@antglobal/copilot-cards-core 0.0.20260915071159-dev.1 → 0.0.20260915071159-dev.9

package/dist/index.cjs

@@ -434,27 +434,34 @@ function getByPath(obj, path) {
  * @param silent - If true, write to variables without triggering re-render.
  */
 async function executeRequest(fetcher, url, init, ctx, varKey, silent = false, timeoutMs) {
-    // Combine the card-level abortSignal with a per-request timeout signal
-    const signals = [];
-    if (ctx.abortSignal)
-        signals.push(ctx.abortSignal);
-    if (timeoutMs && timeoutMs > 0)
-        signals.push(AbortSignal.timeout(timeoutMs));
-    const combinedSignal = signals.length > 0
-        ? (signals.length === 1 ? signals[0] : AbortSignal.any(signals))
-        : undefined;
-    const response = await fetcher(url, { ...init, signal: combinedSignal });
-    const body = await parseResponseBody(response);
-    const result = {
-        ok: response.ok,
-        status: response.status,
-        data: body,
-    };
-    writeResponseVariable(ctx, varKey, result, silent);
-    if (!response.ok) {
-        throw new Error(`HTTP ${response.status}`);
+    // Older WebViews have AbortController but not AbortSignal.timeout/any.
+    // Keep the deadline active through body parsing and release it on every exit.
+    const controller = timeoutMs && timeoutMs > 0 ? new AbortController() : undefined;
+    let timer;
+    const abort = () => controller?.abort();
+    if (controller) {
+        if (ctx.abortSignal?.aborted)
+            controller.abort();
+        else {
+            ctx.abortSignal?.addEventListener('abort', abort, { once: true });
+            timer = setTimeout(abort, timeoutMs);
+        }
+    }
+    try {
+        const response = await fetcher(url, { ...init, signal: controller?.signal ?? ctx.abortSignal });
+        const body = await parseResponseBody(response);
+        const result = { ok: response.ok, status: response.status, data: body };
+        writeResponseVariable(ctx, varKey, result, silent);
+        if (!response.ok)
+            throw new Error(`HTTP ${response.status}`);
+        return result;
+    }
+    finally {
+        if (timer !== undefined)
+            clearTimeout(timer);
+        if (controller)
+            ctx.abortSignal?.removeEventListener('abort', abort);
     }
-    return result;
 }
 /**
  * Create a delay that can be aborted via AbortSignal.

package/dist/index.js

@@ -432,27 +432,34 @@ function getByPath(obj, path) {
  * @param silent - If true, write to variables without triggering re-render.
  */
 async function executeRequest(fetcher, url, init, ctx, varKey, silent = false, timeoutMs) {
-    // Combine the card-level abortSignal with a per-request timeout signal
-    const signals = [];
-    if (ctx.abortSignal)
-        signals.push(ctx.abortSignal);
-    if (timeoutMs && timeoutMs > 0)
-        signals.push(AbortSignal.timeout(timeoutMs));
-    const combinedSignal = signals.length > 0
-        ? (signals.length === 1 ? signals[0] : AbortSignal.any(signals))
-        : undefined;
-    const response = await fetcher(url, { ...init, signal: combinedSignal });
-    const body = await parseResponseBody(response);
-    const result = {
-        ok: response.ok,
-        status: response.status,
-        data: body,
-    };
-    writeResponseVariable(ctx, varKey, result, silent);
-    if (!response.ok) {
-        throw new Error(`HTTP ${response.status}`);
+    // Older WebViews have AbortController but not AbortSignal.timeout/any.
+    // Keep the deadline active through body parsing and release it on every exit.
+    const controller = timeoutMs && timeoutMs > 0 ? new AbortController() : undefined;
+    let timer;
+    const abort = () => controller?.abort();
+    if (controller) {
+        if (ctx.abortSignal?.aborted)
+            controller.abort();
+        else {
+            ctx.abortSignal?.addEventListener('abort', abort, { once: true });
+            timer = setTimeout(abort, timeoutMs);
+        }
+    }
+    try {
+        const response = await fetcher(url, { ...init, signal: controller?.signal ?? ctx.abortSignal });
+        const body = await parseResponseBody(response);
+        const result = { ok: response.ok, status: response.status, data: body };
+        writeResponseVariable(ctx, varKey, result, silent);
+        if (!response.ok)
+            throw new Error(`HTTP ${response.status}`);
+        return result;
+    }
+    finally {
+        if (timer !== undefined)
+            clearTimeout(timer);
+        if (controller)
+            ctx.abortSignal?.removeEventListener('abort', abort);
     }
-    return result;
 }
 /**
  * Create a delay that can be aborted via AbortSignal.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antglobal/copilot-cards-core",
-  "version": "0.0.20260915071159-dev.1",
+  "version": "0.0.20260915071159-dev.9",
   "description": "Core logic engine for copilot bot card SDK — no UI, pure logic (Expression Engine, Action Runner, Schema Parser, Lifecycle Manager)",
   "type": "module",
   "main": "./dist/index.cjs",