dsh-site-bridge 0.5.1 → 0.5.3

package/extension/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "default_locale": "en",
   "name": "__MSG_appName__",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "__MSG_appDesc__",
   "minimum_chrome_version": "116",
   "permissions": [

package/extension/popup.js

@@ -101,7 +101,8 @@ function render(status) {
   const targets = Array.isArray(status.targets) ? status.targets : []
   const tabsRow = $('tabs-row')
   const tabsSelect = $('tabs-select')
-  $('claim-more').hidden = !hasTarget
+  const selfAttached = selfTabId != null && targets.some((item) => item.id === selfTabId)
+  $('claim-more').hidden = !hasTarget || selfAttached
   if (targets.length > 1) {
     tabsRow.hidden = false
     tabsSelect.textContent = ''
@@ -146,8 +147,16 @@ function render(status) {
   }
 }
 
+// Which tab this popup is open on: attaching that tab again is a no-op, so the
+// attach button is only offered when the current tab is not attached yet.
+let selfTabId = null
+
 async function refresh() {
   try {
+    if (chrome.tabs?.query) {
+      const [tab] = await chrome.tabs.query({ active: true, currentWindow: true })
+      selfTabId = tab?.id ?? null
+    }
     render(await send({ type: 'status' }))
   } catch {
     render(null)
@@ -230,16 +239,33 @@ $('import-file').addEventListener('change', async (event) => {
   }
 })
 
-$('claim').addEventListener('click', async () => {
-  const [tab] = await chrome.tabs.query({ active: true, currentWindow: true })
-  if (!tab?.id) return
-  const result = await send({ type: 'claim', tabId: tab.id })
-  if (!result?.ok) {
-    setNote(t('claimFailed', [String(result?.error ?? t('claimFailedUnknown'))]), true)
+async function attachCurrentTab() {
+  let tabId = null
+  try {
+    const [tab] = await chrome.tabs.query({ active: true, currentWindow: true })
+    tabId = tab?.id ?? null
+  } catch {
+    tabId = null
+  }
+  if (tabId == null) {
+    setNote(t('claimFailed', [t('claimFailedUnknown')]), true)
+    return
+  }
+  try {
+    const result = await send({ type: 'claim', tabId })
+    if (!result?.ok) {
+      setNote(t('claimFailed', [String(result?.error ?? t('claimFailedUnknown'))]), true)
+      return
+    }
+    setNote('')
+  } catch (error) {
+    setNote(t('claimFailed', [String(error?.message ?? error)]), true)
     return
   }
   await refresh()
-})
+}
+
+$('claim').addEventListener('click', attachCurrentTab)
 
 $('capture').addEventListener('click', async () => {
   const status = await send({ type: 'status' })
@@ -268,11 +294,7 @@ $('pick').addEventListener('click', async () => {
   await refresh()
 })
 
-$('claim-more').addEventListener('click', async () => {
-  const result = await send({ type: 'claim' })
-  if (!result?.ok && result?.error) setNote(String(result.error), true)
-  await refresh()
-})
+$('claim-more').addEventListener('click', attachCurrentTab)
 
 $('tabs-select').addEventListener('change', async (event) => {
   const tabId = Number(event.target.value)

package/extension/sw.js

@@ -272,11 +272,19 @@ async function attach(tabId) {
 }
 
 async function claimTab(tabId) {
-  const tab = await chrome.tabs.get(tabId)
+  // Without an explicit id, claim whatever tab the user is looking at, so a
+  // caller that only knows "this tab" cannot silently pass NaN.
+  let id = Number(tabId)
+  if (!Number.isFinite(id)) {
+    const [active] = await chrome.tabs.query({ active: true, lastFocusedWindow: true })
+    id = active?.id
+  }
+  if (!Number.isFinite(id)) throw new Error('no tab to claim: pass tabId or open a page first')
+  const tab = await chrome.tabs.get(id)
   if (!/^https?:|^file:/.test(tab.url ?? '')) {
     throw new Error(`cannot drive ${tab.url || 'this tab'}: only http(s) and file:// pages are supported`)
   }
-  return attach(tabId)
+  return attach(id)
 }
 
 chrome.debugger.onDetach.addListener((source, reason) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-site-bridge",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "Chrome/Edge MV3 bridge for DeepSeek Harness: capture page markup (DOM, styles, selectors) and BFF traffic (xhr/fetch with headers and bodies) into a workspace snapshot bundle, drive the page with trusted CDP input, and verify injected scripts. Authorization never leaves the browser and is never written to disk.",
   "icon": "./icon.svg",
   "type": "module",

package/tools/preview-popup.mjs

@@ -22,7 +22,7 @@ const sleep = (ms) => new Promise((done) => setTimeout(done, ms))
 
 const statuses = {
   'connected-one': {
-    ok: true, configured: true, connected: true, port: 47321, recording: false, captured: 0,
+    ok: true, configured: true, connected: true, port: 47321, recording: false, captured: 0, selfTabId: 1,
     activeTabId: 1,
     target: { id: 1, title: 'Example Store — Products', url: 'https://shop.example/products' },
     targets: [
@@ -30,7 +30,7 @@ const statuses = {
     ]
   },
   connected: {
-    ok: true, configured: true, connected: true, port: 47321, recording: true, captured: 12,
+    ok: true, configured: true, connected: true, port: 47321, recording: true, captured: 12, selfTabId: 3,
     activeTabId: 1,
     target: { id: 1, title: 'Ozon: Торговая площадка', url: 'https://seller.ozon.ru/app/products' },
     targets: [
@@ -59,6 +59,7 @@ const stub = `
   window.chrome = {
     runtime: { sendMessage: async (m) => (m.type === 'status' ? ${JSON.stringify(statuses[state] ?? statuses.connected)} : { ok: true }) },
     storage: { local: { get: async () => ({ port: 47321, token: 'GWCIveb--rxL_wKChN9Wl-OJmXFGTK4' }), set: async () => {} } },
+    tabs: { query: async () => [{ id: ${JSON.stringify(statuses[state]?.selfTabId ?? 1)} }] },
     i18n: {
       getUILanguage: () => ${JSON.stringify(locale.replace('_', '-'))},
       getMessage: (key, subs) => {