josh/telebit.js
1
0
Fork 0
forked from coolaj86/telebit.js
Code Issues Pull Requests Releases Wiki Activity

use Packer utils

Browse Source
This commit is contained in:
AJ ONeal 2016-10-05 23:55:48 -06:00
parent 3a36248377
commit 1de642efa4
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
wsclient.js
View File

@ -3,25 +3,9 @@
var WebSocket = require('ws'); var WebSocket = require('ws');
var sni = require('sni'); var sni = require('sni');
var pack = require('tunnel-packer').pack; var Packer = require('tunnel-packer');
var authenticated = false; var authenticated = false;
// TODO move these helpers to tunnel-packer package
function addrToId(address) {
return address.family + ',' + address.address + ',' + address.port;
}
/*
function socketToAddr(socket) {
return { family: socket.remoteFamily, address: socket.remoteAddress, port: socket.remotePort };
}
function socketToId(socket) {
return addrToId(socketToAddr(socket));
}
*/
/* /*
var request = require('request'); var request = require('request');
request.get('https://pokemap.hellabit.com/?access_token=' + token, { rejectUnauthorized: false }, function (err, resp) { request.get('https://pokemap.hellabit.com/?access_token=' + token, { rejectUnauthorized: false }, function (err, resp) {
@ -47,7 +31,7 @@ function run(copts) {
var handlers = { var handlers = {
onmessage: function (opts) { onmessage: function (opts) {
var net = copts.net || require('net'); var net = copts.net || require('net');
var cid = addrToId(opts); var cid = Packer.addrToId(opts);
var service = opts.service; var service = opts.service;
var port = services[service]; var port = services[service];
var servername; var servername;
@ -77,7 +61,7 @@ function run(copts) {
if (!servername) { if (!servername) {
console.info("[error] missing servername for '" + cid + "'", opts.data.byteLength); console.info("[error] missing servername for '" + cid + "'", opts.data.byteLength);
//console.warn(opts.data.toString()); //console.warn(opts.data.toString());
wstunneler.send(pack(opts, null, 'error'), { binary: true }); wstunneler.send(Packer.pack(opts, null, 'error'), { binary: true });
return; return;
} }
@ -105,7 +89,7 @@ function run(copts) {
chunk = localclients[cid].read(size); chunk = localclients[cid].read(size);
//console.log("[<=] local '" + opts.service + "' sent to '" + cid + "' <= ", chunk.byteLength, "bytes"); //console.log("[<=] local '" + opts.service + "' sent to '" + cid + "' <= ", chunk.byteLength, "bytes");
//console.log(JSON.stringify(chunk.toString())); //console.log(JSON.stringify(chunk.toString()));
wstunneler.send(pack(opts, chunk), { binary: true }); wstunneler.send(Packer.pack(opts, chunk), { binary: true });
} while (chunk); } while (chunk);
}); });
localclients[cid].on('error', function (err) { localclients[cid].on('error', function (err) {
@ -117,12 +101,12 @@ function run(copts) {
}); });
} }
, onend: function (opts) { , onend: function (opts) {
var cid = addrToId(opts); var cid = Packer.addrToId(opts);
//console.log("[end] '" + cid + "'"); //console.log("[end] '" + cid + "'");
handlers._onend(cid); handlers._onend(cid);
} }
, onerror: function (opts) { , onerror: function (opts) {
var cid = addrToId(opts); var cid = Packer.addrToId(opts);
//console.log("[error] '" + cid + "'", opts.code || '', opts.message); //console.log("[error] '" + cid + "'", opts.code || '', opts.message);
handlers._onend(cid); handlers._onend(cid);
} }
@ -138,7 +122,7 @@ function run(copts) {
} }
, _onLocalClose: function (cid, opts, err) { , _onLocalClose: function (cid, opts, err) {
try { try {
wstunneler.send(pack(opts, null, err && 'error' || 'end'), { binary: true }); wstunneler.send(Packer.pack(opts, null, err && 'error' || 'end'), { binary: true });
} catch(e) { } catch(e) {
// ignore // ignore
} }