pr feedback:

- replace `BSON.x.y` code with `x.y`
- added readUint32LE wrapper around NumberUtils.getUint32LE

Author: PavelSafronov

src/bson.ts

@@ -55,6 +55,13 @@ export const readInt32LE = (buffer: Uint8Array, offset: number): number => {
   return NumberUtils.getInt32LE(buffer, offset);
 };
 
+// readUint32LE, reads a 32-bit unsigned integer from buffer at given offset
+// throws if offset is out of bounds
+export const readUint32LE = (buffer: Uint8Array, offset: number): number => {
+  validateBufferInputs(buffer, offset, 4);
+  return NumberUtils.getUint32LE(buffer, offset);
+};
+
 /**
  * BSON Serialization options.
  * @public

src/cmap/auth/aws4.ts

@@ -1,4 +1,4 @@
-import { BSON } from '../../bson';
+import { ByteUtils } from '../../bson';
 import { type AWSCredentials } from '../../deps';
 
 export type AwsSigv4Options = {
@@ -31,7 +31,7 @@ export type SignedHeaders = {
 const getHexSha256 = async (str: string): Promise<string> => {
   const data = stringToBuffer(str);
   const hashBuffer = await crypto.subtle.digest('SHA-256', data);
-  const hashHex = BSON.ByteUtils.toHex(new Uint8Array(hashBuffer));
+  const hashHex = ByteUtils.toHex(new Uint8Array(hashBuffer));
   return hashHex;
 };
 
@@ -81,8 +81,8 @@ const convertHeaderValue = (value: string | number) => {
  * @returns Uint8Array containing the UTF-8 encoded string.
  */
 function stringToBuffer(str: string): Uint8Array {
-  const data = new Uint8Array(BSON.ByteUtils.utf8ByteLength(str));
-  BSON.ByteUtils.encodeUTF8Into(data, str, 0);
+  const data = new Uint8Array(ByteUtils.utf8ByteLength(str));
+  ByteUtils.encodeUTF8Into(data, str, 0);
   return data;
 }
 
@@ -189,7 +189,7 @@ export async function aws4Sign(
 
   // 5. Calculate the signature
   const signatureBuffer = await getHmacSha256(signingKey, stringToSign);
-  const signature = BSON.ByteUtils.toHex(signatureBuffer);
+  const signature = ByteUtils.toHex(signatureBuffer);
 
   // 6. Add the signature to the request
   // Calculate the Authorization header

src/cmap/auth/mongodb_aws.ts

@@ -1,4 +1,4 @@
-import type { Binary, BSONSerializeOptions } from '../../bson';
+import { type Binary, type BSONSerializeOptions, ByteUtils } from '../../bson';
 import * as BSON from '../../bson';
 import {
   MongoCompatibilityError,
@@ -92,7 +92,7 @@ export class MongoDBAWS extends AuthProvider {
       throw new MongoRuntimeError(`Invalid server nonce length ${serverNonce.length}, expected 64`);
     }
 
-    if (!BSON.ByteUtils.equals(serverNonce.subarray(0, nonce.byteLength), nonce)) {
+    if (!ByteUtils.equals(serverNonce.subarray(0, nonce.byteLength), nonce)) {
       // throw because the serverNonce's leading 32 bytes must equal the client nonce's 32 bytes
       // https://github.com/mongodb/specifications/blob/master/source/auth/auth.md#conversation-5
 
@@ -115,7 +115,7 @@ export class MongoDBAWS extends AuthProvider {
         headers: {
           'Content-Type': 'application/x-www-form-urlencoded',
           'Content-Length': body.length,
-          'X-MongoDB-Server-Nonce': BSON.ByteUtils.toBase64(serverNonce),
+          'X-MongoDB-Server-Nonce': ByteUtils.toBase64(serverNonce),
           'X-MongoDB-GS2-CB-Flag': 'n'
         },
         path: '/',

src/cmap/commands.ts

@@ -5,7 +5,8 @@ import {
   type Document,
   type Long,
   NumberUtils,
-  readInt32LE
+  readInt32LE,
+  readUint32LE
 } from '../bson';
 import { MongoInvalidArgumentError, MongoRuntimeError } from '../error';
 import { type ReadPreference } from '../read_preference';
@@ -37,7 +38,7 @@ const QUERY_FAILURE = 2;
 const SHARD_CONFIG_STALE = 4;
 const AWAIT_CAPABLE = 8;
 
-const encodeUTF8Into = BSON.ByteUtils.encodeUTF8Into;
+const encodeUTF8Into = ByteUtils.encodeUTF8Into;
 
 /** @internal */
 export type WriteProtocolMessageType = OpQueryRequest | OpMsgRequest;
@@ -715,7 +716,7 @@ export class OpMsgResponse {
     while (this.index < this.data.length) {
       const payloadType = this.data[this.index++];
       if (payloadType === 0) {
-        const bsonSize = readInt32LE(this.data, this.index);
+        const bsonSize = readUint32LE(this.data, this.index);
         const bin = this.data.subarray(this.index, this.index + bsonSize);
 
         this.sections.push(bin);

src/cmap/connection.ts

@@ -176,7 +176,7 @@ function streamIdentifier(stream: Stream, options: ConnectionOptions): string {
     return HostAddress.fromHostPort(remoteAddress, remotePort).toString();
   }
 
-  return BSON.ByteUtils.toHex(uuidV4());
+  return ByteUtils.toHex(uuidV4());
 }
 
 /** @internal */

src/cmap/handshake/client_metadata.ts

@@ -1,7 +1,7 @@
 import * as os from 'os';
 import * as process from 'process';
 
-import { BSON, ByteUtils, type Document, Int32 } from '../../bson';
+import { BSON, ByteUtils, type Document, Int32, NumberUtils } from '../../bson';
 import { MongoInvalidArgumentError } from '../../error';
 import type { DriverInfo, MongoOptions } from '../../mongo_client';
 import { fileIsAccessible } from '../../utils';
@@ -114,7 +114,7 @@ export async function makeClientMetadata(
   // Add app name first, it must be sent
   if (appName.length > 0) {
     const name =
-      BSON.ByteUtils.utf8ByteLength(appName) <= 128
+      ByteUtils.utf8ByteLength(appName) <= 128
         ? appName
         : ByteUtils.toUTF8(ByteUtils.fromUTF8(appName), 0, 128, false);
     metadataDocument.ifItFitsItSits('application', { name });
@@ -336,7 +336,7 @@ declare const Bun: { (): void; version?: string } | undefined;
  * with a future change to these global objects.
  */
 function getRuntimeInfo(): string {
-  const endianness = BSON.NumberUtils.isBigEndian ? 'BE' : 'LE';
+  const endianness = NumberUtils.isBigEndian ? 'BE' : 'LE';
   if ('Deno' in globalThis) {
     const version = typeof Deno?.version?.deno === 'string' ? Deno?.version?.deno : '0.0.0-unknown';