coolaj86
/
telebit-relay.js
1
1
Fork 0
Code Issues 4 Pull Requests Releases Activity

Merge branch 'master' into commercial

This commit is contained in:
AJ ONeal 2018-06-09 20:56:00 +00:00
parent 5e1963d11f 5ddd85e14e
commit 63065d6d65
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/relay.js
View File

@ -4,6 +4,7 @@ var url = require('url');
var PromiseA = require('bluebird'); var PromiseA = require('bluebird');
var jwt = require('jsonwebtoken'); var jwt = require('jsonwebtoken');
var Packer = require('proxy-packer'); var Packer = require('proxy-packer');
var portServers = {};
function timeoutPromise(duration) { function timeoutPromise(duration) {
return new PromiseA(function (resolve) { return new PromiseA(function (resolve) {
@ -258,9 +259,7 @@ module.exports.create = function (state) {
Devices.add(state.deviceLists, domainname, token); Devices.add(state.deviceLists, domainname, token);
}); });
function onDynTcpReady() { function onDynTcpReadyHelper(serviceport) {
var serviceport = this.address().port;
console.info('[DynTcpConn] Port', serviceport, 'now open for', token.deviceId);
//token.dynamicPorts.push(serviceport); //token.dynamicPorts.push(serviceport);
Devices.add(state.deviceLists, serviceport, token); Devices.add(state.deviceLists, serviceport, token);
//var hri = require('human-readable-ids').hri; //var hri = require('human-readable-ids').hri;
@ -300,10 +299,21 @@ module.exports.create = function (state) {
//token.dynamicNames = []; //token.dynamicNames = [];
var onePortForNow = parseInt(token.ports[0], 10) || 0; var onePortForNow = parseInt(token.ports[0], 10) || 0;
// TODO try again with random port if (portServers[onePortForNow]) {
//token.ports = [];
token.server = portServers[onePortForNow];
token.server.on('connection', onDynTcpConn);
onDynTcpReadyHelper(onePortForNow);
} else {
try { try {
token.server = require('net').createServer(onDynTcpConn).listen(onePortForNow, onDynTcpReady); token.server = require('net').createServer(onDynTcpConn).listen(onePortForNow, function () {
var serviceport = this.address().port;
portServers[serviceport] = this;
console.info('[DynTcpConn] Port', serviceport, 'now open for', token.deviceId);
onDynTcpReadyHelper(serviceport);
});
token.server.on('error', function (e) { token.server.on('error', function (e) {
// TODO try again with random port
console.error("Server Error assigning a dynamic port to a new connection:", e); console.error("Server Error assigning a dynamic port to a new connection:", e);
}); });
} catch(e) { } catch(e) {
@ -311,6 +321,7 @@ module.exports.create = function (state) {
// (i.e. there are enough users to run out of ports) // (i.e. there are enough users to run out of ports)
console.error("Error assigning a dynamic port to a new connection:", e); console.error("Error assigning a dynamic port to a new connection:", e);
} }
}
remotes[jwtoken] = token; remotes[jwtoken] = token;
console.info("[ws] authorized", socketId, "for", token.deviceId); console.info("[ws] authorized", socketId, "for", token.deviceId);