fix: prevent extra iterations occurring on retryOrTimeout

Author: Codex-

src/api.spec.ts

@@ -681,8 +681,7 @@ describe("API", () => {
       const attempt = () => Promise.resolve([]);
 
       const retryOrTimeoutPromise = retryOrTimeout(attempt, 1000);
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      vi.advanceTimersByTimeAsync(2000);
+      await vi.advanceTimersByTimeAsync(2000);
 
       const result = await retryOrTimeoutPromise;
       if (result.success) {
@@ -701,8 +700,7 @@ describe("API", () => {
         .mockResolvedValueOnce([]);
 
       const retryOrDiePromise = retryOrTimeout(attempt, 5000);
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      vi.advanceTimersByTimeAsync(3000);
+      await vi.advanceTimersByTimeAsync(3000);
 
       const result = await retryOrDiePromise;
       if (!result.success) {
@@ -713,5 +711,25 @@ describe("API", () => {
       expect(result.value).toStrictEqual(attemptResult);
       expect(attempt).toHaveBeenCalledTimes(3);
     });
+
+    it("should iterate only once if timed out", async () => {
+      const attempt = vi.fn(() => Promise.resolve([]));
+
+      const retryOrTimeoutPromise = retryOrTimeout(attempt, 1000);
+
+      expect(attempt).toHaveBeenCalledOnce();
+
+      await vi.advanceTimersByTimeAsync(2000);
+
+      const result = await retryOrTimeoutPromise;
+
+      if (result.success) {
+        expect.fail("expected retryOrTimeout to timeout");
+      }
+      expect(attempt).toHaveBeenCalledOnce();
+
+      expect(result.success).toStrictEqual(false);
+      expect(result.reason).toStrictEqual("timeout");
+    });
   });
 });

src/api.ts

@@ -269,14 +269,13 @@ export async function retryOrTimeout<T>(
   const startTime = Date.now();
   let elapsedTime = 0;
   while (elapsedTime < timeoutMs) {
-    elapsedTime = Date.now() - startTime;
-
     const response = await retryFunc();
     if (response.length > 0) {
       return { success: true, value: response };
     }
 
     await sleep(1000);
+    elapsedTime = Date.now() - startTime;
   }
 
   return { success: false, reason: "timeout" };