chore: refactor the whole code to es6

Drop support for Node.js < 4
Improve the error performance by factor 2-3
Refactor benchmark execution order

Author: BridgeAR

.travis.yml

@@ -9,8 +9,6 @@ addons:
     packages:
     - g++-4.8
 node_js:
-  - "0.10"
-  - "4"
   - "6"
   - "7"
 install:

benchmark/index.js

@@ -2,56 +2,34 @@
 
 /* eslint handle-callback-err: 0 */
 
-var intercept = require('intercept-stdout')
-var Benchmark = require('benchmark')
-var suite = new Benchmark.Suite()
-var Parser = require('./../')
+const Benchmark = require('benchmark')
+const suite = new Benchmark.Suite()
+const Parser = require('./../')
+const HiredisParser = require('../test/hiredis')
 
 function returnError (error) {}
 function checkReply (error, res) {}
-function shuffle (array) {
-  var currentIndex = array.length
-  var temporaryValue
-  var randomIndex
-
-  // While there remain elements to shuffle...
-  while (currentIndex !== 0) {
-    // Pick a remaining element...
-    randomIndex = Math.floor(Math.random() * currentIndex)
-    currentIndex -= 1
-
-    // And swap it with the current element.
-    temporaryValue = array[currentIndex]
-    array[currentIndex] = array[randomIndex]
-    array[randomIndex] = temporaryValue
-  }
-
-  return array
-}
 
-// Suppress hiredis warnings
-intercept(function () {}, function () { return '' })
-
-var startBuffer = new Buffer('$100\r\nabcdefghij')
-var chunkBuffer = new Buffer('abcdefghijabcdefghijabcdefghij')
-var stringBuffer = new Buffer('+testing a simple string\r\n')
-var integerBuffer = new Buffer(':1237884\r\n')
-var bigIntegerBuffer = new Buffer(':184467440737095516171234567890\r\n') // 2^64 + 1
-var errorBuffer = new Buffer('-Error ohnoesitbroke\r\n')
-var endBuffer = new Buffer('\r\n')
-var lorem = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, ' +
+const startBuffer = new Buffer('$100\r\nabcdefghij')
+const chunkBuffer = new Buffer('abcdefghijabcdefghijabcdefghij')
+const stringBuffer = new Buffer('+testing a simple string\r\n')
+const integerBuffer = new Buffer(':1237884\r\n')
+const bigIntegerBuffer = new Buffer(':184467440737095516171234567890\r\n') // 2^64 + 1
+const errorBuffer = new Buffer('-Error ohnoesitbroke\r\n')
+const endBuffer = new Buffer('\r\n')
+const lorem = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, ' +
   'sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. ' +
   'Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ' +
   'ut aliquip ex ea commodo consequat. Duis aute irure dolor in' // 256 chars
-var bigStringArray = (new Array(Math.pow(2, 16) / lorem.length).join(lorem + ' ')).split(' ') // Math.pow(2, 16) chars long
-var startBigBuffer = new Buffer('$' + (4 * 1024 * 1024) + '\r\n')
+const bigStringArray = (new Array(Math.pow(2, 16) / lorem.length).join(lorem + ' ')).split(' ') // Math.pow(2, 16) chars long
+const startBigBuffer = new Buffer('$' + (4 * 1024 * 1024) + '\r\n')
 
-var chunks = new Array(64)
+const chunks = new Array(64)
 for (var i = 0; i < 64; i++) {
-  chunks[i] = new Buffer(shuffle(bigStringArray).join(' ') + '.') // Math.pow(2, 16) chars long
+  chunks[i] = new Buffer(bigStringArray.join(' ') + '.') // Math.pow(2, 16) chars long
 }
 
-var arraySize = 100
+const arraySize = 100
 var array = '*' + arraySize + '\r\n'
 var size = 0
 for (i = 0; i < arraySize; i++) {
@@ -60,10 +38,10 @@ for (i = 0; i < arraySize; i++) {
   array += size + '\r\n' + lorem.slice(0, size) + '\r\n'
 }
 
-var arrayBuffer = new Buffer(array)
+const arrayBuffer = new Buffer(array)
 
-var bigArraySize = 160
-var bigArrayChunks = [new Buffer('*1\r\n*1\r\n*' + bigArraySize)]
+const bigArraySize = 160
+const bigArrayChunks = [new Buffer('*1\r\n*1\r\n*' + bigArraySize)]
 for (i = 0; i < bigArraySize; i++) {
   // A chunk has a maximum size of 2^16 bytes.
   size = 65000 + i
@@ -76,28 +54,24 @@ for (i = 0; i < bigArraySize; i++) {
 }
 bigArrayChunks.push(new Buffer('\r\n'))
 
-var chunkedStringPart1 = new Buffer('+foobar')
-var chunkedStringPart2 = new Buffer('bazEND\r\n')
+const chunkedStringPart1 = new Buffer('+foobar')
+const chunkedStringPart2 = new Buffer('bazEND\r\n')
 
-var options = {
+const options = {
   returnReply: checkReply,
   returnError: returnError,
   returnFatalError: returnError
 }
-var parser = new Parser(options)
+const parser = new Parser(options)
+const parserHiRedis = new HiredisParser(options)
 
 options.returnBuffers = true
-var parserBuffer = new Parser(options)
-
-options.name = 'hiredis'
-var parserHiRedisBuffer = new Parser(options)
+const parserBuffer = new Parser(options)
+const parserHiRedisBuffer = new HiredisParser(options)
 
 delete options.returnBuffers
-var parserHiRedis = new Parser(options)
-
-delete options.name
 options.stringNumbers = true
-var parserStr = new Parser(options)
+const parserStr = new Parser(options)
 
 // BULK STRINGS
 
@@ -109,14 +83,6 @@ suite.add('HIREDIS: $ multiple chunks in a bulk string', function () {
   parserHiRedis.execute(endBuffer)
 })
 
-suite.add('HIREDIS BUF: $ multiple chunks in a bulk string', function () {
-  parserHiRedisBuffer.execute(startBuffer)
-  parserHiRedisBuffer.execute(chunkBuffer)
-  parserHiRedisBuffer.execute(chunkBuffer)
-  parserHiRedisBuffer.execute(chunkBuffer)
-  parserHiRedisBuffer.execute(endBuffer)
-})
-
 suite.add('JS PARSER: $ multiple chunks in a bulk string', function () {
   parser.execute(startBuffer)
   parser.execute(chunkBuffer)
@@ -125,6 +91,14 @@ suite.add('JS PARSER: $ multiple chunks in a bulk string', function () {
   parser.execute(endBuffer)
 })
 
+suite.add('HIREDIS BUF: $ multiple chunks in a bulk string', function () {
+  parserHiRedisBuffer.execute(startBuffer)
+  parserHiRedisBuffer.execute(chunkBuffer)
+  parserHiRedisBuffer.execute(chunkBuffer)
+  parserHiRedisBuffer.execute(chunkBuffer)
+  parserHiRedisBuffer.execute(endBuffer)
+})
+
 suite.add('JS PARSER BUF: $ multiple chunks in a bulk string', function () {
   parserBuffer.execute(startBuffer)
   parserBuffer.execute(chunkBuffer)
@@ -140,16 +114,16 @@ suite.add('\nHIREDIS: + multiple chunks in a string', function () {
   parserHiRedis.execute(chunkedStringPart2)
 })
 
-suite.add('HIREDIS BUF: + multiple chunks in a string', function () {
-  parserHiRedisBuffer.execute(chunkedStringPart1)
-  parserHiRedisBuffer.execute(chunkedStringPart2)
-})
-
 suite.add('JS PARSER: + multiple chunks in a string', function () {
   parser.execute(chunkedStringPart1)
   parser.execute(chunkedStringPart2)
 })
 
+suite.add('HIREDIS BUF: + multiple chunks in a string', function () {
+  parserHiRedisBuffer.execute(chunkedStringPart1)
+  parserHiRedisBuffer.execute(chunkedStringPart2)
+})
+
 suite.add('JS PARSER BUF: + multiple chunks in a string', function () {
   parserBuffer.execute(chunkedStringPart1)
   parserBuffer.execute(chunkedStringPart2)
@@ -165,14 +139,6 @@ suite.add('\nHIREDIS: $ 4mb bulk string', function () {
   parserHiRedis.execute(endBuffer)
 })
 
-suite.add('HIREDIS BUF: $ 4mb bulk string', function () {
-  parserHiRedisBuffer.execute(startBigBuffer)
-  for (var i = 0; i < 64; i++) {
-    parserHiRedisBuffer.execute(chunks[i])
-  }
-  parserHiRedisBuffer.execute(endBuffer)
-})
-
 suite.add('JS PARSER: $ 4mb bulk string', function () {
   parser.execute(startBigBuffer)
   for (var i = 0; i < 64; i++) {
@@ -181,6 +147,14 @@ suite.add('JS PARSER: $ 4mb bulk string', function () {
   parser.execute(endBuffer)
 })
 
+suite.add('HIREDIS BUF: $ 4mb bulk string', function () {
+  parserHiRedisBuffer.execute(startBigBuffer)
+  for (var i = 0; i < 64; i++) {
+    parserHiRedisBuffer.execute(chunks[i])
+  }
+  parserHiRedisBuffer.execute(endBuffer)
+})
+
 suite.add('JS PARSER BUF: $ 4mb bulk string', function () {
   parserBuffer.execute(startBigBuffer)
   for (var i = 0; i < 64; i++) {
@@ -195,14 +169,14 @@ suite.add('\nHIREDIS: + simple string', function () {
   parserHiRedis.execute(stringBuffer)
 })
 
-suite.add('HIREDIS BUF: + simple string', function () {
-  parserHiRedisBuffer.execute(stringBuffer)
-})
-
 suite.add('JS PARSER: + simple string', function () {
   parser.execute(stringBuffer)
 })
 
+suite.add('HIREDIS BUF: + simple string', function () {
+  parserHiRedisBuffer.execute(stringBuffer)
+})
+
 suite.add('JS PARSER BUF: + simple string', function () {
   parserBuffer.execute(stringBuffer)
 })
@@ -241,14 +215,14 @@ suite.add('\nHIREDIS: * array', function () {
   parserHiRedis.execute(arrayBuffer)
 })
 
-suite.add('HIREDIS BUF: * array', function () {
-  parserHiRedisBuffer.execute(arrayBuffer)
-})
-
 suite.add('JS PARSER: * array', function () {
   parser.execute(arrayBuffer)
 })
 
+suite.add('HIREDIS BUF: * array', function () {
+  parserHiRedisBuffer.execute(arrayBuffer)
+})
+
 suite.add('JS PARSER BUF: * array', function () {
   parserBuffer.execute(arrayBuffer)
 })
@@ -261,15 +235,15 @@ suite.add('\nHIREDIS: * big nested array', function () {
   }
 })
 
-suite.add('HIREDIS BUF: * big nested array', function () {
+suite.add('JS PARSER: * big nested array', function () {
   for (var i = 0; i < bigArrayChunks.length; i++) {
-    parserHiRedisBuffer.execute(bigArrayChunks[i])
+    parser.execute(bigArrayChunks[i])
   }
 })
 
-suite.add('JS PARSER: * big nested array', function () {
+suite.add('HIREDIS BUF: * big nested array', function () {
   for (var i = 0; i < bigArrayChunks.length; i++) {
-    parser.execute(bigArrayChunks[i])
+    parserHiRedisBuffer.execute(bigArrayChunks[i])
   }
 })
 

changelog.md

@@ -1,3 +1,14 @@
+## v.3.0.0 - xx Apr, 2017
+
+Breaking Changes
+
+- Drop support for Node.js < 6
+- Removed support for hiredis completely
+
+Internals
+
+- Due to the changes to ES6 the error performance improved by factor 2-3x
+
 ## v.2.6.0 - 03 Apr, 2017
 
 Internals