cleanup

client.js

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

machine.js

@@ -1,14 +1,16 @@
 'use strict';
 
-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 = {};
+module.exports.create = function () {
 
-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;
     len = len || chunk.length - i;
     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('statei:', machine.state);
     console.log('index:', machine.chunkIndex);
-}
+  }
 
-machine.fns.version = function (chunk) {
+  machine.fns.version = function (chunk) {
     //console.log('');
     //console.log('[version]');
     if ((255 - machine._version) !== chunk[machine.chunkIndex]) {
@@ -28,24 +30,24 @@ machine.fns.version = function (chunk) {
     machine.chunkIndex += 1;
 
     return true;
-};
+  };
 
 
-machine.headerLen = 0;
-machine.fns.headerLength = function (chunk) {
+  machine.headerLen = 0;
+  machine.fns.headerLength = function (chunk) {
     //console.log('');
     //console.log('[headerLength]');
     machine.headerLen = chunk[machine.chunkIndex];
     machine.chunkIndex += 1;
 
     return true;
-};
+  };
 
 
-machine.buf = null;
-machine.bufIndex = 0;
-//var buf = Buffer.alloc(4096);
-machine.fns.header = function (chunk) {
+  machine.buf = null;
+  machine.bufIndex = 0;
+  //var buf = Buffer.alloc(4096);
+  machine.fns.header = function (chunk) {
     //console.log('');
     //console.log('[header]');
     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.
       if (!machine.buf) {
         machine.buf = Buffer.alloc(machine.headerLen);
-      //console.log('[1a] machine.headerLen:', machine.headerLen);
       }
 
       // partLen should be no more than the available size
@@ -94,9 +95,9 @@ machine.fns.header = function (chunk) {
 
       return true;
     }
-};
+  };
 
-machine.fns.data = function (chunk) {
+  machine.fns.data = function (chunk) {
     //console.log('');
     //console.log('[data]');
     var curSize = machine.bufIndex + (chunk.length - machine.chunkIndex);
@@ -123,7 +124,7 @@ machine.fns.data = function (chunk) {
       return false;
     }
 
-  if (machine.buf) {
+    if (machine.bufIndex > 0) {
       // the completing remainder of the body is in the current slice
       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
       machine.buf = chunk.slice(machine.chunkIndex, machine.chunkIndex + partLen);
     }
+    machine.bufIndex += partLen;
 
     machine.onMessage({
       family: machine.family
     , address: machine.address
     , port: machine.port
-  , data: machine.buf
+    , data: machine.buf.slice(0, machine.bufIndex)
     });
 
     machine.chunkIndex += partLen;  // === chunk.length
@@ -144,8 +146,8 @@ machine.fns.data = function (chunk) {
     machine.bufIndex = 0;           // reset to 0
 
     return true;
-};
-machine.fns.addChunk = function (chunk) {
+  };
+  machine.fns.addChunk = function (chunk) {
     //console.log('');
     //console.log('[addChunk]');
     machine.chunkIndex = 0;
@@ -157,11 +159,8 @@ machine.fns.addChunk = function (chunk) {
         machine.state %= machine.states_length;
       }
     }
+  };
+
+  return machine;
+
 };
-
-module.exports = machine;
-
-process.on('uncaughtException', function (err) {
-  console.error(err);
-  debug(Buffer.from([0]));
-});

test-machine.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var sni = require('sni');
-var machine = require('./machine.js');
+var machine = require('./machine.js').create();
 var hello = require('fs').readFileSync('./sni.hello.bin');
 var version = 1;
 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 clients = {};
+var count = 0;
 
 machine.onMessage = function (opts) {
   var id = opts.family + ',' + opts.address + ',' + opts.port;
@@ -24,7 +25,7 @@ machine.onMessage = function (opts) {
   if (!opts.data.equals(hello)) {
     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('dst:', 'IPv4 127.0.0.1:' + port);
 
@@ -35,24 +36,28 @@ machine.onMessage = function (opts) {
     }
     console.log("servername: '" + servername + "'");
   }
+
+  count += 1;
 };
 
 
+console.log('');
+
 // full message in one go
 // 223 = 2 + 22 + 199
-console.log('');
 console.log('[WHOLE BUFFER]', 2, header.length, hello.length, buf.byteLength);
 clients = {};
 machine.fns.addChunk(buf);
+console.log('');
 
 
 // messages one byte at a time
-console.log('');
 console.log('[BYTE-BY-BYTE BUFFER]', 1);
 clients = {};
 buf.forEach(function (byte) {
   machine.fns.addChunk(Buffer.from([ byte ]));
 });
+console.log('');
 
 
 // split messages in overlapping thirds
@@ -63,7 +68,6 @@ buf.forEach(function (byte) {
 // 225-247  (22)
 // 247-446  (199)
 buf = Buffer.concat([ buf, buf ]);
-console.log('');
 console.log('[OVERLAPPING BUFFERS]', buf.length);
 clients = {};
 [ buf.slice(0, 7)                 // version + header
@@ -77,3 +81,12 @@ clients = {};
 ].forEach(function (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('');
+});