wip

Author: saitonakamura

src/cli.ts

@@ -18,49 +18,27 @@ const certify = () =>
 (async () => {
   // Parse arguments from the command line
   program
-    .arguments('[root] [fallback] [port]')
+    .arguments('[root]')
+    .option('-f, --fallback <fallback>', 'fallback file', 'index.html')
+    .option('-p, --port <port>', 'port to use', '8080')
     .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('--host <host>', 'host to listen on')
+    .option('--dir-listing', 'enable 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 fallback = opts.fallback;
+  const argsPort = opts.port;
 
-  // 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 (opts.editor) {
-    try {
-      require('child_process').execSync(`code ${argsRoot || '.'}`);
-    } catch (e) {
-      console.log(`\n  ⚠️  Could not open code editor for ${argsRoot || '.'}`);
-    }
-  }
-
   // Generate ssl certificates
 
   if (opts.secure) {
@@ -83,11 +61,11 @@ const certify = () =>
     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,
+    reload: opts.reload,
+    module: opts.module,
+    static: opts.static,
+    host: opts.host,
+    noDirListing: !opts.dirListing,
     credentials,
   });
 

src/servor.ts

@@ -24,7 +24,7 @@ interface Options {
   static?: boolean;
   inject?: string;
   credentials?: any;
-  port?: string | number;
+  port?: number;
   host?: string;
   livereloadUrl?: string;
   proxy?: Record<string, string>;
@@ -40,22 +40,23 @@ export const servor = async ({
   inject = '',
   credentials,
   port: outerPort,
-  host = '127.0.0.1',
+  host,
   livereloadUrl = '/livereload',
   proxy: proxyConfigObj,
   noDirListing = false,
 }: Options = {}) => {
   // Try start on specified port then fail or find a free port
 
-  let port: string;
+  let port: number;
+  const envPort = process.env.PORT ? parseInt(process.env.PORT) : undefined;
   try {
-    port = await usePort(outerPort || process.env.PORT || 8080);
+    port = await usePort(outerPort || envPort || 8080, host);
   } catch (e) {
-    if (outerPort || process.env.PORT) {
+    if (outerPort || envPort) {
       console.log('[ERR] The port you have specified is already in use!');
       process.exit();
     }
-    port = await usePort();
+    port = await usePort(undefined, host);
   }
 
   const proxyConfig: Array<[RegExp, string]> = proxyConfigObj
@@ -231,7 +232,7 @@ export const servor = async ({
     if (reload && pathname === livereloadUrl) return serveReload(res);
     if (!isRouteRequest(pathname) && !(await isDir(pathname))) return await serveStaticFile(res, pathname);
     return await serveRoute(req, res, pathname);
-  }).listen(parseInt(port, 10), host);
+  }).listen(port, host);
 
   // Notify livereload reloadClients on file change
 

src/utils/common.ts

@@ -28,13 +28,13 @@ export const fileWatch = (
   chokidar.watch(x).on('all', cb);
 };
 
-export const usePort = (port: number | string = 0) =>
-  new Promise<string>((ok, x) => {
+export const usePort = (port?: number, host?: string) =>
+  new Promise<number>((ok, x) => {
     const s = net.createServer();
     s.on('error', x);
-    s.listen(port, () => {
+    s.listen(port, host, undefined, () => {
       const a = s.address();
-      s.close(() => (a ? ok(typeof a === 'string' ? a : a.port.toString()) : void 0));
+      s.close(() => (a && typeof a === 'object' ? ok(a.port) : void 0));
     });
   });