@btraut/browser-bridge 0.8.0 → 0.8.1

package/extension/dist/background.js

@@ -418,6 +418,10 @@ var DEBUGGER_PROTOCOL_VERSION = "1.3";
 var DEBUGGER_IDLE_TIMEOUT_KEY = "debuggerIdleTimeoutMs";
 var DEFAULT_DEBUGGER_IDLE_TIMEOUT_MS = 15e3;
 var DEFAULT_DEBUGGER_COMMAND_TIMEOUT_MS = 1e4;
+var DEFAULT_SEND_TO_TAB_TIMEOUT_MS = 1e4;
+var HISTORY_DISPATCH_TIMEOUT_MS = 2e3;
+var HISTORY_NAVIGATION_SIGNAL_TIMEOUT_MS = 8e3;
+var HISTORY_POST_NAV_DOM_GRACE_TIMEOUT_MS = 2e3;
 var AGENT_TAB_ID_KEY = "agentTabId";
 var AGENT_TAB_GROUP_TITLE = "\u{1F309} Browser Bridge";
 var nowIso = () => (/* @__PURE__ */ new Date()).toISOString();
@@ -809,14 +813,42 @@ var getDefaultTabId = async () => {
     return await getActiveTabId();
   }
 };
-var sendToTab = async (tabId, action, params) => {
+var sendToTab = async (tabId, action, params, options) => {
+  const timeoutMs = typeof options?.timeoutMs === "number" && Number.isFinite(options.timeoutMs) ? Math.max(1, Math.floor(options.timeoutMs)) : DEFAULT_SEND_TO_TAB_TIMEOUT_MS;
   const attemptSend = async () => {
     return await new Promise((resolve) => {
       const message = { action, params };
+      let settled = false;
+      const finish = (result) => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        if (timeout !== void 0) {
+          clearTimeout(timeout);
+        }
+        resolve(result);
+      };
+      let timeout;
+      timeout = self.setTimeout(() => {
+        finish({
+          ok: false,
+          error: {
+            code: "TIMEOUT",
+            message: `Timed out waiting for content response after ${timeoutMs}ms.`,
+            retryable: true,
+            details: {
+              action,
+              tab_id: tabId,
+              timeout_ms: timeoutMs
+            }
+          }
+        });
+      }, timeoutMs);
       chrome.tabs.sendMessage(tabId, message, (response) => {
         const error = chrome.runtime.lastError;
         if (error) {
-          resolve({
+          finish({
             ok: false,
             error: {
               code: "EVALUATION_FAILED",
@@ -827,7 +859,7 @@ var sendToTab = async (tabId, action, params) => {
           return;
         }
         if (!response || typeof response !== "object") {
-          resolve({
+          finish({
             ok: false,
             error: {
               code: "EVALUATION_FAILED",
@@ -837,7 +869,7 @@ var sendToTab = async (tabId, action, params) => {
           });
           return;
         }
-        resolve(response);
+        finish(response);
       });
     });
   };
@@ -863,6 +895,67 @@ var sendToTab = async (tabId, action, params) => {
     }
   };
 };
+var waitForHistoryNavigationSignal = async (tabId, timeoutMs) => {
+  return await new Promise((resolve, reject) => {
+    let timeout;
+    const cleanup = () => {
+      if (timeout !== void 0) {
+        clearTimeout(timeout);
+      }
+      chrome.webNavigation.onCommitted.removeListener(onCommitted);
+      chrome.webNavigation.onHistoryStateUpdated.removeListener(
+        onHistoryStateUpdated
+      );
+      chrome.webNavigation.onReferenceFragmentUpdated.removeListener(
+        onReferenceFragmentUpdated
+      );
+      chrome.tabs.onUpdated.removeListener(onTabUpdated);
+    };
+    const resolveSignal = () => {
+      cleanup();
+      resolve();
+    };
+    const onCommitted = (details) => {
+      if (details.tabId !== tabId || details.frameId !== 0) {
+        return;
+      }
+      resolveSignal();
+    };
+    const onHistoryStateUpdated = (details) => {
+      if (details.tabId !== tabId || details.frameId !== 0) {
+        return;
+      }
+      resolveSignal();
+    };
+    const onReferenceFragmentUpdated = (details) => {
+      if (details.tabId !== tabId || details.frameId !== 0) {
+        return;
+      }
+      resolveSignal();
+    };
+    const onTabUpdated = (updatedTabId, changeInfo) => {
+      if (updatedTabId !== tabId) {
+        return;
+      }
+      if (typeof changeInfo.url !== "string" || changeInfo.url.length === 0) {
+        return;
+      }
+      resolveSignal();
+    };
+    chrome.webNavigation.onCommitted.addListener(onCommitted);
+    chrome.webNavigation.onHistoryStateUpdated.addListener(
+      onHistoryStateUpdated
+    );
+    chrome.webNavigation.onReferenceFragmentUpdated.addListener(
+      onReferenceFragmentUpdated
+    );
+    chrome.tabs.onUpdated.addListener(onTabUpdated);
+    timeout = self.setTimeout(() => {
+      cleanup();
+      reject(new Error("Timed out waiting for history navigation signal."));
+    }, timeoutMs);
+  });
+};
 var waitForDomContentLoaded = async (tabId, timeoutMs) => {
   return await new Promise((resolve, reject) => {
     let timeout;
@@ -1313,21 +1406,37 @@ var DriveSocket = class {
           if (tabId === void 0) {
             tabId = await getDefaultTabId();
           }
-          const result = await sendToTab(tabId, message.action);
-          if (!result.ok) {
+          const navigationSignal = waitForHistoryNavigationSignal(
+            tabId,
+            HISTORY_NAVIGATION_SIGNAL_TIMEOUT_MS
+          );
+          const result = await sendToTab(
+            tabId,
+            message.action,
+            void 0,
+            {
+              timeoutMs: HISTORY_DISPATCH_TIMEOUT_MS
+            }
+          );
+          if (!result.ok && result.error.code !== "TIMEOUT") {
             respondError(result.error);
             return;
           }
           markTabActive(tabId);
           try {
-            await waitForDomContentLoaded(tabId, 3e4);
-          } catch (error) {
-            respondError({
-              code: "TIMEOUT",
-              message: error instanceof Error ? error.message : "Timed out waiting.",
-              retryable: true
-            });
-            return;
+            await navigationSignal;
+            try {
+              await waitForDomContentLoaded(
+                tabId,
+                HISTORY_POST_NAV_DOM_GRACE_TIMEOUT_MS
+              );
+            } catch {
+            }
+          } catch {
+            if (!result.ok) {
+              respondError(result.error);
+              return;
+            }
           }
           respondOk({ ok: true });
           return;
@@ -1901,10 +2010,14 @@ var DriveSocket = class {
           if (tabId === void 0) {
             tabId = await getDefaultTabId();
           }
+          const timeoutMs = message.action === "drive.wait_for" && typeof params.timeout_ms === "number" && Number.isFinite(params.timeout_ms) ? Math.max(1, Math.floor(params.timeout_ms) + 1e3) : void 0;
           const result = await sendToTab(
             tabId,
             message.action,
-            params
+            params,
+            {
+              timeoutMs
+            }
           );
           if (result.ok) {
             respondOk(result.result ?? { ok: true });