mongodb 7.5.0 → 7.6.0

package/src/runtime_adapters.ts

@@ -1,8 +1,9 @@
 /* eslint-disable no-restricted-imports*/
 
-// We squash the restricted import errors here because we are using type-only imports, which
-// do not impact the driver's actual runtime dependencies.
-// We also allow restricted imports in this file, because we expect this file to be the only place actually importing restricted Node APIs.
+// We squash the restricted import errors here: the module-scope imports are type-only, and the
+// one runtime dependency this file takes — the dynamic `import('os')` fallback in
+// resolveRuntimeAdapters — is deliberate: this file is expected to be the only place that loads
+// restricted Node APIs at runtime.
 
 import type * as os from 'os';
 
@@ -11,8 +12,9 @@ import { type MongoClientOptions } from './mongo_client';
 /**
  * @internal
  *
- * This propery can be set on the global object to allow the driver to require otherwise blocked modules.
- * This is used by our test suite to allow tests to access the `os` module without allowing user code to do so.
+ * Legacy escape hatch for the test sandbox's restricted `require`: the driver no longer sets this
+ * property (the os adapter loads via dynamic `import()`), but the vm test harness
+ * still checks it. Kept until the sandbox contract is revisited in a follow-up.
  */
 export const ALLOWED_DRIVER_REQUIRE_PROPERTY_NAME = 'allowedDriverRequire';
 
@@ -47,18 +49,17 @@ export interface Runtime {
 /**
  * @internal
  *
- * Given a MongoClientOptions, this function resolves the set of runtime options, providing Nodejs implementations if
- * not provided by in `options`, and returns a `Runtime`.
+ * Given a MongoClientOptions, this function resolves the set of runtime options, providing Nodejs
+ * implementations if not provided in `options`, and returns a `Runtime`.
+ *
+ * Resolution is asynchronous because the default `os` adapter is loaded via a dynamic `import()`.
+ * Unlike `require`, dynamic import exists in every module system the driver ships into or is
+ * bundled into (CJS, ESM, and bundled ESM output), and the literal specifier keeps it
+ * statically analyzable for bundlers. The promise is created during synchronous
+ * options parsing and awaited later by consumers, so the public constructor stays synchronous.
  */
-export function resolveRuntimeAdapters(options: MongoClientOptions): Runtime {
-  (globalThis as any)[ALLOWED_DRIVER_REQUIRE_PROPERTY_NAME] = true;
-  try {
-    const runtime = {
-      // eslint-disable-next-line @typescript-eslint/no-require-imports
-      os: options.runtimeAdapters?.os ?? require('os')
-    };
-    return runtime;
-  } finally {
-    (globalThis as any)[ALLOWED_DRIVER_REQUIRE_PROPERTY_NAME] = false;
-  }
+export async function resolveRuntimeAdapters(options: MongoClientOptions): Promise<Runtime> {
+  return {
+    os: options.runtimeAdapters?.os ?? (await import('os'))
+  };
 }

package/src/sdam/server.ts

@@ -494,7 +494,7 @@ export class Server extends TypedEventEmitter<ServerEvents> {
     } else {
       if (
         (isRetryableWritesEnabled(this.topology) || isTransactionCommand(cmd)) &&
-        needsRetryableWriteLabel(error, maxWireVersion(this), this.description.type) &&
+        needsRetryableWriteLabel(error) &&
         !inActiveTransaction(session, cmd)
       ) {
         error.addErrorLabel(MongoErrorLabel.RetryableWriteError);

package/src/sessions.ts

@@ -771,7 +771,7 @@ export class ClientSession
       ) {
         // 2. If `transactionAttempt` > 0:
         if (isRetry) {
-          // 2.1 Calculate backoffMS to be jitter * min(BACKOFF_INITIAL * 1.5 ** (transactionAttempt - 1), BACKOFF_MAX).
+          // 2.1 Calculate backoffMS to be jitter * min(BACKOFF_INITIAL * 1.5 ** (transactionAttempt), BACKOFF_MAX).
           //  If elapsed time + backoffMS > TIMEOUT_MS, then propagate the previously encountered error to the caller of
           //  withTransaction as per timeout error propagation and return immediately. Otherwise, sleep for backoffMS.
           //  2.1.1 jitter is a random float between [0, 1), optionally including 1, depending on what is most natural
@@ -785,10 +785,7 @@ export class ClientSession
           const jitter = Math.random();
           const backoffMS =
             jitter *
-            Math.min(
-              BACKOFF_INITIAL_MS * BACKOFF_GROWTH ** (transactionAttempt - 1),
-              BACKOFF_MAX_MS
-            );
+            Math.min(BACKOFF_INITIAL_MS * BACKOFF_GROWTH ** transactionAttempt, BACKOFF_MAX_MS);
 
           if (processTimeMS() + backoffMS >= deadline) {
             throw makeTimeoutError(

package/src/utils.ts

@@ -343,9 +343,7 @@ export function maxWireVersion(handshakeAware?: Connection | Topology | Server):
     // object being checked will be a connection, and we will have a hello response on
     // it. For other cases, such as retryable writes, the object will be a server or
     // topology, and there will be no hello response on those objects, so we return
-    // the max wire version so we support retryability. Once we have a min supported
-    // wire version of 9, then the needsRetryableWriteLabel() check can remove the
-    // usage of passing the wire version into it.
+    // the max wire version so we support retryability.
     if (handshakeAware.loadBalanced) {
       return MAX_SUPPORTED_WIRE_VERSION;
     }

package/tsconfig.json

@@ -5,8 +5,15 @@
     "strict": true,
     "alwaysStrict": true,
     "target": "ES2023",
-    "module": "commonJS",
-    "moduleResolution": "node",
+    // node16 still emits CommonJS for this package (no "type": "module") but, unlike
+    // `module: commonjs`, models Node's real semantics: dynamic `import()` is legal inside CJS
+    // and is preserved verbatim instead of being downleveled to `require()` (NODE-7603).
+    "module": "node16",
+    "moduleResolution": "node16",
+    // node16 defaults esModuleInterop on; keep it off to preserve this package's historical
+    // emit exactly (`import * as x` stays `const x = require(...)`, no __importStar wrappers —
+    // which sinon-based module stubbing in the test suite also relies on).
+    "esModuleInterop": false,
     "skipLibCheck": true,
     "lib": [
       "es2023"