fix CI

Author: baileympearson

src/index.ts

@@ -540,7 +540,12 @@ export type {
 export type { InsertManyResult, InsertOneOptions, InsertOneResult } from './operations/insert';
 export type { CollectionInfo, ListCollectionsOptions } from './operations/list_collections';
 export type { ListDatabasesOptions, ListDatabasesResult } from './operations/list_databases';
-export type { AbstractOperation, Hint, OperationOptions } from './operations/operation';
+export type {
+  AbstractOperation,
+  Hint,
+  OperationOptions,
+  RetryContext
+} from './operations/operation';
 export type { ProfilingLevelOptions } from './operations/profiling_level';
 export type { RemoveUserOptions } from './operations/remove_user';
 export type { RenameOptions } from './operations/rename';

src/operations/execute_operation.ts

@@ -254,7 +254,10 @@ async function executeOperationWithRetries<
     2 // backoff rate
   );
 
-  const retryContext = new RetryContext(willRetry, timeoutContext.csotEnabled() ? Infinity : 2);
+  const retryContext = new RetryContext(
+    willRetry,
+    willRetry ? (timeoutContext.csotEnabled() ? Infinity : 2) : 1
+  );
 
   for (; retryContext.shouldRetry(); retryContext.recordFailure(previousOperationError)) {
     if (previousOperationError) {
@@ -266,14 +269,18 @@ async function executeOperationWithRetries<
         });
       }
 
+      // TODO: think about whether or not willRetry checks are necessary here.
       const isRetryable =
         // bulk write commands are retryable if all operations in the batch are retryable
-        (operation.hasAspect(Aspect.COMMAND_BATCHING) && operation.canRetryWrite) ||
+        (willRetryWrite &&
+          operation.hasAspect(Aspect.COMMAND_BATCHING) &&
+          operation.canRetryWrite) ||
         // if we have a retryable read or write operation, we can retry
         (hasWriteAspect && willRetryWrite && isRetryableWriteError(previousOperationError)) ||
         (hasReadAspect && willRetryRead && isRetryableReadError(previousOperationError)) ||
         // if we have a retryable, system overloaded error, we can retry
-        (previousOperationError.hasErrorLabel(MongoErrorLabel.SystemOverloadedError) &&
+        (willRetry &&
+          previousOperationError.hasErrorLabel(MongoErrorLabel.SystemOverloadedError) &&
           previousOperationError.hasErrorLabel(MongoErrorLabel.RetryableError));
 
       if (!isRetryable) {

src/operations/operation.ts

@@ -1,6 +1,7 @@
-import { type Connection, type MongoError, MongoErrorLabel } from '..';
+import { type Connection, type MongoError } from '..';
 import { type BSONSerializeOptions, type Document, resolveBSONOptions } from '../bson';
 import { type MongoDBResponse } from '../cmap/wire_protocol/responses';
+import { MongoErrorLabel } from '../error';
 import { type Abortable } from '../mongo_types';
 import { ReadPreference, type ReadPreferenceLike } from '../read_preference';
 import type { Server, ServerCommandOptions } from '../sdam/server';

test/unit/assorted/imports.test.ts

@@ -15,7 +15,7 @@ function* walk(root) {
   }
 }
 
-describe('importing mongodb driver', () => {
+describe.only('importing mongodb driver', () => {
   const sourceFiles = walk(path.resolve(__dirname, '../../../src'));
 
   for (const sourceFile of sourceFiles) {