mol_vary 0.0.24 → 0.0.26

package/node.mjs

@@ -2292,7 +2292,7 @@ var $;
     })($mol_vary_spec = $.$mol_vary_spec || ($.$mol_vary_spec = {}));
     let buffer = new Uint8Array(256);
     let pack = new DataView(buffer.buffer);
-    class $mol_vary extends DataView {
+    class $mol_vary extends Object {
         static pack(data) {
             let pos = 0;
             let capacity = 0;
@@ -2499,8 +2499,8 @@ var $;
             dump(data);
             return buffer.slice(0, pos);
         }
-        static take(buf) {
-            const pack = new $mol_vary(buf.buffer, buf.byteOffset, buf.byteLength);
+        static take(buffer) {
+            const pack = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
             const stream = [];
             let pos = 0;
             const read_unum = (kind) => {
@@ -2510,7 +2510,7 @@ var $;
                     return num;
                 let res = 0;
                 if (num === 28) {
-                    res = buffer[pos++];
+                    res = pack.getUint8(pos++);
                 }
                 else if (num === 29) {
                     res = pack.getUint16(pos, true);
@@ -2561,14 +2561,14 @@ var $;
             };
             const read_text = (kind) => {
                 const len = read_unum(kind);
-                const [text, bytes] = $mol_charset_decode_from(buf, pack.byteOffset + pos, len);
+                const [text, bytes] = $mol_charset_decode_from(buffer, pack.byteOffset + pos, len);
                 pos += bytes;
                 if (text.length)
                     stream.push(text);
                 return text;
             };
             const read_buffer = (len, TypedArray) => {
-                const bin = new TypedArray(buf.slice(pos, pos + len).buffer);
+                const bin = new TypedArray(buffer.slice(pos, pos + len).buffer);
                 pos += len;
                 if (len)
                     stream.push(bin);
@@ -2576,7 +2576,7 @@ var $;
             };
             const read_blob = (kind) => {
                 const len = read_unum(kind);
-                const kind_item = buffer[pos++];
+                const kind_item = pack.getUint8(pos++);
                 switch (kind_item) {
                     case $.$mol_vary_len[1]: return read_buffer(len, Uint8Array);
                     case $.$mol_vary_len[2]: return read_buffer(len, Uint16Array);
@@ -2665,7 +2665,7 @@ var $;
                 }
             };
             const read_vary = () => {
-                const kind = buffer[pos];
+                const kind = pack.getUint8(pos);
                 const tip = kind & 0b111_00000;
                 switch (tip) {
                     case $mol_vary_tip.uint: return read_unum(kind);
@@ -2679,7 +2679,10 @@ var $;
                     default: $mol_fail(new Error('Unsupported tip', { cause: { tip } }));
                 }
             };
-            return read_vary();
+            const result = read_vary();
+            if (pos !== buffer.byteLength)
+                $mol_fail(new Error('Buffer too large', { cause: { size: buffer.byteLength, taken: pos, result } }));
+            return result;
         }
         static riches = new Map();
         static type(Class, keys, lean, rich) {

package/node.test.js

@@ -2283,7 +2283,7 @@ var $;
     })($mol_vary_spec = $.$mol_vary_spec || ($.$mol_vary_spec = {}));
     let buffer = new Uint8Array(256);
     let pack = new DataView(buffer.buffer);
-    class $mol_vary extends DataView {
+    class $mol_vary extends Object {
         static pack(data) {
             let pos = 0;
             let capacity = 0;
@@ -2490,8 +2490,8 @@ var $;
             dump(data);
             return buffer.slice(0, pos);
         }
-        static take(buf) {
-            const pack = new $mol_vary(buf.buffer, buf.byteOffset, buf.byteLength);
+        static take(buffer) {
+            const pack = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
             const stream = [];
             let pos = 0;
             const read_unum = (kind) => {
@@ -2501,7 +2501,7 @@ var $;
                     return num;
                 let res = 0;
                 if (num === 28) {
-                    res = buffer[pos++];
+                    res = pack.getUint8(pos++);
                 }
                 else if (num === 29) {
                     res = pack.getUint16(pos, true);
@@ -2552,14 +2552,14 @@ var $;
             };
             const read_text = (kind) => {
                 const len = read_unum(kind);
-                const [text, bytes] = $mol_charset_decode_from(buf, pack.byteOffset + pos, len);
+                const [text, bytes] = $mol_charset_decode_from(buffer, pack.byteOffset + pos, len);
                 pos += bytes;
                 if (text.length)
                     stream.push(text);
                 return text;
             };
             const read_buffer = (len, TypedArray) => {
-                const bin = new TypedArray(buf.slice(pos, pos + len).buffer);
+                const bin = new TypedArray(buffer.slice(pos, pos + len).buffer);
                 pos += len;
                 if (len)
                     stream.push(bin);
@@ -2567,7 +2567,7 @@ var $;
             };
             const read_blob = (kind) => {
                 const len = read_unum(kind);
-                const kind_item = buffer[pos++];
+                const kind_item = pack.getUint8(pos++);
                 switch (kind_item) {
                     case $.$mol_vary_len[1]: return read_buffer(len, Uint8Array);
                     case $.$mol_vary_len[2]: return read_buffer(len, Uint16Array);
@@ -2656,7 +2656,7 @@ var $;
                 }
             };
             const read_vary = () => {
-                const kind = buffer[pos];
+                const kind = pack.getUint8(pos);
                 const tip = kind & 0b111_00000;
                 switch (tip) {
                     case $mol_vary_tip.uint: return read_unum(kind);
@@ -2670,7 +2670,10 @@ var $;
                     default: $mol_fail(new Error('Unsupported tip', { cause: { tip } }));
                 }
             };
-            return read_vary();
+            const result = read_vary();
+            if (pos !== buffer.byteLength)
+                $mol_fail(new Error('Buffer too large', { cause: { size: buffer.byteLength, taken: pos, result } }));
+            return result;
         }
         static riches = new Map();
         static type(Class, keys, lean, rich) {
@@ -4707,6 +4710,10 @@ var $;
                 check(Number.MAX_SAFE_INTEGER, [uint | l8, 255, 255, 255, 255, 255, 255, 31, 0]);
                 check(256n ** 8n - 1n, [uint | l8, 255, 255, 255, 255, 255, 255, 255, 255]);
             },
+            "vary pack with wrong size"($) {
+                $mol_assert_fail(() => $mol_vary.take(new Uint8Array([uint | l1])), Error);
+                $mol_assert_fail(() => $mol_vary.take(new Uint8Array([uint | l1, 200, 300])), 'Buffer too large');
+            },
             "vary pack sint0"($) {
                 check(-1, [-1]);
                 check(-28, [-28]);