@pyrokine/mcp-chrome 2.4.1 → 2.4.4
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 +213 -158
- package/README_zh.md +245 -187
- package/dist/anti-detection/behavior.js +1 -1
- package/dist/anti-detection/behavior.js.map +1 -1
- package/dist/anti-detection/injection.d.ts.map +1 -1
- package/dist/anti-detection/injection.js +2 -1
- package/dist/anti-detection/injection.js.map +1 -1
- package/dist/cdp/client.d.ts +2 -2
- package/dist/cdp/client.d.ts.map +1 -1
- package/dist/cdp/client.js +7 -4
- package/dist/cdp/client.js.map +1 -1
- package/dist/core/browser-driver.d.ts +3 -2
- package/dist/core/browser-driver.d.ts.map +1 -1
- package/dist/core/browser-driver.js +1 -0
- package/dist/core/browser-driver.js.map +1 -1
- package/dist/core/errors.d.ts +9 -0
- package/dist/core/errors.d.ts.map +1 -1
- package/dist/core/errors.js +16 -1
- package/dist/core/errors.js.map +1 -1
- package/dist/core/os-mouse.d.ts +65 -0
- package/dist/core/os-mouse.d.ts.map +1 -0
- package/dist/core/os-mouse.js +334 -0
- package/dist/core/os-mouse.js.map +1 -0
- package/dist/core/session.d.ts +14 -4
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +159 -54
- package/dist/core/session.js.map +1 -1
- package/dist/core/types.d.ts +10 -0
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js +2 -0
- package/dist/core/types.js.map +1 -1
- package/dist/core/unified-session.d.ts +24 -3
- package/dist/core/unified-session.d.ts.map +1 -1
- package/dist/core/unified-session.js +143 -25
- package/dist/core/unified-session.js.map +1 -1
- package/dist/extension/bridge.d.ts +16 -0
- package/dist/extension/bridge.d.ts.map +1 -1
- package/dist/extension/bridge.js +27 -0
- package/dist/extension/bridge.js.map +1 -1
- package/dist/extension/http-server.d.ts.map +1 -1
- package/dist/extension/http-server.js +6 -1
- package/dist/extension/http-server.js.map +1 -1
- package/dist/tools/browse.d.ts +1 -1
- package/dist/tools/browse.d.ts.map +1 -1
- package/dist/tools/browse.js +72 -26
- package/dist/tools/browse.js.map +1 -1
- package/dist/tools/challenge.d.ts +153 -0
- package/dist/tools/challenge.d.ts.map +1 -0
- package/dist/tools/challenge.js +573 -0
- package/dist/tools/challenge.js.map +1 -0
- package/dist/tools/cookies.d.ts.map +1 -1
- package/dist/tools/cookies.js +8 -4
- package/dist/tools/cookies.js.map +1 -1
- package/dist/tools/diagnostics.d.ts +2 -2
- package/dist/tools/diagnostics.d.ts.map +1 -1
- package/dist/tools/diagnostics.js +26 -8
- package/dist/tools/diagnostics.js.map +1 -1
- package/dist/tools/evaluate.d.ts.map +1 -1
- package/dist/tools/evaluate.js +61 -9
- package/dist/tools/evaluate.js.map +1 -1
- package/dist/tools/extract.d.ts.map +1 -1
- package/dist/tools/extract.js +110 -51
- package/dist/tools/extract.js.map +1 -1
- package/dist/tools/input.d.ts.map +1 -1
- package/dist/tools/input.js +148 -22
- package/dist/tools/input.js.map +1 -1
- package/dist/tools/logs.js +2 -2
- package/dist/tools/logs.js.map +1 -1
- package/dist/tools/manage.d.ts.map +1 -1
- package/dist/tools/manage.js +20 -7
- package/dist/tools/manage.js.map +1 -1
- package/dist/tools/network-sanitizer.d.ts.map +1 -1
- package/dist/tools/network-sanitizer.js +1 -0
- package/dist/tools/network-sanitizer.js.map +1 -1
- package/dist/tools/png.js +5 -3
- package/dist/tools/png.js.map +1 -1
- package/dist/tools/post-condition.d.ts.map +1 -1
- package/dist/tools/post-condition.js +12 -3
- package/dist/tools/post-condition.js.map +1 -1
- package/dist/tools/target-diagnostics.d.ts +7 -0
- package/dist/tools/target-diagnostics.d.ts.map +1 -1
- package/dist/tools/target-diagnostics.js +18 -1
- package/dist/tools/target-diagnostics.js.map +1 -1
- package/dist/tools/wait.d.ts.map +1 -1
- package/dist/tools/wait.js +41 -39
- package/dist/tools/wait.js.map +1 -1
- package/extension/dist/assets/{index.ts-GG6dPUPX.js → index.ts-Bqcu2qiN.js} +286 -9
- package/extension/dist/manifest.json +1 -1
- package/extension/dist/service-worker-loader.js +1 -1
- package/extension/dist/src/popup/popup.html +44 -44
- package/package.json +8 -7
- package/dist/extension/native-host-installer.d.ts +0 -21
- package/dist/extension/native-host-installer.d.ts.map +0 -1
- package/dist/extension/native-host-installer.js +0 -147
- package/dist/extension/native-host-installer.js.map +0 -1
- package/dist/extension/socket-server.d.ts +0 -32
- package/dist/extension/socket-server.d.ts.map +0 -1
- package/dist/extension/socket-server.js +0 -177
- package/dist/extension/socket-server.js.map +0 -1
- package/dist/extension/ws-server.d.ts +0 -40
- package/dist/extension/ws-server.d.ts.map +0 -1
- package/dist/extension/ws-server.js +0 -246
- package/dist/extension/ws-server.js.map +0 -1
- package/dist/native-host/index.js +0 -280
- package/dist/native-host/mcp-chrome-host +0 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../../src/tools/cookies.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EACH,eAAe,EACf,mBAAmB,EACnB,cAAc,EACd,iBAAiB,EACjB,uBAAuB,EACvB,eAAe,EACf,gBAAgB,GACnB,MAAM,kBAAkB,CAAA;AAEzB;;GAEG;AACH,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;IAClE,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,8BAA8B,CAAC;IACnE,IAAI,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../../src/tools/cookies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { getUnifiedSession } from '../core/index.js';
|
|
2
2
|
export type DiagnosticsStatus = 'disabled' | 'collected' | 'unavailable' | 'error';
|
|
3
3
|
interface DiagnosticsStart {
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
consoleLastEntry?: string;
|
|
5
|
+
networkLastEntry?: string;
|
|
6
6
|
}
|
|
7
7
|
export interface DiagnosticsResult {
|
|
8
8
|
diagnosticsStatus: DiagnosticsStatus;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../src/tools/diagnostics.ts"],"names":[],"mappings":"AACA,OAAO,EAAuC,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAGzF,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG,WAAW,GAAG,aAAa,GAAG,OAAO,CAAA;AAElF,UAAU,gBAAgB;IACtB,
|
|
1
|
+
{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../src/tools/diagnostics.ts"],"names":[],"mappings":"AACA,OAAO,EAAuC,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAGzF,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG,WAAW,GAAG,aAAa,GAAG,OAAO,CAAA;AAElF,UAAU,gBAAgB;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAED,MAAM,WAAW,iBAAiB;IAC9B,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAC5B;AAyBD,wBAAsB,gBAAgB,CAClC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpD,OAAO,EAAE,OAAO,GAAG,SAAS,GAC7B,OAAO,CAAC;IAAE,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,iBAAiB,CAAA;CAAE,CAAC,CAwBlE;AAED,wBAAsB,iBAAiB,CACnC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpD,OAAO,EAAE;IAAE,KAAK,CAAC,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,iBAAiB,CAAA;CAAE,GACjE,OAAO,CAAC,iBAAiB,CAAC,CA6B5B;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAQlG;AAED,KAAK,YAAY,GAAG;IAChB,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC9C,OAAO,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAanG;AAED,wBAAsB,uBAAuB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3E,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpD,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,MAAM,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACzB,OAAO,CAAC,YAAY,CAAC,CAWvB"}
|
|
@@ -4,6 +4,21 @@ import { sanitizeUrlRecords } from './network-sanitizer.js';
|
|
|
4
4
|
function errorSummary(error) {
|
|
5
5
|
return sanitizeErrorMessage(error instanceof Error ? error.message : String(error)).slice(0, 500);
|
|
6
6
|
}
|
|
7
|
+
function entryMarker(entry) {
|
|
8
|
+
return JSON.stringify(entry);
|
|
9
|
+
}
|
|
10
|
+
function entriesSince(entries, lastEntry) {
|
|
11
|
+
if (!lastEntry) {
|
|
12
|
+
return { entries, truncated: false };
|
|
13
|
+
}
|
|
14
|
+
for (let index = entries.length - 1; index >= 0; --index) {
|
|
15
|
+
if (entryMarker(entries[index]) === lastEntry) {
|
|
16
|
+
return { entries: entries.slice(index + 1), truncated: false };
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
// 旧 marker 已从环形缓冲淘汰,返回当前可用事件而不是伪装成没有增量
|
|
20
|
+
return { entries, truncated: true };
|
|
21
|
+
}
|
|
7
22
|
export async function startDiagnostics(unifiedSession, enabled) {
|
|
8
23
|
if (!enabled) {
|
|
9
24
|
return { result: { diagnosticsStatus: 'disabled' } };
|
|
@@ -14,7 +29,10 @@ export async function startDiagnostics(unifiedSession, enabled) {
|
|
|
14
29
|
const consoleLogs = await unifiedSession.getConsoleLogs();
|
|
15
30
|
const network = await unifiedSession.getNetworkRequests();
|
|
16
31
|
return {
|
|
17
|
-
start: {
|
|
32
|
+
start: {
|
|
33
|
+
consoleLastEntry: consoleLogs.length > 0 ? entryMarker(consoleLogs[consoleLogs.length - 1]) : undefined,
|
|
34
|
+
networkLastEntry: network.length > 0 ? entryMarker(network[network.length - 1]) : undefined,
|
|
35
|
+
},
|
|
18
36
|
result: { diagnosticsStatus: 'collected' },
|
|
19
37
|
};
|
|
20
38
|
}
|
|
@@ -34,17 +52,16 @@ export async function finishDiagnostics(unifiedSession, started) {
|
|
|
34
52
|
try {
|
|
35
53
|
const consoleLogs = await unifiedSession.getConsoleLogs();
|
|
36
54
|
const network = await unifiedSession.getNetworkRequests();
|
|
55
|
+
const consoleDelta = entriesSince(consoleLogs, started.start.consoleLastEntry);
|
|
56
|
+
const networkDelta = entriesSince(network, started.start.networkLastEntry);
|
|
37
57
|
return {
|
|
38
58
|
diagnosticsStatus: 'collected',
|
|
39
59
|
diagnostics: {
|
|
40
|
-
console: sanitizeUrlRecords(
|
|
41
|
-
|
|
42
|
-
.filter((item) => ['error', 'warning', 'warn'].includes(item.level))
|
|
43
|
-
.slice(-20)),
|
|
44
|
-
failedRequests: sanitizeUrlRecords(network
|
|
45
|
-
.slice(started.start.networkCount)
|
|
60
|
+
console: sanitizeUrlRecords(consoleDelta.entries.filter((item) => ['error', 'warning', 'warn'].includes(item.level)).slice(-20)),
|
|
61
|
+
failedRequests: sanitizeUrlRecords(networkDelta.entries
|
|
46
62
|
.filter((item) => item.errorText || (item.status !== undefined && item.status >= 400))
|
|
47
63
|
.slice(-20)),
|
|
64
|
+
truncated: consoleDelta.truncated || networkDelta.truncated,
|
|
48
65
|
},
|
|
49
66
|
};
|
|
50
67
|
}
|
|
@@ -66,8 +83,9 @@ export function appendDiagnostics(target, result) {
|
|
|
66
83
|
}
|
|
67
84
|
export function appendDiagnosticsToResponse(response, result) {
|
|
68
85
|
const text = response.content[0]?.text;
|
|
69
|
-
if (!text)
|
|
86
|
+
if (!text) {
|
|
70
87
|
return;
|
|
88
|
+
}
|
|
71
89
|
try {
|
|
72
90
|
const payload = JSON.parse(text);
|
|
73
91
|
appendDiagnostics(payload, result);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../src/tools/diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAqB,MAAM,kBAAkB,CAAA;AACzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAe3D,SAAS,YAAY,CAAC,KAAc;IAChC,OAAO,oBAAoB,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;AACrG,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAClC,cAAoD,EACpD,OAA4B;IAE5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,EAAE,MAAM,EAAE,EAAE,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAA;IACxD,CAAC;IACD,IAAI,CAAC;QACD,MAAM,cAAc,CAAC,aAAa,EAAE,CAAA;QACpC,MAAM,cAAc,CAAC,aAAa,EAAE,CAAA;QACpC,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,cAAc,EAAE,CAAA;QACzD,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,kBAAkB,EAAE,CAAA;QACzD,OAAO;YACH,KAAK,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../src/tools/diagnostics.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluate.d.ts","sourceRoot":"","sources":["../../src/tools/evaluate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;
|
|
1
|
+
{"version":3,"file":"evaluate.d.ts","sourceRoot":"","sources":["../../src/tools/evaluate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;AAGxE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAYxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAyH3D,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAE1E;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,uBAAuB,GAAG,SAAS,GAAG,uBAAuB,CAEnH;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG;IACzD,cAAc,EAAE,OAAO,CAAA;IACvB,YAAY,EAAE,QAAQ,GAAG,SAAS,CAAA;IAClC,SAAS,EAAE,OAAO,CAAA;CACrB,CAeA;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,GAAG;IACrD,cAAc,EAAE,OAAO,CAAA;IACvB,YAAY,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAA;IAChD,YAAY,EAAE,QAAQ,GAAG,QAAQ,CAAA;IACjC,SAAS,EAAE,OAAO,CAAA;CACrB,CAaA;AA2LD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAkB5D"}
|
package/dist/tools/evaluate.js
CHANGED
|
@@ -7,6 +7,7 @@ import { readFile } from 'fs/promises';
|
|
|
7
7
|
import { z } from 'zod';
|
|
8
8
|
import { CWD_PATH_PREFIX, formatErrorResponse, formatResponse, getUnifiedSession, resolveScopedInputPath, resolveScopedOutputPath, TMP_PATH_PREFIX, writePrivateFile, } from '../core/index.js';
|
|
9
9
|
import { EvaluateResultTooLargeError, NonSerializableEvaluateResultError } from '../core/types.js';
|
|
10
|
+
import { ChallengeDeniedError, ChallengeTimeoutError, resolveChallenge } from './challenge.js';
|
|
10
11
|
import { appendDiagnostics, finishDiagnostics, startDiagnostics } from './diagnostics.js';
|
|
11
12
|
import { postConditionSchema, waitForPostCondition } from './post-condition.js';
|
|
12
13
|
/**
|
|
@@ -29,7 +30,7 @@ const evaluateSchema = z.object({
|
|
|
29
30
|
timeout: z
|
|
30
31
|
.number()
|
|
31
32
|
.optional()
|
|
32
|
-
.describe('
|
|
33
|
+
.describe('超时(毫秒),含 Cloudflare Challenge 等待。Extension 模式作为端到端预算(含传输),CDP 模式作为脚本执行超时'),
|
|
33
34
|
mode: z
|
|
34
35
|
.enum(['stealth', 'precise'])
|
|
35
36
|
.optional()
|
|
@@ -38,7 +39,10 @@ const evaluateSchema = z.object({
|
|
|
38
39
|
.enum(['never', 'readOnly'])
|
|
39
40
|
.optional()
|
|
40
41
|
.describe('iframe precise 执行遇到 stale execution context 时的重试契约;默认 never 不重放,readOnly 表示脚本无副作用并允许重新解析 context 后重放一次'),
|
|
41
|
-
diagnostics: z
|
|
42
|
+
diagnostics: z
|
|
43
|
+
.boolean()
|
|
44
|
+
.optional()
|
|
45
|
+
.describe('执行后返回新增 console error/warning 和失败网络请求摘要。访问 Cloudflare 页面时默认不传;开启后会启用 debugger 日志采集'),
|
|
42
46
|
postCondition: postConditionSchema
|
|
43
47
|
.optional()
|
|
44
48
|
.describe('脚本执行后要验证的页面状态;不传时 success 只表示脚本已执行并返回,不表示业务结果已达成'),
|
|
@@ -51,6 +55,24 @@ const evaluateSchema = z.object({
|
|
|
51
55
|
.optional()
|
|
52
56
|
.describe('iframe 定位(可选,仅 Extension 模式),CSS 选择器(如 "iframe#main")或索引(如 0),不指定则在主框架执行'),
|
|
53
57
|
});
|
|
58
|
+
function invalidEvaluateInputResponse(message) {
|
|
59
|
+
return {
|
|
60
|
+
content: [
|
|
61
|
+
{
|
|
62
|
+
type: 'text',
|
|
63
|
+
text: JSON.stringify({
|
|
64
|
+
error: {
|
|
65
|
+
code: 'INVALID_ARGUMENT',
|
|
66
|
+
message,
|
|
67
|
+
},
|
|
68
|
+
actionExecuted: false,
|
|
69
|
+
actionStatus: 'not_started',
|
|
70
|
+
}),
|
|
71
|
+
},
|
|
72
|
+
],
|
|
73
|
+
isError: true,
|
|
74
|
+
};
|
|
75
|
+
}
|
|
54
76
|
function cspErrorResponse() {
|
|
55
77
|
return {
|
|
56
78
|
content: [
|
|
@@ -84,7 +106,7 @@ export function resolveStaleContextRetryPolicy(policy) {
|
|
|
84
106
|
}
|
|
85
107
|
export function classifyEvaluateActionError(error) {
|
|
86
108
|
const message = error instanceof Error ? error.message : String(error);
|
|
87
|
-
const preActionTimeout = /
|
|
109
|
+
const preActionTimeout = /(?:timeout|timed out) before/i.test(message);
|
|
88
110
|
const timedOut = !preActionTimeout && /Request timeout|timed out|timeout|超时/i.test(message);
|
|
89
111
|
const pageEvaluationStarted = /Evaluation failed|exception|ReferenceError|TypeError|SyntaxError|RangeError|URIError|(?:^|\n)Error:/i.test(message);
|
|
90
112
|
const executionStatusUnknown = timedOut || /FRAME_STALE_CONTEXT|FRAME_EVALUATION_FAILED|Execution context became stale/i.test(message);
|
|
@@ -110,13 +132,25 @@ export function classifyEvaluateFailure(error) {
|
|
|
110
132
|
}
|
|
111
133
|
function appendEvaluateFailureMetadata(response, error, verificationRequested, overrides = {}) {
|
|
112
134
|
const text = response.content[0]?.text;
|
|
113
|
-
if (!text)
|
|
135
|
+
if (!text) {
|
|
114
136
|
return undefined;
|
|
137
|
+
}
|
|
115
138
|
try {
|
|
116
139
|
const payload = JSON.parse(text);
|
|
117
|
-
|
|
140
|
+
const failure = error instanceof ChallengeTimeoutError || error instanceof ChallengeDeniedError
|
|
141
|
+
? {
|
|
142
|
+
actionExecuted: error.actionStatus === 'completed',
|
|
143
|
+
actionStatus: error.actionStatus,
|
|
144
|
+
failureStage: 'action',
|
|
145
|
+
retryable: error instanceof ChallengeTimeoutError,
|
|
146
|
+
verificationStatus: error instanceof ChallengeDeniedError ? 'blocked' : 'failed',
|
|
147
|
+
}
|
|
148
|
+
: {
|
|
149
|
+
...classifyEvaluateFailure(error),
|
|
150
|
+
verificationStatus: 'unavailable',
|
|
151
|
+
};
|
|
152
|
+
Object.assign(payload, failure, {
|
|
118
153
|
verificationRequested,
|
|
119
|
-
verificationStatus: 'unavailable',
|
|
120
154
|
...overrides,
|
|
121
155
|
});
|
|
122
156
|
return payload;
|
|
@@ -127,6 +161,11 @@ function appendEvaluateFailureMetadata(response, error, verificationRequested, o
|
|
|
127
161
|
}
|
|
128
162
|
async function handleEvaluate(args) {
|
|
129
163
|
// 输入校验:在 try 外提前返回,避免 throw-catch-in-place
|
|
164
|
+
const hasScript = args.script !== undefined && args.script.trim().length > 0;
|
|
165
|
+
const hasScriptFile = args.scriptFile !== undefined && args.scriptFile.trim().length > 0;
|
|
166
|
+
if (hasScript === hasScriptFile) {
|
|
167
|
+
return invalidEvaluateInputResponse('script 与 scriptFile 必须且只能提供一个');
|
|
168
|
+
}
|
|
130
169
|
let script = args.script;
|
|
131
170
|
let outputPath;
|
|
132
171
|
if (args.scriptFile) {
|
|
@@ -147,19 +186,22 @@ async function handleEvaluate(args) {
|
|
|
147
186
|
}
|
|
148
187
|
}
|
|
149
188
|
if (!script) {
|
|
150
|
-
return
|
|
189
|
+
return invalidEvaluateInputResponse('script 或 scriptFile 必须提供其一');
|
|
151
190
|
}
|
|
152
191
|
try {
|
|
153
192
|
const unifiedSession = getUnifiedSession();
|
|
154
193
|
return await unifiedSession.withTabId(args.tabId, async () => {
|
|
155
194
|
return await unifiedSession.withFrame(args.frame, async () => {
|
|
195
|
+
const startedAt = Date.now();
|
|
196
|
+
await resolveChallenge(unifiedSession, 'evaluate', 'not_started', args.timeout);
|
|
197
|
+
const remainingTimeout = args.timeout === undefined ? undefined : Math.max(0, args.timeout - (Date.now() - startedAt));
|
|
156
198
|
const diagnostics = await startDiagnostics(unifiedSession, args.diagnostics);
|
|
157
199
|
const evaluationMode = resolveEvaluateMode(args.mode);
|
|
158
200
|
const staleContextRetry = resolveStaleContextRetryPolicy(args.staleContextRetry);
|
|
159
201
|
let result;
|
|
160
202
|
let evaluationMetadata;
|
|
161
203
|
try {
|
|
162
|
-
result = await unifiedSession.evaluate(script, evaluationMode,
|
|
204
|
+
result = await unifiedSession.evaluate(script, evaluationMode, remainingTimeout, args.args, {
|
|
163
205
|
staleContextRetry,
|
|
164
206
|
});
|
|
165
207
|
evaluationMetadata = unifiedSession.consumeLastEvaluationMetadata();
|
|
@@ -183,6 +225,7 @@ async function handleEvaluate(args) {
|
|
|
183
225
|
: undefined;
|
|
184
226
|
const payload = {
|
|
185
227
|
success: postCondition ? postCondition.verificationStatus === 'matched' : true,
|
|
228
|
+
mode: unifiedSession.getMode(),
|
|
186
229
|
actionExecuted: true,
|
|
187
230
|
actionStatus: 'completed',
|
|
188
231
|
verificationRequested: Boolean(postCondition),
|
|
@@ -257,7 +300,16 @@ async function handleEvaluate(args) {
|
|
|
257
300
|
*/
|
|
258
301
|
export function registerEvaluateTool(server) {
|
|
259
302
|
server.registerTool('evaluate', {
|
|
260
|
-
description:
|
|
303
|
+
description: [
|
|
304
|
+
'在页面上下文执行 JavaScript。默认优先使用已连接的 Chrome Extension;',
|
|
305
|
+
'只有 Extension 不可用或 browse(action="connect", port=…) 已显式选择 CDP 时才使用 CDP。',
|
|
306
|
+
'访问 Cloudflare 时默认不传 diagnostics,Extension 先被动等待真实 tab 标题恢复,',
|
|
307
|
+
'持续存在可点击 Turnstile 时才点击。同页测试按钮走页面点击;',
|
|
308
|
+
'Extension inspect 走 isolated world,不先挂 debugger。',
|
|
309
|
+
'Cloudflare iframe 或宿主页验证按钮只在已聚焦窗口的活动受控 tab 上用系统鼠标,',
|
|
310
|
+
'Linux 用窗口原点加边距,沿路径移动、悬停后再按下抬起,混合窗口不会调用 focusWindow。',
|
|
311
|
+
'交互式验证码和 Access denied 无法自动完成',
|
|
312
|
+
].join(''),
|
|
261
313
|
inputSchema: evaluateSchema,
|
|
262
314
|
}, (args) => handleEvaluate(args));
|
|
263
315
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../src/tools/evaluate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"evaluate.js","sourceRoot":"","sources":["../../src/tools/evaluate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../src/tools/extract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;
|
|
1
|
+
{"version":3,"file":"extract.d.ts","sourceRoot":"","sources":["../../src/tools/extract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;AAu/CxE;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAS3D"}
|
package/dist/tools/extract.js
CHANGED
|
@@ -14,22 +14,24 @@ import { readFile } from 'fs/promises';
|
|
|
14
14
|
import { basename, extname, join } from 'path';
|
|
15
15
|
import { z } from 'zod';
|
|
16
16
|
import { CWD_PATH_PREFIX, formatErrorResponse, formatResponse, getSession, getUnifiedSession, resolveScopedOutputPath, TMP_PATH_PREFIX, writePrivateFile, } from '../core/index.js';
|
|
17
|
+
import { sanitizeUrlRecords } from './network-sanitizer.js';
|
|
17
18
|
import { comparePngImages, MAX_COMPARE_PIXELS, MAX_COMPARE_PNG_BYTES, readPngHeader } from './png.js';
|
|
18
19
|
import { targetToFindParams, targetZodSchema } from './schema.js';
|
|
19
|
-
import {
|
|
20
|
-
import { buildTargetDiagnostics, TargetTimeoutError } from './target-diagnostics.js';
|
|
20
|
+
import { buildTargetDiagnostics, TargetNotFoundError, TargetTimeoutError } from './target-diagnostics.js';
|
|
21
21
|
/** 无 output 时附录返回的最大图片数 */
|
|
22
22
|
const MAX_APPENDIX_IMAGES = 20;
|
|
23
23
|
/**
|
|
24
24
|
* extract 参数 schema
|
|
25
25
|
*/
|
|
26
|
-
const extractSchema = z
|
|
26
|
+
const extractSchema = z
|
|
27
|
+
.object({
|
|
27
28
|
type: z
|
|
28
29
|
.enum(['text', 'html', 'frameHtml', 'attribute', 'screenshot', 'state', 'metadata', 'diagnosticBundle'])
|
|
29
30
|
.describe('提取类型'),
|
|
30
31
|
target: targetZodSchema
|
|
31
32
|
.optional()
|
|
32
|
-
.describe('目标元素(attribute 必填;text/html 可选,省略则提取整个页面;
|
|
33
|
+
.describe('目标元素(attribute 必填;text/html 可选,省略则提取整个页面;' +
|
|
34
|
+
'screenshot 可选用于元素截图;state 可选(仅 Extension)用于返回目标子树;metadata 不需要)'),
|
|
33
35
|
attribute: z.string().optional().describe('属性名(attribute)'),
|
|
34
36
|
images: z
|
|
35
37
|
.enum(['info', 'data'])
|
|
@@ -69,16 +71,31 @@ const extractSchema = z.object({
|
|
|
69
71
|
.string()
|
|
70
72
|
.optional()
|
|
71
73
|
.describe('目标 Tab ID(可选,仅 Extension 模式),不指定则使用当前 attach 的 tab,可操作非当前 attach 的 tab,CDP 模式下不支持此参数'),
|
|
72
|
-
depth: z
|
|
74
|
+
depth: z
|
|
75
|
+
.number()
|
|
76
|
+
.int()
|
|
77
|
+
.nonnegative()
|
|
78
|
+
.optional()
|
|
79
|
+
.describe('DOM 遍历深度限制(state),默认 15,减小可降低返回数据量'),
|
|
73
80
|
mode: z
|
|
74
81
|
.enum(['accessibility', 'domsnapshot'])
|
|
75
82
|
.optional()
|
|
76
|
-
.describe('页面状态提取模式(state 类型有效),accessibility=可访问性树(默认,与原 read_page 一致),
|
|
83
|
+
.describe('页面状态提取模式(state 类型有效),accessibility=可访问性树(默认,与原 read_page 一致),' +
|
|
84
|
+
'domsnapshot=CDP DOMSnapshot 全量快照(仅 CDP 模式)'),
|
|
77
85
|
timeout: z.number().optional().describe('等待目标元素超时'),
|
|
78
86
|
frame: z
|
|
79
87
|
.union([z.string(), z.number()])
|
|
80
88
|
.optional()
|
|
81
89
|
.describe('iframe 定位(可选,仅 Extension 模式),CSS 选择器(如 "iframe#main")或索引(如 0),不指定则在主框架操作'),
|
|
90
|
+
})
|
|
91
|
+
.superRefine((args, context) => {
|
|
92
|
+
if (args.diffOutput && !args.compareWith) {
|
|
93
|
+
context.addIssue({
|
|
94
|
+
code: 'custom',
|
|
95
|
+
path: ['diffOutput'],
|
|
96
|
+
message: 'diffOutput 需要 compareWith 参数',
|
|
97
|
+
});
|
|
98
|
+
}
|
|
82
99
|
});
|
|
83
100
|
async function handleExtract(args) {
|
|
84
101
|
try {
|
|
@@ -204,22 +221,29 @@ async function handleAttributeExtract({ unifiedSession, session, useExtension },
|
|
|
204
221
|
}
|
|
205
222
|
async function handleScreenshotExtract({ unifiedSession, useExtension }, args) {
|
|
206
223
|
let clip;
|
|
207
|
-
if (args.target) {
|
|
224
|
+
if (args.target && !args.clip) {
|
|
208
225
|
const { selector, text, xpath, nth: nthParam } = targetToFindParams(args.target);
|
|
209
226
|
const nth = nthParam ?? 0;
|
|
210
|
-
const found = await unifiedSession.find(selector, text, xpath);
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
}
|
|
227
|
+
const found = await unifiedSession.find(selector, text, xpath, args.timeout);
|
|
228
|
+
const target = found[nth];
|
|
229
|
+
if (!target || target.rect.width <= 0 || target.rect.height <= 0) {
|
|
230
|
+
throw new TargetNotFoundError(await buildTargetDiagnostics(unifiedSession, args.target, {
|
|
231
|
+
nth,
|
|
232
|
+
timeout: args.timeout,
|
|
233
|
+
frame: args.frame,
|
|
234
|
+
matchCount: found.length,
|
|
235
|
+
lastState: target ? 'zero-size' : 'not-found',
|
|
236
|
+
candidates: found,
|
|
237
|
+
}));
|
|
222
238
|
}
|
|
239
|
+
const scrollOffset = args.frame === undefined ? await getPageScrollOffset(unifiedSession, args.timeout) : { x: 0, y: 0 };
|
|
240
|
+
const frameOffset = unifiedSession.getFrameOffset();
|
|
241
|
+
clip = {
|
|
242
|
+
x: target.rect.x + scrollOffset.x + (frameOffset?.x ?? 0),
|
|
243
|
+
y: target.rect.y + scrollOffset.y + (frameOffset?.y ?? 0),
|
|
244
|
+
width: target.rect.width,
|
|
245
|
+
height: target.rect.height,
|
|
246
|
+
};
|
|
223
247
|
}
|
|
224
248
|
clip = args.clip ?? clip;
|
|
225
249
|
const fullPage = clip ? false : (args.fullPage ?? false);
|
|
@@ -341,7 +365,7 @@ async function handleDomSnapshotState(unifiedSession, useExtension, args) {
|
|
|
341
365
|
async function handleDiagnosticBundleExtract({ unifiedSession, useExtension }, args) {
|
|
342
366
|
const state = await unifiedSession.getLiveState().catch(() => null);
|
|
343
367
|
const metadata = await unifiedSession.getMetadata();
|
|
344
|
-
const frames =
|
|
368
|
+
const frames = await unifiedSession.getFrames();
|
|
345
369
|
await unifiedSession.enableConsole();
|
|
346
370
|
await unifiedSession.enableNetwork();
|
|
347
371
|
const consoleLogs = sanitizeUrlRecords(await unifiedSession.getConsoleLogs());
|
|
@@ -367,7 +391,7 @@ async function handleDiagnosticBundleExtract({ unifiedSession, useExtension }, a
|
|
|
367
391
|
capabilities: {
|
|
368
392
|
screenshot: true,
|
|
369
393
|
hiddenTabScreenshot: useExtension,
|
|
370
|
-
frames:
|
|
394
|
+
frames: true,
|
|
371
395
|
},
|
|
372
396
|
};
|
|
373
397
|
const summary = {
|
|
@@ -392,9 +416,9 @@ async function handleDiagnosticBundleExtract({ unifiedSession, useExtension }, a
|
|
|
392
416
|
failedRequests: bundle.networkSummary.recentFailures,
|
|
393
417
|
});
|
|
394
418
|
}
|
|
395
|
-
async function handleMetadataExtract({ unifiedSession
|
|
419
|
+
async function handleMetadataExtract({ unifiedSession }, args) {
|
|
396
420
|
const metadata = await unifiedSession.getMetadata();
|
|
397
|
-
const frames =
|
|
421
|
+
const frames = await unifiedSession.getFrames();
|
|
398
422
|
if (args.output) {
|
|
399
423
|
const outputPath = await writeOutputFile(args.output, JSON.stringify({ ...metadata, ...frames }, null, 2), 'utf-8');
|
|
400
424
|
return formatResponse({ success: true, type: 'metadata', output: outputPath });
|
|
@@ -434,7 +458,10 @@ async function getScreenshotFallbackDimensions(unifiedSession, clip, fullPage, s
|
|
|
434
458
|
}
|
|
435
459
|
try {
|
|
436
460
|
const size = await unifiedSession.evaluate(fullPage
|
|
437
|
-
?
|
|
461
|
+
? `(() => ({
|
|
462
|
+
width: document.documentElement.scrollWidth,
|
|
463
|
+
height: document.documentElement.scrollHeight,
|
|
464
|
+
}))()`
|
|
438
465
|
: '(() => ({ width: window.innerWidth, height: window.innerHeight }))()', undefined, timeout);
|
|
439
466
|
return {
|
|
440
467
|
width: Math.round(size.width * scale),
|
|
@@ -556,37 +583,26 @@ function readWebpDimensions(buffer) {
|
|
|
556
583
|
* 处理 html + images 提取
|
|
557
584
|
*/
|
|
558
585
|
async function handleHtmlWithImages(unifiedSession, session, useExtension, args) {
|
|
559
|
-
const { selector, nth: nthParam } = args.target
|
|
560
|
-
? targetToFindParams(args.target)
|
|
561
|
-
: { selector: undefined, nth: undefined };
|
|
562
|
-
const nth = nthParam ?? 0;
|
|
563
586
|
let result;
|
|
564
|
-
if (
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
var raw = img.dataset.src || img.dataset.lazySrc || img.dataset.original || '';
|
|
579
|
-
if (!raw) return ''; try { return new URL(raw, location.href).href } catch(e) { return raw }
|
|
580
|
-
})(), alt: img.alt, width: img.width, height: img.height,
|
|
581
|
-
naturalWidth: img.naturalWidth, naturalHeight: img.naturalHeight});
|
|
582
|
-
}
|
|
583
|
-
return {html: html, images: images};
|
|
584
|
-
})`, undefined, undefined, [selector, nth]);
|
|
587
|
+
if (args.target) {
|
|
588
|
+
const { selector, text, xpath, nth: nthParam } = targetToFindParams(args.target);
|
|
589
|
+
const nth = nthParam ?? 0;
|
|
590
|
+
const matches = await unifiedSession.find(selector, text, xpath, args.timeout);
|
|
591
|
+
if (matches.length <= nth) {
|
|
592
|
+
throw new TargetNotFoundError(await buildTargetDiagnostics(unifiedSession, args.target, {
|
|
593
|
+
nth,
|
|
594
|
+
timeout: args.timeout,
|
|
595
|
+
matchCount: matches.length,
|
|
596
|
+
lastState: 'not-found',
|
|
597
|
+
candidates: matches,
|
|
598
|
+
}));
|
|
599
|
+
}
|
|
600
|
+
result = await extractHtmlWithImagesByTarget(unifiedSession, selector, text, xpath, nth, args.timeout);
|
|
585
601
|
}
|
|
586
602
|
else {
|
|
587
603
|
result = useExtension
|
|
588
|
-
? await unifiedSession.getHtmlWithImages(
|
|
589
|
-
: await extractHtmlWithImagesCdp(session,
|
|
604
|
+
? await unifiedSession.getHtmlWithImages()
|
|
605
|
+
: await extractHtmlWithImagesCdp(session, undefined, args.timeout);
|
|
590
606
|
}
|
|
591
607
|
if (args.images === 'info') {
|
|
592
608
|
// info 模式:HTML + 图片元信息
|
|
@@ -623,6 +639,49 @@ async function handleHtmlWithImages(unifiedSession, session, useExtension, args)
|
|
|
623
639
|
// 无 output:MCP 附录方式返回
|
|
624
640
|
return buildImageAppendixResponse(result.html, result.images, imageDataList);
|
|
625
641
|
}
|
|
642
|
+
async function extractHtmlWithImagesByTarget(unifiedSession, selector, text, xpath, nth, timeout) {
|
|
643
|
+
return unifiedSession.evaluate(`(function(selector, text, xpath, nth) {
|
|
644
|
+
var candidates = [];
|
|
645
|
+
if (xpath) {
|
|
646
|
+
var snapshot = document.evaluate(xpath, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
|
|
647
|
+
for (var i = 0; i < snapshot.snapshotLength; i++) candidates.push(snapshot.snapshotItem(i));
|
|
648
|
+
} else if (selector) {
|
|
649
|
+
candidates = Array.from(document.querySelectorAll(selector));
|
|
650
|
+
} else if (text) {
|
|
651
|
+
candidates = Array.from(document.querySelectorAll('*')).filter(function(element) {
|
|
652
|
+
return (element.textContent || '').includes(text);
|
|
653
|
+
});
|
|
654
|
+
}
|
|
655
|
+
if (text && (selector || xpath)) {
|
|
656
|
+
candidates = candidates.filter(function(element) {
|
|
657
|
+
return (element.textContent || '').includes(text);
|
|
658
|
+
});
|
|
659
|
+
}
|
|
660
|
+
var root = candidates[nth];
|
|
661
|
+
if (!root || !root.outerHTML) return { html: '', images: [] };
|
|
662
|
+
var imageNodes = [];
|
|
663
|
+
if (root.tagName === 'IMG') imageNodes.push(root);
|
|
664
|
+
root.querySelectorAll('img').forEach(function(img) { imageNodes.push(img); });
|
|
665
|
+
var images = imageNodes.map(function(img, index) {
|
|
666
|
+
var raw = img.dataset.src || img.dataset.lazySrc || img.dataset.original || '';
|
|
667
|
+
var dataSrc = '';
|
|
668
|
+
if (raw) {
|
|
669
|
+
try { dataSrc = new URL(raw, location.href).href } catch (error) { dataSrc = raw }
|
|
670
|
+
}
|
|
671
|
+
return {
|
|
672
|
+
index: index,
|
|
673
|
+
src: img.src,
|
|
674
|
+
dataSrc: dataSrc,
|
|
675
|
+
alt: img.alt,
|
|
676
|
+
width: img.width,
|
|
677
|
+
height: img.height,
|
|
678
|
+
naturalWidth: img.naturalWidth,
|
|
679
|
+
naturalHeight: img.naturalHeight
|
|
680
|
+
};
|
|
681
|
+
});
|
|
682
|
+
return { html: root.outerHTML, images: images };
|
|
683
|
+
})`, undefined, timeout, [selector ?? null, text ?? null, xpath ?? null, nth]);
|
|
684
|
+
}
|
|
626
685
|
/**
|
|
627
686
|
* CDP 模式:提取 HTML + 图片元信息
|
|
628
687
|
*/
|