Merge pull request #80 from nazar-pc/ArrayBufferView-fix

Fix support for any valid `ArrayDataView`

Author: themasch

lib/encode.js

@@ -28,7 +28,7 @@ encode._floatConversionDetected = false
 encode.getType = function (value) {
   if (Buffer.isBuffer(value)) return 'buffer'
   if (Array.isArray(value)) return 'array'
-  if (ArrayBuffer.isView(value)) return 'typedarray'
+  if (ArrayBuffer.isView(value)) return 'arraybufferview'
   if (value instanceof Number) return 'number'
   if (value instanceof Boolean) return 'boolean'
   if (value instanceof ArrayBuffer) return 'arraybuffer'
@@ -45,7 +45,7 @@ encode._encode = function (buffers, data) {
     case 'string': encode.string(buffers, data); break
     case 'number': encode.number(buffers, data); break
     case 'boolean': encode.number(buffers, data); break
-    case 'typedarray': encode.buffer(buffers, Buffer.from(data.buffer)); break
+    case 'arraybufferview': encode.buffer(buffers, Buffer.from(data.buffer, data.byteOffset, data.byteLength)); break
     case 'arraybuffer': encode.buffer(buffers, Buffer.from(data)); break
   }
 }

test/encode.test.js

@@ -161,7 +161,24 @@ test('bencode#encode()', function (t) {
     var data = new Float32Array([ 1.2, 2.3, 3.4, 4.5, 5.6, 6.7, 7.8, 8.9, 9.0 ])
     var result = bencode.decode(bencode.encode(data))
     var expected = Buffer.from(data.buffer)
-    console.log(result)
+    t.plan(1)
+    t.deepEqual(result, expected)
+  })
+
+  t.test('should encode DataView as buffer', function (t) {
+    var data = new Uint8Array([ 1, 2, 3, 4, 5, 6, 7, 8, 9 ])
+    var view = new DataView(data.buffer)
+    var result = bencode.decode(bencode.encode(view))
+    var expected = Buffer.from(data.buffer)
+    t.plan(1)
+    t.deepEqual(result, expected)
+  })
+
+  t.test('should encode Uint8Array subarray properly', function (t) {
+    var data = new Uint8Array([ 1, 2, 3, 4, 5, 6, 7, 8, 9 ])
+    var subData = data.subarray(5)
+    var result = bencode.decode(bencode.encode(subData))
+    var expected = Buffer.from(subData.buffer, subData.byteOffset, subData.byteLength)
     t.plan(1)
     t.deepEqual(result, expected)
   })