Move the option defaulting into the main script

screepers · Sep 27, 2024 · 9d619e9 · 9d619e9
1 parent 69c7170
commit 9d619e9
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 29 deletions.
diff --git a/bin/server.js b/bin/server.js
@@ -4,6 +4,10 @@ const { execSync } = require('child_process');
 const { join } = require('path');
 require('dotenv').config({ path: join(__dirname, '../.env') });
 
+const nodeVersion = process.versions.node;
+const nodeVersionMajor = Number(nodeVersion.split('.')[0]);
+const { getPort } = nodeVersionMajor >= 14 ? require('get-port-please') : { getPort: async () => 3000 };
+
 const minimist = require('minimist');
 const { createLogger, format, transports } = require('winston');
 
@@ -27,27 +31,34 @@ const logger = createLogger({
     })],
 });
 
-const cli = {
-  cmd: argv._.shift(),
-  args: argv,
-  logger,
-};
-
-switch (cli.cmd) {
-  case 'setup':
-    setup(cli);
-    break;
-
-  case 'start':
-    start(cli);
-    break;
-
-  case 'stop':
-    logger.info(`Stopping server from ${process.env.COMPOSE_FILE}`);
-    execSync('docker-compose stop');
-    break;
-
-  default:
-    logger.error(`expected command, got "${cli.cmd}"`);
-    break;
+async function main() {
+  argv.grafanaPort = argv.grafanaPort ?? await getPort({ portRange: [3000, 4000] });
+  argv.serverPort = argv.serverPort ?? 21025;
+
+  const cli = {
+    cmd: argv._.shift(),
+    args: argv,
+    logger,
+  };
+
+  switch (cli.cmd) {
+    case 'setup':
+      setup(cli);
+      break;
+
+    case 'start':
+      start(cli);
+      break;
+
+    case 'stop':
+      logger.info(`Stopping server from ${process.env.COMPOSE_FILE}`);
+      execSync('docker-compose stop');
+      break;
+
+    default:
+      logger.error(`expected command, got "${cli.cmd}"`);
+      break;
+  }
 }
+
+main();
diff --git a/src/setup/setup.js b/src/setup/setup.js
@@ -7,10 +7,6 @@ let argv;
 /** @type {import('winston').Logger} */
 let logger;
 
-const nodeVersion = process.versions.node;
-const nodeVersionMajor = Number(nodeVersion.split('.')[0]);
-const { getPort } = nodeVersionMajor >= 14 ? require('get-port-please') : { getPort: async () => 3000 };
-
 const isWindows = process.platform === 'win32';
 const regexEscape = isWindows ? '\r\n' : '\n';
 
@@ -152,8 +148,6 @@ async function Setup(cli) {
   argv = cli.args;
   logger = cli.logger;
 
-  argv.grafanaPort = argv.grafanaPort ?? await getPort({ portRange: [3000, 4000] });
-
   UpdateUsersFile();
   UpdateEnvFile();
   await UpdateDockerComposeFile();