coolaj86
/
telebit.js
1
2
Fork 1
Code Issues 46 Pull Requests 2 Releases Activity

cleanup

This commit is contained in:
AJ ONeal 2016-09-22 12:17:45 -06:00
parent 269605e1ba
commit 88be06c872
3 changed files with 163 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client.js
View File

@ -34,7 +34,7 @@ var tunneler = net.connect({ port: 5443 , host: 'pokemap.hellabit.com' }, functi
// a place to store data // a place to store data
// file management // file management
// Synergy Teamwork Paradigm = Jabberwocky // Synergy Teamwork Paradigm = Jabberwocky
var machine = require('./machine.js'); var machine = require('./machine.js').create();
machine.onMessage = function (opts) { machine.onMessage = function (opts) {
var id = opts.family + ',' + opts.address + ',' + opts.port; var id = opts.family + ',' + opts.address + ',' + opts.port;
var service = 'https'; var service = 'https';

63
machine.js
View File

@ -1,14 +1,16 @@
'use strict'; 'use strict';
var machine = {}; module.exports.create = function () {
machine._version = 1;
machine.state = 0;
machine.states = { 0: 'version', 1: 'headerLength', 2: 'header', 3: 'data'/*, 4: 'error'*/ };
machine.states_length = Object.keys(machine.states).length;
machine.chunkIndex = 0;
machine.fns = {};
function debug(chunk, i, len) { var machine = {};
machine._version = 1;
machine.state = 0;
machine.states = { 0: 'version', 1: 'headerLength', 2: 'header', 3: 'data'/*, 4: 'error'*/ };
machine.states_length = Object.keys(machine.states).length;
machine.chunkIndex = 0;
machine.fns = {};
function debug(chunk, i, len) {
i = i || 0; i = i || 0;
len = len || chunk.length - i; len = len || chunk.length - i;
console.log(chunk.slice(i, len)[0]); console.log(chunk.slice(i, len)[0]);
@ -16,9 +18,9 @@ function debug(chunk, i, len) {
console.log('state:', machine.states[machine.state]); console.log('state:', machine.states[machine.state]);
console.log('statei:', machine.state); console.log('statei:', machine.state);
console.log('index:', machine.chunkIndex); console.log('index:', machine.chunkIndex);
} }
machine.fns.version = function (chunk) { machine.fns.version = function (chunk) {
//console.log(''); //console.log('');
//console.log('[version]'); //console.log('[version]');
if ((255 - machine._version) !== chunk[machine.chunkIndex]) { if ((255 - machine._version) !== chunk[machine.chunkIndex]) {
@ -28,24 +30,24 @@ machine.fns.version = function (chunk) {
machine.chunkIndex += 1; machine.chunkIndex += 1;
return true; return true;
}; };
machine.headerLen = 0; machine.headerLen = 0;
machine.fns.headerLength = function (chunk) { machine.fns.headerLength = function (chunk) {
//console.log(''); //console.log('');
//console.log('[headerLength]'); //console.log('[headerLength]');
machine.headerLen = chunk[machine.chunkIndex]; machine.headerLen = chunk[machine.chunkIndex];
machine.chunkIndex += 1; machine.chunkIndex += 1;
return true; return true;
}; };
machine.buf = null; machine.buf = null;
machine.bufIndex = 0; machine.bufIndex = 0;
//var buf = Buffer.alloc(4096); //var buf = Buffer.alloc(4096);
machine.fns.header = function (chunk) { machine.fns.header = function (chunk) {
//console.log(''); //console.log('');
//console.log('[header]'); //console.log('[header]');
var curSize = machine.bufIndex + (chunk.length - machine.chunkIndex); var curSize = machine.bufIndex + (chunk.length - machine.chunkIndex);
@ -59,7 +61,6 @@ machine.fns.header = function (chunk) {
// write these bits, and wait for the next chunk. // write these bits, and wait for the next chunk.
if (!machine.buf) { if (!machine.buf) {
machine.buf = Buffer.alloc(machine.headerLen); machine.buf = Buffer.alloc(machine.headerLen);
//console.log('[1a] machine.headerLen:', machine.headerLen);
} }
// partLen should be no more than the available size // partLen should be no more than the available size
@ -94,9 +95,9 @@ machine.fns.header = function (chunk) {
return true; return true;
} }
}; };
machine.fns.data = function (chunk) { machine.fns.data = function (chunk) {
//console.log(''); //console.log('');
//console.log('[data]'); //console.log('[data]');
var curSize = machine.bufIndex + (chunk.length - machine.chunkIndex); var curSize = machine.bufIndex + (chunk.length - machine.chunkIndex);
@ -123,7 +124,7 @@ machine.fns.data = function (chunk) {
return false; return false;
} }
if (machine.buf) { if (machine.bufIndex > 0) {
// the completing remainder of the body is in the current slice // the completing remainder of the body is in the current slice
chunk.copy(machine.buf, machine.bufIndex, machine.chunkIndex, machine.chunkIndex + partLen); chunk.copy(machine.buf, machine.bufIndex, machine.chunkIndex, machine.chunkIndex + partLen);
} }
@ -131,12 +132,13 @@ machine.fns.data = function (chunk) {
// the whole body is in the current slice // the whole body is in the current slice
machine.buf = chunk.slice(machine.chunkIndex, machine.chunkIndex + partLen); machine.buf = chunk.slice(machine.chunkIndex, machine.chunkIndex + partLen);
} }
machine.bufIndex += partLen;
machine.onMessage({ machine.onMessage({
family: machine.family family: machine.family
, address: machine.address , address: machine.address
, port: machine.port , port: machine.port
, data: machine.buf , data: machine.buf.slice(0, machine.bufIndex)
}); });
machine.chunkIndex += partLen; // === chunk.length machine.chunkIndex += partLen; // === chunk.length
@ -144,8 +146,8 @@ machine.fns.data = function (chunk) {
machine.bufIndex = 0; // reset to 0 machine.bufIndex = 0; // reset to 0
return true; return true;
}; };
machine.fns.addChunk = function (chunk) { machine.fns.addChunk = function (chunk) {
//console.log(''); //console.log('');
//console.log('[addChunk]'); //console.log('[addChunk]');
machine.chunkIndex = 0; machine.chunkIndex = 0;
@ -157,11 +159,8 @@ machine.fns.addChunk = function (chunk) {
machine.state %= machine.states_length; machine.state %= machine.states_length;
} }
} }
};
return machine;
}; };
module.exports = machine;
process.on('uncaughtException', function (err) {
console.error(err);
debug(Buffer.from([0]));
});

23
test-machine.js
View File

@ -1,7 +1,7 @@
'use strict'; 'use strict';
var sni = require('sni'); var sni = require('sni');
var machine = require('./machine.js'); var machine = require('./machine.js').create();
var hello = require('fs').readFileSync('./sni.hello.bin'); var hello = require('fs').readFileSync('./sni.hello.bin');
var version = 1; var version = 1;
var header = 'IPv4,127.0.1.1,443,' + hello.byteLength; var header = 'IPv4,127.0.1.1,443,' + hello.byteLength;
@ -12,6 +12,7 @@ var buf = Buffer.concat([
]); ]);
var services = { 'ssh': 22, 'http': 4080, 'https': 8443 }; var services = { 'ssh': 22, 'http': 4080, 'https': 8443 };
var clients = {}; var clients = {};
var count = 0;
machine.onMessage = function (opts) { machine.onMessage = function (opts) {
var id = opts.family + ',' + opts.address + ',' + opts.port; var id = opts.family + ',' + opts.address + ',' + opts.port;
@ -24,7 +25,7 @@ machine.onMessage = function (opts) {
if (!opts.data.equals(hello)) { if (!opts.data.equals(hello)) {
throw new Error("'data' packet is not equal to original 'hello' packet"); throw new Error("'data' packet is not equal to original 'hello' packet");
} }
console.log('all ', opts.data.byteLength, 'bytes are equal'); console.log('all', opts.data.byteLength, 'bytes are equal');
console.log('src:', opts.family, opts.address + ':' + opts.port); console.log('src:', opts.family, opts.address + ':' + opts.port);
console.log('dst:', 'IPv4 127.0.0.1:' + port); console.log('dst:', 'IPv4 127.0.0.1:' + port);
@ -35,24 +36,28 @@ machine.onMessage = function (opts) {
} }
console.log("servername: '" + servername + "'"); console.log("servername: '" + servername + "'");
} }
count += 1;
}; };
console.log('');
// full message in one go // full message in one go
// 223 = 2 + 22 + 199 // 223 = 2 + 22 + 199
console.log('');
console.log('[WHOLE BUFFER]', 2, header.length, hello.length, buf.byteLength); console.log('[WHOLE BUFFER]', 2, header.length, hello.length, buf.byteLength);
clients = {}; clients = {};
machine.fns.addChunk(buf); machine.fns.addChunk(buf);
console.log('');
// messages one byte at a time // messages one byte at a time
console.log('');
console.log('[BYTE-BY-BYTE BUFFER]', 1); console.log('[BYTE-BY-BYTE BUFFER]', 1);
clients = {}; clients = {};
buf.forEach(function (byte) { buf.forEach(function (byte) {
machine.fns.addChunk(Buffer.from([ byte ])); machine.fns.addChunk(Buffer.from([ byte ]));
}); });
console.log('');
// split messages in overlapping thirds // split messages in overlapping thirds
@ -63,7 +68,6 @@ buf.forEach(function (byte) {
// 225-247 (22) // 225-247 (22)
// 247-446 (199) // 247-446 (199)
buf = Buffer.concat([ buf, buf ]); buf = Buffer.concat([ buf, buf ]);
console.log('');
console.log('[OVERLAPPING BUFFERS]', buf.length); console.log('[OVERLAPPING BUFFERS]', buf.length);
clients = {}; clients = {};
[ buf.slice(0, 7) // version + header [ buf.slice(0, 7) // version + header
@ -77,3 +81,12 @@ clients = {};
].forEach(function (buf) { ].forEach(function (buf) {
machine.fns.addChunk(Buffer.from(buf)); machine.fns.addChunk(Buffer.from(buf));
}); });
console.log('');
process.on('exit', function () {
if (count !== 4) {
throw new Error("should have delivered 4 messages, not", count);
}
console.log('TESTS PASS');
console.log('');
});