Merge pull request #162 from jrobeson/unbundle-hexy

Unbundle hexy and use the npm package
sidorares · Oct 3, 2017 · 01d9237 · 01d9237
2 parents 0ff6455 + cdaf7e2
commit 01d9237
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 276 deletions.
diff --git a/lib/hexy.js b/lib/hexy.js
diff --git a/lib/marshall.js b/lib/marshall.js
@@ -66,7 +66,7 @@ function write(ps, ele, data) {
       ps._offset += arrBuff.length;
 
       //console.log('=========================');
-      //console.error(require('./hexy').hexy(arrBuff, {prefix: '======= '}));
+      //console.error(require('hexy').hexy(arrBuff, {prefix: '======= '}));
       //console.log('=========================');
       break;
     case 'v':

diff --git a/lib/marshall1.js b/lib/marshall1.js
@@ -58,7 +58,7 @@ function write(ps, ele, data) {
       ps._offset += arrBuff.length;
 
       //console.log('=========================');
-      //console.error(require('./hexy').hexy(arrBuff, {prefix: '======= '}));
+      //console.error(require('hexy').hexy(arrBuff, {prefix: '======= '}));
       //console.log('=========================');
       break;
     case 'v':

diff --git a/lib/server.js b/lib/server.js
@@ -7,7 +7,7 @@ module.exports.createServer = function(handler) {
         var id = 123;
         this.server = net.createServer(function(socket) {
 
-           //var hexy = require('./hexy');
+           //var hexy = require('hexy');
            //socket.on('data', function(data) {
            //  console.error(hexy.hexy(data, {prefix: 'from client  '}));
            //});

diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
   },
   "dependencies": {
     "event-stream": "^3.1.7",
+    "hexy": "^0.2.10",
     "long": "^3.0.1",
     "put": "0.0.6",
     "xml2js": "0.1.14"

diff --git a/test/example-messages.js b/test/example-messages.js
@@ -10,7 +10,7 @@ describe('given base-64 encoded files with complete messages', function() {
     messages.forEach(function(name) {
       var msg = fs.readFileSync(dir + name, 'ascii');
       var msgBin = new Buffer(msg, 'base64');
-      //var hexy = require('../lib/hexy').hexy;
+      //var hexy = require('hexy').hexy;
       //console.log(hexy(msgBin));
       //console.log(unmarshall(msgBin));
       var unmarshalledMsg = unmarshall(msgBin);

diff --git a/test/js-types.js b/test/js-types.js
@@ -1,7 +1,7 @@
 var marshall   = require('../lib/marshall');
 var unmarshall = require('../lib/unmarshall');
 var assert     = require('assert');
-var hexy       = require('../lib/hexy').hexy;
+var hexy       = require('hexy').hexy;
 
 function testOnly() {};
 

diff --git a/test/unmarshall-basic.js b/test/unmarshall-basic.js
@@ -1,7 +1,7 @@
 var marshall   = require('../lib/marshall');
 var unmarshall = require('../lib/unmarshall');
 var assert     = require('assert');
-var hexy       = require('../lib/hexy').hexy;
+var hexy       = require('hexy').hexy;
 
 var Long = require('long');
 var LongMaxS64 = Long.fromString("9223372036854775807", false);

diff --git a/test/unmarshall-message.js b/test/unmarshall-message.js
@@ -2,7 +2,7 @@ var marshall = require('../lib/marshall');
 var unmarshall = require('../lib/unmarshall');
 var message = require('../lib/message');
 var assert = require('assert');
-var hexy = require('../lib/hexy').hexy;
+var hexy = require('hexy').hexy;
 
 function msg2buff(msg) {
   return message.marshall(msg);

diff --git a/test/utils/packetcapture.js b/test/utils/packetcapture.js
@@ -1,5 +1,5 @@
 var net = require('net');
-var hexy = require('./lib/hexy').hexy;
+var hexy = require('hexy').hexy;
 require('abstractsocket')(net);
 var buffs = require('buffers');
 
@@ -13,7 +13,7 @@ function nextPacketPos(b)
       if (b.get(i) == 0x6c && b.get(i+3) == 1 && b.get(i+1) < 5 && b.get(i+2) < 4 && b.get(i+10) < 9)
         return i;
     return -1;
-    
+
 }
 
 var packetfile = fs.createWriteStream('./packets.bin');
@@ -78,7 +78,7 @@ net.createServer(function(s)
             packetfile.write(packet);
             }
             extractPacket();
-        } 
+        }
         }
         extractPacket()
     });

diff --git a/test/utils/portforv.js b/test/utils/portforv.js
@@ -1,5 +1,5 @@
 var net = require('net');
-var hexy = require('./lib/hexy').hexy;
+var hexy = require('hexy').hexy;
 require('abstractsocket')(net);
 
 net.createServer(function(s)

diff --git a/test/utils/tester.js b/test/utils/tester.js
@@ -3,7 +3,7 @@ var binarystream = require('binary');
 var packets = fs.readFileSync('./packets.bin');
 var EventEmitter = require('events').EventEmitter;
 var message = require('./lib/message');
-var hexy = require('./lib/hexy').hexy;
+var hexy = require('hexy').hexy;
 
 //var probBody = packets.slice(2544+16*11+16*4+8, 2544+16*11+16*4+8+0x390);
 //var stream = fs.createWriteStream('./problembody.bin')
@@ -33,7 +33,7 @@ if (1) {
 
 
 function readPacket(offset, data) {
-    
+
     if (offset > data.length)
         return;
     console.log(' ======********====== START : ', offset, data.length);
@@ -46,12 +46,12 @@ function readPacket(offset, data) {
         packet = data.slice(offset, data.length);
         //console.error(hexy(packet, {prefix: 'problem packet: '}));
         //return
-        console.log(hexy(packet, {prefix: 'packet: '}));    
+        console.log(hexy(packet, {prefix: 'packet: '}));
         debugger;
     } else {
         console.log("SLICING:", len, offset+4, offset+len+4);
         packet = data.slice(offset+4, offset+len+4);
-        console.log(hexy(packet, {prefix: 'packet: '}));    
+        console.log(hexy(packet, {prefix: 'packet: '}));
     }
     var dbus = new EventEmitter();
     var stream = binarystream.parse(packet);