wip

Author: saitonakamura

package.json

@@ -22,7 +22,7 @@
     "utils/*"
   ],
   "scripts": {
-    "start": "node dist/cli.js tests/example --reload --browse --static --module",
+    "start": "SWC_NODE_PROJECT=./tsconfig.json node -r @swc-node/register src/cli.ts tests/example index.html 8081 --reload --browse",
     "build": "tsc",
     "cleanup": "rm -f servor.key servor.crt",
     "test": "npm run cleanup && cd tests && node index.js"
@@ -40,6 +40,7 @@
   },
   "dependencies": {
     "chokidar": "^3.5.3",
+    "commander": "^10.0.1",
     "http-proxy": "^1.18.1"
   },
   "packageManager": "[email protected]",

src/cli.ts

@@ -3,6 +3,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { servor } from './servor';
 import openBrowser from './utils/openBrowser';
+import { program } from 'commander';
 
 const readCredentials = () => ({
   cert: fs.readFileSync(__dirname + '/servor.crt'),
@@ -15,35 +16,54 @@ const certify = () =>
   });
 
 (async () => {
-  const args = process.argv.slice(2).filter((x) => !~x.indexOf('--'));
+  // Parse arguments from the command line
+  program
+    .arguments('[root] [fallback] [port]')
+    .option('-r, --reload', 'reload on file change')
+    .option('-m, --module', 'serve javascript modules')
+    .option('-s, --static', 'serve static files')
+    .option('--secure', 'use https')
+    .option('-b, --browse', 'open browser on start')
+    .option('--localhost-only', 'only serve on localhost')
+    .option('--no-dir-listing', 'disable directory listing')
+    .option('--silent', 'disable console output')
+    .option('--editor', 'open code editor')
+    .parse(process.argv);
+
+  const opts = program.opts();
+  const argsRoot = program.args[0];
+  const fallback = program.args[1];
+  const argsPort = program.args[2];
+
+  // const args = process.argv.slice(2).filter((x) => !~x.indexOf('--'));
   const admin = process.getuid && process.getuid() === 0;
   let credentials;
 
-  if (args[0] && args[0].startsWith('gh:')) {
-    const repo = args[0].replace('gh:', '');
-    const dest = repo.split('/')[1];
-    if (!fs.existsSync(dest)) {
-      try {
-        require('child_process').execSync(`git clone https://github.com/${repo}`, { stdio: 'ignore' });
-      } catch (e) {
-        console.log(`\n  ⚠️  Could not clone from https://github.com/${repo}\n`);
-        process.exit();
-      }
-    }
-    args[0] = dest;
-  }
+  // if (args[0] && args[0].startsWith('gh:')) {
+  //   const repo = args[0].replace('gh:', '');
+  //   const dest = repo.split('/')[1];
+  //   if (!fs.existsSync(dest)) {
+  //     try {
+  //       require('child_process').execSync(`git clone https://github.com/${repo}`, { stdio: 'ignore' });
+  //     } catch (e) {
+  //       console.log(`\n  ⚠️  Could not clone from https://github.com/${repo}\n`);
+  //       process.exit();
+  //     }
+  //   }
+  //   args[0] = dest;
+  // }
 
-  if (~process.argv.indexOf('--editor')) {
+  if (opts.editor) {
     try {
-      require('child_process').execSync(`code ${args[0] || '.'}`);
+      require('child_process').execSync(`code ${argsRoot || '.'}`);
     } catch (e) {
-      console.log(`\n  ⚠️  Could not open code editor for ${args[0] || '.'}`);
+      console.log(`\n  ⚠️  Could not open code editor for ${argsRoot || '.'}`);
     }
   }
 
   // Generate ssl certificates
 
-  if (~process.argv.indexOf('--secure')) {
+  if (opts.secure) {
     admin && certify();
     admin && process.platform === 'darwin' && process.setuid?.(501);
     try {
@@ -59,23 +79,21 @@ const certify = () =>
     }
   }
 
-  // Parse arguments from the command line
-
   const { root, protocol, port, ips, url } = await servor({
-    root: args[0],
-    fallback: args[1],
-    port: args[2],
-    reload: !!~process.argv.indexOf('--reload'),
-    module: !!~process.argv.indexOf('--module'),
-    static: !!~process.argv.indexOf('--static'),
-    host: !!~process.argv.indexOf('--localhost-only') ? '127.0.0.1' : undefined,
-    noDirListing: !!~process.argv.indexOf('--no-dir-listing'),
+    root: argsRoot,
+    fallback,
+    port: argsPort,
+    reload: !!opts.reload,
+    module: !!opts.module,
+    static: !!opts.static,
+    host: !!opts.localhostOnly ? '127.0.0.1' : undefined,
+    noDirListing: !!opts.noDirListing,
     credentials,
   });
 
   // Output server details to the console
 
-  !~process.argv.indexOf('--silent') &&
+  !opts.silent &&
     console.log(`
   🗂  Serving:\t${root}\n
   🏡 Local:\t${url}
@@ -84,5 +102,5 @@ const certify = () =>
 
   // Browser the server index
 
-  !!~process.argv.indexOf('--browse') && openBrowser(url);
+  !!opts.browse && openBrowser(url);
 })();

yarn.lock

@@ -21,6 +21,7 @@ __metadata:
     "@types/http-proxy": ^1.17.10
     "@types/node": ^18.14.6
     chokidar: ^3.5.3
+    commander: ^10.0.1
     http-proxy: ^1.18.1
     prettier: ^2.8.7
     puppeteer: ^3.0.4
@@ -483,6 +484,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"commander@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "commander@npm:10.0.1"
+  checksum: 436901d64a818295803c1996cd856621a74f30b9f9e28a588e726b2b1670665bccd7c1a77007ebf328729f0139838a88a19265858a0fa7a8728c4656796db948
+  languageName: node
+  linkType: hard
+
 "concat-map@npm:0.0.1":
   version: 0.0.1
   resolution: "concat-map@npm:0.0.1"