complete merge

bin/telebit-remote.js

@@ -546,6 +546,10 @@ function parseConfig(err, text) {
           } else {
             console.info('> Rejecting SSH-over-HTTPS for now');
           }
+        } else if ('status' === body.module) {
+          // TODO funny one this one
+          console.info('http://localhost:' + (body.port || state.config.ipc.port));
+          console.info(JSON.stringify(body, null, 2));
         } else {
           console.info(JSON.stringify(body, null, 2));
         }

bin/telebitd.js

@@ -326,356 +326,366 @@ controllers.ssh = function (req, res, opts) {
   state.config.sshAuto = sshAuto;
   sshSuccess();
 };
-function serveControlsHelper() {
-  controlServer = http.createServer(function (req, res) {
-    var opts = url.parse(req.url, true);
-    if (false && opts.query._body) {
-      try {
-        opts.body = JSON.parse(decodeURIComponent(opts.query._body, true));
-      } catch(e) {
-        res.statusCode = 500;
-        res.end('{"error":{"message":"?_body={{bad_format}}"}}');
-        return;
-      }
-    }
 
-    function listSuccess() {
-      var dumpy = {
-        servernames: state.servernames
-      , ports: state.ports
-      , ssh: state.config.sshAuto || 'disabled'
-      , code: 'CONFIG'
-      };
-      if (state.otp) {
-        dumpy.device_pair_code = state.otp;
-      }
-
-      if (state._can_pair && state.config.email && !state.token) {
-        dumpy.code = "AWAIT_AUTH";
-        dumpy.message = "Please run 'telebit init' to authenticate.";
-      }
-
-      res.end(JSON.stringify(dumpy));
-    }
-
-    function getConfigOnly() {
-      var resp = JSON.parse(JSON.stringify(state.config));
-      resp.version = pkg.version;
-      res.setHeader('Content-Type', 'application/json');
-      res.end(JSON.stringify(resp));
-    }
-
-    //
-    // without proper config
-    //
-    function saveAndReport() {
-      console.log('[DEBUG] saveAndReport config write', confpath);
-      console.log(YAML.safeDump(snakeCopy(state.config)));
-      fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) {
-        if (err) {
-          res.statusCode = 500;
-          res.setHeader('Content-Type', 'application/json');
-          res.end('{"error":{"message":"Could not save config file after init: ' + err.message.replace(/"/g, "'")
-            + '.\nPerhaps check that the file exists and your user has permissions to write it?"}}');
-          return;
-        }
-
-        listSuccess();
-      });
-    }
-
-    function initOrConfig() {
-      var conf = {};
-      if (!opts.body) {
-        res.statusCode = 422;
-        res.end('{"error":{"message":"module \'init\' needs more arguments"}}');
-        return;
-      }
-      // relay, email, agree_tos, servernames, ports
-      //
-      opts.body.forEach(function (opt) {
-        var parts = opt.split(/:/);
-        if ('true' === parts[1]) {
-          parts[1] = true;
-        } else if ('false' === parts[1]) {
-          parts[1] = false;
-        } else if ('null' === parts[1]) {
-          parts[1] = null;
-        } else if ('undefined' === parts[1]) {
-          parts[1] = undefined;
-        }
-        conf[parts[0]] = parts[1];
-      });
-
-      // TODO camelCase query
-      state.config.email = conf.email || state.config.email || '';
-      if ('undefined' !== typeof conf.agreeTos
-        || 'undefined' !== typeof conf.agreeTos ) {
-        state.config.agreeTos = conf.agreeTos || conf.agree_tos;
-      }
-      state.otp = conf._otp; // this should only be done on the client side
-      state.config.relay = conf.relay || state.config.relay || '';
-      console.log();
-      console.log('conf.token', typeof conf.token, conf.token);
-      console.log('state.config.token', typeof state.config.token, state.config.token);
-      state.config.token = conf.token || state.config.token || null;
-      state.config.secret = conf.secret || state.config.secret || null;
-      state.pretoken = conf.pretoken || state.config.pretoken || null;
-      if (state.secret) {
-        console.log('state.secret');
-        state.token = common.signToken(state);
-      }
-      if (!state.token) {
-        console.log('!state.token');
-        state.token = conf._token;
-      }
-      console.log();
-      console.log('JSON.stringify(conf)');
-      console.log(JSON.stringify(conf));
-      console.log();
-      console.log('JSON.stringify(state)');
-      console.log(JSON.stringify(state));
-      console.log();
-      if ('undefined' !== typeof conf.newsletter) {
-        state.config.newsletter = conf.newsletter;
-      }
-      if ('undefined' !== typeof conf.communityMember
-        || 'undefined' !== typeof conf.community_member) {
-        state.config.communityMember = conf.communityMember || conf.community_member;
-      }
-      if ('undefined' !== typeof conf.telemetry) {
-        state.config.telemetry = conf.telemetry;
-      }
-      if (conf._servernames) {
-        (conf._servernames||'').split(/,/g).forEach(function (key) {
-          if (!state.config.servernames[key]) {
-            state.config.servernames[key] = { sub: undefined };
-          }
-        });
-      }
-      if (conf._ports) {
-        (conf._ports||'').split(/,/g).forEach(function (key) {
-          if (!state.config.ports[key]) {
-            state.config.ports[key] = {};
-          }
-        });
-      }
-
-      if (!state.config.relay || !state.config.email || !state.config.agreeTos) {
-        console.warn('missing config');
-        res.statusCode = 400;
-
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify({
-          error: {
-            code: "E_INIT"
-          , message: "Missing important config file params"
-          , _params: JSON.stringify(conf)
-          , _config: JSON.stringify(state.config)
-          , _body: JSON.stringify(opts.body)
-          }
-        }));
-        return;
-      }
-
-      // init also means enable
-      delete state.config.disable;
-      safeStartTelebitRemote(true).then(saveAndReport).catch(handleError);
-    }
-
-    function restart() {
-      console.info("[telebitd.js] server closing...");
-      state.keepAlive.state = false;
-      if (myRemote) {
-        myRemote.end();
-        myRemote.on('end', respondAndClose);
-        // failsafe
-        setTimeout(function () {
-          console.info("[telebitd.js] closing too slowly, force quit");
-          respondAndClose();
-        }, 5 * 1000);
-      } else {
-        respondAndClose();
-      }
-
-      function respondAndClose() {
-        res.setHeader('Content-Type', 'application/json');
-        res.end(JSON.stringify({ success: true }));
-        controlServer.close(function () {
-          console.info("[telebitd.js] server closed");
-          setTimeout(function () {
-            // system daemon will restart the process
-            process.exit(22); // use non-success exit code
-          }, 100);
-        });
-      }
-    }
-
-    function invalidConfig() {
-      res.statusCode = 400;
-      res.setHeader('Content-Type', 'application/json');
-      res.end(JSON.stringify({
-        error: { code: "E_CONFIG", message: "Invalid config file. Please run 'telebit init'" }
-      }));
-    }
-
-    function saveAndCommit() {
-      state.config.servernames = state.servernames;
-      state.config.ports = state.ports;
-      fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) {
-        if (err) {
-          res.statusCode = 500;
-          res.setHeader('Content-Type', 'application/json');
-          res.end(JSON.stringify({
-            "error":{"message":"Could not save config file. Perhaps you're not running as root?"}
-          }));
-          return;
-        }
-        listSuccess();
-      });
-    }
-
-    function handleError(err) {
+var serveStatic = require('serve-static')(path.join(__dirname, '../lib/admin/'));
+function handleRemoteClient(req, res) {
+  if (/^\/(rpc|api)\//.test(req.url)) {
+    return handleApi(req, res);
+  }
+  serveStatic(req, res, require('finalhandler')(req, res));
+}
+function handleApi(req, res) {
+  var opts = url.parse(req.url, true);
+  if (false && opts.query._body) {
+    try {
+      opts.body = JSON.parse(decodeURIComponent(opts.query._body, true));
+    } catch(e) {
       res.statusCode = 500;
+      res.end('{"error":{"message":"?_body={{bad_format}}"}}');
+      return;
+    }
+  }
+
+  function listSuccess() {
+    var dumpy = {
+      servernames: state.servernames
+    , ports: state.ports
+    , ssh: state.config.sshAuto || 'disabled'
+    , code: 'CONFIG'
+    };
+    if (state.otp) {
+      dumpy.device_pair_code = state.otp;
+    }
+
+    if (state._can_pair && state.config.email && !state.token) {
+      dumpy.code = "AWAIT_AUTH";
+      dumpy.message = "Please run 'telebit init' to authenticate.";
+    }
+
+    res.end(JSON.stringify(dumpy));
+  }
+
+  function getConfigOnly() {
+    var resp = JSON.parse(JSON.stringify(state.config));
+    resp.version = pkg.version;
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(resp));
+  }
+
+  //
+  // without proper config
+  //
+  function saveAndReport() {
+    console.log('[DEBUG] saveAndReport config write', confpath);
+    console.log(YAML.safeDump(snakeCopy(state.config)));
+    fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) {
+      if (err) {
+        res.statusCode = 500;
+        res.setHeader('Content-Type', 'application/json');
+        res.end('{"error":{"message":"Could not save config file after init: ' + err.message.replace(/"/g, "'")
+          + '.\nPerhaps check that the file exists and your user has permissions to write it?"}}');
+        return;
+      }
+
+      listSuccess();
+    });
+  }
+
+  function initOrConfig() {
+    var conf = {};
+    if (!opts.body) {
+      res.statusCode = 422;
+      res.end('{"error":{"message":"module \'init\' needs more arguments"}}');
+      return;
+    }
+    // relay, email, agree_tos, servernames, ports
+    //
+    opts.body.forEach(function (opt) {
+      var parts = opt.split(/:/);
+      if ('true' === parts[1]) {
+        parts[1] = true;
+      } else if ('false' === parts[1]) {
+        parts[1] = false;
+      } else if ('null' === parts[1]) {
+        parts[1] = null;
+      } else if ('undefined' === parts[1]) {
+        parts[1] = undefined;
+      }
+      conf[parts[0]] = parts[1];
+    });
+
+    // TODO camelCase query
+    state.config.email = conf.email || state.config.email || '';
+    if ('undefined' !== typeof conf.agreeTos
+      || 'undefined' !== typeof conf.agreeTos ) {
+      state.config.agreeTos = conf.agreeTos || conf.agree_tos;
+    }
+    state.otp = conf._otp; // this should only be done on the client side
+    state.config.relay = conf.relay || state.config.relay || '';
+    console.log();
+    console.log('conf.token', typeof conf.token, conf.token);
+    console.log('state.config.token', typeof state.config.token, state.config.token);
+    state.config.token = conf.token || state.config.token || null;
+    state.config.secret = conf.secret || state.config.secret || null;
+    state.pretoken = conf.pretoken || state.config.pretoken || null;
+    if (state.secret) {
+      console.log('state.secret');
+      state.token = common.signToken(state);
+    }
+    if (!state.token) {
+      console.log('!state.token');
+      state.token = conf._token;
+    }
+    console.log();
+    console.log('JSON.stringify(conf)');
+    console.log(JSON.stringify(conf));
+    console.log();
+    console.log('JSON.stringify(state)');
+    console.log(JSON.stringify(state));
+    console.log();
+    if ('undefined' !== typeof conf.newsletter) {
+      state.config.newsletter = conf.newsletter;
+    }
+    if ('undefined' !== typeof conf.communityMember
+      || 'undefined' !== typeof conf.community_member) {
+      state.config.communityMember = conf.communityMember || conf.community_member;
+    }
+    if ('undefined' !== typeof conf.telemetry) {
+      state.config.telemetry = conf.telemetry;
+    }
+    if (conf._servernames) {
+      (conf._servernames||'').split(/,/g).forEach(function (key) {
+        if (!state.config.servernames[key]) {
+          state.config.servernames[key] = { sub: undefined };
+        }
+      });
+    }
+    if (conf._ports) {
+      (conf._ports||'').split(/,/g).forEach(function (key) {
+        if (!state.config.ports[key]) {
+          state.config.ports[key] = {};
+        }
+      });
+    }
+
+    if (!state.config.relay || !state.config.email || !state.config.agreeTos) {
+      console.warn('missing config');
+      res.statusCode = 400;
+
       res.setHeader('Content-Type', 'application/json');
       res.end(JSON.stringify({
-        error: { message: err.message, code: err.code }
+        error: {
+          code: "E_INIT"
+        , message: "Missing important config file params"
+        , _params: JSON.stringify(conf)
+        , _config: JSON.stringify(state.config)
+        , _body: JSON.stringify(opts.body)
+        }
       }));
-    }
-
-    function enable() {
-      delete state.config.disable;// = undefined;
-      state.keepAlive.state = true;
-
-      fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) {
-        if (err) {
-          err.message = "Could not save config file. Perhaps you're user doesn't have permission?";
-          handleError(err);
-          return;
-        }
-        // TODO XXX myRemote.active
-        if (myRemote) {
-          listSuccess();
-          return;
-        }
-        safeStartTelebitRemote(true).then(listSuccess).catch(handleError);
-      });
-    }
-
-    function disable() {
-      state.config.disable = true;
-      state.keepAlive.state = false;
-
-      if (myRemote) { myRemote.end(); myRemote = null; }
-      fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) {
-        res.setHeader('Content-Type', 'application/json');
-        if (err) {
-          err.message = "Could not save config file. Perhaps you're user doesn't have permission?";
-          handleError(err);
-          return;
-        }
-        res.end('{"success":true}');
-      });
-    }
-
-    function getStatus() {
-      res.setHeader('Content-Type', 'application/json');
-      res.end(JSON.stringify(
-        { status: (state.config.disable ? 'disabled' : 'enabled')
-        , ready: ((state.config.relay && (state.config.token || state.config.agreeTos)) ? true : false)
-        , active: !!myRemote
-        , connected: 'maybe (todo)'
-        , version: pkg.version
-        , servernames: state.servernames
-        }
-      ));
-    }
-
-    function route() {
-      if (/\b(config)\b/.test(opts.pathname) && /get/i.test(req.method)) {
-        getConfigOnly();
-        return;
-      }
-      if (/\b(init|config)\b/.test(opts.pathname)) {
-        initOrConfig();
-        return;
-      }
-      if (/restart/.test(opts.pathname)) {
-        restart();
-        return;
-      }
-      //
-      // Check for proper config
-      //
-      if (!state.config.relay || !state.config.email || !state.config.agreeTos) {
-        invalidConfig();
-        return;
-      }
-      //
-      // With proper config
-      //
-      if (/http/.test(opts.pathname)) {
-        controllers.http(req, res, opts);
-        return;
-      }
-      if (/tcp/.test(opts.pathname)) {
-        controllers.tcp(req, res, opts);
-        return;
-      }
-      if (/save|commit/.test(opts.pathname)) {
-        saveAndCommit();
-        return;
-      }
-      if (/ssh/.test(opts.pathname)) {
-        controllers.ssh(req, res, opts);
-        return;
-      }
-      if (/enable/.test(opts.pathname)) {
-        enable();
-        return;
-      }
-      if (/disable/.test(opts.pathname)) {
-        disable();
-        return;
-      }
-      if (/status/.test(opts.pathname)) {
-        getStatus();
-        return;
-      }
-      if (/list/.test(opts.pathname)) {
-        listSuccess();
-        return;
-      }
-
-      res.setHeader('Content-Type', 'application/json');
-      res.end(JSON.stringify({"error":{"message":"unrecognized rpc"}}));
-    }
-
-    if (!req.headers['content-length'] && !req.headers['content-type']) {
-      route();
       return;
     }
 
-    var body = '';
-    req.on('readable', function () {
-      var data;
-      while (true) {
-        data = req.read();
-        if (!data) { break; }
-        body += data.toString();
-      }
-    });
-    req.on('end', function () {
-      try {
-        opts.body = JSON.parse(body);
-      } catch(e) {
-        res.statusCode = 400;
-        res.end('{"error":{"message":"POST body is not valid json"}}');
+    // init also means enable
+    delete state.config.disable;
+    safeStartTelebitRemote(true).then(saveAndReport).catch(handleError);
+  }
+
+  function restart() {
+    console.info("[telebitd.js] server closing...");
+    state.keepAlive.state = false;
+    if (myRemote) {
+      myRemote.end();
+      myRemote.on('end', respondAndClose);
+      // failsafe
+      setTimeout(function () {
+        console.info("[telebitd.js] closing too slowly, force quit");
+        respondAndClose();
+      }, 5 * 1000);
+    } else {
+      respondAndClose();
+    }
+
+    function respondAndClose() {
+      res.setHeader('Content-Type', 'application/json');
+      res.end(JSON.stringify({ success: true }));
+      controlServer.close(function () {
+        console.info("[telebitd.js] server closed");
+        setTimeout(function () {
+          // system daemon will restart the process
+          process.exit(22); // use non-success exit code
+        }, 100);
+      });
+    }
+  }
+
+  function invalidConfig() {
+    res.statusCode = 400;
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify({
+      error: { code: "E_CONFIG", message: "Invalid config file. Please run 'telebit init'" }
+    }));
+  }
+
+  function saveAndCommit() {
+    state.config.servernames = state.servernames;
+    state.config.ports = state.ports;
+    fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) {
+      if (err) {
+        res.statusCode = 500;
+        res.setHeader('Content-Type', 'application/json');
+        res.end(JSON.stringify({
+          "error":{"message":"Could not save config file. Perhaps you're not running as root?"}
+        }));
         return;
       }
-      route();
+      listSuccess();
     });
+  }
+
+  function handleError(err) {
+    res.statusCode = 500;
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify({
+      error: { message: err.message, code: err.code }
+    }));
+  }
+
+  function enable() {
+    delete state.config.disable;// = undefined;
+    state.keepAlive.state = true;
+
+    fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) {
+      if (err) {
+        err.message = "Could not save config file. Perhaps you're user doesn't have permission?";
+        handleError(err);
+        return;
+      }
+      // TODO XXX myRemote.active
+      if (myRemote) {
+        listSuccess();
+        return;
+      }
+      safeStartTelebitRemote(true).then(listSuccess).catch(handleError);
+    });
+  }
+
+  function disable() {
+    state.config.disable = true;
+    state.keepAlive.state = false;
+
+    if (myRemote) { myRemote.end(); myRemote = null; }
+    fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) {
+      res.setHeader('Content-Type', 'application/json');
+      if (err) {
+        err.message = "Could not save config file. Perhaps you're user doesn't have permission?";
+        handleError(err);
+        return;
+      }
+      res.end('{"success":true}');
+    });
+  }
+
+  function getStatus() {
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify(
+      { module: 'status'
+      , status: (state.config.disable ? 'disabled' : 'enabled')
+      , ready: ((state.config.relay && (state.config.token || state.config.agreeTos)) ? true : false)
+      , active: !!myRemote
+      , connected: 'maybe (todo)'
+      , version: pkg.version
+      , servernames: state.servernames
+      }
+    ));
+  }
+
+  function route() {
+    if (/\b(config)\b/.test(opts.pathname) && /get/i.test(req.method)) {
+      getConfigOnly();
+      return;
+    }
+    if (/\b(init|config)\b/.test(opts.pathname)) {
+      initOrConfig();
+      return;
+    }
+    if (/restart/.test(opts.pathname)) {
+      restart();
+      return;
+    }
+    //
+    // Check for proper config
+    //
+    if (!state.config.relay || !state.config.email || !state.config.agreeTos) {
+      invalidConfig();
+      return;
+    }
+    //
+    // With proper config
+    //
+    if (/http/.test(opts.pathname)) {
+      controllers.http(req, res, opts);
+      return;
+    }
+    if (/tcp/.test(opts.pathname)) {
+      controllers.tcp(req, res, opts);
+      return;
+    }
+    if (/save|commit/.test(opts.pathname)) {
+      saveAndCommit();
+      return;
+    }
+    if (/ssh/.test(opts.pathname)) {
+      controllers.ssh(req, res, opts);
+      return;
+    }
+    if (/enable/.test(opts.pathname)) {
+      enable();
+      return;
+    }
+    if (/disable/.test(opts.pathname)) {
+      disable();
+      return;
+    }
+    if (/status/.test(opts.pathname)) {
+      getStatus();
+      return;
+    }
+    if (/list/.test(opts.pathname)) {
+      listSuccess();
+      return;
+    }
+
+    res.setHeader('Content-Type', 'application/json');
+    res.end(JSON.stringify({"error":{"message":"unrecognized rpc"}}));
+  }
+
+  if (!req.headers['content-length'] && !req.headers['content-type']) {
+    route();
+    return;
+  }
+
+  var body = '';
+  req.on('readable', function () {
+    var data;
+    while (true) {
+      data = req.read();
+      if (!data) { break; }
+      body += data.toString();
+    }
   });
+  req.on('end', function () {
+    try {
+      opts.body = JSON.parse(body);
+    } catch(e) {
+      res.statusCode = 400;
+      res.end('{"error":{"message":"POST body is not valid json"}}');
+      return;
+    }
+    route();
+  });
+}
+function serveControlsHelper() {
+  controlServer = http.createServer(handleRemoteClient);
 
   if (fs.existsSync(state._ipc.path)) {
     fs.unlinkSync(state._ipc.path);
@@ -688,15 +698,30 @@ function serveControlsHelper() {
   , readableAll: true
   , exclusive: false
   };
+  if (!state.config.ipc) {
+    state.config.ipc = {};
+  }
+  if (!state.config.ipc.path) {
+    state.config.ipc.path = path.dirname(state._ipc.path);
+  }
+  require('mkdirp').sync(state.config.ipc.path);
+  if (!state.config.ipc.type) {
+    state.config.ipc.type = 'port';
+  }
+  var portFile = path.join(state.config.ipc.path, 'telebit.port');
+  if (fs.existsSync(portFile)) {
+    state._ipc.port = parseInt(fs.readFileSync(portFile, 'utf8').trim(), 10);
+  }
+
   if ('socket' === state._ipc.type) {
     require('mkdirp').sync(path.dirname(state._ipc.path));
   }
   // https://nodejs.org/api/net.html#net_server_listen_options_callback
   // path is ignore if port is defined
   // https://git.coolaj86.com/coolaj86/telebit.js/issues/23#issuecomment-326
-  if (state._ipc.port) {
+  if ('port' === state.config.ipc.type) {
     serverOpts.host = 'localhost';
-    serverOpts.port = state._ipc.port;
+    serverOpts.port = state._ipc.port || 0;
   } else {
     serverOpts.path = state._ipc.path;
   }
@@ -709,6 +734,21 @@ function serveControlsHelper() {
     //console.log(this.address());
     console.info("[info] Listening for commands on", address);
   });
+  controlServer.on('error', function (err) {
+    if ('EADDRINUSE' === err.code) {
+      try {
+        fs.unlinkSync(portFile);
+      } catch(e) {
+        // nada
+      }
+      setTimeout(function () {
+        console.log("trying again");
+        serveControlsHelper();
+      }, 1000);
+      return;
+    }
+    console.error('failed to start c&c server:', err);
+  });
 }
 
 function serveControls() {

lib/admin/index.html

@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Telebit Admin</title>
+</head>
+<body>
+  <div class="v-app">
+    <h1>Telebit Admin</h1>
+
+    <section>
+      <h2>GET /api/config</h2>
+      <pre><code>{{ config }}</code></pre>
+    </section>
+
+    <section>
+      <h2>GET /api/status</h2>
+      <pre><code>{{ status }}</code></pre>
+    </section>
+
+    <section>
+      <h2>POST /api/init</h2>
+      <form v-on:submit.stop.prevent="initialize">
+
+        <label for="-email">Email:</label>
+        <input id="-email" v-model="init.email" type="text" placeholder="john@example.com">
+        <br>
+
+        <label for="-teletos"><input id="-teletos" v-model="init.teletos" type="checkbox">
+          Accept Telebit Terms of Service</label>
+        <br>
+
+        <label for="-letos"><input id="-letos" v-model="init.letos" type="checkbox">
+          Accept Let's Encrypt Terms of Service</label>
+        <br>
+
+      </form>
+      <pre><code>{{ init }}</code></pre>
+    </section>
+
+    <section>
+      <h2>POST /api/http</h2>
+      <pre><code>{{ http }}</code></pre>
+    </section>
+
+    <section>
+      <h2>POST /api/tcp</h2>
+      <pre><code>{{ tcp }}</code></pre>
+    </section>
+
+    <section>
+      <h2>POST /api/ssh</h2>
+      <pre><code>{{ ssh }}</code></pre>
+    </section>
+
+  </div>
+
+  <script src="js/vue.js"></script>
+  <script src="js/app.js"></script>
+</body>
+</html>

lib/admin/js/app.js

@@ -0,0 +1,50 @@
+;(function () {
+'use strict';
+
+console.log("hello");
+
+var Vue = window.Vue;
+var api = {};
+
+api.config = function apiConfig() {
+  return window.fetch("/api/config", { method: "GET" }).then(function (resp) {
+    return resp.json().then(function (json) {
+      appData.config = json;
+      return json;
+    });
+  });
+};
+api.status = function apiStatus() {
+  return window.fetch("/api/status", { method: "GET" }).then(function (resp) {
+    return resp.json().then(function (json) {
+      appData.status = json;
+      return json;
+    });
+  });
+};
+
+var appData = {
+  config: null
+, status: null
+, init: {}
+, http: null
+, tcp: null
+, ssh: null
+};
+var appMethods = {
+  initialize: function () {
+    console.log("call initialize");
+  }
+};
+
+new Vue({
+  el: ".v-app"
+, data: appData
+, methods: appMethods
+});
+
+api.config();
+api.status();
+
+window.api = api;
+}());

lib/en-us.toml

@@ -59,7 +59,7 @@ Use \"telebit help [command]\" for more information about a command, including f
 
 Copyright 2015-2018 AJ ONeal https://telebit.cloud MPL-2.0 Licensed (RAWR!)"
 
-status = "usage: telebit status <path/port/none> [subdomain]
+status = "usage: telebit status
 
 'telebit status' shows details about the current connections (or lack thereof).
 

lib/rc/index.js

@@ -79,11 +79,25 @@ module.exports.create = function (state) {
       url += ('?_body=' + encodeURIComponent(json));
     }
     var method = opts.method || (args && 'POST') || 'GET';
-    var req = http.request({
-      socketPath: state._ipc.path
-    , method: method
+    var reqOpts = {
+      method: method
     , path: url
-    }, function (resp) {
+    };
+    var fs = require('fs');
+    var portFile = path.join(path.dirname(state._ipc.path), 'telebit.port');
+    if (fs.existsSync(portFile)) {
+      reqOpts.host = 'localhost';
+      reqOpts.port = parseInt(fs.readFileSync(portFile, 'utf8').trim(), 10);
+      if (!state.config.ipc) {
+        state.config.ipc = {};
+      }
+      state.config.ipc.type = 'port';
+      state.config.ipc.path = path.dirname(state._ipc.path);
+      state.config.ipc.port = reqOpts.port;
+    } else {
+      reqOpts.socketPath = state._ipc.path;
+    }
+    var req = http.request(reqOpts, function (resp) {
       makeResponder(service, resp, fn);
     });
 

usr/share/install-launcher.js

@@ -84,8 +84,8 @@ Launcher.install = function (things, fn) {
   };
   vars.telebitBinTpl = path.join(telebitRoot, 'usr/share/dist/bin/telebit.tpl');
   vars.telebitNpm = path.resolve(vars.telebitNode, '../npm');
-  vars.nodePath = path.resolve(vars.telebitNode, '../lib/node_modules');
-  vars.npmConfigPrefix = path.resolve(vars.telebitNode, '..');
+  vars.nodePath = path.resolve(vars.telebitNode, '../../lib/node_modules');
+  vars.npmConfigPrefix = path.resolve(vars.telebitNode, '..', '..');
   vars.userspace = (!things.telebitUser || (things.telebitUser === os.userInfo().username)) ? true : false;
   if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
     vars.telebitRwDirs.push(vars.npmConfigPrefix);

usr/share/install_helper.sh

@@ -224,16 +224,20 @@ pushd $TELEBIT_TMP >/dev/null
   else
     echo -n "."
   fi
+  set +e
   $tmp_npm install >/dev/null 2>/dev/null &
-  # ursa is now an entirely optional dependency for key generation
-  # but very much needed on ARM devices
-  $tmp_npm install ursa >/dev/null 2>/dev/null &
   tmp_npm_pid=$!
   while [ -n "$tmp_npm_pid" ]; do
     sleep 2
     echo -n "."
     kill -s 0 $tmp_npm_pid >/dev/null 2>/dev/null || tmp_npm_pid=""
   done
+  set -e
+  echo -n "."
+  $tmp_npm install >/dev/null 2>/dev/null
+  # ursa is now an entirely optional dependency for key generation
+  # but very much needed on ARM devices
+  $tmp_npm install ursa >/dev/null 2>/dev/null || true
 popd >/dev/null
 
 if [ -n "${TELEBIT_DEBUG}" ]; then
@@ -425,8 +429,8 @@ if [ -d "/Library/LaunchDaemons" ]; then
 
     if [ -n "${TELEBIT_DEBUG}" ]; then
       echo "    > launchctl unload -w $my_app_launchd_service >/dev/null 2>/dev/null"
-      launchctl unload -w "$my_app_launchd_service" >/dev/null 2>/dev/null
     fi
+    launchctl unload -w "$my_app_launchd_service" >/dev/null 2>/dev/null
   else
     my_app_launchd_service_skel="usr/share/dist/Library/LaunchDaemons/${my_app_pkg_name}.plist"
     my_app_launchd_service="$my_root/Library/LaunchDaemons/${my_app_pkg_name}.plist"

usr/share/template-launcher.js

@@ -79,8 +79,8 @@ function run() {
     , TELEBIT_LOG_DIR: process.env.TELEBIT_LOG_DIR || path.join(os.homedir(), '.local/share/telebit/var/log')
     };
     vars.telebitNpm = process.env.TELEBIT_NPM || path.resolve(vars.telebitNode, '../npm');
-    vars.nodePath = process.env.NODE_PATH || path.resolve(vars.telebitNode, '../lib/node_modules');
-    vars.npmConfigPrefix = process.env.NPM_CONFIG_PREFIX || path.resolve(vars.telebitNode, '..');
+    vars.nodePath = process.env.NODE_PATH || path.resolve(vars.telebitNode, '../../lib/node_modules');
+    vars.npmConfigPrefix = process.env.NPM_CONFIG_PREFIX || path.resolve(vars.telebitNode, '..', '..');
     if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
       vars.telebitRwDirs.push(vars.npmConfigPrefix);
     }