wip

Author: W-A-James

src/client-side-encryption/auto_encrypter.ts

@@ -160,6 +160,7 @@ export class AutoEncrypter {
   _mongocrypt: MongoCrypt;
 
   /**
+   * @internal
    * Used by devtools to enable decorating decryption results.
    *
    * When set and enabled, `decrypt` will automatically recursively

src/cmap/connection.ts

@@ -889,7 +889,7 @@ export class CryptoConnection extends Connection {
 
     const decryptedResponse = responseType?.make(result) ?? deserialize(result, options);
 
-    if (autoEncrypter[kDecorateResult]) {
+    if (autoEncrypter.__decorateDecryptionResult) {
       if (responseType == null) {
         decorateDecryptionResult(decryptedResponse, encryptedResponse.toObject(), true);
       } else if (decryptedResponse instanceof CursorResponse) {

src/cmap/wire_protocol/responses.ts

@@ -221,9 +221,9 @@ export class MongoDBResponse extends OnDemandDocument {
 export class CursorResponse extends MongoDBResponse {
   /**
    * Devtools need to know which keys were encrypted before the driver automatically decrypted them.
-   * If decorating is enabled (`Symbol.for('@@mdb.decorateDecryptionResult')`), this field will be set,
+   * If decorating is enabled (`__decorateDecryptionResult`), this field will be set,
    * storing the original encrypted response from the server, so that we can build an object that has
-   * the list of BSON keys that were encrypted stored at a well known symbol: `Symbol.for('@@mdb.decryptedKeys')`.
+   * the list of BSON keys that were encrypted stored at a well known symbol: `__decryptedKeys`.
    */
   encryptedResponse?: MongoDBResponse;
   /**

src/connection_string.ts

@@ -249,13 +249,6 @@ export function parseOptions(
 
   const mongoOptions = Object.create(null);
 
-  // Feature flags
-  for (const flag of Object.getOwnPropertySymbols(options)) {
-    if (FEATURE_FLAGS.has(flag)) {
-      mongoOptions[flag] = options[flag];
-    }
-  }
-
   mongoOptions.hosts = isSRV ? [] : hosts.map(HostAddress.fromString);
 
   const urlOptions = new CaseInsensitiveMap<unknown[]>();
@@ -515,7 +508,7 @@ export function parseOptions(
     );
   }
 
-  const loggerFeatureFlag = Symbol.for('@@mdb.enableMongoLogger');
+  const loggerFeatureFlag = '__enableMongoLogger';
   mongoOptions[loggerFeatureFlag] = mongoOptions[loggerFeatureFlag] ?? false;
 
   let loggerEnvOptions: MongoLoggerEnvOptions = {};
@@ -530,7 +523,7 @@ export function parseOptions(
       MONGODB_LOG_ALL: process.env.MONGODB_LOG_ALL,
       MONGODB_LOG_MAX_DOCUMENT_LENGTH: process.env.MONGODB_LOG_MAX_DOCUMENT_LENGTH,
       MONGODB_LOG_PATH: process.env.MONGODB_LOG_PATH,
-      ...mongoOptions[Symbol.for('@@mdb.internalLoggerConfig')]
+      ...mongoOptions['__internalLoggerConfig']
     };
     loggerClientOptions = {
       mongodbLogPath: mongoOptions.mongodbLogPath,
@@ -1331,7 +1324,7 @@ export const DEFAULT_OPTIONS = new CaseInsensitiveMap(
  * @internal
  */
 export const FEATURE_FLAGS = new Set([
-  Symbol.for('@@mdb.skipPingOnConnect'),
-  Symbol.for('@@mdb.enableMongoLogger'),
-  Symbol.for('@@mdb.internalLoggerConfig')
+  '__skipPingOnConnect',
+  '__enableMongoLogger',
+  '__internalLoggerConfig'
 ]);

src/constants.ts

@@ -172,6 +172,6 @@ export const LEGACY_HELLO_COMMAND_CAMEL_CASE = 'isMaster';
 // the objects (and class) that we expect to see them on and prevent TS
 // errors.
 /** @internal */
-export const kDecorateResult = Symbol.for('@@mdb.decorateDecryptionResult');
+export const kDecorateResult = '__decorateDecryptionResult';
 /** @internal */
-export const kDecoratedKeys = Symbol.for('@@mdb.decryptedKeys');
+export const kDecoratedKeys = '__decryptedKeys';

src/mongo_client.ts

@@ -299,7 +299,11 @@ export interface MongoClientOptions extends BSONSerializeOptions, SupportedNodeC
   mongodbLogMaxDocumentLength?: number;
 
   /** @internal */
-  [featureFlag: symbol]: any;
+  __skipPingOnConnect?: boolean;
+  /** @internal */
+  __internalLoggerConfig?: any;
+  /** @internal */
+  __enableMongoLogger?: boolean;
 }
 
 /** @public */

src/operations/execute_operation.ts

@@ -131,7 +131,7 @@ async function autoConnect(client: MongoClient): Promise<Topology> {
     if (client.s.hasBeenClosed) {
       throw new MongoNotConnectedError('Client must be connected before running operations');
     }
-    client.s.options[Symbol.for('@@mdb.skipPingOnConnect')] = true;
+    client.s.options[__skipPingOnConnect] = true;
     try {
       await client.connect();
       if (client.topology == null) {
@@ -141,7 +141,7 @@ async function autoConnect(client: MongoClient): Promise<Topology> {
       }
       return client.topology;
     } finally {
-      delete client.s.options[Symbol.for('@@mdb.skipPingOnConnect')];
+      delete client.s.options[__skipPingOnConnect];
     }
   }
   return client.topology;

src/sdam/topology.ts

@@ -471,7 +471,7 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
         readPreferenceServerSelector(readPreference),
         selectServerOptions
       );
-      const skipPingOnConnect = this.s.options[Symbol.for('@@mdb.skipPingOnConnect')] === true;
+      const skipPingOnConnect = this.s.options[__skipPingOnConnect] === true;
       if (!skipPingOnConnect && this.s.credentials) {
         await server.command(ns('admin.$cmd'), { ping: 1 }, { timeoutContext });
         stateTransition(this, STATE_CONNECTED);

test/integration/client-side-encryption/client_side_encryption.prose.12.deadlock.test.ts

@@ -34,7 +34,7 @@ class CapturingMongoClient extends MongoClient {
   commandStartedEvents: Array<CommandStartedEvent> = [];
   clientsCreated = 0;
   constructor(url: string, options: MongoClientOptions = {}) {
-    options = { ...options, monitorCommands: true, [Symbol.for('@@mdb.skipPingOnConnect')]: true };
+    options = { ...options, monitorCommands: true, [__skipPingOnConnect]: true };
     if (process.env.MONGODB_API_VERSION) {
       options.serverApi = process.env.MONGODB_API_VERSION as MongoClientOptions['serverApi'];
     }

test/integration/client-side-encryption/driver.test.ts

@@ -394,7 +394,7 @@ describe('Client Side Encryption Functional', function () {
           }
         );
 
-        encryptedClient.autoEncrypter[Symbol.for('@@mdb.decorateDecryptionResult')] = true;
+        encryptedClient.autoEncrypter[__decorateDecryptionResult] = true;
         await encryptedClient.connect();
       });
 
@@ -418,13 +418,13 @@ describe('Client Side Encryption Functional', function () {
 
         expect(decrypted).to.deep.equal(data);
         expect(decrypted)
-          .to.have.property(Symbol.for('@@mdb.decryptedKeys'))
+          .to.have.property(__decryptedKeys)
           .that.deep.equals(['a', 'b']);
 
         // Nested
         expect(decrypted).to.have.property('c');
         expect(decrypted.c)
-          .to.have.property(Symbol.for('@@mdb.decryptedKeys'))
+          .to.have.property(__decryptedKeys)
           .that.deep.equals(['d']);
       });
     }