Compare commits
No commits in common. "stable" and "v0.19.23" have entirely different histories.
22
README.md
22
README.md
@ -1,14 +1,12 @@
|
|||||||
# Telebit™ Remote | a [Root](https://rootprojects.org) project
|
# Telebit™ Remote
|
||||||
|
|
||||||
Because friends don't let friends localhost™
|
Because friends don't let friends localhost™
|
||||||
|
|
||||||
|
| Sponsored by [ppl](https://ppl.family)
|
||||||
| **Telebit Remote**
|
| **Telebit Remote**
|
||||||
| [Telebit Relay](https://git.coolaj86.com/coolaj86/telebit-relay.js)
|
| [Telebit Relay](https://git.coolaj86.com/coolaj86/telebit-relay.js)
|
||||||
| [sclient](https://telebit.cloud/sclient)
|
|
||||||
|
|
|
|
||||||
|
|
||||||
<img align="center" src="https://git.coolaj86.com/coolaj86/telebit.js/raw/branch/master/usr/share/docs/terminal-example-1.png">
|
|
||||||
|
|
||||||
Break out of localhost.
|
Break out of localhost.
|
||||||
=======
|
=======
|
||||||
|
|
||||||
@ -35,7 +33,7 @@ Examples
|
|||||||
|
|
||||||
You do this:
|
You do this:
|
||||||
|
|
||||||
curl -fsSL https://get.telebit.io | bash
|
curl -fsSL https://get.telebit.cloud | bash
|
||||||
|
|
||||||
You get this:
|
You get this:
|
||||||
|
|
||||||
@ -69,19 +67,19 @@ Mac & Linux
|
|||||||
Open Terminal and run this install script:
|
Open Terminal and run this install script:
|
||||||
|
|
||||||
```
|
```
|
||||||
curl -fsSL https://get.telebit.io | bash
|
curl -fsSL https://get.telebit.cloud | bash
|
||||||
```
|
```
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
```
|
```
|
||||||
bash <( curl -fsSL https://get.telebit.io )
|
bash <( curl -fsSL https://get.telebit.cloud )
|
||||||
```
|
```
|
||||||
|
|
||||||
<small>
|
<small>
|
||||||
Note: **fish**, **zsh**, and other **non-bash** users should do this
|
Note: **fish**, **zsh**, and other **non-bash** users should do this
|
||||||
|
|
||||||
```
|
```
|
||||||
curl -fsSL https://get.telebit.io/ > get.sh; bash get.sh
|
curl -fsSL https://get.telebit.cloud/ > get.sh; bash get.sh
|
||||||
```
|
```
|
||||||
</small>
|
</small>
|
||||||
-->
|
-->
|
||||||
@ -97,7 +95,7 @@ What does the installer do?
|
|||||||
* `~/.config/telebit/telebit.yml`
|
* `~/.config/telebit/telebit.yml`
|
||||||
* `~/.local/share/telebit`
|
* `~/.local/share/telebit`
|
||||||
|
|
||||||
Of course, feel free to inspect it before you run it: `curl -fsSL https://get.telebit.io`
|
Of course, feel free to inspect it before you run it: `curl -fsSL https://get.telebit.cloud`
|
||||||
|
|
||||||
**You can customize the installation**:
|
**You can customize the installation**:
|
||||||
|
|
||||||
@ -108,7 +106,7 @@ export TELEBIT_USERSPACE=no # install as a system service (launchd
|
|||||||
export TELEBIT_PATH=/opt/telebit
|
export TELEBIT_PATH=/opt/telebit
|
||||||
export TELEBIT_USER=telebit
|
export TELEBIT_USER=telebit
|
||||||
export TELEBIT_GROUP=telebit
|
export TELEBIT_GROUP=telebit
|
||||||
curl -fsSL https://get.telebit.io/ | bash
|
curl -fsSL https://get.telebit.cloud/ | bash
|
||||||
```
|
```
|
||||||
|
|
||||||
That will change the bundled version of node.js is bundled with Telebit Relay
|
That will change the bundled version of node.js is bundled with Telebit Relay
|
||||||
@ -120,8 +118,8 @@ Windows & Node.js
|
|||||||
1. Install [node.js](https://nodejs.org)
|
1. Install [node.js](https://nodejs.org)
|
||||||
2. Open _Node.js_
|
2. Open _Node.js_
|
||||||
2. Run the command `npm install -g telebit`
|
2. Run the command `npm install -g telebit`
|
||||||
2. Copy the example daemon config to your user folder `.config/telebit/telebitd.yml` (such as `/Users/John/.config/telebit/telebitd.yml`)
|
2. Copy the example daemon conifg to your user folder `.config/telebit/telebitd.yml` (such as `/Users/John/.config/telebit/telebitd.yml`)
|
||||||
2. Copy the example remote config to your user folder `.config/telebit/telebit.yml` (such as `/Users/John/.config/telebit/telebit.yml`)
|
2. Copy the example remote conifg to your user folder `.config/telebit/telebit.yml` (such as `/Users/John/.config/telebit/telebit.yml`)
|
||||||
2. Change the email address
|
2. Change the email address
|
||||||
2. Run `npx telebit init` and follow the instructions
|
2. Run `npx telebit init` and follow the instructions
|
||||||
2. Run `npx telebit list`
|
2. Run `npx telebit list`
|
||||||
|
|||||||
@ -1,812 +0,0 @@
|
|||||||
#!/usr/bin/env node
|
|
||||||
(function () {
|
|
||||||
'use strict';
|
|
||||||
|
|
||||||
var pkg = require('../package.json');
|
|
||||||
var os = require('os');
|
|
||||||
|
|
||||||
//var url = require('url');
|
|
||||||
var fs = require('fs');
|
|
||||||
var path = require('path');
|
|
||||||
var http = require('http');
|
|
||||||
//var https = require('https');
|
|
||||||
var YAML = require('js-yaml');
|
|
||||||
var TOML = require('toml');
|
|
||||||
var TPLS = TOML.parse(fs.readFileSync(path.join(__dirname, "../lib/en-us.toml"), 'utf8'));
|
|
||||||
/*
|
|
||||||
if ('function' !== typeof TOML.stringify) {
|
|
||||||
TOML.stringify = require('json2toml');
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
var recase = require('recase').create({});
|
|
||||||
var camelCopy = recase.camelCopy.bind(recase);
|
|
||||||
//var snakeCopy = recase.snakeCopy.bind(recase);
|
|
||||||
|
|
||||||
var urequest = require('@coolaj86/urequest');
|
|
||||||
var common = require('../lib/cli-common.js');
|
|
||||||
|
|
||||||
var argv = process.argv.slice(2);
|
|
||||||
|
|
||||||
var argIndex = argv.indexOf('--config');
|
|
||||||
if (-1 === argIndex) {
|
|
||||||
argIndex = argv.indexOf('-c');
|
|
||||||
}
|
|
||||||
var confpath;
|
|
||||||
var useTty;
|
|
||||||
var state = {};
|
|
||||||
if (-1 === argIndex) {
|
|
||||||
argIndex = argv.indexOf('-c');
|
|
||||||
}
|
|
||||||
if (-1 !== argIndex) {
|
|
||||||
confpath = argv.splice(argIndex, 2)[1];
|
|
||||||
}
|
|
||||||
argIndex = argv.indexOf('--tty');
|
|
||||||
if (-1 !== argIndex) {
|
|
||||||
useTty = argv.splice(argIndex, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
function help() {
|
|
||||||
var keys = Object.keys(TPLS.help).filter(function (key) {
|
|
||||||
return 'remote' !== key;
|
|
||||||
});
|
|
||||||
var key = keys.filter(function (key) {
|
|
||||||
return -1 !== process.argv.indexOf(key);
|
|
||||||
})[0] || 'remote';
|
|
||||||
console.info(TPLS.help[key].replace(/{version}/g, pkg.version));
|
|
||||||
}
|
|
||||||
|
|
||||||
var verstr = [ pkg.name + ' remote v' + pkg.version ];
|
|
||||||
if (!confpath) {
|
|
||||||
confpath = path.join(os.homedir(), '.config/telebit/telebit.yml');
|
|
||||||
verstr.push('(--config \'' + confpath.replace(new RegExp('^' + os.homedir()), '~') + '\')');
|
|
||||||
}
|
|
||||||
|
|
||||||
if ([ '-h', '--help', 'help' ].some(function (arg) {
|
|
||||||
return -1 !== argv.indexOf(arg);
|
|
||||||
})) {
|
|
||||||
help();
|
|
||||||
process.exit(0);
|
|
||||||
}
|
|
||||||
if (!confpath || /^--/.test(confpath)) {
|
|
||||||
help();
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
function askForConfig(state, mainCb) {
|
|
||||||
var fs = require('fs');
|
|
||||||
var ttyname = '/dev/tty';
|
|
||||||
var stdin = useTty ? fs.createReadStream(ttyname, {
|
|
||||||
fd: fs.openSync(ttyname, fs.constants.O_RDONLY | fs.constants.O_NOCTTY)
|
|
||||||
}) : process.stdin;
|
|
||||||
var readline = require('readline');
|
|
||||||
var rl = readline.createInterface({
|
|
||||||
input: stdin
|
|
||||||
, output: process.stdout
|
|
||||||
// https://github.com/nodejs/node/issues/21771
|
|
||||||
// https://github.com/nodejs/node/issues/21319
|
|
||||||
, terminal: !/^win/i.test(os.platform()) && !useTty
|
|
||||||
});
|
|
||||||
state._useTty = useTty;
|
|
||||||
|
|
||||||
// NOTE: Use of setTimeout
|
|
||||||
// We're using setTimeout just to make the user experience a little
|
|
||||||
// nicer, as if we're doing something inbetween steps, so that it
|
|
||||||
// is a smooth rather than jerky experience.
|
|
||||||
// >= 300ms is long enough to become distracted and change focus (a full blink, time for an idea to form as a thought)
|
|
||||||
// <= 100ms is shorter than normal human reaction time (ability to place events chronologically, which happened first)
|
|
||||||
// ~ 150-250ms is the sweet spot for most humans (long enough to notice change and not be jarred, but stay on task)
|
|
||||||
var firstSet = [
|
|
||||||
function askEmail(cb) {
|
|
||||||
if (state.config.email) { cb(); return; }
|
|
||||||
console.info(TPLS.remote.setup.email);
|
|
||||||
// TODO attempt to read email from npmrc or the like?
|
|
||||||
rl.question('email: ', function (email) {
|
|
||||||
email = /@/.test(email) && email.trim();
|
|
||||||
if (!email) { askEmail(cb); return; }
|
|
||||||
state.config.email = email.trim();
|
|
||||||
state.config.agreeTos = true;
|
|
||||||
console.info("");
|
|
||||||
setTimeout(cb, 250);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
, function askRelay(cb) {
|
|
||||||
function checkRelay(relay) {
|
|
||||||
// TODO parse and check https://{{relay}}/.well-known/telebit.cloud/directives.json
|
|
||||||
if (!relay) { relay = 'telebit.cloud'; }
|
|
||||||
relay = relay.trim();
|
|
||||||
var urlstr = common.parseUrl(relay) + common.apiDirectory;
|
|
||||||
urequest({ url: urlstr, json: true }, function (err, resp, body) {
|
|
||||||
if (err) {
|
|
||||||
console.error("[Network Error] Failed to retrieve '" + urlstr + "'");
|
|
||||||
console.error(err);
|
|
||||||
askRelay(cb);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (200 !== resp.statusCode || (Buffer.isBuffer(body) || 'object' !== typeof body) || !body.api_host) {
|
|
||||||
console.warn("===================");
|
|
||||||
console.warn(" WARNING ");
|
|
||||||
console.warn("===================");
|
|
||||||
console.warn("");
|
|
||||||
console.warn("[" + resp.statusCode + "] '" + urlstr + "'");
|
|
||||||
console.warn("This server does not describe a current telebit version (but it may still work).");
|
|
||||||
console.warn("");
|
|
||||||
console.warn(body);
|
|
||||||
} else if (body && body.pair_request) {
|
|
||||||
state._can_pair = true;
|
|
||||||
}
|
|
||||||
state.config.relay = relay;
|
|
||||||
cb();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (state.config.relay) { checkRelay(state.config.relay); return; }
|
|
||||||
console.info("");
|
|
||||||
console.info("");
|
|
||||||
console.info("What relay will you be using? (press enter for default)");
|
|
||||||
console.info("");
|
|
||||||
rl.question('relay [default: telebit.cloud]: ', checkRelay);
|
|
||||||
}
|
|
||||||
, function checkRelay(cb) {
|
|
||||||
nextSet = [];
|
|
||||||
if ('telebit.cloud' !== state.config.relay) {
|
|
||||||
nextSet = nextSet.concat(standardSet);
|
|
||||||
}
|
|
||||||
if (!state._can_pair) {
|
|
||||||
nextSet = nextSet.concat(fossSet);
|
|
||||||
}
|
|
||||||
cb();
|
|
||||||
}
|
|
||||||
];
|
|
||||||
var standardSet = [
|
|
||||||
// There are questions that we need to aks in the CLI
|
|
||||||
// if we can't guarantee that they are being asked in the web interface
|
|
||||||
function askAgree(cb) {
|
|
||||||
if (state.config.agreeTos) { cb(); return; }
|
|
||||||
console.info("");
|
|
||||||
console.info("");
|
|
||||||
console.info("Do you accept the terms of service for each and all of the following?");
|
|
||||||
console.info("");
|
|
||||||
console.info("\tTelebit - End-to-End Encrypted Relay");
|
|
||||||
console.info("\tGreenlock - Automated HTTPS");
|
|
||||||
console.info("\tLet's Encrypt - TLS Certificates");
|
|
||||||
console.info("");
|
|
||||||
console.info("Type 'y' or 'yes' to accept these Terms of Service.");
|
|
||||||
console.info("");
|
|
||||||
rl.question('agree to all? [y/N]: ', function (resp) {
|
|
||||||
resp = resp.trim();
|
|
||||||
if (!/^y(es)?$/i.test(resp) && 'true' !== resp) {
|
|
||||||
throw new Error("You didn't accept the Terms of Service... not sure what to do...");
|
|
||||||
}
|
|
||||||
state.config.agreeTos = true;
|
|
||||||
console.info("");
|
|
||||||
setTimeout(cb, 250);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
, function askUpdates(cb) {
|
|
||||||
// required means transactional, security alerts, mandatory updates
|
|
||||||
var options = [ 'newsletter', 'important', 'required' ];
|
|
||||||
if (-1 !== options.indexOf(state._updates)) { cb(); return; }
|
|
||||||
console.info("");
|
|
||||||
console.info("");
|
|
||||||
console.info("What updates would you like to receive? (" + options.join(',') + ")");
|
|
||||||
console.info("");
|
|
||||||
rl.question('messages (default: important): ', function (updates) {
|
|
||||||
state._updates = (updates || '').trim().toLowerCase();
|
|
||||||
if (!state._updates) { state._updates = 'important'; }
|
|
||||||
if (-1 === options.indexOf(state._updates)) { askUpdates(cb); return; }
|
|
||||||
|
|
||||||
if ('newsletter' === state._updates) {
|
|
||||||
state.config.newsletter = true;
|
|
||||||
state.config.communityMember = true;
|
|
||||||
} else if ('important' === state._updates) {
|
|
||||||
state.config.communityMember = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
setTimeout(cb, 250);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
, function askTelemetry(cb) {
|
|
||||||
if (state.config.telemetry) { cb(); return; }
|
|
||||||
console.info("");
|
|
||||||
console.info("");
|
|
||||||
console.info("Contribute project telemetry data? (press enter for default [yes])");
|
|
||||||
console.info("");
|
|
||||||
rl.question('telemetry [Y/n]: ', function (telemetry) {
|
|
||||||
if (!telemetry || /^y(es)?$/i.test(telemetry)) {
|
|
||||||
state.config.telemetry = true;
|
|
||||||
}
|
|
||||||
setTimeout(cb, 250);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
];
|
|
||||||
var fossSet = [
|
|
||||||
function askTokenOrSecret(cb) {
|
|
||||||
if (state._can_pair || state.token || state.config.token
|
|
||||||
|| state.secret || state.config.secret) { cb(); return; }
|
|
||||||
console.info("");
|
|
||||||
console.info("");
|
|
||||||
console.info("What's your authorization for '" + state.config.relay + "'?");
|
|
||||||
console.info("");
|
|
||||||
// TODO check .well-known to learn supported token types
|
|
||||||
console.info("Currently supported:");
|
|
||||||
console.info("");
|
|
||||||
console.info("\tToken (JWT format)");
|
|
||||||
console.info("\tShared Secret (HMAC hex)");
|
|
||||||
//console.info("\tPrivate key (hex)");
|
|
||||||
console.info("");
|
|
||||||
rl.question('auth: ', function (resp) {
|
|
||||||
var jwt = require('jsonwebtoken');
|
|
||||||
resp = (resp || '').trim();
|
|
||||||
try {
|
|
||||||
jwt.decode(resp);
|
|
||||||
state.config.token = resp;
|
|
||||||
} catch(e) {
|
|
||||||
// is not jwt
|
|
||||||
}
|
|
||||||
if (!state.config.token) {
|
|
||||||
resp = resp.toLowerCase();
|
|
||||||
if (resp === Buffer.from(resp, 'hex').toString('hex')) {
|
|
||||||
state.config.secret = resp;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!state.config.token && !state.config.secret) {
|
|
||||||
askTokenOrSecret(cb);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
setTimeout(cb, 250);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
, function askServernames(cb) {
|
|
||||||
if (!state.config.secret || state.config._servernames) { cb(); return; }
|
|
||||||
console.info("");
|
|
||||||
console.info("");
|
|
||||||
console.info("What servername(s) will you be relaying here?");
|
|
||||||
console.info("(use a comma-separated list such as example.com,example.net)");
|
|
||||||
console.info("");
|
|
||||||
rl.question('domain(s): ', function (resp) {
|
|
||||||
resp = (resp || '').trim().split(/,/g);
|
|
||||||
if (!resp.length) { askServernames(); return; }
|
|
||||||
// TODO validate the domains
|
|
||||||
state.config._servernames = resp;
|
|
||||||
setTimeout(cb, 250);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
, function askPorts(cb) {
|
|
||||||
if (!state.config.secret || state.config._ports) { cb(); return; }
|
|
||||||
console.info("");
|
|
||||||
console.info("");
|
|
||||||
console.info("What tcp port(s) will you be relaying here?");
|
|
||||||
console.info("(use a comma-separated list such as 2222,5050)");
|
|
||||||
console.info("");
|
|
||||||
rl.question('port(s) [default:none]: ', function (resp) {
|
|
||||||
resp = (resp || '').trim().split(/,/g);
|
|
||||||
if (!resp.length) { askPorts(); return; }
|
|
||||||
// TODO validate the domains
|
|
||||||
state.config._ports = resp;
|
|
||||||
setTimeout(cb, 250);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
];
|
|
||||||
var nextSet = firstSet;
|
|
||||||
|
|
||||||
function next() {
|
|
||||||
var q = nextSet.shift();
|
|
||||||
if (!q) {
|
|
||||||
// https://github.com/nodejs/node/issues/21319
|
|
||||||
if (useTty) { try { stdin.push(null); } catch(e) { /*ignore*/ } }
|
|
||||||
rl.close();
|
|
||||||
if (useTty) { try { stdin.close(); } catch(e) { /*ignore*/ } }
|
|
||||||
mainCb(null, state);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
q(next);
|
|
||||||
}
|
|
||||||
|
|
||||||
next();
|
|
||||||
}
|
|
||||||
|
|
||||||
var utils = {
|
|
||||||
request: function request(opts, fn) {
|
|
||||||
if (!opts) { opts = {}; }
|
|
||||||
var service = opts.service || 'config';
|
|
||||||
var req = http.request({
|
|
||||||
socketPath: state._ipc.path
|
|
||||||
, method: opts.method || 'GET'
|
|
||||||
, path: '/rpc/' + service
|
|
||||||
}, function (resp) {
|
|
||||||
var body = '';
|
|
||||||
|
|
||||||
function finish() {
|
|
||||||
if (200 !== resp.statusCode) {
|
|
||||||
console.warn(resp.statusCode);
|
|
||||||
console.warn(body || ('get' + service + ' failed'));
|
|
||||||
//cb(new Error("not okay"), body);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!body) { fn(null, null); return; }
|
|
||||||
|
|
||||||
try {
|
|
||||||
body = JSON.parse(body);
|
|
||||||
} catch(e) {
|
|
||||||
// ignore
|
|
||||||
}
|
|
||||||
|
|
||||||
fn(null, body);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (resp.headers['content-length']) {
|
|
||||||
resp.on('data', function (chunk) {
|
|
||||||
body += chunk.toString();
|
|
||||||
});
|
|
||||||
resp.on('end', function () {
|
|
||||||
finish();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
finish();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
req.on('error', function (err) {
|
|
||||||
// ENOENT - never started, cleanly exited last start, or creating socket at a different path
|
|
||||||
// ECONNREFUSED - leftover socket just needs to be restarted
|
|
||||||
if ('ENOENT' === err.code || 'ECONNREFUSED' === err.code) {
|
|
||||||
if (opts._taketwo) {
|
|
||||||
console.error("Either the telebit service was not already (and could not be started) or its socket could not be written to.");
|
|
||||||
console.error(err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
require('../usr/share/install-launcher.js').install({ env: process.env }, function (err) {
|
|
||||||
if (err) { fn(err); return; }
|
|
||||||
opts._taketwo = true;
|
|
||||||
setTimeout(function () {
|
|
||||||
utils.request(opts, fn);
|
|
||||||
}, 2500);
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if ('ENOTSOCK' === err.code) {
|
|
||||||
console.error(err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
console.error(err);
|
|
||||||
return;
|
|
||||||
});
|
|
||||||
req.end();
|
|
||||||
}
|
|
||||||
, putConfig: function putConfig(service, args, fn) {
|
|
||||||
var req = http.request({
|
|
||||||
socketPath: state._ipc.path
|
|
||||||
, method: 'POST'
|
|
||||||
, path: '/rpc/' + service + '?_body=' + encodeURIComponent(JSON.stringify(args))
|
|
||||||
}, function (resp) {
|
|
||||||
|
|
||||||
function finish() {
|
|
||||||
if ('function' === typeof fn) {
|
|
||||||
fn(null, resp);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
console.info("");
|
|
||||||
if (200 !== resp.statusCode) {
|
|
||||||
console.warn("'" + service + "' may have failed."
|
|
||||||
+ " Consider peaking at the logs either with 'journalctl -xeu telebit' or /opt/telebit/var/log/error.log");
|
|
||||||
console.warn(resp.statusCode, body);
|
|
||||||
//cb(new Error("not okay"), body);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!body) {
|
|
||||||
console.info("👌");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
body = JSON.parse(body);
|
|
||||||
} catch(e) {
|
|
||||||
// ignore
|
|
||||||
}
|
|
||||||
|
|
||||||
if ("AWAIT_AUTH" === body.code) {
|
|
||||||
console.info(body.message);
|
|
||||||
} else if ("CONFIG" === body.code) {
|
|
||||||
delete body.code;
|
|
||||||
//console.info(TOML.stringify(body));
|
|
||||||
console.info(YAML.safeDump(body));
|
|
||||||
} else {
|
|
||||||
if ('http' === body.module) {
|
|
||||||
// TODO we'll support slingshot-ing in the future
|
|
||||||
if (String(body.local) === String(parseInt(body.local, 10))) {
|
|
||||||
console.info('> Forwarding https://' + body.remote + ' => localhost:' + body.local);
|
|
||||||
} else {
|
|
||||||
console.info('> Serving ' + body.local + ' as https://' + body.remote);
|
|
||||||
}
|
|
||||||
} else if ('tcp' === body.module) {
|
|
||||||
console.info('> Forwarding ' + state.config.relay + ':' + body.remote + ' => localhost:' + body.local);
|
|
||||||
} else if ('ssh' === body.module) {
|
|
||||||
//console.info('> Forwarding ' + state.config.relay + ' -p ' + JSON.stringify(body) + ' => localhost:' + body.local);
|
|
||||||
console.info('> Forwarding ssh+https (openssl proxy) => localhost:' + body.local);
|
|
||||||
} else {
|
|
||||||
console.info(JSON.stringify(body, null, 2));
|
|
||||||
}
|
|
||||||
console.info();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var body = '';
|
|
||||||
if (resp.headers['content-length']) {
|
|
||||||
resp.on('data', function (chunk) {
|
|
||||||
body += chunk.toString();
|
|
||||||
});
|
|
||||||
resp.on('end', function () {
|
|
||||||
finish();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
finish();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
req.on('error', function (err) {
|
|
||||||
console.error('Put Config Error:');
|
|
||||||
console.error(err);
|
|
||||||
return;
|
|
||||||
});
|
|
||||||
req.end();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Two styles:
|
|
||||||
// http 3000
|
|
||||||
// http modulename
|
|
||||||
function makeRpc(key) {
|
|
||||||
if (key !== argv[0]) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
utils.putConfig(argv[0], argv.slice(1));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
function packConfig(config) {
|
|
||||||
return Object.keys(config).map(function (key) {
|
|
||||||
var val = config[key];
|
|
||||||
if ('undefined' === val) {
|
|
||||||
throw new Error("'undefined' used as a string value");
|
|
||||||
}
|
|
||||||
if ('undefined' === typeof val) {
|
|
||||||
//console.warn('[DEBUG]', key, 'is present but undefined');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (val && 'object' === typeof val && !Array.isArray(val)) {
|
|
||||||
val = JSON.stringify(val);
|
|
||||||
}
|
|
||||||
return key + ':' + val; // converts arrays to strings with ,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function getToken(err, state) {
|
|
||||||
if (err) {
|
|
||||||
console.error("Error while initializing config [init]:");
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
state.relay = state.config.relay;
|
|
||||||
|
|
||||||
// { _otp, config: {} }
|
|
||||||
common.api.token(state, {
|
|
||||||
error: function (err/*, next*/) {
|
|
||||||
console.error("[Error] common.api.token:");
|
|
||||||
console.error(err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
, directory: function (dir, next) {
|
|
||||||
//console.log('[directory] Telebit Relay Discovered:');
|
|
||||||
//console.log(dir);
|
|
||||||
state._apiDirectory = dir;
|
|
||||||
next();
|
|
||||||
}
|
|
||||||
, tunnelUrl: function (tunnelUrl, next) {
|
|
||||||
//console.log('[tunnelUrl] Telebit Relay Tunnel Socket:', tunnelUrl);
|
|
||||||
state.wss = tunnelUrl;
|
|
||||||
next();
|
|
||||||
}
|
|
||||||
, requested: function (authReq, next) {
|
|
||||||
//console.log("[requested] Pairing Requested");
|
|
||||||
state.config._otp = state.config._otp = authReq.otp;
|
|
||||||
|
|
||||||
if (!state.config.token && state._can_pair) {
|
|
||||||
console.info("");
|
|
||||||
console.info("==============================================");
|
|
||||||
console.info(" Hey, Listen! ");
|
|
||||||
console.info("==============================================");
|
|
||||||
console.info(" ");
|
|
||||||
console.info(" GO CHECK YOUR EMAIL! ");
|
|
||||||
console.info(" ");
|
|
||||||
console.info(" DEVICE PAIR CODE: 0000 ".replace(/0000/g, state.config._otp));
|
|
||||||
console.info(" ");
|
|
||||||
console.info("==============================================");
|
|
||||||
console.info("");
|
|
||||||
}
|
|
||||||
|
|
||||||
next();
|
|
||||||
}
|
|
||||||
, connect: function (pretoken, next) {
|
|
||||||
//console.log("[connect] Enabling Pairing Locally...");
|
|
||||||
state.config.pretoken = pretoken;
|
|
||||||
state._connecting = true;
|
|
||||||
|
|
||||||
// TODO use php-style object querification
|
|
||||||
utils.putConfig('config', packConfig(state.config), function (err/*, body*/) {
|
|
||||||
if (err) {
|
|
||||||
state._error = err;
|
|
||||||
console.error("Error while initializing config [connect]:");
|
|
||||||
console.error(err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
console.info(TPLS.remote.waiting.replace(/{email}/, state.config.email));
|
|
||||||
next();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
, offer: function (token, next) {
|
|
||||||
//console.log("[offer] Pairing Enabled by Relay");
|
|
||||||
state.config.token = token;
|
|
||||||
if (state._error) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
state._connecting = true;
|
|
||||||
try {
|
|
||||||
require('jsonwebtoken').decode(token);
|
|
||||||
//console.log(require('jsonwebtoken').decode(token));
|
|
||||||
} catch(e) {
|
|
||||||
console.warn("[warning] could not decode token");
|
|
||||||
}
|
|
||||||
utils.putConfig('config', packConfig(state.config), function (err/*, body*/) {
|
|
||||||
if (err) {
|
|
||||||
state._error = err;
|
|
||||||
console.error("Error while initializing config [offer]:");
|
|
||||||
console.error(err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
//console.log("Pairing Enabled Locally");
|
|
||||||
next();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
, granted: function (_, next) {
|
|
||||||
//console.log("[grant] Pairing complete!");
|
|
||||||
next();
|
|
||||||
}
|
|
||||||
, end: function () {
|
|
||||||
utils.putConfig('enable', [], function (err) {
|
|
||||||
if (err) { console.error(err); return; }
|
|
||||||
console.info(TPLS.remote.success);
|
|
||||||
|
|
||||||
// workaround for https://github.com/nodejs/node/issues/21319
|
|
||||||
if (state._useTty) {
|
|
||||||
setTimeout(function () {
|
|
||||||
console.info(TPLS.remote.next_steps);
|
|
||||||
process.exit(0);
|
|
||||||
}, 0.5 * 1000);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// end workaround
|
|
||||||
|
|
||||||
parseCli(state);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseCli(/*state*/) {
|
|
||||||
var special = [
|
|
||||||
'false', 'none', 'off', 'disable'
|
|
||||||
, 'true', 'auto', 'on', 'enable'
|
|
||||||
];
|
|
||||||
if (-1 !== argv.indexOf('init')) {
|
|
||||||
utils.putConfig('list', []/*, function (err) {
|
|
||||||
}*/);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ([ 'ssh', 'http', 'tcp' ].some(function (key) {
|
|
||||||
if (key !== argv[0]) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (argv[1]) {
|
|
||||||
if (String(argv[1]) === String(parseInt(argv[1], 10))) {
|
|
||||||
// looks like a port
|
|
||||||
argv[1] = parseInt(argv[1], 10);
|
|
||||||
} else if (/\/|\\/.test(argv[1])) {
|
|
||||||
// looks like a path
|
|
||||||
argv[1] = path.resolve(argv[1]);
|
|
||||||
// TODO make a default assignment here
|
|
||||||
} else if (-1 === special.indexOf(argv[1])) {
|
|
||||||
console.error("Not sure what you meant by '" + argv[1] + "'.");
|
|
||||||
console.error("Remember: paths should begin with ." + path.sep + ", like '." + path.sep + argv[1] + "'");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
utils.putConfig(argv[0], argv.slice(1));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
})) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ([ 'status', 'enable', 'disable', 'restart', 'list', 'save' ].some(makeRpc)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
help();
|
|
||||||
process.exit(11);
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleConfig(err, config) {
|
|
||||||
//console.log('CONFIG');
|
|
||||||
//console.log(config);
|
|
||||||
state.config = config;
|
|
||||||
var verstrd = [ pkg.name + ' daemon v' + state.config.version ];
|
|
||||||
if (state.config.version && state.config.version !== pkg.version) {
|
|
||||||
console.info(verstr.join(' '), verstrd.join(' '));
|
|
||||||
} else {
|
|
||||||
console.info(verstr.join(' '));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (err) { console.error(err); process.exit(101); return; }
|
|
||||||
|
|
||||||
//
|
|
||||||
// check for init first, before anything else
|
|
||||||
// because it has arguments that may help in
|
|
||||||
// the next steps
|
|
||||||
//
|
|
||||||
if (-1 !== argv.indexOf('init')) {
|
|
||||||
parsers.init(argv, getToken);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!state.config.relay || !state.config.token) {
|
|
||||||
if (!state.config.relay) {
|
|
||||||
state.config.relay = 'telebit.cloud';
|
|
||||||
}
|
|
||||||
|
|
||||||
//console.log("question the user?", Date.now());
|
|
||||||
askForConfig(state, function (err, state) {
|
|
||||||
// no errors actually get passed, so this is just future-proofing
|
|
||||||
if (err) { throw err; }
|
|
||||||
|
|
||||||
if (!state.config.token && state._can_pair) {
|
|
||||||
state.config._otp = common.otp();
|
|
||||||
}
|
|
||||||
|
|
||||||
//console.log("done questioning:", Date.now());
|
|
||||||
if (!state.token && !state.config.token) {
|
|
||||||
getToken(err, state);
|
|
||||||
} else {
|
|
||||||
parseCli(state);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//console.log("no questioning:");
|
|
||||||
parseCli(state);
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseConfig(err, text) {
|
|
||||||
try {
|
|
||||||
state._clientConfig = JSON.parse(text || '{}');
|
|
||||||
} catch(e1) {
|
|
||||||
try {
|
|
||||||
state._clientConfig = YAML.safeLoad(text || '{}');
|
|
||||||
} catch(e2) {
|
|
||||||
try {
|
|
||||||
state._clientConfig = TOML.parse(text || '');
|
|
||||||
} catch(e3) {
|
|
||||||
console.error(e1.message);
|
|
||||||
console.error(e2.message);
|
|
||||||
process.exit(1);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
state._clientConfig = camelCopy(state._clientConfig || {}) || {};
|
|
||||||
common._init(
|
|
||||||
// make a default working dir and log dir
|
|
||||||
state._clientConfig.root || path.join(os.homedir(), '.local/share/telebit')
|
|
||||||
, (state._clientConfig.root && path.join(state._clientConfig.root, 'etc'))
|
|
||||||
|| path.resolve(common.DEFAULT_CONFIG_PATH, '..')
|
|
||||||
);
|
|
||||||
state._ipc = common.pipename(state._clientConfig, true);
|
|
||||||
|
|
||||||
if (!Object.keys(state._clientConfig).length) {
|
|
||||||
console.info('(' + state._ipc.comment + ": " + state._ipc.path + ')');
|
|
||||||
console.info("");
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((err && 'ENOENT' === err.code) || !Object.keys(state._clientConfig).length) {
|
|
||||||
if (!err || 'ENOENT' === err.code) {
|
|
||||||
//console.warn("Empty config file. Run 'telebit init' to configure.\n");
|
|
||||||
} else {
|
|
||||||
console.warn("Couldn't load config:\n\n\t" + err.message + "\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
utils.request({ service: 'config' }, handleConfig);
|
|
||||||
}
|
|
||||||
|
|
||||||
var parsers = {
|
|
||||||
init: function (argv, parseCb) {
|
|
||||||
var answers = {};
|
|
||||||
var boolish = [ '--advanced' ];
|
|
||||||
if ('init' !== argv[0]) {
|
|
||||||
throw new Error("init must be the first argument");
|
|
||||||
}
|
|
||||||
argv.shift();
|
|
||||||
|
|
||||||
// init --foo bar
|
|
||||||
argv.forEach(function (arg, i) {
|
|
||||||
if (!/^--/.test(arg)) { return; }
|
|
||||||
if (-1 !== boolish.indexOf(arg)) {
|
|
||||||
answers['_' + arg.replace(/^--/, '')] = true;
|
|
||||||
}
|
|
||||||
if (/^-/.test(argv[i + 1])) {
|
|
||||||
throw new Error(argv[i + 1] + ' requires an argument');
|
|
||||||
}
|
|
||||||
answers[arg] = argv[i + 1];
|
|
||||||
});
|
|
||||||
|
|
||||||
// init foo:bar
|
|
||||||
argv.forEach(function (arg) {
|
|
||||||
if (/^--/.test(arg)) { return; }
|
|
||||||
var parts = arg.split(/:/g);
|
|
||||||
if (2 !== parts.length) {
|
|
||||||
throw new Error("bad option to init: '" + arg + "'");
|
|
||||||
}
|
|
||||||
if (answers[parts[0]]) {
|
|
||||||
throw new Error("duplicate key to init '" + parts[0] + "'");
|
|
||||||
}
|
|
||||||
answers[parts[0]] = parts[1];
|
|
||||||
});
|
|
||||||
|
|
||||||
if (answers.relay) {
|
|
||||||
console.info("using --relay " + answers.relay);
|
|
||||||
}
|
|
||||||
// things that aren't straight-forward copy-over
|
|
||||||
if (!answers.advanced && !answers.relay) {
|
|
||||||
answers.relay = 'telebit.cloud';
|
|
||||||
}
|
|
||||||
if (Array.isArray(common._NOTIFICATIONS[answers.update])) {
|
|
||||||
common._NOTIFICATIONS[answers.update].forEach(function (name) {
|
|
||||||
state.config[name] = true;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (answers.servernames) {
|
|
||||||
state.config._servernames = answers.servernames;
|
|
||||||
}
|
|
||||||
if (answers.ports) {
|
|
||||||
state.config._ports = answers.ports;
|
|
||||||
}
|
|
||||||
|
|
||||||
// things that are straight-forward copy-over
|
|
||||||
common.CONFIG_KEYS.forEach(function (key) {
|
|
||||||
if ('true' === answers[key]) { answers[key] = true; }
|
|
||||||
if ('false' === answers[key]) { answers[key] = false; }
|
|
||||||
if ('null' === answers[key]) { answers[key] = null; }
|
|
||||||
if ('undefined' === answers[key]) { delete answers[key]; }
|
|
||||||
if ('undefined' !== typeof answers[key]) {
|
|
||||||
state.config[key] = answers[key];
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
askForConfig(state, function (err, state) {
|
|
||||||
if (err) { parseCb(err); return; }
|
|
||||||
|
|
||||||
if (!state.config.token && state._can_pair) {
|
|
||||||
state.config._otp = common.otp();
|
|
||||||
}
|
|
||||||
|
|
||||||
argv.unshift('init');
|
|
||||||
parseCb(null, state);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
fs.readFile(confpath, 'utf8', parseConfig);
|
|
||||||
|
|
||||||
}());
|
|
||||||
847
bin/telebit.js
847
bin/telebit.js
@ -2,35 +2,830 @@
|
|||||||
(function () {
|
(function () {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
//
|
var pkg = require('../package.json');
|
||||||
// node telebit daemon arg1 arg2
|
var os = require('os');
|
||||||
//
|
|
||||||
if ('daemon' === process.argv[2]) {
|
//var url = require('url');
|
||||||
require('./telebitd.js');
|
var path = require('path');
|
||||||
return;
|
var http = require('http');
|
||||||
|
//var https = require('https');
|
||||||
|
var YAML = require('js-yaml');
|
||||||
|
var recase = require('recase').create({});
|
||||||
|
var camelCopy = recase.camelCopy.bind(recase);
|
||||||
|
//var snakeCopy = recase.snakeCopy.bind(recase);
|
||||||
|
|
||||||
|
var urequest = require('@coolaj86/urequest');
|
||||||
|
var common = require('../lib/cli-common.js');
|
||||||
|
|
||||||
|
var argv = process.argv.slice(2);
|
||||||
|
|
||||||
|
var argIndex = argv.indexOf('--config');
|
||||||
|
var confpath;
|
||||||
|
var useTty;
|
||||||
|
var state = {};
|
||||||
|
if (-1 === argIndex) {
|
||||||
|
argIndex = argv.indexOf('-c');
|
||||||
|
}
|
||||||
|
if (-1 !== argIndex) {
|
||||||
|
confpath = argv.splice(argIndex, 2)[1];
|
||||||
|
}
|
||||||
|
argIndex = argv.indexOf('--tty');
|
||||||
|
if (-1 !== argIndex) {
|
||||||
|
useTty = argv.splice(argIndex, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
function help() {
|
||||||
// sclient proxies
|
//console.info('');
|
||||||
//
|
//console.info('Telebit Remote v' + pkg.version);
|
||||||
if ('sclient' === process.argv[2]) {
|
console.info('');
|
||||||
process.argv.splice(1,1);
|
console.info('Usage:');
|
||||||
return;
|
console.info('');
|
||||||
}
|
console.info('\ttelebit [--config <path>] <module> <module-options>');
|
||||||
if ('rsync' === process.argv[2]) {
|
console.info('');
|
||||||
require('sclient/bin/sclient.js');
|
console.info('Examples:');
|
||||||
return;
|
console.info('');
|
||||||
}
|
//console.info('\ttelebit init # bootstrap the config files');
|
||||||
if ('ssh' === process.argv[2] && /[\w-]+\.[a-z]{2,}/i.test(process.argv[3])) {
|
//console.info('');
|
||||||
process.argv.splice(1,1,'sclient');
|
console.info('\ttelebit status # whether enabled or disabled');
|
||||||
process.argv.splice(2,1,'ssh');
|
console.info('\ttelebit enable # disallow incoming connections');
|
||||||
require('sclient/bin/sclient.js');
|
console.info('\ttelebit disable # allow incoming connections');
|
||||||
return;
|
console.info('');
|
||||||
|
console.info('\ttelebit list # list rules for servernames and ports');
|
||||||
|
console.info('');
|
||||||
|
console.info('\ttelebit http none # remove all https handlers');
|
||||||
|
console.info('\ttelebit http 3000 # forward all https traffic to port 3000');
|
||||||
|
console.info('\ttelebit http /module/path # load a node module to handle all https traffic');
|
||||||
|
console.info('');
|
||||||
|
console.info('\ttelebit http none example.com # remove https handler from example.com');
|
||||||
|
console.info('\ttelebit http 3001 example.com # forward https traffic for example.com to port 3001');
|
||||||
|
console.info('\ttelebit http /module/path example.com # forward https traffic for example.com to port 3001');
|
||||||
|
console.info('');
|
||||||
|
console.info('\ttelebit tcp none # remove all tcp handlers');
|
||||||
|
console.info('\ttelebit tcp 5050 # forward all tcp to port 5050');
|
||||||
|
console.info('\ttelebit tcp /module/path # handle all tcp with a node module');
|
||||||
|
console.info('');
|
||||||
|
console.info('\ttelebit tcp none 6565 # remove tcp handler from external port 6565');
|
||||||
|
console.info('\ttelebit tcp 5050 6565 # forward external port 6565 to local 5050');
|
||||||
|
console.info('\ttelebit tcp /module/path 6565 # handle external port 6565 with a node module');
|
||||||
|
console.info('');
|
||||||
|
console.info('Config:');
|
||||||
|
console.info('');
|
||||||
|
console.info('\tSee https://git.coolaj86.com/coolaj86/telebit.js');
|
||||||
|
console.info('');
|
||||||
|
console.info('');
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
var verstr = [ pkg.name + ' remote v' + pkg.version ];
|
||||||
// telebit remote
|
if (!confpath) {
|
||||||
//
|
confpath = path.join(os.homedir(), '.config/telebit/telebit.yml');
|
||||||
require('./telebit-remote.js');
|
verstr.push('(--config "' + confpath + '")');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (-1 !== argv.indexOf('-h') || -1 !== argv.indexOf('--help')) {
|
||||||
|
help();
|
||||||
|
process.exit(0);
|
||||||
|
}
|
||||||
|
if (!confpath || /^--/.test(confpath)) {
|
||||||
|
help();
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
function askForConfig(state, mainCb) {
|
||||||
|
var fs = require('fs');
|
||||||
|
var ttyname = '/dev/tty';
|
||||||
|
var stdin = useTty ? fs.createReadStream(ttyname, {
|
||||||
|
fd: fs.openSync(ttyname, fs.constants.O_RDONLY | fs.constants.O_NOCTTY)
|
||||||
|
}) : process.stdin;
|
||||||
|
var readline = require('readline');
|
||||||
|
var rl = readline.createInterface({
|
||||||
|
input: stdin
|
||||||
|
, output: process.stdout
|
||||||
|
// https://github.com/nodejs/node/issues/21319
|
||||||
|
, terminal: !useTty
|
||||||
|
});
|
||||||
|
state._useTty = useTty;
|
||||||
|
|
||||||
|
// NOTE: Use of setTimeout
|
||||||
|
// We're using setTimeout just to make the user experience a little
|
||||||
|
// nicer, as if we're doing something inbetween steps, so that it
|
||||||
|
// is a smooth rather than jerky experience.
|
||||||
|
// >= 300ms is long enough to become distracted and change focus (a full blink, time for an idea to form as a thought)
|
||||||
|
// <= 100ms is shorter than normal human reaction time (ability to place events chronologically, which happened first)
|
||||||
|
// ~ 150-250ms is the sweet spot for most humans (long enough to notice change and not be jarred, but stay on task)
|
||||||
|
var firstSet = [
|
||||||
|
function askEmail(cb) {
|
||||||
|
if (state.config.email) { cb(); return; }
|
||||||
|
//console.info("");
|
||||||
|
console.info("Welcome!");
|
||||||
|
console.info("");
|
||||||
|
console.info("By using Telebit you agree to:");
|
||||||
|
console.info("");
|
||||||
|
console.info(" [x] Accept the Telebit™ terms of service");
|
||||||
|
console.info(" [x] Accept the Let's Encrypt™ terms of service");
|
||||||
|
console.info("");
|
||||||
|
console.info("Enter your email to agree and login/create your account:");
|
||||||
|
console.info("");
|
||||||
|
// TODO attempt to read email from npmrc or the like?
|
||||||
|
rl.question('email: ', function (email) {
|
||||||
|
email = /@/.test(email) && email.trim();
|
||||||
|
if (!email) { askEmail(cb); return; }
|
||||||
|
state.config.email = email.trim();
|
||||||
|
state.config.agreeTos = true;
|
||||||
|
console.info("");
|
||||||
|
setTimeout(cb, 250);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
, function askRelay(cb) {
|
||||||
|
function checkRelay(relay) {
|
||||||
|
// TODO parse and check https://{{relay}}/.well-known/telebit.cloud/directives.json
|
||||||
|
if (!relay) { relay = 'telebit.cloud'; }
|
||||||
|
relay = relay.trim();
|
||||||
|
var urlstr = common.parseUrl(relay) + common.apiDirectory;
|
||||||
|
urequest({ url: urlstr, json: true }, function (err, resp, body) {
|
||||||
|
if (err) {
|
||||||
|
console.error("[Network Error] Failed to retrieve '" + urlstr + "'");
|
||||||
|
console.error(err);
|
||||||
|
askRelay(cb);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (200 !== resp.statusCode || (Buffer.isBuffer(body) || 'object' !== typeof body) || !body.api_host) {
|
||||||
|
console.warn("===================");
|
||||||
|
console.warn(" WARNING ");
|
||||||
|
console.warn("===================");
|
||||||
|
console.warn("");
|
||||||
|
console.warn("[" + resp.statusCode + "] '" + urlstr + "'");
|
||||||
|
console.warn("This server does not describe a current telebit version (but it may still work).");
|
||||||
|
console.warn("");
|
||||||
|
console.warn(body);
|
||||||
|
} else if (body && body.pair_request) {
|
||||||
|
state._can_pair = true;
|
||||||
|
}
|
||||||
|
state.config.relay = relay;
|
||||||
|
cb();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (state.config.relay) { checkRelay(); return; }
|
||||||
|
console.info("");
|
||||||
|
console.info("");
|
||||||
|
console.info("What relay will you be using? (press enter for default)");
|
||||||
|
console.info("");
|
||||||
|
rl.question('relay [default: telebit.cloud]: ', checkRelay);
|
||||||
|
}
|
||||||
|
, function checkRelay(cb) {
|
||||||
|
nextSet = [];
|
||||||
|
if ('telebit.cloud' !== state.config.relay) {
|
||||||
|
nextSet = nextSet.concat(standardSet);
|
||||||
|
}
|
||||||
|
if (!state._can_pair) {
|
||||||
|
nextSet = nextSet.concat(fossSet);
|
||||||
|
}
|
||||||
|
cb();
|
||||||
|
}
|
||||||
|
];
|
||||||
|
var standardSet = [
|
||||||
|
// There are questions that we need to aks in the CLI
|
||||||
|
// if we can't guarantee that they are being asked in the web interface
|
||||||
|
function askAgree(cb) {
|
||||||
|
if (state.config.agreeTos) { cb(); return; }
|
||||||
|
console.info("");
|
||||||
|
console.info("");
|
||||||
|
console.info("Do you accept the terms of service for each and all of the following?");
|
||||||
|
console.info("");
|
||||||
|
console.info("\tTelebit - End-to-End Encrypted Relay");
|
||||||
|
console.info("\tGreenlock - Automated HTTPS");
|
||||||
|
console.info("\tLet's Encrypt - TLS Certificates");
|
||||||
|
console.info("");
|
||||||
|
console.info("Type 'y' or 'yes' to accept these Terms of Service.");
|
||||||
|
console.info("");
|
||||||
|
rl.question('agree to all? [y/N]: ', function (resp) {
|
||||||
|
resp = resp.trim();
|
||||||
|
if (!/^y(es)?$/i.test(resp) && 'true' !== resp) {
|
||||||
|
throw new Error("You didn't accept the Terms of Service... not sure what to do...");
|
||||||
|
}
|
||||||
|
state.config.agreeTos = true;
|
||||||
|
console.info("");
|
||||||
|
setTimeout(cb, 250);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
, function askUpdates(cb) {
|
||||||
|
// required means transactional, security alerts, mandatory updates
|
||||||
|
var options = [ 'newsletter', 'important', 'required' ];
|
||||||
|
if (-1 !== options.indexOf(state._updates)) { cb(); return; }
|
||||||
|
console.info("");
|
||||||
|
console.info("");
|
||||||
|
console.info("What updates would you like to receive? (" + options.join(',') + ")");
|
||||||
|
console.info("");
|
||||||
|
rl.question('messages (default: important): ', function (updates) {
|
||||||
|
state._updates = (updates || '').trim().toLowerCase();
|
||||||
|
if (!state._updates) { state._updates = 'important'; }
|
||||||
|
if (-1 === options.indexOf(state._updates)) { askUpdates(cb); return; }
|
||||||
|
|
||||||
|
if ('newsletter' === state._updates) {
|
||||||
|
state.config.newsletter = true;
|
||||||
|
state.config.communityMember = true;
|
||||||
|
} else if ('important' === state._updates) {
|
||||||
|
state.config.communityMember = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
setTimeout(cb, 250);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
, function askTelemetry(cb) {
|
||||||
|
if (state.config.telemetry) { cb(); return; }
|
||||||
|
console.info("");
|
||||||
|
console.info("");
|
||||||
|
console.info("Contribute project telemetry data? (press enter for default [yes])");
|
||||||
|
console.info("");
|
||||||
|
rl.question('telemetry [Y/n]: ', function (telemetry) {
|
||||||
|
if (!telemetry || /^y(es)?$/i.test(telemetry)) {
|
||||||
|
state.config.telemetry = true;
|
||||||
|
}
|
||||||
|
setTimeout(cb, 250);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
];
|
||||||
|
var fossSet = [
|
||||||
|
function askTokenOrSecret(cb) {
|
||||||
|
if (state._can_pair || state.token || state.config.token
|
||||||
|
|| state.secret || state.config.secret) { cb(); return; }
|
||||||
|
console.info("");
|
||||||
|
console.info("");
|
||||||
|
console.info("What's your authorization for '" + state.config.relay + "'?");
|
||||||
|
console.info("");
|
||||||
|
// TODO check .well-known to learn supported token types
|
||||||
|
console.info("Currently supported:");
|
||||||
|
console.info("");
|
||||||
|
console.info("\tToken (JWT format)");
|
||||||
|
console.info("\tShared Secret (HMAC hex)");
|
||||||
|
//console.info("\tPrivate key (hex)");
|
||||||
|
console.info("");
|
||||||
|
rl.question('auth: ', function (resp) {
|
||||||
|
var jwt = require('jsonwebtoken');
|
||||||
|
resp = (resp || '').trim();
|
||||||
|
try {
|
||||||
|
jwt.decode(resp);
|
||||||
|
state.config.token = resp;
|
||||||
|
} catch(e) {
|
||||||
|
// is not jwt
|
||||||
|
}
|
||||||
|
if (!state.config.token) {
|
||||||
|
resp = resp.toLowerCase();
|
||||||
|
if (resp === Buffer.from(resp, 'hex').toString('hex')) {
|
||||||
|
state.config.secret = resp;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!state.config.token && !state.config.secret) {
|
||||||
|
askTokenOrSecret(cb);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setTimeout(cb, 250);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
, function askServernames(cb) {
|
||||||
|
if (!state.config.secret || state.config._servernames) { cb(); return; }
|
||||||
|
console.info("");
|
||||||
|
console.info("");
|
||||||
|
console.info("What servername(s) will you be relaying here?");
|
||||||
|
console.info("(use a comma-separated list such as example.com,example.net)");
|
||||||
|
console.info("");
|
||||||
|
rl.question('domain(s): ', function (resp) {
|
||||||
|
resp = (resp || '').trim().split(/,/g);
|
||||||
|
if (!resp.length) { askServernames(); return; }
|
||||||
|
// TODO validate the domains
|
||||||
|
state.config._servernames = resp;
|
||||||
|
setTimeout(cb, 250);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
, function askPorts(cb) {
|
||||||
|
if (!state.config.secret || state.config._ports) { cb(); return; }
|
||||||
|
console.info("");
|
||||||
|
console.info("");
|
||||||
|
console.info("What tcp port(s) will you be relaying here?");
|
||||||
|
console.info("(use a comma-separated list such as 2222,5050)");
|
||||||
|
console.info("");
|
||||||
|
rl.question('port(s) [default:none]: ', function (resp) {
|
||||||
|
resp = (resp || '').trim().split(/,/g);
|
||||||
|
if (!resp.length) { askPorts(); return; }
|
||||||
|
// TODO validate the domains
|
||||||
|
state.config._ports = resp;
|
||||||
|
setTimeout(cb, 250);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
];
|
||||||
|
var nextSet = firstSet;
|
||||||
|
|
||||||
|
function next() {
|
||||||
|
var q = nextSet.shift();
|
||||||
|
if (!q) {
|
||||||
|
// https://github.com/nodejs/node/issues/21319
|
||||||
|
if (useTty) { try { stdin.push(null); } catch(e) { /*ignore*/ } }
|
||||||
|
rl.close();
|
||||||
|
if (useTty) { try { stdin.close(); } catch(e) { /*ignore*/ } }
|
||||||
|
mainCb(null, state);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
q(next);
|
||||||
|
}
|
||||||
|
|
||||||
|
next();
|
||||||
|
}
|
||||||
|
|
||||||
|
var utils = {
|
||||||
|
request: function request(opts, fn) {
|
||||||
|
if (!opts) { opts = {}; }
|
||||||
|
var service = opts.service || 'config';
|
||||||
|
var req = http.request({
|
||||||
|
socketPath: state._ipc.path
|
||||||
|
, method: opts.method || 'GET'
|
||||||
|
, path: '/rpc/' + service
|
||||||
|
}, function (resp) {
|
||||||
|
var body = '';
|
||||||
|
|
||||||
|
function finish() {
|
||||||
|
if (200 !== resp.statusCode) {
|
||||||
|
console.warn(resp.statusCode);
|
||||||
|
console.warn(body || ('get' + service + ' failed'));
|
||||||
|
//cb(new Error("not okay"), body);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!body) { fn(null, null); return; }
|
||||||
|
|
||||||
|
try {
|
||||||
|
body = JSON.parse(body);
|
||||||
|
} catch(e) {
|
||||||
|
// ignore
|
||||||
|
}
|
||||||
|
|
||||||
|
fn(null, body);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (resp.headers['content-length']) {
|
||||||
|
resp.on('data', function (chunk) {
|
||||||
|
body += chunk.toString();
|
||||||
|
});
|
||||||
|
resp.on('end', function () {
|
||||||
|
finish();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
req.on('error', function (err) {
|
||||||
|
// ENOENT - never started, cleanly exited last start, or creating socket at a different path
|
||||||
|
// ECONNREFUSED - leftover socket just needs to be restarted
|
||||||
|
if ('ENOENT' === err.code || 'ECONNREFUSED' === err.code) {
|
||||||
|
if (opts._taketwo) {
|
||||||
|
console.error("Either the telebit service was not already (and could not be started) or its socket could not be written to.");
|
||||||
|
console.error(err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
require('../usr/share/install-launcher.js').install({ env: process.env }, function (err) {
|
||||||
|
if (err) { fn(err); return; }
|
||||||
|
opts._taketwo = true;
|
||||||
|
utils.request(opts, fn);
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if ('ENOTSOCK' === err.code) {
|
||||||
|
console.error(err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
console.error(err);
|
||||||
|
return;
|
||||||
|
});
|
||||||
|
req.end();
|
||||||
|
}
|
||||||
|
, putConfig: function putConfig(service, args, fn) {
|
||||||
|
var req = http.request({
|
||||||
|
socketPath: state._ipc.path
|
||||||
|
, method: 'POST'
|
||||||
|
, path: '/rpc/' + service + '?_body=' + JSON.stringify(args)
|
||||||
|
}, function (resp) {
|
||||||
|
|
||||||
|
function finish() {
|
||||||
|
if ('function' === typeof fn) {
|
||||||
|
fn(null, resp);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.info("");
|
||||||
|
if (200 !== resp.statusCode) {
|
||||||
|
console.warn("'" + service + "' may have failed."
|
||||||
|
+ " Consider peaking at the logs either with 'journalctl -xeu telebit' or /opt/telebit/var/log/error.log");
|
||||||
|
console.warn(resp.statusCode, body);
|
||||||
|
//cb(new Error("not okay"), body);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!body) {
|
||||||
|
console.info("👌");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
body = JSON.parse(body);
|
||||||
|
} catch(e) {
|
||||||
|
// ignore
|
||||||
|
}
|
||||||
|
|
||||||
|
if ("AWAIT_AUTH" === body.code) {
|
||||||
|
console.info(body.message);
|
||||||
|
} else if ("CONFIG" === body.code) {
|
||||||
|
delete body.code;
|
||||||
|
console.info(YAML.safeDump(body));
|
||||||
|
} else {
|
||||||
|
if ('http' === body.module) {
|
||||||
|
// TODO we'll support slingshot-ing in the future
|
||||||
|
if (String(body.local) === String(parseInt(body.local, 10))) {
|
||||||
|
console.info('> Forwarding https://' + body.remote + ' => localhost:' + body.local);
|
||||||
|
} else {
|
||||||
|
console.info('> Serving ' + body.local + ' as https://' + body.remote);
|
||||||
|
}
|
||||||
|
} else if ('tcp' === body.module) {
|
||||||
|
console.info('> Forwarding ' + state.config.relay + ':' + body.remote + ' => localhost:' + body.local);
|
||||||
|
} else if ('ssh' === body.module) {
|
||||||
|
console.info('> Forwarding ' + state.config.relay + ' -p ' + body.remote + ' => localhost:' + body.local);
|
||||||
|
console.info('> Forwarding ssh+https (openssl proxy) => localhost:' + body.local);
|
||||||
|
} else {
|
||||||
|
console.info(JSON.stringify(body, null, 2));
|
||||||
|
}
|
||||||
|
console.info();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var body = '';
|
||||||
|
if (resp.headers['content-length']) {
|
||||||
|
resp.on('data', function (chunk) {
|
||||||
|
body += chunk.toString();
|
||||||
|
});
|
||||||
|
resp.on('end', function () {
|
||||||
|
finish();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
req.on('error', function (err) {
|
||||||
|
console.error('Put Config Error:');
|
||||||
|
console.error(err);
|
||||||
|
return;
|
||||||
|
});
|
||||||
|
req.end();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Two styles:
|
||||||
|
// http 3000
|
||||||
|
// http modulename
|
||||||
|
function makeRpc(key) {
|
||||||
|
if (key !== argv[0]) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
utils.putConfig(argv[0], argv.slice(1));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function packConfig(config) {
|
||||||
|
return Object.keys(config).map(function (key) {
|
||||||
|
var val = config[key];
|
||||||
|
if ('undefined' === val) {
|
||||||
|
throw new Error("'undefined' used as a string value");
|
||||||
|
}
|
||||||
|
if ('undefined' === typeof val) {
|
||||||
|
//console.warn('[DEBUG]', key, 'is present but undefined');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (val && 'object' === typeof val && !Array.isArray(val)) {
|
||||||
|
val = JSON.stringify(val);
|
||||||
|
}
|
||||||
|
return key + ':' + val; // converts arrays to strings with ,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function getToken(err, state) {
|
||||||
|
if (err) {
|
||||||
|
console.error("Error while initializing config [init]:");
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
state.relay = state.config.relay;
|
||||||
|
|
||||||
|
// { _otp, config: {} }
|
||||||
|
common.api.token(state, {
|
||||||
|
error: function (err/*, next*/) {
|
||||||
|
console.error("[Error] common.api.token:");
|
||||||
|
console.error(err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
, directory: function (dir, next) {
|
||||||
|
//console.log('[directory] Telebit Relay Discovered:');
|
||||||
|
//console.log(dir);
|
||||||
|
state._apiDirectory = dir;
|
||||||
|
next();
|
||||||
|
}
|
||||||
|
, tunnelUrl: function (tunnelUrl, next) {
|
||||||
|
//console.log('[tunnelUrl] Telebit Relay Tunnel Socket:', tunnelUrl);
|
||||||
|
state.wss = tunnelUrl;
|
||||||
|
next();
|
||||||
|
}
|
||||||
|
, requested: function (authReq, next) {
|
||||||
|
//console.log("[requested] Pairing Requested");
|
||||||
|
state.config._otp = state.config._otp = authReq.otp;
|
||||||
|
|
||||||
|
if (!state.config.token && state._can_pair) {
|
||||||
|
console.info("");
|
||||||
|
console.info("==============================================");
|
||||||
|
console.info(" Hey, Listen! ");
|
||||||
|
console.info("==============================================");
|
||||||
|
console.info(" ");
|
||||||
|
console.info(" GO CHECK YOUR EMAIL! ");
|
||||||
|
console.info(" ");
|
||||||
|
console.info(" DEVICE PAIR CODE: 0000 ".replace(/0000/g, state.config._otp));
|
||||||
|
console.info(" ");
|
||||||
|
console.info("==============================================");
|
||||||
|
console.info("");
|
||||||
|
}
|
||||||
|
|
||||||
|
next();
|
||||||
|
}
|
||||||
|
, connect: function (pretoken, next) {
|
||||||
|
//console.log("[connect] Enabling Pairing Locally...");
|
||||||
|
state.config.pretoken = pretoken;
|
||||||
|
state._connecting = true;
|
||||||
|
|
||||||
|
// TODO use php-style object querification
|
||||||
|
utils.putConfig('config', packConfig(state.config), function (err/*, body*/) {
|
||||||
|
if (err) {
|
||||||
|
state._error = err;
|
||||||
|
console.error("Error while initializing config [connect]:");
|
||||||
|
console.error(err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
console.info("waiting...");
|
||||||
|
next();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
, offer: function (token, next) {
|
||||||
|
//console.log("[offer] Pairing Enabled by Relay");
|
||||||
|
state.config.token = token;
|
||||||
|
if (state._error) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
state._connecting = true;
|
||||||
|
try {
|
||||||
|
require('jsonwebtoken').decode(token);
|
||||||
|
//console.log(require('jsonwebtoken').decode(token));
|
||||||
|
} catch(e) {
|
||||||
|
console.warn("[warning] could not decode token");
|
||||||
|
}
|
||||||
|
utils.putConfig('config', packConfig(state.config), function (err/*, body*/) {
|
||||||
|
if (err) {
|
||||||
|
state._error = err;
|
||||||
|
console.error("Error while initializing config [offer]:");
|
||||||
|
console.error(err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
//console.log("Pairing Enabled Locally");
|
||||||
|
next();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
, granted: function (_, next) {
|
||||||
|
//console.log("[grant] Pairing complete!");
|
||||||
|
next();
|
||||||
|
}
|
||||||
|
, end: function () {
|
||||||
|
utils.putConfig('enable', [], function (err) {
|
||||||
|
if (err) { console.error(err); return; }
|
||||||
|
console.info("Success");
|
||||||
|
|
||||||
|
// workaround for https://github.com/nodejs/node/issues/21319
|
||||||
|
if (state._useTty) {
|
||||||
|
setTimeout(function () {
|
||||||
|
console.info("Some fun things to try first:\n");
|
||||||
|
console.info(" ~/telebit http 3000");
|
||||||
|
console.info(" ~/telebit tcp 5050");
|
||||||
|
console.info(" ~/telebit ssh auto");
|
||||||
|
console.info();
|
||||||
|
console.info("Press any key to continue...");
|
||||||
|
console.info();
|
||||||
|
process.exit(0);
|
||||||
|
}, 0.5 * 1000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// end workaround
|
||||||
|
|
||||||
|
parseCli(state);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseCli(/*state*/) {
|
||||||
|
var special = [
|
||||||
|
'false', 'none', 'off', 'disable'
|
||||||
|
, 'true', 'auto', 'on', 'enable'
|
||||||
|
];
|
||||||
|
if (-1 !== argv.indexOf('init')) {
|
||||||
|
utils.putConfig('list', []/*, function (err) {
|
||||||
|
}*/);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([ 'ssh', 'http', 'tcp' ].some(function (key) {
|
||||||
|
if (key !== argv[0]) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (argv[1]) {
|
||||||
|
if (String(argv[1]) === String(parseInt(argv[1], 10))) {
|
||||||
|
// looks like a port
|
||||||
|
argv[1] = parseInt(argv[1], 10);
|
||||||
|
} else if (/\/|\\/.test(argv[1])) {
|
||||||
|
// looks like a path
|
||||||
|
argv[1] = path.resolve(argv[1]);
|
||||||
|
} else if (-1 === special.indexOf(argv[1])) {
|
||||||
|
console.error("Not sure what you meant by '" + argv[1] + "'.");
|
||||||
|
console.error("Remember: paths should begin with ." + path.sep + ", like '." + path.sep + argv[1] + "'");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
utils.putConfig(argv[0], argv.slice(1));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
})) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ([ 'status', 'enable', 'disable', 'restart', 'list', 'save' ].some(makeRpc)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
help();
|
||||||
|
process.exit(11);
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleConfig(err, config) {
|
||||||
|
//console.log('CONFIG');
|
||||||
|
//console.log(config);
|
||||||
|
state.config = config;
|
||||||
|
|
||||||
|
if (err) { console.error(err); process.exit(101); return; }
|
||||||
|
|
||||||
|
//
|
||||||
|
// check for init first, before anything else
|
||||||
|
// because it has arguments that may help in
|
||||||
|
// the next steps
|
||||||
|
//
|
||||||
|
if (-1 !== argv.indexOf('init')) {
|
||||||
|
parsers.init(argv, getToken);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!state.config.relay || !state.config.token) {
|
||||||
|
if (!state.config.relay) {
|
||||||
|
state.config.relay = 'telebit.cloud';
|
||||||
|
}
|
||||||
|
|
||||||
|
//console.log("question the user?", Date.now());
|
||||||
|
askForConfig(state, function (err, state) {
|
||||||
|
// no errors actually get passed, so this is just future-proofing
|
||||||
|
if (err) { throw err; }
|
||||||
|
|
||||||
|
if (!state.config.token && state._can_pair) {
|
||||||
|
state.config._otp = common.otp();
|
||||||
|
}
|
||||||
|
|
||||||
|
//console.log("done questioning:", Date.now());
|
||||||
|
if (!state.token && !state.config.token) {
|
||||||
|
getToken(err, state);
|
||||||
|
} else {
|
||||||
|
parseCli(state);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//console.log("no questioning:");
|
||||||
|
parseCli(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseConfig(err, text) {
|
||||||
|
|
||||||
|
console.info("");
|
||||||
|
console.info(verstr.join(' '));
|
||||||
|
|
||||||
|
try {
|
||||||
|
state._clientConfig = JSON.parse(text || '{}');
|
||||||
|
} catch(e1) {
|
||||||
|
try {
|
||||||
|
state._clientConfig = YAML.safeLoad(text || '{}');
|
||||||
|
} catch(e2) {
|
||||||
|
console.error(e1.message);
|
||||||
|
console.error(e2.message);
|
||||||
|
process.exit(1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
state._clientConfig = camelCopy(state._clientConfig || {}) || {};
|
||||||
|
common._init(
|
||||||
|
// make a default working dir and log dir
|
||||||
|
state._clientConfig.root || path.join(os.homedir(), '.local/share/telebit')
|
||||||
|
, (state._clientConfig.root && path.join(state._clientConfig.root, 'etc'))
|
||||||
|
|| path.resolve(common.DEFAULT_CONFIG_PATH, '..')
|
||||||
|
);
|
||||||
|
state._ipc = common.pipename(state._clientConfig, true);
|
||||||
|
|
||||||
|
if (!Object.keys(state._clientConfig).length) {
|
||||||
|
console.info('(' + state._ipc.comment + ": " + state._ipc.path + ')');
|
||||||
|
console.info("");
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((err && 'ENOENT' === err.code) || !Object.keys(state._clientConfig).length) {
|
||||||
|
if (!err || 'ENOENT' === err.code) {
|
||||||
|
//console.warn("Empty config file. Run 'telebit init' to configure.\n");
|
||||||
|
} else {
|
||||||
|
console.warn("Couldn't load config:\n\n\t" + err.message + "\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
utils.request({ service: 'config' }, handleConfig);
|
||||||
|
}
|
||||||
|
|
||||||
|
var parsers = {
|
||||||
|
init: function (argv, parseCb) {
|
||||||
|
var answers = {};
|
||||||
|
var boolish = [ '--advanced' ];
|
||||||
|
if ('init' !== argv[0]) {
|
||||||
|
throw new Error("init must be the first argument");
|
||||||
|
}
|
||||||
|
argv.shift();
|
||||||
|
|
||||||
|
// init --foo bar
|
||||||
|
argv.forEach(function (arg, i) {
|
||||||
|
if (!/^--/.test(arg)) { return; }
|
||||||
|
if (-1 !== boolish.indexOf(arg)) {
|
||||||
|
answers['_' + arg.replace(/^--/, '')] = true;
|
||||||
|
}
|
||||||
|
if (/^-/.test(argv[i + 1])) {
|
||||||
|
throw new Error(argv[i + 1] + ' requires an argument');
|
||||||
|
}
|
||||||
|
answers[arg] = argv[i + 1];
|
||||||
|
});
|
||||||
|
|
||||||
|
// init foo:bar
|
||||||
|
argv.forEach(function (arg) {
|
||||||
|
if (/^--/.test(arg)) { return; }
|
||||||
|
var parts = arg.split(/:/g);
|
||||||
|
if (2 !== parts.length) {
|
||||||
|
throw new Error("bad option to init: '" + arg + "'");
|
||||||
|
}
|
||||||
|
if (answers[parts[0]]) {
|
||||||
|
throw new Error("duplicate key to init '" + parts[0] + "'");
|
||||||
|
}
|
||||||
|
answers[parts[0]] = parts[1];
|
||||||
|
});
|
||||||
|
|
||||||
|
// things that aren't straight-forward copy-over
|
||||||
|
if (!answers.advanced && !answers.relay) {
|
||||||
|
answers.relay = 'telebit.cloud';
|
||||||
|
}
|
||||||
|
if (Array.isArray(common._NOTIFICATIONS[answers.update])) {
|
||||||
|
common._NOTIFICATIONS[answers.update].forEach(function (name) {
|
||||||
|
state.config[name] = true;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (answers.servernames) {
|
||||||
|
state.config._servernames = answers.servernames;
|
||||||
|
}
|
||||||
|
if (answers.ports) {
|
||||||
|
state.config._ports = answers.ports;
|
||||||
|
}
|
||||||
|
|
||||||
|
// things that are straight-forward copy-over
|
||||||
|
common.CONFIG_KEYS.forEach(function (key) {
|
||||||
|
if ('true' === answers[key]) { answers[key] = true; }
|
||||||
|
if ('false' === answers[key]) { answers[key] = false; }
|
||||||
|
if ('null' === answers[key]) { answers[key] = null; }
|
||||||
|
if ('undefined' === answers[key]) { delete answers[key]; }
|
||||||
|
if ('undefined' !== typeof answers[key]) {
|
||||||
|
state.config[key] = answers[key];
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
askForConfig(state, function (err, state) {
|
||||||
|
if (err) { parseCb(err); return; }
|
||||||
|
|
||||||
|
if (!state.config.token && state._can_pair) {
|
||||||
|
state.config._otp = common.otp();
|
||||||
|
}
|
||||||
|
|
||||||
|
argv.unshift('init');
|
||||||
|
parseCb(null, state);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
require('fs').readFile(confpath, 'utf8', parseConfig);
|
||||||
|
|
||||||
}());
|
}());
|
||||||
|
|||||||
691
bin/telebitd.js
691
bin/telebitd.js
@ -2,13 +2,6 @@
|
|||||||
(function () {
|
(function () {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var PromiseA;
|
|
||||||
try {
|
|
||||||
PromiseA = require('bluebird');
|
|
||||||
} catch(e) {
|
|
||||||
PromiseA = global.Promise;
|
|
||||||
}
|
|
||||||
|
|
||||||
var pkg = require('../package.json');
|
var pkg = require('../package.json');
|
||||||
|
|
||||||
var url = require('url');
|
var url = require('url');
|
||||||
@ -17,16 +10,11 @@ var os = require('os');
|
|||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
var common = require('../lib/cli-common.js');
|
var common = require('../lib/cli-common.js');
|
||||||
var http = require('http');
|
var http = require('http');
|
||||||
var TOML = require('toml');
|
|
||||||
var YAML = require('js-yaml');
|
var YAML = require('js-yaml');
|
||||||
var recase = require('recase').create({});
|
var recase = require('recase').create({});
|
||||||
var camelCopy = recase.camelCopy.bind(recase);
|
var camelCopy = recase.camelCopy.bind(recase);
|
||||||
var snakeCopy = recase.snakeCopy.bind(recase);
|
var snakeCopy = recase.snakeCopy.bind(recase);
|
||||||
var TPLS = TOML.parse(fs.readFileSync(path.join(__dirname, "../lib/en-us.toml"), 'utf8'));
|
var state = { homedir: os.homedir(), servernames: {}, ports: {} };
|
||||||
|
|
||||||
var TelebitRemote = require('../').TelebitRemote;
|
|
||||||
|
|
||||||
var state = { homedir: os.homedir(), servernames: {}, ports: {}, keepAlive: { state: false } };
|
|
||||||
|
|
||||||
var argv = process.argv.slice(2);
|
var argv = process.argv.slice(2);
|
||||||
|
|
||||||
@ -44,7 +32,20 @@ if (-1 !== confIndex) {
|
|||||||
var cancelUpdater = require('../lib/updater')(pkg);
|
var cancelUpdater = require('../lib/updater')(pkg);
|
||||||
|
|
||||||
function help() {
|
function help() {
|
||||||
console.info(TPLS.daemon.help.main.replace(/{version}/g, pkg.version));
|
console.info('');
|
||||||
|
console.info('Telebit Daemon v' + pkg.version);
|
||||||
|
console.info('');
|
||||||
|
console.info('Usage:');
|
||||||
|
console.info('');
|
||||||
|
console.info('\ttelebitd --config <path>');
|
||||||
|
console.info('\tex: telebitd --config ~/.config/telebit/telebitd.yml');
|
||||||
|
console.info('');
|
||||||
|
console.info('');
|
||||||
|
console.info('Config:');
|
||||||
|
console.info('');
|
||||||
|
console.info('\tSee https://git.coolaj86.com/coolaj86/telebit.js');
|
||||||
|
console.info('');
|
||||||
|
console.info('');
|
||||||
}
|
}
|
||||||
|
|
||||||
var verstr = [ pkg.name + ' daemon v' + pkg.version ];
|
var verstr = [ pkg.name + ' daemon v' + pkg.version ];
|
||||||
@ -65,19 +66,21 @@ if (!confpath || /^--/.test(confpath)) {
|
|||||||
help();
|
help();
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
var tokenpath = path.join(path.dirname(confpath), 'access_token.txt');
|
||||||
state._confpath = confpath;
|
|
||||||
var tokenpath = path.join(path.dirname(state._confpath), 'access_token.txt');
|
|
||||||
var token;
|
var token;
|
||||||
try {
|
try {
|
||||||
token = fs.readFileSync(tokenpath, 'ascii').trim();
|
token = fs.readFileSync(tokenpath, 'ascii').trim();
|
||||||
//console.log('[DEBUG] access_token', typeof token, token);
|
console.log('[DEBUG] access_token', typeof token, token);
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
// ignore
|
// ignore
|
||||||
}
|
}
|
||||||
var controlServer;
|
var controlServer;
|
||||||
var myRemote;
|
var tun;
|
||||||
|
|
||||||
|
var controllers = {};
|
||||||
|
function saveConfig(cb) {
|
||||||
|
fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), cb);
|
||||||
|
}
|
||||||
function getServername(servernames, sub) {
|
function getServername(servernames, sub) {
|
||||||
if (state.servernames[sub]) {
|
if (state.servernames[sub]) {
|
||||||
return sub;
|
return sub;
|
||||||
@ -102,11 +105,6 @@ function getServername(servernames, sub) {
|
|||||||
}
|
}
|
||||||
})[0];
|
})[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
function saveConfig(cb) {
|
|
||||||
fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), cb);
|
|
||||||
}
|
|
||||||
var controllers = {};
|
|
||||||
controllers.http = function (req, res, opts) {
|
controllers.http = function (req, res, opts) {
|
||||||
function getAppname(pathname) {
|
function getAppname(pathname) {
|
||||||
// port number
|
// port number
|
||||||
@ -134,60 +132,17 @@ controllers.http = function (req, res, opts) {
|
|||||||
var appname = getAppname(portOrPath);
|
var appname = getAppname(portOrPath);
|
||||||
var subdomain = opts.body[1];
|
var subdomain = opts.body[1];
|
||||||
var remoteHost;
|
var remoteHost;
|
||||||
|
if (subdomain) {
|
||||||
// Assign an FQDN to brief subdomains
|
|
||||||
// ex: foo => foo.rando.telebit.cloud
|
|
||||||
if (subdomain && !/\./.test(subdomain)) {
|
|
||||||
Object.keys(state.servernames).some(function (key) {
|
|
||||||
if (state.servernames[key].wildcard) {
|
|
||||||
subdomain += '.' + key;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if ('none' === portOrPath || 'none' === subdomain) {
|
|
||||||
// ~/telebit http none // turn off all
|
|
||||||
// ~/telebit http none none // (same as above)
|
|
||||||
// ~/telebit http 3000 none // turn off this handler
|
|
||||||
// ~/telebit http none sub.example.com // turn off this subdomain
|
|
||||||
// ~/telebit http none sub // TODO
|
|
||||||
Object.keys(state.servernames).forEach(function (key) {
|
|
||||||
if ('none' === portOrPath && 'none' === subdomain) {
|
|
||||||
delete state.servernames[key].handler;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (state.servernames[key].handler === portOrPath) {
|
|
||||||
delete state.servernames[key].handler;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!subdomain || key === subdomain) {
|
|
||||||
if (state.servernames[key].sub) {
|
|
||||||
delete state.servernames[key];
|
|
||||||
} else {
|
|
||||||
delete state.servernames[key].handler;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
delete state.servernames[subdomain];
|
|
||||||
remoteHost = 'none';
|
|
||||||
} else if (subdomain && 'none' !== subdomain) {
|
|
||||||
// use a subdomain with this handler
|
|
||||||
var handlerName = getServername(state.servernames, subdomain);
|
var handlerName = getServername(state.servernames, subdomain);
|
||||||
if (!handlerName) {
|
if (!handlerName) {
|
||||||
active = false;
|
active = false;
|
||||||
}
|
}
|
||||||
if (!state.servernames[subdomain]) {
|
if (!state.servernames[subdomain]) {
|
||||||
state.servernames[subdomain] = { sub: true };
|
state.servernames[subdomain] = {};
|
||||||
}
|
}
|
||||||
if ('none' === portOrPath) {
|
|
||||||
delete state.servernames[subdomain].handler;
|
|
||||||
} else {
|
|
||||||
state.servernames[subdomain].handler = portOrPath;
|
state.servernames[subdomain].handler = portOrPath;
|
||||||
}
|
|
||||||
remoteHost = subdomain;
|
remoteHost = subdomain;
|
||||||
} else {
|
} else {
|
||||||
// just replace the default domain
|
|
||||||
if (!Object.keys(state.servernames).sort(function (a, b) {
|
if (!Object.keys(state.servernames).sort(function (a, b) {
|
||||||
return b.length - a.length;
|
return b.length - a.length;
|
||||||
}).some(function (key) {
|
}).some(function (key) {
|
||||||
@ -197,21 +152,17 @@ controllers.http = function (req, res, opts) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (state.servernames[key].wildcard) {
|
if (state.servernames[key].wildcard) {
|
||||||
//var prefix = appname + '.' + key;
|
if (!state.servernames[appname + '.' + key]) {
|
||||||
var prefix = key;
|
state.servernames[appname + '.' + key] = {};
|
||||||
if (!state.servernames[prefix]) {
|
|
||||||
state.servernames[prefix] = { sub: undefined };
|
|
||||||
}
|
}
|
||||||
state.servernames[prefix].handler = portOrPath;
|
state.servernames[appname + '.' + key].handler = portOrPath;
|
||||||
remoteHost = prefix;
|
remoteHost = appname + '.' + key;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
})) {
|
})) {
|
||||||
Object.keys(state.servernames).some(function (key) {
|
Object.keys(state.servernames).some(function (key) {
|
||||||
//var prefix = appname + '.' + key;
|
|
||||||
var prefix = key;
|
|
||||||
state.servernames[key].handler = portOrPath;
|
state.servernames[key].handler = portOrPath;
|
||||||
remoteHost = prefix;
|
remoteHost = appname + '.' + key;
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -289,16 +240,12 @@ controllers.ssh = function (req, res, opts) {
|
|||||||
function sshSuccess() {
|
function sshSuccess() {
|
||||||
//state.config.sshAuto = state.sshAuto;
|
//state.config.sshAuto = state.sshAuto;
|
||||||
saveConfig(function (err) {
|
saveConfig(function (err) {
|
||||||
var local = state.config.sshAuto;
|
|
||||||
if (false !== local && !local) {
|
|
||||||
local = 22;
|
|
||||||
}
|
|
||||||
res.setHeader('Content-Type', 'application/json');
|
res.setHeader('Content-Type', 'application/json');
|
||||||
res.end(JSON.stringify({
|
res.end(JSON.stringify({
|
||||||
success: true
|
success: true
|
||||||
, active: true
|
, active: true
|
||||||
, remote: Object.keys(state.config.ports)[0]
|
, remote: Object.keys(state.config.ports)[0]
|
||||||
, local: local
|
, local: state.config.sshAuto || 22
|
||||||
, saved: !err
|
, saved: !err
|
||||||
, module: 'ssh'
|
, module: 'ssh'
|
||||||
}));
|
}));
|
||||||
@ -331,7 +278,7 @@ function serveControlsHelper() {
|
|||||||
var opts = url.parse(req.url, true);
|
var opts = url.parse(req.url, true);
|
||||||
if (opts.query._body) {
|
if (opts.query._body) {
|
||||||
try {
|
try {
|
||||||
opts.body = JSON.parse(decodeURIComponent(opts.query._body, true));
|
opts.body = JSON.parse(opts.query._body, true);
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
res.statusCode = 500;
|
res.statusCode = 500;
|
||||||
res.end('{"error":{"message":"?_body={{bad_format}}"}}');
|
res.end('{"error":{"message":"?_body={{bad_format}}"}}');
|
||||||
@ -358,19 +305,20 @@ function serveControlsHelper() {
|
|||||||
res.end(JSON.stringify(dumpy));
|
res.end(JSON.stringify(dumpy));
|
||||||
}
|
}
|
||||||
|
|
||||||
function getConfigOnly() {
|
if (/\b(config)\b/.test(opts.pathname) && /get/i.test(req.method)) {
|
||||||
var resp = JSON.parse(JSON.stringify(state.config));
|
res.setHeader('Content-Type', 'appliCation/json');
|
||||||
resp.version = pkg.version;
|
res.end(JSON.stringify(state.config));
|
||||||
res.setHeader('Content-Type', 'application/json');
|
return;
|
||||||
res.end(JSON.stringify(resp));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// without proper config
|
// without proper config
|
||||||
//
|
//
|
||||||
function saveAndReport() {
|
function saveAndReport(err, _tun) {
|
||||||
console.log('[DEBUG] saveAndReport config write', confpath);
|
console.log('[DEBUG] saveAndReport config write', confpath);
|
||||||
console.log(YAML.safeDump(snakeCopy(state.config)));
|
console.log(YAML.safeDump(snakeCopy(state.config)));
|
||||||
|
if (err) { throw err; }
|
||||||
|
tun = _tun;
|
||||||
fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) {
|
fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
res.statusCode = 500;
|
res.statusCode = 500;
|
||||||
@ -383,8 +331,7 @@ function serveControlsHelper() {
|
|||||||
listSuccess();
|
listSuccess();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
if (/\b(init|config)\b/.test(opts.pathname)) {
|
||||||
function initOrConfig() {
|
|
||||||
var conf = {};
|
var conf = {};
|
||||||
if (!opts.body) {
|
if (!opts.body) {
|
||||||
res.statusCode = 422;
|
res.statusCode = 422;
|
||||||
@ -449,7 +396,7 @@ function serveControlsHelper() {
|
|||||||
if (conf._servernames) {
|
if (conf._servernames) {
|
||||||
(conf._servernames||'').split(/,/g).forEach(function (key) {
|
(conf._servernames||'').split(/,/g).forEach(function (key) {
|
||||||
if (!state.config.servernames[key]) {
|
if (!state.config.servernames[key]) {
|
||||||
state.config.servernames[key] = { sub: undefined };
|
state.config.servernames[key] = {};
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -462,7 +409,7 @@ function serveControlsHelper() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!state.config.relay || !state.config.email || !state.config.agreeTos) {
|
if (!state.config.relay || !state.config.email || !state.config.agreeTos) {
|
||||||
console.warn('missing config');
|
console.log('aborting for some reason');
|
||||||
res.statusCode = 400;
|
res.statusCode = 400;
|
||||||
|
|
||||||
res.setHeader('Content-Type', 'application/json');
|
res.setHeader('Content-Type', 'application/json');
|
||||||
@ -478,48 +425,66 @@ function serveControlsHelper() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// init also means enable
|
if (tun) {
|
||||||
delete state.config.disable;
|
console.log('ending existing tunnel, starting anew');
|
||||||
safeStartTelebitRemote(true).then(saveAndReport).catch(handleError);
|
tun.end(function () {
|
||||||
}
|
console.log('success ending');
|
||||||
|
rawTunnel(saveAndReport);
|
||||||
function restart() {
|
});
|
||||||
console.info("[telebitd.js] server closing...");
|
tun = null;
|
||||||
state.keepAlive.state = false;
|
|
||||||
if (myRemote) {
|
|
||||||
myRemote.end();
|
|
||||||
myRemote.on('end', respondAndClose);
|
|
||||||
// failsafe
|
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
console.info("[telebitd.js] closing too slowly, force quit");
|
if (!tun) {
|
||||||
respondAndClose();
|
console.log('failed to end, but starting anyway');
|
||||||
}, 5 * 1000);
|
rawTunnel(saveAndReport);
|
||||||
|
}
|
||||||
|
}, 3000);
|
||||||
} else {
|
} else {
|
||||||
respondAndClose();
|
console.log('no tunnel, starting anew');
|
||||||
|
rawTunnel(saveAndReport);
|
||||||
|
}
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function respondAndClose() {
|
if (/restart/.test(opts.pathname)) {
|
||||||
|
tun.end();
|
||||||
res.setHeader('Content-Type', 'application/json');
|
res.setHeader('Content-Type', 'application/json');
|
||||||
res.end(JSON.stringify({ success: true }));
|
res.end(JSON.stringify({ success: true }));
|
||||||
controlServer.close(function () {
|
controlServer.close(function () {
|
||||||
console.info("[telebitd.js] server closed");
|
// TODO closeAll other things
|
||||||
setTimeout(function () {
|
process.nextTick(function () {
|
||||||
// system daemon will restart the process
|
// system daemon will restart the process
|
||||||
process.exit(22); // use non-success exit code
|
process.exit(22); // use non-success exit code
|
||||||
}, 100);
|
|
||||||
});
|
});
|
||||||
}
|
});
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function invalidConfig() {
|
//
|
||||||
|
// Check for proper config
|
||||||
|
//
|
||||||
|
if (!state.config.relay || !state.config.email || !state.config.agreeTos) {
|
||||||
res.statusCode = 400;
|
res.statusCode = 400;
|
||||||
res.setHeader('Content-Type', 'application/json');
|
res.setHeader('Content-Type', 'application/json');
|
||||||
res.end(JSON.stringify({
|
res.end(JSON.stringify({
|
||||||
error: { code: "E_CONFIG", message: "Invalid config file. Please run 'telebit init'" }
|
error: { code: "E_CONFIG", message: "Invalid config file. Please run 'telebit init'" }
|
||||||
}));
|
}));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function saveAndCommit() {
|
//
|
||||||
|
// 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)) {
|
||||||
state.config.servernames = state.servernames;
|
state.config.servernames = state.servernames;
|
||||||
state.config.ports = state.ports;
|
state.config.ports = state.ports;
|
||||||
fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) {
|
fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) {
|
||||||
@ -533,114 +498,65 @@ function serveControlsHelper() {
|
|||||||
}
|
}
|
||||||
listSuccess();
|
listSuccess();
|
||||||
});
|
});
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
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(
|
|
||||||
{ 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
|
|
||||||
}
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
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)) {
|
if (/ssh/.test(opts.pathname)) {
|
||||||
controllers.ssh(req, res, opts);
|
controllers.ssh(req, res, opts);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (/enable/.test(opts.pathname)) {
|
if (/enable/.test(opts.pathname)) {
|
||||||
enable();
|
delete state.config.disable;// = undefined;
|
||||||
|
if (tun) {
|
||||||
|
listSuccess();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
rawTunnel(function (err, _tun) {
|
||||||
|
if (err) { throw err; }
|
||||||
|
tun = _tun;
|
||||||
|
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 user doesn't have permission?" }
|
||||||
|
}));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
listSuccess();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (/disable/.test(opts.pathname)) {
|
if (/disable/.test(opts.pathname)) {
|
||||||
disable();
|
state.config.disable = true;
|
||||||
|
if (tun) { tun.end(); tun = null; }
|
||||||
|
fs.writeFile(confpath, YAML.safeDump(snakeCopy(state.config)), function (err) {
|
||||||
|
res.setHeader('Content-Type', 'application/json');
|
||||||
|
if (err) {
|
||||||
|
res.statusCode = 500;
|
||||||
|
res.end(JSON.stringify({
|
||||||
|
"error":{"message":"Could not save config file. Perhaps you're not running as root?"}
|
||||||
|
}));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
res.end('{"success":true}');
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (/status/.test(opts.pathname)) {
|
if (/status/.test(opts.pathname)) {
|
||||||
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)
|
||||||
|
}
|
||||||
|
));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (/list/.test(opts.pathname)) {
|
if (/list/.test(opts.pathname)) {
|
||||||
listSuccess();
|
listSuccess();
|
||||||
return;
|
return;
|
||||||
@ -649,7 +565,6 @@ function serveControlsHelper() {
|
|||||||
res.setHeader('Content-Type', 'application/json');
|
res.setHeader('Content-Type', 'application/json');
|
||||||
res.end(JSON.stringify({"error":{"message":"unrecognized rpc"}}));
|
res.end(JSON.stringify({"error":{"message":"unrecognized rpc"}}));
|
||||||
});
|
});
|
||||||
|
|
||||||
if (fs.existsSync(state._ipc.path)) {
|
if (fs.existsSync(state._ipc.path)) {
|
||||||
fs.unlinkSync(state._ipc.path);
|
fs.unlinkSync(state._ipc.path);
|
||||||
}
|
}
|
||||||
@ -685,25 +600,27 @@ function serveControlsHelper() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function serveControls() {
|
function serveControls() {
|
||||||
serveControlsHelper();
|
|
||||||
|
|
||||||
if (state.config.disable) {
|
if (state.config.disable) {
|
||||||
console.info("[info] starting disabled");
|
console.info("[info] starting disabled");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// This will remain in a disconnect state and wait for an init
|
if (state.config.relay && (state.config.token || state.config.pretoken)) {
|
||||||
if (!(state.config.relay && (state.config.token || state.config.pretoken))) {
|
console.info("[info] connecting with stored token");
|
||||||
console.info("[info] waiting for init/authentication (missing relay and/or token)");
|
rawTunnel(function (err, _tun) {
|
||||||
|
if (err) { throw err; }
|
||||||
|
if (_tun) { tun = _tun; }
|
||||||
|
setTimeout(function () {
|
||||||
|
// TODO attach handler to tunnel
|
||||||
|
serveControlsHelper();
|
||||||
|
}, 150);
|
||||||
|
});
|
||||||
return;
|
return;
|
||||||
|
} else {
|
||||||
|
console.info("[info] waiting for init/authentication (missing relay and/or token)");
|
||||||
}
|
}
|
||||||
|
|
||||||
console.info("[info] connecting with stored token");
|
serveControlsHelper();
|
||||||
return safeStartTelebitRemote().catch(function (err) {
|
|
||||||
// ignore, it'll keep looping anyway
|
|
||||||
console.warn("[debug] error that (supposedly) shouldn't matter:");
|
|
||||||
console.warn(err);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseConfig(err, text) {
|
function parseConfig(err, text) {
|
||||||
@ -765,7 +682,61 @@ function parseConfig(err, text) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function approveDomains(opts, certs, cb) {
|
function rawTunnel(rawCb) {
|
||||||
|
if (state.config.disable || !state.config.relay || !(state.config.token || state.config.agreeTos)) {
|
||||||
|
rawCb(null, null);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
state.relay = state.config.relay;
|
||||||
|
if (!state.relay) {
|
||||||
|
rawCb(new Error("'" + state._confpath + "' is missing 'relay'"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(state.token || state.pretoken)) {
|
||||||
|
rawCb(null, null);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tun) {
|
||||||
|
rawCb(null, tun);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
common.api.wss(state, function (err, wss) {
|
||||||
|
if (err) { rawCb(err); return; }
|
||||||
|
state.wss = wss;
|
||||||
|
|
||||||
|
// Saves the token
|
||||||
|
// state.handlers.access_token({ jwt: token });
|
||||||
|
// Adds the token to the connection
|
||||||
|
// tun.append(token);
|
||||||
|
|
||||||
|
state.greenlockConf = state.config.greenlock || {};
|
||||||
|
state.sortingHat = state.config.sortingHat;
|
||||||
|
|
||||||
|
// TODO sortingHat.print(); ?
|
||||||
|
// TODO Check undefined vs false for greenlock config
|
||||||
|
var remote = require('../');
|
||||||
|
|
||||||
|
state.greenlockConfig = {
|
||||||
|
version: state.greenlockConf.version || 'draft-11'
|
||||||
|
, server: state.greenlockConf.server || 'https://acme-v02.api.letsencrypt.org/directory'
|
||||||
|
, communityMember: state.greenlockConf.communityMember || state.config.communityMember
|
||||||
|
, telemetry: state.greenlockConf.telemetry || state.config.telemetry
|
||||||
|
, configDir: state.greenlockConf.configDir
|
||||||
|
|| (state.config.root && path.join(state.config.root, 'etc/acme'))
|
||||||
|
|| path.join(os.homedir(), '.config/telebit/acme')
|
||||||
|
// TODO, store: require(state.greenlockConf.store.name || 'le-store-certbot').create(state.greenlockConf.store.options || {})
|
||||||
|
, approveDomains: function (opts, certs, cb) {
|
||||||
|
// Certs being renewed are listed in certs.altnames
|
||||||
|
if (certs) {
|
||||||
|
opts.domains = certs.altnames;
|
||||||
|
cb(null, { options: opts, certs: certs });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Even though it's being tunneled by a trusted source
|
// Even though it's being tunneled by a trusted source
|
||||||
// we need to make sure we don't get rate-limit spammed
|
// we need to make sure we don't get rate-limit spammed
|
||||||
// with wildcard domains
|
// with wildcard domains
|
||||||
@ -777,200 +748,19 @@ function approveDomains(opts, certs, cb) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
cb(new Error("servername not found in allowed list"));
|
//cb(new Error("servername not found in allowed list"));
|
||||||
}
|
}
|
||||||
|
|
||||||
function greenlockHelper(state) {
|
|
||||||
// TODO Check undefined vs false for greenlock config
|
|
||||||
state.greenlockConf = state.config.greenlock || {};
|
|
||||||
state.greenlockConfig = {
|
|
||||||
version: state.greenlockConf.version || 'draft-11'
|
|
||||||
, server: state.greenlockConf.server || 'https://acme-v02.api.letsencrypt.org/directory'
|
|
||||||
, communityMember: state.greenlockConf.communityMember || state.config.communityMember
|
|
||||||
, _communityPackage: 'telebit.js'
|
|
||||||
, telemetry: state.greenlockConf.telemetry || state.config.telemetry
|
|
||||||
, configDir: state.greenlockConf.configDir
|
|
||||||
|| (state.config.root && path.join(state.config.root, 'etc/acme'))
|
|
||||||
|| path.join(os.homedir(), '.config/telebit/acme')
|
|
||||||
// TODO, store: require(state.greenlockConf.store.name || 'le-store-certbot').create(state.greenlockConf.store.options || {})
|
|
||||||
, approveDomains: approveDomains
|
|
||||||
};
|
};
|
||||||
state.insecure = state.config.relay_ignore_invalid_certificates;
|
state.insecure = state.config.relay_ignore_invalid_certificates;
|
||||||
}
|
|
||||||
|
|
||||||
function promiseTimeout(t) {
|
|
||||||
return new PromiseA(function (resolve) {
|
|
||||||
setTimeout(resolve, t);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
var promiseWss = PromiseA.promisify(function (state, fn) {
|
|
||||||
return common.api.wss(state, fn);
|
|
||||||
});
|
|
||||||
|
|
||||||
var trPromise;
|
|
||||||
function safeStartTelebitRemote(forceOn) {
|
|
||||||
// whatever is currently going will not restart
|
|
||||||
state.keepAlive.state = false;
|
|
||||||
if (trPromise && !forceOn) { return trPromise; }
|
|
||||||
|
|
||||||
// if something is running, this will kill it
|
|
||||||
// (TODO option to use known-good active instead of restarting)
|
|
||||||
// this won't restart either
|
|
||||||
trPromise = rawStartTelebitRemote(state.keepAlive);
|
|
||||||
trPromise.then(function () {
|
|
||||||
console.log("[debug] success on raw start, keepAlive = true");
|
|
||||||
state.keepAlive.state = true;
|
|
||||||
trPromise = null;
|
|
||||||
}).catch(function () {
|
|
||||||
console.log("[debug] failure on raw start, { keepAlive = true }");
|
|
||||||
// this will restart
|
|
||||||
state.keepAlive = { state: true };
|
|
||||||
trPromise = rawStartTelebitRemote(state.keepAlive);
|
|
||||||
trPromise.then(function () {
|
|
||||||
console.log("[debug] success on 2nd start keepAlive:", state.keepAlive.state);
|
|
||||||
trPromise = null;
|
|
||||||
}).catch(function () {
|
|
||||||
console.log("[debug] failure on 2nd start. keepAlive", state.keepAlive.state);
|
|
||||||
trPromise = null;
|
|
||||||
});
|
|
||||||
});
|
|
||||||
return trPromise;
|
|
||||||
}
|
|
||||||
|
|
||||||
function rawStartTelebitRemote(keepAlive) {
|
|
||||||
var err;
|
|
||||||
var exiting = false;
|
|
||||||
var localRemote = myRemote;
|
|
||||||
myRemote = null;
|
|
||||||
if (localRemote) { /*console.log('DEBUG destroy() existing');*/ localRemote.destroy(); }
|
|
||||||
|
|
||||||
function safeReload(delay) {
|
|
||||||
if (exiting) {
|
|
||||||
// return a junk promise as the prior call
|
|
||||||
// already passed flow-control to the next promise
|
|
||||||
// (this is a second or delayed error or close event)
|
|
||||||
return PromiseA.resolve();
|
|
||||||
}
|
|
||||||
exiting = true;
|
|
||||||
// TODO state.keepAlive?
|
|
||||||
return promiseTimeout(delay).then(function () {
|
|
||||||
return rawStartTelebitRemote(keepAlive);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (state.config.disable) {
|
|
||||||
//console.log('DEBUG disabled or incapable');
|
|
||||||
err = new Error("connecting is disabled");
|
|
||||||
err.code = 'EDISABLED';
|
|
||||||
return PromiseA.reject(err);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(state.config.token || state.config.agreeTos)) {
|
|
||||||
//console.log('DEBUG Must agreeTos to generate preauth');
|
|
||||||
err = new Error("Must either supply token (for auth) or agreeTos (for preauth)");
|
|
||||||
err.code = 'ENOAGREE';
|
|
||||||
return PromiseA.reject(err);
|
|
||||||
}
|
|
||||||
|
|
||||||
state.relay = state.config.relay;
|
|
||||||
if (!state.relay) {
|
|
||||||
//console.log('DEBUG no relay');
|
|
||||||
err = new Error("'" + state._confpath + "' is missing 'relay'");
|
|
||||||
err.code = 'ENORELAY';
|
|
||||||
return PromiseA.reject(err);
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: we need some form of pre-authorization before connecting,
|
|
||||||
// otherwise we'll get disconnected pretty quickly
|
|
||||||
if (!(state.token || state.pretoken)) {
|
|
||||||
//console.log('DEBUG no token');
|
|
||||||
err = new Error("no jwt token or preauthorization");
|
|
||||||
err.code = 'ENOAUTH';
|
|
||||||
return PromiseA.reject(err);
|
|
||||||
}
|
|
||||||
|
|
||||||
return PromiseA.resolve().then(function () {
|
|
||||||
//console.log('DEBUG rawStartTelebitRemote');
|
|
||||||
|
|
||||||
function startHelper() {
|
|
||||||
//console.log('DEBUG startHelper');
|
|
||||||
greenlockHelper(state);
|
|
||||||
// Saves the token
|
|
||||||
// state.handlers.access_token({ jwt: token });
|
|
||||||
// Adds the token to the connection
|
|
||||||
// tun.append(token);
|
|
||||||
|
|
||||||
//console.log("[DEBUG] token", typeof token, token);
|
|
||||||
//state.sortingHat = state.config.sortingHat;
|
|
||||||
// { relay, config, servernames, ports, sortingHat, net, insecure, token, handlers, greenlockConfig }
|
// { relay, config, servernames, ports, sortingHat, net, insecure, token, handlers, greenlockConfig }
|
||||||
|
|
||||||
return new PromiseA(function (myResolve, myReject) {
|
console.log("[DEBUG] token", typeof token, token);
|
||||||
function reject(err) {
|
tun = remote.connect({
|
||||||
if (myReject) {
|
|
||||||
myReject(err);
|
|
||||||
myResolve = null;
|
|
||||||
myReject = null;
|
|
||||||
} else {
|
|
||||||
//console.log('DEBUG double rejection');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
function resolve(val) {
|
|
||||||
//console.log('[DEBUG] pre-resolve');
|
|
||||||
if (myResolve) {
|
|
||||||
myResolve(val);
|
|
||||||
myResolve = null;
|
|
||||||
myReject = null;
|
|
||||||
} else {
|
|
||||||
//console.log('DEBUG double resolution');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function onConnect() {
|
|
||||||
console.info('[connect] relay established');
|
|
||||||
myRemote.removeListener('error', onConnectError);
|
|
||||||
myRemote.once('error', function (err) {
|
|
||||||
console.log("[debug] Error after connect.");
|
|
||||||
console.log(err);
|
|
||||||
if (!keepAlive.state) {
|
|
||||||
reject(err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
retryLoop();
|
|
||||||
});
|
|
||||||
resolve(myRemote);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
function onConnectError(err) {
|
|
||||||
myRemote = null;
|
|
||||||
if (handleError(err, 'onConnectError')) {
|
|
||||||
if (!keepAlive.state) {
|
|
||||||
reject(err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
safeReload(10 * 1000).then(resolve).catch(reject);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
console.error('[Error] onConnectError: no retry (possibly bad auth):');
|
|
||||||
console.error(err);
|
|
||||||
reject(err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
function retryLoop() {
|
|
||||||
console.warn('[Warn] disconnected. Will retry?', keepAlive.state);
|
|
||||||
if (keepAlive.state) {
|
|
||||||
safeReload(10 * 1000).then(resolve).catch(reject);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
myRemote = TelebitRemote.createConnection({
|
|
||||||
relay: state.relay
|
relay: state.relay
|
||||||
, wss: state.wss
|
, wss: state.wss
|
||||||
, config: state.config
|
, config: state.config
|
||||||
, otp: state.otp
|
, otp: state.otp
|
||||||
, sortingHat: state.config.sortingHat
|
, sortingHat: state.sortingHat
|
||||||
, net: state.net
|
, net: state.net
|
||||||
, insecure: state.insecure
|
, insecure: state.insecure
|
||||||
, token: state.token || state.pretoken // instance
|
, token: state.token || state.pretoken // instance
|
||||||
@ -978,81 +768,9 @@ function rawStartTelebitRemote(keepAlive) {
|
|||||||
, ports: state.ports
|
, ports: state.ports
|
||||||
, handlers: state.handlers
|
, handlers: state.handlers
|
||||||
, greenlockConfig: state.greenlockConfig
|
, greenlockConfig: state.greenlockConfig
|
||||||
}, onConnect);
|
|
||||||
|
|
||||||
myRemote.once('error', onConnectError);
|
|
||||||
myRemote.once('close', retryLoop);
|
|
||||||
myRemote.on('grant', state.handlers.grant);
|
|
||||||
myRemote.on('access_token', state.handlers.access_token);
|
|
||||||
});
|
});
|
||||||
}
|
|
||||||
|
|
||||||
if (state.wss) {
|
rawCb(null, tun);
|
||||||
return startHelper();
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleError(err, prefix) {
|
|
||||||
// Likely causes:
|
|
||||||
// * DNS lookup failed (no Internet)
|
|
||||||
// * Rejected (bad authn)
|
|
||||||
if ('ENOTFOUND' === err.code) {
|
|
||||||
// DNS issue, probably network is disconnected
|
|
||||||
err.message = [
|
|
||||||
'[warn] (' + prefix + '): DNS address not found.'
|
|
||||||
, ' Either the remote does not exist or local network is down or blocked.'
|
|
||||||
, ' You might check wifi, eth, paywall, etc.'
|
|
||||||
].join('\n');
|
|
||||||
if (keepAlive.error !== err.code) {
|
|
||||||
console.warn(err.message);
|
|
||||||
keepAlive.error = err.code;
|
|
||||||
console.warn("(retrying silently)");
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
} else if ('ECONNREFUSED' === err.code) {
|
|
||||||
// Server issue. If it's the development server, it's probably down
|
|
||||||
err.message = [
|
|
||||||
'[warn] onConnectError: Connection Refused.'
|
|
||||||
, ' Either the remote does not exist or local network is blocking it.'
|
|
||||||
, ' Is the relay service provider\'s website up? Did you make a typo?'
|
|
||||||
, ' Is there a local firewall or paywall? Might the relay be otherwise blocked?'
|
|
||||||
].join('\n');
|
|
||||||
if (keepAlive.error !== err.code) {
|
|
||||||
console.warn(err.message);
|
|
||||||
keepAlive.error = err.code;
|
|
||||||
console.warn("(retrying silently)");
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// get the wss url
|
|
||||||
function retryWssLoop(err) {
|
|
||||||
if (!keepAlive.state) {
|
|
||||||
console.log("[debug] error getting wss url:");
|
|
||||||
console.log(err);
|
|
||||||
return PromiseA.reject(err);
|
|
||||||
}
|
|
||||||
|
|
||||||
myRemote = null;
|
|
||||||
if (handleError(err, 'retryWssLoop')) {
|
|
||||||
// Always retry at this stage. It *is* a connectivity problem.
|
|
||||||
// Since the internet is disconnected, try again and again and again.
|
|
||||||
return safeReload(2 * 1000);
|
|
||||||
} else {
|
|
||||||
console.error("[error] retryWssLoop (will not retry):");
|
|
||||||
console.error(err.message);
|
|
||||||
return PromiseA.reject(err);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// It makes since for this to be in here because the server
|
|
||||||
// could be restarting to force a change of the metadata
|
|
||||||
return promiseWss(state).then(function (wss) {
|
|
||||||
state.wss = wss;
|
|
||||||
console.log("[debug] got wss url");
|
|
||||||
keepAlive.error = null;
|
|
||||||
return startHelper();
|
|
||||||
}).catch(retryWssLoop);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1114,17 +832,14 @@ state.handlers = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
function sigHandler() {
|
function sigHandler() {
|
||||||
process.removeListener('SIGINT', sigHandler);
|
|
||||||
|
|
||||||
console.info('Received kill signal. Attempting to exit cleanly...');
|
console.info('Received kill signal. Attempting to exit cleanly...');
|
||||||
state.keepAlive.state = false;
|
|
||||||
|
|
||||||
// We want to handle cleanup properly unless something is broken in our cleanup process
|
// We want to handle cleanup properly unless something is broken in our cleanup process
|
||||||
// that prevents us from exitting, in which case we want the user to be able to send
|
// that prevents us from exitting, in which case we want the user to be able to send
|
||||||
// the signal again and exit the way it normally would.
|
// the signal again and exit the way it normally would.
|
||||||
if (myRemote) {
|
process.removeListener('SIGINT', sigHandler);
|
||||||
myRemote.end();
|
if (tun) {
|
||||||
myRemote = null;
|
tun.end();
|
||||||
}
|
}
|
||||||
if (controlServer) {
|
if (controlServer) {
|
||||||
controlServer.close();
|
controlServer.close();
|
||||||
|
|||||||
493
lib/en-us.toml
493
lib/en-us.toml
@ -1,493 +0,0 @@
|
|||||||
[help]
|
|
||||||
|
|
||||||
remote = "telebit remote v{version}
|
|
||||||
|
|
||||||
Telebit Remote is the T-Rex long-arm of the Internet. UNSTOPPABLE!
|
|
||||||
|
|
||||||
Using reliable HTTPS tunneling to establishing peer-to-peer connections,
|
|
||||||
Telebit is empowering the next generation of tinkerers. Access your devices.
|
|
||||||
Share your stuff. Be UNSTOPPABLE! (Join us at https://rootprojects.org)
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
|
|
||||||
telebit [flags] <command> [arguments]
|
|
||||||
ex: telebit http ~/Public
|
|
||||||
|
|
||||||
The flags are:
|
|
||||||
|
|
||||||
--config <path> specify config file (default is ~/.config/telebit/telebit.yml)
|
|
||||||
--json output json instead of text, if available
|
|
||||||
-h,--help display this menu (or sub-command menus)
|
|
||||||
|
|
||||||
The commands are:
|
|
||||||
|
|
||||||
status show status and configuration info
|
|
||||||
|
|
||||||
http access files, folders, and local apps via https (secure)
|
|
||||||
ssh enable remote access to this device with ssh-over-https
|
|
||||||
ssh (client) access devices via ssh-over-https (telebit, stunnel, openssl, etc)
|
|
||||||
tcp forward tcp locally
|
|
||||||
|
|
||||||
enable turn on remote access and sharing
|
|
||||||
disable turn off remote access and sharing
|
|
||||||
|
|
||||||
activate start and register the telebit service
|
|
||||||
disable stop and unregister the telebit service
|
|
||||||
|
|
||||||
config (doc) config file format and settings
|
|
||||||
client (doc) vpn, ftp, rsync, scp, ssh-proxy, sclient
|
|
||||||
|
|
||||||
Use \"telebit help [command]\" for more information about a command, including flags.
|
|
||||||
|
|
||||||
Additional help topics:
|
|
||||||
|
|
||||||
daemon telebit daemon secure background service
|
|
||||||
relay telebit secure relay, hosted, and self-hosting options
|
|
||||||
|
|
||||||
Copyright 2015-2018 AJ ONeal https://telebit.cloud MPL-2.0 Licensed (RAWR!)"
|
|
||||||
|
|
||||||
client = "telebit client v{version}
|
|
||||||
|
|
||||||
ftp secure ftp file transfer between devices
|
|
||||||
rsync rsync over https and proxy commands
|
|
||||||
scp scp over https and proxy commands
|
|
||||||
sclient use the sclient emebbed within telebit
|
|
||||||
ssh-proxy ssh over https and proxy commands
|
|
||||||
vpn (client) home network access and private web browsing via socks5
|
|
||||||
|
|
||||||
Use \"telebit help [command]\" for more information about a command, including flags.
|
|
||||||
|
|
||||||
Copyright 2015-2018 AJ ONeal https://telebit.cloud MPL-2.0 Licensed (RAWR!)"
|
|
||||||
|
|
||||||
status = "usage: telebit status
|
|
||||||
|
|
||||||
'telebit status' shows details about the current connections (or lack thereof).
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
Status: RAWR! (uptime: 45 minutes)
|
|
||||||
|
|
||||||
Forwarding ssh+https://jon.telebit.io => localhost:22
|
|
||||||
Forwarding https://client.jon.telebit.io => localhost:3000
|
|
||||||
Serving https://public.jon.telebit.io from ~/Public
|
|
||||||
Syncing ~/shared => home.jon.telebit.io:shared
|
|
||||||
|
|
||||||
Relay: https://telebit.cloud
|
|
||||||
Launcher: user
|
|
||||||
|
|
||||||
Additional help topics: enable, disable"
|
|
||||||
|
|
||||||
enable = "Enable Telebit - Re-enable and accept incoming connections
|
|
||||||
|
|
||||||
usage: telebit enable
|
|
||||||
|
|
||||||
enable Re-enable incoming connections for https, ssh, etc"
|
|
||||||
|
|
||||||
disable = "Disable Telebit - Reject https, ssh, and tcp connections
|
|
||||||
|
|
||||||
usage: telebit disable
|
|
||||||
|
|
||||||
disable (Temporarily) reject incoming connections for https,
|
|
||||||
ssh, etc without deleting the current configuration.
|
|
||||||
|
|
||||||
Perists on restart, but can be re-enabled remotely
|
|
||||||
(with your authorization only)."
|
|
||||||
|
|
||||||
activate = "Activate Telebit - Start telebit (if not running) and register a launcher
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
|
|
||||||
telebit activate [flags]
|
|
||||||
ex: telebit activate --launcher none
|
|
||||||
|
|
||||||
The flags may be exactly one of:
|
|
||||||
|
|
||||||
--no-launcher uregister any launchers (start manually)
|
|
||||||
--user-launcher (default) register an unprivileged launcher (start on login)
|
|
||||||
--system-launcher register with the system launcher (start on boot)
|
|
||||||
|
|
||||||
Note: telebit relies on the system launcher to recover from certain error conditions"
|
|
||||||
|
|
||||||
deactivate = "Deactivate Telebit - Unregister userspace (or system) launcher and stop
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
|
|
||||||
telebit deactivate [flags]
|
|
||||||
ex: telebit deactivate --keep alive
|
|
||||||
|
|
||||||
The flags are:
|
|
||||||
|
|
||||||
--keep-launcher stop telebit without unregistering the launcher
|
|
||||||
--keep-alive unregister launcher without stopping"
|
|
||||||
|
|
||||||
http = "Telebit HTTP - The UNSTOPPABLE way to share files, folders, and local apps.
|
|
||||||
|
|
||||||
usage: telebit http <path/port/none> [subdomain]
|
|
||||||
|
|
||||||
http <DIR> [subdomain] serve a file, folder, or node express app
|
|
||||||
ex: telebit http ~/Public pub ex: securely host ~/Public as pub.johndoe.telebit.io
|
|
||||||
|
|
||||||
http <PORT> [subdomain] forward all https traffic to a local app
|
|
||||||
ex: telebit http 3000 app ex: publicize localhost:3000 as app.johndoe.telebit.io
|
|
||||||
|
|
||||||
http none [subdomain] remove secure http access for (any or all) subdomain(s)
|
|
||||||
ex: telebit http none ex: remove all https access
|
|
||||||
|
|
||||||
Use cases:
|
|
||||||
|
|
||||||
- Lazy man's AirDrop (works for lazy women too!)
|
|
||||||
- Testing dev sites on a phone
|
|
||||||
- Sharing indie music and movies with friends"
|
|
||||||
|
|
||||||
ssh = "Telebit SSH - The UNSTOPPABLE way to remote into your devices.
|
|
||||||
|
|
||||||
usage: telebit ssh <auto|port|none>
|
|
||||||
|
|
||||||
All https traffic will be inspected to see if it looks like ssh Once enabled all traffic that looks
|
|
||||||
|
|
||||||
ssh auto Make ssh Just Work™ (on port 22)
|
|
||||||
|
|
||||||
ssh <port> forward ssh traffic to non-standard port
|
|
||||||
ex: telebit ssh 22 ex: explicitly forward ssh-looking packets to localhost:22
|
|
||||||
|
|
||||||
ssh none Disables ssh tunneling
|
|
||||||
|
|
||||||
Telebit SSH Client
|
|
||||||
|
|
||||||
usage: telebit ssh <remote> [ssh flags and options]
|
|
||||||
|
|
||||||
This is just a shortcut for \"ssh\", with all ssh-over-https options turned on.
|
|
||||||
|
|
||||||
ssh <remote> Make ssh Just Work™ (over https)
|
|
||||||
ex: telebit ssh jon.telebit.io ex:
|
|
||||||
|
|
||||||
\"telebit help ssh-proxy\" for more info
|
|
||||||
|
|
||||||
Use cases:
|
|
||||||
|
|
||||||
- Access your home computer from work.
|
|
||||||
- Access your work computer from home.
|
|
||||||
- Good ol' fashioned screen/tmux style pair programming"
|
|
||||||
|
|
||||||
ssh-proxy = "Proxying SSH over HTTPS
|
|
||||||
|
|
||||||
Wrapping SSH in HTTPS makes it accessible anywhere and also makes it routable.
|
|
||||||
Whether inside a harsh network environment or even if hindered by a poorly
|
|
||||||
configured firewall, once wrapped in tls, ssh becomes UNSTOPPABLE.
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
telebit ssh <remote> [ssh flags and options]
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
telebit ssh jon.telebit.io
|
|
||||||
|
|
||||||
It is NOT at all neccessary to use \"telebit ssh\", it's just a convenience.
|
|
||||||
Wanna know why, and the alternatives? Keep reading!
|
|
||||||
|
|
||||||
## History
|
|
||||||
|
|
||||||
When TLS sends an encrypted packet over the network it begins with a handshake
|
|
||||||
which shows the things like the tls version and the host SERVERNAME unencrypted
|
|
||||||
so that the remote server can respond with the correct certificate.
|
|
||||||
|
|
||||||
SSH was created well before TLS and has a completely different header. The good
|
|
||||||
news is that, unlike some other early internet protocols, it does have a header
|
|
||||||
with its name and version, but it doesn't have anything to identify the server.
|
|
||||||
|
|
||||||
## Telebit + SSH
|
|
||||||
|
|
||||||
Here's why:
|
|
||||||
|
|
||||||
When you're running ssh through an https tunnel (as telebit does) you
|
|
||||||
can't just use \"ssh me.example.com\" to get in. You have to tell ssh that you
|
|
||||||
want to use an https tunnel. Using \"telebit ssh\" as a client will specify
|
|
||||||
all of the correct ssh options.
|
|
||||||
|
|
||||||
However, when you want to connect to ssh over https, you either have to pass
|
|
||||||
the correct arguments or modify your ~/.ssh/config to use \"openssl s_client\".
|
|
||||||
|
|
||||||
We explain the different configurations below:
|
|
||||||
|
|
||||||
## SSH + openssl
|
|
||||||
|
|
||||||
The configuration that's most likely to work with what's already installed on
|
|
||||||
your machine is this:
|
|
||||||
|
|
||||||
Host jon.telebit.io
|
|
||||||
ProxyCommand openssl s_client -quiet -connect %h:443 -servername %h
|
|
||||||
|
|
||||||
Or you would call ssh directly, like this:
|
|
||||||
|
|
||||||
ssh jon.telebit.io -o ProxyCommand=\"openssl s_client -quiet -connect %h:443 -servername %h\"
|
|
||||||
|
|
||||||
It's rather simple, but it looks quite daunting.
|
|
||||||
|
|
||||||
## SSH + sclient
|
|
||||||
|
|
||||||
Because that looks a little hairy, we created \"sclient\", so that the example
|
|
||||||
could look a bit more digestible:
|
|
||||||
|
|
||||||
Host jon.telebit.io
|
|
||||||
ProxyCommand sclient %h
|
|
||||||
|
|
||||||
Or
|
|
||||||
|
|
||||||
ssh jon.telebit.io -o ProxyCommand=\"sclient %h\"
|
|
||||||
|
|
||||||
## Inverse SSH Tunnel (same as stunnel)
|
|
||||||
|
|
||||||
The commands above instruct ssh to open a pipe into openssl or sclient. If we
|
|
||||||
instead want to connect ssh to a local tunnel, it looks like this:
|
|
||||||
|
|
||||||
Host jon.telebit.io
|
|
||||||
Hostname localhost
|
|
||||||
Port 3000
|
|
||||||
HostKeyAlias jon.telebit.io
|
|
||||||
CheckHostIP no
|
|
||||||
RequestTTY force
|
|
||||||
|
|
||||||
Or
|
|
||||||
|
|
||||||
ssh localhost -p 3000 -t -o CheckHostIP=no -o HostKeyAlias=jon.telebit.io
|
|
||||||
|
|
||||||
## See also
|
|
||||||
|
|
||||||
telebit ftp
|
|
||||||
telebit vpn"
|
|
||||||
|
|
||||||
tcp = "Telebit TCP - Seemless connectivity to LEGACY apps.
|
|
||||||
Use 'telebit http' instead, where possible (including for ssh).
|
|
||||||
|
|
||||||
usage: telebit tcp <path/port/none>
|
|
||||||
|
|
||||||
tcp <local> [remote] forward tcp to <local> from <remote>
|
|
||||||
ex: telebit tcp 5050 6565 ex: forward tcp port 6565 locally to port 5050
|
|
||||||
|
|
||||||
tcp <path> [remote] show ftp-style directory listing
|
|
||||||
ex: telebit tcp ~/Public ex: show listing of ~/Public
|
|
||||||
|
|
||||||
tcp none [remote] disable tcp access for [remote] port
|
|
||||||
ex: telebit tcp none 6565 ex: remove access to port 6565
|
|
||||||
|
|
||||||
Use cases:
|
|
||||||
|
|
||||||
- Debugging plain TCP when troubleshooting a legacy app
|
|
||||||
- You can't install a secure client (like telebit, sclient, openssl, or stunnel)
|
|
||||||
|
|
||||||
See also sclient <https://telebit.cloud/sclient> for connecting to legacy apps
|
|
||||||
with telebit-upscaled secure https access."
|
|
||||||
|
|
||||||
scp = "Telebit (Client) scp
|
|
||||||
|
|
||||||
See \"telebit rsync\"."
|
|
||||||
|
|
||||||
rsync = "Telebit (Client) rsync - Sync files to or from another computer
|
|
||||||
|
|
||||||
Sync files and directories from one computer to another.
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
|
|
||||||
telebit rsync [flags] <src> <dst> [arguments]
|
|
||||||
ex: telebit rsync -av home.jon.telebit.cloud:shared/ ~/shared/ --exclude=tmp
|
|
||||||
|
|
||||||
This is not a full implementation of rsync, but rather a convenience wrapper
|
|
||||||
around rsync which passes the correct options to ssh for https tunneling.
|
|
||||||
|
|
||||||
Due to the way telebit wraps rsync, all flags which take an argumnt must
|
|
||||||
go after the source and destination paths / addresses.
|
|
||||||
|
|
||||||
See also: telebit help ssh-proxy"
|
|
||||||
|
|
||||||
vpn = "Telebit (Client) vpn - Use with Firefox for UNSTOPPABLE web browsing
|
|
||||||
|
|
||||||
This provides a very easy-to-use, lightweight VPN known as Socks5 that can be
|
|
||||||
used directly by Firefox and Chrome without requiring administrator privileges.
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
|
|
||||||
telebit vpn --socks5 <port> <remote>
|
|
||||||
ex: telebit vpn --socks5 6789 home.jon.telebit.io
|
|
||||||
|
|
||||||
The flags are:
|
|
||||||
|
|
||||||
--socks5 <port> You MUST specify the socks5 port
|
|
||||||
|
|
||||||
Firefox Configuration:
|
|
||||||
|
|
||||||
Firefox -> Preferences
|
|
||||||
Advanced -> Network
|
|
||||||
Connection -> Settings
|
|
||||||
|
|
||||||
Manual proxy configuration:
|
|
||||||
|
|
||||||
SOCKS Host: localhost
|
|
||||||
Port: 6789
|
|
||||||
SOCKS v5
|
|
||||||
|
|
||||||
Just like a full vpn client, it routes your IP traffic places through the VPN
|
|
||||||
server (which in this case is another one of your telebit devices), but only
|
|
||||||
for traffic in the configured browser. You can still access school and office
|
|
||||||
resources in the other browser (and other applications) the need to switch a
|
|
||||||
full VPN on and off.
|
|
||||||
|
|
||||||
As will all other telebit functionality, this use https tunneling and will not
|
|
||||||
be disrupted by unfavorable network conditions.
|
|
||||||
|
|
||||||
Use cases:
|
|
||||||
|
|
||||||
- Watch your US Netflix using your home IP while traveling abroad.
|
|
||||||
- Log into your router as if from inside your home network.
|
|
||||||
- Disregard poorly configured web proxies at school or work.
|
|
||||||
|
|
||||||
See also: telebit help ssh-proxy"
|
|
||||||
|
|
||||||
ftp = "Telebit (Client) Secure FTP
|
|
||||||
|
|
||||||
Alias of \"telebit rsync\"
|
|
||||||
|
|
||||||
The original FTP was superseded by sftp and then rsync a few decades ago,
|
|
||||||
however, sometimes we refer to its successors, generically, as \"FTP\"
|
|
||||||
(just like you might say \"hang up\" the phone).
|
|
||||||
|
|
||||||
## History
|
|
||||||
|
|
||||||
FTP is a legacy of the 1970s. It served its purpose well on local networks, but
|
|
||||||
was extremely dangerous on the Internet due to its lack of security and various
|
|
||||||
vulnerabilities. On some legacy systems it remains an easy target to steal
|
|
||||||
passwords and load viruses onto computers.
|
|
||||||
|
|
||||||
Although very few systems have ftp installed today (thank goodness), almost every
|
|
||||||
computer comes with rsync already installed and ready to go.
|
|
||||||
|
|
||||||
Use \"telebit rsync\" instead."
|
|
||||||
|
|
||||||
daemon = "telebit daemon v{version}
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
|
|
||||||
telebit daemon --config <path>
|
|
||||||
ex: telebit daemon --config ~/.config/telebit/telebitd.yml
|
|
||||||
|
|
||||||
Additional help topics:
|
|
||||||
|
|
||||||
config config file format and settings
|
|
||||||
remote telebit cli remote control
|
|
||||||
|
|
||||||
Copyright 2015-2018 https://telebit.cloud MPL-2.0 Licensed"
|
|
||||||
|
|
||||||
config = "Telebit Config (docs)
|
|
||||||
|
|
||||||
There are TWO config files:
|
|
||||||
|
|
||||||
remote ~/.config/telebit/telebit.yml
|
|
||||||
|
|
||||||
daemon ~/.config/telebit/telebitd.yml
|
|
||||||
|
|
||||||
### Remote Config
|
|
||||||
|
|
||||||
This only specifies the ipc - socket path (dir), address, or pipe name.
|
|
||||||
All other options are handled by the daemon.
|
|
||||||
|
|
||||||
ipc: /Users/aj/.local/share/telebit/var/run/
|
|
||||||
|
|
||||||
### Daemon Config
|
|
||||||
|
|
||||||
relay: telebit.cloud the relay to use
|
|
||||||
secret: null HMAC secret for self-hosted relay
|
|
||||||
email: jon@example.com the email to authenticate
|
|
||||||
agree_tos: true agree to Telebit, Greenlock, & Let's Encrypt, ToS
|
|
||||||
community_member: true get rare but relevant community updates
|
|
||||||
telemetry: true contribute to project telemetry
|
|
||||||
servernames:
|
|
||||||
example.com: don't reject https traffic for example.com
|
|
||||||
wildcard: true allow assignment to subdomains
|
|
||||||
handler: ~/Public whether to use a static server by path or app by port
|
|
||||||
home.example.com:
|
|
||||||
wildcard: true
|
|
||||||
handler: 3000
|
|
||||||
ssh_auto: 22 forward ssh-ish traffic to port 22
|
|
||||||
|
|
||||||
See also: telebit help relay"
|
|
||||||
|
|
||||||
sclient = "sclient
|
|
||||||
|
|
||||||
Usage:
|
|
||||||
|
|
||||||
sclient [flags] <remote> [local]
|
|
||||||
ex: sclient whatever.com:443 localhost:3000
|
|
||||||
ex: sclient whatever.com -
|
|
||||||
ex: printf \"GET / HTTP/1.1\\n\\n\" | sclient whatever.com
|
|
||||||
|
|
||||||
sclient is a standalane tls unwrapper. For convenience it's bundled with telebit
|
|
||||||
as the passthru subcommand \"telebit sclient\" and functions exactly the name.
|
|
||||||
|
|
||||||
telebit sclient [flags] <remote> [local]
|
|
||||||
ex: printf \"GET / HTTP/1.1\\n\\n\" | telebit sclient whatever.com
|
|
||||||
|
|
||||||
See https://telebit.cloud/sclient/"
|
|
||||||
|
|
||||||
relay = "Telebit Relay
|
|
||||||
|
|
||||||
We envision a future with better routers capable of providing reliable Internet
|
|
||||||
connectivity, and trusted peers bridging the gaps between unfavorable network
|
|
||||||
conditions.
|
|
||||||
|
|
||||||
We plan to always run telebit.cloud as a relay-as-a-service for convenience,
|
|
||||||
but it is our hope that, if your network conditions permit, you will also run
|
|
||||||
your own telebit relay for your friends, family, and yourself.
|
|
||||||
|
|
||||||
See https://git.coolaj86.com/coolaj86/telebit-relay.js"
|
|
||||||
|
|
||||||
in-n-out = "Telebit Secret Menu
|
|
||||||
|
|
||||||
The secret flags are:
|
|
||||||
|
|
||||||
--profile <name> Use config files, sockets, and pipes with this name.
|
|
||||||
For debugging and development. (default: telbit, telebitd)
|
|
||||||
--set-profile <name> Switch from the default profile
|
|
||||||
--address <path|host:port> Use explicit socket path (or address) or pipe name
|
|
||||||
Overrides \"--profile\""
|
|
||||||
|
|
||||||
[remote]
|
|
||||||
version = "telebit remote v{version}"
|
|
||||||
|
|
||||||
code = "
|
|
||||||
==============================================
|
|
||||||
Hey, Listen!
|
|
||||||
==============================================
|
|
||||||
|
|
||||||
GO CHECK YOUR EMAIL!
|
|
||||||
|
|
||||||
DEVICE PAIR CODE: 0000
|
|
||||||
|
|
||||||
==============================================
|
|
||||||
"
|
|
||||||
|
|
||||||
waiting = "waiting for you to check your email..."
|
|
||||||
|
|
||||||
success = "Success"
|
|
||||||
|
|
||||||
next_steps = "Some fun things to try first:
|
|
||||||
|
|
||||||
~/telebit http ~/Public
|
|
||||||
~/telebit tcp 5050
|
|
||||||
~/telebit ssh auto
|
|
||||||
|
|
||||||
Press any key to continue...
|
|
||||||
"
|
|
||||||
|
|
||||||
[remote.setup]
|
|
||||||
|
|
||||||
email = "Welcome!
|
|
||||||
|
|
||||||
By using Telebit you agree to:
|
|
||||||
|
|
||||||
[x] Accept the Telebit™ terms of service
|
|
||||||
[x] Accept the Let's Encrypt™ terms of service
|
|
||||||
|
|
||||||
Enter your email to agree and login/create your account:
|
|
||||||
"
|
|
||||||
|
|
||||||
[daemon]
|
|
||||||
version = "telebit daemon v{version}"
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
body {
|
|
||||||
font-family: Source Sans Pro, sans-serif;
|
|
||||||
font-size: 18px;
|
|
||||||
color: #1a1a1a;
|
|
||||||
letter-spacing: -0.022222222em;
|
|
||||||
line-height: 1.33;
|
|
||||||
margin: 0;
|
|
||||||
text-align: center;
|
|
||||||
padding: 2em 0 2em 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
code {}
|
|
||||||
|
|
||||||
code, pre {
|
|
||||||
font-family: Source Code Pro, monospace;
|
|
||||||
}
|
|
||||||
|
|
||||||
.code-block {
|
|
||||||
text-align: left;
|
|
||||||
display: inline-block;
|
|
||||||
}
|
|
||||||
|
|
||||||
span.logo {
|
|
||||||
font-size: 1.666em;
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
p {margin-bottom: 0.5em;margin-top: 1.5em;}
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -3,92 +3,39 @@
|
|||||||
<head>
|
<head>
|
||||||
<title>Telebit</title>
|
<title>Telebit</title>
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<link href="./css/main.css" rel="stylesheet">
|
|
||||||
<style>
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Source Sans Pro';
|
|
||||||
font-style: normal;
|
|
||||||
font-display: block;
|
|
||||||
font-weight: 400;
|
|
||||||
src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(./fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2) format('woff2');
|
|
||||||
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Source Sans Pro';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 700;
|
|
||||||
font-display: block;
|
|
||||||
src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(./fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2) format('woff2');
|
|
||||||
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: 'Source Code Pro';
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
src: local('Source Code Pro'), local('SourceCodePro-Regular'), url(./fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlPevW.woff2) format('woff2');
|
|
||||||
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<link rel="preload" href="./fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2" as="font" crossorigin="anonymous">
|
|
||||||
<link rel="preload" href="./fonts/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2" as="font" crossorigin="anonymous">
|
|
||||||
<link rel="preload" href="./fonts/HI_SiYsKILxRpg3hIP6sJ7fM7PqlPevW.woff2" as="font" crossorigin="anonymous">
|
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<script>document.body.hidden = true;</script>
|
<script>document.body.hidden = true;</script>
|
||||||
<!-- let's define our SVG that we will use later -->
|
|
||||||
<svg width="0" height="0" viewBox="0 0 24 24">
|
|
||||||
<defs>
|
|
||||||
<g id="svg-lock">
|
|
||||||
<path d="M0 0h24v24H0z" fill="none"/>
|
|
||||||
<path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/>
|
|
||||||
</g>
|
|
||||||
</defs>
|
|
||||||
</svg>
|
|
||||||
<span class="logo">Telebit</span>
|
|
||||||
<h1>Welcome Home <!-- as in 127.0.0.1, y'know ;) --></h1>
|
<h1>Welcome Home <!-- as in 127.0.0.1, y'know ;) --></h1>
|
||||||
<div>Go ahead and bookmark this page. It's yours now.</div>
|
<p>Go ahead and bookmark this page. It's yours now.</p>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<h2>You've claimed <span class="js-servername">{{servername}}</span></h2>
|
<h2>You've claimed <span class="js-servername">{{servername}}</span></h2>
|
||||||
<p>Here are some ways you can use Telebit via Terminal or other Command Line Interface:</p>
|
<p>Here's some ways you can use it:</p>
|
||||||
<div class="code-block">
|
<pre><code>
|
||||||
<br />
|
telebit http 3000 # forward all https traffic to localhost:3000
|
||||||
<pre><code>~/telebit ssh auto # allows you to connect to your computer with <br /> ssh-over-https from a different computer</span></code></pre>
|
telebit http /path/to/module # handle incoming https traffic with a node module
|
||||||
<pre><code>~/telebit http ~/Public # serve a public folder
|
telebit http none # remove all https handlers</code></pre>
|
||||||
~/telebit http 3000 # forward all https traffic to localhost:3000
|
|
||||||
~/telebit http none # remove all https handlers</code></pre>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<p>You can <em>always</em> use this port for <strong>SSH over HTTPS</strong>, even while you're using it for something else:</p>
|
||||||
<p>And remember you can <em>always</em> tunnel <strong>SSH over HTTPS</strong>,
|
<pre><code>
|
||||||
even while you're using it for something else:</p>
|
ssh -o ProxyCommand='openssl s_client -connect %h:443 -servername %h -quiet' <span class="js-servername">{{servername}}</span></code></pre>
|
||||||
<p> </p>
|
|
||||||
|
|
||||||
<details>
|
|
||||||
<p><summary><strong>Here are some examples for those of you that want to access files and folders remotely. </strong></summary></p>
|
<div class="js-port" hidden>
|
||||||
<p><strong>This function allows you to connect one computer to another computer you also have SSH on.</strong></p>
|
|
||||||
<div class="code-block"><pre><code>~/telebit ssh <span class="js-servername">{{servername}}</span></code></pre>
|
|
||||||
<br>
|
|
||||||
- or -
|
|
||||||
<pre><code>ssh -o ProxyCommand='<a href="https://telebit.cloud/sclient">sclient</a> %h' <span class="js-servername">{{servername}}</span></code></pre>
|
|
||||||
- or -
|
|
||||||
<pre><code>proxy_cmd='openssl s_client -connect %h:443 -servername %h -quiet'
|
|
||||||
ssh -o ProxyCommand="$proxy_cmd" <span class="js-servername">{{servername}}</span></code></pre>
|
|
||||||
</div>
|
|
||||||
<pre><code>ssh -o ProxyCommand='openssl s_client -connect %h:443 -servername %h -quiet' <span class="js-servername">{{servername}}</span></code></pre>
|
|
||||||
</details>
|
|
||||||
<!--div class="js-port" hidden>
|
|
||||||
<h2>You've claimed port <span class="js-serviceport">{{serviceport}}</span></h2>
|
<h2>You've claimed port <span class="js-serviceport">{{serviceport}}</span></h2>
|
||||||
<p>Here's some ways you can use it:</p>
|
<p>Here's some ways you can use it:</p>
|
||||||
<div class="code-block"><pre><code>telebit tcp 3000 # forward all tcp traffic to localhost:3000
|
<pre><code>
|
||||||
|
telebit tcp 3000 # forward all tcp traffic to localhost:3000
|
||||||
telebit tcp /path/to/module # handle incoming tcp traffic with a node module
|
telebit tcp /path/to/module # handle incoming tcp traffic with a node module
|
||||||
telebit tcp none # remove all tcp handlers</code></pre>
|
telebit tcp none # remove all tcp handlers</code></pre>
|
||||||
</div>
|
</div>
|
||||||
<p>You can <em>always</em> use this port for <strong>SSH</strong>, even while you're using it for something else:</p>
|
<p>You can <em>always</em> use this port for <strong>SSH</strong>, even while you're using it for something else:</p>
|
||||||
<div class="code-block"><pre><code>telebit ssh 22
|
<pre><code>telebit ssh 22
|
||||||
|
|
||||||
|
ssh <span class="js-servername">{{servername}}</span> -p <span class="js-serviceport">{{serviceport}}</span></code></pre>
|
||||||
|
|
||||||
ssh <span class="js-servername">{{servername}}</span> -p <span class="js-serviceport">{{serviceport}}</span></code></pre></div>
|
|
||||||
</div -->
|
|
||||||
|
|
||||||
<script src="js/app.js"></script>
|
<script src="js/app.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
document.body.hidden = false;
|
document.body.hidden = false;
|
||||||
|
|
||||||
var hash = window.location.hash.replace(/^[\/#?]+/, '');
|
var hash = window.location.hash.substr(1);
|
||||||
var query = window.location.search;
|
var query = window.location.search;
|
||||||
|
|
||||||
function parseQuery(search) {
|
function parseQuery(search) {
|
||||||
|
|||||||
497
lib/remote.js
497
lib/remote.js
@ -11,7 +11,6 @@ var WebSocket = require('ws');
|
|||||||
var sni = require('sni');
|
var sni = require('sni');
|
||||||
var Packer = require('proxy-packer');
|
var Packer = require('proxy-packer');
|
||||||
var os = require('os');
|
var os = require('os');
|
||||||
var EventEmitter = require('events').EventEmitter;
|
|
||||||
|
|
||||||
function timeoutPromise(duration) {
|
function timeoutPromise(duration) {
|
||||||
return new PromiseA(function (resolve) {
|
return new PromiseA(function (resolve) {
|
||||||
@ -19,24 +18,15 @@ function timeoutPromise(duration) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function TelebitRemote(state) {
|
function _connect(state) {
|
||||||
// jshint latedef:false
|
// jshint latedef:false
|
||||||
|
var defaultHttpTimeout = (2 * 60);
|
||||||
if (!(this instanceof TelebitRemote)) {
|
var activityTimeout = state.activityTimeout || (defaultHttpTimeout - 5) * 1000;
|
||||||
return new TelebitRemote(state);
|
|
||||||
}
|
|
||||||
EventEmitter.call(this);
|
|
||||||
var me = this;
|
|
||||||
var priv = {};
|
|
||||||
|
|
||||||
//var defaultHttpTimeout = (2 * 60);
|
|
||||||
//var activityTimeout = state.activityTimeout || (defaultHttpTimeout - 5) * 1000;
|
|
||||||
var activityTimeout = 6 * 1000;
|
|
||||||
var pongTimeout = state.pongTimeout || 10*1000;
|
var pongTimeout = state.pongTimeout || 10*1000;
|
||||||
// Allow the tunnel client to be created with no token. This will prevent the connection from
|
// Allow the tunnel client to be created with no token. This will prevent the connection from
|
||||||
// being established initialy and allows the caller to use `.append` for the first token so
|
// being established initialy and allows the caller to use `.append` for the first token so
|
||||||
// they can get a promise that will provide feedback about invalid tokens.
|
// they can get a promise that will provide feedback about invalid tokens.
|
||||||
priv.tokens = [];
|
var tokens = [];
|
||||||
var auth;
|
var auth;
|
||||||
if(!state.sortingHat) {
|
if(!state.sortingHat) {
|
||||||
state.sortingHat = "./sorting-hat.js";
|
state.sortingHat = "./sorting-hat.js";
|
||||||
@ -45,7 +35,7 @@ function TelebitRemote(state) {
|
|||||||
if ('undefined' === state.token) {
|
if ('undefined' === state.token) {
|
||||||
throw new Error("passed string 'undefined' as token");
|
throw new Error("passed string 'undefined' as token");
|
||||||
}
|
}
|
||||||
priv.tokens.push(state.token);
|
tokens.push(state.token);
|
||||||
}
|
}
|
||||||
|
|
||||||
var wstunneler;
|
var wstunneler;
|
||||||
@ -53,24 +43,19 @@ function TelebitRemote(state) {
|
|||||||
var authsent = false;
|
var authsent = false;
|
||||||
var initialConnect = true;
|
var initialConnect = true;
|
||||||
|
|
||||||
priv.localclients = {};
|
var localclients = {};
|
||||||
var pausedClients = [];
|
var pausedClients = [];
|
||||||
var clientHandlers = {
|
var clientHandlers = {
|
||||||
add: function (conn, cid, tun) {
|
add: function (conn, cid, tun) {
|
||||||
priv.localclients[cid] = conn;
|
localclients[cid] = conn;
|
||||||
console.info("[connect] new client '" + tun.name + ":" + tun.serviceport + "' for '" + cid + "'"
|
console.info("[connect] new client '" + cid + "' for '" + tun.name + ":" + tun.serviceport + "' "
|
||||||
+ "(" + clientHandlers.count() + " clients)");
|
+ "(" + clientHandlers.count() + " clients)");
|
||||||
|
|
||||||
conn.tunnelCid = cid;
|
conn.tunnelCid = cid;
|
||||||
if (tun.data) {
|
|
||||||
conn.tunnelRead = tun.data.byteLength;
|
conn.tunnelRead = tun.data.byteLength;
|
||||||
} else {
|
|
||||||
conn.tunnelRead = 0;
|
|
||||||
}
|
|
||||||
conn.tunnelWritten = 0;
|
conn.tunnelWritten = 0;
|
||||||
|
|
||||||
conn.on('data', function onLocalData(chunk) {
|
conn.on('data', function onLocalData(chunk) {
|
||||||
//var chunk = conn.read();
|
|
||||||
if (conn.tunnelClosing) {
|
if (conn.tunnelClosing) {
|
||||||
console.warn("[onLocalData] received data for '"+cid+"' over socket after connection was ended");
|
console.warn("[onLocalData] received data for '"+cid+"' over socket after connection was ended");
|
||||||
return;
|
return;
|
||||||
@ -82,10 +67,8 @@ function TelebitRemote(state) {
|
|||||||
// down the data we are getting to send over. We also want to pause all active connections
|
// down the data we are getting to send over. We also want to pause all active connections
|
||||||
// if any connections are paused to make things more fair so one connection doesn't get
|
// if any connections are paused to make things more fair so one connection doesn't get
|
||||||
// stuff waiting for all other connections to finish because it tried writing near the border.
|
// stuff waiting for all other connections to finish because it tried writing near the border.
|
||||||
var bufSize = sendMessage(Packer.packHeader(tun, chunk));
|
var bufSize = wsHandlers.sendMessage(Packer.pack(tun, chunk));
|
||||||
// Sending 2 messages instead of copying the buffer
|
if (pausedClients.length || bufSize > 1024*1024) {
|
||||||
var bufSize2 = sendMessage(chunk);
|
|
||||||
if (pausedClients.length || (bufSize + bufSize2) > 1024*1024) {
|
|
||||||
// console.log('[onLocalData] paused connection', cid, 'to allow websocket to catch up');
|
// console.log('[onLocalData] paused connection', cid, 'to allow websocket to catch up');
|
||||||
conn.pause();
|
conn.pause();
|
||||||
pausedClients.push(conn);
|
pausedClients.push(conn);
|
||||||
@ -94,33 +77,32 @@ function TelebitRemote(state) {
|
|||||||
|
|
||||||
var sentEnd = false;
|
var sentEnd = false;
|
||||||
conn.on('end', function onLocalEnd() {
|
conn.on('end', function onLocalEnd() {
|
||||||
//console.info("[onLocalEnd] connection '" + cid + "' ended, will probably close soon");
|
console.info("[onLocalEnd] connection '" + cid + "' ended, will probably close soon");
|
||||||
conn.tunnelClosing = true;
|
conn.tunnelClosing = true;
|
||||||
if (!sentEnd) {
|
if (!sentEnd) {
|
||||||
sendMessage(Packer.packHeader(tun, null, 'end'));
|
wsHandlers.sendMessage(Packer.pack(tun, null, 'end'));
|
||||||
sentEnd = true;
|
sentEnd = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
conn.on('error', function onLocalError(err) {
|
conn.on('error', function onLocalError(err) {
|
||||||
console.info("[onLocalError] connection '" + cid + "' errored:", err);
|
console.info("[onLocalError] connection '" + cid + "' errored:", err);
|
||||||
if (!sentEnd) {
|
if (!sentEnd) {
|
||||||
var packBody = true;
|
wsHandlers.sendMessage(Packer.pack(tun, {message: err.message, code: err.code}, 'error'));
|
||||||
sendMessage(Packer.packHeader(tun, {message: err.message, code: err.code}, 'error', packBody));
|
|
||||||
sentEnd = true;
|
sentEnd = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
conn.on('close', function onLocalClose(hadErr) {
|
conn.on('close', function onLocalClose(hadErr) {
|
||||||
delete priv.localclients[cid];
|
delete localclients[cid];
|
||||||
console.log('[onLocalClose] closed "' + cid + '" read:'+conn.tunnelRead+', wrote:'+conn.tunnelWritten+' (' + clientHandlers.count() + ' clients)');
|
console.log('[onLocalClose] closed "' + cid + '" read:'+conn.tunnelRead+', wrote:'+conn.tunnelWritten+' (' + clientHandlers.count() + ' clients)');
|
||||||
if (!sentEnd) {
|
if (!sentEnd) {
|
||||||
sendMessage(Packer.packHeader(tun, null, hadErr && 'error' || 'end'));
|
wsHandlers.sendMessage(Packer.pack(tun, null, hadErr && 'error' || 'end'));
|
||||||
sentEnd = true;
|
sentEnd = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
, write: function (cid, opts) {
|
, write: function (cid, opts) {
|
||||||
var conn = priv.localclients[cid];
|
var conn = localclients[cid];
|
||||||
if (!conn) {
|
if (!conn) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -137,13 +119,11 @@ function TelebitRemote(state) {
|
|||||||
conn.tunnelRead += opts.data.byteLength;
|
conn.tunnelRead += opts.data.byteLength;
|
||||||
|
|
||||||
if (!conn.remotePaused && conn.bufferSize > 1024*1024) {
|
if (!conn.remotePaused && conn.bufferSize > 1024*1024) {
|
||||||
var packBody = true;
|
wsHandlers.sendMessage(Packer.pack(opts, conn.tunnelRead, 'pause'));
|
||||||
sendMessage(Packer.packHeader(opts, conn.tunnelRead, 'pause', packBody));
|
|
||||||
conn.remotePaused = true;
|
conn.remotePaused = true;
|
||||||
|
|
||||||
conn.once('drain', function () {
|
conn.once('drain', function () {
|
||||||
var packBody = true;
|
wsHandlers.sendMessage(Packer.pack(opts, conn.tunnelRead, 'resume'));
|
||||||
sendMessage(Packer.packHeader(opts, conn.tunnelRead, 'resume', packBody));
|
|
||||||
conn.remotePaused = false;
|
conn.remotePaused = false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -151,13 +131,13 @@ function TelebitRemote(state) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
, closeSingle: function (cid) {
|
, closeSingle: function (cid) {
|
||||||
if (!priv.localclients[cid]) {
|
if (!localclients[cid]) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//console.log('[closeSingle]', cid);
|
console.log('[closeSingle]', cid);
|
||||||
PromiseA.resolve().then(function () {
|
PromiseA.resolve().then(function () {
|
||||||
var conn = priv.localclients[cid];
|
var conn = localclients[cid];
|
||||||
conn.tunnelClosing = true;
|
conn.tunnelClosing = true;
|
||||||
conn.end();
|
conn.end();
|
||||||
|
|
||||||
@ -175,49 +155,40 @@ function TelebitRemote(state) {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
}).then(function () {
|
}).then(function () {
|
||||||
if (priv.localclients[cid]) {
|
if (localclients[cid]) {
|
||||||
console.warn('[closeSingle]', cid, 'connection still present after calling `end`');
|
console.warn('[closeSingle]', cid, 'connection still present after calling `end`');
|
||||||
priv.localclients[cid].destroy();
|
localclients[cid].destroy();
|
||||||
return timeoutPromise(500);
|
return timeoutPromise(500);
|
||||||
}
|
}
|
||||||
}).then(function () {
|
}).then(function () {
|
||||||
if (priv.localclients[cid]) {
|
if (localclients[cid]) {
|
||||||
console.error('[closeSingle]', cid, 'connection still present after calling `destroy`');
|
console.error('[closeSingle]', cid, 'connection still present after calling `destroy`');
|
||||||
delete priv.localclients[cid];
|
delete localclients[cid];
|
||||||
}
|
}
|
||||||
}).catch(function (err) {
|
}).catch(function (err) {
|
||||||
console.error('[closeSingle] failed to close connection', cid, err.toString());
|
console.error('[closeSingle] failed to close connection', cid, err.toString());
|
||||||
delete priv.localclients[cid];
|
delete localclients[cid];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
, closeAll: function () {
|
, closeAll: function () {
|
||||||
console.log('[closeAll]');
|
console.log('[closeAll]');
|
||||||
Object.keys(priv.localclients).forEach(function (cid) {
|
Object.keys(localclients).forEach(function (cid) {
|
||||||
clientHandlers.closeSingle(cid);
|
clientHandlers.closeSingle(cid);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
, count: function () {
|
, count: function () {
|
||||||
return Object.keys(priv.localclients).length;
|
return Object.keys(localclients).length;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
var pendingCommands = {};
|
var pendingCommands = {};
|
||||||
function sendMessage(msg) {
|
|
||||||
// There is a chance that this occurred after the websocket was told to close
|
|
||||||
// and before it finished, in which case we don't need to log the error.
|
|
||||||
if (wstunneler.readyState !== wstunneler.CLOSING) {
|
|
||||||
wstunneler.send(msg, {binary: true});
|
|
||||||
return wstunneler.bufferedAmount;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
function sendCommand(name) {
|
function sendCommand(name) {
|
||||||
var id = Math.ceil(1e9 * Math.random());
|
var id = Math.ceil(1e9 * Math.random());
|
||||||
var cmd = [id, name].concat(Array.prototype.slice.call(arguments, 1));
|
var cmd = [id, name].concat(Array.prototype.slice.call(arguments, 1));
|
||||||
if (state.debug) { console.log('[DEBUG] command sending', cmd); }
|
if (state.debug) { console.log('[DEBUG] command sending', cmd); }
|
||||||
|
|
||||||
var packBody = true;
|
wsHandlers.sendMessage(Packer.pack(null, cmd, 'control'));
|
||||||
sendMessage(Packer.packHeader(null, cmd, 'control', packBody));
|
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
if (pendingCommands[id]) {
|
if (pendingCommands[id]) {
|
||||||
console.warn('command', name, id, 'timed out');
|
console.warn('command', name, id, 'timed out');
|
||||||
@ -240,6 +211,24 @@ function TelebitRemote(state) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function sendAllTokens() {
|
||||||
|
if (auth) {
|
||||||
|
authsent = true;
|
||||||
|
sendCommand('auth', auth).catch(function (err) { console.error('1', err); });
|
||||||
|
}
|
||||||
|
tokens.forEach(function (jwtoken) {
|
||||||
|
if (state.debug) { console.log('[DEBUG] send token'); }
|
||||||
|
authsent = true;
|
||||||
|
sendCommand('add_token', jwtoken)
|
||||||
|
.catch(function (err) {
|
||||||
|
console.error('failed re-adding token', jwtoken, 'after reconnect', err);
|
||||||
|
// Not sure if we should do something like remove the token here. It worked
|
||||||
|
// once or it shouldn't have stayed in the list, so it's less certain why
|
||||||
|
// it would have failed here.
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function noHandler(cmd) {
|
function noHandler(cmd) {
|
||||||
console.warn("[telebit] state.handlers['" + cmd[1] + "'] not set");
|
console.warn("[telebit] state.handlers['" + cmd[1] + "'] not set");
|
||||||
console.warn(cmd[2]);
|
console.warn(cmd[2]);
|
||||||
@ -247,23 +236,6 @@ function TelebitRemote(state) {
|
|||||||
|
|
||||||
var connCallback;
|
var connCallback;
|
||||||
|
|
||||||
function hyperPeek(tun) {
|
|
||||||
var m;
|
|
||||||
var str;
|
|
||||||
if (tun.data) {
|
|
||||||
if ('http' === tun.service) {
|
|
||||||
str = tun.data.toString();
|
|
||||||
m = str.match(/(?:^|[\r\n])Host: ([^\r\n]+)[\r\n]*/im);
|
|
||||||
tun._name = tun._hostname = (m && m[1].toLowerCase() || '').split(':')[0];
|
|
||||||
}
|
|
||||||
else if ('https' === tun.service || 'tls' === tun.service) {
|
|
||||||
tun._name = tun._servername = sni(tun.data);
|
|
||||||
} else {
|
|
||||||
tun._name = '';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var packerHandlers = {
|
var packerHandlers = {
|
||||||
oncontrol: function (opts) {
|
oncontrol: function (opts) {
|
||||||
var cmd, err;
|
var cmd, err;
|
||||||
@ -295,21 +267,7 @@ function TelebitRemote(state) {
|
|||||||
|
|
||||||
if (cmd[1] === 'hello') {
|
if (cmd[1] === 'hello') {
|
||||||
if (state.debug) { console.log('[DEBUG] hello received'); }
|
if (state.debug) { console.log('[DEBUG] hello received'); }
|
||||||
if (auth) {
|
sendAllTokens();
|
||||||
authsent = true;
|
|
||||||
sendCommand('auth', auth).catch(function (err) { console.error('1', err); });
|
|
||||||
}
|
|
||||||
priv.tokens.forEach(function (jwtoken) {
|
|
||||||
if (state.debug) { console.log('[DEBUG] send token'); }
|
|
||||||
authsent = true;
|
|
||||||
sendCommand('add_token', jwtoken)
|
|
||||||
.catch(function (err) {
|
|
||||||
console.error('failed re-adding token', jwtoken, 'after reconnect', err);
|
|
||||||
// Not sure if we should do something like remove the token here. It worked
|
|
||||||
// once or it shouldn't have stayed in the list, so it's less certain why
|
|
||||||
// it would have failed here.
|
|
||||||
});
|
|
||||||
});
|
|
||||||
if (connCallback) {
|
if (connCallback) {
|
||||||
connCallback();
|
connCallback();
|
||||||
}
|
}
|
||||||
@ -336,19 +294,28 @@ function TelebitRemote(state) {
|
|||||||
err = { message: 'unknown command "'+cmd[1]+'"', code: 'E_UNKNOWN_COMMAND' };
|
err = { message: 'unknown command "'+cmd[1]+'"', code: 'E_UNKNOWN_COMMAND' };
|
||||||
}
|
}
|
||||||
|
|
||||||
var packBody = true;
|
wsHandlers.sendMessage(Packer.pack(null, [-cmd[0], err], 'control'));
|
||||||
sendMessage(Packer.packHeader(null, [-cmd[0], err], 'control', packBody));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
, onconnection: function (tun) {
|
, onmessage: function (tun) {
|
||||||
var cid = tun._id = Packer.addrToId(tun);
|
var cid = tun._id = Packer.addrToId(tun);
|
||||||
|
var str;
|
||||||
|
var m;
|
||||||
|
|
||||||
// this data should have been gathered already as part of the proxy protocol
|
if ('http' === tun.service) {
|
||||||
// but if it's available again here we can double check
|
str = tun.data.toString();
|
||||||
hyperPeek(tun);
|
m = str.match(/(?:^|[\r\n])Host: ([^\r\n]+)[\r\n]*/im);
|
||||||
|
tun._name = tun._hostname = (m && m[1].toLowerCase() || '').split(':')[0];
|
||||||
|
}
|
||||||
|
else if ('https' === tun.service || 'tls' === tun.service) {
|
||||||
|
tun._name = tun._servername = sni(tun.data);
|
||||||
|
} else {
|
||||||
|
tun._name = '';
|
||||||
|
}
|
||||||
|
|
||||||
// TODO use readable streams instead
|
if (clientHandlers.write(cid, tun)) { return; }
|
||||||
wstunneler._socket.pause();
|
|
||||||
|
wstunneler.pause();
|
||||||
require(state.sortingHat).assign(state, tun, function (err, conn) {
|
require(state.sortingHat).assign(state, tun, function (err, conn) {
|
||||||
if (err) {
|
if (err) {
|
||||||
err.message = err.message.replace(/:tun_id/, tun._id);
|
err.message = err.message.replace(/:tun_id/, tun._id);
|
||||||
@ -357,46 +324,32 @@ function TelebitRemote(state) {
|
|||||||
}
|
}
|
||||||
clientHandlers.add(conn, cid, tun);
|
clientHandlers.add(conn, cid, tun);
|
||||||
if (tun.data) { conn.write(tun.data); }
|
if (tun.data) { conn.write(tun.data); }
|
||||||
wstunneler._socket.resume();
|
wstunneler.resume();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
, onmessage: function (tun) {
|
|
||||||
var cid = tun._id = Packer.addrToId(tun);
|
|
||||||
var handled;
|
|
||||||
|
|
||||||
hyperPeek(tun);
|
|
||||||
|
|
||||||
handled = clientHandlers.write(cid, tun);
|
|
||||||
|
|
||||||
// quasi backwards compat
|
|
||||||
if (!handled) { console.log("[debug] did not get 'connection' event"); packerHandlers.onconnection(tun); }
|
|
||||||
}
|
|
||||||
|
|
||||||
, onpause: function (opts) {
|
, onpause: function (opts) {
|
||||||
var cid = Packer.addrToId(opts);
|
var cid = Packer.addrToId(opts);
|
||||||
if (priv.localclients[cid]) {
|
if (localclients[cid]) {
|
||||||
console.log("[TunnelPause] pausing '"+cid+"', remote received", opts.data.toString(), 'of', priv.localclients[cid].tunnelWritten, 'sent');
|
console.log("[TunnelPause] pausing '"+cid+"', remote received", opts.data.toString(), 'of', localclients[cid].tunnelWritten, 'sent');
|
||||||
priv.localclients[cid].manualPause = true;
|
localclients[cid].manualPause = true;
|
||||||
priv.localclients[cid].pause();
|
localclients[cid].pause();
|
||||||
} else {
|
} else {
|
||||||
console.log('[TunnelPause] remote tried pausing finished connection', cid);
|
console.log('[TunnelPause] remote tried pausing finished connection', cid);
|
||||||
// Often we have enough latency that we've finished sending before we're told to pause, so
|
// Often we have enough latency that we've finished sending before we're told to pause, so
|
||||||
// don't worry about sending back errors, since we won't be sending data over anyway.
|
// don't worry about sending back errors, since we won't be sending data over anyway.
|
||||||
// var packBody = true;
|
// wsHandlers.sendMessage(Packer.pack(opts, {message: 'no matching connection', code: 'E_NO_CONN'}, 'error'));
|
||||||
// sendMessage(Packer.packHeader(opts, {message: 'no matching connection', code: 'E_NO_CONN'}, 'error', packBody));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
, onresume: function (opts) {
|
, onresume: function (opts) {
|
||||||
var cid = Packer.addrToId(opts);
|
var cid = Packer.addrToId(opts);
|
||||||
if (priv.localclients[cid]) {
|
if (localclients[cid]) {
|
||||||
console.log("[TunnelResume] resuming '"+cid+"', remote received", opts.data.toString(), 'of', priv.localclients[cid].tunnelWritten, 'sent');
|
console.log("[TunnelResume] resuming '"+cid+"', remote received", opts.data.toString(), 'of', localclients[cid].tunnelWritten, 'sent');
|
||||||
priv.localclients[cid].manualPause = false;
|
localclients[cid].manualPause = false;
|
||||||
priv.localclients[cid].resume();
|
localclients[cid].resume();
|
||||||
} else {
|
} else {
|
||||||
console.log('[TunnelResume] remote tried resuming finished connection', cid);
|
console.log('[TunnelResume] remote tried resuming finished connection', cid);
|
||||||
// var packBody = true;
|
// wsHandlers.sendMessage(Packer.pack(opts, {message: 'no matching connection', code: 'E_NO_CONN'}, 'error'));
|
||||||
// sendMessage(Packer.packHeader(opts, {message: 'no matching connection', code: 'E_NO_CONN'}, 'error', packBody));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -413,74 +366,56 @@ function TelebitRemote(state) {
|
|||||||
|
|
||||||
, _onConnectError: function (cid, opts, err) {
|
, _onConnectError: function (cid, opts, err) {
|
||||||
console.info("[_onConnectError] opening '" + cid + "' failed because " + err.message);
|
console.info("[_onConnectError] opening '" + cid + "' failed because " + err.message);
|
||||||
sendMessage(Packer.packHeader(opts, null, 'error'));
|
wsHandlers.sendMessage(Packer.pack(opts, null, 'error'));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
priv.timeoutId = null;
|
var lastActivity;
|
||||||
priv.lastActivity = Date.now();
|
var timeoutId;
|
||||||
priv.refreshTimeout = function refreshTimeout() {
|
var wsHandlers = {
|
||||||
priv.lastActivity = Date.now();
|
refreshTimeout: function () {
|
||||||
};
|
lastActivity = Date.now();
|
||||||
priv.checkTimeout = function checkTimeout() {
|
}
|
||||||
|
, checkTimeout: function () {
|
||||||
if (!wstunneler) {
|
if (!wstunneler) {
|
||||||
console.warn('checkTimeout called when websocket already closed');
|
console.warn('checkTimeout called when websocket already closed');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Determine how long the connection has been "silent", ie no activity.
|
// Determine how long the connection has been "silent", ie no activity.
|
||||||
var silent = Date.now() - priv.lastActivity;
|
var silent = Date.now() - lastActivity;
|
||||||
|
|
||||||
// If we have had activity within the last activityTimeout then all we need to do is
|
// If we have had activity within the last activityTimeout then all we need to do is
|
||||||
// call this function again at the soonest time when the connection could be timed out.
|
// call this function again at the soonest time when the connection could be timed out.
|
||||||
if (silent < activityTimeout) {
|
if (silent < activityTimeout) {
|
||||||
priv.timeoutId = setTimeout(priv.checkTimeout, activityTimeout-silent);
|
timeoutId = setTimeout(wsHandlers.checkTimeout, activityTimeout-silent);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Otherwise we check to see if the pong has also timed out, and if not we send a ping
|
// Otherwise we check to see if the pong has also timed out, and if not we send a ping
|
||||||
// and call this function again when the pong will have timed out.
|
// and call this function again when the pong will have timed out.
|
||||||
else if (silent < activityTimeout + pongTimeout) {
|
else if (silent < activityTimeout + pongTimeout) {
|
||||||
//console.log('DEBUG: pinging tunnel server');
|
console.log('pinging tunnel server');
|
||||||
try {
|
try {
|
||||||
wstunneler.ping();
|
wstunneler.ping();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn('failed to ping tunnel server', err);
|
console.warn('failed to ping tunnel server', err);
|
||||||
}
|
}
|
||||||
priv.timeoutId = setTimeout(priv.checkTimeout, pongTimeout);
|
timeoutId = setTimeout(wsHandlers.checkTimeout, pongTimeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Last case means the ping we sent before didn't get a response soon enough, so we
|
// Last case means the ping we sent before didn't get a response soon enough, so we
|
||||||
// need to close the websocket connection.
|
// need to close the websocket connection.
|
||||||
else {
|
else {
|
||||||
console.info('[info] closing due to connection timeout');
|
console.log('connection timed out');
|
||||||
wstunneler.close(1000, 'connection timeout');
|
wstunneler.close(1000, 'connection timeout');
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
me.destroy = function destroy() {
|
|
||||||
console.info('[info] destroy()');
|
|
||||||
try {
|
|
||||||
//wstunneler.close(1000, 're-connect');
|
|
||||||
wstunneler._socket.destroy();
|
|
||||||
} catch(e) {
|
|
||||||
// ignore
|
|
||||||
}
|
}
|
||||||
};
|
|
||||||
me.connect = function connect() {
|
|
||||||
if (!priv.tokens.length && state.config.email) {
|
|
||||||
auth = TelebitRemote._tokenFromState(state);
|
|
||||||
}
|
|
||||||
priv.timeoutId = null;
|
|
||||||
var machine = Packer.create(packerHandlers);
|
|
||||||
|
|
||||||
console.info("[telebit:lib/remote.js] [connect] '" + (state.wss || state.relay) + "'");
|
, onOpen: function () {
|
||||||
var tunnelUrl = (state.wss || state.relay).replace(/\/$/, '') + '/'; // + auth;
|
console.info("[open] connected to '" + (state.wss || state.relay) + "'");
|
||||||
wstunneler = new WebSocket(tunnelUrl, { rejectUnauthorized: !state.insecure });
|
wsHandlers.refreshTimeout();
|
||||||
// XXXXXX
|
|
||||||
wstunneler.on('open', function () {
|
timeoutId = setTimeout(wsHandlers.checkTimeout, activityTimeout);
|
||||||
console.info("[telebit:lib/remote.js] [open] connected to '" + (state.wss || state.relay) + "'");
|
|
||||||
me.emit('connect');
|
|
||||||
priv.refreshTimeout();
|
|
||||||
priv.timeoutId = setTimeout(priv.checkTimeout, activityTimeout);
|
|
||||||
wstunneler._socket.on('drain', function () {
|
wstunneler._socket.on('drain', function () {
|
||||||
// the websocket library has it's own buffer apart from node's socket buffer, but that one
|
// the websocket library has it's own buffer apart from node's socket buffer, but that one
|
||||||
// is much more difficult to watch, so we watch for the lower level buffer to drain and
|
// is much more difficult to watch, so we watch for the lower level buffer to drain and
|
||||||
@ -497,13 +432,22 @@ function TelebitRemote(state) {
|
|||||||
conn.resume();
|
conn.resume();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
pausedClients.length = 0;
|
pausedClients.length = 0;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
//Call either Open or Reconnect handlers.
|
||||||
|
if(state.handlers.onOpen && initialConnect) {
|
||||||
|
state.handlers.onOpen();
|
||||||
|
} else if (state.handlers.onReconnect && !initialConnect) {
|
||||||
|
state.handlers.onReconnect();
|
||||||
|
}
|
||||||
initialConnect = false;
|
initialConnect = false;
|
||||||
});
|
}
|
||||||
wstunneler.on('close', function () {
|
|
||||||
console.info("[info] [closing] received close signal from relay");
|
, onClose: function () {
|
||||||
clearTimeout(priv.timeoutId);
|
clearTimeout(timeoutId);
|
||||||
|
wstunneler = null;
|
||||||
clientHandlers.closeAll();
|
clientHandlers.closeAll();
|
||||||
|
|
||||||
var error = new Error('websocket connection closed before response');
|
var error = new Error('websocket connection closed before response');
|
||||||
@ -515,44 +459,67 @@ function TelebitRemote(state) {
|
|||||||
connCallback(error);
|
connCallback(error);
|
||||||
}
|
}
|
||||||
|
|
||||||
me.emit('close');
|
if (!authenticated) {
|
||||||
});
|
if(state.handlers.onError) {
|
||||||
wstunneler.on('error', function (err) {
|
var err = new Error('Failed to connect on first attempt... check authentication');
|
||||||
me.emit('error', err);
|
state.handlers.onError(err);
|
||||||
});
|
}
|
||||||
|
if(state.handlers.onClose) {
|
||||||
|
state.handlers.onClose();
|
||||||
|
}
|
||||||
|
console.info('[close] failed on first attempt... check authentication.');
|
||||||
|
timeoutId = null;
|
||||||
|
}
|
||||||
|
else if (tokens.length) {
|
||||||
|
if(state.handlers.onDisconnect) {
|
||||||
|
state.handlers.onDisconnect();
|
||||||
|
}
|
||||||
|
console.info('[retry] disconnected and waiting...');
|
||||||
|
timeoutId = setTimeout(connect, 5000);
|
||||||
|
} else {
|
||||||
|
if(state.handlers.onClose) {
|
||||||
|
state.handlers.onClose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Our library will automatically handle sending the pong respose to ping requests.
|
, onError: function (err) {
|
||||||
wstunneler.on('ping', priv.refreshTimeout);
|
if ('ENOTFOUND' === err.code) {
|
||||||
wstunneler.on('pong', function () {
|
// DNS issue, probably network is disconnected
|
||||||
//console.log('DEBUG received pong');
|
timeoutId = setTimeout(connect, 90 * 1000);
|
||||||
priv.refreshTimeout();
|
|
||||||
});
|
|
||||||
wstunneler.on('message', function (data, flags) {
|
|
||||||
priv.refreshTimeout();
|
|
||||||
if (data.error || '{' === data[0]) {
|
|
||||||
console.log(data);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
machine.fns.addChunk(data, flags);
|
console.error("[tunnel error] " + err.message);
|
||||||
});
|
console.error(err);
|
||||||
};
|
if (connCallback) {
|
||||||
me.end = function() {
|
connCallback(err);
|
||||||
priv.tokens.length = 0;
|
}
|
||||||
if (priv.timeoutId) {
|
|
||||||
clearTimeout(priv.timeoutId);
|
|
||||||
priv.timeoutId = null;
|
|
||||||
}
|
}
|
||||||
console.info('[info] closing due to tr.end()');
|
|
||||||
wstunneler.close(1000, 're-connect');
|
|
||||||
wstunneler.on('close', function () {
|
|
||||||
me.emit('end');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
TelebitRemote.prototype = EventEmitter.prototype;
|
, sendMessage: function (msg) {
|
||||||
TelebitRemote._tokenFromState = function (state) {
|
if (wstunneler) {
|
||||||
return {
|
try {
|
||||||
|
wstunneler.send(msg, {binary: true});
|
||||||
|
return wstunneler.bufferedAmount;
|
||||||
|
} catch (err) {
|
||||||
|
// There is a chance that this occurred after the websocket was told to close
|
||||||
|
// and before it finished, in which case we don't need to log the error.
|
||||||
|
if (wstunneler.readyState !== wstunneler.CLOSING) {
|
||||||
|
console.warn('[sendMessage] error sending websocket message', err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
function connect() {
|
||||||
|
if (wstunneler) {
|
||||||
|
console.warn('attempted to connect with connection already active');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!tokens.length) {
|
||||||
|
if (state.config.email) {
|
||||||
|
auth = {
|
||||||
subject: state.config.email
|
subject: state.config.email
|
||||||
, subject_scheme: 'mailto'
|
, subject_scheme: 'mailto'
|
||||||
// TODO create domains list earlier
|
// TODO create domains list earlier
|
||||||
@ -565,19 +532,131 @@ TelebitRemote._tokenFromState = function (state) {
|
|||||||
, os_release: os.release()
|
, os_release: os.release()
|
||||||
, os_arch: os.arch()
|
, os_arch: os.arch()
|
||||||
};
|
};
|
||||||
};
|
}
|
||||||
|
}
|
||||||
|
timeoutId = null;
|
||||||
|
var machine = Packer.create(packerHandlers);
|
||||||
|
|
||||||
TelebitRemote.create = function (opts) {
|
console.info("[connect] '" + (state.wss || state.relay) + "'");
|
||||||
return new TelebitRemote(opts);
|
var tunnelUrl = (state.wss || state.relay).replace(/\/$/, '') + '/'; // + auth;
|
||||||
};
|
wstunneler = new WebSocket(tunnelUrl, { rejectUnauthorized: !state.insecure });
|
||||||
TelebitRemote.createConnection = function (opts, cb) {
|
wstunneler.on('open', wsHandlers.onOpen);
|
||||||
var tunnel = TelebitRemote.create(opts);
|
wstunneler.on('close', wsHandlers.onClose);
|
||||||
tunnel.connect(opts);
|
wstunneler.on('error', wsHandlers.onError);
|
||||||
tunnel.once('connect', cb);
|
|
||||||
return tunnel;
|
|
||||||
};
|
|
||||||
TelebitRemote.connect = TelebitRemote.createConnection;
|
|
||||||
|
|
||||||
module.exports.TelebitRemote = TelebitRemote;
|
// Our library will automatically handle sending the pong respose to ping requests.
|
||||||
|
wstunneler.on('ping', wsHandlers.refreshTimeout);
|
||||||
|
wstunneler.on('pong', wsHandlers.refreshTimeout);
|
||||||
|
wstunneler.on('message', function (data, flags) {
|
||||||
|
wsHandlers.refreshTimeout();
|
||||||
|
if (data.error || '{' === data[0]) {
|
||||||
|
console.log(data);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
machine.fns.addChunk(data, flags);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
connect();
|
||||||
|
|
||||||
|
var connPromise;
|
||||||
|
return {
|
||||||
|
end: function(cb) {
|
||||||
|
tokens.length = 0;
|
||||||
|
if (timeoutId) {
|
||||||
|
clearTimeout(timeoutId);
|
||||||
|
timeoutId = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (wstunneler) {
|
||||||
|
try {
|
||||||
|
wstunneler.close(cb);
|
||||||
|
} catch(e) {
|
||||||
|
console.error("[error] wstunneler.close()");
|
||||||
|
console.error(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
, append: function (token) {
|
||||||
|
if (!token) {
|
||||||
|
throw new Error("attempted to append empty token");
|
||||||
|
}
|
||||||
|
if ('undefined' === token) {
|
||||||
|
throw new Error("attempted to append token as the string 'undefined'");
|
||||||
|
}
|
||||||
|
if (tokens.indexOf(token) >= 0) {
|
||||||
|
return PromiseA.resolve();
|
||||||
|
}
|
||||||
|
tokens.push(token);
|
||||||
|
var prom;
|
||||||
|
if (tokens.length === 1 && !wstunneler) {
|
||||||
|
// We just added the only token in the list, and the websocket connection isn't up
|
||||||
|
// so we need to restart the connection.
|
||||||
|
if (timeoutId) {
|
||||||
|
// Handle the case were the last token was removed and this token added between
|
||||||
|
// reconnect attempts to make sure we don't try openning multiple connections.
|
||||||
|
clearTimeout(timeoutId);
|
||||||
|
timeoutId = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// We want this case to behave as much like the other case as we can, but we don't have
|
||||||
|
// the same kind of reponses when we open brand new connections, so we have to rely on
|
||||||
|
// the 'hello' and the 'un-associated' error commands to determine if the token is good.
|
||||||
|
prom = connPromise = new PromiseA(function (resolve, reject) {
|
||||||
|
connCallback = function (err) {
|
||||||
|
connCallback = null;
|
||||||
|
connPromise = null;
|
||||||
|
if (err) {
|
||||||
|
reject(err);
|
||||||
|
} else {
|
||||||
|
resolve();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
connect();
|
||||||
|
}
|
||||||
|
else if (connPromise) {
|
||||||
|
prom = connPromise.then(function () {
|
||||||
|
return sendCommand('add_token', token);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
prom = sendCommand('add_token', token);
|
||||||
|
}
|
||||||
|
|
||||||
|
prom.catch(function (err) {
|
||||||
|
console.error('adding token', token, 'failed:', err);
|
||||||
|
// Most probably an invalid token of some kind, so we don't really want to keep it.
|
||||||
|
tokens.splice(tokens.indexOf(token), 1);
|
||||||
|
});
|
||||||
|
|
||||||
|
return prom;
|
||||||
|
}
|
||||||
|
, clear: function (token) {
|
||||||
|
if (typeof token === 'undefined') {
|
||||||
|
token = '*';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (token === '*') {
|
||||||
|
tokens.length = 0;
|
||||||
|
} else {
|
||||||
|
var index = tokens.indexOf(token);
|
||||||
|
if (index < 0) {
|
||||||
|
return PromiseA.resolve();
|
||||||
|
}
|
||||||
|
tokens.splice(index);
|
||||||
|
}
|
||||||
|
|
||||||
|
var prom = sendCommand('delete_token', token);
|
||||||
|
prom.catch(function (err) {
|
||||||
|
console.error('clearing token', token, 'failed:', err);
|
||||||
|
});
|
||||||
|
|
||||||
|
return prom;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports.connect = _connect;
|
||||||
|
module.exports.createConnection = _connect;
|
||||||
|
|
||||||
}());
|
}());
|
||||||
|
|||||||
@ -59,7 +59,7 @@ module.exports.print = function (config) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
module.exports.assign = function (state, tun, cb) {
|
module.exports.assign = function (state, tun, cb) {
|
||||||
//console.log('first message from', tun);
|
console.log('first message from', tun);
|
||||||
var net = state.net || require('net');
|
var net = state.net || require('net');
|
||||||
|
|
||||||
function trySsh(tun, cb) {
|
function trySsh(tun, cb) {
|
||||||
@ -157,15 +157,15 @@ module.exports.assign = function (state, tun, cb) {
|
|||||||
//if (tun.data) { conn.write(tun.data); }
|
//if (tun.data) { conn.write(tun.data); }
|
||||||
return conn;
|
return conn;
|
||||||
}
|
}
|
||||||
function fileDirTcp(opts, cb) {
|
function fileDirTcp(conf, cb) {
|
||||||
var socketPair = require('socket-pair');
|
var socketPair = require('socket-pair');
|
||||||
var conn = socketPair.create(function (err, other) {
|
var conn = socketPair.create(function (err, other) {
|
||||||
if (err) { cb(err); return; }
|
if (err) { cb(err); return; }
|
||||||
|
|
||||||
if (opts.stat.isFile()) {
|
if (conf._stat.isFile()) {
|
||||||
fs.createReadStream(opts.config.handler).pipe(other);
|
fs.createReadStream(conf.handler).pipe(other);
|
||||||
} else {
|
} else {
|
||||||
fs.readdir(opts.config.handler, function (err, nodes) {
|
fs.readdir(conf.handler, function (err, nodes) {
|
||||||
other.write('\n' + nodes.join('\n') + '\n\n');
|
other.write('\n' + nodes.join('\n') + '\n\n');
|
||||||
other.end();
|
other.end();
|
||||||
});
|
});
|
||||||
@ -282,7 +282,8 @@ module.exports.assign = function (state, tun, cb) {
|
|||||||
errorTcp(conf, cb);
|
errorTcp(conf, cb);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
fileDirTcp({ config: conf, stat: stat }, cb);
|
conf._stat = stat;
|
||||||
|
fileDirTcp(conf, cb);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -328,15 +329,15 @@ module.exports.assign = function (state, tun, cb) {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
handler = require(handlerpath);
|
handler = require(handlerpath);
|
||||||
console.info("Trying to handle '" + handle + ":" + id + "' with '" + handlerpath + "'");
|
console.info("Handling '" + handle + ":" + id + "' with '" + handlerpath + "'");
|
||||||
} catch(e1) {
|
} catch(e1) {
|
||||||
try {
|
try {
|
||||||
handler = require(path.join(localshare, handlerpath));
|
handler = require(path.join(localshare, handlerpath));
|
||||||
console.info("Skip. (couldn't require('" + handlerpath + "'):", e1.message + ")");
|
console.info("Handling '" + handle + ":" + id + "' with '" + handlerpath + "'");
|
||||||
console.info("Trying to handle '" + handle + ":" + id + "' with '" + handlerpath + "'");
|
|
||||||
} catch(e2) {
|
} catch(e2) {
|
||||||
console.info("Skip. (couldn't require('" + path.join(localshare, handlerpath) + "'):", e2.message + ")");
|
console.error("Failed to require('" + handlerpath + "'):", e1.message);
|
||||||
console.info("Last chance! (using static and index handlers for '" + handle + ":" + id + "')");
|
console.error("Failed to require('" + path.join(localshare, handlerpath) + "'):", e2.message);
|
||||||
|
console.warn("Trying static and index handlers for '" + handle + ":" + id + "'");
|
||||||
handler = null;
|
handler = null;
|
||||||
// fallthru
|
// fallthru
|
||||||
}
|
}
|
||||||
@ -362,47 +363,21 @@ module.exports.assign = function (state, tun, cb) {
|
|||||||
state._serveIndex = require('serve-index');
|
state._serveIndex = require('serve-index');
|
||||||
var serveIndex;
|
var serveIndex;
|
||||||
var serveStatic;
|
var serveStatic;
|
||||||
var dlStatic;
|
|
||||||
if (isFile) {
|
if (isFile) {
|
||||||
serveStatic = state._serveStatic(path.dirname(conf.handler), { dotfiles: 'allow', index: [ 'index.html' ] });
|
serveStatic = state._serveStatic(path.dirname(conf.handler), { dotfiles: 'allow', index: [ 'index.html' ] });
|
||||||
dlStatic = state._serveStatic(path.dirname(conf.handler), { acceptRanges: false, dotfiles: 'allow', index: [ 'index.html' ] });
|
|
||||||
serveIndex = function (req, res, next) { next(); };
|
serveIndex = function (req, res, next) { next(); };
|
||||||
isFile = path.basename(conf.handler);
|
isFile = path.basename(conf.handler);
|
||||||
} else {
|
} else {
|
||||||
serveStatic = state._serveStatic(conf.handler, { dotfiles: 'allow', index: [ 'index.html' ] });
|
serveStatic = state._serveStatic(conf.handler, { dotfiles: 'allow', index: [ 'index.html' ] });
|
||||||
dlStatic = state._serveStatic(conf.handler, { acceptRanges: false, dotfiles: 'allow', index: [ 'index.html' ] });
|
serveIndex = state._serveIndex(conf.handler, { hidden: true, icons: true, view: 'tiles' });
|
||||||
serveIndex = state._serveIndex(conf.handler, {
|
|
||||||
hidden: true, icons: true
|
|
||||||
, template: require('serve-tpl-attachment')({ privatefiles: 'ignore' })
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
handler = function (req, res) {
|
handler = function (req, res) {
|
||||||
var qIndex = req.url.indexOf('?');
|
|
||||||
var fIndex;
|
|
||||||
var fname;
|
|
||||||
if (-1 === qIndex) {
|
|
||||||
qIndex = req.url.length;
|
|
||||||
}
|
|
||||||
req.querystring = req.url.substr(qIndex);
|
|
||||||
req.url = req.url.substr(0, qIndex);
|
|
||||||
req.query = require('querystring').parse(req.querystring.substr(1));
|
|
||||||
if (isFile) {
|
if (isFile) {
|
||||||
req.url = '/' + isFile;
|
req.url = '/' + isFile;
|
||||||
}
|
}
|
||||||
//console.log('[req.query]', req.url, req.query);
|
|
||||||
if (req.query.download) {
|
|
||||||
fIndex = req.url.lastIndexOf('/');
|
|
||||||
fname = req.url.substr(fIndex + 1);
|
|
||||||
res.setHeader('Content-Disposition', 'attachment; filename="'+decodeURIComponent(fname)+'"');
|
|
||||||
res.setHeader('Content-Type', 'application/octet-stream');
|
|
||||||
dlStatic(req, res, function () {
|
|
||||||
serveIndex(req, res, state._finalHandler(req, res));
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
serveStatic(req, res, function () {
|
serveStatic(req, res, function () {
|
||||||
serveIndex(req, res, state._finalHandler(req, res));
|
serveIndex(req, res, state._finalHandler(req, res));
|
||||||
});
|
});
|
||||||
}
|
|
||||||
};
|
};
|
||||||
handlerservers[conf.handler] = http.createServer(handler);
|
handlerservers[conf.handler] = http.createServer(handler);
|
||||||
handlerservers[conf.handler].emit('connection', tlsSocket);
|
handlerservers[conf.handler].emit('connection', tlsSocket);
|
||||||
@ -452,7 +427,7 @@ module.exports.assign = function (state, tun, cb) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//console.log('https invokeHandler');
|
console.log('https invokeHandler');
|
||||||
invokeHandler(conf, tlsSocket, tun, id);
|
invokeHandler(conf, tlsSocket, tun, id);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@ -8,7 +8,6 @@ module.exports = function (pkg) {
|
|||||||
https.get(url, function (resp) {
|
https.get(url, function (resp) {
|
||||||
var str = '';
|
var str = '';
|
||||||
resp.on('data', function (chunk) {
|
resp.on('data', function (chunk) {
|
||||||
//var chunk = conn.read();
|
|
||||||
str += chunk.toString('utf8');
|
str += chunk.toString('utf8');
|
||||||
});
|
});
|
||||||
resp.on('end', function () {
|
resp.on('end', function () {
|
||||||
|
|||||||
10
package.json
10
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "telebit",
|
"name": "telebit",
|
||||||
"version": "0.20.251025",
|
"version": "0.19.23",
|
||||||
"description": "Break out of localhost. Connect to any device from anywhere over any tcp port or securely in a browser. A secure tunnel. A poor man's reverse VPN.",
|
"description": "Break out of localhost. Connect to any device from anywhere over any tcp port or securely in a browser. A secure tunnel. A poor man's reverse VPN.",
|
||||||
"main": "lib/remote.js",
|
"main": "lib/remote.js",
|
||||||
"files": [
|
"files": [
|
||||||
@ -59,18 +59,14 @@
|
|||||||
"js-yaml": "^3.11.0",
|
"js-yaml": "^3.11.0",
|
||||||
"jsonwebtoken": "^7.1.9",
|
"jsonwebtoken": "^7.1.9",
|
||||||
"mkdirp": "^0.5.1",
|
"mkdirp": "^0.5.1",
|
||||||
"proxy-packer": "^2.0.2",
|
"proxy-packer": "^1.4.3",
|
||||||
"ps-list": "^5.0.0",
|
|
||||||
"recase": "^1.0.4",
|
"recase": "^1.0.4",
|
||||||
"redirect-https": "^1.1.5",
|
"redirect-https": "^1.1.5",
|
||||||
"sclient": "^1.4.1",
|
|
||||||
"serve-index": "^1.9.1",
|
"serve-index": "^1.9.1",
|
||||||
"serve-static": "^1.13.2",
|
"serve-static": "^1.13.2",
|
||||||
"serve-tpl-attachment": "^1.0.4",
|
|
||||||
"sni": "^1.0.0",
|
"sni": "^1.0.0",
|
||||||
"socket-pair": "^1.0.3",
|
"socket-pair": "^1.0.3",
|
||||||
"toml": "^0.4.1",
|
"ws": "^2.2.3"
|
||||||
"ws": "^6.0.0"
|
|
||||||
},
|
},
|
||||||
"trulyOptionalDependencies": {
|
"trulyOptionalDependencies": {
|
||||||
"bluebird": "^3.5.1"
|
"bluebird": "^3.5.1"
|
||||||
|
|||||||
@ -54,8 +54,8 @@
|
|||||||
<string>{TELEBIT_PATH}</string>
|
<string>{TELEBIT_PATH}</string>
|
||||||
|
|
||||||
<key>StandardErrorPath</key>
|
<key>StandardErrorPath</key>
|
||||||
<string>{TELEBIT_LOG_DIR}/telebit.log</string>
|
<string>{TELEBIT_LOG_DIR}/error.log</string>
|
||||||
<key>StandardOutPath</key>
|
<key>StandardOutPath</key>
|
||||||
<string>{TELEBIT_LOG_DIR}/telebit.log</string>
|
<string>{TELEBIT_LOG_DIR}/info.log</string>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|||||||
@ -34,9 +34,9 @@ ExecReload=/bin/kill -USR1 $MAINPID
|
|||||||
# Use private /tmp and /var/tmp, which are discarded after this stops.
|
# Use private /tmp and /var/tmp, which are discarded after this stops.
|
||||||
PrivateTmp=true
|
PrivateTmp=true
|
||||||
# Use a minimal /dev
|
# Use a minimal /dev
|
||||||
PrivateDevices=true
|
;PrivateDevices=true
|
||||||
# Hide /home, /root, and /run/user. Nobody will steal your SSH-keys.
|
# Hide /home, /root, and /run/user. Nobody will steal your SSH-keys.
|
||||||
;ProtectHome=true
|
ProtectHome=true
|
||||||
# Make /usr, /boot, /etc and possibly some more folders read-only.
|
# Make /usr, /boot, /etc and possibly some more folders read-only.
|
||||||
ProtectSystem=full
|
ProtectSystem=full
|
||||||
# ... except for a few because we want a place for config, logs, etc
|
# ... except for a few because we want a place for config, logs, etc
|
||||||
@ -61,5 +61,4 @@ NoNewPrivileges=true
|
|||||||
; NoNewPrivileges=true
|
; NoNewPrivileges=true
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
# For userspace service
|
WantedBy=multi-user.target
|
||||||
WantedBy=default.target
|
|
||||||
|
|||||||
@ -63,8 +63,8 @@
|
|||||||
<string>{TELEBIT_PATH}</string>
|
<string>{TELEBIT_PATH}</string>
|
||||||
|
|
||||||
<key>StandardErrorPath</key>
|
<key>StandardErrorPath</key>
|
||||||
<string>{TELEBIT_LOG_DIR}/telebit.log</string>
|
<string>{TELEBIT_LOG_DIR}/error.log</string>
|
||||||
<key>StandardOutPath</key>
|
<key>StandardOutPath</key>
|
||||||
<string>{TELEBIT_LOG_DIR}/telebit.log</string>
|
<string>{TELEBIT_LOG_DIR}/info.log</string>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|||||||
@ -61,7 +61,4 @@ NoNewPrivileges=true
|
|||||||
; NoNewPrivileges=true
|
; NoNewPrivileges=true
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
# For system-level service
|
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
# For userspace service
|
|
||||||
;WantedBy=default.target
|
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 36 KiB |
@ -7,76 +7,6 @@ var exec = require('child_process').exec;
|
|||||||
var path = require('path');
|
var path = require('path');
|
||||||
|
|
||||||
var Launcher = module.exports;
|
var Launcher = module.exports;
|
||||||
Launcher._killAll = function (fn) {
|
|
||||||
var psList = require('ps-list');
|
|
||||||
psList().then(function (procs) {
|
|
||||||
procs.forEach(function (proc) {
|
|
||||||
if ('node' === proc.name && /\btelebitd\b/i.test(proc.cmd)) {
|
|
||||||
console.log(proc);
|
|
||||||
process.kill(proc.pid);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
// Two things:
|
|
||||||
// 1) wait to see if the process dies
|
|
||||||
// 2) wait to give time for the socket to connect
|
|
||||||
setTimeout(function () {
|
|
||||||
if (fn) { fn(null); return; }
|
|
||||||
}, 1.75 * 1000);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
Launcher._getError = function getError(err, stderr) {
|
|
||||||
if (err) { return err; }
|
|
||||||
if (stderr) {
|
|
||||||
err = new Error(stderr);
|
|
||||||
err.code = 'ELAUNCHER';
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
Launcher._detect = function (things, fn) {
|
|
||||||
if (things.launcher) {
|
|
||||||
if ('string' === typeof things.launcher) {
|
|
||||||
fn(null, things.launcher);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if ('function' === typeof things.launcher) {
|
|
||||||
things.launcher(things);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// could have used "command-exists" but I'm trying to stay low-dependency
|
|
||||||
// os.platform(), os.type()
|
|
||||||
if (!/^win/i.test(os.platform())) {
|
|
||||||
if (/^darwin/i.test(os.platform())) {
|
|
||||||
exec('command -v launchctl', things._execOpts, function (err, stdout, stderr) {
|
|
||||||
err = Launcher._getError(err, stderr);
|
|
||||||
fn(err, 'launchctl');
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
exec('command -v systemctl', things._execOpts, function (err, stdout, stderr) {
|
|
||||||
err = Launcher._getError(err, stderr);
|
|
||||||
fn(err, 'systemctl');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// https://stackoverflow.com/questions/17908789/how-to-add-an-item-to-registry-to-run-at-startup-without-uac
|
|
||||||
// wininit? regedit? SCM?
|
|
||||||
// REG ADD "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" /V "My App" /t REG_SZ /F /D "C:\MyAppPath\MyApp.exe"
|
|
||||||
// https://www.microsoft.com/developerblog/2015/11/09/reading-and-writing-to-the-windows-registry-in-process-from-node-js/
|
|
||||||
// https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/reg-add
|
|
||||||
// https://social.msdn.microsoft.com/Forums/en-US/5b318f44-281e-4098-8dee-3ba8435fa391/add-registry-key-for-autostart-of-app-in-ice?forum=quebectools
|
|
||||||
// utils.elevate
|
|
||||||
// https://github.com/CatalystCode/windows-registry-node
|
|
||||||
exec('where reg.exe', things._execOpts, function (err, stdout, stderr) {
|
|
||||||
//console.log((stdout||'').trim());
|
|
||||||
if (stderr) {
|
|
||||||
console.error(stderr);
|
|
||||||
}
|
|
||||||
fn(err, 'reg.exe');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
Launcher.install = function (things, fn) {
|
Launcher.install = function (things, fn) {
|
||||||
if (!fn) { fn = function (err) { if (err) { console.error(err); } }; }
|
if (!fn) { fn = function (err) { if (err) { console.error(err); } }; }
|
||||||
things = things || {};
|
things = things || {};
|
||||||
@ -114,13 +44,21 @@ Launcher.install = function (things, fn) {
|
|||||||
};
|
};
|
||||||
vars.telebitBinTpl = path.join(telebitRoot, 'usr/share/dist/bin/telebit.tpl');
|
vars.telebitBinTpl = path.join(telebitRoot, 'usr/share/dist/bin/telebit.tpl');
|
||||||
vars.telebitNpm = path.resolve(vars.telebitNode, '../npm');
|
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;
|
vars.userspace = (!things.telebitUser || (things.telebitUser === os.userInfo().username)) ? true : false;
|
||||||
if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
|
if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
|
||||||
vars.telebitRwDirs.push(vars.npmConfigPrefix);
|
vars.telebitRwDirs.push(vars.npmConfigPrefix);
|
||||||
}
|
}
|
||||||
vars.telebitRwDirs = vars.telebitRwDirs.join(' ');
|
vars.telebitRwDirs = vars.telebitRwDirs.join(' ');
|
||||||
|
function getError(err, stderr) {
|
||||||
|
if (err) { return err; }
|
||||||
|
if (stderr) {
|
||||||
|
err = new Error(stderr);
|
||||||
|
err.code = 'ELAUNCHER';
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
}
|
||||||
var launchers = {
|
var launchers = {
|
||||||
'node': function () {
|
'node': function () {
|
||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
@ -192,13 +130,13 @@ Launcher.install = function (things, fn) {
|
|||||||
var execstr = launcherstr + "unload -w " + launcher;
|
var execstr = launcherstr + "unload -w " + launcher;
|
||||||
exec(execstr, things._execOpts, function (/*err, stdout, stderr*/) {
|
exec(execstr, things._execOpts, function (/*err, stdout, stderr*/) {
|
||||||
// we probably only need to skip the stderr (saying that it can't stop something that isn't started)
|
// we probably only need to skip the stderr (saying that it can't stop something that isn't started)
|
||||||
//err = Launcher._getError(err, stderr);
|
//err = getError(err, stderr);
|
||||||
//if (err) { fn(err); return; }
|
//if (err) { fn(err); return; }
|
||||||
//console.log((stdout||'').trim());
|
//console.log((stdout||'').trim());
|
||||||
//console.log('unload worked?');
|
//console.log('unload worked?');
|
||||||
execstr = launcherstr + "load -w " + launcher;
|
execstr = launcherstr + "load -w " + launcher;
|
||||||
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
||||||
err = Launcher._getError(err, stderr);
|
err = getError(err, stderr);
|
||||||
if (err) { fn(err); return; }
|
if (err) { fn(err); return; }
|
||||||
//console.log((stdout||'').trim());
|
//console.log((stdout||'').trim());
|
||||||
//console.log('load worked?');
|
//console.log('load worked?');
|
||||||
@ -232,23 +170,23 @@ Launcher.install = function (things, fn) {
|
|||||||
var launcherstr = (vars.userspace ? "" : "sudo ") + "systemctl " + (vars.userspace ? "--user " : "");
|
var launcherstr = (vars.userspace ? "" : "sudo ") + "systemctl " + (vars.userspace ? "--user " : "");
|
||||||
var execstr = launcherstr + "daemon-reload";
|
var execstr = launcherstr + "daemon-reload";
|
||||||
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
||||||
err = Launcher._getError(err, stderr);
|
err = getError(err, stderr);
|
||||||
if (err) { fn(err); return; }
|
if (err) { fn(err); return; }
|
||||||
//console.log((stdout||'').trim());
|
//console.log((stdout||'').trim());
|
||||||
var execstr = launcherstr + "enable " + launchername;
|
var execstr = launcherstr + "enable " + launchername;
|
||||||
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
||||||
err = Launcher._getError(err, stderr && !/Created symlink/i.test(stderr) && stderr || '');
|
err = getError(err, stderr);
|
||||||
if (err) { fn(err); return; }
|
if (err) { fn(err); return; }
|
||||||
//console.log((stdout||'').trim());
|
//console.log((stdout||'').trim());
|
||||||
var execstr = launcherstr + "restart " + launchername;
|
var execstr = launcherstr + "restart " + launchername;
|
||||||
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
||||||
err = Launcher._getError(err, stderr);
|
err = getError(err, stderr);
|
||||||
if (err) { fn(err); return; }
|
if (err) { fn(err); return; }
|
||||||
//console.log((stdout||'').trim());
|
//console.log((stdout||'').trim());
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
var execstr = launcherstr + "status " + launchername;
|
var execstr = launcherstr + "status " + launchername;
|
||||||
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
||||||
err = Launcher._getError(err, stderr);
|
err = getError(err, stderr);
|
||||||
if (err) { fn(err); return; }
|
if (err) { fn(err); return; }
|
||||||
if (!/active.*running/i.test(stdout)) {
|
if (!/active.*running/i.test(stdout)) {
|
||||||
err = new Error("systemd failed to start '" + launchername + "'");
|
err = new Error("systemd failed to start '" + launchername + "'");
|
||||||
@ -284,7 +222,7 @@ Launcher.install = function (things, fn) {
|
|||||||
+ '" /F'
|
+ '" /F'
|
||||||
;
|
;
|
||||||
exec(cmd, things._execOpts, function (err, stdout, stderr) {
|
exec(cmd, things._execOpts, function (err, stdout, stderr) {
|
||||||
err = Launcher._getError(err, stderr);
|
err = getError(err, stderr);
|
||||||
if (err) { fn(err); return; }
|
if (err) { fn(err); return; }
|
||||||
// need to start it for the first time ourselves
|
// need to start it for the first time ourselves
|
||||||
run(null, 'node');
|
run(null, 'node');
|
||||||
@ -311,134 +249,54 @@ Launcher.install = function (things, fn) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
things._vars = vars;
|
if (things.launcher) {
|
||||||
things._userspace = vars.userspace;
|
if ('string' === typeof things.launcher) {
|
||||||
Launcher._detect(things, run);
|
run(null, things.launcher);
|
||||||
};
|
return;
|
||||||
Launcher.uninstall = function (things, fn) {
|
}
|
||||||
if (!fn) { fn = function (err) { if (err) { console.error(err); } }; }
|
if ('function' === typeof things.launcher) {
|
||||||
things = things || {};
|
things._vars = vars;
|
||||||
|
things._userspace = vars.userspace;
|
||||||
// Right now this is just for npm install -g and npx
|
things.launcher(things);
|
||||||
if (things.env) {
|
|
||||||
things.env.PATH = things.env.PATH || process.env.PATH;
|
|
||||||
} else {
|
|
||||||
things.env = process.env;
|
|
||||||
}
|
|
||||||
things.argv = things.argv || process.argv;
|
|
||||||
things._execOpts = { windowsHide: true, env: things.env };
|
|
||||||
var vars = {
|
|
||||||
telebitUser: os.userInfo().username
|
|
||||||
};
|
|
||||||
vars.userspace = (!things.telebitUser || (things.telebitUser === os.userInfo().username)) ? true : false;
|
|
||||||
var launchers = {
|
|
||||||
'node': function () {
|
|
||||||
Launcher._killAll(fn);
|
|
||||||
}
|
|
||||||
, 'launchctl': function () {
|
|
||||||
var launcher = path.join(os.homedir(), 'Library/LaunchAgents/cloud.telebit.remote.plist');
|
|
||||||
try {
|
|
||||||
var launcherstr = (vars.userspace ? "" : "sudo ") + "launchctl ";
|
|
||||||
var execstr = launcherstr + "unload -w " + launcher;
|
|
||||||
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
|
||||||
// we probably only need to skip the stderr (saying that it can't stop something that isn't started)
|
|
||||||
//err = Launcher._getError(err, stderr);
|
|
||||||
//if (err) { fn(err); return; }
|
|
||||||
//console.log((stdout||'').trim());
|
|
||||||
//console.log('unload worked?');
|
|
||||||
err = Launcher._getError(err, stderr);
|
|
||||||
if (err) { fn(err); return; }
|
|
||||||
//console.log((stdout||'').trim());
|
|
||||||
//console.log('load worked?');
|
|
||||||
setTimeout(function () {
|
|
||||||
fn(null);
|
|
||||||
}, 1.25 * 1000);
|
|
||||||
});
|
|
||||||
} catch(e) {
|
|
||||||
console.error("'" + launcher + "' error (uninstall):");
|
|
||||||
console.error(e);
|
|
||||||
if (fn) { fn(e); return; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
, 'systemctl': function () {
|
|
||||||
var launcher = path.join(os.homedir(), '.config/systemd/user/telebit.service');
|
|
||||||
var launchername = 'telebit.service';
|
|
||||||
try {
|
|
||||||
mkdirp.sync(path.join(os.homedir(), '.config/systemd/user'));
|
|
||||||
// IMPORTANT
|
|
||||||
// It's a dangerous to go alone, take this:
|
|
||||||
// SYSTEMD_LOG_LEVEL=debug journalctl -xef --user-unit=telebit
|
|
||||||
// (makes debugging systemd issues not "easy" per se, but possible)
|
|
||||||
var launcherstr = (vars.userspace ? "" : "sudo ") + "systemctl " + (vars.userspace ? "--user " : "");
|
|
||||||
var execstr = launcherstr + "disable " + launchername;
|
|
||||||
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
|
||||||
err = Launcher._getError(err, stderr && !/Removed symlink/i.test(stderr) && stderr || '');
|
|
||||||
if (err) { fn(err); return; }
|
|
||||||
//console.log((stdout||'').trim());
|
|
||||||
var execstr = launcherstr + "stop " + launchername;
|
|
||||||
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
|
||||||
err = Launcher._getError(err, stderr);
|
|
||||||
if (err) { fn(err); return; }
|
|
||||||
//console.log((stdout||'').trim());
|
|
||||||
setTimeout(function () {
|
|
||||||
var execstr = launcherstr + "status " + launchername;
|
|
||||||
exec(execstr, things._execOpts, function (err, stdout, stderr) {
|
|
||||||
err = Launcher._getError(err, stderr);
|
|
||||||
if (err) { fn(err); return; }
|
|
||||||
if (!/inactive.*dead/i.test(stdout)) {
|
|
||||||
err = new Error("systemd failed to stop '" + launchername + "'");
|
|
||||||
}
|
|
||||||
if (err) { fn(err); return; }
|
|
||||||
//console.log((stdout||'').trim());
|
|
||||||
fn(null);
|
|
||||||
});
|
|
||||||
}, 1.25 * 1000);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
} catch(e) {
|
|
||||||
console.error("'" + launcher + "' error:");
|
|
||||||
console.error(e);
|
|
||||||
if (fn) { fn(e); return; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
, 'reg.exe': function () {
|
|
||||||
if (!vars.userspace) {
|
|
||||||
console.warn("sysetm-level, privileged services are not yet supported on windows");
|
|
||||||
}
|
|
||||||
var cmd = 'reg.exe add "HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run"'
|
|
||||||
+ ' /V "Telebit" /F'
|
|
||||||
;
|
|
||||||
exec(cmd, things._execOpts, function (err, stdout, stderr) {
|
|
||||||
err = Launcher._getError(err, stderr);
|
|
||||||
if (err) { fn(err); return; }
|
|
||||||
// need to start it for the first time ourselves
|
|
||||||
kill(null, 'node');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
function kill(err, launcher) {
|
|
||||||
if (err) {
|
|
||||||
console.error("No luck with '" + launcher + "', trying a process.kill() instead...");
|
|
||||||
console.error(err);
|
|
||||||
launcher = 'node';
|
|
||||||
}
|
|
||||||
|
|
||||||
if (launchers[launcher]) {
|
|
||||||
launchers[launcher]();
|
|
||||||
return;
|
return;
|
||||||
} else {
|
|
||||||
console.error("No launcher handler (uninstall) for '" + launcher + "'");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
things._vars = vars;
|
// could have used "command-exists" but I'm trying to stay low-dependency
|
||||||
things._userspace = vars.userspace;
|
// os.platform(), os.type()
|
||||||
Launcher._detect(things, kill);
|
if (!/^win/i.test(os.platform())) {
|
||||||
|
if (/^darwin/i.test(os.platform())) {
|
||||||
|
exec('command -v launchctl', things._execOpts, function (err, stdout, stderr) {
|
||||||
|
err = getError(err, stderr);
|
||||||
|
run(err, 'launchctl');
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
exec('command -v systemctl', things._execOpts, function (err, stdout, stderr) {
|
||||||
|
err = getError(err, stderr);
|
||||||
|
run(err, 'systemctl');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// https://stackoverflow.com/questions/17908789/how-to-add-an-item-to-registry-to-run-at-startup-without-uac
|
||||||
|
// wininit? regedit? SCM?
|
||||||
|
// REG ADD "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" /V "My App" /t REG_SZ /F /D "C:\MyAppPath\MyApp.exe"
|
||||||
|
// https://www.microsoft.com/developerblog/2015/11/09/reading-and-writing-to-the-windows-registry-in-process-from-node-js/
|
||||||
|
// https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/reg-add
|
||||||
|
// https://social.msdn.microsoft.com/Forums/en-US/5b318f44-281e-4098-8dee-3ba8435fa391/add-registry-key-for-autostart-of-app-in-ice?forum=quebectools
|
||||||
|
// utils.elevate
|
||||||
|
// https://github.com/CatalystCode/windows-registry-node
|
||||||
|
exec('where reg.exe', things._execOpts, function (err, stdout, stderr) {
|
||||||
|
//console.log((stdout||'').trim());
|
||||||
|
if (stderr) {
|
||||||
|
console.error(stderr);
|
||||||
|
}
|
||||||
|
run(err, 'reg.exe');
|
||||||
|
});
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (module === require.main) {
|
if (module === require.main) {
|
||||||
Launcher.install({
|
module.exports.install({
|
||||||
argv: process.argv
|
argv: process.argv
|
||||||
, env: process.env
|
, env: process.env
|
||||||
}, function (err) {
|
}, function (err) {
|
||||||
|
|||||||
@ -59,9 +59,9 @@ http_get()
|
|||||||
|
|
||||||
http_bash()
|
http_bash()
|
||||||
{
|
{
|
||||||
local _http_bash_url=$1
|
_http_bash_url=$1
|
||||||
local _http_bash_args=${2:-}
|
_http_bash_args=${2:-}
|
||||||
local _http_bash_tmp=$(mktemp)
|
_http_bash_tmp=$(mktemp)
|
||||||
$_my_http_get $_my_http_opts $_my_http_out "$_http_bash_tmp" "$_http_bash_url"
|
$_my_http_get $_my_http_opts $_my_http_out "$_http_bash_tmp" "$_http_bash_url"
|
||||||
bash "$_http_bash_tmp" $_http_bash_args; rm "$_http_bash_tmp"
|
bash "$_http_bash_tmp" $_http_bash_args; rm "$_http_bash_tmp"
|
||||||
}
|
}
|
||||||
@ -77,7 +77,7 @@ export -f http_bash
|
|||||||
if [ -n "${TELEBIT_VERSION:-}" ]; then
|
if [ -n "${TELEBIT_VERSION:-}" ]; then
|
||||||
echo 'TELEBIT_VERSION='${TELEBIT_VERSION}
|
echo 'TELEBIT_VERSION='${TELEBIT_VERSION}
|
||||||
fi
|
fi
|
||||||
export TELEBIT_VERSION=${TELEBIT_VERSION:-master}
|
TELEBIT_VERSION=${TELEBIT_VERSION:-master}
|
||||||
if [ -e "usr/share/install_helper.sh" ]; then
|
if [ -e "usr/share/install_helper.sh" ]; then
|
||||||
bash usr/share/install_helper.sh "$@"
|
bash usr/share/install_helper.sh "$@"
|
||||||
else
|
else
|
||||||
|
|||||||
@ -33,11 +33,7 @@ set -u
|
|||||||
|
|
||||||
TELEBIT_DEBUG=${TELEBIT_DEBUG:-}
|
TELEBIT_DEBUG=${TELEBIT_DEBUG:-}
|
||||||
|
|
||||||
# NOTE: On OS X logname works from a pipe, but on Linux it does not
|
if [ "$(logname)" != "$(id -u -n)" ]; then
|
||||||
my_logname=$(who am i </dev/tty | awk '{print $1}')
|
|
||||||
#my_logname=${my_logname:-$(logname)}
|
|
||||||
#my_logname=${my_logname:-$SUDO_USER}
|
|
||||||
if [ -n "$my_logname" ] && [ "$my_logname" != "$(id -u -n)" ]; then
|
|
||||||
echo "WARNING:"
|
echo "WARNING:"
|
||||||
echo " You are logged in as '$(logname)' but acting as '$(id -u -n)'."
|
echo " You are logged in as '$(logname)' but acting as '$(id -u -n)'."
|
||||||
echo " If the installation is not successful please log in as '$(id -u -n)' directly."
|
echo " If the installation is not successful please log in as '$(id -u -n)' directly."
|
||||||
@ -133,11 +129,8 @@ my_tmp="$(mktemp -d -t telebit.XXXXXXXX)"
|
|||||||
#TELEBIT_TMP="$my_tmp/telebit"
|
#TELEBIT_TMP="$my_tmp/telebit"
|
||||||
|
|
||||||
echo "Installing $my_name to '$TELEBIT_REAL_PATH'"
|
echo "Installing $my_name to '$TELEBIT_REAL_PATH'"
|
||||||
# v10.2+ has much needed networking fixes, but breaks ursa.
|
# v10.2+ has much needed networking fixes, but breaks ursa. v9.x has severe networking bugs. v8.x has working ursa, but requires tls workarounds"
|
||||||
# v9.x has severe networking bugs.
|
NODEJS_VER="${NODEJS_VER:-v10.6}"
|
||||||
# v8.x has working ursa, but requires tls workarounds"
|
|
||||||
# v10.13 seems to work for me locally (new greenlock)
|
|
||||||
NODEJS_VER="${NODEJS_VER:-v10.13}"
|
|
||||||
export NODEJS_VER
|
export NODEJS_VER
|
||||||
export NODE_PATH="$TELEBIT_TMP/lib/node_modules"
|
export NODE_PATH="$TELEBIT_TMP/lib/node_modules"
|
||||||
export NPM_CONFIG_PREFIX="$TELEBIT_TMP"
|
export NPM_CONFIG_PREFIX="$TELEBIT_TMP"
|
||||||
@ -227,20 +220,16 @@ pushd $TELEBIT_TMP >/dev/null
|
|||||||
else
|
else
|
||||||
echo -n "."
|
echo -n "."
|
||||||
fi
|
fi
|
||||||
set +e
|
|
||||||
$tmp_npm install >/dev/null 2>/dev/null &
|
$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=$!
|
tmp_npm_pid=$!
|
||||||
while [ -n "$tmp_npm_pid" ]; do
|
while [ -n "$tmp_npm_pid" ]; do
|
||||||
sleep 2
|
sleep 2
|
||||||
echo -n "."
|
echo -n "."
|
||||||
kill -s 0 $tmp_npm_pid >/dev/null 2>/dev/null || tmp_npm_pid=""
|
kill -s 0 $tmp_npm_pid >/dev/null 2>/dev/null || tmp_npm_pid=""
|
||||||
done
|
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
|
popd >/dev/null
|
||||||
|
|
||||||
if [ -n "${TELEBIT_DEBUG}" ]; then
|
if [ -n "${TELEBIT_DEBUG}" ]; then
|
||||||
@ -432,8 +421,8 @@ if [ -d "/Library/LaunchDaemons" ]; then
|
|||||||
|
|
||||||
if [ -n "${TELEBIT_DEBUG}" ]; then
|
if [ -n "${TELEBIT_DEBUG}" ]; then
|
||||||
echo " > launchctl unload -w $my_app_launchd_service >/dev/null 2>/dev/null"
|
echo " > 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
|
launchctl unload -w "$my_app_launchd_service" >/dev/null 2>/dev/null
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
my_app_launchd_service_skel="usr/share/dist/Library/LaunchDaemons/${my_app_pkg_name}.plist"
|
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"
|
my_app_launchd_service="$my_root/Library/LaunchDaemons/${my_app_pkg_name}.plist"
|
||||||
@ -496,8 +485,7 @@ elif [ "systemd" == "$my_system_launcher" ]; then
|
|||||||
else
|
else
|
||||||
echo -n "."
|
echo -n "."
|
||||||
fi
|
fi
|
||||||
set +e
|
systemctl --user daemon-reload
|
||||||
if systemctl --user daemon-reload; then
|
|
||||||
# enable also puts success output to stderr... why?
|
# enable also puts success output to stderr... why?
|
||||||
systemctl --user enable $my_app >/dev/null 2>/dev/null
|
systemctl --user enable $my_app >/dev/null 2>/dev/null
|
||||||
#echo " > systemctl --user enable systemd-tmpfiles-setup.service systemd-tmpfiles-clean.timer"
|
#echo " > systemctl --user enable systemd-tmpfiles-setup.service systemd-tmpfiles-clean.timer"
|
||||||
@ -507,19 +495,13 @@ elif [ "systemd" == "$my_system_launcher" ]; then
|
|||||||
fi
|
fi
|
||||||
systemctl --user stop $my_app >/dev/null 2>/dev/null
|
systemctl --user stop $my_app >/dev/null 2>/dev/null
|
||||||
systemctl --user start $my_app >/dev/null
|
systemctl --user start $my_app >/dev/null
|
||||||
|
|
||||||
sleep 2; # give it time to start
|
sleep 2; # give it time to start
|
||||||
_is_running=$(systemctl --user status --no-pager $my_app 2>/dev/null | grep "active.*running")
|
_is_running=$(systemctl --user status --no-pager $my_app 2>/dev/null | grep "active.*running")
|
||||||
if [ -z "$_is_running" ]; then
|
if [ -z "$_is_running" ]; then
|
||||||
echo "Something went wrong:"
|
echo "Something went wrong:"
|
||||||
systemctl --user status --no-pager $my_app
|
systemctl --user status --no-pager $my_app
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
echo "libpam-systemd is missing, which is required on Linux to register Telebit with the user launcher."
|
|
||||||
echo "sudo apt-get install -y libpam-systemd"
|
|
||||||
sudo apt-get install -y libpam-systemd
|
|
||||||
fi
|
|
||||||
set -e
|
|
||||||
echo -n "."
|
echo -n "."
|
||||||
else
|
else
|
||||||
|
|
||||||
|
|||||||
@ -79,8 +79,8 @@ function run() {
|
|||||||
, TELEBIT_LOG_DIR: process.env.TELEBIT_LOG_DIR || path.join(os.homedir(), '.local/share/telebit/var/log')
|
, 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.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)) {
|
if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
|
||||||
vars.telebitRwDirs.push(vars.npmConfigPrefix);
|
vars.telebitRwDirs.push(vars.npmConfigPrefix);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user