browserclaw 0.5.2 → 0.5.3

package/dist/index.js

@@ -929,33 +929,37 @@ async function findPageByTargetId(browser, targetId, cdpUrl) {
     }
     if (tid && tid === targetId) return page;
   }
-  if (!resolvedViaCdp && pages.length === 1) {
-    return pages[0];
-  }
   if (cdpUrl) {
     try {
       const listUrl = `${normalizeCdpHttpBaseForJsonEndpoints(cdpUrl)}/json/list`;
       const headers = {};
       if (cached?.authToken) headers["Authorization"] = `Bearer ${cached.authToken}`;
-      const response = await fetch(listUrl, { headers });
-      if (response.ok) {
-        const targets = await response.json();
-        const target = targets.find((t) => t.id === targetId);
-        if (target) {
-          const urlMatch = pages.filter((p) => p.url() === target.url);
-          if (urlMatch.length === 1) return urlMatch[0];
-          if (urlMatch.length > 1) {
-            const sameUrlTargets = targets.filter((t) => t.url === target.url);
-            if (sameUrlTargets.length === urlMatch.length) {
-              const idx = sameUrlTargets.findIndex((t) => t.id === targetId);
-              if (idx >= 0 && idx < urlMatch.length) return urlMatch[idx];
+      const ctrl = new AbortController();
+      const t = setTimeout(() => ctrl.abort(), 2e3);
+      try {
+        const response = await fetch(listUrl, { headers, signal: ctrl.signal });
+        if (response.ok) {
+          const targets = await response.json();
+          const target = targets.find((entry) => entry.id === targetId);
+          if (target) {
+            const urlMatch = pages.filter((p) => p.url() === target.url);
+            if (urlMatch.length === 1) return urlMatch[0];
+            if (urlMatch.length > 1) {
+              const sameUrlTargets = targets.filter((entry) => entry.url === target.url);
+              if (sameUrlTargets.length === urlMatch.length) {
+                const idx = sameUrlTargets.findIndex((entry) => entry.id === targetId);
+                if (idx >= 0 && idx < urlMatch.length) return urlMatch[idx];
+              }
             }
           }
         }
+      } finally {
+        clearTimeout(t);
       }
     } catch {
     }
   }
+  if (!resolvedViaCdp && pages.length === 1) return pages[0];
   return null;
 }
 async function getPageForTargetId(opts) {