chore: revert timeout move

Author: nbbeeken

src/sdam/topology.ts

@@ -559,6 +559,11 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
         new ServerSelectionStartedEvent(selector, this.description, options.operationName)
       );
     }
+    let timeout;
+    if (options.timeoutContext) timeout = options.timeoutContext.serverSelectionTimeout;
+    else {
+      timeout = Timeout.expires(options.serverSelectionTimeoutMS ?? 0);
+    }
 
     const isSharded = this.description.type === TopologyType.Sharded;
     const session = options.session;
@@ -581,16 +586,10 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
           )
         );
       }
-
+      if (options.timeoutContext?.clearServerSelectionTimeout) timeout?.clear();
       return transaction.server;
     }
 
-    let timeout;
-    if (options.timeoutContext) timeout = options.timeoutContext.serverSelectionTimeout;
-    else {
-      timeout = Timeout.expires(options.serverSelectionTimeoutMS ?? 0);
-    }
-
     const { promise: serverPromise, resolve, reject } = promiseWithResolvers<Server>();
 
     const waitQueueMember: ServerSelectionRequest = {

test/integration/node-specific/abort_signal.test.ts

@@ -793,8 +793,9 @@ describe('AbortSignal support', () => {
     describe('if reauth throws', () => {
       beforeEach(() => {
         sinon.stub(ConnectionPool.prototype, 'reauthenticate').callsFake(async function () {
+          const error = new Error('Rejecting reauthenticate for testing');
           await sleep(1000);
-          throw new Error('Rejecting reauthenticate for testing');
+          throw error;
         });
       });