dsh-inner-browser-use 0.18.0 → 0.34.28

package/client.js

@@ -32,7 +32,8 @@ window.__ModuleLoader__.load({
     const DICT = {
       zh: {
         'side.label': '后台浏览器',
-        'side.empty': '还没有打开的页面',
+        'side.empty': '还没有打开的页面，在上方地址栏输入网址',
+        'side.restore': '恢复上次的页面',
         'side.connecting': '正在连接…',
         'side.failed': '画面没有连上',
         'side.foreign': '这个浏览器属于发起它的会话，回到那个会话继续。',
@@ -44,7 +45,8 @@ window.__ModuleLoader__.load({
       },
       en: {
         'side.label': 'Background browser',
-        'side.empty': 'No page open',
+        'side.empty': 'No page open; type an address above',
+        'side.restore': 'Reopen the last page',
         'side.connecting': 'Connecting…',
         'side.failed': 'The picture did not connect',
         'side.foreign': 'This browser belongs to the chat that opened it.',
@@ -73,6 +75,8 @@ window.__ModuleLoader__.load({
          on screen at once, and moving the mouse never takes the arrow over. */
       '.dshib-side-ptr{position:absolute;width:20px;height:20px;pointer-events:none;z-index:2;transform:translate(-2px,-2px);transition:left 60ms linear,top 60ms linear;filter:drop-shadow(0 1px 2px rgba(0,0,0,.45))}',
       '.dshib-side-note{font-size:12px;color:var(--dsw-alias-label-tertiary);padding:0 16px;text-align:center}',
+      '.dshib-side-back{border:0;border-radius:8px;background:transparent;color:var(--dsw-alias-label-primary);font:inherit;font-size:12px;padding:6px 12px;cursor:pointer}',
+      '.dshib-side-back:hover{background:var(--dsw-alias-bg-subtle)}',
     ].join('')
 
     return {
@@ -84,6 +88,9 @@ window.__ModuleLoader__.load({
           /* one locale service or none */
         }
         ctx.effect(() => {
+          /* A reload keeps one sheet, not one per lifetime: the same id is
+             replaced instead of stacked. */
+          document.getElementById?.(STYLE_ID)?.remove()
           const style = document.createElement('style')
           style.id = STYLE_ID
           /* A sheet is keyed by the plugin that brought it. */
@@ -109,6 +116,12 @@ window.__ModuleLoader__.load({
             }
           }
           const closeHere = (sessionId) => {
+            /* A tab the person closed is not a tab they want back on return. */
+            try {
+              void fetch(`${ROUTE}/sidecar/forget?session=${encodeURIComponent(sessionId)}`, { method: 'POST' }) // ui-copy-ignore
+            } catch {
+              /* a page that cannot hear it keeps its note */
+            }
             let records = []
             try {
               records = surface?.tabsIn?.(sessionId) ?? []
@@ -138,14 +151,23 @@ window.__ModuleLoader__.load({
               /* a column that refuses keeps its own tabs */
             }
           }
-          disposers.push(tabs.register({
+          /* The same rule on this side: a second mount of the same tab is a
+             no-op, not a thrown error that takes the pane down. */
+          const safely = (register) => {
+            try {
+              return register()
+            } catch (error) {
+              return () => {}
+            }
+          }
+          disposers.push(safely(() => tabs.register({
             id: SIDE_ID, // ui-copy-ignore
             kind: SIDE_KIND, // ui-copy-ignore
             keepMounted: true,
             single: true,
             priority: 'extension',
             title: () => L('side.label'),
-          }))
+          })))
           disposers.push(scope.slots.inject(SLOT, () => scope.slots.register({
             name: SLOT, // ui-copy-ignore
             key: SIDE_ID, // ui-copy-ignore
@@ -177,7 +199,10 @@ window.__ModuleLoader__.load({
           }
           const syncAsk = () => {
             const who = mountedOf()
-            if (who === askWho) return
+            /* A stream the browser gave up on keeps its address here, so the
+               next tick has to notice it is dead and open a fresh one, or this
+               chat never hears an ask again. */
+            if (who === askWho && askSource !== null && Number(askSource.readyState) !== 2) return
             closeAsk()
             if (who === '') return
             try {
@@ -251,6 +276,9 @@ window.__ModuleLoader__.load({
       const [ptr, setPtr] = React.useState(null)
       const [phase, setPhase] = React.useState('connecting')
       const [note, setNote] = React.useState('')
+      /* The address this chat had before its tab went away: the pane reopens
+         that address, so a lost picture costs one click. */
+      const [back, setBack] = React.useState('')
       const [url, setUrl] = React.useState('')
       const [draft, setDraft] = React.useState('')
       const [editing, setEditing] = React.useState(false)
@@ -263,13 +291,48 @@ window.__ModuleLoader__.load({
       React.useEffect(() => {
         let alive = true
         let dropped = false
+        /* The tab is still in this chat's column, so this chat may say the
+           mirror is its own: a reload forgets the owner, and a pane that only
+           waited would stay dark until some tool ran. */
+        const reclaim = () => {
+          const id = String(props.sessionId ?? '')
+          if (id === '') return
+          void fetch(`${ROUTE}/sidecar/claim`, { // ui-copy-ignore
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify({ session: id }),
+          })
+            .then((reply) => (reply.ok === true ? reply.json() : null))
+            .then((info) => {
+              if (alive !== true) return
+              if (info?.ok === true) {
+                setOwner(id)
+                /* The owner was just named, so the next poll may adopt the
+                   browser: ask now instead of up to a poll later. */
+                setTimeout(read, 0)
+              }
+            })
+            .catch(() => {})
+        }
         const read = () => {
-          void fetch(`${ROUTE}/sidecar/state`, { cache: 'no-store' }) // ui-copy-ignore
+          const who = String(props.sessionId ?? '')
+          /* Naming the chat lets a browser that outlived a reload be picked
+             up for us; an anonymous poll cannot, and the column would sit on
+             an empty stage with the browser running behind it. */
+          void fetch(`${ROUTE}/sidecar/state?session=${encodeURIComponent(who)}`, { cache: 'no-store' }) // ui-copy-ignore
             .then((reply) => (reply.ok === true ? reply.json() : null))
             .then((info) => {
               if (alive !== true) return
               const next = String(info?.owner ?? '')
+              const asked = String(props.sessionId ?? '')
+              /* Nobody owns it, or this chat does but the note was lost: ask
+                 back instead of showing a note for a browser this column shows. */
+              if (asked !== '' && next !== asked) reclaim()
               setOwner((prev) => (prev === next ? prev : next))
+              /* A browser that is gone still remembers where this chat was:
+                 keep the address so the pane can offer to reopen it. */
+              const was = String(info?.chat?.remembered ?? '')
+              if (was !== '') setBack((prev) => (prev === was ? prev : was))
               /* Another chat holds the browser now: this tab goes away instead
                  of sitting here as a note. */
               if (dropped !== true && next !== '' && next !== String(props.sessionId ?? '')) {
@@ -297,9 +360,15 @@ window.__ModuleLoader__.load({
          this chat keeps only a note. // ui-copy-ignore */
       const unknown = owner === null
       const mine = unknown !== true && owner === asked
+      /* A picture that stops arriving has to come back by itself: the pane
+         re-opens its stream instead of sitting on an empty stage until the
+         person reloads the page. */
+      const [attempt, setAttempt] = React.useState(0)
+      const drawnAt = React.useRef(0)
 
       React.useEffect(() => {
         if (mine !== true) return undefined
+        drawnAt.current = Date.now()
         const who = encodeURIComponent(String(props.sessionId ?? ''))
         const source = new EventSource(`${ROUTE}/sidecar/frames?session=${who}`)
         /* Bursts arrive faster than a picture can decode: only the newest frame
@@ -316,6 +385,7 @@ window.__ModuleLoader__.load({
           setFrame(message)
           setPtr(message.pointer ?? null)
           setPhase('live')
+          drawnAt.current = Date.now()
           if (typeof message.url === 'string' && message.url !== '') setUrl(message.url)
         }
         const draw = (message) => {
@@ -324,6 +394,11 @@ window.__ModuleLoader__.load({
           if (typeof requestAnimationFrame === 'function') raf = requestAnimationFrame(paint)
           else paint()
         }
+        const stuck = setInterval(() => {
+          /* Hello alone is not a picture: six quiet seconds means the stream is
+             dead, so ask for a new one. */
+          if (Date.now() - drawnAt.current > 6000) setAttempt((n) => n + 1)
+        }, 3000)
         source.onmessage = (event) => {
           let message
           try {
@@ -333,7 +408,9 @@ window.__ModuleLoader__.load({
           }
           if (message.type === 'hello') {
             setPhase('live')
+            drawnAt.current = Date.now()
             setUrl(String(message.url ?? ''))
+            setBack(String(message.chat?.remembered ?? ''))
           } else if (message.type === 'failed') {
             setPhase('failed')
             setNote(String(message.text ?? ''))
@@ -347,10 +424,11 @@ window.__ModuleLoader__.load({
         }
         source.onerror = () => setPhase('lost')
         return () => {
+          clearInterval(stuck)
           if (raf !== 0 && typeof cancelAnimationFrame === 'function') cancelAnimationFrame(raf)
           source.close()
         }
-      }, [props.sessionId, mine])
+      }, [props.sessionId, mine, attempt])
 
       /* The address field follows the page except while the person is editing it. */
       React.useEffect(() => {
@@ -510,7 +588,24 @@ window.__ModuleLoader__.load({
           onWheel,
           onKeyDown,
         },
-          frame === null ? h('div', { className: 'dshib-side-note' }, noteText) : null,
+          frame === null && back !== ''
+            ? h('button', {
+              className: 'dshib-side-back',
+              type: 'button', // ui-copy-ignore
+              onClick: () => { // ui-copy-ignore
+                void fetch(`${ROUTE}/sidecar/open`, { // ui-copy-ignore
+                  method: 'POST',
+                  headers: { 'content-type': 'application/json' },
+                  body: JSON.stringify({ session: who, url: back }), // ui-copy-ignore
+                })
+                  .then((reply) => (reply.ok === true ? reply.json() : null))
+                  .then((info) => {
+                    if (info?.ok === true) setAttempt((n) => n + 1)
+                  })
+                  .catch(() => {})
+              },
+            }, L('side.restore'))
+            : frame === null ? h('div', { className: 'dshib-side-note' }, noteText) : null,
           h('textarea', {
             className: 'dshib-side-ime',
             ref: ime,

package/docs/ARTIFACTS.md

@@ -0,0 +1,19 @@
+# 文件落在哪里
+
+浏览器产生的东西——截图、抓下来的图、打印的 PDF——不落在项目根目录，也不散在 home 下。固定规则：
+
+```
+~/.dsh-inner-browser-use/artifacts/<项目>/<会话>/<种类>/
+```
+
+- **项目**：会话工作目录的文件夹名，加路径哈希前 6 位，例如 `dsh-inner-browser-use-a1b2c3`。同名文件夹、不同路径不会混。
+- **会话**：会话 id 去掉 `session-` 后的前 8 位，例如 `72557d6e`。同一项目里两个会话各存各的。
+- **种类**：`shots/` 是 `sidecar_shot` 的截图，`pictures/` 是 `sidecar_grab` 抓的图，`pdf/` 是 `sidecar_pdf` 打印的文档。
+
+文件名默认带时间戳（`shot-20261028-124500.png`），给了 `name` 就用它；名字里的分隔符、连续点、开头点都会被去掉，跳不出这个目录。
+
+每个种类保留最新 40 个文件，旧的自动删，免得跑一天的会话留下一个没人翻得动的文件夹。开着的文件不会被删掉（尽力删除，失败就留着）。
+
+调用环境里没有项目或会话信息时，落到 `no-project/no-chat/<种类>/`，不猜。
+
+测试里用 `DSH_INNER_BROWSER_ARTIFACTS` 指向临时目录，不写真实 home。