timeoutContext refresh fix

Author: W-A-James

src/cursor/abstract_cursor.ts

@@ -444,22 +444,20 @@ export abstract class AbstractCursor<
       throw new MongoCursorExhaustedError();
     }
 
-    try {
-      do {
-        const doc = this.documents?.shift(this.cursorOptions);
-        if (doc != null) {
-          if (this.transform != null) return await this.transformDocument(doc);
-          return doc;
-        }
-        await this.fetchBatch();
-      } while (!this.isDead || (this.documents?.length ?? 0) !== 0);
+    if (this.cursorOptions.timeoutMode === CursorTimeoutMode.ITERATION) {
+      this.timeoutContext?.refresh();
+    }
 
-      return null;
-    } finally {
-      if (this.cursorOptions.timeoutMode === CursorTimeoutMode.ITERATION) {
-        this.timeoutContext?.refresh();
+    do {
+      const doc = this.documents?.shift(this.cursorOptions);
+      if (doc != null) {
+        if (this.transform != null) return await this.transformDocument(doc);
+        return doc;
       }
-    }
+      await this.fetchBatch();
+    } while (!this.isDead || (this.documents?.length ?? 0) !== 0);
+
+    return null;
   }
 
   /**

src/timeout.ts

@@ -87,6 +87,7 @@ export class Timeout extends Promise<never> {
   clear(): void {
     clearTimeout(this.id);
     this.id = undefined;
+    this.timedOut = false;
     this.cleared = true;
   }
 
@@ -209,7 +210,6 @@ export class CSOTTimeoutContext extends TimeoutContext {
   }
 
   get maxTimeMS(): number {
-    console.log(this.remainingTimeMS, this.minRoundTripTime);
     return this.remainingTimeMS - this.minRoundTripTime;
   }
 
@@ -282,12 +282,14 @@ export class CSOTTimeoutContext extends TimeoutContext {
     this.start = Math.trunc(performance.now());
     this.minRoundTripTime = 0;
     this._serverSelectionTimeout?.clear();
-    this._connectionCheckoutTimeout?.clear();
+    this._serverSelectionTimeout = undefined;
+    this._connectionCheckoutTimeout = undefined;
   }
 
   clear(): void {
     this._serverSelectionTimeout?.clear();
-    this._connectionCheckoutTimeout?.clear();
+    this._serverSelectionTimeout = undefined;
+    this._connectionCheckoutTimeout = undefined;
   }
 }