@alexgyver/bson 2.1.0 → 2.1.1

package/README.md

@@ -1,5 +1,5 @@
 # bson.js
-Распаковщик бинарного JSON для библиотеки [BSON](https://github.com/GyverLibs/BSON).
+Распаковщик и запаковщик бинарного JSON для библиотеки [BSON](https://github.com/GyverLibs/BSON).
 
 > npm i @alexgyver/bson
 
@@ -10,10 +10,26 @@ const codes = [
     'constants',
 ];
 
-let json;
-const res = await fetch(...);
+let test = {
+    int: 123,
+    float: 3.14,
+    arr: [
+        "str",
+        true,
+        1234,
+        new Uint8Array([1, 2, 3]),
+    ],
+    obj: {
+        str2: "str2",
+        true: true,
+    },
+    str3: "str3",
+    nul: null,
+    [getCode('constants', codes)]: getCode('string', codes),
+    bins: new Uint8Array([1, 2, 3]),
+};
 
-try {
-    json = decodeBson(new Uint8Array(await res.arrayBuffer()), codes);
-} catch (e) { }
+let enc = encodeBson(test);
+let json = decodeBson(enc, codes);
+console.log(json);
 ```

package/bson.js

@@ -156,16 +156,16 @@ function _makeBins(obj, bins) {
  * @param {*} val
  * @returns {Uint8Array}
  */
-export function encodeBson(val) {
+export function encodeBson(val, codes = []) {
     let arr = [];
-    _encode(val, arr);
+    _encode(val, arr, codes);
     return Uint8Array.from(arr);
 }
 
-function _encode(val, arr) {
+function _encode(val, arr, codes) {
     if (Array.isArray(val)) {
         arr.push(BS_CONTAINER | BS_CONT_ARR | BS_CONT_OPEN);
-        val.forEach(v => _encode(v, arr));
+        val.forEach(v => _encode(v, arr, codes));
         arr.push(BS_CONTAINER | BS_CONT_ARR | BS_CONT_CLOSE);
         return;
     }
@@ -182,8 +182,8 @@ function _encode(val, arr) {
             } else {
                 arr.push(BS_CONTAINER | BS_CONT_OBJ | BS_CONT_OPEN);
                 for (const [key, value] of Object.entries(val)) {
-                    _encode(key, arr);
-                    _encode(value, arr);
+                    _encode(key, arr, codes);
+                    _encode(value, arr, codes);
                 }
                 arr.push(BS_CONTAINER | BS_CONT_OBJ | BS_CONT_CLOSE);
             }
@@ -212,9 +212,14 @@ function _encode(val, arr) {
 
         case 'string':
             if (val.startsWith(BS_CODE_PREFIX)) {
-                let code = Number(val.slice(BS_CODE_PREFIX.length));
-                arr.push(BS_CODE | BS_D16_MSB(code));
-                arr.push(BS_D16_LSB(code));
+                val = val.slice(BS_CODE_PREFIX.length);
+                let code = codes.indexOf(val);
+                if (code >= 0) {
+                    arr.push(BS_CODE | BS_D16_MSB(code));
+                    arr.push(BS_D16_LSB(code));
+                } else {
+                    _encode(val, arr, codes);
+                }
             } else {
                 const bytes = new TextEncoder().encode(val);
                 const len = Math.min(bytes.length, BS_MAX_LEN);
@@ -234,6 +239,6 @@ function _encode(val, arr) {
     }
 }
 
-export function getCode(name, codes) {
-    return BS_CODE_PREFIX + codes.indexOf(name);
+export function getCode(name) {
+    return BS_CODE_PREFIX + name;
 }

package/bson.min.js

@@ -1 +1 @@
-var e={d:(t,r)=>{for(var n in r)e.o(r,n)&&!e.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:r[n]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)},t={};e.d(t,{$R:()=>U,QC:()=>C,lo:()=>F});const r=0,n=32,s=64,o=96,a=128,c=160,i=192,l=224,u=16,h=8,f=4,p=2,b=8191,g=e=>224&e,y=e=>31&e,d=e=>1&e,w=16,O=e=>e&w,N=e=>15&e,k=4,A=e=>15&e,B=e=>e>>8&31,m=e=>255&e,_=(e,t)=>(e<<8|t)>>>0,j="__BSON_BIN_",x="__BSON_CODE_";function F(e,t=[]){if(!(e&&e instanceof Uint8Array))return null;if(!e.length)return{};let f=[],p=[],b=!0,w="";try{for(let B=0;B<e.length;B++){const m=g(e[B]),x=y(e[B]);switch(m){case i:if(x&h){let e=x&u?"{":"[";w+=e,p.push(e)}else","==w[w.length-1]&&(w=w.slice(0,-1)),w+=(x&u?"}":"]")+",",p.pop();b=!0;continue;case a:w+='"'+t[_(x,e[++B])]+'"';break;case r:{let t=_(x,e[++B]);w+=JSON.stringify((new TextDecoder).decode(e.slice(B+1,B+1+t))),B+=t}break;case s:{O(x)&&(w+="-");let t=N(x),r=new Uint8Array(8);r.set(e.slice(B+1,B+1+t)),w+=new BigUint64Array(r.buffer)[0],B+=t}break;case n:w+=d(x)?"true":"false";break;case l:w+="null";break;case o:{let t=new DataView(e.buffer,e.byteOffset+B+1,k).getFloat32(0,!0);w+=isNaN(t)||!isFinite(t)?"null":t.toFixed(A(x)),B+=k}break;case c:{let t=_(x,e[++B]);B++,w+='"'+j+f.length+'"',f.push(e.slice(B,B+t)),B+=t-1}}"{"===p[p.length-1]?(w+=b?":":",",b=!b):w+=","}}catch(e){throw console.error(e,w),new Error("BSON decode error")}","==w[w.length-1]&&(w=w.slice(0,-1));try{let e=JSON.parse(w);return f.length&&S(e,f),e}catch(e){throw console.error(e,w),new Error("JSON parse error")}}function S(e,t){if("object"==typeof e)for(let r in e)"object"==typeof e[r]&&null!==e[r]?S(e[r],t):"string"==typeof e[r]&&e[r].startsWith(j)&&(e[r]=t[e[r].slice(j.length)])}function U(e){let t=[];return E(e,t),Uint8Array.from(t)}function E(e,t){if(Array.isArray(e))return t.push(i|f|h),e.forEach(e=>E(e,t)),void t.push(i|f|p);switch(typeof e){case"object":if(null===e)t.push(l);else if(e instanceof Uint8Array){const r=Math.min(e.length,b);t.push(c|B(r)),t.push(m(r)),t.push(...e.slice(0,r))}else{t.push(i|u|h);for(const[r,n]of Object.entries(e))E(r,t),E(n,t);t.push(i|u|p)}break;case"bigint":case"number":if(Number.isInteger(e)){const r=(e=BigInt(e))<0;r&&(e=-e);let n=[];for(;e;)n.push(Number(0xFFn&e)),e>>=8n;t.push(s|(r?w:0)|n.length),t.push(...n)}else{const r=new ArrayBuffer(k);new DataView(r).setFloat32(0,e,!0),t.push(4|o),t.push(...new Uint8Array(r))}break;case"string":if(e.startsWith(x)){let r=Number(e.slice(x.length));t.push(a|B(r)),t.push(m(r))}else{const n=(new TextEncoder).encode(e),s=Math.min(n.length,b);t.push(r|B(s)),t.push(m(s)),t.push(...n.slice(0,s))}break;case"boolean":t.push(n|(e?1:0));break;default:t.push(l)}}function C(e,t){return x+t.indexOf(e)}const D=t.lo,v=t.$R,I=t.QC;export{D as decodeBson,v as encodeBson,I as getCode};
+var e={d:(t,r)=>{for(var n in r)e.o(r,n)&&!e.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:r[n]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)},t={};e.d(t,{$R:()=>U,QC:()=>C,lo:()=>F});const r=0,n=32,s=64,o=96,a=128,c=160,i=192,l=224,u=16,h=8,f=4,p=2,b=8191,g=e=>224&e,y=e=>31&e,d=e=>1&e,w=16,O=e=>e&w,N=e=>15&e,k=4,A=e=>15&e,B=e=>e>>8&31,_=e=>255&e,m=(e,t)=>(e<<8|t)>>>0,j="__BSON_BIN_",x="__BSON_CODE_";function F(e,t=[]){if(!(e&&e instanceof Uint8Array))return null;if(!e.length)return{};let f=[],p=[],b=!0,w="";try{for(let B=0;B<e.length;B++){const _=g(e[B]),x=y(e[B]);switch(_){case i:if(x&h){let e=x&u?"{":"[";w+=e,p.push(e)}else","==w[w.length-1]&&(w=w.slice(0,-1)),w+=(x&u?"}":"]")+",",p.pop();b=!0;continue;case a:w+='"'+t[m(x,e[++B])]+'"';break;case r:{let t=m(x,e[++B]);w+=JSON.stringify((new TextDecoder).decode(e.slice(B+1,B+1+t))),B+=t}break;case s:{O(x)&&(w+="-");let t=N(x),r=new Uint8Array(8);r.set(e.slice(B+1,B+1+t)),w+=new BigUint64Array(r.buffer)[0],B+=t}break;case n:w+=d(x)?"true":"false";break;case l:w+="null";break;case o:{let t=new DataView(e.buffer,e.byteOffset+B+1,k).getFloat32(0,!0);w+=isNaN(t)||!isFinite(t)?"null":t.toFixed(A(x)),B+=k}break;case c:{let t=m(x,e[++B]);B++,w+='"'+j+f.length+'"',f.push(e.slice(B,B+t)),B+=t-1}}"{"===p[p.length-1]?(w+=b?":":",",b=!b):w+=","}}catch(e){throw console.error(e,w),new Error("BSON decode error")}","==w[w.length-1]&&(w=w.slice(0,-1));try{let e=JSON.parse(w);return f.length&&S(e,f),e}catch(e){throw console.error(e,w),new Error("JSON parse error")}}function S(e,t){if("object"==typeof e)for(let r in e)"object"==typeof e[r]&&null!==e[r]?S(e[r],t):"string"==typeof e[r]&&e[r].startsWith(j)&&(e[r]=t[e[r].slice(j.length)])}function U(e,t=[]){let r=[];return E(e,r,t),Uint8Array.from(r)}function E(e,t,g){if(Array.isArray(e))return t.push(i|f|h),e.forEach(e=>E(e,t,g)),void t.push(i|f|p);switch(typeof e){case"object":if(null===e)t.push(l);else if(e instanceof Uint8Array){const r=Math.min(e.length,b);t.push(c|B(r)),t.push(_(r)),t.push(...e.slice(0,r))}else{t.push(i|u|h);for(const[r,n]of Object.entries(e))E(r,t,g),E(n,t,g);t.push(i|u|p)}break;case"bigint":case"number":if(Number.isInteger(e)){const r=(e=BigInt(e))<0;r&&(e=-e);let n=[];for(;e;)n.push(Number(0xFFn&e)),e>>=8n;t.push(s|(r?w:0)|n.length),t.push(...n)}else{const r=new ArrayBuffer(k);new DataView(r).setFloat32(0,e,!0),t.push(4|o),t.push(...new Uint8Array(r))}break;case"string":if(e.startsWith(x)){e=e.slice(x.length);let r=g.indexOf(e);r>=0?(t.push(a|B(r)),t.push(_(r))):E(e,t,g)}else{const n=(new TextEncoder).encode(e),s=Math.min(n.length,b);t.push(r|B(s)),t.push(_(s)),t.push(...n.slice(0,s))}break;case"boolean":t.push(n|(e?1:0));break;default:t.push(l)}}function C(e){return x+e}const D=t.lo,v=t.$R,I=t.QC;export{D as decodeBson,v as encodeBson,I as getCode};

package/package.json

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

package/test.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, getCode } from 'https://gyverlibs.github.io/bson.js/dist/bson.js';
+        import { decodeBson, encodeBson, getCode } from '/bson.js';
 
         const url = 'http://192.168.1.54';
 
@@ -16,9 +16,6 @@
             'constants',
         ];
 
-        // =========== getCode ===========
-        console.log(getCode('constants', codes));
-
         // =========== encode ===========
         let test = {
             int: 123,
@@ -35,11 +32,12 @@
             },
             str3: "str3",
             nul: null,
-            [getCode('constants', codes)]: getCode('string', codes),
+            [getCode('constants1')]: getCode('string1'),
+            [getCode('constants')]: getCode('string'),
             bins: new Uint8Array([1, 2, 3]),
         };
 
-        let enc = encodeBson(test);
+        let enc = encodeBson(test, codes);
         let json = decodeBson(enc, codes);
         console.log(json);