partial
This commit is contained in:
parent
f48dc1937c
commit
c52fc13ec3
193
mux-ws.js
193
mux-ws.js
|
@ -12,28 +12,86 @@ var tlsOpts = require('localhost.daplie.com-certificates').merge({});
|
||||||
var Duplex = require('stream').Duplex;
|
var Duplex = require('stream').Duplex;
|
||||||
var WebSocketServer = require('ws').Server;
|
var WebSocketServer = require('ws').Server;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* Tunnel Packer
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
var packer = require('tunnel-packer');
|
||||||
|
|
||||||
|
var Transform = require('stream').Transform;
|
||||||
|
var util = require('util');
|
||||||
|
|
||||||
|
function MyTransform(options) {
|
||||||
|
if (!(this instanceof MyTransform)) {
|
||||||
|
return new MyTransform(options);
|
||||||
|
}
|
||||||
|
this.__my_addr = options.address;
|
||||||
|
Transform.call(this, options);
|
||||||
|
}
|
||||||
|
util.inherits(MyTransform, Transform);
|
||||||
|
function transform(me, data, encoding, callback) {
|
||||||
|
var address = me.__my_addr;
|
||||||
|
|
||||||
|
me.push(packer.pack(address, data));
|
||||||
|
callback();
|
||||||
|
}
|
||||||
|
MyTransform.prototype._transform = function (data, encoding, callback) {
|
||||||
|
return transform(this, data, encoding, callback);
|
||||||
|
};
|
||||||
|
|
||||||
|
function socketToAddr(socket) {
|
||||||
|
return { family: socket.remoteFamily, address: socket.remoteAddress, port: socket.remotePort };
|
||||||
|
}
|
||||||
|
|
||||||
|
function addrToId(address) {
|
||||||
|
return address.family + ',' + address.address + ',' + address.port;
|
||||||
|
}
|
||||||
|
|
||||||
|
function socketToId(socket) {
|
||||||
|
return addrToId(socketToAddr(socket));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
require('cluster-store').create().then(function (store) {
|
require('cluster-store').create().then(function (store) {
|
||||||
var remotes = {};
|
var remotes = {};
|
||||||
var selfname = 'pokemap.hellabit.com';
|
var selfname = 'pokemap.hellabit.com';
|
||||||
var secret = 'shhhhh';
|
var secret = 'shhhhh';
|
||||||
|
|
||||||
var httpServer = http.createServer(function (req, res) {
|
var httpServer = http.createServer(function (req, res) {
|
||||||
|
console.log('req.socket.encrypted', req.socket.encrypted);
|
||||||
res.end('Hello, World!');
|
res.end('Hello, World!');
|
||||||
});
|
});
|
||||||
var wss = new WebSocketServer({ server: httpServer });
|
var wss = new WebSocketServer({ server: httpServer });
|
||||||
var tcp3000 = net.createServer();
|
var tcp3000 = net.createServer();
|
||||||
|
|
||||||
wss.on('connection', function connection(ws) {
|
wss.on('connection', function (ws) {
|
||||||
|
console.log('todo connection');
|
||||||
|
|
||||||
var location = url.parse(ws.upgradeReq.url, true);
|
var location = url.parse(ws.upgradeReq.url, true);
|
||||||
//var token = jwt.decode(location.query.access_token);
|
//var token = jwt.decode(location.query.access_token);
|
||||||
var token = jwt.verify(location.query.access_token, secret);
|
var token = jwt.verify(location.query.access_token, secret);
|
||||||
|
|
||||||
|
console.log('location, token');
|
||||||
|
console.log(location.query.access_token);
|
||||||
|
console.log(token);
|
||||||
|
|
||||||
if (!token) {
|
if (!token) {
|
||||||
ws.send({ error: { message: "invalid access token", code: "E_INVALID_TOKEN" } });
|
ws.send({ error: { message: "invalid access token", code: "E_INVALID_TOKEN" } });
|
||||||
ws.close();
|
ws.close();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log('token.name');
|
||||||
|
console.log(token.name);
|
||||||
|
|
||||||
if (!token.name) {
|
if (!token.name) {
|
||||||
ws.send({ error: { message: "invalid server name", code: "E_INVALID_NAME" } });
|
ws.send({ error: { message: "invalid server name", code: "E_INVALID_NAME" } });
|
||||||
ws.close();
|
ws.close();
|
||||||
|
@ -44,15 +102,20 @@ require('cluster-store').create().then(function (store) {
|
||||||
console.log("TODO cleanup");
|
console.log("TODO cleanup");
|
||||||
});
|
});
|
||||||
|
|
||||||
remotes[token.name] = remotes[token.name] || {};
|
var remote = remotes[token.name] = remotes[token.name] || {};
|
||||||
// TODO allow more than one remote per servername
|
// TODO allow more than one remote per servername
|
||||||
remotes[token.name].ws = ws;
|
remote.ws = ws;
|
||||||
|
remote.id = socketToId(ws.upgradeReq.socket);
|
||||||
// TODO allow tls to be decrypted by server if client is actually a browser
|
// TODO allow tls to be decrypted by server if client is actually a browser
|
||||||
// and we haven't implemented tls in the browser yet
|
// and we haven't implemented tls in the browser yet
|
||||||
remotes[token.name].decrypt = token.decrypt;
|
remote.decrypt = token.decrypt;
|
||||||
// TODO how to allow a child process to communicate with this one?
|
// TODO how to allow a child process to communicate with this one?
|
||||||
remotes[token.name].handle = { address: null, handle: null };
|
remote.clients = {};
|
||||||
store.set(token.name, remotes[token.name].handle);
|
remote.handle = { address: null, handle: null };
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
store.set(token.name, remote.handle);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -62,6 +125,17 @@ require('cluster-store').create().then(function (store) {
|
||||||
|
|
||||||
|
|
||||||
var tls3000 = tls.createServer(tlsOpts, function (tlsSocket) {
|
var tls3000 = tls.createServer(tlsOpts, function (tlsSocket) {
|
||||||
|
console.log('tls connection');
|
||||||
|
|
||||||
|
/*
|
||||||
|
tlsSocket.on('data', function (chunk) {
|
||||||
|
console.log('secure chunk');
|
||||||
|
console.log('');
|
||||||
|
console.log(chunk.toString());
|
||||||
|
console.log('');
|
||||||
|
});
|
||||||
|
*/
|
||||||
|
|
||||||
httpServer.emit('connection', tlsSocket);
|
httpServer.emit('connection', tlsSocket);
|
||||||
/*
|
/*
|
||||||
tlsSocket.on('data', function (chunk) {
|
tlsSocket.on('data', function (chunk) {
|
||||||
|
@ -86,6 +160,33 @@ require('cluster-store').create().then(function (store) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
function connectHttp(servername, socket) {
|
||||||
|
console.log("connectHttp('" + servername + "', socket)");
|
||||||
|
socket.__my_servername = servername;
|
||||||
|
httpServer.emit('connection', socket);
|
||||||
|
}
|
||||||
|
|
||||||
|
function connectHttps(servername, socket) {
|
||||||
|
// none of these methods work:
|
||||||
|
// httpsServer.emit('connection', socket); // this didn't work
|
||||||
|
// tlsServer.emit('connection', socket); // this didn't work either
|
||||||
|
//console.log('chunkLen', firstChunk.byteLength);
|
||||||
|
|
||||||
|
var myDuplex = new Duplex();
|
||||||
|
|
||||||
|
myDuplex.__my_socket = socket;
|
||||||
|
myDuplex._write = Dup.write;
|
||||||
|
myDuplex._read = Dup.read;
|
||||||
|
|
||||||
|
console.log('connectHttps servername', servername);
|
||||||
|
tls3000.emit('connection', myDuplex);
|
||||||
|
|
||||||
|
socket.on('data', function (chunk) {
|
||||||
|
console.log('[' + Date.now() + '] socket data', chunk.byteLength);
|
||||||
|
myDuplex.push(chunk);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
tcp3000.on('connection', function (socket) {
|
tcp3000.on('connection', function (socket) {
|
||||||
// this works when I put it here, but I don't know if it's tls yet here
|
// this works when I put it here, but I don't know if it's tls yet here
|
||||||
// httpsServer.emit('connection', socket);
|
// httpsServer.emit('connection', socket);
|
||||||
|
@ -106,6 +207,8 @@ require('cluster-store').create().then(function (store) {
|
||||||
|
|
||||||
// defer after return (instead of being in many places)
|
// defer after return (instead of being in many places)
|
||||||
process.nextTick(function () {
|
process.nextTick(function () {
|
||||||
|
console.log('unshift firstChunk', firstChunk.byteLength);
|
||||||
|
console.log(firstChunk.toString());
|
||||||
socket.unshift(firstChunk);
|
socket.unshift(firstChunk);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -114,63 +217,77 @@ require('cluster-store').create().then(function (store) {
|
||||||
var str;
|
var str;
|
||||||
var m;
|
var m;
|
||||||
|
|
||||||
function connectHttps() {
|
function pipeWs(socket, remote) {
|
||||||
// none of these methods work:
|
//var remote = remotes[servername];
|
||||||
// httpsServer.emit('connection', socket); // this didn't work
|
var ws = remote.ws;
|
||||||
// tlsServer.emit('connection', socket); // this didn't work either
|
//var address = socketToAddr(ws.upgradeReq.socket);
|
||||||
//console.log('chunkLen', firstChunk.byteLength);
|
var address = socketToAddr(socket);
|
||||||
|
var id = addrToId(address);
|
||||||
var myDuplex = new Duplex();
|
var wrapForRemote = new MyTransform({
|
||||||
|
id: id
|
||||||
myDuplex.__my_socket = socket;
|
//, remoteId: remote.id
|
||||||
myDuplex._write = Dup.write;
|
, address: address
|
||||||
myDuplex._read = Dup.read;
|
, servername: servername
|
||||||
socket.on('data', function (chunk) {
|
|
||||||
//console.log('[' + Date.now() + '] socket data', chunk.byteLength);
|
|
||||||
myDuplex.push(chunk);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
tls3000.emit('connection', myDuplex);
|
var unpacker = packer.create({ onMessage: function (opts) {
|
||||||
}
|
// opts.data
|
||||||
|
var cid = addrToId(opts);
|
||||||
|
var cstream = remote.clients[cid];
|
||||||
|
|
||||||
function pipeWs(socket, ws) {
|
console.log("remote '" + remote.id + "' has data for '" + id + "'", opts.data.byteLength);
|
||||||
socket.on('data', function (chunk) {
|
|
||||||
// TODO XXX pack
|
if (!cstream) {
|
||||||
|
console.log('no client for', cid, opts.data.toString('utf8').substr(0, 100));
|
||||||
|
//remote.socket.write(packer.pack(opts, Buffer.from('|__END__|')));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
cstream.write(opts.data);
|
||||||
|
} });
|
||||||
|
//socket.unshift(hello);
|
||||||
|
|
||||||
|
//remote.socket/*.pipe(transform)*/.pipe(socket, { end: false });
|
||||||
|
var bstream = remote.clients[id] = socket.pipe(wrapForRemote);
|
||||||
|
bstream.on('data', function (pchunk) {
|
||||||
// var chunk = socket.read();
|
// var chunk = socket.read();
|
||||||
ws.send(chunk, { binary: true });
|
ws.send(pchunk, { binary: true });
|
||||||
});
|
});
|
||||||
ws.on('message', function (chunk) {
|
ws.on('message', function (chunk) {
|
||||||
// TODO XXX pack
|
unpacker.fns.addChunk(chunk);
|
||||||
socket.write(chunk);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function tryTls() {
|
function tryTls() {
|
||||||
if (!servername || selfname === servername) {
|
if (!servername || selfname === servername) {
|
||||||
connectHttps();
|
console.log('this is a server or an unknown');
|
||||||
|
connectHttps(servername, socket);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (remotes[servername]) {
|
if (remotes[servername]) {
|
||||||
pipeWs(socket, remotes[servername].ws);
|
console.log("pipeWs(socket, remotes['" + servername + "'])");
|
||||||
|
pipeWs(socket, remotes[servername]);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
store.get(servername, function (remote) {
|
store.get(servername, function (remote) {
|
||||||
if (!remote) {
|
if (!remote) {
|
||||||
connectHttps();
|
connectHttps(servername, socket);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!remote.address) {
|
if (!remote.address) {
|
||||||
console.error("connecting to a socket in a sibling process is not yet implemented");
|
console.error("connecting to a socket in a sibling process is not yet implemented");
|
||||||
connectHttps();
|
connectHttps(servername, socket);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
console.error("connecting to a socket in a sibling process is not yet implemented");
|
console.error("connecting to a socket in a sibling process is not yet implemented");
|
||||||
connectHttps();
|
connectHttps(servername, socket);
|
||||||
});
|
});
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
// https://github.com/mscdex/httpolyglot/issues/3#issuecomment-173680155
|
// https://github.com/mscdex/httpolyglot/issues/3#issuecomment-173680155
|
||||||
|
@ -184,17 +301,21 @@ require('cluster-store').create().then(function (store) {
|
||||||
|
|
||||||
if (firstChunk[0] > 32 && firstChunk[0] < 127) {
|
if (firstChunk[0] > 32 && firstChunk[0] < 127) {
|
||||||
str = firstChunk.toString();
|
str = firstChunk.toString();
|
||||||
m = str.match(/^Host: ([^\r\n]+)[\r\n]+/);
|
m = str.match(/^Host: ([^\r\n]+)[\r\n]+/i);
|
||||||
servername = m && m[1].toLowerCase() || '';
|
servername = m && m[1].toLowerCase() || '';
|
||||||
if (/HTTP\//i.test(str)) {
|
if (/HTTP\//i.test(str)) {
|
||||||
service = 'http';
|
service = 'http';
|
||||||
if (/\/\.well-known\//.test(str)) {
|
if (/\/\.well-known\//.test(str)) {
|
||||||
// HTTP
|
// HTTP
|
||||||
httpServer.emit('connection', socket);
|
if (remotes[servername]) {
|
||||||
|
pipeWs(socket, remotes[servername]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
connectHttp(servername, socket);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// redirect to https
|
// redirect to https
|
||||||
httpServer.emit('connection', socket);
|
connectHttp(servername, socket);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue