@alexgyver/bson 2.2.0 → 2.2.1

package/bson.js

@@ -41,15 +41,19 @@ const BS_CODE_PREFIX = "__BS#";
  * @returns {Object|Array|*}
  */
 export function decodeBson(buf, codes = []) {
-    if (!(buf instanceof Uint8Array)) return undefined;
+    if (!(buf instanceof Uint8Array) || !buf.length) return undefined;
 
     const reader = {
         buf,
         offset: 0,
+        cont: 'root',
         decoder: new TextDecoder(),
+        error(e) {
+            return new Error(e + ' in ' + JSON.stringify(this.cont));
+        },
         read(len) {
             if (this.offset + len > buf.length) {
-                throw new Error("Overflow");
+                throw this.error("Overflow");
             }
             const res = this.buf.subarray(this.offset, this.offset + len);
             this.offset += len;
@@ -60,7 +64,9 @@ export function decodeBson(buf, codes = []) {
         }
     };
 
-    return _decode(reader, codes);
+    let res = _decode(reader, codes);
+    if (reader.offset != reader.buf.length) throw reader.error("Broken packet");
+    return res;
 }
 
 function _decode(r, codes) {
@@ -76,14 +82,15 @@ function _decode(r, codes) {
                 let key;
 
                 while (true) {
+                    r.cont = cont;
                     let res = _decode(r, codes);
 
                     if (res && res.__close !== undefined) {
                         if (isArr === res.__close) {
-                            if (!isArr && expect) throw new Error("Missed value: " + JSON.stringify(cont));
+                            if (!isArr && expect) throw r.error("Missed value");
                             return cont;
                         } else {
-                            throw new Error("Wrong close: " + JSON.stringify(cont));
+                            throw r.error("Wrong close");
                         }
                     }
 
@@ -98,7 +105,7 @@ function _decode(r, codes) {
             } else if (data & BS_CONT_CLOSE) {
                 return { __close: !!(data & BS_CONT_ARR) };
             } else {
-                throw new Error("Unknown cont: " + JSON.stringify(cont));
+                throw r.error("Unknown cont");
             }
         // break;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alexgyver/bson",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Decode BSON from BSON Arduino library",
   "main": "./bson.js",
   "module": "./bson.js",