Implement spec runner changes

Author: W-A-James

src/cmap/connection_pool.ts

@@ -388,6 +388,7 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
       }
     } else {
       timeout = Timeout.expires(waitQueueTimeoutMS);
+      clearTimeout = true;
     }
 
     const waitQueueMember: WaitQueueMember = {

src/error.ts

@@ -768,6 +768,15 @@ export class MongoOperationTimeoutError extends MongoRuntimeError {
   }
 }
 
+/**
+ * @internal
+ */
+export class MongoOperationTimeoutError extends MongoRuntimeError {
+  override get name(): string {
+    return 'MongoOperationTimeoutError';
+  }
+}
+
 /**
  * An error thrown when the user attempts to add options to a cursor that has already been
  * initialized

src/operations/find.ts

@@ -112,8 +112,7 @@ export class FindOperation extends CommandOperation<Document> {
         ...this.options,
         ...this.bsonOptions,
         documentsReturnedIn: 'firstBatch',
-        session,
-        timeout: this.timeout
+        sessiontimeout: this.timeout
       },
       undefined
     );

src/operations/operation.ts

@@ -67,6 +67,9 @@ export abstract class AbstractOperation<TResult = any> {
   /** @internal */
   timeoutMS?: number;
 
+  /** @internal */
+  serverSelectionTimeout?: Timeout;
+
   [kSession]: ClientSession | undefined;
 
   constructor(options: OperationOptions = {}) {

src/sdam/topology.ts

@@ -565,6 +565,7 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
     }
     const serverSelectionTimeoutMS = options.serverSelectionTimeoutMS ?? 0;
     let timeout: Timeout | null;
+
     if (options.timeout) {
       // CSOT Enabled
       if (options.timeout.duration > 0 || serverSelectionTimeoutMS > 0) {
@@ -581,6 +582,7 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
       }
     } else {
       timeout = Timeout.expires(serverSelectionTimeoutMS);
+      clearTimeout = true;
     }
 
     const isSharded = this.description.type === TopologyType.Sharded;

test/tools/unified-spec-runner/match.ts

@@ -23,6 +23,7 @@ import {
   type Document,
   Long,
   MongoError,
+  MongoOperationTimeoutError,
   MongoServerError,
   ObjectId,
   type OneOrMore,
@@ -96,6 +97,19 @@ export function isMatchAsRootOperator(value: unknown): value is MatchAsRootOpera
   return typeof value === 'object' && value != null && '$$matchAsRoot' in value;
 }
 
+export interface LteOperator {
+  $$lte: number;
+}
+
+export function isLteOperator(value: unknown): value is LteOperator {
+  return (
+    typeof value === 'object' &&
+    value != null &&
+    '$$lte' in value &&
+    typeof value['$$lte'] === 'number'
+  );
+}
+
 export const SpecialOperatorKeys = [
   '$$exists',
   '$$type',
@@ -104,7 +118,8 @@ export const SpecialOperatorKeys = [
   '$$matchAsRoot',
   '$$matchAsDocument',
   '$$unsetOrMatches',
-  '$$sessionLsid'
+  '$$sessionLsid',
+  '$$lte'
 ];
 
 export type SpecialOperator =
@@ -115,7 +130,8 @@ export type SpecialOperator =
   | UnsetOrMatchesOperator
   | SessionLsidOperator
   | MatchAsDocumentOperator
-  | MatchAsRootOperator;
+  | MatchAsRootOperator
+  | LteOperator;
 
 type KeysOfUnion<T> = T extends object ? keyof T : never;
 export type SpecialOperatorKey = KeysOfUnion<SpecialOperator>;
@@ -128,7 +144,8 @@ export function isSpecialOperator(value: unknown): value is SpecialOperator {
     isUnsetOrMatchesOperator(value) ||
     isSessionLsidOperator(value) ||
     isMatchAsRootOperator(value) ||
-    isMatchAsDocumentOperator(value)
+    isMatchAsDocumentOperator(value) ||
+    isLteOperator(value)
   );
 }
 
@@ -377,6 +394,9 @@ export function specialCheck(
     );
 
     resultCheck(actual, expected.$$matchAsRoot as any, entities, path, false);
+  } else if (isLteOperator(expected)) {
+    expect(typeof actual).to.equal('number');
+    expect(actual).to.be.lte(expected.$$lte);
   } else {
     expect.fail(`Unknown special operator: ${JSON.stringify(expected)}`);
   }
@@ -736,6 +756,12 @@ export function expectErrorCheck(
     expect(error).not.to.be.instanceOf(MongoServerError);
   }
 
+  if (expected.isTimeoutError === false) {
+    expect(error).to.not.be.instanceof(MongoOperationTimeoutError);
+  } else if (expected.isTimeoutError === true) {
+    expect(error).to.be.instanceof(MongoOperationTimeoutError);
+  }
+
   if (expected.errorContains != null) {
     expect(error.message.toLowerCase(), expectMessage.toLowerCase()).to.include(
       expected.errorContains.toLowerCase()

test/tools/unified-spec-runner/schema.ts

@@ -364,6 +364,7 @@ export interface StoreEventsAsEntity {
 }
 export interface ExpectedError {
   isError?: true;
+  isTimeoutError?: boolean;
   isClientError?: boolean;
   errorContains?: string;
   errorCode?: number;