bireader 1.0.36 → 1.0.38

package/lib/cjs/index.js

@@ -1,22 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.biwriter = exports.bireader = exports.wstring = exports.rstring = exports.rdfloat = exports.wdfloat = exports.wint64 = exports.rint64 = exports.wfloat = exports.rfloat = exports.rint32 = exports.wint32 = exports.whalffloat = exports.rhalffloat = exports.rint16 = exports.wint16 = exports.rbyte = exports.wbyte = exports.rbit = exports.wbit = exports.ADD = exports.RSHIFT = exports.LSHIFT = exports.NOT = exports.XOR = exports.OR = exports.AND = exports.hexDump = exports.addData = exports.remove = exports.goto = exports.skip = exports.checkSize = exports.extendarray = exports.arraybuffcheck = exports.buffcheck = exports.check_size = exports.isBuffer = void 0;
+exports.biwriter = exports.bireader = void 0;
 function isBuffer(obj) {
     return buffcheck(obj);
 }
-exports.isBuffer = isBuffer;
 function check_size(_this, write_bytes, write_bit, offset) {
     return checkSize(_this, write_bytes || 0, write_bit || 0, offset || _this.offset);
 }
-exports.check_size = check_size;
 function buffcheck(obj) {
     return (typeof Buffer !== 'undefined' && obj instanceof Buffer);
 }
-exports.buffcheck = buffcheck;
 function arraybuffcheck(_this, obj) {
     return obj instanceof Uint8Array || isBuffer(obj);
 }
-exports.arraybuffcheck = arraybuffcheck;
 function extendarray(_this, to_padd) {
     if ((typeof Buffer !== 'undefined' && _this.data instanceof Buffer)) {
         var paddbuffer = Buffer.alloc(to_padd);
@@ -27,7 +23,6 @@ function extendarray(_this, to_padd) {
         _this.data = new Uint8Array([..._this.data, ...addArray]);
     }
 }
-exports.extendarray = extendarray;
 function checkSize(_this, write_bytes, write_bit, offset) {
     const bits = (write_bit || 0) + _this.bitoffset;
     var new_off = (offset || _this.offset);
@@ -51,7 +46,6 @@ function checkSize(_this, write_bytes, write_bit, offset) {
     //start read location
     return new_off;
 }
-exports.checkSize = checkSize;
 function skip(_this, bytes, bits) {
     var new_size = (((bytes || 0) + _this.offset) + Math.ceil((_this.bitoffset + (bits || 0)) / 8));
     if (bits && bits < 0) {
@@ -66,11 +60,29 @@ function skip(_this, bytes, bits) {
             throw new Error("\x1b[33m[Strict mode]\x1b[0m: Seek of range of data: seek " + new_size + " of " + _this.size);
         }
     }
-    const total_bits = (((bytes || 0) + _this.offset) * 8) + (bits || 0) + _this.bitoffset;
-    _this.bitoffset = total_bits % 8;
-    _this.offset = Math.floor(total_bits / 8);
+    // Adjust byte offset based on bit overflow
+    _this.offset += Math.floor((_this.bitoffset + (bits || 0)) / 8);
+    // Adjust bit offset
+    _this.bitoffset = (_this.bitoffset + (bits || 0) + 64) % 8;
+    // Adjust byte offset based on byte overflow
+    _this.offset += bytes;
+    // Ensure bit offset stays between 0-7
+    _this.bitoffset = Math.min(Math.max(_this.bitoffset, 0), 7);
+    // Ensure offset doesn't go negative
+    _this.offset = Math.max(_this.offset, 0);
+}
+function align(_this, n) {
+    var a = _this.offset % n;
+    if (a) {
+        _this.skip(n - a);
+    }
+}
+function alignRev(_this, n) {
+    var a = _this.offset % n;
+    if (a) {
+        _this.skip(a * -1);
+    }
 }
-exports.skip = skip;
 function goto(_this, byte, bit) {
     const new_size = (byte + Math.ceil((bit || 0) / 8));
     if (new_size > _this.size) {
@@ -85,7 +97,6 @@ function goto(_this, byte, bit) {
     _this.offset = byte;
     _this.bitoffset = (bit || 0) % 8;
 }
-exports.goto = goto;
 function remove(_this, startOffset, endOffset, consume, remove, fillValue) {
     const new_start = Math.abs(startOffset || 0);
     const new_offset = (endOffset || _this.offset);
@@ -139,7 +150,6 @@ function remove(_this, startOffset, endOffset, consume, remove, fillValue) {
     }
     return data_removed;
 }
-exports.remove = remove;
 function addData(_this, data, consume, offset, repalce) {
     if (_this.strict == true) {
         _this.errorDump ? "\x1b[31m[Error]\x1b[0m: hexdump:\n" + _this.hexdump() : "";
@@ -198,7 +208,6 @@ function addData(_this, data, consume, offset, repalce) {
         _this.bitoffset = 0;
     }
 }
-exports.addData = addData;
 function hexDump(_this, options) {
     var length = options && options.length;
     var startByte = options && options.startByte;
@@ -381,7 +390,6 @@ function hexDump(_this, options) {
     }
     console.log(rows.join("\n"));
 }
-exports.hexDump = hexDump;
 function AND(_this, and_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
@@ -403,7 +411,7 @@ function AND(_this, and_key, start, end, consume) {
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(and_key)) {
+        if (arraybuffcheck(_this, and_key)) {
             let number = -1;
             for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
                 if (number != and_key.length - 1) {
@@ -424,7 +432,6 @@ function AND(_this, and_key, start, end, consume) {
         }
     }
 }
-exports.AND = AND;
 function OR(_this, or_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
@@ -446,7 +453,7 @@ function OR(_this, or_key, start, end, consume) {
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(or_key)) {
+        if (arraybuffcheck(_this, or_key)) {
             let number = -1;
             for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
                 if (number != or_key.length - 1) {
@@ -467,7 +474,6 @@ function OR(_this, or_key, start, end, consume) {
         }
     }
 }
-exports.OR = OR;
 function XOR(_this, xor_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
@@ -489,7 +495,7 @@ function XOR(_this, xor_key, start, end, consume) {
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(xor_key)) {
+        if (arraybuffcheck(_this, xor_key)) {
             let number = -1;
             for (let i = (start || 0); i < Math.min(end || _this.size, _this.size); i++) {
                 if (number != xor_key.length - 1) {
@@ -510,7 +516,6 @@ function XOR(_this, xor_key, start, end, consume) {
         }
     }
 }
-exports.XOR = XOR;
 function NOT(_this, start, end, consume) {
     if ((end || 0) > _this.size) {
         if (_this.strict == false) {
@@ -529,7 +534,6 @@ function NOT(_this, start, end, consume) {
         }
     }
 }
-exports.NOT = NOT;
 function LSHIFT(_this, shift_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
@@ -551,7 +555,7 @@ function LSHIFT(_this, shift_key, start, end, consume) {
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(shift_key)) {
+        if (arraybuffcheck(_this, 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) {
@@ -572,7 +576,6 @@ function LSHIFT(_this, shift_key, start, end, consume) {
         }
     }
 }
-exports.LSHIFT = LSHIFT;
 function RSHIFT(_this, shift_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
@@ -594,7 +597,7 @@ function RSHIFT(_this, shift_key, start, end, consume) {
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(shift_key)) {
+        if (arraybuffcheck(_this, 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) {
@@ -615,7 +618,6 @@ function RSHIFT(_this, shift_key, start, end, consume) {
         }
     }
 }
-exports.RSHIFT = RSHIFT;
 function ADD(_this, add_key, start, end, consume) {
     const input = _this.data;
     if ((end || 0) > _this.size) {
@@ -637,7 +639,7 @@ function ADD(_this, add_key, start, end, consume) {
         }
     }
     else {
-        if (_this.isBufferOrUint8Array(add_key)) {
+        if (arraybuffcheck(_this, 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) {
@@ -658,7 +660,6 @@ function ADD(_this, add_key, start, end, consume) {
         }
     }
 }
-exports.ADD = ADD;
 function wbit(_this, value, bits, unsigned, endian) {
     if (value == undefined) {
         throw new Error('Must supply value.');
@@ -719,7 +720,6 @@ function wbit(_this, value, bits, unsigned, endian) {
     _this.offset = _this.offset + Math.floor(((bits) + _this.bitoffset) / 8); //end byte
     _this.bitoffset = ((bits) + _this.bitoffset) % 8;
 }
-exports.wbit = wbit;
 function rbit(_this, bits, unsigned, endian) {
     if (bits == undefined || typeof bits != "number") {
         throw new Error("Enter number of bits to read");
@@ -764,7 +764,6 @@ function rbit(_this, bits, unsigned, endian) {
     }
     return value;
 }
-exports.rbit = rbit;
 function wbyte(_this, value, unsigned) {
     check_size(_this, 1, 0);
     if (unsigned == true) {
@@ -785,7 +784,6 @@ function wbyte(_this, value, unsigned) {
     _this.offset += 1;
     _this.bitoffset = 0;
 }
-exports.wbyte = wbyte;
 function rbyte(_this, unsigned) {
     check_size(_this, 1);
     var read = _this.data[_this.offset];
@@ -798,7 +796,6 @@ function rbyte(_this, unsigned) {
         return read > 127 ? read - 256 : read;
     }
 }
-exports.rbyte = rbyte;
 function wint16(_this, value, unsigned, endian) {
     check_size(_this, 2, 0);
     if (unsigned == true) {
@@ -826,7 +823,6 @@ function wint16(_this, value, unsigned, endian) {
     _this.offset += 2;
     _this.bitoffset = 0;
 }
-exports.wint16 = wint16;
 function rint16(_this, unsigned, endian) {
     check_size(_this, 2);
     var read;
@@ -845,7 +841,6 @@ function rint16(_this, unsigned, endian) {
         return read & 0xFFFF;
     }
 }
-exports.rint16 = rint16;
 function rhalffloat(_this, endian) {
     var uint16Value = _this.readInt16(true, (endian != undefined ? endian : _this.endian));
     const sign = (uint16Value & 0x8000) >> 15;
@@ -875,7 +870,6 @@ function rhalffloat(_this, endian) {
     }
     return floatValue;
 }
-exports.rhalffloat = rhalffloat;
 function whalffloat(_this, value, endian) {
     check_size(_this, 2, 0);
     const maxValue = 65504;
@@ -919,7 +913,6 @@ function whalffloat(_this, value, endian) {
     _this.offset += 2;
     _this.bitoffset = 0;
 }
-exports.whalffloat = whalffloat;
 function wint32(_this, value, unsigned, endian) {
     check_size(_this, 4, 0);
     if (unsigned == true) {
@@ -951,7 +944,6 @@ function wint32(_this, value, unsigned, endian) {
     _this.offset += 4;
     _this.bitoffset = 0;
 }
-exports.wint32 = wint32;
 function rint32(_this, unsigned, endian) {
     check_size(_this, 4);
     var read;
@@ -970,7 +962,6 @@ function rint32(_this, unsigned, endian) {
         return read >>> 0;
     }
 }
-exports.rint32 = rint32;
 function rfloat(_this, endian) {
     var uint32Value = _this.readInt32(true, (endian == undefined ? _this.endian : endian));
     // Check if the value is negative (i.e., the most significant bit is set)
@@ -994,7 +985,6 @@ function rfloat(_this, endian) {
     }
     return floatValue;
 }
-exports.rfloat = rfloat;
 function wfloat(_this, value, endian) {
     check_size(_this, 4, 0);
     const maxValue = 3.402823466e+38;
@@ -1017,7 +1007,6 @@ function wfloat(_this, value, endian) {
     _this.offset += 4;
     _this.bitoffset = 0;
 }
-exports.wfloat = wfloat;
 function rint64(_this, unsigned, endian) {
     check_size(_this, 8);
     // Convert the byte array to a BigInt
@@ -1048,7 +1037,6 @@ function rint64(_this, unsigned, endian) {
     _this.bitoffset = 0;
     return value;
 }
-exports.rint64 = rint64;
 function wint64(_this, value, unsigned, endian) {
     check_size(_this, 8, 0);
     if (unsigned == true) {
@@ -1103,7 +1091,6 @@ function wint64(_this, value, unsigned, endian) {
     _this.offset += 8;
     _this.bitoffset = 0;
 }
-exports.wint64 = wint64;
 function wdfloat(_this, value, endian) {
     check_size(_this, 8, 0);
     const maxValue = 1.7976931348623158e308;
@@ -1127,7 +1114,6 @@ function wdfloat(_this, value, endian) {
     _this.offset += 8;
     _this.bitoffset = 0;
 }
-exports.wdfloat = wdfloat;
 function rdfloat(_this, endian) {
     var uint64Value = _this.readInt64(true, (endian == undefined ? _this.endian : endian));
     const sign = (uint64Value & 0x8000000000000000n) >> 63n;
@@ -1157,7 +1143,6 @@ function rdfloat(_this, endian) {
     }
     return floatValue;
 }
-exports.rdfloat = rdfloat;
 function rstring(_this, options) {
     var length = options && options.length;
     var stringType = options && options.stringType || 'utf-8';
@@ -1280,7 +1265,6 @@ function rstring(_this, options) {
         throw new Error('Unsupported string type: ' + stringType);
     }
 }
-exports.rstring = rstring;
 function wstring(_this, string, options) {
     var length = options && options.length;
     var stringType = options && options.stringType || 'utf-8';
@@ -1407,7 +1391,6 @@ function wstring(_this, string, options) {
         throw new Error('Unsupported string type: ' + stringType);
     }
 }
-exports.wstring = wstring;
 /**
 * Binary reader, includes bitfields and strings
 *
@@ -1535,6 +1518,26 @@ class bireader {
     // move from current position
     //
     /**
+    * Aligns current byte position
+    *
+    * Note: Will extend array if strict mode is off and outside of max size
+    *
+    * @param {number} number - Byte to align
+    */
+    align(number) {
+        return align(this, number);
+    }
+    /**
+    * Reverse aligns current byte position
+    *
+    * Note: Will extend array if strict mode is off and outside of max size
+    *
+    * @param {number} number - Byte to align
+    */
+    alignRev(number) {
+        return alignRev(this, number);
+    }
+    /**
     * Offset current byte or bit position
     * Note: Will extend array if strict mode is off and outside of max size
     *
@@ -4484,6 +4487,14 @@ class bireader {
         return wbyte(this, value, unsigned);
     }
     /**
+    * Write unsigned byte
+    *
+    * @param {number} value - value as int
+    */
+    writeUByte(value) {
+        return wbyte(this, value, true);
+    }
+    /**
     * Read byte
     *
     * @param {boolean} unsigned - if value is unsigned or not
@@ -4549,6 +4560,15 @@ class bireader {
         return wint16(this, value, unsigned, endian);
     }
     /**
+    * Write unsigned int16
+    *
+    * @param {number} value - value as int
+    * @param {string} endian - ``big`` or ``little`
+    */
+    writeUInt16(value, endian) {
+        return wint16(this, value, true, endian);
+    }
+    /**
     * Read short
     *
     * @param {boolean} unsigned - if value is unsigned or not
@@ -4857,6 +4877,15 @@ class bireader {
         return wint32(this, value, unsigned, endian);
     }
     /**
+    * Write unsigned int32
+    *
+    * @param {number} value - value as int
+    * @param {string} endian - ``big`` or ``little``
+    */
+    writeUInt32(value, endian) {
+        return wint32(this, value, true, endian);
+    }
+    /**
     * Read 32 bit integer
     *
     * @param {boolean} unsigned - if value is unsigned or not
@@ -5952,7 +5981,28 @@ class biwriter {
     // move from current position
     //
     /**
+    * Aligns current byte position
+    *
+    * Note: Will extend array if strict mode is off and outside of max size
+    *
+    * @param {number} number - Byte to align
+    */
+    align(number) {
+        return align(this, number);
+    }
+    /**
+    * Reverse aligns current byte position
+    *
+    * Note: Will extend array if strict mode is off and outside of max size
+    *
+    * @param {number} number - Byte to align
+    */
+    alignRev(number) {
+        return alignRev(this, number);
+    }
+    /**
     * Offset current byte or bit position
+    *
     * Note: Will extend array if strict mode is off and outside of max size
     *
     * @param {number} bytes - Bytes to skip
@@ -9166,6 +9216,14 @@ class biwriter {
         return rbyte(this, unsigned);
     }
     /**
+    * Read unsigned byte
+    *
+    * @returns number
+    */
+    readUByte() {
+        return rbyte(this, true);
+    }
+    /**
     * Write byte
     *
     * @param {number} value - value as int