fixing issue 135

Signed-off-by: Divyansh Rai <140232173+divyansh-cyber@users.noreply.github.com>

Author: divyansh-cyber

frontend/src/tests/callChatbotApi.test.ts

@@ -56,4 +56,32 @@ describe("callChatbotApi", () => {
 
     expect(result).toBe(fallback);
   });
+
+  it("aborts when caller signal is aborted", async () => {
+    const controller = new AbortController();
+    fetchMock.mockImplementationOnce(
+      (_url: string, init?: RequestInit) =>
+        new Promise((_, reject) => {
+          const signal = init?.signal as AbortSignal;
+          if (signal) {
+            signal.addEventListener("abort", () => {
+              reject(new DOMException("Aborted", "AbortError"));
+            });
+          }
+        }) as Promise<Response>,
+    );
+
+    const fallback = { error: "cancelled" };
+    const promise = callChatbotApi(
+      "cancel-endpoint",
+      { signal: controller.signal },
+      fallback,
+      10000,
+    );
+
+    controller.abort();
+
+    const result = await promise;
+    expect(result).toEqual(fallback);
+  });
 });

frontend/src/utils/callChatbotApi.ts

@@ -15,13 +15,16 @@ export const callChatbotApi = async <T>(
   fallbackErrorValue: T,
   timeoutMs: number,
 ): Promise<T> => {
-  const controller = new AbortController();
-  const id = setTimeout(() => controller.abort(), timeoutMs);
+  const callerSignal = options.signal;
+  const timeoutSignal = AbortSignal.timeout(timeoutMs);
+  const signal = callerSignal
+    ? AbortSignal.any([callerSignal, timeoutSignal])
+    : timeoutSignal;
 
   try {
     const response = await fetch(`${API_BASE_URL}/api/chatbot/${endpoint}`, {
       ...options,
-      signal: controller.signal,
+      signal,
     });
 
     if (!response.ok) {
@@ -31,15 +34,17 @@ export const callChatbotApi = async <T>(
 
     return await response.json();
   } catch (error: unknown) {
-    if (error instanceof DOMException && error.name == "AbortError") {
-      console.error(
-        `API request to ${endpoint} timed out after ${timeoutMs}ms.`,
-      );
+    if (error instanceof DOMException && error.name === "AbortError") {
+      if (callerSignal?.aborted) {
+        console.error("API request cancelled by user");
+      } else {
+        console.error(
+          `API request to ${endpoint} timed out after ${timeoutMs}ms.`,
+        );
+      }
     } else {
       console.error(`API error calling ${endpoint}:`, error);
     }
     return fallbackErrorValue;
-  } finally {
-    clearTimeout(id);
   }
 };