Merge branch 'master' into benchmarks

Author: themasch

.travis.yml

@@ -1,12 +1,8 @@
 language: node_js
-sudo: false
 node_js:
   - stable
+  - 8
   - 6
   - 4
-  - "0.12"
-  - "0.10"
-branches:
-  only:
-    - master
-script: npm test
+script:
+  - npm test

lib/encode.js

@@ -25,30 +25,28 @@ function encode (data, buffer, offset) {
 encode.bytes = -1
 encode._floatConversionDetected = false
 
-encode._encode = function (buffers, data) {
-  if (Buffer.isBuffer(data)) {
-    buffers.push(Buffer.from(data.length + ':'))
-    buffers.push(data)
-    return
-  }
+encode.getType = function (value) {
+  if (Buffer.isBuffer(value)) return 'buffer'
+  if (Array.isArray(value)) return 'array'
+  if (ArrayBuffer.isView(value)) return 'typedarray'
+  if (value instanceof Number) return 'number'
+  if (value instanceof Boolean) return 'boolean'
+  if (value instanceof ArrayBuffer) return 'arraybuffer'
+  return typeof value
+}
 
+encode._encode = function (buffers, data) {
   if (data == null) { return }
 
-  switch (typeof data) {
-    case 'string':
-      encode.buffer(buffers, data)
-      break
-    case 'number':
-      encode.number(buffers, data)
-      break
-    case 'object':
-      data.constructor === Array
-        ? encode.list(buffers, data)
-        : encode.dict(buffers, data)
-      break
-    case 'boolean':
-      encode.number(buffers, data ? 1 : 0)
-      break
+  switch (encode.getType(data)) {
+    case 'buffer': encode.buffer(buffers, data); break
+    case 'object': encode.dict(buffers, data); break
+    case 'array': encode.list(buffers, data); break
+    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 'arraybuffer': encode.buffer(buffers, Buffer.from(data)); break
   }
 }
 
@@ -57,6 +55,10 @@ var buffD = Buffer.from('d')
 var buffL = Buffer.from('l')
 
 encode.buffer = function (buffers, data) {
+  buffers.push(new Buffer(data.length + ':'), data)
+}
+
+encode.string = function (buffers, data) {
   buffers.push(Buffer.from(Buffer.byteLength(data) + ':' + data))
 }
 
@@ -90,7 +92,7 @@ encode.dict = function (buffers, data) {
   for (; j < kl; j++) {
     k = keys[j]
     if (data[k] == null) continue
-    encode.buffer(buffers, k)
+    encode.string(buffers, k)
     encode._encode(buffers, data[k])
   }
 

test/encode.test.js

@@ -116,4 +116,53 @@ test('bencode#encode()', function (t) {
     t.equal(bencode.encode({'a': '45', 'b': 45}).toString(), 'd1:a2:451:bi45ee')
     t.equal(bencode.encode({'a': Buffer.from('bc')}).toString(), 'd1:a2:bce')
   })
+
+  t.test('should encode new Number(1) as number', function (t) {
+    var data = new Number(1) // eslint-disable-line
+    var result = bencode.decode(bencode.encode(data))
+    var expected = 1
+    t.plan(1)
+    t.strictEqual(result, expected)
+  })
+
+  t.test('should encode new Boolean(true) as number', function (t) {
+    var data = new Boolean(true) // eslint-disable-line
+    var result = bencode.decode(bencode.encode(data))
+    var expected = 1
+    t.plan(1)
+    t.strictEqual(result, expected)
+  })
+
+  t.test('should encode Uint8Array as buffer', function (t) {
+    var data = new Uint8Array([ 1, 2, 3, 4, 5, 6, 7, 8, 9 ])
+    var result = bencode.decode(bencode.encode(data))
+    var expected = Buffer.from(data.buffer)
+    t.plan(1)
+    t.deepEqual(result, expected)
+  })
+
+  t.test('should encode Uint32Array as buffer', function (t) {
+    var data = new Uint32Array([ 0xF, 0xFF, 0xFFF, 0xFFFF, 0xFFFFF, 0xFFFFFF, 0xFFFFFFF, 0xFFFFFFFF ])
+    var result = bencode.decode(bencode.encode(data))
+    var expected = Buffer.from(data.buffer)
+    t.plan(1)
+    t.deepEqual(result, expected)
+  })
+
+  t.test('should encode ArrayBuffer as buffer', function (t) {
+    var data = new Uint32Array([ 0xF, 0xFF, 0xFFF, 0xFFFF, 0xFFFFF, 0xFFFFFF, 0xFFFFFFF, 0xFFFFFFFF ])
+    var result = bencode.decode(bencode.encode(data.buffer))
+    var expected = Buffer.from(data.buffer)
+    t.plan(1)
+    t.deepEqual(result, expected)
+  })
+
+  t.test('should encode Float32Array as buffer', 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)
+  })
 })