bson 6.3.0 → 6.4.1

package/package.json

@@ -14,7 +14,7 @@
     "vendor"
   ],
   "types": "bson.d.ts",
-  "version": "6.3.0",
+  "version": "6.4.1",
   "author": {
     "name": "The MongoDB NodeJS Team",
     "email": "dbx-node@mongodb.com"
@@ -27,39 +27,39 @@
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@microsoft/api-extractor": "^7.38.4",
-    "@octokit/core": "^4.2.4",
+    "@microsoft/api-extractor": "^7.40.5",
+    "@octokit/core": "^5.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.5",
+    "@rollup/plugin-typescript": "^11.1.6",
     "@types/chai": "^4.3.11",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^18.19.2",
-    "@types/sinon": "^10.0.20",
+    "@types/node": "^20.11.19",
+    "@types/sinon": "^17.0.3",
     "@types/sinon-chai": "^3.2.12",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.62.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "@typescript-eslint/parser": "^7.0.2",
     "benchmark": "^2.1.4",
     "chai": "^4.3.10",
     "chalk": "^5.3.0",
     "dbx-js-tools": "github:mongodb-js/dbx-js-tools",
-    "eslint": "^8.55.0",
-    "eslint-config-prettier": "^8.10.0",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-no-bigint-usage": "file:etc/eslint/no-bigint-usage",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-tsdoc": "^0.2.17",
-    "magic-string": "^0.30.5",
-    "mocha": "10.2.0",
+    "magic-string": "^0.30.7",
+    "mocha": "10.3.0",
     "node-fetch": "^3.3.2",
     "nyc": "^15.1.0",
-    "prettier": "^2.8.8",
-    "rollup": "^3.29.4",
-    "sinon": "^15.2.0",
+    "prettier": "^3.2.5",
+    "rollup": "^4.12.0",
+    "sinon": "^17.0.1",
     "sinon-chai": "^3.7.0",
     "source-map-support": "^0.5.21",
     "standard-version": "^9.5.0",
     "tar": "^6.2.0",
-    "ts-node": "^10.9.1",
-    "tsd": "^0.28.1",
+    "ts-node": "^10.9.2",
+    "tsd": "^0.30.5",
     "typescript": "^5.0.4",
     "typescript-cached-transpile": "0.0.6",
     "uuid": "^9.0.1"

package/src/bson.ts

@@ -16,6 +16,7 @@ import { BSONRegExp } from './regexp';
 import { BSONSymbol } from './symbol';
 import { Timestamp } from './timestamp';
 import { ByteUtils } from './utils/byte_utils';
+import { NumberUtils } from './utils/number_utils';
 export type { UUIDExtended, BinaryExtended, BinaryExtendedLegacy, BinarySequence } from './binary';
 export type { CodeExtended } from './code';
 export type { DBRefLike } from './db_ref';
@@ -115,7 +116,7 @@ export function serialize(object: Document, options: SerializeOptions = {}): Uin
   );
 
   // Create the final buffer
-  const finishedBuffer = ByteUtils.allocate(serializationIndex);
+  const finishedBuffer = ByteUtils.allocateUnsafe(serializationIndex);
 
   // Copy into the finished buffer
   finishedBuffer.set(buffer.subarray(0, serializationIndex), 0);
@@ -232,11 +233,7 @@ export function deserializeStream(
   // Loop over all documents
   for (let i = 0; i < numberOfDocuments; i++) {
     // Find size of the document
-    const size =
-      bufferData[index] |
-      (bufferData[index + 1] << 8) |
-      (bufferData[index + 2] << 16) |
-      (bufferData[index + 3] << 24);
+    const size = NumberUtils.getInt32LE(bufferData, index);
     // Update options with index
     internalOptions.index = index;
     // Parse the document at this point

package/src/db_ref.ts

@@ -51,7 +51,6 @@ export class DBRef extends BSONValue {
     const parts = collection.split('.');
     if (parts.length === 2) {
       db = parts.shift();
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       collection = parts.shift()!;
     }
 

package/src/decimal128.ts

@@ -591,7 +591,7 @@ export class Decimal128 extends BSONValue {
     }
 
     // Encode into a buffer
-    const buffer = ByteUtils.allocate(16);
+    const buffer = ByteUtils.allocateUnsafe(16);
     index = 0;
 
     // Encode the low 64 bits of the decimal

package/src/objectid.ts

@@ -1,7 +1,8 @@
 import { BSONValue } from './bson_value';
 import { BSONError } from './error';
 import { type InspectFn, defaultInspect } from './parser/utils';
-import { BSONDataView, ByteUtils } from './utils/byte_utils';
+import { ByteUtils } from './utils/byte_utils';
+import { NumberUtils } from './utils/number_utils';
 
 // Regular expression that checks for hex value
 const checkForHexRegExp = new RegExp('^[0-9a-fA-F]{24}$');
@@ -21,8 +22,6 @@ export interface ObjectIdExtended {
   $oid: string;
 }
 
-const kId = Symbol('id');
-
 /**
  * A class representation of the BSON ObjectId type.
  * @public
@@ -39,7 +38,7 @@ export class ObjectId extends BSONValue {
   static cacheHexString: boolean;
 
   /** ObjectId Bytes @internal */
-  private [kId]!: Uint8Array;
+  private buffer!: Uint8Array;
   /** ObjectId hexString cache @internal */
   private __id?: string;
 
@@ -108,13 +107,13 @@ export class ObjectId extends BSONValue {
     if (workingId == null || typeof workingId === 'number') {
       // The most common use case (blank id, new objectId instance)
       // Generate a new id
-      this[kId] = ObjectId.generate(typeof workingId === 'number' ? workingId : undefined);
+      this.buffer = ObjectId.generate(typeof workingId === 'number' ? workingId : undefined);
     } else if (ArrayBuffer.isView(workingId) && workingId.byteLength === 12) {
       // If intstanceof matches we can escape calling ensure buffer in Node.js environments
-      this[kId] = ByteUtils.toLocalBufferType(workingId);
+      this.buffer = ByteUtils.toLocalBufferType(workingId);
     } else if (typeof workingId === 'string') {
       if (workingId.length === 24 && checkForHexRegExp.test(workingId)) {
-        this[kId] = ByteUtils.fromHex(workingId);
+        this.buffer = ByteUtils.fromHex(workingId);
       } else {
         throw new BSONError(
           'input must be a 24 character hex string, 12 byte Uint8Array, or an integer'
@@ -134,11 +133,11 @@ export class ObjectId extends BSONValue {
    * @readonly
    */
   get id(): Uint8Array {
-    return this[kId];
+    return this.buffer;
   }
 
   set id(value: Uint8Array) {
-    this[kId] = value;
+    this.buffer = value;
     if (ObjectId.cacheHexString) {
       this.__id = ByteUtils.toHex(value);
     }
@@ -178,10 +177,10 @@ export class ObjectId extends BSONValue {
     }
 
     const inc = ObjectId.getInc();
-    const buffer = ByteUtils.allocate(12);
+    const buffer = ByteUtils.allocateUnsafe(12);
 
     // 4-byte timestamp
-    BSONDataView.fromUint8Array(buffer).setUint32(0, time, false);
+    NumberUtils.setInt32BE(buffer, 0, time);
 
     // set PROCESS_UNIQUE if yet not initialized
     if (PROCESS_UNIQUE === null) {
@@ -240,7 +239,9 @@ export class ObjectId extends BSONValue {
     }
 
     if (ObjectId.is(otherId)) {
-      return this[kId][11] === otherId[kId][11] && ByteUtils.equals(this[kId], otherId[kId]);
+      return (
+        this.buffer[11] === otherId.buffer[11] && ByteUtils.equals(this.buffer, otherId.buffer)
+      );
     }
 
     if (typeof otherId === 'string') {
@@ -259,7 +260,7 @@ export class ObjectId extends BSONValue {
   /** Returns the generation date (accurate up to the second) that this ID was generated. */
   getTimestamp(): Date {
     const timestamp = new Date();
-    const time = BSONDataView.fromUint8Array(this.id).getUint32(0, false);
+    const time = NumberUtils.getUint32BE(this.buffer, 0);
     timestamp.setTime(Math.floor(time) * 1000);
     return timestamp;
   }
@@ -269,15 +270,33 @@ export class ObjectId extends BSONValue {
     return new ObjectId();
   }
 
+  /** @internal */
+  serializeInto(uint8array: Uint8Array, index: number): 12 {
+    uint8array[index] = this.buffer[0];
+    uint8array[index + 1] = this.buffer[1];
+    uint8array[index + 2] = this.buffer[2];
+    uint8array[index + 3] = this.buffer[3];
+    uint8array[index + 4] = this.buffer[4];
+    uint8array[index + 5] = this.buffer[5];
+    uint8array[index + 6] = this.buffer[6];
+    uint8array[index + 7] = this.buffer[7];
+    uint8array[index + 8] = this.buffer[8];
+    uint8array[index + 9] = this.buffer[9];
+    uint8array[index + 10] = this.buffer[10];
+    uint8array[index + 11] = this.buffer[11];
+    return 12;
+  }
+
   /**
    * Creates an ObjectId from a second based number, with the rest of the ObjectId zeroed out. Used for comparisons or sorting the ObjectId.
    *
    * @param time - an integer number representing a number of seconds.
    */
   static createFromTime(time: number): ObjectId {
-    const buffer = ByteUtils.fromNumberArray([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    const buffer = ByteUtils.allocate(12);
+    for (let i = 11; i >= 4; i--) buffer[i] = 0;
     // Encode time into first 4 bytes
-    BSONDataView.fromUint8Array(buffer).setUint32(0, time, false);
+    NumberUtils.setInt32BE(buffer, 0, time);
     // Return the new objectId
     return new ObjectId(buffer);
   }

package/src/parser/deserializer.ts

@@ -14,7 +14,8 @@ import { ObjectId } from '../objectid';
 import { BSONRegExp } from '../regexp';
 import { BSONSymbol } from '../symbol';
 import { Timestamp } from '../timestamp';
-import { BSONDataView, ByteUtils } from '../utils/byte_utils';
+import { ByteUtils } from '../utils/byte_utils';
+import { NumberUtils } from '../utils/number_utils';
 import { validateUtf8 } from '../validate_utf8';
 
 /** @public */
@@ -91,11 +92,7 @@ export function internalDeserialize(
   options = options == null ? {} : options;
   const index = options && options.index ? options.index : 0;
   // Read the document size
-  const size =
-    buffer[index] |
-    (buffer[index + 1] << 8) |
-    (buffer[index + 2] << 16) |
-    (buffer[index + 3] << 24);
+  const size = NumberUtils.getInt32LE(buffer, index);
 
   if (size < 5) {
     throw new BSONError(`bson size must be >= 5, is ${size}`);
@@ -164,7 +161,7 @@ function deserializeObject(
   // Reflects utf-8 validation setting regardless of global or specific key validation
   let validationSetting: boolean;
   // Set of keys either to enable or disable validation on
-  const utf8KeysSet = new Set();
+  let utf8KeysSet;
 
   // Check for boolean uniformity and empty validation option
   const utf8ValidatedKeys = validation.utf8;
@@ -190,6 +187,8 @@ function deserializeObject(
 
   // Add keys to set that will either be validated or not based on validationSetting
   if (!globalUTFValidation) {
+    utf8KeysSet = new Set();
+
     for (const key of Object.keys(utf8ValidatedKeys)) {
       utf8KeysSet.add(key);
     }
@@ -202,8 +201,8 @@ function deserializeObject(
   if (buffer.length < 5) throw new BSONError('corrupt bson message < 5 bytes long');
 
   // Read the document size
-  const size =
-    buffer[index++] | (buffer[index++] << 8) | (buffer[index++] << 16) | (buffer[index++] << 24);
+  const size = NumberUtils.getInt32LE(buffer, index);
+  index += 4;
 
   // Ensure buffer is valid size
   if (size < 5 || size > buffer.length) throw new BSONError('corrupt bson message');
@@ -217,7 +216,6 @@ function deserializeObject(
   let isPossibleDBRef = isArray ? false : null;
 
   // While we have more left data left keep parsing
-  const dataview = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
   while (!done) {
     // Read the type
     const elementType = buffer[index++];
@@ -240,7 +238,7 @@ function deserializeObject(
 
     // shouldValidateKey is true if the key should be validated, false otherwise
     let shouldValidateKey = true;
-    if (globalUTFValidation || utf8KeysSet.has(name)) {
+    if (globalUTFValidation || utf8KeysSet?.has(name)) {
       shouldValidateKey = validationSetting;
     } else {
       shouldValidateKey = !validationSetting;
@@ -254,11 +252,8 @@ function deserializeObject(
     index = i + 1;
 
     if (elementType === constants.BSON_DATA_STRING) {
-      const stringSize =
-        buffer[index++] |
-        (buffer[index++] << 8) |
-        (buffer[index++] << 16) |
-        (buffer[index++] << 24);
+      const stringSize = NumberUtils.getInt32LE(buffer, index);
+      index += 4;
       if (
         stringSize <= 0 ||
         stringSize > buffer.length - index ||
@@ -269,37 +264,25 @@ function deserializeObject(
       value = ByteUtils.toUTF8(buffer, index, index + stringSize - 1, shouldValidateKey);
       index = index + stringSize;
     } else if (elementType === constants.BSON_DATA_OID) {
-      const oid = ByteUtils.allocate(12);
-      oid.set(buffer.subarray(index, index + 12));
+      const oid = ByteUtils.allocateUnsafe(12);
+      for (let i = 0; i < 12; i++) oid[i] = buffer[index + i];
       value = new ObjectId(oid);
       index = index + 12;
     } else if (elementType === constants.BSON_DATA_INT && promoteValues === false) {
-      value = new Int32(
-        buffer[index++] | (buffer[index++] << 8) | (buffer[index++] << 16) | (buffer[index++] << 24)
-      );
+      value = new Int32(NumberUtils.getInt32LE(buffer, index));
+      index += 4;
     } else if (elementType === constants.BSON_DATA_INT) {
-      value =
-        buffer[index++] |
-        (buffer[index++] << 8) |
-        (buffer[index++] << 16) |
-        (buffer[index++] << 24);
-    } else if (elementType === constants.BSON_DATA_NUMBER && promoteValues === false) {
-      value = new Double(dataview.getFloat64(index, true));
-      index = index + 8;
+      value = NumberUtils.getInt32LE(buffer, index);
+      index += 4;
     } else if (elementType === constants.BSON_DATA_NUMBER) {
-      value = dataview.getFloat64(index, true);
-      index = index + 8;
+      value = NumberUtils.getFloat64LE(buffer, index);
+      index += 8;
+      if (promoteValues === false) value = new Double(value);
     } else if (elementType === constants.BSON_DATA_DATE) {
-      const lowBits =
-        buffer[index++] |
-        (buffer[index++] << 8) |
-        (buffer[index++] << 16) |
-        (buffer[index++] << 24);
-      const highBits =
-        buffer[index++] |
-        (buffer[index++] << 8) |
-        (buffer[index++] << 16) |
-        (buffer[index++] << 24);
+      const lowBits = NumberUtils.getInt32LE(buffer, index);
+      const highBits = NumberUtils.getInt32LE(buffer, index + 4);
+      index += 8;
+
       value = new Date(new Long(lowBits, highBits).toNumber());
     } else if (elementType === constants.BSON_DATA_BOOLEAN) {
       if (buffer[index] !== 0 && buffer[index] !== 1)
@@ -307,11 +290,8 @@ function deserializeObject(
       value = buffer[index++] === 1;
     } else if (elementType === constants.BSON_DATA_OBJECT) {
       const _index = index;
-      const objectSize =
-        buffer[index] |
-        (buffer[index + 1] << 8) |
-        (buffer[index + 2] << 16) |
-        (buffer[index + 3] << 24);
+      const objectSize = NumberUtils.getInt32LE(buffer, index);
+
       if (objectSize <= 0 || objectSize > buffer.length - index)
         throw new BSONError('bad embedded document length in bson');
 
@@ -329,11 +309,7 @@ function deserializeObject(
       index = index + objectSize;
     } else if (elementType === constants.BSON_DATA_ARRAY) {
       const _index = index;
-      const objectSize =
-        buffer[index] |
-        (buffer[index + 1] << 8) |
-        (buffer[index + 2] << 16) |
-        (buffer[index + 3] << 24);
+      const objectSize = NumberUtils.getInt32LE(buffer, index);
       let arrayOptions: DeserializeOptions = options;
 
       // Stop index
@@ -357,46 +333,38 @@ function deserializeObject(
     } else if (elementType === constants.BSON_DATA_NULL) {
       value = null;
     } else if (elementType === constants.BSON_DATA_LONG) {
-      // Unpack the low and high bits
-      const dataview = BSONDataView.fromUint8Array(buffer.subarray(index, index + 8));
-
-      const lowBits =
-        buffer[index++] |
-        (buffer[index++] << 8) |
-        (buffer[index++] << 16) |
-        (buffer[index++] << 24);
-      const highBits =
-        buffer[index++] |
-        (buffer[index++] << 8) |
-        (buffer[index++] << 16) |
-        (buffer[index++] << 24);
-      const long = new Long(lowBits, highBits);
       if (useBigInt64) {
-        value = dataview.getBigInt64(0, true);
-      } else if (promoteLongs && promoteValues === true) {
-        // Promote the long if possible
-        value =
-          long.lessThanOrEqual(JS_INT_MAX_LONG) && long.greaterThanOrEqual(JS_INT_MIN_LONG)
-            ? long.toNumber()
-            : long;
+        value = NumberUtils.getBigInt64LE(buffer, index);
+        index += 8;
       } else {
-        value = long;
+        // Unpack the low and high bits
+        const lowBits = NumberUtils.getInt32LE(buffer, index);
+        const highBits = NumberUtils.getInt32LE(buffer, index + 4);
+        index += 8;
+
+        const long = new Long(lowBits, highBits);
+        // Promote the long if possible
+        if (promoteLongs && promoteValues === true) {
+          value =
+            long.lessThanOrEqual(JS_INT_MAX_LONG) && long.greaterThanOrEqual(JS_INT_MIN_LONG)
+              ? long.toNumber()
+              : long;
+        } else {
+          value = long;
+        }
       }
     } else if (elementType === constants.BSON_DATA_DECIMAL128) {
       // Buffer to contain the decimal bytes
-      const bytes = ByteUtils.allocate(16);
+      const bytes = ByteUtils.allocateUnsafe(16);
       // Copy the next 16 bytes into the bytes buffer
-      bytes.set(buffer.subarray(index, index + 16), 0);
+      for (let i = 0; i < 16; i++) bytes[i] = buffer[index + i];
       // Update index
       index = index + 16;
       // Assign the new Decimal128 value
       value = new Decimal128(bytes);
     } else if (elementType === constants.BSON_DATA_BINARY) {
-      let binarySize =
-        buffer[index++] |
-        (buffer[index++] << 8) |
-        (buffer[index++] << 16) |
-        (buffer[index++] << 24);
+      let binarySize = NumberUtils.getInt32LE(buffer, index);
+      index += 4;
       const totalBinarySize = binarySize;
       const subType = buffer[index++];
 
@@ -411,11 +379,8 @@ function deserializeObject(
       if (buffer['slice'] != null) {
         // If we have subtype 2 skip the 4 bytes for the size
         if (subType === Binary.SUBTYPE_BYTE_ARRAY) {
-          binarySize =
-            buffer[index++] |
-            (buffer[index++] << 8) |
-            (buffer[index++] << 16) |
-            (buffer[index++] << 24);
+          binarySize = NumberUtils.getInt32LE(buffer, index);
+          index += 4;
           if (binarySize < 0)
             throw new BSONError('Negative binary type element size found for subtype 0x02');
           if (binarySize > totalBinarySize - 4)
@@ -433,14 +398,10 @@ function deserializeObject(
           }
         }
       } else {
-        const _buffer = ByteUtils.allocate(binarySize);
         // If we have subtype 2 skip the 4 bytes for the size
         if (subType === Binary.SUBTYPE_BYTE_ARRAY) {
-          binarySize =
-            buffer[index++] |
-            (buffer[index++] << 8) |
-            (buffer[index++] << 16) |
-            (buffer[index++] << 24);
+          binarySize = NumberUtils.getInt32LE(buffer, index);
+          index += 4;
           if (binarySize < 0)
             throw new BSONError('Negative binary type element size found for subtype 0x02');
           if (binarySize > totalBinarySize - 4)
@@ -449,13 +410,12 @@ function deserializeObject(
             throw new BSONError('Binary type with subtype 0x02 contains too short binary size');
         }
 
-        // Copy the data
-        for (i = 0; i < binarySize; i++) {
-          _buffer[i] = buffer[index + i];
-        }
-
         if (promoteBuffers && promoteValues) {
-          value = _buffer;
+          value = ByteUtils.allocateUnsafe(binarySize);
+          // Copy the data
+          for (i = 0; i < binarySize; i++) {
+            value[i] = buffer[index + i];
+          }
         } else {
           value = new Binary(buffer.slice(index, index + binarySize), subType);
           if (subType === constants.BSON_BINARY_SUBTYPE_UUID_NEW && UUID.isValid(value)) {
@@ -539,11 +499,8 @@ function deserializeObject(
       // Set the object
       value = new BSONRegExp(source, regExpOptions);
     } else if (elementType === constants.BSON_DATA_SYMBOL) {
-      const stringSize =
-        buffer[index++] |
-        (buffer[index++] << 8) |
-        (buffer[index++] << 16) |
-        (buffer[index++] << 24);
+      const stringSize = NumberUtils.getInt32LE(buffer, index);
+      index += 4;
       if (
         stringSize <= 0 ||
         stringSize > buffer.length - index ||
@@ -555,31 +512,18 @@ function deserializeObject(
       value = promoteValues ? symbol : new BSONSymbol(symbol);
       index = index + stringSize;
     } else if (elementType === constants.BSON_DATA_TIMESTAMP) {
-      // We intentionally **do not** use bit shifting here
-      // Bit shifting in javascript coerces numbers to **signed** int32s
-      // We need to keep i, and t unsigned
-      const i =
-        buffer[index++] +
-        buffer[index++] * (1 << 8) +
-        buffer[index++] * (1 << 16) +
-        buffer[index++] * (1 << 24);
-      const t =
-        buffer[index++] +
-        buffer[index++] * (1 << 8) +
-        buffer[index++] * (1 << 16) +
-        buffer[index++] * (1 << 24);
-
-      value = new Timestamp({ i, t });
+      value = new Timestamp({
+        i: NumberUtils.getUint32LE(buffer, index),
+        t: NumberUtils.getUint32LE(buffer, index + 4)
+      });
+      index += 8;
     } else if (elementType === constants.BSON_DATA_MIN_KEY) {
       value = new MinKey();
     } else if (elementType === constants.BSON_DATA_MAX_KEY) {
       value = new MaxKey();
     } else if (elementType === constants.BSON_DATA_CODE) {
-      const stringSize =
-        buffer[index++] |
-        (buffer[index++] << 8) |
-        (buffer[index++] << 16) |
-        (buffer[index++] << 24);
+      const stringSize = NumberUtils.getInt32LE(buffer, index);
+      index += 4;
       if (
         stringSize <= 0 ||
         stringSize > buffer.length - index ||
@@ -599,11 +543,8 @@ function deserializeObject(
       // Update parse index position
       index = index + stringSize;
     } else if (elementType === constants.BSON_DATA_CODE_W_SCOPE) {
-      const totalSize =
-        buffer[index++] |
-        (buffer[index++] << 8) |
-        (buffer[index++] << 16) |
-        (buffer[index++] << 24);
+      const totalSize = NumberUtils.getInt32LE(buffer, index);
+      index += 4;
 
       // Element cannot be shorter than totalSize + stringSize + documentSize + terminator
       if (totalSize < 4 + 4 + 4 + 1) {
@@ -611,11 +552,8 @@ function deserializeObject(
       }
 
       // Get the code string size
-      const stringSize =
-        buffer[index++] |
-        (buffer[index++] << 8) |
-        (buffer[index++] << 16) |
-        (buffer[index++] << 24);
+      const stringSize = NumberUtils.getInt32LE(buffer, index);
+      index += 4;
       // Check if we have a valid string
       if (
         stringSize <= 0 ||
@@ -637,11 +575,7 @@ function deserializeObject(
       // Parse the element
       const _index = index;
       // Decode the size of the object document
-      const objectSize =
-        buffer[index] |
-        (buffer[index + 1] << 8) |
-        (buffer[index + 2] << 16) |
-        (buffer[index + 3] << 24);
+      const objectSize = NumberUtils.getInt32LE(buffer, index);
       // Decode the scope object
       const scopeObject = deserializeObject(buffer, _index, options, false);
       // Adjust the index
@@ -660,11 +594,8 @@ function deserializeObject(
       value = new Code(functionString, scopeObject);
     } else if (elementType === constants.BSON_DATA_DBPOINTER) {
       // Get the code string size
-      const stringSize =
-        buffer[index++] |
-        (buffer[index++] << 8) |
-        (buffer[index++] << 16) |
-        (buffer[index++] << 24);
+      const stringSize = NumberUtils.getInt32LE(buffer, index);
+      index += 4;
       // Check if we have a valid string
       if (
         stringSize <= 0 ||
@@ -683,8 +614,8 @@ function deserializeObject(
       index = index + stringSize;
 
       // Read the oid
-      const oidBuffer = ByteUtils.allocate(12);
-      oidBuffer.set(buffer.subarray(index, index + 12), 0);
+      const oidBuffer = ByteUtils.allocateUnsafe(12);
+      for (let i = 0; i < 12; i++) oidBuffer[i] = buffer[index + i];
       const oid = new ObjectId(oidBuffer);
 
       // Update the index