bb-browser 0.1.1 → 0.1.2

package/extension/dist/background.js

@@ -81,7 +81,9 @@ class SSEClient {
             data = trimmedLine.substring(5).trim();
           } else if (trimmedLine === "") {
             if (event && data) {
-              await this.handleMessage(event, data);
+              this.handleMessage(event, data).catch(
+                (err) => console.error("[SSEClient] handleMessage error:", err)
+              );
               event = "";
               data = "";
             }
@@ -424,15 +426,15 @@ function initEventListeners() {
   });
   chrome.debugger.onDetach.addListener((source) => {
     if (source.tabId) {
-      cleanupTab(source.tabId);
+      cleanupTab$2(source.tabId);
       console.log("[CDPService] Debugger detached from tab:", source.tabId);
     }
   });
   chrome.tabs.onRemoved.addListener((tabId) => {
-    cleanupTab(tabId);
+    cleanupTab$2(tabId);
   });
 }
-function cleanupTab(tabId) {
+function cleanupTab$2(tabId) {
   attachedTabs.delete(tabId);
   pendingDialogs.delete(tabId);
   networkRequests.delete(tabId);
@@ -584,13 +586,19 @@ function handleException(tabId, params) {
   jsErrors.set(tabId, errors);
 }
 
+const tabSnapshotRefs$1 = /* @__PURE__ */ new Map();
+const tabActiveFrameId$2 = /* @__PURE__ */ new Map();
+function cleanupTab$1(tabId) {
+  tabSnapshotRefs$1.delete(tabId);
+  tabActiveFrameId$2.delete(tabId);
+}
 async function getSnapshot$1(tabId, options = {}) {
   const { interactive = false } = options;
   console.log("[DOMService] Getting snapshot for tab:", tabId, { interactive });
   await injectBuildDomTreeScript(tabId);
   const domTreeResult = await executeBuildDomTree(tabId);
   const snapshotResult = interactive ? convertToAccessibilityTree(domTreeResult) : convertToFullTree(domTreeResult);
-  snapshotResult.refs;
+  tabSnapshotRefs$1.set(tabId, snapshotResult.refs);
   console.log("[DOMService] Snapshot complete:", {
     mode: interactive ? "interactive" : "full",
     linesCount: snapshotResult.snapshot.split("\n").length,
@@ -599,6 +607,10 @@ async function getSnapshot$1(tabId, options = {}) {
   return snapshotResult;
 }
 function getFrameTarget(tabId) {
+  const frameId = tabActiveFrameId$2.get(tabId) ?? null;
+  if (frameId !== null) {
+    return { tabId, frameIds: [frameId] };
+  }
   return { tabId };
 }
 async function injectBuildDomTreeScript(tabId) {
@@ -883,22 +895,29 @@ function convertToFullTree(result) {
   return { snapshot: lines.join("\n"), refs };
 }
 
-let lastSnapshotRefs = {};
+const tabSnapshotRefs = /* @__PURE__ */ new Map();
+const tabActiveFrameId$1 = /* @__PURE__ */ new Map();
 async function loadRefsFromStorage() {
   try {
-    const result = await chrome.storage.session.get("snapshotRefs");
-    if (result.snapshotRefs) {
-      lastSnapshotRefs = result.snapshotRefs;
-      console.log("[CDPDOMService] Loaded refs from storage:", Object.keys(lastSnapshotRefs).length);
+    const result = await chrome.storage.session.get("tabSnapshotRefs");
+    if (result.tabSnapshotRefs) {
+      const stored = result.tabSnapshotRefs;
+      for (const [tabIdStr, refs] of Object.entries(stored)) {
+        tabSnapshotRefs.set(Number(tabIdStr), refs);
+      }
+      console.log("[CDPDOMService] Loaded refs from storage:", tabSnapshotRefs.size, "tabs");
     }
   } catch (e) {
     console.warn("[CDPDOMService] Failed to load refs from storage:", e);
   }
 }
-async function saveRefsToStorage(refs) {
+async function saveRefsToStorage(tabId, refs) {
   try {
-    await chrome.storage.session.set({ snapshotRefs: refs });
-    console.log("[CDPDOMService] Saved refs to storage:", Object.keys(refs).length);
+    const result = await chrome.storage.session.get("tabSnapshotRefs");
+    const stored = result.tabSnapshotRefs || {};
+    stored[String(tabId)] = refs;
+    await chrome.storage.session.set({ tabSnapshotRefs: stored });
+    console.log("[CDPDOMService] Saved refs to storage for tab:", tabId, Object.keys(refs).length);
   } catch (e) {
     console.warn("[CDPDOMService] Failed to save refs to storage:", e);
   }
@@ -916,8 +935,8 @@ async function getSnapshot(tabId, options = {}) {
       tagName: refInfo.tagName
     };
   }
-  lastSnapshotRefs = convertedRefs;
-  await saveRefsToStorage(convertedRefs);
+  tabSnapshotRefs.set(tabId, convertedRefs);
+  await saveRefsToStorage(tabId, convertedRefs);
   console.log("[CDPDOMService] Snapshot complete:", {
     linesCount: result.snapshot.split("\n").length,
     refsCount: Object.keys(convertedRefs).length
@@ -927,15 +946,24 @@ async function getSnapshot(tabId, options = {}) {
     refs: convertedRefs
   };
 }
-async function getRefInfo(ref) {
+async function getRefInfo(tabId, ref) {
   const refId = ref.startsWith("@") ? ref.slice(1) : ref;
-  if (lastSnapshotRefs[refId]) {
-    return lastSnapshotRefs[refId];
+  const refs = tabSnapshotRefs.get(tabId);
+  if (refs?.[refId]) {
+    return refs[refId];
   }
-  if (Object.keys(lastSnapshotRefs).length === 0) {
+  if (!tabSnapshotRefs.has(tabId)) {
     await loadRefsFromStorage();
+    const loaded = tabSnapshotRefs.get(tabId);
+    if (loaded?.[refId]) {
+      return loaded[refId];
+    }
   }
-  return lastSnapshotRefs[refId] || null;
+  return null;
+}
+function cleanupTab(tabId) {
+  tabSnapshotRefs.delete(tabId);
+  tabActiveFrameId$1.delete(tabId);
 }
 async function getElementCenterByXPath(tabId, xpath) {
   const result = await evaluate(tabId, `
@@ -966,7 +994,7 @@ async function getElementCenterByXPath(tabId, xpath) {
   return result;
 }
 async function clickElement(tabId, ref) {
-  const refInfo = await getRefInfo(ref);
+  const refInfo = await getRefInfo(tabId, ref);
   if (!refInfo) {
     throw new Error(`Ref "${ref}" not found. Run snapshot first to get available refs.`);
   }
@@ -977,7 +1005,7 @@ async function clickElement(tabId, ref) {
   return { role, name };
 }
 async function hoverElement(tabId, ref) {
-  const refInfo = await getRefInfo(ref);
+  const refInfo = await getRefInfo(tabId, ref);
   if (!refInfo) {
     throw new Error(`Ref "${ref}" not found. Run snapshot first to get available refs.`);
   }
@@ -988,7 +1016,7 @@ async function hoverElement(tabId, ref) {
   return { role, name };
 }
 async function fillElement(tabId, ref, text) {
-  const refInfo = await getRefInfo(ref);
+  const refInfo = await getRefInfo(tabId, ref);
   if (!refInfo) {
     throw new Error(`Ref "${ref}" not found. Run snapshot first to get available refs.`);
   }
@@ -1021,7 +1049,7 @@ async function fillElement(tabId, ref, text) {
   return { role, name };
 }
 async function typeElement(tabId, ref, text) {
-  const refInfo = await getRefInfo(ref);
+  const refInfo = await getRefInfo(tabId, ref);
   if (!refInfo) {
     throw new Error(`Ref "${ref}" not found. Run snapshot first to get available refs.`);
   }
@@ -1049,7 +1077,7 @@ async function typeElement(tabId, ref, text) {
   return { role, name };
 }
 async function getElementText(tabId, ref) {
-  const refInfo = await getRefInfo(ref);
+  const refInfo = await getRefInfo(tabId, ref);
   if (!refInfo) {
     throw new Error(`Ref "${ref}" not found. Run snapshot first to get available refs.`);
   }
@@ -1072,7 +1100,7 @@ async function getElementText(tabId, ref) {
   return text;
 }
 async function checkElement(tabId, ref) {
-  const refInfo = await getRefInfo(ref);
+  const refInfo = await getRefInfo(tabId, ref);
   if (!refInfo) {
     throw new Error(`Ref "${ref}" not found. Run snapshot first to get available refs.`);
   }
@@ -1103,7 +1131,7 @@ async function checkElement(tabId, ref) {
   return { role, name, wasAlreadyChecked: result };
 }
 async function uncheckElement(tabId, ref) {
-  const refInfo = await getRefInfo(ref);
+  const refInfo = await getRefInfo(tabId, ref);
   if (!refInfo) {
     throw new Error(`Ref "${ref}" not found. Run snapshot first to get available refs.`);
   }
@@ -1134,7 +1162,7 @@ async function uncheckElement(tabId, ref) {
   return { role, name, wasAlreadyUnchecked: result };
 }
 async function selectOption(tabId, ref, value) {
-  const refInfo = await getRefInfo(ref);
+  const refInfo = await getRefInfo(tabId, ref);
   if (!refInfo) {
     throw new Error(`Ref "${ref}" not found. Run snapshot first to get available refs.`);
   }
@@ -1191,7 +1219,7 @@ async function selectOption(tabId, ref, value) {
   return { role, name, selectedValue, selectedLabel };
 }
 async function waitForElement(tabId, ref, maxWait = 1e4, interval = 200) {
-  const refInfo = await getRefInfo(ref);
+  const refInfo = await getRefInfo(tabId, ref);
   if (!refInfo) {
     throw new Error(`Ref "${ref}" not found. Run snapshot first to get available refs.`);
   }
@@ -1219,8 +1247,9 @@ async function waitForElement(tabId, ref, maxWait = 1e4, interval = 200) {
   }
   throw new Error(`Timeout waiting for element @${ref} after ${maxWait}ms`);
 }
-function setActiveFrameId(frameId) {
-  console.log("[CDPDOMService] Active frame changed:", frameId ?? "main");
+function setActiveFrameId(tabId, frameId) {
+  tabActiveFrameId$1.set(tabId, frameId);
+  console.log("[CDPDOMService] Active frame changed:", { tabId, frameId: frameId ?? "main" });
 }
 async function pressKey(tabId, key, modifiers = []) {
   let modifierFlags = 0;
@@ -1365,7 +1394,17 @@ chrome.tabs.onUpdated.addListener(async (tabId, changeInfo, _tab) => {
 console.log("[TraceService] Initialized");
 
 initEventListeners();
-let activeFrameId = null;
+const tabActiveFrameId = /* @__PURE__ */ new Map();
+async function resolveTab(command) {
+  if (command.tabId !== void 0 && typeof command.tabId === "number") {
+    return chrome.tabs.get(command.tabId);
+  }
+  const [tab] = await chrome.tabs.query({ active: true, currentWindow: true });
+  if (!tab?.id) {
+    throw new Error("No active tab found");
+  }
+  return tab;
+}
 async function handleCommand(command) {
   console.log("[CommandHandler] Processing command:", command.id, command.action);
   let result;
@@ -1530,8 +1569,8 @@ async function handleOpen(command) {
   };
 }
 async function handleSnapshot(command) {
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -1577,8 +1616,8 @@ async function handleClick(command) {
       error: "Missing ref parameter"
     };
   }
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -1614,8 +1653,8 @@ async function handleHover(command) {
       error: "Missing ref parameter"
     };
   }
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -1659,8 +1698,8 @@ async function handleFill(command) {
       error: "Missing text parameter"
     };
   }
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -1705,8 +1744,8 @@ async function handleType(command) {
       error: "Missing text parameter"
     };
   }
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -1743,8 +1782,8 @@ async function handleCheck(command) {
       error: "Missing ref parameter"
     };
   }
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -1781,8 +1820,8 @@ async function handleUncheck(command) {
       error: "Missing ref parameter"
     };
   }
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -1827,8 +1866,8 @@ async function handleSelect(command) {
       error: "Missing value parameter"
     };
   }
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -1858,8 +1897,8 @@ async function handleSelect(command) {
   }
 }
 async function handleClose(command) {
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -1872,6 +1911,9 @@ async function handleClose(command) {
   console.log("[CommandHandler] Closing tab:", tabId, url);
   try {
     await chrome.tabs.remove(tabId);
+    cleanupTab$1(tabId);
+    cleanupTab(tabId);
+    tabActiveFrameId.delete(tabId);
     return {
       id: command.id,
       success: true,
@@ -1899,8 +1941,8 @@ async function handleGet(command) {
       error: "Missing attribute parameter"
     };
   }
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -1953,8 +1995,8 @@ async function handleGet(command) {
   }
 }
 async function handleScreenshot(command) {
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id || !activeTab.windowId) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id || !activeTab.windowId) {
     return {
       id: command.id,
       success: false,
@@ -2009,8 +2051,8 @@ async function handleWait(command) {
         error: "Missing ref parameter"
       };
     }
-    const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-    if (!activeTab || !activeTab.id) {
+    const activeTab = await resolveTab(command);
+    if (!activeTab.id) {
       return {
         id: command.id,
         success: false,
@@ -2051,8 +2093,8 @@ async function handlePress(command) {
       error: "Missing key parameter"
     };
   }
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -2104,8 +2146,8 @@ async function handleScroll(command) {
       error: `Invalid direction: ${direction}`
     };
   }
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -2133,8 +2175,8 @@ async function handleScroll(command) {
   }
 }
 async function handleBack(command) {
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -2173,8 +2215,8 @@ async function handleBack(command) {
   }
 }
 async function handleForward(command) {
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -2205,8 +2247,8 @@ async function handleForward(command) {
   }
 }
 async function handleRefresh(command) {
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -2244,8 +2286,8 @@ async function handleEval(command) {
       error: "Missing script parameter"
     };
   }
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -2422,6 +2464,9 @@ async function handleTabClose(command) {
     const title = targetTab.title || "";
     const url = targetTab.url || "";
     await chrome.tabs.remove(tabId);
+    cleanupTab$1(tabId);
+    cleanupTab(tabId);
+    tabActiveFrameId.delete(tabId);
     return {
       id: command.id,
       success: true,
@@ -2449,8 +2494,8 @@ async function handleFrame(command) {
       error: "Missing selector parameter"
     };
   }
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -2461,7 +2506,7 @@ async function handleFrame(command) {
   console.log("[CommandHandler] Switching to frame:", selector);
   try {
     const iframeInfoResults = await chrome.scripting.executeScript({
-      target: { tabId, frameIds: activeFrameId !== null ? [activeFrameId] : [0] },
+      target: { tabId, frameIds: tabActiveFrameId.get(tabId) !== null && tabActiveFrameId.get(tabId) !== void 0 ? [tabActiveFrameId.get(tabId)] : [0] },
       func: (sel) => {
         const iframe = document.querySelector(sel);
         if (!iframe) {
@@ -2540,8 +2585,8 @@ async function handleFrame(command) {
         error: `无法访问 frame (frameId: ${targetFrameId})，可能是跨域 iframe`
       };
     }
-    activeFrameId = targetFrameId;
-    setActiveFrameId(String(targetFrameId));
+    tabActiveFrameId.set(tabId, targetFrameId);
+    setActiveFrameId(tabId, String(targetFrameId));
     const matchedFrameInfo = frames.find((f) => f.frameId === targetFrameId);
     return {
       id: command.id,
@@ -2566,8 +2611,17 @@ async function handleFrame(command) {
 }
 async function handleFrameMain(command) {
   console.log("[CommandHandler] Switching to main frame");
-  activeFrameId = null;
-  setActiveFrameId(null);
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
+    return {
+      id: command.id,
+      success: false,
+      error: "No active tab found"
+    };
+  }
+  const tabId = activeTab.id;
+  tabActiveFrameId.set(tabId, null);
+  setActiveFrameId(tabId, null);
   return {
     id: command.id,
     success: true,
@@ -2588,8 +2642,8 @@ async function handleDialog(command) {
       error: "Missing or invalid dialogResponse parameter (accept/dismiss)"
     };
   }
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -2650,8 +2704,8 @@ function waitForTabLoad(tabId, timeout = 3e4) {
   });
 }
 async function handleNetwork(command) {
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -2742,8 +2796,8 @@ async function handleNetwork(command) {
   }
 }
 async function handleConsole(command) {
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -2791,8 +2845,8 @@ async function handleConsole(command) {
   }
 }
 async function handleErrors(command) {
-  const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-  if (!activeTab || !activeTab.id) {
+  const activeTab = await resolveTab(command);
+  if (!activeTab.id) {
     return {
       id: command.id,
       success: false,
@@ -2845,8 +2899,8 @@ async function handleTrace(command) {
   try {
     switch (subCommand) {
       case "start": {
-        const [activeTab] = await chrome.tabs.query({ active: true, currentWindow: true });
-        if (!activeTab || !activeTab.id) {
+        const activeTab = await resolveTab(command);
+        if (!activeTab.id) {
           return {
             id: command.id,
             success: false,