complete merge

show port on status
allow port in remote client
2018-10-15 22:04:32 -06:00 · 2018-10-15 21:48:28 -06:00 · 2018-10-15 21:30:29 -06:00 · 2018-10-15 21:06:59 -06:00 · 2018-10-15 21:02:57 -06:00 · 2018-10-15 20:48:00 -06:00
10 changed files with 11472 additions and 353 deletions
--- a/bin/telebit-remote.js
+++ b/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));
        }
--- a/bin/telebitd.js
+++ b/bin/telebitd.js
@ -326,8 +326,15 @@ controllers.ssh = function (req, res, opts) {
  state.config.sshAuto = sshAuto;
  sshSuccess();
 };
-function serveControlsHelper() {
+
-  controlServer = http.createServer(function (req, res) {
+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 {
@ -581,7 +588,8 @@ function serveControlsHelper() {
  function getStatus() {
    res.setHeader('Content-Type', 'application/json');
    res.end(JSON.stringify(
-        { status: (state.config.disable ? 'disabled' : 'enabled')
+      { 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)'
@ -675,7 +683,9 @@ function serveControlsHelper() {
    }
    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() {
--- a/lib/admin/index.html
+++ b/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>
--- a/lib/admin/js/app.js
+++ b/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;
 }());
--- a/lib/admin/js/vue.js
+++ b/lib/admin/js/vue.js
--- a/lib/en-us.toml
+++ b/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).
--- a/lib/rc/index.js
+++ b/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({
+    var reqOpts = {
-      socketPath: state._ipc.path
+      method: method
    , 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);
    });
--- a/usr/share/install-launcher.js
+++ b/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.nodePath = path.resolve(vars.telebitNode, '../../lib/node_modules');
-  vars.npmConfigPrefix = path.resolve(vars.telebitNode, '..');
+  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);
--- a/usr/share/install_helper.sh
+++ b/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"
--- a/usr/share/template-launcher.js
+++ b/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.nodePath = process.env.NODE_PATH || path.resolve(vars.telebitNode, '../../lib/node_modules');
-    vars.npmConfigPrefix = process.env.NPM_CONFIG_PREFIX || path.resolve(vars.telebitNode, '..');
+    vars.npmConfigPrefix = process.env.NPM_CONFIG_PREFIX || path.resolve(vars.telebitNode, '..', '..');
    if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
      vars.telebitRwDirs.push(vars.npmConfigPrefix);
    }
Author	SHA1	Message	Date
AJ ONeal	311e82b9b6	complete merge	2018-10-15 22:04:32 -06:00
AJ ONeal	79d01e2c31	show port on status	2018-10-15 21:48:28 -06:00
AJ ONeal	0bdaacb8aa	allow port in remote client	2018-10-15 21:30:29 -06:00
AJ ONeal	26939a62cf	add route function	2018-10-15 21:06:59 -06:00
AJ ONeal	a6e4bda317	move control handler to own function	2018-10-15 21:02:57 -06:00
AJ ONeal	e0ea17a377	merge master	2018-10-15 20:48:00 -06:00
AJ ONeal	be7a895dc7	WIP web remote client	2018-10-15 20:37:07 -06:00
AJ ONeal	8ffc30797a	doc 'status' to take no arguments	2018-10-15 18:46:40 -06:00
AJ ONeal	909b479265	v0.20.8: fix npmPrefixPath	2018-10-09 16:30:10 -06:00
AJ ONeal	8589a66fca	bugfix: always launchctl unload, not just on DEBUG	2018-10-07 23:05:32 -06:00
AJ ONeal	461166d3e3	single npm install process at a time	2018-10-07 22:50:11 -06:00