Rollback changes as not needed in the core

src/Misc/dataReader.ts

@@ -25,19 +25,12 @@ export class DataReader {
     /**
      * The data buffer associated with this data reader.
      */
-    public readonly buffer: IDataBuffer | undefined;
+    public readonly buffer: IDataBuffer;
 
     /**
      * The current byte offset from the beginning of the data buffer.
      */
-    public get byteOffset() {
-        return this._dataByteOffset;
-    }
-
-    /**
-     * Indicates the endianness of the data in the buffer
-     */
-    public littleEndian = true;
+    public byteOffset = 0;
 
     private _dataView: DataView;
     private _dataByteOffset: number;
@@ -46,7 +39,7 @@ export class DataReader {
      * Constructor
      * @param buffer The buffer to read
      */
-    constructor(buffer?: IDataBuffer) {
+    constructor(buffer: IDataBuffer) {
         this.buffer = buffer;
     }
 
@@ -59,73 +52,10 @@ export class DataReader {
         delete this._dataView;
         delete this._dataByteOffset;
 
-        if (!this.buffer) {
-            return Promise.resolve();
-        } else {
-            return this.buffer.readAsync(this.byteOffset, byteLength).then((data) => {
-                this._dataView = new DataView(data.buffer, data.byteOffset, data.byteLength);
-                this._dataByteOffset = 0;
-            });
-        }
-    }
-
-    /**
-     * Sets the given buffer
-     * @param buffer The buffer to set
-     * @param byteOffset The starting offset in the buffer
-     * @param byteLength The byte length of the buffer
-     * @returns This instance
-     */
-    public setBuffer(buffer: ArrayBuffer | ArrayBufferView, byteOffset?: number, byteLength?: number) {
-        if ((buffer as  ArrayBufferView).buffer) {
-            this._dataView = new DataView((buffer as ArrayBufferView).buffer, byteOffset ?? (buffer as ArrayBufferView).byteOffset, byteLength ?? (buffer as ArrayBufferView).byteLength);
-        } else {
-            this._dataView = new DataView(buffer as ArrayBuffer, byteOffset ?? 0, byteLength ?? (buffer as ArrayBuffer).byteLength);
-        }
-
-        this._dataByteOffset = 0;
-
-        return this;
-    }
-
-    /**
-     * Read a unsigned 8-bit integer from the currently loaded data range.
-     * @returns The 8-bit integer read
-     */
-    public readUint8(): number {
-        const value = this._dataView.getUint8(this._dataByteOffset);
-        this._dataByteOffset += 1;
-        return value;
-    }
-
-    /**
-     * Read a signed 8-bit integer from the currently loaded data range.
-     * @returns The 8-bit integer read
-     */
-    public readInt8(): number {
-        const value = this._dataView.getInt8(this._dataByteOffset);
-        this._dataByteOffset += 1;
-        return value;
-    }
-
-    /**
-     * Read a unsigned 16-bit integer from the currently loaded data range.
-     * @returns The 16-bit integer read
-     */
-    public readUint16(): number {
-        const value = this._dataView.getUint16(this._dataByteOffset, this.littleEndian);
-        this._dataByteOffset += 2;
-        return value;
-    }
-
-    /**
-     * Read a signed 16-bit integer from the currently loaded data range.
-     * @returns The 16-bit integer read
-     */
-    public readInt16(): number {
-        const value = this._dataView.getInt16(this._dataByteOffset, this.littleEndian);
-        this._dataByteOffset += 2;
-        return value;
+        return this.buffer.readAsync(this.byteOffset, byteLength).then((data) => {
+            this._dataView = new DataView(data.buffer, data.byteOffset, data.byteLength);
+            this._dataByteOffset = 0;
+        });
     }
 
     /**
@@ -133,42 +63,13 @@ export class DataReader {
      * @returns The 32-bit integer read
      */
     public readUint32(): number {
-        const value = this._dataView.getUint32(this._dataByteOffset, this.littleEndian);
+        const value = this._dataView.getUint32(this._dataByteOffset, true);
         this._dataByteOffset += 4;
+        this.byteOffset += 4;
         return value;
     }
 
     /**
-     * Read a signed 32-bit integer from the currently loaded data range.
-     * @returns The 32-bit integer read
-     */
-    public readInt32(): number {
-        const value = this._dataView.getInt32(this._dataByteOffset, this.littleEndian);
-        this._dataByteOffset += 4;
-        return value;
-    }
-
-    /**
-     * Read a unsigned 32-bit integer from the currently loaded data range.
-     * @returns The 32-bit integer read
-     */
-    public readUint64(): number {
-        // split 64-bit number into two 32-bit (4-byte) parts
-        const left = this._dataView.getUint32(this._dataByteOffset, this.littleEndian);
-        const right = this._dataView.getUint32(this._dataByteOffset + 4, this.littleEndian);
-
-        // combine the two 32-bit values
-        const combined = this.littleEndian ? left + (2 ** 32 * right) : (2 ** 32 * left) + right;
-
-        /*if (!Number.isSafeInteger(combined)) {
-            console.warn('DataReader: ' + combined + ' exceeds MAX_SAFE_INTEGER. Precision may be lost.');
-        }*/
-
-        this._dataByteOffset += 8;
-        return combined;
-    }
-
-    /**
      * Read a byte array from the currently loaded data range.
      * @param byteLength The byte length to read
      * @returns The byte array read
@@ -176,6 +77,7 @@ export class DataReader {
     public readUint8Array(byteLength: number): Uint8Array {
         const value = new Uint8Array(this._dataView.buffer, this._dataView.byteOffset + this._dataByteOffset, byteLength);
         this._dataByteOffset += byteLength;
+        this.byteOffset += byteLength;
         return value;
     }
 
@@ -191,10 +93,9 @@ export class DataReader {
     /**
      * Skips the given byte length the currently loaded data range.
      * @param byteLength The byte length to skip
-     * @returns This instance
      */
-    public skipBytes(byteLength: number) {
+    public skipBytes(byteLength: number): void {
         this._dataByteOffset += byteLength;
-        return this;
+        this.byteOffset += byteLength;
     }
 }