@pyrokine/mcp-chrome 3.0.0 → 3.1.0
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 +721 -303
- package/README_zh.md +750 -292
- package/dist/cdp/client.d.ts +7 -3
- package/dist/cdp/client.d.ts.map +1 -1
- package/dist/cdp/client.js +252 -63
- package/dist/cdp/client.js.map +1 -1
- package/dist/cdp/launcher.d.ts +1 -1
- package/dist/cdp/launcher.d.ts.map +1 -1
- package/dist/cdp/launcher.js +33 -12
- package/dist/cdp/launcher.js.map +1 -1
- package/dist/core/auto-wait.d.ts.map +1 -1
- package/dist/core/auto-wait.js +88 -52
- package/dist/core/auto-wait.js.map +1 -1
- package/dist/core/browser-driver.d.ts +76 -18
- package/dist/core/browser-driver.d.ts.map +1 -1
- package/dist/core/browser-driver.js.map +1 -1
- package/dist/core/browser-event-schema.d.ts +287 -0
- package/dist/core/browser-event-schema.d.ts.map +1 -0
- package/dist/core/browser-event-schema.js +104 -0
- package/dist/core/browser-event-schema.js.map +1 -0
- package/dist/core/browser-events.d.ts +99 -0
- package/dist/core/browser-events.d.ts.map +1 -0
- package/dist/core/browser-events.js +1312 -0
- package/dist/core/browser-events.js.map +1 -0
- package/dist/core/challenge-page.d.ts +39 -0
- package/dist/core/challenge-page.d.ts.map +1 -0
- package/dist/core/challenge-page.js +226 -0
- package/dist/core/challenge-page.js.map +1 -0
- package/dist/core/dom-helpers.d.ts +28 -0
- package/dist/core/dom-helpers.d.ts.map +1 -0
- package/dist/core/dom-helpers.js +311 -0
- package/dist/core/dom-helpers.js.map +1 -0
- package/dist/core/errors.d.ts +10 -4
- package/dist/core/errors.d.ts.map +1 -1
- package/dist/core/errors.js +63 -13
- package/dist/core/errors.js.map +1 -1
- package/dist/core/file-upload.d.ts +22 -0
- package/dist/core/file-upload.d.ts.map +1 -0
- package/dist/core/file-upload.js +194 -0
- package/dist/core/file-upload.js.map +1 -0
- package/dist/core/locator.d.ts +17 -2
- package/dist/core/locator.d.ts.map +1 -1
- package/dist/core/locator.js +156 -212
- package/dist/core/locator.js.map +1 -1
- package/dist/core/os-mouse.d.ts +11 -0
- package/dist/core/os-mouse.d.ts.map +1 -1
- package/dist/core/os-mouse.js +102 -29
- package/dist/core/os-mouse.js.map +1 -1
- package/dist/core/retry.d.ts.map +1 -1
- package/dist/core/retry.js +4 -1
- package/dist/core/retry.js.map +1 -1
- package/dist/core/session.d.ts +65 -14
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +1089 -273
- package/dist/core/session.js.map +1 -1
- package/dist/core/types.d.ts +5 -1
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js +16 -1
- package/dist/core/types.js.map +1 -1
- package/dist/core/unified-session.d.ts +50 -41
- package/dist/core/unified-session.d.ts.map +1 -1
- package/dist/core/unified-session.js +938 -285
- package/dist/core/unified-session.js.map +1 -1
- package/dist/core/utils.d.ts +5 -4
- package/dist/core/utils.d.ts.map +1 -1
- package/dist/core/utils.js +73 -18
- package/dist/core/utils.js.map +1 -1
- package/dist/extension/bridge.d.ts +50 -19
- package/dist/extension/bridge.d.ts.map +1 -1
- package/dist/extension/bridge.js +289 -57
- package/dist/extension/bridge.js.map +1 -1
- package/dist/extension/http-server.d.ts +7 -2
- package/dist/extension/http-server.d.ts.map +1 -1
- package/dist/extension/http-server.js +219 -48
- package/dist/extension/http-server.js.map +1 -1
- package/dist/index.js +14 -1
- package/dist/index.js.map +1 -1
- package/dist/tools/browse.d.ts.map +1 -1
- package/dist/tools/browse.js +66 -32
- package/dist/tools/browse.js.map +1 -1
- package/dist/tools/browser-event-output.d.ts +7 -0
- package/dist/tools/browser-event-output.d.ts.map +1 -0
- package/dist/tools/browser-event-output.js +19 -0
- package/dist/tools/browser-event-output.js.map +1 -0
- package/dist/tools/challenge.d.ts +17 -5
- package/dist/tools/challenge.d.ts.map +1 -1
- package/dist/tools/challenge.js +113 -195
- package/dist/tools/challenge.js.map +1 -1
- package/dist/tools/cookies.d.ts.map +1 -1
- package/dist/tools/cookies.js +33 -8
- package/dist/tools/cookies.js.map +1 -1
- package/dist/tools/diagnostics.d.ts.map +1 -1
- package/dist/tools/diagnostics.js +14 -0
- package/dist/tools/diagnostics.js.map +1 -1
- package/dist/tools/evaluate.d.ts +6 -5
- package/dist/tools/evaluate.d.ts.map +1 -1
- package/dist/tools/evaluate.js +102 -52
- package/dist/tools/evaluate.js.map +1 -1
- package/dist/tools/extract.d.ts.map +1 -1
- package/dist/tools/extract.js +178 -124
- package/dist/tools/extract.js.map +1 -1
- package/dist/tools/input.d.ts.map +1 -1
- package/dist/tools/input.js +623 -271
- package/dist/tools/input.js.map +1 -1
- package/dist/tools/logs.d.ts.map +1 -1
- package/dist/tools/logs.js +50 -11
- package/dist/tools/logs.js.map +1 -1
- package/dist/tools/manage.d.ts.map +1 -1
- package/dist/tools/manage.js +127 -46
- package/dist/tools/manage.js.map +1 -1
- package/dist/tools/network-sanitizer.d.ts +1 -0
- package/dist/tools/network-sanitizer.d.ts.map +1 -1
- package/dist/tools/network-sanitizer.js +30 -1
- package/dist/tools/network-sanitizer.js.map +1 -1
- package/dist/tools/page-context.d.ts +4 -3
- package/dist/tools/page-context.d.ts.map +1 -1
- package/dist/tools/page-context.js +56 -14
- package/dist/tools/page-context.js.map +1 -1
- package/dist/tools/post-condition.d.ts +1 -1
- package/dist/tools/post-condition.d.ts.map +1 -1
- package/dist/tools/post-condition.js +153 -47
- package/dist/tools/post-condition.js.map +1 -1
- package/dist/tools/schema.d.ts +7 -4
- package/dist/tools/schema.d.ts.map +1 -1
- package/dist/tools/schema.js +32 -122
- package/dist/tools/schema.js.map +1 -1
- package/dist/tools/target-diagnostics.d.ts +10 -2
- package/dist/tools/target-diagnostics.d.ts.map +1 -1
- package/dist/tools/target-diagnostics.js +74 -21
- package/dist/tools/target-diagnostics.js.map +1 -1
- package/dist/tools/wait.d.ts.map +1 -1
- package/dist/tools/wait.js +108 -42
- package/dist/tools/wait.js.map +1 -1
- package/extension/dist/assets/{content.ts-C4imZ6A9.js → content.ts-BAMOcF3R.js} +1 -1
- package/extension/dist/assets/{content.ts-loader-CnJuCGhl.js → content.ts-loader-4F9a1EWZ.js} +1 -1
- package/extension/dist/assets/index.ts-B79g2ikq.js +19820 -0
- package/extension/dist/assets/{page-scripts-CMIY1zhd.js → page-scripts-CSxn58h1.js} +300 -410
- package/extension/dist/assets/{popup.html-CgtWL6Py.js → popup.html-DwwHo00N.js} +8 -6
- package/extension/dist/manifest.json +4 -4
- package/extension/dist/service-worker-loader.js +1 -1
- package/extension/dist/src/popup/popup.html +3 -3
- package/package.json +15 -7
- package/scripts/start-chrome.ps1 +9 -1
- package/extension/dist/assets/index.ts-GeHNZBml.js +0 -8972
package/dist/cdp/launcher.js
CHANGED
|
@@ -9,6 +9,7 @@ import { homedir, platform } from 'os';
|
|
|
9
9
|
import { join, win32 } from 'path';
|
|
10
10
|
import { BrowserNotFoundError, TimeoutError } from '../core/errors.js';
|
|
11
11
|
import { DEFAULT_TIMEOUT } from '../core/types.js';
|
|
12
|
+
import { remainingNavigationTimeout } from '../core/utils.js';
|
|
12
13
|
/**
|
|
13
14
|
* 默认 profile 目录(固定路径,保留 cookies 和登录状态)
|
|
14
15
|
*/
|
|
@@ -55,9 +56,9 @@ function readWindowsAppPaths() {
|
|
|
55
56
|
timeout: 2000,
|
|
56
57
|
});
|
|
57
58
|
if (result.status === 0) {
|
|
58
|
-
const value = result.stdout.match(/REG_(?:EXPAND_)?SZ\s+([^\r\n]+)/i)?.[1]?.trim();
|
|
59
|
+
const value = result.stdout.match(/REG_(?:EXPAND_)?SZ\s+(?<registryValue>[^\r\n]+)/i)?.[1]?.trim();
|
|
59
60
|
if (value) {
|
|
60
|
-
paths.push(value.replace(/%([^%]+)%/g, (raw, key) => process.env[key] ?? raw));
|
|
61
|
+
paths.push(value.replace(/%(?<variable>[^%]+)%/g, (raw, key) => process.env[key] ?? raw));
|
|
61
62
|
}
|
|
62
63
|
}
|
|
63
64
|
}
|
|
@@ -100,8 +101,11 @@ export class BrowserLauncher {
|
|
|
100
101
|
/**
|
|
101
102
|
* 启动浏览器
|
|
102
103
|
*/
|
|
103
|
-
async launch(options = {}) {
|
|
104
|
+
async launch(options = {}, signal, deadline) {
|
|
104
105
|
const { executablePath, port = 0, incognito = false, headless = false, userDataDir, timeout = DEFAULT_TIMEOUT, } = options;
|
|
106
|
+
deadline = Math.min(deadline ?? Infinity, Date.now() + timeout);
|
|
107
|
+
signal?.throwIfAborted();
|
|
108
|
+
remainingNavigationTimeout(deadline);
|
|
105
109
|
// 查找 Chrome
|
|
106
110
|
const chromePath = executablePath ?? findChrome();
|
|
107
111
|
if (!chromePath) {
|
|
@@ -129,14 +133,18 @@ export class BrowserLauncher {
|
|
|
129
133
|
}
|
|
130
134
|
}
|
|
131
135
|
// 构建启动参数
|
|
136
|
+
signal?.throwIfAborted();
|
|
137
|
+
remainingNavigationTimeout(deadline);
|
|
132
138
|
const args = this.buildArgs({ port, incognito, headless, userDataDir });
|
|
133
139
|
// 启动进程
|
|
140
|
+
signal?.throwIfAborted();
|
|
141
|
+
remainingNavigationTimeout(deadline);
|
|
134
142
|
this.process = spawn(chromePath, args, {
|
|
135
143
|
detached: false,
|
|
136
144
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
137
145
|
});
|
|
138
146
|
// 等待 CDP 端点就绪
|
|
139
|
-
return this.waitForEndpoint(
|
|
147
|
+
return this.waitForEndpoint(Math.max(0, deadline - Date.now()), signal);
|
|
140
148
|
}
|
|
141
149
|
/**
|
|
142
150
|
* 关闭浏览器
|
|
@@ -200,29 +208,35 @@ export class BrowserLauncher {
|
|
|
200
208
|
/**
|
|
201
209
|
* 等待 CDP 端点就绪
|
|
202
210
|
*/
|
|
203
|
-
waitForEndpoint(timeout) {
|
|
211
|
+
waitForEndpoint(timeout, signal) {
|
|
204
212
|
return new Promise((resolve, reject) => {
|
|
205
213
|
if (!this.process) {
|
|
206
214
|
reject(new Error('浏览器进程未启动'));
|
|
207
215
|
return;
|
|
208
216
|
}
|
|
217
|
+
const child = this.process;
|
|
209
218
|
let settled = false;
|
|
210
219
|
let stderr = '';
|
|
211
220
|
let stderrLineBuffer = '';
|
|
212
|
-
const stderrStream =
|
|
221
|
+
const stderrStream = child.stderr;
|
|
213
222
|
const timer = setTimeout(() => {
|
|
214
223
|
fail(new TimeoutError(`等待浏览器启动超时 (${timeout}ms)`), true);
|
|
215
224
|
}, timeout);
|
|
216
225
|
const cleanup = () => {
|
|
217
226
|
clearTimeout(timer);
|
|
218
227
|
stderrStream?.removeListener('data', onStderr);
|
|
219
|
-
|
|
220
|
-
|
|
228
|
+
child.removeListener('error', onError);
|
|
229
|
+
child.removeListener('exit', onExit);
|
|
230
|
+
signal?.removeEventListener('abort', onAbort);
|
|
221
231
|
};
|
|
222
232
|
const finish = (url) => {
|
|
223
233
|
if (settled) {
|
|
224
234
|
return;
|
|
225
235
|
}
|
|
236
|
+
if (signal?.aborted) {
|
|
237
|
+
onAbort();
|
|
238
|
+
return;
|
|
239
|
+
}
|
|
226
240
|
settled = true;
|
|
227
241
|
cleanup();
|
|
228
242
|
resolve(url);
|
|
@@ -233,12 +247,15 @@ export class BrowserLauncher {
|
|
|
233
247
|
}
|
|
234
248
|
settled = true;
|
|
235
249
|
cleanup();
|
|
236
|
-
if (killProcess &&
|
|
237
|
-
|
|
250
|
+
if (killProcess && !child.killed) {
|
|
251
|
+
child.kill();
|
|
252
|
+
}
|
|
253
|
+
if (this.process === child && killProcess) {
|
|
238
254
|
this.process = null;
|
|
239
255
|
}
|
|
240
256
|
reject(error);
|
|
241
257
|
};
|
|
258
|
+
const onAbort = () => fail(signal?.reason ?? new Error('Request cancelled'), true);
|
|
242
259
|
const onStderr = (data) => {
|
|
243
260
|
const chunk = data.toString();
|
|
244
261
|
stderr += chunk;
|
|
@@ -284,8 +301,12 @@ export class BrowserLauncher {
|
|
|
284
301
|
}
|
|
285
302
|
};
|
|
286
303
|
stderrStream?.on('data', onStderr);
|
|
287
|
-
|
|
288
|
-
|
|
304
|
+
child.on('error', onError);
|
|
305
|
+
child.on('exit', onExit);
|
|
306
|
+
signal?.addEventListener('abort', onAbort, { once: true });
|
|
307
|
+
if (signal?.aborted) {
|
|
308
|
+
onAbort();
|
|
309
|
+
}
|
|
289
310
|
});
|
|
290
311
|
}
|
|
291
312
|
}
|
package/dist/cdp/launcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../src/cdp/launcher.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAgB,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACtE,OAAO,EAAE,eAAe,EAAsB,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../src/cdp/launcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-wait.d.ts","sourceRoot":"","sources":["../../src/core/auto-wait.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"auto-wait.d.ts","sourceRoot":"","sources":["../../src/core/auto-wait.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAMjD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,wBAAwB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;CACnB;AAED;;GAEG;AACH,qBAAa,QAAQ;IAKb,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,SAAS;IALrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAQ;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IAEjC,YACY,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,MAAM,EACzB,OAAO,GAAE,eAAoB,EAIhC;IAED;;;;;OAKG;IACG,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BlD;IAED;;;;;OAKG;IACG,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsC5D;IAED;;;;;OAKG;IACG,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiCpD;IAED;;;;OAIG;IACG,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BlD;IAED;;;;OAIG;IACG,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmDpD;IAED;;;;OAIG;IACG,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKrD;IAED;;;;OAIG;IACH,OAAO,CAAC,IAAI;IAIZ;;OAEG;IACH,OAAO,CAAC,SAAS;CAGpB"}
|
package/dist/core/auto-wait.js
CHANGED
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
*
|
|
9
9
|
* 核心思想:操作前自动检查元素状态,失败则重试,而非立即报错
|
|
10
10
|
*/
|
|
11
|
+
import { installDomHelpers } from './dom-helpers.js';
|
|
11
12
|
import { StructuredToolError } from './errors.js';
|
|
12
13
|
import { withRetry } from './retry.js';
|
|
13
14
|
import { DEFAULT_TIMEOUT } from './types.js';
|
|
@@ -34,18 +35,25 @@ export class AutoWait {
|
|
|
34
35
|
async waitForEnabled(nodeId) {
|
|
35
36
|
await withRetry(async () => {
|
|
36
37
|
const { object } = (await this.send('DOM.resolveNode', { nodeId }));
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
38
|
+
try {
|
|
39
|
+
const { result } = (await this.send('Runtime.callFunctionOn', {
|
|
40
|
+
objectId: object.objectId,
|
|
41
|
+
functionDeclaration: `function() {
|
|
40
42
|
if (!(this instanceof HTMLElement)) return true;
|
|
41
43
|
const formControls = ['BUTTON', 'INPUT', 'SELECT', 'TEXTAREA'];
|
|
42
44
|
if (!formControls.includes(this.nodeName)) return true;
|
|
43
45
|
return !this.hasAttribute('disabled');
|
|
44
46
|
}`,
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
47
|
+
returnByValue: true,
|
|
48
|
+
}));
|
|
49
|
+
if (!result.value) {
|
|
50
|
+
throw new Error('元素处于禁用状态');
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
finally {
|
|
54
|
+
await this.cdp
|
|
55
|
+
.send('Runtime.releaseObject', { objectId: object.objectId }, this.sessionId)
|
|
56
|
+
.catch(() => { });
|
|
49
57
|
}
|
|
50
58
|
}, { timeout: this.remaining() });
|
|
51
59
|
}
|
|
@@ -58,22 +66,29 @@ export class AutoWait {
|
|
|
58
66
|
async waitForStableBoundingBox(nodeId) {
|
|
59
67
|
await withRetry(async () => {
|
|
60
68
|
const { object } = (await this.send('DOM.resolveNode', { nodeId }));
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
69
|
+
try {
|
|
70
|
+
const params = {
|
|
71
|
+
objectId: object.objectId,
|
|
72
|
+
functionDeclaration: `function() {
|
|
64
73
|
const { x, y, width, height } = this.getBoundingClientRect();
|
|
65
74
|
return { x, y, width, height };
|
|
66
75
|
}`,
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
76
|
+
returnByValue: true,
|
|
77
|
+
};
|
|
78
|
+
const { result: first } = (await this.send('Runtime.callFunctionOn', params));
|
|
79
|
+
await new Promise((resolve) => setTimeout(resolve, Math.min(32, this.remaining())));
|
|
80
|
+
const { result: second } = (await this.send('Runtime.callFunctionOn', params));
|
|
81
|
+
if (first.value.x !== second.value.x ||
|
|
82
|
+
first.value.y !== second.value.y ||
|
|
83
|
+
first.value.width !== second.value.width ||
|
|
84
|
+
first.value.height !== second.value.height) {
|
|
85
|
+
throw new Error('元素位置不稳定');
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
finally {
|
|
89
|
+
await this.cdp
|
|
90
|
+
.send('Runtime.releaseObject', { objectId: object.objectId }, this.sessionId)
|
|
91
|
+
.catch(() => { });
|
|
77
92
|
}
|
|
78
93
|
}, { timeout: this.remaining() });
|
|
79
94
|
}
|
|
@@ -85,27 +100,32 @@ export class AutoWait {
|
|
|
85
100
|
*/
|
|
86
101
|
async ensureInViewport(nodeId) {
|
|
87
102
|
const { object } = (await this.send('DOM.resolveNode', { nodeId }));
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
103
|
+
try {
|
|
104
|
+
// 检查是否在视口内
|
|
105
|
+
const { result: isInViewport } = (await this.send('Runtime.callFunctionOn', {
|
|
106
|
+
objectId: object.objectId,
|
|
107
|
+
functionDeclaration: `function() {
|
|
92
108
|
const rect = this.getBoundingClientRect();
|
|
93
109
|
return rect.top >= 0 && rect.left >= 0 &&
|
|
94
110
|
rect.bottom <= window.innerHeight &&
|
|
95
111
|
rect.right <= window.innerWidth;
|
|
96
112
|
}`,
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
113
|
+
returnByValue: true,
|
|
114
|
+
}));
|
|
115
|
+
// 如果不在视口内,滚动到视口中
|
|
116
|
+
if (!isInViewport.value) {
|
|
117
|
+
await this.send('Runtime.callFunctionOn', {
|
|
118
|
+
objectId: object.objectId,
|
|
119
|
+
functionDeclaration: `function() {
|
|
104
120
|
this.scrollIntoView({ block: 'center', inline: 'center', behavior: 'instant' });
|
|
105
121
|
}`,
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
122
|
+
});
|
|
123
|
+
// 等待滚动完成
|
|
124
|
+
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
finally {
|
|
128
|
+
await this.cdp.send('Runtime.releaseObject', { objectId: object.objectId }, this.sessionId).catch(() => { });
|
|
109
129
|
}
|
|
110
130
|
}
|
|
111
131
|
/**
|
|
@@ -116,19 +136,26 @@ export class AutoWait {
|
|
|
116
136
|
async waitForVisible(nodeId) {
|
|
117
137
|
await withRetry(async () => {
|
|
118
138
|
const { object } = (await this.send('DOM.resolveNode', { nodeId }));
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
139
|
+
try {
|
|
140
|
+
const { result } = (await this.send('Runtime.callFunctionOn', {
|
|
141
|
+
objectId: object.objectId,
|
|
142
|
+
functionDeclaration: `function() {
|
|
122
143
|
const style = window.getComputedStyle(this);
|
|
123
|
-
if (style.visibility === 'hidden') return false;
|
|
144
|
+
if (style.visibility === 'hidden' || style.visibility === 'collapse') return false;
|
|
124
145
|
if (style.display === 'none') return false;
|
|
125
146
|
const rect = this.getBoundingClientRect();
|
|
126
147
|
return rect.width > 0 && rect.height > 0;
|
|
127
148
|
}`,
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
149
|
+
returnByValue: true,
|
|
150
|
+
}));
|
|
151
|
+
if (!result.value) {
|
|
152
|
+
throw new Error('元素不可见');
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
finally {
|
|
156
|
+
await this.cdp
|
|
157
|
+
.send('Runtime.releaseObject', { objectId: object.objectId }, this.sessionId)
|
|
158
|
+
.catch(() => { });
|
|
132
159
|
}
|
|
133
160
|
}, { timeout: this.remaining() });
|
|
134
161
|
}
|
|
@@ -144,15 +171,17 @@ export class AutoWait {
|
|
|
144
171
|
await this.ensureInViewport(nodeId);
|
|
145
172
|
await withRetry(async () => {
|
|
146
173
|
const { object } = (await this.send('DOM.resolveNode', { nodeId }));
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
174
|
+
try {
|
|
175
|
+
const { result } = (await this.send('Runtime.callFunctionOn', {
|
|
176
|
+
objectId: object.objectId,
|
|
177
|
+
functionDeclaration: `function() {
|
|
178
|
+
(${installDomHelpers.toString()})();
|
|
150
179
|
const rect = this.getBoundingClientRect();
|
|
151
180
|
const clickPoint = {x: rect.x + rect.width / 2, y: rect.y + rect.height / 2};
|
|
152
|
-
const top =
|
|
181
|
+
const top = globalThis.__mcpDomHelpers.deepElementFromPoint(clickPoint.x, clickPoint.y);
|
|
153
182
|
const describe = el => el.tagName.toLowerCase() + (el.id ? '#' + CSS.escape(el.id) : '');
|
|
154
183
|
const plainRect = r => ({x: r.x, y: r.y, width: r.width, height: r.height});
|
|
155
|
-
const covered =
|
|
184
|
+
const covered = !globalThis.__mcpDomHelpers.containsComposed(this, top);
|
|
156
185
|
return {
|
|
157
186
|
actionable: this.isConnected && !covered,
|
|
158
187
|
reason: !this.isConnected ? 'not-connected' : !top ? 'not-in-viewport' : 'covered',
|
|
@@ -160,14 +189,21 @@ export class AutoWait {
|
|
|
160
189
|
coveringElement: covered && top ? describe(top).slice(0, 500) : undefined,
|
|
161
190
|
candidates: document.elementsFromPoint(clickPoint.x, clickPoint.y).slice(0, 10).map(el => ({
|
|
162
191
|
tag: el.tagName.toLowerCase(), selector: describe(el).slice(0, 500),
|
|
163
|
-
text: (el.textContent || '').trim().slice(0, 160),
|
|
192
|
+
text: (el.textContent || '').trim().slice(0, 160),
|
|
193
|
+
rect: plainRect(el.getBoundingClientRect())
|
|
164
194
|
}))
|
|
165
195
|
};
|
|
166
196
|
}`,
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
197
|
+
returnByValue: true,
|
|
198
|
+
}));
|
|
199
|
+
if (!result.value.actionable) {
|
|
200
|
+
throw new StructuredToolError('ACTIONABILITY_FAILED', '点击目标无法接收鼠标事件,未执行点击', '请根据 rect、clickPoint 和 coveringElement 关闭遮罩或调整 target;直接触发目标事件需明确使用 force', result.value);
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
finally {
|
|
204
|
+
await this.cdp
|
|
205
|
+
.send('Runtime.releaseObject', { objectId: object.objectId }, this.sessionId)
|
|
206
|
+
.catch(() => { });
|
|
171
207
|
}
|
|
172
208
|
}, { timeout: this.remaining() });
|
|
173
209
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-wait.js","sourceRoot":"","sources":["../../src/core/auto-wait.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"auto-wait.js","sourceRoot":"","sources":["../../src/core/auto-wait.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAY,eAAe,EAAE,MAAM,YAAY,CAAA;AAUtD;;GAEG;AACH,MAAM,OAAO,QAAQ;IAKL,GAAG;IACH,SAAS;IALJ,OAAO,CAAQ;IACf,QAAQ,CAAQ;IAEjC,YACY,GAAc,EACd,SAAiB,EACzB,OAAO,GAAoB,EAAE;mBAFrB,GAAG;yBACH,SAAS;QAGjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,eAAe,CAAA;QACjD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAA;IAC7C,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAAC,MAAc;QAC/B,MAAM,SAAS,CACX,KAAK,IAAI,EAAE;YACP,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,CAAC,CAEjE,CAAA;YAED,IAAI,CAAC;gBACD,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE;oBAC1D,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,mBAAmB,EAAE;;;;;YAKjC;oBACY,aAAa,EAAE,IAAI;iBACtB,CAAC,CAAmC,CAAA;gBAErC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;oBAChB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,CAAA;gBAC/B,CAAC;YACL,CAAC;oBAAS,CAAC;gBACP,MAAM,IAAI,CAAC,GAAG;qBACT,IAAI,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC;qBAC5E,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;YACxB,CAAC;QACL,CAAC,EACD,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,CAChC,CAAA;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,wBAAwB,CAAC,MAAc;QACzC,MAAM,SAAS,CACX,KAAK,IAAI,EAAE;YACP,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,CAAC,CAEjE,CAAA;YACD,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG;oBACX,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,mBAAmB,EAAE;;;sBAGvB;oBACE,aAAa,EAAE,IAAI;iBACtB,CAAA;gBACD,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAE3E,CAAA;gBACD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAA;gBACnF,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAE5E,CAAA;gBACD,IACI,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC;oBAChC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC;oBAChC,KAAK,CAAC,KAAK,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC,KAAK;oBACxC,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAAC,KAAK,CAAC,MAAM,EAC5C,CAAC;oBACC,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;gBAC9B,CAAC;YACL,CAAC;oBAAS,CAAC;gBACP,MAAM,IAAI,CAAC,GAAG;qBACT,IAAI,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC;qBAC5E,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;YACxB,CAAC;QACL,CAAC,EACD,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,CAChC,CAAA;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,gBAAgB,CAAC,MAAc;QACjC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,CAAC,CAEjE,CAAA;QAED,IAAI,CAAC;YACD,WAAW;YACX,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE;gBACxE,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,mBAAmB,EAAE;;;;;QAK7B;gBACQ,aAAa,EAAE,IAAI;aACtB,CAAC,CAAmC,CAAA;YAErC,iBAAiB;YACjB,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;gBACtB,MAAM,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE;oBACtC,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,mBAAmB,EAAE;;UAE/B;iBACO,CAAC,CAAA;gBAEF,SAAS;gBACT,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;YAC5D,CAAC;QACL,CAAC;gBAAS,CAAC;YACP,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QAC/G,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,cAAc,CAAC,MAAc;QAC/B,MAAM,SAAS,CACX,KAAK,IAAI,EAAE;YACP,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,CAAC,CAEjE,CAAA;YAED,IAAI,CAAC;gBACD,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE;oBAC1D,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,mBAAmB,EAAE;;;;;;YAMjC;oBACY,aAAa,EAAE,IAAI;iBACtB,CAAC,CAAmC,CAAA;gBAErC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;oBAChB,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;gBAC5B,CAAC;YACL,CAAC;oBAAS,CAAC;gBACP,MAAM,IAAI,CAAC,GAAG;qBACT,IAAI,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC;qBAC5E,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;YACxB,CAAC;QACL,CAAC,EACD,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,CAChC,CAAA;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,gBAAgB,CAAC,MAAc;QACjC,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QACjC,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QACjC,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAA;QAC3C,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;QACnC,MAAM,SAAS,CACX,KAAK,IAAI,EAAE;YACP,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,CAAC,CAEjE,CAAA;YACD,IAAI,CAAC;gBACD,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE;oBAC1D,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,mBAAmB,EAAE;uBACtB,iBAAiB,CAAC,QAAQ,EAAE;;;;;;;;;;;;;;;;;;kBAkBjC;oBACM,aAAa,EAAE,IAAI;iBACtB,CAAC,CAA6E,CAAA;gBAC/E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;oBAC3B,MAAM,IAAI,mBAAmB,CACzB,sBAAsB,EACtB,oBAAoB,EACpB,0EAA0E,EAC1E,MAAM,CAAC,KAAK,CACf,CAAA;gBACL,CAAC;YACL,CAAC;oBAAS,CAAC;gBACP,MAAM,IAAI,CAAC,GAAG;qBACT,IAAI,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC;qBAC5E,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;YACxB,CAAC;QACL,CAAC,EACD,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,CAChC,CAAA;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,iBAAiB,CAAC,MAAc;QAClC,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QACjC,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;QACjC,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAA;QAC3C,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;IACvC,CAAC;IAED;;;;OAIG;IACK,IAAI,CAAI,MAAc,EAAE,MAAe;QAC3C,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;IAC1E,CAAC;IAED;;OAEG;IACK,SAAS;QACb,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;IAClD,CAAC;CACJ"}
|
|
@@ -8,6 +8,40 @@
|
|
|
8
8
|
* 业务操作统一走 driver.X,状态管理(getDriver/ensureExtensionConnected)保留作为入口
|
|
9
9
|
*/
|
|
10
10
|
import type { ConsoleLogEntry, NetworkRequestEntry } from './types.js';
|
|
11
|
+
import type { BrowserEventAction, EventCommand } from './browser-events.js';
|
|
12
|
+
import type { SemanticTarget } from './dom-helpers.js';
|
|
13
|
+
export type { SemanticTarget } from './dom-helpers.js';
|
|
14
|
+
export type UserActionKind = 'evaluate' | 'input';
|
|
15
|
+
export interface BrowserRequestContext {
|
|
16
|
+
signal?: AbortSignal;
|
|
17
|
+
deadline?: number;
|
|
18
|
+
budgetError?: Error;
|
|
19
|
+
keyboardFocus?: {
|
|
20
|
+
id: string;
|
|
21
|
+
targetId: string;
|
|
22
|
+
warning?: string;
|
|
23
|
+
};
|
|
24
|
+
pendingPageCondition?: {
|
|
25
|
+
targetId: string;
|
|
26
|
+
expectedUrl?: string;
|
|
27
|
+
expectedRevision?: string;
|
|
28
|
+
} | null;
|
|
29
|
+
userAction?: {
|
|
30
|
+
kind: UserActionKind;
|
|
31
|
+
dispatched: boolean;
|
|
32
|
+
phase: 'preparation' | 'precondition';
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
export type FrameSelection = string | number | Array<string | number>;
|
|
36
|
+
export interface CookieScope {
|
|
37
|
+
targetId?: string;
|
|
38
|
+
storeId?: string;
|
|
39
|
+
browserContextId?: string;
|
|
40
|
+
partitionKey?: {
|
|
41
|
+
topLevelSite?: string;
|
|
42
|
+
hasCrossSiteAncestor?: boolean;
|
|
43
|
+
};
|
|
44
|
+
}
|
|
11
45
|
export interface NavigateOptions {
|
|
12
46
|
wait?: 'load' | 'domcontentloaded' | 'networkidle';
|
|
13
47
|
timeout?: number;
|
|
@@ -45,7 +79,7 @@ export interface NetworkRequestOptions {
|
|
|
45
79
|
urlPattern?: string;
|
|
46
80
|
clear?: boolean;
|
|
47
81
|
}
|
|
48
|
-
export interface CookieFilter {
|
|
82
|
+
export interface CookieFilter extends CookieScope {
|
|
49
83
|
url?: string;
|
|
50
84
|
name?: string;
|
|
51
85
|
domain?: string;
|
|
@@ -53,7 +87,7 @@ export interface CookieFilter {
|
|
|
53
87
|
secure?: boolean;
|
|
54
88
|
session?: boolean;
|
|
55
89
|
}
|
|
56
|
-
export interface SetCookieParams {
|
|
90
|
+
export interface SetCookieParams extends CookieScope {
|
|
57
91
|
name: string;
|
|
58
92
|
value: string;
|
|
59
93
|
url?: string;
|
|
@@ -94,6 +128,8 @@ export interface InteractiveElementInfo {
|
|
|
94
128
|
refId: string;
|
|
95
129
|
role: string;
|
|
96
130
|
name: string;
|
|
131
|
+
type?: string;
|
|
132
|
+
value?: string;
|
|
97
133
|
selector: string;
|
|
98
134
|
visible: boolean;
|
|
99
135
|
disabled: boolean;
|
|
@@ -134,6 +170,7 @@ export interface ActionabilityDiagnosticCandidate {
|
|
|
134
170
|
}
|
|
135
171
|
export interface ActionableClickResult {
|
|
136
172
|
success: boolean;
|
|
173
|
+
warning?: string;
|
|
137
174
|
error?: string;
|
|
138
175
|
reason?: string;
|
|
139
176
|
coveringElement?: string;
|
|
@@ -209,7 +246,19 @@ export interface DriverState {
|
|
|
209
246
|
title: string;
|
|
210
247
|
managed?: boolean;
|
|
211
248
|
}
|
|
249
|
+
export interface PageMetadata {
|
|
250
|
+
origin: 'created' | 'adopted' | 'unknown';
|
|
251
|
+
createdBy: 'mcp-chrome' | 'unknown';
|
|
252
|
+
createdAt: string | null;
|
|
253
|
+
lastUsedAt: string | null;
|
|
254
|
+
taskHint?: string;
|
|
255
|
+
note?: string;
|
|
256
|
+
}
|
|
257
|
+
export interface TargetListOptions {
|
|
258
|
+
preserveDefaultTarget?: boolean;
|
|
259
|
+
}
|
|
212
260
|
export interface ListedTarget {
|
|
261
|
+
metadata?: PageMetadata;
|
|
213
262
|
id: number | string;
|
|
214
263
|
targetId?: string;
|
|
215
264
|
url: string;
|
|
@@ -264,7 +313,7 @@ export interface BrowserTopology {
|
|
|
264
313
|
focusedWindowId?: number;
|
|
265
314
|
activeTargetId?: string;
|
|
266
315
|
windows: BrowserWindowInfo[];
|
|
267
|
-
groups
|
|
316
|
+
groups?: BrowserTabGroupInfo[];
|
|
268
317
|
}
|
|
269
318
|
export interface BrowserTabGroupInfo {
|
|
270
319
|
id: number;
|
|
@@ -293,6 +342,8 @@ export interface GroupPagesOptions {
|
|
|
293
342
|
}
|
|
294
343
|
export type UpdateGroupOptions = Pick<GroupPagesOptions, 'title' | 'color' | 'collapsed'>;
|
|
295
344
|
export interface NewPageOptions {
|
|
345
|
+
taskHint?: string | null;
|
|
346
|
+
note?: string | null;
|
|
296
347
|
windowId?: number;
|
|
297
348
|
index?: number;
|
|
298
349
|
groupId?: number;
|
|
@@ -362,7 +413,7 @@ export interface NewTabResult extends Omit<ListedTarget, 'id'> {
|
|
|
362
413
|
* 消费者:UnifiedSessionManager(unified-session.ts)
|
|
363
414
|
*
|
|
364
415
|
* 设计约定:
|
|
365
|
-
* - Extension 独有的能力(refId 操作、stealth、
|
|
416
|
+
* - Extension 独有的能力(refId 操作、stealth、actionable、dispatch、drag/drop)
|
|
366
417
|
* 在 CDP 实现里 throw(保持业务语义而非伪造结果)
|
|
367
418
|
* - precise 输入接口(inputKey/inputMouse/inputTouch/inputType)两侧实现一致语义
|
|
368
419
|
* - modifiers 由调用方维护并通过 options 传入,driver 不持有键盘修饰键状态
|
|
@@ -379,10 +430,10 @@ export interface IBrowserDriver {
|
|
|
379
430
|
getHtmlWithImages(selector?: string, outer?: boolean): Promise<HtmlWithImagesResult>;
|
|
380
431
|
getMetadata(): Promise<Record<string, unknown>>;
|
|
381
432
|
getFrames?(): Promise<Record<string, unknown>>;
|
|
382
|
-
find(selector?: string, text?: string, xpath?: string, timeout?: number): Promise<FindResult[]>;
|
|
433
|
+
find(selector?: string, text?: string, xpath?: string, timeout?: number, semanticOrMatchIndex?: SemanticTarget | number, matchIndex?: number): Promise<FindResult[]>;
|
|
383
434
|
/** Extension 真做;CDP throw(CDP 模式应通过 input 工具坐标点击) */
|
|
384
|
-
click(refId: string): Promise<void>;
|
|
385
|
-
actionableClick(refId: string, force?: boolean): Promise<ActionableClickResult>;
|
|
435
|
+
click(refId: string, timeout?: number, modifiers?: number): Promise<void>;
|
|
436
|
+
actionableClick(refId: string, force?: boolean, timeout?: number, modifiers?: number): Promise<ActionableClickResult>;
|
|
386
437
|
checkActionability(refId: string): Promise<ActionableClickResult>;
|
|
387
438
|
dispatchInput(refId: string, text: string): Promise<DispatchInputResult>;
|
|
388
439
|
dragAndDrop(srcRefId: string, dstRefId: string): Promise<DragAndDropResult>;
|
|
@@ -390,13 +441,13 @@ export interface IBrowserDriver {
|
|
|
390
441
|
typeRef(refId: string, text: string, clear?: boolean): Promise<void>;
|
|
391
442
|
scrollAt(x: number, y: number, refId?: string): Promise<void>;
|
|
392
443
|
getAttribute(selector: string | undefined, refId: string | undefined, attribute: string): Promise<string | null>;
|
|
393
|
-
inputKey(type: InputKeyType, options?: InputKeyOptions): Promise<void>;
|
|
444
|
+
inputKey(type: InputKeyType, options?: InputKeyOptions, timeout?: number): Promise<void>;
|
|
394
445
|
inputMouse(type: InputMouseType, x: number, y: number, options?: InputMouseOptions, timeout?: number): Promise<void>;
|
|
395
446
|
inputTouch(type: InputTouchType, touchPoints: InputTouchPoint[]): Promise<void>;
|
|
396
447
|
inputType(text: string, delay?: number, timeout?: number): Promise<void>;
|
|
397
|
-
stealthKey(key: string, type: 'down' | 'up' | 'press', modifiers: string[]): Promise<void>;
|
|
398
|
-
stealthClick(x: number, y: number, button?: string, clickCount?: number, refId?: string, timeout?: number): Promise<void>;
|
|
399
|
-
stealthMouse(type: string, x: number, y: number, button?: string, timeout?: number): Promise<void>;
|
|
448
|
+
stealthKey(key: string, type: 'down' | 'up' | 'press', modifiers: string[], timeout?: number): Promise<void>;
|
|
449
|
+
stealthClick(x: number, y: number, button?: string, clickCount?: number, refId?: string, timeout?: number, modifiers?: number): Promise<void>;
|
|
450
|
+
stealthMouse(type: string, x: number, y: number, button?: string, timeout?: number, modifiers?: number): Promise<void>;
|
|
400
451
|
stealthType(text: string, delay?: number, timeout?: number): Promise<void>;
|
|
401
452
|
stealthInject(): Promise<void>;
|
|
402
453
|
getCookies(filter?: CookieFilter): Promise<Array<{
|
|
@@ -411,7 +462,7 @@ export interface IBrowserDriver {
|
|
|
411
462
|
session?: boolean;
|
|
412
463
|
}>>;
|
|
413
464
|
setCookie(params: SetCookieParams): Promise<void>;
|
|
414
|
-
deleteCookie(url: string, name: string): Promise<void>;
|
|
465
|
+
deleteCookie(url: string, name: string, scope?: CookieScope): Promise<void>;
|
|
415
466
|
/**
|
|
416
467
|
* 清除 cookies,合同条款:filter 必须含 url 或 domain,name 只能进一步缩小范围,
|
|
417
468
|
* 实现层应拒绝无站点范围的清除(防止跨站误清同名登录态)
|
|
@@ -424,8 +475,8 @@ export interface IBrowserDriver {
|
|
|
424
475
|
getConsoleLogs(options?: ConsoleLogOptions): Promise<ConsoleLogEntry[]>;
|
|
425
476
|
getNetworkRequests(options?: NetworkRequestOptions): Promise<NetworkRequestEntry[]>;
|
|
426
477
|
getChallengeState(): Promise<boolean>;
|
|
427
|
-
listTargets(timeout?: number): Promise<ListedTarget[]>;
|
|
428
|
-
listWindows?(timeout?: number): Promise<BrowserTopology>;
|
|
478
|
+
listTargets(timeout?: number, options?: TargetListOptions): Promise<ListedTarget[]>;
|
|
479
|
+
listWindows?(timeout?: number, options?: TargetListOptions): Promise<BrowserTopology>;
|
|
429
480
|
setReadAccess?(targetId: string, allow: boolean): Promise<Record<string, unknown>>;
|
|
430
481
|
adoptPage?(targetId: string): Promise<ManagedPageResult>;
|
|
431
482
|
releasePage?(targetId: string): Promise<ManagedPageResult>;
|
|
@@ -443,8 +494,13 @@ export interface IBrowserDriver {
|
|
|
443
494
|
updateGroup?(groupId: number, options: UpdateGroupOptions): Promise<GroupManagementResult>;
|
|
444
495
|
moveGroup?(groupId: number, options: Pick<MovePageOptions, 'windowId' | 'index'>): Promise<GroupManagementResult>;
|
|
445
496
|
newPage(url?: string, timeout?: number, options?: NewPageOptions): Promise<NewTabResult>;
|
|
497
|
+
setPageMetadata?(targetId: string, updates: {
|
|
498
|
+
taskHint?: string | null;
|
|
499
|
+
note?: string | null;
|
|
500
|
+
}): Promise<PageMetadata>;
|
|
446
501
|
closePage(targetId: string): Promise<void | PageManagementResult>;
|
|
447
502
|
activatePage(targetId: string): Promise<void>;
|
|
503
|
+
activatePageWithAffected?(targetId: string): Promise<PageManagementResult>;
|
|
448
504
|
selectPage(targetId: string, timeout?: number): Promise<void>;
|
|
449
505
|
getCurrentTargetId(): string | null;
|
|
450
506
|
setCurrentTargetId(targetId: string | null): void;
|
|
@@ -460,13 +516,12 @@ export interface IBrowserDriver {
|
|
|
460
516
|
expectedRevision?: string;
|
|
461
517
|
} | null): void;
|
|
462
518
|
getState(): DriverState | null;
|
|
463
|
-
/**
|
|
464
|
-
resolveFrame(frame:
|
|
519
|
+
/** Extension 使用原生 frame/document 身份;CDP 使用 frame tree、执行上下文和所属 target session */
|
|
520
|
+
resolveFrame(frame: FrameSelection, timeout?: number): Promise<FrameResolveResult>;
|
|
465
521
|
getCurrentFrameId(): number;
|
|
466
522
|
setCurrentFrameId(frameId: number): void;
|
|
467
523
|
/**
|
|
468
|
-
*
|
|
469
|
-
* CDP 实现 throw 'iframe 穿透需要 Extension 模式'
|
|
524
|
+
* 在已解析的 frame scope 中执行 JS,保留原生异常与 stale-context 状态
|
|
470
525
|
*/
|
|
471
526
|
evaluateInFrame(frameId: number, expression: string, timeout?: number, staleContextRetry?: StaleContextRetryPolicy): Promise<{
|
|
472
527
|
result?: {
|
|
@@ -484,6 +539,9 @@ export interface IBrowserDriver {
|
|
|
484
539
|
staleContextRetry?: StaleContextRetryPolicy;
|
|
485
540
|
frameContext?: Record<string, unknown>;
|
|
486
541
|
}>;
|
|
542
|
+
browserEvents(action: BrowserEventAction, command: EventCommand, targetId?: string, timeout?: number): Promise<Record<string, unknown>>;
|
|
543
|
+
browserFetchCommand?(method: string, params?: Record<string, unknown>, targetId?: string): Promise<unknown>;
|
|
544
|
+
suspendBrowserEventsForChallenge?(): Promise<Record<string, unknown>>;
|
|
487
545
|
/**
|
|
488
546
|
* 发送 CDP 命令;
|
|
489
547
|
* Extension:经 chrome.debugger.sendCommand 转发;
|