bireader 1.0.19 → 1.0.20

package/lib/esm/src/common.js

@@ -103,9 +103,11 @@ export function remove(_this, startOffset, endOffset, consume, remove, fillValue
     if (consume == true) {
         if (remove != true) {
             _this.offset = new_offset;
+            _this.bitoffset = 0;
         }
         else {
             _this.offset = new_start;
+            _this.bitoffset = 0;
         }
     }
     return data_removed;
@@ -160,6 +162,7 @@ export function addData(_this, data, consume, offset, repalce) {
     }
     if (consume) {
         _this.offset = needed_size;
+        _this.bitoffset = 0;
     }
 }
 export function hexDump(_this, options) {
@@ -344,7 +347,7 @@ export function hexDump(_this, options) {
     }
     console.log(rows.join("\n"));
 }
-export function AND(_this, xor_key, start, end, consume) {
+export function AND(_this, and_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
         if (_this.strict == false) {
@@ -355,27 +358,29 @@ export function AND(_this, xor_key, start, end, consume) {
             throw new Error("\x1b[33m[Strict mode]\x1b[0m: End offset outside of data: endOffset" + (end || 0) + " of " + _this.size);
         }
     }
-    if (typeof xor_key == "number") {
+    if (typeof and_key == "number") {
         for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
-            input[i] = input[i] & (xor_key & 0xff);
+            input[i] = input[i] & (and_key & 0xff);
             if (consume) {
                 _this.offset = i;
+                _this.bitoffset = 0;
             }
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(xor_key)) {
+        if (_this.isBufferOrUint8Array(and_key)) {
             let number = -1;
             for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
-                if (number != xor_key.length - 1) {
+                if (number != and_key.length - 1) {
                     number = number + 1;
                 }
                 else {
                     number = 0;
                 }
-                input[i] = input[i] & xor_key[number];
+                input[i] = input[i] & and_key[number];
                 if (consume) {
                     _this.offset = i;
+                    _this.bitoffset = 0;
                 }
             }
         }
@@ -384,7 +389,7 @@ export function AND(_this, xor_key, start, end, consume) {
         }
     }
 }
-export function OR(_this, xor_key, start, end, consume) {
+export function OR(_this, or_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
         if (_this.strict == false) {
@@ -395,27 +400,29 @@ export function OR(_this, xor_key, start, end, consume) {
             throw new Error("\x1b[33m[Strict mode]\x1b[0m: End offset outside of data: endOffset" + (end || 0) + " of " + _this.size);
         }
     }
-    if (typeof xor_key == "number") {
+    if (typeof or_key == "number") {
         for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
-            input[i] = input[i] | (xor_key & 0xff);
+            input[i] = input[i] | (or_key & 0xff);
             if (consume) {
                 _this.offset = i;
+                _this.bitoffset = 0;
             }
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(xor_key)) {
+        if (_this.isBufferOrUint8Array(or_key)) {
             let number = -1;
             for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
-                if (number != xor_key.length - 1) {
+                if (number != or_key.length - 1) {
                     number = number + 1;
                 }
                 else {
                     number = 0;
                 }
-                input[i] = input[i] | xor_key[number];
+                input[i] = input[i] | or_key[number];
                 if (consume) {
                     _this.offset = i;
+                    _this.bitoffset = 0;
                 }
             }
         }
@@ -440,6 +447,7 @@ export function XOR(_this, xor_key, start, end, consume) {
             input[i] = input[i] ^ (xor_key & 0xff);
             if (consume) {
                 _this.offset = i;
+                _this.bitoffset = 0;
             }
         }
     }
@@ -456,6 +464,7 @@ export function XOR(_this, xor_key, start, end, consume) {
                 input[i] = input[i] ^ xor_key[number];
                 if (consume) {
                     _this.offset = i;
+                    _this.bitoffset = 0;
                 }
             }
         }
@@ -478,10 +487,12 @@ export function NOT(_this, start, end, consume) {
         _this.data[i] = ~_this.data[i];
         if (consume) {
             _this.offset = i;
+            _this.bitoffset = 0;
         }
     }
 }
-export function LSHIFT(_this, value, start, end, consume) {
+export function LSHIFT(_this, shift_key, start, end, consume) {
+    const input = _this.data;
     if ((end || 0) > _this.size) {
         if (_this.strict == false) {
             _this.extendArray((end || 0) - _this.size);
@@ -491,14 +502,39 @@ export function LSHIFT(_this, value, start, end, consume) {
             throw new Error("\x1b[33m[Strict mode]\x1b[0m: End offset outside of data: endOffset" + (end || 0) + " of " + _this.size);
         }
     }
-    for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
-        _this.data[i] = _this.data[i] << value;
-        if (consume) {
-            _this.offset = i;
+    if (typeof shift_key == "number") {
+        for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
+            input[i] = input[i] << shift_key;
+            if (consume) {
+                _this.offset = i;
+                _this.bitoffset = 0;
+            }
+        }
+    }
+    else {
+        if (_this.isBufferOrUint8Array(shift_key)) {
+            let number = -1;
+            for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
+                if (number != shift_key.length - 1) {
+                    number = number + 1;
+                }
+                else {
+                    number = 0;
+                }
+                input[i] = input[i] << shift_key[number];
+                if (consume) {
+                    _this.offset = i;
+                    _this.bitoffset = 0;
+                }
+            }
+        }
+        else {
+            throw new Error("XOR key must be a byte value, string, Uint8Array or Buffer");
         }
     }
 }
-export function RSHIFT(_this, value, start, end, consume) {
+export function RSHIFT(_this, shift_key, start, end, consume) {
+    const input = _this.data;
     if ((end || 0) > _this.size) {
         if (_this.strict == false) {
             _this.extendArray((end || 0) - _this.size);
@@ -508,14 +544,39 @@ export function RSHIFT(_this, value, start, end, consume) {
             throw new Error("\x1b[33m[Strict mode]\x1b[0m: End offset outside of data: endOffset" + (end || 0) + " of " + _this.size);
         }
     }
-    for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
-        _this.data[i] = _this.data[i] >> value;
-        if (consume) {
-            _this.offset = i;
+    if (typeof shift_key == "number") {
+        for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
+            input[i] = input[i] >> shift_key;
+            if (consume) {
+                _this.offset = i;
+                _this.bitoffset = 0;
+            }
+        }
+    }
+    else {
+        if (_this.isBufferOrUint8Array(shift_key)) {
+            let number = -1;
+            for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
+                if (number != shift_key.length - 1) {
+                    number = number + 1;
+                }
+                else {
+                    number = 0;
+                }
+                input[i] = input[i] >> shift_key[number];
+                if (consume) {
+                    _this.offset = i;
+                    _this.bitoffset = 0;
+                }
+            }
+        }
+        else {
+            throw new Error("XOR key must be a byte value, string, Uint8Array or Buffer");
         }
     }
 }
-export function ADD(_this, value, start, end, consume) {
+export function ADD(_this, add_key, start, end, consume) {
+    const input = _this.data;
     if ((end || 0) > _this.size) {
         if (_this.strict == false) {
             _this.extendArray((end || 0) - _this.size);
@@ -525,10 +586,34 @@ export function ADD(_this, value, start, end, consume) {
             throw new Error("\x1b[33m[Strict mode]\x1b[0m: End offset outside of data: endOffset" + (end || 0) + " of " + _this.size);
         }
     }
-    for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
-        _this.data[i] += value;
-        if (consume) {
-            _this.offset = i;
+    if (typeof add_key == "number") {
+        for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
+            input[i] = input[i] + add_key;
+            if (consume) {
+                _this.offset = i;
+                _this.bitoffset = 0;
+            }
+        }
+    }
+    else {
+        if (_this.isBufferOrUint8Array(add_key)) {
+            let number = -1;
+            for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
+                if (number != add_key.length - 1) {
+                    number = number + 1;
+                }
+                else {
+                    number = 0;
+                }
+                input[i] = input[i] + add_key[number];
+                if (consume) {
+                    _this.offset = i;
+                    _this.bitoffset = 0;
+                }
+            }
+        }
+        else {
+            throw new Error("XOR key must be a byte value, string, Uint8Array or Buffer");
         }
     }
 }
@@ -654,11 +739,13 @@ export function wbyte(_this, value, unsigned) {
     }
     _this.data[_this.offset] = (unsigned == undefined || unsigned == false) ? value : value & 0xFF;
     _this.offset += 1;
+    _this.bitoffset = 0;
 }
 export function rbyte(_this, unsigned) {
     _this.check_size(1);
     var read = _this.data[_this.offset];
     _this.offset += 1;
+    _this.bitoffset = 0;
     if (unsigned == true) {
         return read & 0xFF;
     }
@@ -691,6 +778,7 @@ export function wint16(_this, value, unsigned, endian) {
         _this.data[_this.offset + 1] = (unsigned == undefined || unsigned == false) ? value : value & 0xff;
     }
     _this.offset += 2;
+    _this.bitoffset = 0;
 }
 export function rint16(_this, unsigned, endian) {
     _this.check_size(2);
@@ -702,6 +790,7 @@ export function rint16(_this, unsigned, endian) {
         read = (_this.data[_this.offset] << 8) | _this.data[_this.offset + 1];
     }
     _this.offset += 2;
+    _this.bitoffset = 0;
     if (unsigned == undefined || unsigned == false) {
         return read & 0x8000 ? -(0x10000 - read) : read;
     }
@@ -737,6 +826,8 @@ export function rhalffloat(_this, endian) {
         // Normalized number
         floatValue = (sign === 0 ? 1 : -1) * Math.pow(2, exponent - 15) * (1 + fraction / 0x0400);
     }
+    _this.offset += 2;
+    _this.bitoffset = 0;
     return floatValue;
 }
 export function whalffloat(_this, value, endian) {
@@ -780,6 +871,7 @@ export function whalffloat(_this, value, endian) {
         _this.data[_this.offset + 1] = halfFloatBits & 0xFF;
     }
     _this.offset += 2;
+    _this.bitoffset = 0;
 }
 export function wint32(_this, value, unsigned, endian) {
     _this.check_size(4, 0);
@@ -810,6 +902,7 @@ export function wint32(_this, value, unsigned, endian) {
         _this.data[_this.offset + 3] = (unsigned == undefined || unsigned == false) ? value : value & 0xFF;
     }
     _this.offset += 4;
+    _this.bitoffset = 0;
 }
 export function rint32(_this, unsigned, endian) {
     _this.check_size(4);
@@ -821,6 +914,7 @@ export function rint32(_this, unsigned, endian) {
         read = (_this.data[_this.offset] << 24) | (_this.data[_this.offset + 1] << 16) | (_this.data[_this.offset + 2] << 8) | _this.data[_this.offset + 3];
     }
     _this.offset += 4;
+    _this.bitoffset = 0;
     if (unsigned == undefined || unsigned == false) {
         return read;
     }
@@ -850,6 +944,8 @@ export function rfloat(_this, endian) {
         // Normalized number
         floatValue = Math.pow(-1, isNegative) * Math.pow(2, exponent - 127) * (1 + fraction / Math.pow(2, 23));
     }
+    _this.offset += 4;
+    _this.bitoffset = 0;
     return floatValue;
 }
 export function wfloat(_this, value, endian) {
@@ -872,6 +968,7 @@ export function wfloat(_this, value, endian) {
         shift += 8;
     }
     _this.offset += 4;
+    _this.bitoffset = 0;
 }
 export function rint64(_this, unsigned, endian) {
     _this.check_size(8);
@@ -886,10 +983,6 @@ export function rint64(_this, unsigned, endian) {
             if (value & (BigInt(1) << BigInt(63))) {
                 value -= BigInt(1) << BigInt(64);
             }
-            return value;
-        }
-        else {
-            return value;
         }
     }
     else {
@@ -901,12 +994,11 @@ export function rint64(_this, unsigned, endian) {
             if (value & (BigInt(1) << BigInt(63))) {
                 value -= BigInt(1) << BigInt(64);
             }
-            return value;
-        }
-        else {
-            return value;
         }
     }
+    _this.offset += 8;
+    _this.bitoffset = 0;
+    return value;
 }
 export function wint64(_this, value, unsigned, endian) {
     _this.check_size(8, 0);
@@ -960,6 +1052,7 @@ export function wint64(_this, value, unsigned, endian) {
         }
     }
     _this.offset += 8;
+    _this.bitoffset = 0;
 }
 export function wdfloat(_this, value, endian) {
     _this.check_size(8, 0);
@@ -982,6 +1075,7 @@ export function wdfloat(_this, value, endian) {
         }
     }
     _this.offset += 8;
+    _this.bitoffset = 0;
 }
 export function rdfloat(_this, endian) {
     _this.check_size(8);
@@ -1011,6 +1105,8 @@ export function rdfloat(_this, endian) {
         // Normalized number
         floatValue = (sign == 0n ? 1 : -1) * Math.pow(2, exponent) * (1 + fraction);
     }
+    _this.offset += 8;
+    _this.bitoffset = 0;
     return floatValue;
 }
 export function rstring(_this, options) {
@@ -1189,6 +1285,7 @@ export function wstring(_this, string, options) {
             }
         }
         _this.offset += totalLength;
+        _this.bitoffset = 0;
     }
     else if (stringType == 'pascal' || stringType == 'wide-pascal') {
         if (encoding == undefined) {
@@ -1254,6 +1351,7 @@ export function wstring(_this, string, options) {
             }
         }
         _this.offset += totalLength;
+        _this.bitoffset = 0;
     }
     else {
         throw new Error('Unsupported string type: ' + stringType);