@liyuera/dsh-chrome-browser 0.6.7 → 0.6.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +21 -8
- package/extension/manifest.json +1 -1
- package/extension/service-worker.js +156 -37
- package/lib/backend.d.ts +24 -2
- package/lib/backend.d.ts.map +1 -1
- package/lib/backend.js +45 -2
- package/lib/backend.js.map +1 -1
- package/lib/chrome.d.ts +12 -0
- package/lib/chrome.d.ts.map +1 -1
- package/lib/chrome.js +11 -0
- package/lib/chrome.js.map +1 -1
- package/lib/index.d.ts +6 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +2 -1
- package/lib/index.js.map +1 -1
- package/lib/skill.d.ts.map +1 -1
- package/lib/skill.js +35 -7
- package/lib/skill.js.map +1 -1
- package/lib/tools.d.ts.map +1 -1
- package/lib/tools.js +69 -9
- package/lib/tools.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -11,7 +11,7 @@ Chrome 浏览器控制插件(host + 浏览器半边):通过 Chrome 扩展桥(默
|
|
|
11
11
|
| `chrome_navigate` | 标签页导航到 URL(默认等待 `readyState=complete`) |
|
|
12
12
|
| `chrome_open` | 新开前台标签页;**默认等加载完成**(`readyState=complete`,上限 `waitLoadMs`)后返回,返回的标题已是加载后的标题。**URL 只接受 http/https/file**,其它 scheme 在开标签页**之前**就报错 |
|
|
13
13
|
| `chrome_close` | 按 id 关闭一个标签页;**`tabId` 必填,不接受 `active`**——关掉用户正在看的那一页几乎总是错的 |
|
|
14
|
-
| `chrome_screenshot` | 截图落盘,返回路径/字节数/mime;模型用 `read_image` 查看。**`fullPage: true` 一次拍完整页**,`selector` 只拍某个元素(等同 DevTools 的「截取节点屏幕截图」)
|
|
14
|
+
| `chrome_screenshot` | 截图落盘,返回路径/字节数/mime;模型用 `read_image` 查看。**`fullPage: true` 一次拍完整页**,`selector` 只拍某个元素(等同 DevTools 的「截取节点屏幕截图」)。**调试通道失败时自动降级到可视区域截图**,结果带 `fallback` / `warning`(见下) |
|
|
15
15
|
| `chrome_click` | CSS 选择器 `element.click()`(可选 `all` 批量)。返回**实际派发点击**的元素数(不是匹配到的数量),并报告「存在但不可点」的原因 |
|
|
16
16
|
| `chrome_hover` | 悬停到元素上,展开只在 hover 时出现的菜单/工具条 |
|
|
17
17
|
| `chrome_type` | 聚焦输入框并输入文本(默认先全选替换) |
|
|
@@ -21,7 +21,7 @@ Chrome 浏览器控制插件(host + 浏览器半边):通过 Chrome 扩展桥(默
|
|
|
21
21
|
| `chrome_webmcp_list` | 列出当前标签页声明的 **WebMCP 工具**(name / title / description / origin / `inputSchema` / `annotations`);浏览器没有 WebMCP API 面(Chrome 未启用)或列表失败时返回 `available: false` + `reason`,退回 DOM 工具;页面有 API 但没注册工具(包括页面没实现 WebMCP)时是 `available: true` + 空 `tools`。只读、并发安全(见 [WebMCP 小节](#webmcp页面声明的工具)) |
|
|
22
22
|
| `chrome_webmcp_call` | 按 `name` + `input`(符合该工具 JSON Schema 的参数对象)调用页面自己实现的工具;**`pending: true` 表示声明式表单在等用户点提交,不要重试**;`navigated: true` 表示调用触发了页面跳转;页面报错会 throw;`result` 上限 200k 字符,**对象结果以 JSON 字符串返回,模型需自己 parse** |
|
|
23
23
|
| `chrome_wait` | 等元素达到某个状态(`visible` / `hidden` / `attached` / `detached`);**`satisfied: false` 表示超时,不是成功** |
|
|
24
|
-
| `chrome_console` | 采集/读取某个标签页的控制台(`action: start / read / stop`);**必须在页面出问题之前 start**,含浏览器自身抛的错误(资源加载失败、CSP 拦截) |
|
|
24
|
+
| `chrome_console` | 采集/读取某个标签页的控制台(`action: start / read / stop`);**必须在页面出问题之前 start**,含浏览器自身抛的错误(资源加载失败、CSP 拦截)。**start 会占用调试器**;5 分钟无读取会自动释放并保留日志(见[采集的代价与自动退出](#采集的代价与自动退出)) |
|
|
25
25
|
| `chrome_request_help` | 停下来请用户做只有人能做的事(登录、验证码、二次验证),等用户答复;`completed: false` 表示用户跳过了,不要重试 |
|
|
26
26
|
| `@` 标签页分组 | 在输入框敲 `@` 时列出实时标签页(行内是「标题 + URL」),选中插入一个引用芯片;发送后消息里只有这个引用,标签页的 URL 与 tabId 由宿主注入一条上下文消息给模型 |
|
|
27
27
|
| **活动状态条** | 会话标题栏末尾**常驻**的淡色胶囊:空闲显示「Chrome 就绪」,调用中显示当前动作与标签页,失败短暂变红 |
|
|
@@ -139,10 +139,22 @@ chrome_console { action: 'stop', tabId } ← 收尾
|
|
|
139
139
|
- **不落盘**:缓冲只在宿主进程内存里,不写会话日志。只有模型显式 `read` 回来的内容才会进入对话记录——和 `chrome_read` 的暴露面一样。
|
|
140
140
|
- `stop`、插件卸载、标签页关闭都会释放缓冲。
|
|
141
141
|
|
|
142
|
-
####
|
|
142
|
+
#### 采集的代价与自动退出
|
|
143
143
|
|
|
144
144
|
扩展后端用 `chrome.debugger` 附着到被采集的那个标签页,所以**只有那一个标签页顶部会出现 Chrome 的「已开始调试此浏览器」提示条**,`stop` 后消失。模型不会对你没让它采集的标签页这么做。
|
|
145
145
|
|
|
146
|
+
**这条提示条不会无限期留着**——即便模型忘了 `stop`,`chrome.debugger` 也有自动退出路径:
|
|
147
|
+
|
|
148
|
+
| 触发 | 行为 |
|
|
149
|
+
| --- | --- |
|
|
150
|
+
| 显式 `action: 'stop'` | 立即 detach、释放缓冲,提示条消失 |
|
|
151
|
+
| `consoleIdleMs`(默认 5 分钟)内没有任何 `read` | 宿主自动 `stopConsole`,释放调试器与提示条;**已捕获的日志保留**,下次 `read` 返回 `detached: "idle"` + `note`,需要继续采集就重新 `start`(可用配置 `consoleIdleMs: 0` 关闭) |
|
|
152
|
+
| 宿主进程断开超过 60 秒 | 扩展在 alarm/boot 时 detach 所有采集并清空持久化的采集集合(没人会再来读它) |
|
|
153
|
+
| 宿主重启后扩展重连 | 新宿主通过 `console-sync` 下发自己仍持有的采集集合;扩展把上一进程遗留、宿主不认识的采集全部 detach,并按宿主持有的集合补挂 |
|
|
154
|
+
| 标签页关闭 | Chrome 自己 detach,提示条随标签页消失 |
|
|
155
|
+
|
|
156
|
+
`console-sync` 是扩展 0.5.5 新增的 op;旧扩展(0.5.4 及以前)不支持时宿主会跳过这一步,其余自动退出路径照常。
|
|
157
|
+
|
|
146
158
|
CDP 后端不涉及扩展,直接在一次长驻 CDP 会话上订阅事件。
|
|
147
159
|
|
|
148
160
|
> ⚠️ **升级到本版本后必须重新加载扩展**(`chrome://extensions` → 重新加载)。扩展新增了 `debugger` 权限,Chrome 不会自动授予。
|
|
@@ -278,7 +290,7 @@ Chrome 不会重读「加载已解压」扩展的文件,所以插件自己补了
|
|
|
278
290
|
|
|
279
291
|
于是 **npm 升级插件后不用再碰 `chrome://extensions`**。
|
|
280
292
|
|
|
281
|
-
**扩展 0.5.0 / 0.5.1 / 0.5.2 / 0.5.3 升级会自动重载**:0.5.0 加了 `webmcp-list` / `webmcp-call` 两个 op,0.5.1 改了重连逻辑,0.5.2 加了僵尸宿主检测,0.5.3
|
|
293
|
+
**扩展 0.5.0 / 0.5.1 / 0.5.2 / 0.5.3 / 0.5.4 / 0.5.5 升级会自动重载**:0.5.0 加了 `webmcp-list` / `webmcp-call` 两个 op,0.5.1 改了重连逻辑,0.5.2 加了僵尸宿主检测,0.5.3/0.5.4 加了截图降级,0.5.5 加了采集的自动退出(`console-sync`、宿主失联释放);这几版都没动 `WS_URLS` 与桥端口(仍拨 21987),改的只是各自的代码与 `BUILD_HASH`。已经连着 21987 的扩展会被现有自动更新握手用 `chrome.runtime.reload()` 重读磁盘,升到对应版本;升级到 0.6.9(扩展 0.5.5)同样不需要手动重载。下面的手动重载只针对从 0.4.1/19387 跨端口升级的那一次。
|
|
282
294
|
|
|
283
295
|
**例外:首次升级到 21987 这一版**。自动重载握手要求扩展已经连着桥;旧扩展(0.4.1)拨的还是 19387/3080,桌面应用的 dsh 端口每次启动随机,旧扩展没有可用地址,够不到 21987,连不上就收不到握手,所以桌面应用升级后第一次要手动重载(步骤见[安装 → 2](#2-装配套-chrome-扩展));源码启动的 `pnpm dsh web` 在 3080 上仍可能让旧扩展经备用地址连上并自动完成重载,没自动恢复时同样手动重载一次。重载后扩展拨 21987,后续升级恢复自动;新装用户加载的已经是新扩展,没有这一步。
|
|
284
296
|
|
|
@@ -402,6 +414,7 @@ $DSH_HOME/profiles/<profile>/node_modules/@liyuera/dsh-chrome-browser/extension/
|
|
|
402
414
|
waitLoadMs: 8000 # chrome_navigate 加载等待
|
|
403
415
|
timeoutMs: 15000 # 单命令/就绪超时
|
|
404
416
|
screenshotDir: null # 默认 <tmp>/dsh-chrome-shots
|
|
417
|
+
consoleIdleMs: 300000 # chrome_console 无读取自动释放调试器的时限(毫秒;0 = 不自动释放)
|
|
405
418
|
```
|
|
406
419
|
|
|
407
420
|
`bridgePort` 是扩展要拨的固定回环端口(默认 **21987**,插件自有端口,理由见[浏览器连接模式](#浏览器连接模式)):dsh web server 的实际监听端口与它不同时,插件在这个端口上另起一个只服务扩展的 HTTP/WS 服务;相同时不另起 listener,由 dsh web server 应答。`bridgePort: 0` 交给系统分配,扩展不知道实际端口,只用于测试/诊断。`backend: 'cdp'` 不启动固定桥,扩展面路由只在 dsh web server 上。
|
|
@@ -433,8 +446,8 @@ DSH_CHROME_SMOKE=1 npx vitest run tests/smoke.spec.ts # headless Chrome 全链
|
|
|
433
446
|
```sh
|
|
434
447
|
# 1. 改 chrome-browser/package.json 的 version,提交并 push main
|
|
435
448
|
# 2. 打 tag 并 push,触发 .github/workflows/publish-chrome-browser.yml
|
|
436
|
-
git tag chrome-browser-v0.6.
|
|
437
|
-
git push origin chrome-browser-v0.6.
|
|
449
|
+
git tag chrome-browser-v0.6.9
|
|
450
|
+
git push origin chrome-browser-v0.6.9
|
|
438
451
|
```
|
|
439
452
|
|
|
440
453
|
workflow 在 `chrome-browser/` 里跑 `npm publish --access public`,tag 与 `package.json` 版本不一致会直接失败;公开仓库 + 公开包会自动生成 provenance 证明。npm 侧的一次性配置(已完成):包 Settings → Trusted Publisher → GitHub Actions,`liyuera` / `deepseek-harness-plugin` / `publish-chrome-browser.yml`,并勾上 **Allow npm publish**;创建后 2 天内必须完成一次成功发布来验证配置,Publishing access 已设为最严格的「disallow bypass 2fa tokens」——token 不能发布,但 trusted publisher 不受影响。若 workflow 报 `ENEEDAUTH`,先核对 workflow 文件名、owner/repo 是否与 npm 配置完全一致,以及是否勾了 Allow npm publish。
|
|
@@ -477,8 +490,8 @@ workflow 在 `chrome-browser/` 里跑 `npm publish --access public`,tag 与 `pac
|
|
|
477
490
|
- **扩展自动更新依赖 `chrome.runtime.reload()` 能读到磁盘上的新文件**:这是该 API 的预期行为,但已加载的解压扩展由 Chrome 缓存,所以插件**只尝试一次**并在失败时明确报告,而不是无限重载。状态见 `/chrome-browser/ext/status`。
|
|
478
491
|
- **`chrome_screenshot` 默认只拍视口**:整页要显式传 `fullPage: true`(一次调用完成,不要靠滚动拼接——拼接会重复固定元素、接缝错位,而且很难对齐)。`selector` 拍单个元素,元素在首屏之下也照样能拍对。
|
|
479
492
|
- **`chrome_screenshot` 优先走调试通道**:`chrome.debugger` 的 `Page.captureScreenshot`(与 CDP 后端同一条路)在标签页处于后台时照样可用,也**不会返回陈旧帧**。代价是 Chrome 在该标签页顶部显示「正在调试」提示条。如果该标签页已被 `chrome_console` 采集,则复用同一会话,不产生第二次附着。
|
|
480
|
-
-
|
|
481
|
-
- ~~截图要求窗口可见~~:旧实现只走 `chrome.tabs.captureVisibleTab`,窗口被遮挡时报 `image readback failed`,窗口停止重绘时**返回上一帧**(实测两张相隔数秒的截图逐字节相同,而返回的路径与字节数不会告诉你它是陈旧的)
|
|
493
|
+
- **调试通道失败时自动降级到可视区域截图**:DevTools 占用、页面拒绝渲染、clip 测量失败等任何调试通道错误,都会退回 `chrome.tabs.captureVisibleTab`,并把实际发生的事写进结果:`fallback: "visible-tab"` + `warning`(含失败原因);`fullPage` / `selector` 指定的范围在回退下**不生效**(`viewportOnly: true`),只拍该窗口当前标签页的**可视区域**。回退通道读的是窗口已绘制的画面:窗口被遮挡时可能报 `image readback failed`,页面停止重绘时**可能返回上一帧**,且目标标签页必须在前台(否则明确报错,不会拍错页面)。**两条通道都失败时调用抛错**,错误里同时给出两个原因;此时正确做法是用 `chrome_eval` / `chrome_read` 取替代证据,请用户关 DevTools 或把窗口切到前台后再拍,而不是连续重试截图。
|
|
494
|
+
- ~~截图要求窗口可见~~:旧实现只走 `chrome.tabs.captureVisibleTab`,窗口被遮挡时报 `image readback failed`,窗口停止重绘时**返回上一帧**(实测两张相隔数秒的截图逐字节相同,而返回的路径与字节数不会告诉你它是陈旧的)。现在调试通道优先,失败才降级,且降级结果会自我声明,不再静默。
|
|
482
495
|
- **活动状态条是轮询的**:客户端每秒发一次本地回环 GET。将来若接入会话事件流可以去掉轮询,目前用的是插件已有的路由机制。
|
|
483
496
|
- **人工求助依赖宿主的提问服务**:`chrome_request_help` 在 `ctx.userQuestions` 缺席的组合、以及被委派的子 agent 里不可用(会明确报错)。
|
|
484
497
|
- **文本读取只覆盖主框架**的 `innerText`(iframe 内容不在其中)。
|
package/extension/manifest.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"manifest_version": 3,
|
|
3
3
|
"name": "dsh Chrome Control",
|
|
4
4
|
"description": "Lets the local dsh agent drive this Chrome: list tabs, read pages, click and type, run JS, capture screenshots, read console output. Talks to dsh on this machine only.",
|
|
5
|
-
"version": "0.5.
|
|
5
|
+
"version": "0.5.5",
|
|
6
6
|
"permissions": [
|
|
7
7
|
"tabs",
|
|
8
8
|
"scripting",
|
|
@@ -71,6 +71,7 @@ function connect() {
|
|
|
71
71
|
retryMs = 1000
|
|
72
72
|
disconnectedAt = 0
|
|
73
73
|
lastHostMessageAt = Date.now()
|
|
74
|
+
touchHostSeen()
|
|
74
75
|
hostOrigin = url.replace(/^ws/u, 'http').replace(/\/chrome-browser\/ext\/ws$/u, '')
|
|
75
76
|
trace('open ' + url)
|
|
76
77
|
hello()
|
|
@@ -80,6 +81,7 @@ function connect() {
|
|
|
80
81
|
}
|
|
81
82
|
ws.onmessage = (event) => {
|
|
82
83
|
lastHostMessageAt = Date.now()
|
|
84
|
+
touchHostSeen()
|
|
83
85
|
void handle(event.data)
|
|
84
86
|
}
|
|
85
87
|
ws.onerror = () => { /* onclose follows */ }
|
|
@@ -204,7 +206,11 @@ setInterval(() => {
|
|
|
204
206
|
|
|
205
207
|
chrome.alarms.create('dsh-bridge', { periodInMinutes: 0.5 })
|
|
206
208
|
chrome.alarms.onAlarm.addListener(alarm => {
|
|
207
|
-
if (alarm.name
|
|
209
|
+
if (alarm.name !== 'dsh-bridge') return
|
|
210
|
+
if (socket === null || socket.readyState !== 1) connect()
|
|
211
|
+
// A wake-up is the one place that also runs after the worker was suspended;
|
|
212
|
+
// use it to release captures whose host is gone for good.
|
|
213
|
+
void releaseCapturesIfHostGone()
|
|
208
214
|
})
|
|
209
215
|
chrome.runtime.onStartup.addListener(() => connect())
|
|
210
216
|
chrome.runtime.onInstalled.addListener(() => connect())
|
|
@@ -225,7 +231,7 @@ chrome.windows.onFocusChanged.addListener(() => wakeBridge())
|
|
|
225
231
|
*/
|
|
226
232
|
const SUPPORTED_OPS = [
|
|
227
233
|
'list-tabs', 'read', 'inventory', 'wait', 'hover', 'press', 'select', 'eval',
|
|
228
|
-
'click', 'type', 'console-start', 'console-stop', 'close', 'navigate', 'open',
|
|
234
|
+
'click', 'type', 'console-start', 'console-stop', 'console-sync', 'close', 'navigate', 'open',
|
|
229
235
|
'screenshot', 'trace', 'reload', 'webmcp-list', 'webmcp-call',
|
|
230
236
|
]
|
|
231
237
|
|
|
@@ -240,10 +246,11 @@ const SUPPORTED_OPS = [
|
|
|
240
246
|
* user stayed on a stale extension with nothing to show for it. Only a value
|
|
241
247
|
* carried by the loaded code can tell the host which code is loaded.
|
|
242
248
|
*/
|
|
243
|
-
const BUILD_HASH = '
|
|
249
|
+
const BUILD_HASH = 'ce156c79ef2fb6695fc38377b924e3a83cb0240c35876eb36d94a5aeca6ec2a6'
|
|
244
250
|
|
|
245
251
|
/** Introduce this worker: what it runs, what it can answer, and which code it is. */
|
|
246
252
|
async function hello() {
|
|
253
|
+
touchHostSeen()
|
|
247
254
|
send({
|
|
248
255
|
kind: 'hello',
|
|
249
256
|
version: chrome.runtime.getManifest().version,
|
|
@@ -351,6 +358,98 @@ async function setConsoleTabs(tabs) {
|
|
|
351
358
|
await chrome.storage.session.set({ [CONSOLE_TABS_KEY]: tabs })
|
|
352
359
|
}
|
|
353
360
|
|
|
361
|
+
/** storage.session key: when the host last proved it was reachable (epoch ms). */
|
|
362
|
+
const HOST_SEEN_KEY = 'hostSeenAt'
|
|
363
|
+
|
|
364
|
+
/**
|
|
365
|
+
* How long a persisted console capture survives without a reachable host.
|
|
366
|
+
*
|
|
367
|
+
* A capture holds Chrome's debugger. If the host vanished (app quit, plugin
|
|
368
|
+
* unloaded), nothing will ever read that capture again, and the "debugging this
|
|
369
|
+
* browser" bar would stay until Chrome happens to suspend this worker. A minute
|
|
370
|
+
* is long enough for a restarted host to reconnect and re-arm, and short enough
|
|
371
|
+
* that a dead consumer cannot leave a tab in debug mode.
|
|
372
|
+
*/
|
|
373
|
+
const CONSOLE_BRIDGE_GRACE_MS = 60_000
|
|
374
|
+
|
|
375
|
+
let hostSeenWrittenAt = 0
|
|
376
|
+
|
|
377
|
+
/** Persist "a host is alive", throttled to one write per 10s. */
|
|
378
|
+
function touchHostSeen() {
|
|
379
|
+
const now = Date.now()
|
|
380
|
+
if (now - hostSeenWrittenAt < 10_000) return
|
|
381
|
+
hostSeenWrittenAt = now
|
|
382
|
+
chrome.storage.session.set({ [HOST_SEEN_KEY]: now }).catch(() => undefined)
|
|
383
|
+
}
|
|
384
|
+
|
|
385
|
+
/**
|
|
386
|
+
* Detach console captures whose host has not been seen within the grace bound.
|
|
387
|
+
*
|
|
388
|
+
* Runs from the alarm and on boot, so it also executes after a suspended worker
|
|
389
|
+
* wakes — a plain timer would die with the worker and never detach anything.
|
|
390
|
+
*/
|
|
391
|
+
async function releaseCapturesIfHostGone() {
|
|
392
|
+
const tabs = await consoleTabs()
|
|
393
|
+
if (tabs.length === 0) return
|
|
394
|
+
let seen = 0
|
|
395
|
+
try {
|
|
396
|
+
const data = await chrome.storage.session.get(HOST_SEEN_KEY)
|
|
397
|
+
seen = typeof data[HOST_SEEN_KEY] === 'number' ? data[HOST_SEEN_KEY] : 0
|
|
398
|
+
} catch {
|
|
399
|
+
seen = 0
|
|
400
|
+
}
|
|
401
|
+
if (seen !== 0 && Date.now() - seen <= CONSOLE_BRIDGE_GRACE_MS) return
|
|
402
|
+
await setConsoleTabs([])
|
|
403
|
+
for (const id of tabs) {
|
|
404
|
+
try {
|
|
405
|
+
await chrome.debugger.detach({ tabId: id })
|
|
406
|
+
} catch {
|
|
407
|
+
// Already detached, or the tab is gone: that is the state we wanted.
|
|
408
|
+
}
|
|
409
|
+
trace('console-release-stale-host ' + id)
|
|
410
|
+
}
|
|
411
|
+
}
|
|
412
|
+
|
|
413
|
+
/**
|
|
414
|
+
* Drop persisted captures the host does not know about.
|
|
415
|
+
*
|
|
416
|
+
* Re-arming happens on every bridge open, including a reconnect to a host that
|
|
417
|
+
* RESTARTED and therefore holds no buffers. The host names the captures it
|
|
418
|
+
* still owns; everything else is a leftover from a previous host and must be
|
|
419
|
+
* detached, or Chrome keeps showing "debugging this browser" for a capture
|
|
420
|
+
* nobody will ever read.
|
|
421
|
+
* @param tabs - tab ids the host still captures.
|
|
422
|
+
* @returns how many were kept and how many were dropped.
|
|
423
|
+
*/
|
|
424
|
+
async function syncConsole(tabs) {
|
|
425
|
+
const keep = new Set((Array.isArray(tabs) ? tabs : []).map(Number))
|
|
426
|
+
const have = await consoleTabs()
|
|
427
|
+
const kept = have.filter(id => keep.has(id))
|
|
428
|
+
const drop = have.filter(id => !keep.has(id))
|
|
429
|
+
const missing = [...keep].filter(id => !kept.includes(id))
|
|
430
|
+
await setConsoleTabs(kept)
|
|
431
|
+
for (const id of drop) {
|
|
432
|
+
try {
|
|
433
|
+
await chrome.debugger.detach({ tabId: id })
|
|
434
|
+
} catch {
|
|
435
|
+
// Already detached, or the tab is gone: that is the state we wanted.
|
|
436
|
+
}
|
|
437
|
+
trace('console-sync-drop ' + id)
|
|
438
|
+
}
|
|
439
|
+
// The host still holds a buffer for these: the extension lost the session
|
|
440
|
+
// (worker restarted) and must re-attach instead of letting the capture die.
|
|
441
|
+
let restored = 0
|
|
442
|
+
for (const id of missing) {
|
|
443
|
+
try {
|
|
444
|
+
await startConsole(id)
|
|
445
|
+
restored += 1
|
|
446
|
+
} catch (error) {
|
|
447
|
+
trace('console-sync-restore-failed ' + id + ' ' + String((error && error.message) || error).slice(0, 60))
|
|
448
|
+
}
|
|
449
|
+
}
|
|
450
|
+
return { kept: kept.length + restored, dropped: drop.length, restored }
|
|
451
|
+
}
|
|
452
|
+
|
|
354
453
|
/**
|
|
355
454
|
* Mirrors `consoleMessageFrom` in the host's src/console-events.ts, which maps
|
|
356
455
|
* the same events for the CDP backend. The bridge cannot import host modules,
|
|
@@ -570,6 +669,8 @@ async function run(command) {
|
|
|
570
669
|
return startConsole(command.args.tabId)
|
|
571
670
|
case 'console-stop':
|
|
572
671
|
return stopConsole(command.args.tabId)
|
|
672
|
+
case 'console-sync':
|
|
673
|
+
return syncConsole(command.args.tabs)
|
|
573
674
|
case 'reload': {
|
|
574
675
|
// Answer first: `chrome.runtime.reload()` tears this worker down, so a
|
|
575
676
|
// result sent after it would never leave. The delay lets the frame flush.
|
|
@@ -611,7 +712,13 @@ async function run(command) {
|
|
|
611
712
|
return {
|
|
612
713
|
path: body.path,
|
|
613
714
|
mime: 'image/jpeg',
|
|
614
|
-
...(shot.fallback
|
|
715
|
+
...(shot.fallback
|
|
716
|
+
? {
|
|
717
|
+
fallback: 'visible-tab',
|
|
718
|
+
viewportOnly: shot.viewportOnly,
|
|
719
|
+
...(shot.reason === undefined ? {} : { reason: shot.reason }),
|
|
720
|
+
}
|
|
721
|
+
: {}),
|
|
615
722
|
}
|
|
616
723
|
}
|
|
617
724
|
case 'trace': {
|
|
@@ -737,15 +844,16 @@ const VISIBLE_CAPTURE_TIMEOUT_MS = 10_000
|
|
|
737
844
|
*
|
|
738
845
|
* The first alternative is that refusal's own message; the second is what
|
|
739
846
|
* `chrome.debugger.attach` answers when DevTools came in between the target
|
|
740
|
-
* listing and the attach.
|
|
741
|
-
*
|
|
847
|
+
* listing and the attach. Only used to give the degradation a readable cause —
|
|
848
|
+
* every debugger failure degrades, this one just has a friendlier name than
|
|
849
|
+
* Chrome's raw attach error.
|
|
742
850
|
*/
|
|
743
851
|
const DEBUGGER_OWNED = /已被另一个调试器占用|Another debugger is already attached/iu
|
|
744
852
|
|
|
745
853
|
/**
|
|
746
854
|
* Whether a capture failure is DevTools owning the tab, not a broken page.
|
|
747
855
|
* @param error - whatever the debugger path threw.
|
|
748
|
-
* @returns whether the
|
|
856
|
+
* @returns whether the cause should be reported as DevTools rather than verbatim.
|
|
749
857
|
*/
|
|
750
858
|
function debuggerOwnedByDevTools(error) {
|
|
751
859
|
return DEBUGGER_OWNED.test(String((error && error.message) || error))
|
|
@@ -754,10 +862,10 @@ function debuggerOwnedByDevTools(error) {
|
|
|
754
862
|
/**
|
|
755
863
|
* Capture the window's visible tab as a data URL.
|
|
756
864
|
*
|
|
757
|
-
* The
|
|
758
|
-
*
|
|
759
|
-
*
|
|
760
|
-
*
|
|
865
|
+
* The degradation route when the debugger capture failed for any reason. It
|
|
866
|
+
* reads back the window's painted surface instead of rendering the tab, so it
|
|
867
|
+
* needs the window visible, can answer with a previous frame while the page is
|
|
868
|
+
* not repainting, and it always photographs whichever tab is active in the
|
|
761
869
|
* window — hence the active-tab refusal rather than a silently wrong image.
|
|
762
870
|
* @param tabId - the tab to capture.
|
|
763
871
|
* @returns the image as a `data:` URL.
|
|
@@ -795,41 +903,49 @@ async function captureVisibleTab(tabId) {
|
|
|
795
903
|
}
|
|
796
904
|
|
|
797
905
|
/**
|
|
798
|
-
* Capture one tab, through the debugger when it can
|
|
799
|
-
*
|
|
906
|
+
* Capture one tab, through the debugger when it can, and through the visible
|
|
907
|
+
* window when it cannot.
|
|
800
908
|
*
|
|
801
|
-
*
|
|
802
|
-
*
|
|
803
|
-
*
|
|
804
|
-
*
|
|
805
|
-
*
|
|
909
|
+
* A screenshot is evidence, so any failure of the precise route — DevTools
|
|
910
|
+
* owning the debugger, a page Chrome refuses to render, an over-tall clip —
|
|
911
|
+
* degrades to a viewport image of the window instead of returning no image at
|
|
912
|
+
* all. The fallback cannot honour `fullPage`/`selector`, can repeat an older
|
|
913
|
+
* frame, and needs the tab in front; therefore its answer carries `fallback`,
|
|
914
|
+
* `viewportOnly` and the failure that caused it. A viewport must never silently
|
|
915
|
+
* pass for the whole page.
|
|
806
916
|
* @param tabId - the tab to capture.
|
|
807
917
|
* @param options - what to cover, as `chrome_screenshot` asked.
|
|
808
|
-
* @returns the image data URL, whether the fallback produced it,
|
|
809
|
-
*
|
|
918
|
+
* @returns the image data URL, whether the fallback produced it, whether it
|
|
919
|
+
* could not honour the requested scope, and why the primary route failed.
|
|
810
920
|
*/
|
|
811
921
|
async function takeScreenshot(tabId, options) {
|
|
922
|
+
const id = Number(tabId)
|
|
923
|
+
if (!Number.isInteger(id)) throw new Error(`无效的标签页 id:${String(tabId)}`)
|
|
924
|
+
let failure
|
|
812
925
|
try {
|
|
813
|
-
const base64 = await captureViaDebugger(
|
|
926
|
+
const base64 = await captureViaDebugger(id, options)
|
|
814
927
|
return { dataUrl: 'data:image/jpeg;base64,' + base64, fallback: false, viewportOnly: false }
|
|
815
928
|
} catch (error) {
|
|
816
|
-
|
|
817
|
-
|
|
818
|
-
|
|
819
|
-
|
|
820
|
-
|
|
821
|
-
|
|
822
|
-
|
|
823
|
-
|
|
824
|
-
|
|
825
|
-
|
|
826
|
-
|
|
827
|
-
//
|
|
828
|
-
//
|
|
829
|
-
|
|
830
|
-
const reason = String((visibleError && visibleError.message) || visibleError)
|
|
831
|
-
throw new Error(`该标签页被另一个调试器占用(例如已打开 DevTools),调试通道无法截图;可视区域回退也失败:${reason}`)
|
|
929
|
+
failure = error
|
|
930
|
+
}
|
|
931
|
+
const primary = String((failure && failure.message) || failure)
|
|
932
|
+
try {
|
|
933
|
+
return {
|
|
934
|
+
dataUrl: await captureVisibleTab(id),
|
|
935
|
+
fallback: true,
|
|
936
|
+
viewportOnly: options !== undefined && (
|
|
937
|
+
options.fullPage === true
|
|
938
|
+
|| (typeof options.selector === 'string' && options.selector !== '')
|
|
939
|
+
),
|
|
940
|
+
// DevTools' conflict has one cause worth naming; every other failure is
|
|
941
|
+
// already an error message the caller can read.
|
|
942
|
+
reason: debuggerOwnedByDevTools(failure) ? 'DevTools 占用了该标签页的调试通道' : primary,
|
|
832
943
|
}
|
|
944
|
+
} catch (visibleError) {
|
|
945
|
+
// Both routes failed: report both, because closing DevTools or bringing the
|
|
946
|
+
// window forward fixes one of them and the caller should know which.
|
|
947
|
+
const secondary = String((visibleError && visibleError.message) || visibleError)
|
|
948
|
+
throw new Error(`截图失败(调试通道:${primary};可视区域回退:${secondary})`)
|
|
833
949
|
}
|
|
834
950
|
}
|
|
835
951
|
|
|
@@ -1481,4 +1597,7 @@ function typeInto(selector, text, clear) {
|
|
|
1481
1597
|
return true
|
|
1482
1598
|
}
|
|
1483
1599
|
|
|
1600
|
+
// Release captures from a host that is gone before dialling the new one: a
|
|
1601
|
+
// wake-up after a crash must not keep the debug bar alive on its own.
|
|
1602
|
+
void releaseCapturesIfHostGone()
|
|
1484
1603
|
connect()
|
package/lib/backend.d.ts
CHANGED
|
@@ -40,12 +40,14 @@ export interface ScreenshotOutcome {
|
|
|
40
40
|
/** Actual encoding, so a JPEG is never handed over under a `.png` name. */
|
|
41
41
|
mime?: string;
|
|
42
42
|
/**
|
|
43
|
-
* Present when
|
|
44
|
-
*
|
|
43
|
+
* Present when the debugger capture failed and the viewport-only fallback had
|
|
44
|
+
* to stand in for it.
|
|
45
45
|
*/
|
|
46
46
|
fallback?: 'visible-tab';
|
|
47
47
|
/** True when the fallback could not honour the requested fullPage/selector. */
|
|
48
48
|
viewportOnly?: boolean;
|
|
49
|
+
/** Why the debugger capture failed, so the warning can name the cause. */
|
|
50
|
+
fallbackReason?: string;
|
|
49
51
|
}
|
|
50
52
|
/** One tab as tools and the picker see it. */
|
|
51
53
|
export interface BackendTab {
|
|
@@ -304,6 +306,15 @@ export declare class ExtensionBackend implements BrowserBackend {
|
|
|
304
306
|
private conn;
|
|
305
307
|
/** What the extension last said about itself; null before its first hello. */
|
|
306
308
|
private extension;
|
|
309
|
+
/**
|
|
310
|
+
* Tabs this host is still capturing. Sent to a newly connected extension so
|
|
311
|
+
* it can detach captures left over from a previous host — a restarted host
|
|
312
|
+
* holds none, and the debug bar must not survive the session that asked for
|
|
313
|
+
* it. Kept in step with {@link startConsole} / {@link stopConsole}.
|
|
314
|
+
*/
|
|
315
|
+
private readonly consoles;
|
|
316
|
+
/** Whether the currently attached extension has been sent `console-sync`. */
|
|
317
|
+
private consoleSynced;
|
|
307
318
|
/**
|
|
308
319
|
* The stale build stamp an automatic reload was last asked for, or null.
|
|
309
320
|
*
|
|
@@ -390,6 +401,17 @@ export declare class ExtensionBackend implements BrowserBackend {
|
|
|
390
401
|
* hand. `chrome.runtime.reload()` is the only thing that re-reads them.
|
|
391
402
|
*/
|
|
392
403
|
private noteExtensionHello;
|
|
404
|
+
/**
|
|
405
|
+
* Send the host's capture set to a freshly connected extension, once.
|
|
406
|
+
*
|
|
407
|
+
* The extension persists console captures across service-worker suspensions
|
|
408
|
+
* and re-arms them on every reconnect — including a reconnect to a NEW host
|
|
409
|
+
* process, which holds no buffers and would silently receive events nobody
|
|
410
|
+
* reads while Chrome keeps showing its "debugging this browser" bar. Naming
|
|
411
|
+
* the set lets the extension detach the leftovers. Extensions older than the
|
|
412
|
+
* op keep the old re-arm behaviour.
|
|
413
|
+
*/
|
|
414
|
+
private reconcileConsoles;
|
|
393
415
|
/**
|
|
394
416
|
* Refuse an op the connected extension does not advertise.
|
|
395
417
|
*
|
package/lib/backend.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../src/backend.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../src/backend.ts"],"names":[],"mappings":"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"}
|
package/lib/backend.js
CHANGED
|
@@ -292,6 +292,15 @@ export class ExtensionBackend {
|
|
|
292
292
|
conn = null;
|
|
293
293
|
/** What the extension last said about itself; null before its first hello. */
|
|
294
294
|
extension = null;
|
|
295
|
+
/**
|
|
296
|
+
* Tabs this host is still capturing. Sent to a newly connected extension so
|
|
297
|
+
* it can detach captures left over from a previous host — a restarted host
|
|
298
|
+
* holds none, and the debug bar must not survive the session that asked for
|
|
299
|
+
* it. Kept in step with {@link startConsole} / {@link stopConsole}.
|
|
300
|
+
*/
|
|
301
|
+
consoles = new Set();
|
|
302
|
+
/** Whether the currently attached extension has been sent `console-sync`. */
|
|
303
|
+
consoleSynced = false;
|
|
295
304
|
/**
|
|
296
305
|
* The stale build stamp an automatic reload was last asked for, or null.
|
|
297
306
|
*
|
|
@@ -329,6 +338,9 @@ export class ExtensionBackend {
|
|
|
329
338
|
}
|
|
330
339
|
/** The WS upgrade route calls this after a successful handshake. */
|
|
331
340
|
attach(socket, head) {
|
|
341
|
+
// A new connection has its own capture set to reconcile, whoever wrote the
|
|
342
|
+
// previous one.
|
|
343
|
+
this.consoleSynced = false;
|
|
332
344
|
// A reconnecting client may attach while another (stale) socket is still
|
|
333
345
|
// registered; replace it without leaking the previous connection.
|
|
334
346
|
if (this.conn !== null)
|
|
@@ -523,21 +535,33 @@ export class ExtensionBackend {
|
|
|
523
535
|
const outcome = { data: '', path: result.path };
|
|
524
536
|
if (result.mime !== undefined)
|
|
525
537
|
outcome.mime = result.mime;
|
|
526
|
-
// Absent on the normal route. Present when
|
|
538
|
+
// Absent on the normal route. Present when the debugger capture failed and
|
|
527
539
|
// the visible-window capture had to stand in for it.
|
|
528
540
|
if (result.fallback === 'visible-tab') {
|
|
529
541
|
outcome.fallback = 'visible-tab';
|
|
530
542
|
if (result.viewportOnly === true)
|
|
531
543
|
outcome.viewportOnly = true;
|
|
544
|
+
if (typeof result.reason === 'string' && result.reason !== '')
|
|
545
|
+
outcome.fallbackReason = result.reason;
|
|
532
546
|
}
|
|
533
547
|
return outcome;
|
|
534
548
|
}
|
|
535
549
|
async startConsole(tabId) {
|
|
536
550
|
// The extension attaches its debugger and forwards events; it also persists
|
|
537
551
|
// the capture set, so a service worker that Chrome suspends re-arms it.
|
|
538
|
-
|
|
552
|
+
// Remember it here as well: a reconnected extension is told which captures
|
|
553
|
+
// this host still holds, and detaches every other one.
|
|
554
|
+
this.consoles.add(tabId);
|
|
555
|
+
try {
|
|
556
|
+
await this.push('console-start', { tabId });
|
|
557
|
+
}
|
|
558
|
+
catch (error) {
|
|
559
|
+
this.consoles.delete(tabId);
|
|
560
|
+
throw error;
|
|
561
|
+
}
|
|
539
562
|
}
|
|
540
563
|
async stopConsole(tabId) {
|
|
564
|
+
this.consoles.delete(tabId);
|
|
541
565
|
await this.push('console-stop', { tabId });
|
|
542
566
|
}
|
|
543
567
|
dispose() {
|
|
@@ -585,6 +609,7 @@ export class ExtensionBackend {
|
|
|
585
609
|
? message.ops.filter((op) => typeof op === 'string')
|
|
586
610
|
: [];
|
|
587
611
|
this.extension = { version, ops, build };
|
|
612
|
+
this.reconcileConsoles();
|
|
588
613
|
const expected = extensionStamp(import.meta.url);
|
|
589
614
|
if (build === '' || expected === '' || build === expected) {
|
|
590
615
|
this.reloadIneffective = false;
|
|
@@ -606,6 +631,24 @@ export class ExtensionBackend {
|
|
|
606
631
|
// distinct to the in-flight dedupe rather than one request twice.
|
|
607
632
|
void this.push('reload', { build }).then(() => { this.reloadAskedFor = build; }, () => undefined);
|
|
608
633
|
}
|
|
634
|
+
/**
|
|
635
|
+
* Send the host's capture set to a freshly connected extension, once.
|
|
636
|
+
*
|
|
637
|
+
* The extension persists console captures across service-worker suspensions
|
|
638
|
+
* and re-arms them on every reconnect — including a reconnect to a NEW host
|
|
639
|
+
* process, which holds no buffers and would silently receive events nobody
|
|
640
|
+
* reads while Chrome keeps showing its "debugging this browser" bar. Naming
|
|
641
|
+
* the set lets the extension detach the leftovers. Extensions older than the
|
|
642
|
+
* op keep the old re-arm behaviour.
|
|
643
|
+
*/
|
|
644
|
+
reconcileConsoles() {
|
|
645
|
+
if (this.consoleSynced || this.extension === null)
|
|
646
|
+
return;
|
|
647
|
+
if (!this.extension.ops.includes('console-sync'))
|
|
648
|
+
return;
|
|
649
|
+
this.consoleSynced = true;
|
|
650
|
+
void this.push('console-sync', { tabs: [...this.consoles] }).catch(() => undefined);
|
|
651
|
+
}
|
|
609
652
|
/**
|
|
610
653
|
* Refuse an op the connected extension does not advertise.
|
|
611
654
|
*
|