@pyrokine/mcp-chrome 3.0.1 → 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 +678 -341
- package/README_zh.md +694 -291
- 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 +72 -15
- 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 +4 -0
- package/dist/core/errors.d.ts.map +1 -1
- package/dist/core/errors.js +51 -7
- 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 +10 -2
- package/dist/core/locator.d.ts.map +1 -1
- package/dist/core/locator.js +121 -200
- 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 +61 -12
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +1040 -259
- 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 +41 -35
- package/dist/core/unified-session.d.ts.map +1 -1
- package/dist/core/unified-session.js +872 -263
- 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 +48 -17
- package/dist/extension/bridge.d.ts.map +1 -1
- package/dist/extension/bridge.js +239 -37
- 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 +211 -49
- 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 +56 -28
- 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 +110 -189
- 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 +92 -52
- package/dist/tools/evaluate.js.map +1 -1
- package/dist/tools/extract.d.ts.map +1 -1
- package/dist/tools/extract.js +149 -103
- package/dist/tools/extract.js.map +1 -1
- package/dist/tools/input.d.ts.map +1 -1
- package/dist/tools/input.js +555 -229
- 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 +111 -16
- 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 +136 -44
- 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 +3 -3
- package/dist/tools/target-diagnostics.d.ts.map +1 -1
- package/dist/tools/target-diagnostics.js +17 -7
- package/dist/tools/target-diagnostics.js.map +1 -1
- package/dist/tools/wait.d.ts.map +1 -1
- package/dist/tools/wait.js +94 -40
- package/dist/tools/wait.js.map +1 -1
- package/extension/dist/assets/{content.ts-qe6IB5DK.js → content.ts-BAMOcF3R.js} +1 -1
- package/extension/dist/assets/{content.ts-loader-DUWbDHRS.js → content.ts-loader-4F9a1EWZ.js} +1 -1
- package/extension/dist/assets/index.ts-B79g2ikq.js +19820 -0
- package/extension/dist/assets/{page-scripts-D508WLkW.js → page-scripts-CSxn58h1.js} +257 -366
- package/extension/dist/assets/{popup.html-B-eVq48O.js → popup.html-DwwHo00N.js} +2 -2
- 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 +8 -6
- package/scripts/start-chrome.ps1 +9 -1
- package/extension/dist/assets/index.ts-D7_LCUoV.js +0 -9319
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page-context.js","sourceRoot":"","sources":["../../src/tools/page-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"page-context.js","sourceRoot":"","sources":["../../src/tools/page-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,6 @@ export interface PostConditionResult extends Record<string, unknown> {
|
|
|
26
26
|
retryable: boolean;
|
|
27
27
|
error?: string;
|
|
28
28
|
}
|
|
29
|
-
export declare function waitForPostCondition(unifiedSession: ReturnType<typeof getUnifiedSession>, condition: PostCondition, operation: string, mode?: InputMode): Promise<PostConditionResult>;
|
|
29
|
+
export declare function waitForPostCondition(unifiedSession: ReturnType<typeof getUnifiedSession>, condition: PostCondition, operation: string, mode?: InputMode, deadline?: number, signal?: AbortSignal): Promise<PostConditionResult>;
|
|
30
30
|
export {};
|
|
31
31
|
//# sourceMappingURL=post-condition.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post-condition.d.ts","sourceRoot":"","sources":["../../src/tools/post-condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"post-condition.d.ts","sourceRoot":"","sources":["../../src/tools/post-condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AASvB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAS3D,eAAO,MAAM,mBAAmB;;;;;;;;iBAwB1B,CAAA;AAEN,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAA;AAC/D,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,aAAa,GAAG,aAAa,GAAG,OAAO,CAAA;AAEpF,UAAU,WAAW;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,mBAAoB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAChE,OAAO,EAAE,OAAO,CAAA;IAChB,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,SAAS,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB;AAyLD,wBAAsB,oBAAoB,CACtC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpD,SAAS,EAAE,aAAa,EACxB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,SAAS,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,mBAAmB,CAAC,CAqE9B"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import { sanitizeErrorMessage } from '../core/error-sanitizer.js';
|
|
3
|
+
import { CDPError, getErrorSource, isNativeExecutionResultUnknown, StructuredToolError, TimeoutError, } from '../core/errors.js';
|
|
4
|
+
import { withNavigationBudget } from '../core/utils.js';
|
|
3
5
|
const POST_CONDITION_DEFAULT_TIMEOUT_MS = 3000;
|
|
4
6
|
const POST_CONDITION_MAX_TIMEOUT_MS = 60_000;
|
|
5
7
|
const POST_CONDITION_DEFAULT_INTERVAL_MS = 100;
|
|
@@ -30,21 +32,64 @@ export const postConditionSchema = z
|
|
|
30
32
|
.refine((value) => value.text || value.selector || value.urlIncludes || value.script, {
|
|
31
33
|
message: 'postCondition 至少需要 text、selector、urlIncludes、script 之一',
|
|
32
34
|
});
|
|
33
|
-
function sleep(ms) {
|
|
34
|
-
|
|
35
|
+
async function sleep(ms, signal) {
|
|
36
|
+
const deadline = Date.now() + ms;
|
|
37
|
+
let timer;
|
|
38
|
+
try {
|
|
39
|
+
do {
|
|
40
|
+
await withNavigationBudget(() => new Promise((resolve) => {
|
|
41
|
+
timer = setTimeout(resolve, ms);
|
|
42
|
+
}), undefined, signal);
|
|
43
|
+
ms = deadline - Date.now();
|
|
44
|
+
} while (ms > 0);
|
|
45
|
+
}
|
|
46
|
+
finally {
|
|
47
|
+
clearTimeout(timer);
|
|
48
|
+
}
|
|
35
49
|
}
|
|
36
50
|
function remainingMs(timeout, startedAt) {
|
|
37
51
|
return Math.max(0, timeout - (Date.now() - startedAt));
|
|
38
52
|
}
|
|
39
53
|
class PostConditionScriptError extends Error {
|
|
40
54
|
}
|
|
55
|
+
class PostConditionReadError extends Error {
|
|
56
|
+
}
|
|
57
|
+
function isTransientContextError(error) {
|
|
58
|
+
const source = getErrorSource(error);
|
|
59
|
+
if (source === 'page' ||
|
|
60
|
+
(error instanceof CDPError && (error.context.nativeCode === -32601 || error.context.nativeCode === -32602))) {
|
|
61
|
+
return false;
|
|
62
|
+
}
|
|
63
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
64
|
+
return /FRAME_STALE_CONTEXT|execution context.*(?:destroyed|not found|invalid)|cannot find context|cannot find object|could not find object|object.*(?:not found|invalid)/i.test(message);
|
|
65
|
+
}
|
|
41
66
|
function isUnavailableError(error) {
|
|
42
|
-
|
|
67
|
+
const source = getErrorSource(error);
|
|
68
|
+
if (error instanceof PostConditionScriptError ||
|
|
69
|
+
source === 'page' ||
|
|
70
|
+
(error instanceof CDPError && (error.context.nativeCode === -32601 || error.context.nativeCode === -32602))) {
|
|
43
71
|
return false;
|
|
44
72
|
}
|
|
73
|
+
if (source === 'transport' || source === 'context' || source === 'budget' || source === 'cancelled') {
|
|
74
|
+
return true;
|
|
75
|
+
}
|
|
76
|
+
if (error instanceof CDPError &&
|
|
77
|
+
['Runtime.evaluate', 'Runtime.callFunctionOn', 'Runtime.runScript'].includes(String(error.context.method)) &&
|
|
78
|
+
isNativeExecutionResultUnknown(error)) {
|
|
79
|
+
return true;
|
|
80
|
+
}
|
|
81
|
+
if (error instanceof TimeoutError ||
|
|
82
|
+
(error instanceof StructuredToolError &&
|
|
83
|
+
error.code === 'EXECUTION_RESULT_UNKNOWN' &&
|
|
84
|
+
error.context.failureStage === 'rpc')) {
|
|
85
|
+
return true;
|
|
86
|
+
}
|
|
45
87
|
const message = error instanceof Error ? error.message : String(error);
|
|
46
88
|
// 原生调用失败与页面内抛出的同文案异常分别分类
|
|
47
|
-
return
|
|
89
|
+
return (isTransientContextError(error) ||
|
|
90
|
+
new RegExp('FRAME_(?:STALE_CONTEXT|EVALUATION_FAILED|EVALUATION_TIMEOUT)|no frame with given id|execution context|cannot find context with specified id|debugger.*(?:detach|not attached)|' +
|
|
91
|
+
'extension.*(?:disconnect|未连接)|not connected|cannot resolve cdp|' +
|
|
92
|
+
'failed to attach|restricted|cannot access', 'i').test(message));
|
|
48
93
|
}
|
|
49
94
|
function boundedError(error) {
|
|
50
95
|
return sanitizeErrorMessage(error instanceof Error ? error.message : String(error)).slice(0, 500);
|
|
@@ -52,37 +97,67 @@ function boundedError(error) {
|
|
|
52
97
|
async function checkPostCondition(unifiedSession, condition, timeout, mode) {
|
|
53
98
|
const checks = [];
|
|
54
99
|
const startedAt = Date.now();
|
|
55
|
-
const nextTimeout = () =>
|
|
100
|
+
const nextTimeout = () => {
|
|
101
|
+
const remaining = remainingMs(timeout, startedAt);
|
|
102
|
+
if (remaining <= 0) {
|
|
103
|
+
throw new PostConditionReadError('后置验证剩余 timeout 已用尽');
|
|
104
|
+
}
|
|
105
|
+
return remaining;
|
|
106
|
+
};
|
|
107
|
+
const read = async (code, args) => {
|
|
108
|
+
try {
|
|
109
|
+
return await unifiedSession.evaluate(code, mode, nextTimeout(), args, { staleContextRetry: 'readOnly' });
|
|
110
|
+
}
|
|
111
|
+
catch (error) {
|
|
112
|
+
if (isTransientContextError(error)) {
|
|
113
|
+
throw new PostConditionReadError(error instanceof Error ? error.message : String(error), {
|
|
114
|
+
cause: error,
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
throw error;
|
|
118
|
+
}
|
|
119
|
+
};
|
|
56
120
|
if (condition.text !== undefined) {
|
|
57
|
-
const result = await
|
|
121
|
+
const result = await read(`(expected, exact) => {
|
|
58
122
|
const body = document.body
|
|
59
123
|
if (!body) return { matched: false, actual: '' }
|
|
60
|
-
const
|
|
61
|
-
element
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
: element instanceof HTMLInputElement || element instanceof HTMLTextAreaElement
|
|
68
|
-
? element.value || ''
|
|
69
|
-
: '')
|
|
70
|
-
const text = [body.textContent || '', ...values].join('\\n')
|
|
71
|
-
return {
|
|
72
|
-
matched: exact
|
|
73
|
-
? [body.textContent || '', ...values].some((value) => value === expected)
|
|
74
|
-
: text.includes(expected),
|
|
75
|
-
actual: text.slice(0, 500),
|
|
124
|
+
const visible = (element) => {
|
|
125
|
+
if (typeof element.checkVisibility === 'function') {
|
|
126
|
+
return element.checkVisibility({ checkOpacity: true, checkVisibilityCSS: true })
|
|
127
|
+
}
|
|
128
|
+
const style = getComputedStyle(element)
|
|
129
|
+
return element.getClientRects().length > 0 && style.display !== 'none' &&
|
|
130
|
+
style.visibility !== 'hidden' && style.visibility !== 'collapse' && style.opacity !== '0'
|
|
76
131
|
}
|
|
77
|
-
|
|
132
|
+
const values = Array.from(body.querySelectorAll('input, textarea, select'))
|
|
133
|
+
.filter(visible)
|
|
134
|
+
.map((element) =>
|
|
135
|
+
element instanceof HTMLSelectElement
|
|
136
|
+
? Array.from(element.selectedOptions)
|
|
137
|
+
.map((option) => option.value || option.textContent || '')
|
|
138
|
+
.join(' ')
|
|
139
|
+
: element instanceof HTMLInputElement && element.type === 'password'
|
|
140
|
+
? ''
|
|
141
|
+
: element instanceof HTMLInputElement || element instanceof HTMLTextAreaElement
|
|
142
|
+
? element.value || ''
|
|
143
|
+
: '')
|
|
144
|
+
const sources = [visible(body) ? body.innerText || '' : '', ...values]
|
|
145
|
+
const text = sources.join('\\n')
|
|
146
|
+
const matchedSource = exact ? sources.find((value) => value === expected) : undefined
|
|
147
|
+
const index = exact ? (matchedSource === undefined ? -1 : text.indexOf(matchedSource)) : text.indexOf(expected)
|
|
148
|
+
const start = Math.max(0, index - 120)
|
|
149
|
+
return { matched: index >= 0, actual: text.slice(start, start + 500) }
|
|
150
|
+
}`, [condition.text, condition.exact === true]);
|
|
78
151
|
checks.push({ name: 'text', matched: result.matched, actual: result.actual });
|
|
79
152
|
}
|
|
80
153
|
if (condition.selector !== undefined) {
|
|
81
|
-
const count = await
|
|
154
|
+
const count = await read('(selector) => document.querySelectorAll(selector).length', [
|
|
155
|
+
condition.selector,
|
|
156
|
+
]);
|
|
82
157
|
checks.push({ name: 'selector', matched: count > 0, actual: { count } });
|
|
83
158
|
}
|
|
84
159
|
if (condition.urlIncludes !== undefined) {
|
|
85
|
-
const url = await
|
|
160
|
+
const url = await read('location.href');
|
|
86
161
|
checks.push({ name: 'urlIncludes', matched: url.includes(condition.urlIncludes), actual: url.slice(0, 500) });
|
|
87
162
|
}
|
|
88
163
|
if (condition.script !== undefined) {
|
|
@@ -91,7 +166,9 @@ async function checkPostCondition(unifiedSession, condition, timeout, mode) {
|
|
|
91
166
|
const value = (0, eval)(source)
|
|
92
167
|
return { matched: Boolean(await (typeof value === 'function' ? value() : value)) }
|
|
93
168
|
} catch (error) {
|
|
94
|
-
|
|
169
|
+
let message = 'Page script threw an unprintable value'
|
|
170
|
+
try { message = String(error).slice(0, 500) } catch {}
|
|
171
|
+
return { matched: false, error: message }
|
|
95
172
|
}
|
|
96
173
|
}`, mode, nextTimeout(), [condition.script]);
|
|
97
174
|
if (result.error !== undefined) {
|
|
@@ -101,14 +178,16 @@ async function checkPostCondition(unifiedSession, condition, timeout, mode) {
|
|
|
101
178
|
}
|
|
102
179
|
return checks;
|
|
103
180
|
}
|
|
104
|
-
export async function waitForPostCondition(unifiedSession, condition, operation, mode) {
|
|
105
|
-
const timeout = condition.timeout ?? POST_CONDITION_DEFAULT_TIMEOUT_MS;
|
|
106
|
-
const interval = condition.interval ?? POST_CONDITION_DEFAULT_INTERVAL_MS;
|
|
181
|
+
export async function waitForPostCondition(unifiedSession, condition, operation, mode, deadline, signal) {
|
|
107
182
|
const startedAt = Date.now();
|
|
183
|
+
const timeout = Math.max(0, Math.min(condition.timeout ?? POST_CONDITION_DEFAULT_TIMEOUT_MS, (deadline ?? Infinity) - startedAt));
|
|
184
|
+
const interval = condition.interval ?? POST_CONDITION_DEFAULT_INTERVAL_MS;
|
|
108
185
|
let checks = [];
|
|
186
|
+
let readError;
|
|
109
187
|
while (remainingMs(timeout, startedAt) > 0) {
|
|
110
188
|
try {
|
|
111
|
-
checks = await checkPostCondition(unifiedSession, condition,
|
|
189
|
+
checks = await withNavigationBudget(() => checkPostCondition(unifiedSession, condition, remainingMs(timeout, startedAt), mode), startedAt + timeout, signal);
|
|
190
|
+
readError = undefined;
|
|
112
191
|
if (checks.every((check) => check.matched)) {
|
|
113
192
|
return {
|
|
114
193
|
matched: true,
|
|
@@ -121,30 +200,43 @@ export async function waitForPostCondition(unifiedSession, condition, operation,
|
|
|
121
200
|
}
|
|
122
201
|
}
|
|
123
202
|
catch (error) {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
203
|
+
if (error instanceof PostConditionReadError ||
|
|
204
|
+
(!(error instanceof PostConditionScriptError) &&
|
|
205
|
+
getErrorSource(error) !== 'page' &&
|
|
206
|
+
getErrorSource(error) !== 'protocol' &&
|
|
207
|
+
remainingMs(timeout, startedAt) === 0)) {
|
|
208
|
+
readError = boundedError(error);
|
|
209
|
+
}
|
|
210
|
+
else {
|
|
211
|
+
const unavailable = isUnavailableError(error);
|
|
212
|
+
return {
|
|
213
|
+
matched: false,
|
|
214
|
+
verificationStatus: unavailable ? 'unavailable' : 'error',
|
|
215
|
+
operation,
|
|
216
|
+
elapsedMs: Date.now() - startedAt,
|
|
217
|
+
checks,
|
|
218
|
+
retryable: unavailable,
|
|
219
|
+
error: boundedError(error),
|
|
220
|
+
};
|
|
221
|
+
}
|
|
135
222
|
}
|
|
136
|
-
const
|
|
223
|
+
const remaining = remainingMs(timeout, startedAt);
|
|
224
|
+
const waitMs = Math.min(interval, remaining);
|
|
137
225
|
if (waitMs > 0) {
|
|
138
|
-
await sleep(waitMs);
|
|
226
|
+
await sleep(waitMs, signal);
|
|
227
|
+
}
|
|
228
|
+
if (remaining <= interval) {
|
|
229
|
+
break;
|
|
139
230
|
}
|
|
140
231
|
}
|
|
141
232
|
return {
|
|
142
233
|
matched: false,
|
|
143
|
-
verificationStatus: 'not_matched',
|
|
234
|
+
verificationStatus: readError || timeout === 0 ? 'unavailable' : 'not_matched',
|
|
144
235
|
operation,
|
|
145
236
|
elapsedMs: Date.now() - startedAt,
|
|
146
237
|
checks,
|
|
147
238
|
retryable: true,
|
|
239
|
+
...(readError ? { error: readError } : timeout === 0 ? { error: '后置验证开始前 timeout 已用尽' } : {}),
|
|
148
240
|
};
|
|
149
241
|
}
|
|
150
242
|
//# sourceMappingURL=post-condition.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post-condition.js","sourceRoot":"","sources":["../../src/tools/post-condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"post-condition.js","sourceRoot":"","sources":["../../src/tools/post-condition.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/schema.d.ts
CHANGED
|
@@ -5,7 +5,9 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { z } from 'zod';
|
|
7
7
|
import type { Target } from '../core/types.js';
|
|
8
|
+
import type { SemanticTarget } from '../core/dom-helpers.js';
|
|
8
9
|
export declare const pageTargetIdSchema: z.ZodOptional<z.ZodString>;
|
|
10
|
+
export declare const frameZodSchema: z.ZodOptional<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>, z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>]>>;
|
|
9
11
|
export declare const pageConditionSchema: {
|
|
10
12
|
expectedUrl: z.ZodOptional<z.ZodString>;
|
|
11
13
|
expectedRevision: z.ZodOptional<z.ZodString>;
|
|
@@ -53,7 +55,7 @@ export declare const targetZodSchema: z.ZodPreprocess<z.ZodIntersection<z.ZodUni
|
|
|
53
55
|
y: z.ZodNumber;
|
|
54
56
|
}, z.core.$strip>]>, z.ZodObject<{
|
|
55
57
|
nth: z.ZodOptional<z.ZodNumber>;
|
|
56
|
-
}, z.core.$strip
|
|
58
|
+
}, z.core.$strip>>, unknown>;
|
|
57
59
|
/**
|
|
58
60
|
* 将 Target 对象解析为 find() 所需的查询参数
|
|
59
61
|
*
|
|
@@ -62,9 +64,9 @@ export declare const targetZodSchema: z.ZodPreprocess<z.ZodIntersection<z.ZodUni
|
|
|
62
64
|
*
|
|
63
65
|
* exact 语义(默认 false):
|
|
64
66
|
* - CSS 属性(placeholder/title/alt):false → *= 子串匹配,true → = 精确匹配
|
|
65
|
-
* - text:false → Extension find 的 includes 子串匹配,true →
|
|
66
|
-
* - label
|
|
67
|
-
* - role
|
|
67
|
+
* - text:false → Extension find 的 includes 子串匹配,true → DOM 精确匹配
|
|
68
|
+
* - label:按控件的标签和 aria-labelledby 引用计算名称
|
|
69
|
+
* - role:CSS 筛选候选,再按实际 role 和可访问名称过滤
|
|
68
70
|
* - testId/css/xpath:exact 不影响
|
|
69
71
|
* - role 值自动 lowercase(ARIA role 不区分大小写)
|
|
70
72
|
*/
|
|
@@ -75,5 +77,6 @@ export declare function targetToFindParams(target: Target & {
|
|
|
75
77
|
text?: string;
|
|
76
78
|
xpath?: string;
|
|
77
79
|
nth?: number;
|
|
80
|
+
semantic?: SemanticTarget;
|
|
78
81
|
};
|
|
79
82
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/tools/schema.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/tools/schema.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAE5D,eAAO,MAAM,kBAAkB,4BAA+B,CAAA;AAE9D,eAAO,MAAM,cAAc,oJAAyE,CAAA;AACpG,eAAO,MAAM,mBAAmB;IAC5B,WAAW;IACX,gBAAgB;CAKnB,CAAA;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAKnG;AA+DD;;;;GAIG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAUN,CAAA;AA8DtB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,cAAc,CAAA;CAC5B,CAkCA"}
|
package/dist/tools/schema.js
CHANGED
|
@@ -4,8 +4,9 @@
|
|
|
4
4
|
* Target Zod Schema 和定位参数转换
|
|
5
5
|
*/
|
|
6
6
|
import { z } from 'zod';
|
|
7
|
-
import { escapeXPathString } from '../core/utils.js';
|
|
8
7
|
export const pageTargetIdSchema = z.string().min(1).optional();
|
|
8
|
+
const frameStepSchema = z.union([z.string().min(1), z.number().int().nonnegative()]);
|
|
9
|
+
export const frameZodSchema = z.union([frameStepSchema, z.array(frameStepSchema).min(1)]).optional();
|
|
9
10
|
export const pageConditionSchema = {
|
|
10
11
|
expectedUrl: z.string().optional().describe('动作执行前要求页面 URL 与此值一致;不一致时不执行'),
|
|
11
12
|
expectedRevision: z
|
|
@@ -132,10 +133,12 @@ const IMPLICIT_ROLE_SELECTORS = {
|
|
|
132
133
|
],
|
|
133
134
|
checkbox: ['input[type="checkbox"]'],
|
|
134
135
|
radio: ['input[type="radio"]'],
|
|
135
|
-
combobox: ['select'],
|
|
136
|
+
combobox: ['select', 'input[list]'],
|
|
137
|
+
listbox: ['select'],
|
|
138
|
+
searchbox: ['input[type="search"]'],
|
|
136
139
|
heading: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'],
|
|
137
|
-
image: ['img
|
|
138
|
-
img: ['img
|
|
140
|
+
image: ['img'],
|
|
141
|
+
img: ['img'],
|
|
139
142
|
navigation: ['nav'],
|
|
140
143
|
main: ['main'],
|
|
141
144
|
banner: ['header'],
|
|
@@ -148,37 +151,6 @@ const IMPLICIT_ROLE_SELECTORS = {
|
|
|
148
151
|
list: ['ul', 'ol', 'menu'],
|
|
149
152
|
listitem: ['li'],
|
|
150
153
|
};
|
|
151
|
-
/**
|
|
152
|
-
* 隐式 ARIA role → XPath self:: 条件映射
|
|
153
|
-
*
|
|
154
|
-
* 用于 role+name 组合定位:需要 xpath 表达多来源可访问名称过滤,
|
|
155
|
-
* 与 IMPLICIT_ROLE_SELECTORS 内容对应,只是语法不同
|
|
156
|
-
*/
|
|
157
|
-
const IMPLICIT_ROLE_XPATH = {
|
|
158
|
-
button: 'self::button or self::input[@type="submit"] or self::input[@type="button"] or ' +
|
|
159
|
-
'self::input[@type="reset"] or self::summary',
|
|
160
|
-
link: 'self::a[@href] or self::area[@href]',
|
|
161
|
-
textbox: 'self::input[not(@type)] or self::input[@type="text"] or self::input[@type="email"] or ' +
|
|
162
|
-
'self::input[@type="url"] or self::input[@type="tel"] or self::input[@type="search"] or ' +
|
|
163
|
-
'self::input[@type="password"] or self::textarea or self::*[@contenteditable="true"]',
|
|
164
|
-
checkbox: 'self::input[@type="checkbox"]',
|
|
165
|
-
radio: 'self::input[@type="radio"]',
|
|
166
|
-
combobox: 'self::select',
|
|
167
|
-
heading: 'self::h1 or self::h2 or self::h3 or self::h4 or self::h5 or self::h6',
|
|
168
|
-
image: 'self::img[@alt]',
|
|
169
|
-
img: 'self::img[@alt]',
|
|
170
|
-
navigation: 'self::nav',
|
|
171
|
-
main: 'self::main',
|
|
172
|
-
banner: 'self::header',
|
|
173
|
-
contentinfo: 'self::footer',
|
|
174
|
-
region: 'self::section[@aria-label or @aria-labelledby]',
|
|
175
|
-
article: 'self::article',
|
|
176
|
-
complementary: 'self::aside',
|
|
177
|
-
form: 'self::form[@aria-label or @aria-labelledby]',
|
|
178
|
-
table: 'self::table',
|
|
179
|
-
list: 'self::ul or self::ol or self::menu',
|
|
180
|
-
listitem: 'self::li',
|
|
181
|
-
};
|
|
182
154
|
/**
|
|
183
155
|
* 将 Target 对象解析为 find() 所需的查询参数
|
|
184
156
|
*
|
|
@@ -187,9 +159,9 @@ const IMPLICIT_ROLE_XPATH = {
|
|
|
187
159
|
*
|
|
188
160
|
* exact 语义(默认 false):
|
|
189
161
|
* - CSS 属性(placeholder/title/alt):false → *= 子串匹配,true → = 精确匹配
|
|
190
|
-
* - text:false → Extension find 的 includes 子串匹配,true →
|
|
191
|
-
* - label
|
|
192
|
-
* - role
|
|
162
|
+
* - text:false → Extension find 的 includes 子串匹配,true → DOM 精确匹配
|
|
163
|
+
* - label:按控件的标签和 aria-labelledby 引用计算名称
|
|
164
|
+
* - role:CSS 筛选候选,再按实际 role 和可访问名称过滤
|
|
193
165
|
* - testId/css/xpath:exact 不影响
|
|
194
166
|
* - role 值自动 lowercase(ARIA role 不区分大小写)
|
|
195
167
|
*/
|
|
@@ -197,105 +169,43 @@ export function targetToFindParams(target) {
|
|
|
197
169
|
let selector;
|
|
198
170
|
let text;
|
|
199
171
|
let xpath;
|
|
172
|
+
let semantic;
|
|
200
173
|
if ('css' in target && target.css) {
|
|
201
174
|
selector = target.css;
|
|
202
|
-
|
|
203
|
-
if ('text' in target && target.text) {
|
|
175
|
+
if ('text' in target) {
|
|
204
176
|
text = target.text;
|
|
177
|
+
semantic = { exact: getExact(target) };
|
|
205
178
|
}
|
|
206
179
|
}
|
|
207
180
|
else if ('xpath' in target && target.xpath) {
|
|
208
181
|
xpath = target.xpath;
|
|
209
182
|
}
|
|
210
|
-
else if ('text' in target
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
xpath = `//*[normalize-space(.)=${escapeXPathString(target.text)}]`;
|
|
214
|
-
}
|
|
215
|
-
else {
|
|
216
|
-
text = target.text;
|
|
217
|
-
}
|
|
183
|
+
else if ('text' in target) {
|
|
184
|
+
text = target.text;
|
|
185
|
+
semantic = { exact: getExact(target) };
|
|
218
186
|
}
|
|
219
187
|
else if ('role' in target && target.role) {
|
|
220
|
-
const
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
const implicitXPath = IMPLICIT_ROLE_XPATH[roleLower];
|
|
225
|
-
if (implicitXPath) {
|
|
226
|
-
roleConditions.push(implicitXPath);
|
|
227
|
-
}
|
|
228
|
-
const nameStr = escapeXPathString(target.name);
|
|
229
|
-
const nameConditions = getExact(target)
|
|
230
|
-
? [
|
|
231
|
-
`normalize-space(.)=${nameStr}`,
|
|
232
|
-
`@aria-label=${nameStr}`,
|
|
233
|
-
`@title=${nameStr}`,
|
|
234
|
-
`@placeholder=${nameStr}`,
|
|
235
|
-
`@alt=${nameStr}`,
|
|
236
|
-
`@value=${nameStr}`,
|
|
237
|
-
`@id=//label[normalize-space(.)=${nameStr}]/@for`,
|
|
238
|
-
]
|
|
239
|
-
: [
|
|
240
|
-
`contains(.,${nameStr})`,
|
|
241
|
-
`contains(@aria-label,${nameStr})`,
|
|
242
|
-
`contains(@title,${nameStr})`,
|
|
243
|
-
`contains(@placeholder,${nameStr})`,
|
|
244
|
-
`contains(@alt,${nameStr})`,
|
|
245
|
-
`contains(@value,${nameStr})`,
|
|
246
|
-
`@id=//label[contains(.,${nameStr})]/@for`,
|
|
247
|
-
];
|
|
248
|
-
xpath = `//*[(${roleConditions.join(' or ')}) and (${nameConditions.join(' or ')})]`;
|
|
249
|
-
}
|
|
250
|
-
else {
|
|
251
|
-
// role only:CSS 选择器匹配隐式标签 + 显式 role
|
|
252
|
-
const escapedRole = escapeAttrValue(roleLower);
|
|
253
|
-
const selectors = [`[role="${escapedRole}"]`];
|
|
254
|
-
const implicit = IMPLICIT_ROLE_SELECTORS[roleLower];
|
|
255
|
-
if (implicit) {
|
|
256
|
-
selectors.push(...implicit);
|
|
257
|
-
}
|
|
258
|
-
selector = selectors.join(',');
|
|
259
|
-
}
|
|
188
|
+
const role = target.role.toLowerCase();
|
|
189
|
+
const implicit = IMPLICIT_ROLE_SELECTORS[role] ?? [];
|
|
190
|
+
selector = ['[role="' + escapeAttrValue(role) + '"]', ...implicit].join(',');
|
|
191
|
+
semantic = { role, ...('name' in target ? { name: target.name } : {}), exact: getExact(target) };
|
|
260
192
|
}
|
|
261
|
-
else if ('label' in target
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
const formControls = 'self::input or self::select or self::textarea';
|
|
265
|
-
if (getExact(target)) {
|
|
266
|
-
const labelMatch = `normalize-space(.)=${xpathStr}`;
|
|
267
|
-
xpath =
|
|
268
|
-
`//*[@aria-label=${xpathStr}]` +
|
|
269
|
-
` | //*[@id=//label[${labelMatch}]/@for]` +
|
|
270
|
-
` | //label[${labelMatch}]/descendant::*[${formControls}]` +
|
|
271
|
-
` | //label[${labelMatch}]/following-sibling::*[${formControls}][1]` +
|
|
272
|
-
` | //label[${labelMatch}]/parent::*/following-sibling::*[1]/descendant::*[${formControls}]`;
|
|
273
|
-
}
|
|
274
|
-
else {
|
|
275
|
-
const labelMatch = `contains(.,${xpathStr})`;
|
|
276
|
-
xpath =
|
|
277
|
-
`//*[contains(@aria-label,${xpathStr})]` +
|
|
278
|
-
` | //*[@id=//label[${labelMatch}]/@for]` +
|
|
279
|
-
` | //label[${labelMatch}]/descendant::*[${formControls}]` +
|
|
280
|
-
` | //label[${labelMatch}]/following-sibling::*[${formControls}][1]` +
|
|
281
|
-
` | //label[${labelMatch}]/parent::*/following-sibling::*[1]/descendant::*[${formControls}]`;
|
|
282
|
-
}
|
|
193
|
+
else if ('label' in target) {
|
|
194
|
+
selector = 'input,select,textarea,button,meter,output,progress,[aria-label],[aria-labelledby]';
|
|
195
|
+
semantic = { label: target.label, exact: getExact(target) };
|
|
283
196
|
}
|
|
284
|
-
else if ('placeholder' in target
|
|
285
|
-
|
|
286
|
-
selector = getExact(target) ? `[placeholder="${escaped}"]` : `[placeholder*="${escaped}"]`;
|
|
197
|
+
else if ('placeholder' in target) {
|
|
198
|
+
selector = '[placeholder' + (getExact(target) ? '=' : '*=') + '"' + escapeAttrValue(target.placeholder) + '"]';
|
|
287
199
|
}
|
|
288
|
-
else if ('title' in target
|
|
289
|
-
|
|
290
|
-
selector = getExact(target) ? `[title="${escaped}"]` : `[title*="${escaped}"]`;
|
|
200
|
+
else if ('title' in target) {
|
|
201
|
+
selector = '[title' + (getExact(target) ? '=' : '*=') + '"' + escapeAttrValue(target.title) + '"]';
|
|
291
202
|
}
|
|
292
|
-
else if ('alt' in target
|
|
293
|
-
|
|
294
|
-
selector = getExact(target) ? `[alt="${escaped}"]` : `[alt*="${escaped}"]`;
|
|
203
|
+
else if ('alt' in target) {
|
|
204
|
+
selector = '[alt' + (getExact(target) ? '=' : '*=') + '"' + escapeAttrValue(target.alt) + '"]';
|
|
295
205
|
}
|
|
296
|
-
else if ('testId' in target
|
|
297
|
-
selector =
|
|
206
|
+
else if ('testId' in target) {
|
|
207
|
+
selector = '[data-testid="' + escapeAttrValue(target.testId) + '"]';
|
|
298
208
|
}
|
|
299
|
-
return { selector, text, xpath, nth: target.nth };
|
|
209
|
+
return { selector, text, xpath, nth: target.nth, ...(semantic ? { semantic } : {}) };
|
|
300
210
|
}
|
|
301
211
|
//# sourceMappingURL=schema.js.map
|