@alexgyver/bson 2.0.0 → 2.0.2

package/bson.js

@@ -66,25 +66,17 @@ export default function decodeBson(b, codes = []) {
 
                 case BS_STRING: {
                     let len = unpack5(data, b[++i]);
-                    i++;
-                    let txt = new TextDecoder().decode(b.slice(i, i + len));
-                    txt = txt.replaceAll(/([^\\])\\([^\"\\nrt])/ig, "$1\\\\$2")
-                        .replaceAll(/\t/ig, "\\t")
-                        .replaceAll(/\n/ig, "\\n")
-                        .replaceAll(/\r/ig, "\\r")
-                        .replaceAll(/([^\\])(")/ig, '$1\\"');
-                    s += '"' + txt + '"';
-                    i += len - 1;
+                    s += JSON.stringify(new TextDecoder().decode(b.slice(i + 1, i + 1 + len)));
+                    i += len;
                 } break;
 
                 case BS_INTEGER: {
                     if (data & BS_NEGATIVE) s += '-';
                     let len = data & 0b1111;
-                    let v = BigInt(0);
-                    for (let j = 0; j < len; j++) {
-                        v |= BigInt(b[++i]) << BigInt(j * 8);
-                    }
-                    s += v;
+                    let u8 = new Uint8Array(8);
+                    u8.set(b.slice(i + 1, i + 1 + len));
+                    s += new BigUint64Array(u8.buffer)[0];
+                    i += len;
                 } break;
 
                 case BS_BOOLEAN:
@@ -92,12 +84,9 @@ export default function decodeBson(b, codes = []) {
                     break;
 
                 case BS_FLOAT: {
-                    let v = 0;
-                    for (let j = 0; j < 4; j++) {
-                        v |= b[++i] << (j * 8);
-                    }
-                    let f = new Float32Array(new Uint32Array([v]).buffer)[0];
+                    let f = new Float32Array(b.slice(i + 1, i + 1 + 4).buffer)[0];
                     s += (isNaN(f) || !isFinite(f)) ? 'null' : f.toFixed(data);
+                    i += 4;
                 } break;
 
                 case BS_BINARY: {
@@ -118,7 +107,7 @@ export default function decodeBson(b, codes = []) {
             }
         }
     } catch (e) {
-        console.log(s);
+        console.error(e, s);
         throw new Error("BSON decode error");
     }
 
@@ -129,7 +118,7 @@ export default function decodeBson(b, codes = []) {
         if (bins.length) makeBins(obj, bins);
         return obj;
     } catch (e) {
-        console.log(s);
+        console.error(e, s);
         throw new Error("JSON parse error");
     }
 }

package/bson.min.js

@@ -0,0 +1 @@
+var e={d:(r,t)=>{for(var n in t)e.o(t,n)&&!e.o(r,n)&&Object.defineProperty(r,n,{enumerable:!0,get:t[n]})},o:(e,r)=>Object.prototype.hasOwnProperty.call(e,r)},r={};function t(e,r=[]){if(!(e&&e instanceof Uint8Array))return null;if(!e.length)return{};const t="__BSON_BINARY";function n(e,r){return(e<<8|r)>>>0}let o=[],l=[],c=!0,s="";try{for(let i=0;i<e.length;i++){const a=224&e[i],f=31&e[i];switch(a){case 192:if(8&f){let e=16&f?"{":"[";s+=e,l.push(e)}else","==s[s.length-1]&&(s=s.slice(0,-1)),s+=(16&f?"}":"]")+",",l.pop();c=!0;continue;case 128:s+='"'+r[n(f,e[++i])]+'"';break;case 0:{let r=n(f,e[++i]);s+=JSON.stringify((new TextDecoder).decode(e.slice(i+1,i+1+r))),i+=r}break;case 64:{16&f&&(s+="-");let r=15&f,t=new Uint8Array(8);t.set(e.slice(i+1,i+1+r)),s+=new BigUint64Array(t.buffer)[0],i+=r}break;case 32:s+=1&f?"true":"false";break;case 96:{let r=new Float32Array(e.slice(i+1,i+1+4).buffer)[0];s+=isNaN(r)||!isFinite(r)?"null":r.toFixed(f),i+=4}break;case 160:{let r=n(f,e[++i]);i++,s+='"'+t+"#"+o.length+'"',o.push(e.slice(i,i+r)),i+=r-1}}"{"===l[l.length-1]?(s+=c?":":",",c=!c):s+=","}}catch(e){throw console.error(e,s),new Error("BSON decode error")}","==s[s.length-1]&&(s=s.slice(0,-1));try{let e=JSON.parse(s);return o.length&&function e(r,n){if("object"==typeof r)for(let o in r)"object"==typeof r[o]&&null!==r[o]?e(r[o],n):"string"==typeof r[o]&&r[o].startsWith(t)&&(r[o]=n[r[o].split("#")[1]])}(e,o),e}catch(e){throw console.error(e,s),new Error("JSON parse error")}}e.d(r,{A:()=>t});const n=r.A;export{n as default};

package/package.json

@@ -1,14 +1,21 @@
 {
   "name": "@alexgyver/bson",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Decode BSON from BSON Arduino library",
   "main": "./bson.js",
   "module": "./bson.js",
   "types": "./bson.js",
+  "scripts": {
+    "build": "webpack --config ./webpack.config.js"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/GyverLibs/bson.js.git"
   },
+  "devDependencies": {
+    "webpack": "^5.98.0",
+    "webpack-cli": "^6.0.1"
+  },
   "author": "AlexGyver <alex@alexgyver.ru>",
   "license": "MIT"
 }

package/test.html

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+
+<body>
+    <button id="req">REQUEST</button>
+    <p id="out" style="white-space: break-spaces;"></p>
+
+    <script type="module">
+        import decodeBson from 'https://gyverlibs.github.io/bson.js/dist/bson.js';
+
+        const url = 'http://192.168.1.54';
+
+        const codes = [
+            'some',
+            'string',
+            'constants',
+        ];
+
+        req.onclick = async () => {
+            let res = await fetch(url + '/bson');
+            try {
+                let arr = new Uint8Array(await res.arrayBuffer());
+                let json = decodeBson(arr, codes);
+                console.log(arr);
+                console.log(JSON.stringify(json), JSON.stringify(json).length);
+                console.log(json);
+                out.innerText = JSON.stringify(json, null, 2);
+            } catch (e) {
+                console.log(e);
+                out.innerText = e;
+            }
+        }
+    </script>
+</body>
+
+</html>

package/webpack.config.js

@@ -0,0 +1,14 @@
+module.exports = {
+    entry: './bson.js',
+    output: {
+        path: __dirname,
+        filename: 'bson.min.js',
+        library: {
+            type: 'module'
+        }
+    },
+    experiments: {
+        outputModule: true
+    },
+    mode: "production",
+};