From 64dc50f3fbb3245a34b79fdb3c59cf71dc7c718a Mon Sep 17 00:00:00 2001
From: Rod Boev <rod.boev@gmail.com>
Date: Thu, 5 Feb 2026 10:38:11 -0500
Subject: [PATCH] Restructure fetchWithTimeout to clear timer on all paths

Replace Promise.race with new Promise wrapper so timeoutId is assigned
as const before fetch starts. Timer is now cleared on both fetch success
and fetch rejection, not just success.
---
 src/shared/worker-utils.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/shared/worker-utils.ts b/src/shared/worker-utils.ts
index e83b7b4b..a8b77fca 100644
--- a/src/shared/worker-utils.ts
+++ b/src/shared/worker-utils.ts
@@ -17,16 +17,16 @@ const HEALTH_CHECK_TIMEOUT_MS = getTimeout(HOOK_TIMEOUTS.HEALTH_CHECK);
  * The orphaned fetch is harmless since the process exits shortly after.
  */
 export function fetchWithTimeout(url: string, init: RequestInit = {}, timeoutMs: number): Promise<Response> {
-  let timeoutId: ReturnType<typeof setTimeout>;
-  return Promise.race([
-    fetch(url, init).then(response => {
-      clearTimeout(timeoutId);
-      return response;
-    }),
-    new Promise<never>((_, reject) => {
-      timeoutId = setTimeout(() => reject(new Error(`Request timed out after ${timeoutMs}ms`)), timeoutMs);
-    }),
-  ]);
+  return new Promise((resolve, reject) => {
+    const timeoutId = setTimeout(
+      () => reject(new Error(`Request timed out after ${timeoutMs}ms`)),
+      timeoutMs
+    );
+    fetch(url, init).then(
+      response => { clearTimeout(timeoutId); resolve(response); },
+      err => { clearTimeout(timeoutId); reject(err); }
+    );
+  });
 }
 
 // Cache to avoid repeated settings file reads