[fix] decodePacket now accepts both Buffer and ArrayBuffer as data

Closes #64, fixes #60

Author: jm

lib/index.js

@@ -146,12 +146,14 @@ exports.decodePacket = function (data, binaryType, utf8decode) {
 
   // Binary data
   if (binaryType === 'arraybuffer') {
-    var type = data[0];
-    var intArray = new Uint8Array(data.length - 1);
-    for (var i = 1; i < data.length; i++) {
-      intArray[i - 1] = data[i];
-    }
-    return { type: packetslist[type], data: intArray.buffer };
+    // wrap Buffer/ArrayBuffer data into an Uint8Array
+    var intArray = new Uint8Array(data);
+    var type = intArray[0];
+    return { type: packetslist[type], data: intArray.buffer.slice(1) };
+  }
+
+  if (data instanceof ArrayBuffer) {
+    data = arrayBufferToBuffer(data);
   }
   var type = data[0];
   return { type: packetslist[type], data: data.slice(1) };

test/node/index.js

@@ -130,6 +130,28 @@ describe('parser', function() {
     });
   });
 
+  it('should decode an ArrayBuffer as binary', function() {
+    var arrayBuffer = new ArrayBuffer(4);
+    var dataview = new DataView(arrayBuffer);
+    for (var i = 0; i < arrayBuffer.byteLength ; i++) dataview.setInt8(i, 4 - i);
+
+    var decoded = decode(arrayBuffer, 'arraybuffer');
+    var expectedOutput = arrayBuffer.slice(1);
+    expect(decoded).to.eql({ type: 'message', data: expectedOutput });
+    expect(new Uint8Array(decoded.data)).to.eql(new Uint8Array(expectedOutput));
+  });
+
+  it('should decode an ArrayBuffer without specifying binaryType', function() {
+    var buffer = new ArrayBuffer(4);
+    var dataview = new DataView(buffer);
+    for (var i = 0; i < buffer.byteLength ; i++) dataview.setInt8(i, 4 - i);
+
+    var decoded = decode(buffer);
+    var expectedOutput = new Buffer([3,2,1]);
+    expect(decoded).to.eql({ type: 'message', data: expectedOutput });
+    expect(new Uint8Array(decoded.data)).to.eql(new Uint8Array(expectedOutput));
+  });
+
 });
 
 function areArraysEqual(x, y) {