fix: unit test and frozen options usages

Author: nbbeeken

src/client-side-encryption/auto_encrypter.ts

@@ -310,7 +310,7 @@ export class AutoEncrypter {
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore: TS complains as this always returns true on versions where it is present.
       if (net.getDefaultAutoSelectFamily) {
-        Object.assign(clientOptions, autoSelectSocketOptions(this._client.options));
+        Object.assign(clientOptions, autoSelectSocketOptions(this._client.s.options));
       }
 
       this._mongocryptdClient = new MongoClient(this._mongocryptdManager.uri, clientOptions);
@@ -392,7 +392,7 @@ export class AutoEncrypter {
       promoteLongs: false,
       proxyOptions: this._proxyOptions,
       tlsOptions: this._tlsOptions,
-      socketOptions: autoSelectSocketOptions(this._client.options)
+      socketOptions: autoSelectSocketOptions(this._client.s.options
     });
 
     return deserialize(await stateMachine.execute(this, context), {
@@ -413,7 +413,7 @@ export class AutoEncrypter {
       ...options,
       proxyOptions: this._proxyOptions,
       tlsOptions: this._tlsOptions,
-      socketOptions: autoSelectSocketOptions(this._client.options)
+      socketOptions: autoSelectSocketOptions(this._client.s.options)
     });
 
     return await stateMachine.execute(this, context);

src/client-side-encryption/client_encryption.ts

@@ -217,7 +217,7 @@ export class ClientEncryption {
     const stateMachine = new StateMachine({
       proxyOptions: this._proxyOptions,
       tlsOptions: this._tlsOptions,
-      socketOptions: autoSelectSocketOptions(this._client.options)
+      socketOptions: autoSelectSocketOptions(this._client.s.options)
     });
 
     const dataKey = deserialize(await stateMachine.execute(this, context)) as DataKey;
@@ -275,7 +275,7 @@ export class ClientEncryption {
     const stateMachine = new StateMachine({
       proxyOptions: this._proxyOptions,
       tlsOptions: this._tlsOptions,
-      socketOptions: autoSelectSocketOptions(this._client.options)
+      socketOptions: autoSelectSocketOptions(this._client.s.options)
     });
 
     const timeoutContext = TimeoutContext.create(
@@ -664,7 +664,7 @@ export class ClientEncryption {
     const stateMachine = new StateMachine({
       proxyOptions: this._proxyOptions,
       tlsOptions: this._tlsOptions,
-      socketOptions: autoSelectSocketOptions(this._client.options)
+      socketOptions: autoSelectSocketOptions(this._client.s.options)
     });
 
     const { v } = deserialize(await stateMachine.execute(this, context));
@@ -743,7 +743,7 @@ export class ClientEncryption {
     const stateMachine = new StateMachine({
       proxyOptions: this._proxyOptions,
       tlsOptions: this._tlsOptions,
-      socketOptions: autoSelectSocketOptions(this._client.options)
+      socketOptions: autoSelectSocketOptions(this._client.s.options)
     });
     const context = this._mongoCrypt.makeExplicitEncryptionContext(valueBuffer, contextOptions);
 

src/cursor/abstract_cursor.ts

@@ -833,7 +833,7 @@ export abstract class AbstractCursor<
     if (this.cursorOptions.timeoutMS != null) {
       this.timeoutContext ??= new CursorTimeoutContext(
         TimeoutContext.create({
-          serverSelectionTimeoutMS: this.client.options.serverSelectionTimeoutMS,
+          serverSelectionTimeoutMS: this.client.s.options.serverSelectionTimeoutMS,
           timeoutMS: this.cursorOptions.timeoutMS
         }),
         this
@@ -923,7 +923,7 @@ export abstract class AbstractCursor<
         this.timeoutContext?.clear();
         return new CursorTimeoutContext(
           TimeoutContext.create({
-            serverSelectionTimeoutMS: this.client.options.serverSelectionTimeoutMS,
+            serverSelectionTimeoutMS: this.client.s.options.serverSelectionTimeoutMS,
             timeoutMS
           }),
           this

src/gridfs/index.ts

@@ -161,7 +161,7 @@ export class GridFSBucket extends TypedEventEmitter<GridFSBucketEvents> {
     if (timeoutMS) {
       timeoutContext = new CSOTTimeoutContext({
         timeoutMS,
-        serverSelectionTimeoutMS: this.s.db.client.options.serverSelectionTimeoutMS
+        serverSelectionTimeoutMS: this.s.db.client.s.options.serverSelectionTimeoutMS
       });
     }
 
@@ -241,7 +241,7 @@ export class GridFSBucket extends TypedEventEmitter<GridFSBucketEvents> {
     if (timeoutMS) {
       timeoutContext = new CSOTTimeoutContext({
         timeoutMS,
-        serverSelectionTimeoutMS: this.s.db.client.options.serverSelectionTimeoutMS
+        serverSelectionTimeoutMS: this.s.db.client.s.options.serverSelectionTimeoutMS
       });
     }
 

src/gridfs/upload.ts

@@ -143,7 +143,7 @@ export class GridFSBucketWriteStream extends Writable {
     if (options.timeoutMS != null)
       this.timeoutContext = new CSOTTimeoutContext({
         timeoutMS: options.timeoutMS,
-        serverSelectionTimeoutMS: this.bucket.s.db.client.options.serverSelectionTimeoutMS
+        serverSelectionTimeoutMS: this.bucket.s.db.client.s.options.serverSelectionTimeoutMS
       });
   }
 

src/operations/client_bulk_write/executor.ts

@@ -56,7 +56,7 @@ export class ClientBulkWriteExecutor {
 
     // If no write concern was provided, we inherit one from the client.
     if (!this.options.writeConcern) {
-      this.options.writeConcern = WriteConcern.fromOptions(this.client.options);
+      this.options.writeConcern = WriteConcern.fromOptions(this.client.s.options);
     }
 
     if (this.options.writeConcern?.w === 0) {

src/operations/create_collection.ts

@@ -137,7 +137,7 @@ export class CreateCollectionOperation extends CommandOperation<Collection> {
 
     const encryptedFields: Document | undefined =
       options.encryptedFields ??
-      db.client.options.autoEncryption?.encryptedFieldsMap?.[`${db.databaseName}.${name}`];
+      db.client.s.options.autoEncryption?.encryptedFieldsMap?.[`${db.databaseName}.${name}`];
 
     if (encryptedFields) {
       // Creating a QE collection required min server of 7.0.0

src/operations/drop.ts

@@ -39,7 +39,7 @@ export class DropCollectionOperation extends CommandOperation<boolean> {
     const options = this.options;
     const name = this.name;
 
-    const encryptedFieldsMap = db.client.options.autoEncryption?.encryptedFieldsMap;
+    const encryptedFieldsMap = db.client.s.options.autoEncryption?.encryptedFieldsMap;
     let encryptedFields: Document | undefined =
       options.encryptedFields ?? encryptedFieldsMap?.[`${db.databaseName}.${name}`];
 

test/unit/client-side-encryption/client_encryption.test.ts

@@ -20,9 +20,11 @@ const { EJSON } = BSON;
 
 class MockClient {
   options: any;
+  s: { options: any };
 
   constructor(options?: any) {
     this.options = { options: options || {} };
+    this.s = { options: this.options };
   }
   db(dbName) {
     return {