Propagate web-search cancellation

docker/web-search/overrides/diagnostics.mjs

@@ -17,24 +17,22 @@ export async function attemptProvider(provider, query, limit, lang, options = {}
   const timeoutMs = Math.max(10, Math.min(options.timeoutMs || DEFAULT_TIMEOUT_MS, 60_000));
   const now = options.now || (() => performance.now());
   const started = now();
+  options.signal?.throwIfAborted();
   if (provider.configured === false) {
     return {
       items: [],
       diagnostic: { provider: provider.name, status: "unavailable", duration_ms: 0, result_count: 0 }
     };
   }
-  let timer;
   const controller = new AbortController();
+  const signal = options.signal
+    ? AbortSignal.any([options.signal, controller.signal])
+    : controller.signal;
+  const timer = setTimeout(() => {
+    controller.abort(new Error(`provider timed out after ${timeoutMs}ms`));
+  }, timeoutMs);
   try {
-    const items = await Promise.race([
-      provider.search(query, limit, lang, controller.signal),
-      new Promise((_, reject) => {
-        timer = setTimeout(() => {
-          controller.abort(new Error(`provider timed out after ${timeoutMs}ms`));
-          reject(new Error(`provider timed out after ${timeoutMs}ms`));
-        }, timeoutMs);
-      })
-    ]);
+    const items = await provider.search(query, limit, lang, signal);
     const bounded = Array.isArray(items) ? items.slice(0, limit) : [];
     return {
       items: bounded,
@@ -46,6 +44,7 @@ export async function attemptProvider(provider, query, limit, lang, options = {}
       }
     };
   } catch (error) {
+    options.signal?.throwIfAborted();
     return {
       items: [],
       diagnostic: {
@@ -57,7 +56,6 @@ export async function attemptProvider(provider, query, limit, lang, options = {}
       }
     };
   } finally {
-    controller.abort();
     clearTimeout(timer);
   }
 }