@alexgyver/bson 3.0.1 → 3.0.2

package/README.md

@@ -29,7 +29,7 @@ let test = {
     },
     str3: "str3",
     nul: null,
-    [getCode('constants', codes)]: getCode('string', codes),
+    [BSCode('constants', codes)]: BSCode('string', codes),
     bins: new Uint8Array([1, 2, 3]),
 };
 

package/bson.js

@@ -37,8 +37,8 @@ const BS_CONT_CLOSE = 0 << 1;
 const BS_CONT_OPEN = 1 << 1;
 
 // subtype float
-const BS_GET_FLOAT_LEN = x => 1 << ((x) & 0b111);
-const BS_FLOAT_F32 = 2;
+const BS_FLOAT_ZERO = 1;
+const BS_FLOAT_SIZE = 4;
 
 // subtype bin
 const BS_GET_BIN_LEN = x => x & 0b111;
@@ -54,6 +54,9 @@ export class BSDecoder {
         this.codes = codes;
     }
 
+    /**
+     * @returns {Object}
+     */
     decode() {
         if (!(this.buf instanceof Uint8Array) || !this.buf.length) return undefined;
 
@@ -76,7 +79,7 @@ export class BSDecoder {
         let val = 0n;
         let bytes = this.read(len);
         while (len--) val = (val << 8n) | BigInt(bytes[len]);
-        return Number(val);
+        return val <= Number.MAX_SAFE_INTEGER ? Number(val) : val;
     }
     _ext(hdr) {
         return BS_GET_LSB(hdr) | ((hdr & BS_EXT_FLAG) ? (this.readB() << BS_EXT_BITS) : 0);
@@ -141,12 +144,12 @@ export class BSDecoder {
             case BS_BOOL:
                 return !!(header & 1);
 
-            case BS_FLOAT: {
-                let len = BS_GET_FLOAT_LEN(header);
-                const b = this.read(len);
-                let view = new DataView(b.buffer, b.byteOffset, len);
-                return (len == 4) ? view.getFloat32(0, true) : ((len == 8) ? view.getFloat64(0, true) : 0);
-            }
+            case BS_FLOAT:
+                if (header & BS_FLOAT_ZERO) return 0.0;
+                else {
+                    const b = this.read(BS_FLOAT_SIZE);
+                    return new DataView(b.buffer, b.byteOffset, BS_FLOAT_SIZE).getFloat32(0, true);
+                }
 
             case BS_BIN:
                 return this.read(this.readInt(BS_GET_BIN_LEN(header))).slice();
@@ -163,10 +166,24 @@ export class BSEncoder {
         this.codes = codes;
     }
 
+    /**
+     * @returns {Uint8Array}
+     */
     getArray() {
         return Uint8Array.from(this.arr);
     }
 
+    /**
+     * @returns {Uint8Array}
+     */
+    encodeSingle(val) {
+        return this.encode(val).getArray();
+    }
+
+    /**
+     * @param {*} val 
+     * @returns {BSEncoder}
+     */
     encode(val) {
         let a = this.arr;
 
@@ -186,16 +203,18 @@ export class BSEncoder {
                         a.push(...val);
                     } else {
                         a.push(BS_SUBT | BS_CONT | BS_CONT_OBJ | BS_CONT_OPEN);
-                        for (const [key, value] of Object.entries(val)) {
+                        for (let key in val) {
                             this.encode(key);
-                            this.encode(value);
+                            this.encode(val[key]);
                         }
                         a.push(BS_SUBT | BS_CONT | BS_CONT_OBJ | BS_CONT_CLOSE);
                     }
                     break;
 
-                case 'number':
                 case 'bigint':
+                    val = Number(val);
+
+                case 'number':
                     if (Number.isInteger(val)) {
                         if (val >= 0 && val < BS_INT_SMALL) {
                             a.push(BS_INT | BS_INT_SMALL | val);
@@ -207,9 +226,10 @@ export class BSEncoder {
                             a.push(...bytes);
                         }
                     } else {
-                        const buffer = new ArrayBuffer(4);
+                        // 0.0 is integer
+                        const buffer = new ArrayBuffer(BS_FLOAT_SIZE);
                         new DataView(buffer).setFloat32(0, val, true);
-                        a.push(BS_SUBT | BS_FLOAT | BS_FLOAT_F32);
+                        a.push(BS_SUBT | BS_FLOAT);
                         a.push(...new Uint8Array(buffer));
                     }
                     break;
@@ -279,9 +299,9 @@ export function decodeBson(buf, codes = []) {
  * @returns {Uint8Array}
  */
 export function encodeBson(val, codes = []) {
-    return new BSEncoder(codes).encode(val).getArray();
+    return new BSEncoder(codes).encodeSingle(val);
 }
 
-export function getCode(name) {
+export function BSCode(name) {
     return BS_CODE_PREFIX + name;
 }

package/bson.min.js

@@ -1 +1 @@
-var e={d:(t,r)=>{for(var s in r)e.o(r,s)&&!e.o(t,s)&&Object.defineProperty(t,s,{enumerable:!0,get:r[s]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)},t={};e.d(t,{$R:()=>h,GF:()=>i,QC:()=>c,lo:()=>o,mp:()=>n});const r=e=>31&e,s="__BS#";class n{offset=0;cont="root";tdec=new TextDecoder;constructor(e,t){this.buf=e,this.codes=t}decode(){if(!(this.buf instanceof Uint8Array&&this.buf.length))return;let e=this._decode();if(this.offset!=this.buf.length)throw this._err("Broken packet");return e}read(e){if(this.offset+e>this.buf.length)throw this._err("Overflow");let t=this.buf.subarray(this.offset,this.offset+e);return this.offset+=e,t}readB(){return this.read(1)[0]}readInt(e){let t=0n,r=this.read(e);for(;e--;)t=t<<8n|BigInt(r[e]);return Number(t)}_ext(e){return r(e)|(32&e?this.readB()<<5:0)}_close(e,t){if(e&&void 0!==e.__close){if(t===e.__close)return!0;throw this._err("Wrong close")}return!1}_err(e){return new Error(e+" in "+JSON.stringify(this.cont))}_decode(){const e=this.readB();let t=192&e;switch(0==t&&(t=56&e),t){case 16:if(2&e){let t=!!(1&e),r=t?{}:[];for(;;){this.cont=r;let e=this._decode();if(this._close(e,t))return r;if(t){let s=this._decode();if(this._close(s,t))throw this._err("Missed value");r[String(e)]=s}else r.push(e)}}return{__close:!!(1&e)};case 64:if(32&e)return 31&e;{let t=this.readInt(15&e);return 16&e?-t:t}case 128:return this.tdec.decode(this.read(this._ext(e)));case 192:return this.codes[this._ext(e)];case 0:return null;case 8:return!!(1&e);case 24:{let t=(e=>1<<(7&e))(e);const r=this.read(t);let s=new DataView(r.buffer,r.byteOffset,t);return 4==t?s.getFloat32(0,!0):8==t?s.getFloat64(0,!0):0}case 32:return this.read(this.readInt((e=>7&e)(e))).slice()}}}class i{arr=[];tenc=new TextEncoder;constructor(e=[]){this.codes=e}getArray(){return Uint8Array.from(this.arr)}encode(e){let t=this.arr;if(Array.isArray(e))t.push(18),e.forEach(e=>this.encode(e)),t.push(16);else switch(typeof e){case"object":if(null===e)t.push(0);else if(e instanceof Uint8Array){let r=this._int(e.length);t.push(32|r.length),t.push(...r),t.push(...e)}else{t.push(19);for(const[t,r]of Object.entries(e))this.encode(t),this.encode(r);t.push(17)}break;case"number":case"bigint":if(Number.isInteger(e))if(e>=0&&e<32)t.push(96|e);else{let r=e<0;r&&(e=-e);let s=this._int(e);t.push(64|(r?16:0)|s.length),t.push(...s)}else{const r=new ArrayBuffer(4);new DataView(r).setFloat32(0,e,!0),t.push(26),t.push(...new Uint8Array(r))}break;case"string":if(e.startsWith(s)){e=e.slice(s.length);let t=this.codes.indexOf(e);t>=0?this._ext(192,t):this.encode(e)}else{const r=this.tenc.encode(e),s=Math.min(r.length,8191);this._ext(128,s),t.push(...r.slice(0,s))}break;case"boolean":t.push(8|!!e);break;default:t.push(0)}return this}_int(e){let t=[];for(e=BigInt(e);e;)t.push(Number(0xFFn&e)),e>>=8n;return t}_ext(e,t){let s=this.arr;t<32?s.push(e|t):(s.push(32|e|r(t)),s.push(t>>5))}}function o(e,t=[]){return new n(e,t).decode()}function h(e,t=[]){return new i(t).encode(e).getArray()}function c(e){return s+e}const a=t.mp,u=t.GF,l=t.lo,f=t.$R,d=t.QC;export{a as BSDecoder,u as BSEncoder,l as decodeBson,f as encodeBson,d as getCode};
+var e={d:(t,r)=>{for(var s in r)e.o(r,s)&&!e.o(t,s)&&Object.defineProperty(t,s,{enumerable:!0,get:r[s]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)},t={};e.d(t,{$R:()=>h,GF:()=>i,JV:()=>c,lo:()=>o,mp:()=>n});const r=e=>31&e,s="__BS#";class n{offset=0;cont="root";tdec=new TextDecoder;constructor(e,t){this.buf=e,this.codes=t}decode(){if(!(this.buf instanceof Uint8Array&&this.buf.length))return;let e=this._decode();if(this.offset!=this.buf.length)throw this._err("Broken packet");return e}read(e){if(this.offset+e>this.buf.length)throw this._err("Overflow");let t=this.buf.subarray(this.offset,this.offset+e);return this.offset+=e,t}readB(){return this.read(1)[0]}readInt(e){let t=0n,r=this.read(e);for(;e--;)t=t<<8n|BigInt(r[e]);return t<=Number.MAX_SAFE_INTEGER?Number(t):t}_ext(e){return r(e)|(32&e?this.readB()<<5:0)}_close(e,t){if(e&&void 0!==e.__close){if(t===e.__close)return!0;throw this._err("Wrong close")}return!1}_err(e){return new Error(e+" in "+JSON.stringify(this.cont))}_decode(){const e=this.readB();let t=192&e;switch(0==t&&(t=56&e),t){case 16:if(2&e){let t=!!(1&e),r=t?{}:[];for(;;){this.cont=r;let e=this._decode();if(this._close(e,t))return r;if(t){let s=this._decode();if(this._close(s,t))throw this._err("Missed value");r[String(e)]=s}else r.push(e)}}return{__close:!!(1&e)};case 64:if(32&e)return 31&e;{let t=this.readInt(15&e);return 16&e?-t:t}case 128:return this.tdec.decode(this.read(this._ext(e)));case 192:return this.codes[this._ext(e)];case 0:return null;case 8:return!!(1&e);case 24:if(1&e)return 0;{const e=this.read(4);return new DataView(e.buffer,e.byteOffset,4).getFloat32(0,!0)}case 32:return this.read(this.readInt((e=>7&e)(e))).slice()}}}class i{arr=[];tenc=new TextEncoder;constructor(e=[]){this.codes=e}getArray(){return Uint8Array.from(this.arr)}encodeSingle(e){return this.encode(e).getArray()}encode(e){let t=this.arr;if(Array.isArray(e))t.push(18),e.forEach(e=>this.encode(e)),t.push(16);else switch(typeof e){case"object":if(null===e)t.push(0);else if(e instanceof Uint8Array){let r=this._int(e.length);t.push(32|r.length),t.push(...r),t.push(...e)}else{t.push(19);for(let t in e)this.encode(t),this.encode(e[t]);t.push(17)}break;case"bigint":e=Number(e);case"number":if(Number.isInteger(e))if(e>=0&&e<32)t.push(96|e);else{let r=e<0;r&&(e=-e);let s=this._int(e);t.push(64|(r?16:0)|s.length),t.push(...s)}else{const r=new ArrayBuffer(4);new DataView(r).setFloat32(0,e,!0),t.push(24),t.push(...new Uint8Array(r))}break;case"string":if(e.startsWith(s)){e=e.slice(s.length);let t=this.codes.indexOf(e);t>=0?this._ext(192,t):this.encode(e)}else{const r=this.tenc.encode(e),s=Math.min(r.length,8191);this._ext(128,s),t.push(...r.slice(0,s))}break;case"boolean":t.push(8|!!e);break;default:t.push(0)}return this}_int(e){let t=[];for(e=BigInt(e);e;)t.push(Number(0xFFn&e)),e>>=8n;return t}_ext(e,t){let s=this.arr;t<32?s.push(e|t):(s.push(32|e|r(t)),s.push(t>>5))}}function o(e,t=[]){return new n(e,t).decode()}function h(e,t=[]){return new i(t).encodeSingle(e)}function c(e){return s+e}const u=t.JV,a=t.mp,l=t.GF,f=t.lo,d=t.$R;export{u as BSCode,a as BSDecoder,l as BSEncoder,f as decodeBson,d as encodeBson};

package/package.json

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

package/test/index.html

@@ -5,8 +5,8 @@
     <p id="out" style="white-space: break-spaces;"></p>
 
     <script type="module">
-        import { decodeBson, encodeBson, getCode } from 'https://gyverlibs.github.io/bson.js/dist/bson.js';
-        // import { decodeBson, encodeBson, getCode } from '/bson.js';
+        // import { decodeBson, encodeBson, BSCode } from 'https://gyverlibs.github.io/bson.js/dist/bson.js';
+        import { decodeBson, encodeBson, BSCode } from '/bson.js';
 
         const url = 'http://192.168.1.54';
 
@@ -18,10 +18,12 @@
 
         // =========== encode ===========
         let test = {
-            sint: 20,
+            sint: 20n,
+            bint: 2000n,
             int: 123,
             nint: -123,
             float: 3.14,
+            float0: 0.0,
             arr: [
                 "str",
                 "0123456789012345678901234567890123456789",
@@ -37,8 +39,8 @@
             },
             str3: "str3",
             nul: null,
-            [getCode('constants1')]: getCode('string1'),
-            [getCode('constants')]: getCode('string'),
+            [BSCode('constants1')]: BSCode('string1'),
+            [BSCode('constants')]: BSCode('string'),
             bins: new Uint8Array([1, 2, 3]),
         };