feat(serve): Add address and port CLI args for nixster server

beneboy · beneboy · commit 3d09af422623 · 2019-01-30T21:39:44.000Z
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/nix.ts b/src/nix.ts
@@ -267,7 +267,7 @@ export function location (env: string): string {
  * @param env The environment name
  * @param pkgs An array of normalized package names
  */
-export async function install (env: string, pkgs: Array<string>, clean: boolean = false, inDocker: boolean = false) {
+export async function install (env: string, pkgs: Array<string>, clean: boolean = false) {
   let channels: { [key: string]: any } = {}
   for (let pkg of pkgs) {
     let matches = await match(pkg)
@@ -295,23 +295,7 @@ export async function install (env: string, pkgs: Array<string>, clean: boolean
     if (clean) args = args.concat('--remove-all')
     args = args.concat('--attr', channels[channel].map((pkg: any) => pkg.attr))
 
-    let command
-
-    if (inDocker) {
-      command = 'docker'
-      let dockerArgs = [
-          'run',
-          'stencila/nixster', 'nix-env'
-          // todo: write correct commands
-      ]
-      args = dockerArgs.concat(args)
-    } else {
-      command = 'nix-env'
-    }
-
-    console.log(args.join(' '))
-
-    await spawn(command, args, {
+    await spawn('nix-env', args, {
       stdio: 'inherit'
     })
   }
diff --git a/src/serve.ts b/src/serve.ts
@@ -1,10 +1,31 @@
 import path from 'path'
 import stream from 'stream'
+import yargs from 'yargs'
+
 
 import express from 'express'
 
 import Environment, { SessionParameters, Platform } from './Environment'
 
+const DEFAULT_PORT = 3000
+
+let argv = yargs.scriptName('nixster-serve')
+    .help('h')
+    .alias('h', 'help')
+    .option('port', {
+      alias: 'p',
+      default: DEFAULT_PORT,
+      describe: 'Port to listen on',
+      type: 'number'
+    })
+    .option('address', {
+      alias: 'a',
+      default: 'localhost',
+      describe: 'Host address to listen on',
+      type: 'string'
+    })
+    .argv
+
 const app = express()
 const expressWs = require('express-ws')(app)
 
@@ -15,6 +36,7 @@ app.use(express.static(path.join(__dirname, 'static')))
 const jsonParser = require('body-parser').json()
 app.use(jsonParser)
 
+
 // todo: rename shell to interact
 // Instantiate shell and set up data handlers
 expressWs.app.ws('/shell', async (ws: any, req: express.Request) => {
@@ -75,5 +97,5 @@ expressWs.app.post('/stop', async (req: any, res: any) => {
   // req: some JSON -> with container ID that will stop the container
 })
 
-app.listen(3000)
-console.error('Listening on http://localhost:3000')
+app.listen(argv.port, argv.address)
+console.info(`Listening on http://${argv.address}:${argv.port}`)
diff --git a/src/static/index.html b/src/static/index.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
   <head>
-    <title>Nixter</title>
+    <title>Nixster</title>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/es6-promise/4.1.1/es6-promise.auto.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/fetch/1.0.0/fetch.min.js"></script>
     <script src="https://unpkg.com/xterm@3.10.1/dist/xterm.js"></script>
