notepack.io - npm Package Compare versions

Comparing version 2.2.0 to 2.3.0

dist/notepack.js

 /*!
- * Notepack.io 2.2.0
- * (c) 2014-2018 Damien Arrachequesne
+ * Notepack.io 2.3.0
+ * (c) 2014-2020 Damien Arrachequesne
  * Released under the MIT License.
@@ -5,0 +5,0 @@ */

dist/notepack.min.js

 /*!
- * Notepack.io 2.2.0
- * (c) 2014-2018 Damien Arrachequesne
+ * Notepack.io 2.3.0
+ * (c) 2014-2020 Damien Arrachequesne
  * Released under the MIT License.
  */
 !function(t){function s(t){if(this.t=0,t instanceof ArrayBuffer)this.i=t,this.s=new DataView(this.i);else{if(!ArrayBuffer.isView(t))throw new Error("Invalid argument");this.i=t.buffer,this.s=new DataView(this.i,t.byteOffset,t.byteLength)}}function y(t,i,r){for(var s=0,e=0,h=r.length;e<h;e++)(s=r.charCodeAt(e))<128?t.setUint8(i++,s):(s<2048?t.setUint8(i++,192|s>>6):(s<55296||57344<=s?t.setUint8(i++,224|s>>12):(e++,s=65536+((1023&s)<<10|1023&r.charCodeAt(e)),t.setUint8(i++,240|s>>18),t.setUint8(i++,128|s>>12&63)),t.setUint8(i++,128|s>>6&63)),t.setUint8(i++,128|63&s))}function d(t){for(var i=0,r=0,s=0,e=t.length;s<e;s++)(i=t.charCodeAt(s))<128?r+=1:i<2048?r+=2:i<55296||57344<=i?r+=3:(s++,r+=4);return r}self.notepack={encode:function(t){var i=[],r=[],s=function t(i,r,s){var e=typeof s,h=0,n=0,a=0,f=0,u=0,o=0;if("string"===e){if((u=d(s))<32)i.push(160|u),o=1;else if(u<256)i.push(217,u),o=2;else if(u<65536)i.push(218,u>>8,u),o=3;else{if(!(u<4294967296))throw new Error("String too long");i.push(219,u>>24,u>>16,u>>8,u),o=5}return r.push({h:s,u:u,t:i.length}),o+u}if("number"===e)return Math.floor(s)===s&&isFinite(s)?0<=s?s<128?(i.push(s),1):s<256?(i.push(204,s),2):s<65536?(i.push(205,s>>8,s),3):s<4294967296?(i.push(206,s>>24,s>>16,s>>8,s),5):(a=s/Math.pow(2,32)>>0,f=s>>>0,i.push(207,a>>24,a>>16,a>>8,a,f>>24,f>>16,f>>8,f),9):-32<=s?(i.push(s),1):-128<=s?(i.push(208,s),2):-32768<=s?(i.push(209,s>>8,s),3):-2147483648<=s?(i.push(210,s>>24,s>>16,s>>8,s),5):(a=Math.floor(s/Math.pow(2,32)),f=s>>>0,i.push(211,a>>24,a>>16,a>>8,a,f>>24,f>>16,f>>8,f),9):(i.push(203),r.push({o:s,u:8,t:i.length}),9);if("object"===e){if(null===s)return i.push(192),1;if(Array.isArray(s)){if((u=s.length)<16)i.push(144|u),o=1;else if(u<65536)i.push(220,u>>8,u),o=3;else{if(!(u<4294967296))throw new Error("Array too large");i.push(221,u>>24,u>>16,u>>8,u),o=5}for(h=0;h<u;h++)o+=t(i,r,s[h]);return o}if(s instanceof Date){var c=s.getTime();return a=Math.floor(c/Math.pow(2,32)),f=c>>>0,i.push(215,0,a>>24,a>>16,a>>8,a,f>>24,f>>16,f>>8,f),10}if(s instanceof ArrayBuffer){if((u=s.byteLength)<256)i.push(196,u),o=2;else if(u<65536)i.push(197,u>>8,u),o=3;else{if(!(u<4294967296))throw new Error("Buffer too large");i.push(198,u>>24,u>>16,u>>8,u),o=5}return r.push({l:s,u:u,t:i.length}),o+u}if("function"==typeof s.toJSON)return t(i,r,s.toJSON());var l=[],w="",v=Object.keys(s);for(h=0,n=v.length;h<n;h++)w=v[h],"function"!=typeof s[w]&&l.push(w);if((u=l.length)<16)i.push(128|u),o=1;else if(u<65536)i.push(222,u>>8,u),o=3;else{if(!(u<4294967296))throw new Error("Object too large");i.push(223,u>>24,u>>16,u>>8,u),o=5}for(h=0;h<u;h++)w=l[h],o+=t(i,r,w),o+=t(i,r,s[w]);return o}if("boolean"===e)return i.push(s?195:194),1;if("undefined"===e)return i.push(212,0,0),3;throw new Error("Could not encode")}(i,r,t),e=new ArrayBuffer(s),h=new DataView(e),n=0,a=0,f=-1;0<r.length&&(f=r[0].t);for(var u,o=0,c=0,l=0,w=i.length;l<w;l++)if(h.setUint8(a+l,i[l]),l+1===f){if(o=(u=r[n]).u,c=a+f,u.l)for(var v=new Uint8Array(u.l),g=0;g<o;g++)h.setUint8(c+g,v[g]);else u.h?y(h,c,u.h):void 0!==u.o&&h.setFloat64(c,u.o);a+=o,r[++n]&&(f=r[n].t)}return e},decode:function(t){var i=new s(t),r=i.v();if(i.t===t.byteLength)return r;throw new Error(t.byteLength-i.t+" trailing bytes")}},s.prototype.g=function(t){for(var i=new Array(t),r=0;r<t;r++)i[r]=this.v();return i},s.prototype.M=function(t){for(var i={},r=0;r<t;r++)i[this.v()]=this.v();return i},s.prototype.h=function(t){var i=function(t,i,r){for(var s="",e=0,h=i,n=i+r;h<n;h++){var a=t.getUint8(h);if(0!=(128&a))if(192!=(224&a))if(224!=(240&a)){if(240!=(248&a))throw new Error("Invalid byte "+a.toString(16));65536<=(e=(7&a)<<18|(63&t.getUint8(++h))<<12|(63&t.getUint8(++h))<<6|(63&t.getUint8(++h))<<0)?(e-=65536,s+=String.fromCharCode(55296+(e>>>10),56320+(1023&e))):s+=String.fromCharCode(e)}else s+=String.fromCharCode((15&a)<<12|(63&t.getUint8(++h))<<6|(63&t.getUint8(++h))<<0);else s+=String.fromCharCode((31&a)<<6|63&t.getUint8(++h));else s+=String.fromCharCode(a)}return s}(this.s,this.t,t);return this.t+=t,i},s.prototype.l=function(t){var i=this.i.slice(this.t,this.t+t);return this.t+=t,i},s.prototype.v=function(){var t,i=this.s.getUint8(this.t++),r=0,s=0,e=0,h=0;if(i<192)return i<128?i:i<144?this.M(15&i):i<160?this.g(15&i):this.h(31&i);if(223<i)return-1*(255-i+1);switch(i){case 192:return null;case 194:return!1;case 195:return!0;case 196:return r=this.s.getUint8(this.t),this.t+=1,this.l(r);case 197:return r=this.s.getUint16(this.t),this.t+=2,this.l(r);case 198:return r=this.s.getUint32(this.t),this.t+=4,this.l(r);case 199:return r=this.s.getUint8(this.t),s=this.s.getInt8(this.t+1),this.t+=2,[s,this.l(r)];case 200:return r=this.s.getUint16(this.t),s=this.s.getInt8(this.t+2),this.t+=3,[s,this.l(r)];case 201:return r=this.s.getUint32(this.t),s=this.s.getInt8(this.t+4),this.t+=5,[s,this.l(r)];case 202:return t=this.s.getFloat32(this.t),this.t+=4,t;case 203:return t=this.s.getFloat64(this.t),this.t+=8,t;case 204:return t=this.s.getUint8(this.t),this.t+=1,t;case 205:return t=this.s.getUint16(this.t),this.t+=2,t;case 206:return t=this.s.getUint32(this.t),this.t+=4,t;case 207:return e=this.s.getUint32(this.t)*Math.pow(2,32),h=this.s.getUint32(this.t+4),this.t+=8,e+h;case 208:return t=this.s.getInt8(this.t),this.t+=1,t;case 209:return t=this.s.getInt16(this.t),this.t+=2,t;case 210:return t=this.s.getInt32(this.t),this.t+=4,t;case 211:return e=this.s.getInt32(this.t)*Math.pow(2,32),h=this.s.getUint32(this.t+4),this.t+=8,e+h;case 212:return s=this.s.getInt8(this.t),this.t+=1,0===s?void(this.t+=1):[s,this.l(1)];case 213:return s=this.s.getInt8(this.t),this.t+=1,[s,this.l(2)];case 214:return s=this.s.getInt8(this.t),this.t+=1,[s,this.l(4)];case 215:return s=this.s.getInt8(this.t),this.t+=1,0===s?(e=this.s.getInt32(this.t)*Math.pow(2,32),h=this.s.getUint32(this.t+4),this.t+=8,new Date(e+h)):[s,this.l(8)];case 216:return s=this.s.getInt8(this.t),this.t+=1,[s,this.l(16)];case 217:return r=this.s.getUint8(this.t),this.t+=1,this.h(r);case 218:return r=this.s.getUint16(this.t),this.t+=2,this.h(r);case 219:return r=this.s.getUint32(this.t),this.t+=4,this.h(r);case 220:return r=this.s.getUint16(this.t),this.t+=2,this.g(r);case 221:return r=this.s.getUint32(this.t),this.t+=4,this.g(r);case 222:return r=this.s.getUint16(this.t),this.t+=2,this.M(r);case 223:return r=this.s.getUint32(this.t),this.t+=4,this.M(r)}throw new Error("Could not parse")}}();

HISTORY.md

@@ -0,1 +1,16 @@
+
+# [2.3.0](https://github.com/darrachequesne/notepack/compare/2.2.0...v2.3.0) (2020-03-15)
+
+
+### Performance Improvements
+
+* **decode:** add a cache for buffer-to-string conversions ([3c0e5a6](https://github.com/darrachequesne/notepack/commit/3c0e5a66332e50ce31749f0159a533156edbdd3d))
+* **encode:** add a cache for string-to-buffer conversions ([60e8b0b](https://github.com/darrachequesne/notepack/commit/60e8b0b4b16b05e702334fe731df1ec43d1a9f14))
+
+
+
+# [2.2.0](https://github.com/darrachequesne/notepack/compare/2.1.3...2.2.0) (2018-12-18)
+
+
+
 <a name="2.1.3"></a>
@@ -2,0 +17,0 @@ ## [2.1.3](https://github.com/darrachequesne/notepack/compare/2.1.2...2.1.3) (2018-05-14)

lib/decode.js

 'use strict';
 
+const DecodeKeyCache = require('./DecodeKeyCache');
+const cache = new DecodeKeyCache();
+
 function Decoder(buffer) {
   this.offset = 0;
   this.buffer = buffer;
+  this.useKeyCache = false;
 }
@@ -19,3 +23,5 @@
   for (let i = 0; i < length; i++) {
-    key = this.parse();
+    this.useKeyCache = true;
+    key = this.parse(true);
+    this.useKeyCache = false;
     value[key] = this.parse();
@@ -27,3 +33,13 @@ }
 Decoder.prototype.str = function (length) {
+  if (this.useKeyCache) {
+    const valueFromCache = cache.get(this.buffer, this.offset, length);
+    if (valueFromCache) {
+      this.offset += length;
+      return valueFromCache;
+    }
+  }
   const value = this.buffer.toString('utf8', this.offset, this.offset + length);
+  if (this.useKeyCache) {
+    cache.set(this.buffer, this.offset, length, value);
+  }
   this.offset += length;
@@ -30,0 +46,0 @@ return value;

lib/encode.js

@@ -49,2 +49,27 @@ 'use strict';
 
+const cache = new Map();
+const cacheMaxSize = process.env.NOTEPACK_ENCODE_CACHE_MAX_SIZE || 1024;
+
+/*jshint latedef: nofunc */
+function encodeKey(bytes, defers, key) {
+  if (cache.has(key)) {
+    const buffer = cache.get(key);
+    defers.push({ bin: buffer, length: buffer.length, offset: bytes.length });
+    return buffer.length;
+  }
+  if (cache.size > cacheMaxSize) {
+    return _encode(bytes, defers, key);
+  }
+  const keyBytes = [];
+  const size = _encode(keyBytes, [], key);
+  const keyBuffer = Buffer.allocUnsafe(size);
+  for (let i = 0, l = keyBytes.length; i < l; i++) {
+    keyBuffer[i] = keyBytes[i];
+  }
+  utf8Write(keyBuffer, keyBytes.length, key);
+  defers.push({ bin: keyBuffer, length: size, offset: bytes.length });
+  cache.set(key, keyBuffer);
+  return size;
+}
+
 function _encode(bytes, defers, value) {
@@ -246,3 +271,3 @@ let hi = 0, lo = 0, length = 0, size = 0;
         key = keys[i];
-        size += _encode(bytes, defers, key);
+        size += encodeKey(bytes, defers, key);
         size += _encode(bytes, defers, value[key]);
@@ -274,34 +299,37 @@ }
     buf[deferWritten + i] = bytes[i];
-    if (i + 1 !== nextOffset) { continue; }
-    defer = defers[deferIndex];
-    deferLength = defer.length;
-    offset = deferWritten + nextOffset;
-    if (defer.bin) {
-      if (deferLength > MICRO_OPT_LEN) {
-        defer.bin.copy(buf, offset, 0, deferLength);
-      } else {
-        const bin = defer.bin;
-        for (let j = 0; j < deferLength; j++) {
-          buf[offset + j] = bin[j];
+    while (i + 1 === nextOffset) {
+      defer = defers[deferIndex];
+      deferLength = defer.length;
+      offset = deferWritten + nextOffset;
+      if (defer.bin) {
+        if (deferLength > MICRO_OPT_LEN) {
+          defer.bin.copy(buf, offset, 0, deferLength);
+        } else {
+          const bin = defer.bin;
+          for (let j = 0; j < deferLength; j++) {
+            buf[offset + j] = bin[j];
+          }
         }
+      } else if (defer.str) {
+        if (deferLength > MICRO_OPT_LEN) {
+          buf.write(defer.str, offset, deferLength, 'utf8');
+        } else {
+          utf8Write(buf, offset, defer.str);
+        }
+      } else if (defer.float !== undefined) {
+        buf.writeDoubleBE(defer.float, offset);
+      } else if (defer.arraybuffer) {
+        const arr = new Uint8Array(defer.arraybuffer);
+        for (let k = 0; k < deferLength; k++) {
+          buf[offset + k] = arr[k];
+        }
       }
-    } else if (defer.str) {
-      if (deferLength > MICRO_OPT_LEN) {
-        buf.write(defer.str, offset, deferLength, 'utf8');
+      deferIndex++;
+      deferWritten += deferLength;
+      if (defers[deferIndex]) {
+        nextOffset = defers[deferIndex].offset;
       } else {
-        utf8Write(buf, offset, defer.str);
+        break;
       }
-    } else if (defer.float !== undefined) {
-      buf.writeDoubleBE(defer.float, offset);
-    } else if (defer.arraybuffer) {
-      const arr = new Uint8Array(defer.arraybuffer);
-      for (let k = 0; k < deferLength; k++) {
-        buf[offset + k] = arr[k];
-      }
     }
-    deferIndex++;
-    deferWritten += deferLength;
-    if (defers[deferIndex]) {
-      nextOffset = defers[deferIndex].offset;
-    }
   }
@@ -308,0 +336,0 @@ return buf;

package.json

 {
   "name": "notepack.io",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "A fast Node.js implementation of the latest MessagePack spec",
@@ -22,2 +22,3 @@ "main": "lib/index.js",
   "devDependencies": {
+    "@msgpack/msgpack": "~1.12.0",
     "benchmark": "^2.1.2",
@@ -24,0 +25,0 @@ "benchtable": "^0.1.0",

README.md

 # notepack
 
-[![Build Status](https://travis-ci.org/coinative/notepack.svg?branch=master)](https://travis-ci.org/coinative/notepack)
+[![Build Status](https://travis-ci.org/darrachequesne/notepack.svg?branch=master)](https://travis-ci.org/darrachequesne/notepack)
 [![Coverage Status](https://coveralls.io/repos/github/darrachequesne/notepack/badge.svg?branch=master)](https://coveralls.io/github/darrachequesne/notepack?branch=master)
@@ -32,6 +32,6 @@
 
-A browser version of notepack is also available (7.6 kB minified)
+A browser version of notepack is also available (2.0 kB minified/gzipped)
 
 ```html
-<script src="https://rawgit.com/darrachequesne/notepack/master/dist/notepack.js"></script>
+<script src="https://unpkg.com/notepack.io@2.3.0/dist/notepack.min.js"></script>
 <script>
@@ -51,3 +51,3 @@ console.log(notepack.decode(notepack.encode([1, '2', new Date()])));
 $ node -v
-v6.9.1
+v12.15.0
 $ ./benchmarks/run
@@ -58,10 +58,12 @@ Encoding (this will take a while):
 +----------------------------+-------------------+-----------------+----------------+---------------+
-| notepack                   │ 1,118,284 ops/sec │ 290,050 ops/sec │ 19,670 ops/sec │ 146 ops/sec   |
+| notepack                   │ 2,187,481 ops/sec │ 510,581 ops/sec │ 39,187 ops/sec │ 231 ops/sec   |
 +----------------------------+-------------------+-----------------+----------------+---------------+
-| msgpack-js                 │ 116,413 ops/sec   │ 29,831 ops/sec  │ 3,199 ops/sec  │ 57.73 ops/sec |
+| msgpack-js                 │ 111,209 ops/sec   │ 95,346 ops/sec  │ 9,896 ops/sec  │ 121 ops/sec   |
 +----------------------------+-------------------+-----------------+----------------+---------------+
-| msgpack-lite               │ 229,063 ops/sec   │ 92,016 ops/sec  │ 12,620 ops/sec │ 169 ops/sec   |
+| msgpack-lite               │ 524,993 ops/sec   │ 195,466 ops/sec │ 18,269 ops/sec │ 242 ops/sec   |
 +----------------------------+-------------------+-----------------+----------------+---------------+
-| JSON.stringify (to Buffer) │ 811,373 ops/sec   │ 111,166 ops/sec │ 2,556 ops/sec  │ 2.83 ops/sec  |
+| @msgpack/msgpack           │ 723,885 ops/sec   │ 292,447 ops/sec │ 30,438 ops/sec │ 80.26 ops/sec |
 +----------------------------+-------------------+-----------------+----------------+---------------+
+| JSON.stringify (to Buffer) │ 1,359,120 ops/sec │ 335,024 ops/sec │ 15,721 ops/sec │ 25.97 ops/sec |
++----------------------------+-------------------+-----------------+----------------+---------------+
 Decoding (this will take a while):
@@ -71,15 +73,16 @@ +--------------------------+-------------------+-----------------+----------------+---------------+
 +--------------------------+-------------------+-----------------+----------------+---------------+
-| notepack                 │ 860,763 ops/sec   │ 179,459 ops/sec │ 17,642 ops/sec │ 184 ops/sec   |
+| notepack                 │ 3,165,012 ops/sec │ 642,348 ops/sec │ 32,173 ops/sec │ 249 ops/sec   |
 +--------------------------+-------------------+-----------------+----------------+---------------+
-| msgpack-js               │ 522,966 ops/sec   │ 132,121 ops/sec │ 12,445 ops/sec │ 179 ops/sec   |
+| msgpack-js               │ 1,255,151 ops/sec │ 280,944 ops/sec │ 24,396 ops/sec │ 243 ops/sec   |
 +--------------------------+-------------------+-----------------+----------------+---------------+
-| msgpack-lite             │ 566,976 ops/sec   │ 114,859 ops/sec │ 9,520 ops/sec  │ 156 ops/sec   |
+| msgpack-lite             │ 667,059 ops/sec   │ 144,927 ops/sec │ 11,922 ops/sec │ 175 ops/sec   |
 +--------------------------+-------------------+-----------------+----------------+---------------+
-| JSON.parse (from Buffer) │ 1,177,912 ops/sec │ 277,076 ops/sec │ 18,430 ops/sec │ 38.74 ops/sec |
+| @msgpack/msgpack         │ 1,760,026 ops/sec │ 353,698 ops/sec │ 18,816 ops/sec │ 45.68 ops/sec |
 +--------------------------+-------------------+-----------------+----------------+---------------+
+| JSON.parse (from Buffer) │ 1,750,845 ops/sec │ 407,212 ops/sec │ 24,999 ops/sec │ 35.77 ops/sec |
++--------------------------+-------------------+-----------------+----------------+---------------+
 * Note that JSON is provided as an indicative comparison only
 ```
-
 ## License
 
 MIT

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

65525

increased by6.04%

Number of package files

12

increased by9.09%

Lines of code

1718

increased by5.4%

Number of lines in readme file

85

increased by3.66%

Worsened metrics

Dev dependency count

10

increased by11.11%

No dependency changes