@pyrokine/mcp-chrome 3.0.1 → 3.1.1
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 +1060 -432
- package/README_zh.md +936 -349
- package/dist/cdp/client.d.ts +8 -3
- package/dist/cdp/client.d.ts.map +1 -1
- package/dist/cdp/client.js +260 -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 +73 -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 +105 -0
- package/dist/core/browser-events.d.ts.map +1 -0
- package/dist/core/browser-events.js +1482 -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 +231 -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/error-sanitizer.d.ts.map +1 -1
- package/dist/core/error-sanitizer.js +2 -1
- package/dist/core/error-sanitizer.js.map +1 -1
- package/dist/core/errors.d.ts +4 -0
- package/dist/core/errors.d.ts.map +1 -1
- package/dist/core/errors.js +57 -9
- 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 +11 -2
- package/dist/core/locator.d.ts.map +1 -1
- package/dist/core/locator.js +135 -206
- 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 +104 -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 +62 -12
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +1174 -304
- 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 +48 -37
- package/dist/core/unified-session.d.ts.map +1 -1
- package/dist/core/unified-session.js +982 -294
- package/dist/core/unified-session.js.map +1 -1
- package/dist/core/utils.d.ts +8 -4
- package/dist/core/utils.d.ts.map +1 -1
- package/dist/core/utils.js +76 -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 +288 -46
- package/dist/extension/bridge.js.map +1 -1
- package/dist/extension/http-server.d.ts +8 -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 +15 -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 +18 -5
- package/dist/tools/challenge.d.ts.map +1 -1
- package/dist/tools/challenge.js +217 -200
- package/dist/tools/challenge.js.map +1 -1
- package/dist/tools/cookies.d.ts.map +1 -1
- package/dist/tools/cookies.js +34 -8
- package/dist/tools/cookies.js.map +1 -1
- package/dist/tools/diagnostics.d.ts.map +1 -1
- package/dist/tools/diagnostics.js +15 -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 +94 -52
- package/dist/tools/evaluate.js.map +1 -1
- package/dist/tools/extract.d.ts.map +1 -1
- package/dist/tools/extract.js +293 -153
- package/dist/tools/extract.js.map +1 -1
- package/dist/tools/input.d.ts.map +1 -1
- package/dist/tools/input.js +747 -282
- 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 +123 -18
- package/dist/tools/manage.js.map +1 -1
- package/dist/tools/network-sanitizer.d.ts +2 -0
- package/dist/tools/network-sanitizer.d.ts.map +1 -1
- package/dist/tools/network-sanitizer.js +53 -10
- 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 +57 -14
- package/dist/tools/page-context.js.map +1 -1
- package/dist/tools/png.d.ts.map +1 -1
- package/dist/tools/png.js +12 -3
- package/dist/tools/png.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 +163 -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 +3 -3
- package/dist/tools/target-diagnostics.d.ts.map +1 -1
- package/dist/tools/target-diagnostics.js +64 -34
- 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-C9QgtUYe.js} +1 -1
- package/extension/dist/assets/{content.ts-loader-DUWbDHRS.js → content.ts-loader-yqB_P8vu.js} +1 -1
- package/extension/dist/assets/index.ts-DBFNh8mZ.js +20275 -0
- package/extension/dist/assets/{page-scripts-D508WLkW.js → page-scripts-BjqQ0zXt.js} +258 -367
- 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 +9 -7
- package/scripts/start-chrome.ps1 +9 -1
- package/extension/dist/assets/index.ts-D7_LCUoV.js +0 -9319
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"challenge.d.ts","sourceRoot":"","sources":["../../src/tools/challenge.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"challenge.d.ts","sourceRoot":"","sources":["../../src/tools/challenge.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/challenge.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { setTimeout as delay } from 'node:timers/promises';
|
|
2
|
+
import { inspectChallengePage } from '../core/challenge-page.js';
|
|
3
|
+
import { formatErrorResponse, getErrorSource, isNativeExecutionResultUnknown, OsMouseError, StructuredToolError, TimeoutError, } from '../core/errors.js';
|
|
1
4
|
import { DEFAULT_TIMEOUT } from '../core/types.js';
|
|
2
|
-
import { StructuredToolError, TimeoutError } from '../core/errors.js';
|
|
3
5
|
import { remainingNavigationTimeout, withNavigationBudget } from '../core/utils.js';
|
|
4
6
|
export const CHALLENGE_POLL_MS = 500;
|
|
5
7
|
export const TURNSTILE_CLICK_COOLDOWN_MS = 2_000;
|
|
@@ -23,9 +25,7 @@ export const CHALLENGE_SELECTORS = [
|
|
|
23
25
|
'#cf-please-wait',
|
|
24
26
|
'#challenge-spinner',
|
|
25
27
|
'#trk_jschal_js',
|
|
26
|
-
'.lds-ring',
|
|
27
28
|
'td.info #js_info',
|
|
28
|
-
'div.vc div.text-box h2',
|
|
29
29
|
];
|
|
30
30
|
export const TURNSTILE_WIDGET_SELECTORS = ['#turnstile-wrapper', '.cf-turnstile'];
|
|
31
31
|
export const TURNSTILE_VERIFY_BUTTON_SELECTORS = [
|
|
@@ -43,13 +43,15 @@ export class ChallengeError extends Error {
|
|
|
43
43
|
waitedMs;
|
|
44
44
|
challengeKind;
|
|
45
45
|
mode;
|
|
46
|
-
|
|
46
|
+
browserEvents;
|
|
47
|
+
constructor(message, action, actionStatus, waitedMs, challengeKind, mode, browserEvents) {
|
|
47
48
|
super(message);
|
|
48
49
|
this.action = action;
|
|
49
50
|
this.actionStatus = actionStatus;
|
|
50
51
|
this.waitedMs = waitedMs;
|
|
51
52
|
this.challengeKind = challengeKind;
|
|
52
53
|
this.mode = mode;
|
|
54
|
+
this.browserEvents = browserEvents;
|
|
53
55
|
this.name = this.constructor.name;
|
|
54
56
|
}
|
|
55
57
|
}
|
|
@@ -57,13 +59,15 @@ export class ChallengeTimeoutError extends ChallengeError {
|
|
|
57
59
|
clickedTurnstile;
|
|
58
60
|
code = 'CHALLENGE_TIMEOUT';
|
|
59
61
|
suggestion;
|
|
60
|
-
constructor(action, actionStatus, waitedMs, challengeKind, mode, clickedTurnstile = false) {
|
|
61
|
-
super(`页面访问验证未在超时内完成(已等待 ${waitedMs}ms)`, action, actionStatus, waitedMs, challengeKind, mode);
|
|
62
|
+
constructor(action, actionStatus, waitedMs, challengeKind, mode, clickedTurnstile = false, browserEvents) {
|
|
63
|
+
super(`页面访问验证未在超时内完成(已等待 ${waitedMs}ms)`, action, actionStatus, waitedMs, challengeKind, mode, browserEvents);
|
|
62
64
|
this.clickedTurnstile = clickedTurnstile;
|
|
63
65
|
this.suggestion =
|
|
64
|
-
|
|
65
|
-
? '
|
|
66
|
-
:
|
|
66
|
+
actionStatus === 'completed'
|
|
67
|
+
? '原动作已执行,等待页面验证结束后核验业务结果,勿重放原动作'
|
|
68
|
+
: mode === 'cdp'
|
|
69
|
+
? '当前请求使用 CDP。先确认 Chrome Extension 已连接,再不传 port 重试;仅在需要独立浏览器时保留 CDP'
|
|
70
|
+
: '增加 timeout 后重试同一操作。交互式验证码、IP 声誉和 Bot Fight Mode 无法仅靠等待或点击 checkbox 完成';
|
|
67
71
|
}
|
|
68
72
|
toJSON() {
|
|
69
73
|
return {
|
|
@@ -77,9 +81,10 @@ export class ChallengeTimeoutError extends ChallengeError {
|
|
|
77
81
|
clickedTurnstile: this.clickedTurnstile,
|
|
78
82
|
mode: this.mode,
|
|
79
83
|
waitedMs: this.waitedMs,
|
|
84
|
+
...(this.browserEvents ? { browserEvents: this.browserEvents } : {}),
|
|
80
85
|
autoRetry: false,
|
|
81
|
-
retryable:
|
|
82
|
-
nextAction: 'retry_with_longer_timeout',
|
|
86
|
+
retryable: this.actionStatus === 'not_started',
|
|
87
|
+
nextAction: this.actionStatus === 'completed' ? 'wait_and_verify' : 'retry_with_longer_timeout',
|
|
83
88
|
error: {
|
|
84
89
|
code: this.code,
|
|
85
90
|
message: this.message,
|
|
@@ -91,8 +96,8 @@ export class ChallengeTimeoutError extends ChallengeError {
|
|
|
91
96
|
export class ChallengeDeniedError extends ChallengeError {
|
|
92
97
|
code = 'CHALLENGE_DENIED';
|
|
93
98
|
suggestion = '该页面返回了 Cloudflare Access denied,等待或点击 checkbox 无法继续访问';
|
|
94
|
-
constructor(action, actionStatus, waitedMs, mode) {
|
|
95
|
-
super('页面拒绝访问(Cloudflare Access denied)', action, actionStatus, waitedMs, 'denied', mode);
|
|
99
|
+
constructor(action, actionStatus, waitedMs, mode, browserEvents) {
|
|
100
|
+
super('页面拒绝访问(Cloudflare Access denied)', action, actionStatus, waitedMs, 'denied', mode, browserEvents);
|
|
96
101
|
}
|
|
97
102
|
toJSON() {
|
|
98
103
|
return {
|
|
@@ -105,6 +110,7 @@ export class ChallengeDeniedError extends ChallengeError {
|
|
|
105
110
|
challengeKind: 'denied',
|
|
106
111
|
mode: this.mode,
|
|
107
112
|
waitedMs: this.waitedMs,
|
|
113
|
+
...(this.browserEvents ? { browserEvents: this.browserEvents } : {}),
|
|
108
114
|
autoRetry: false,
|
|
109
115
|
retryable: false,
|
|
110
116
|
nextAction: 'stop',
|
|
@@ -117,169 +123,16 @@ export class ChallengeDeniedError extends ChallengeError {
|
|
|
117
123
|
}
|
|
118
124
|
}
|
|
119
125
|
//noinspection SpellCheckingInspection -- 模板中的浏览器 API 字段名
|
|
120
|
-
export const CHALLENGE_INSPECT_SCRIPT = `(()
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
const url = location.href || '';
|
|
131
|
-
const visibleBodyText = (
|
|
132
|
-
document.body && document.body.innerText ? document.body.innerText : ''
|
|
133
|
-
).replace(/\\s+/g, ' ');
|
|
134
|
-
const isVisible = (el) => {
|
|
135
|
-
if (!el) return false;
|
|
136
|
-
const style = window.getComputedStyle(el);
|
|
137
|
-
if (style.display === 'none' || style.visibility === 'hidden' || Number(style.opacity) === 0) return false;
|
|
138
|
-
const rect = el.getBoundingClientRect();
|
|
139
|
-
return rect.width > 0 && rect.height > 0;
|
|
140
|
-
};
|
|
141
|
-
const bringIntoView = (el) => {
|
|
142
|
-
if (!el || typeof el.scrollIntoView !== 'function') return;
|
|
143
|
-
el.scrollIntoView({ block: 'center', inline: 'nearest', behavior: 'instant' });
|
|
144
|
-
};
|
|
145
|
-
const hits = (selectors) => selectors.filter((selector) => {
|
|
146
|
-
try { return Array.from(document.querySelectorAll(selector)).some(isVisible); } catch { return false; }
|
|
147
|
-
});
|
|
148
|
-
const isCloudflareFrame = (el) => {
|
|
149
|
-
if (!el) return false;
|
|
150
|
-
const tag = String(el.tagName || '').toUpperCase();
|
|
151
|
-
if (tag === 'IFRAME') {
|
|
152
|
-
const src = String(el.getAttribute('src') || el.src || '');
|
|
153
|
-
return src.includes('challenges.cloudflare.com') || src.includes('turnstile');
|
|
154
|
-
}
|
|
155
|
-
return Boolean(el.closest && el.closest(frameSelectors.join(',')));
|
|
156
|
-
};
|
|
157
|
-
const selectorHits = hits(challengeSelectors);
|
|
158
|
-
const deniedHits = hits(deniedSelectors);
|
|
159
|
-
const widgetHits = hits(widgetSelectors);
|
|
160
|
-
const frameHits = hits(frameSelectors);
|
|
161
|
-
const cloudflareFramePresent = Array.from(document.querySelectorAll('iframe')).some((el) => isCloudflareFrame(el));
|
|
162
|
-
const normalizedTitle = title.trim().toLowerCase().replace(/…/g, '...');
|
|
163
|
-
const titlePending = titleNeedles.some((needle) => normalizedTitle.includes(String(needle).toLowerCase()));
|
|
164
|
-
const textHits = textMarkers.filter((marker) => visibleBodyText.toLowerCase().includes(String(marker).toLowerCase()));
|
|
165
|
-
const originResponsePending = originResponsePendingTextMarkers.some((marker) =>
|
|
166
|
-
visibleBodyText.toLowerCase().includes(String(marker).toLowerCase())
|
|
167
|
-
);
|
|
168
|
-
const interstitialPending = selectorHits.length > 0 || titlePending || textHits.length > 0;
|
|
169
|
-
const findVisibleTurnstileBox = () => {
|
|
170
|
-
const input = document.querySelector('input[name="cf-turnstile-response"]');
|
|
171
|
-
if (!input) return null;
|
|
172
|
-
const candidates = [];
|
|
173
|
-
let node = input.parentElement;
|
|
174
|
-
while (node && node !== document.documentElement) {
|
|
175
|
-
if (isVisible(node)) {
|
|
176
|
-
const rect = node.getBoundingClientRect();
|
|
177
|
-
if (rect.width >= 120 && rect.height >= 40) candidates.push(node);
|
|
178
|
-
}
|
|
179
|
-
node = node.parentElement;
|
|
180
|
-
}
|
|
181
|
-
if (candidates.length === 0) return null;
|
|
182
|
-
return candidates.find((el) => {
|
|
183
|
-
const rect = el.getBoundingClientRect();
|
|
184
|
-
return rect.width >= 250 && rect.width <= 340 && rect.height >= 50 && rect.height <= 85;
|
|
185
|
-
}) || candidates[0];
|
|
186
|
-
};
|
|
187
|
-
const hostVerify = Array.from(document.querySelectorAll(verifyButtonSelectors.join(','))).find(isVisible) ||
|
|
188
|
-
Array.from(document.querySelectorAll('button')).find((el) => {
|
|
189
|
-
const text = (el.textContent || '').trim();
|
|
190
|
-
return isVisible(el) && (text === 'Verify you are human' || text === '请验证您是真人');
|
|
191
|
-
});
|
|
192
|
-
const turnstileBox = !originResponsePending && (interstitialPending || widgetHits.length > 0)
|
|
193
|
-
? findVisibleTurnstileBox() : null;
|
|
194
|
-
const turnstilePresent =
|
|
195
|
-
widgetHits.length > 0 ||
|
|
196
|
-
Boolean(hostVerify) ||
|
|
197
|
-
(!originResponsePending && interstitialPending &&
|
|
198
|
-
(cloudflareFramePresent || frameHits.length > 0 || Boolean(turnstileBox)));
|
|
199
|
-
const useIframeClick = turnstilePresent && (cloudflareFramePresent || (
|
|
200
|
-
!hostVerify &&
|
|
201
|
-
interstitialPending &&
|
|
202
|
-
Boolean(document.querySelector('input[name="cf-turnstile-response"]'))
|
|
203
|
-
));
|
|
204
|
-
const pointFromRect = (rect, kind) => {
|
|
205
|
-
if (!rect || rect.width < 8 || rect.height < 8) return null;
|
|
206
|
-
const y = Math.round(rect.top + Math.min(rect.height, 65) / 2);
|
|
207
|
-
if (kind === 'verify') {
|
|
208
|
-
return { x: Math.round(rect.left + rect.width / 2), y };
|
|
209
|
-
}
|
|
210
|
-
const widgetWidth = Math.min(rect.width, 300);
|
|
211
|
-
return { x: Math.round(rect.left + Math.min(20, Math.max(14, widgetWidth / 15))), y };
|
|
212
|
-
};
|
|
213
|
-
let clickPoint = null;
|
|
214
|
-
let clickTargetKind = null;
|
|
215
|
-
let clickSource = null;
|
|
216
|
-
const setClickTarget = (el, kind) => {
|
|
217
|
-
if (!el) return;
|
|
218
|
-
bringIntoView(el);
|
|
219
|
-
const point = pointFromRect(el.getBoundingClientRect(), kind);
|
|
220
|
-
if (!point) return;
|
|
221
|
-
clickPoint = point;
|
|
222
|
-
clickTargetKind = kind;
|
|
223
|
-
clickSource = isCloudflareFrame(el) || useIframeClick ? 'iframe' : 'page';
|
|
224
|
-
};
|
|
225
|
-
if (hostVerify) {
|
|
226
|
-
setClickTarget(hostVerify, 'verify');
|
|
227
|
-
}
|
|
228
|
-
if (!clickPoint && turnstileBox) {
|
|
229
|
-
const boxRect = turnstileBox.getBoundingClientRect();
|
|
230
|
-
if (boxRect.width <= 340 && boxRect.height <= 85) {
|
|
231
|
-
setClickTarget(turnstileBox, 'widget');
|
|
232
|
-
}
|
|
233
|
-
}
|
|
234
|
-
if (!clickPoint && turnstilePresent) {
|
|
235
|
-
const frame = Array.from(document.querySelectorAll(frameSelectors.join(','))).find(isVisible);
|
|
236
|
-
if (frame) {
|
|
237
|
-
setClickTarget(frame, 'widget');
|
|
238
|
-
}
|
|
239
|
-
}
|
|
240
|
-
if (!clickPoint && turnstilePresent) {
|
|
241
|
-
const widget = Array.from(document.querySelectorAll(widgetSelectors.join(','))).find(isVisible);
|
|
242
|
-
if (widget) {
|
|
243
|
-
setClickTarget(widget, 'widget');
|
|
244
|
-
}
|
|
245
|
-
}
|
|
246
|
-
if (!clickPoint && turnstileBox) {
|
|
247
|
-
setClickTarget(turnstileBox, 'widget');
|
|
248
|
-
}
|
|
249
|
-
const viewport = {
|
|
250
|
-
screenX: Number(window.screenX),
|
|
251
|
-
screenY: Number(window.screenY),
|
|
252
|
-
innerWidth: Number(window.innerWidth),
|
|
253
|
-
innerHeight: Number(window.innerHeight),
|
|
254
|
-
outerWidth: Number(window.outerWidth),
|
|
255
|
-
outerHeight: Number(window.outerHeight),
|
|
256
|
-
devicePixelRatio: Number(window.devicePixelRatio || 1),
|
|
257
|
-
};
|
|
258
|
-
const horizontal = Math.max(0, viewport.outerWidth - viewport.innerWidth);
|
|
259
|
-
const vertical = Math.max(0, viewport.outerHeight - viewport.innerHeight);
|
|
260
|
-
const chromeLeft = Math.round(horizontal / 2);
|
|
261
|
-
const chromeTop = Math.max(0, vertical - horizontal);
|
|
262
|
-
const screenPoint = clickPoint
|
|
263
|
-
? {
|
|
264
|
-
x: Math.round(viewport.screenX + chromeLeft + clickPoint.x),
|
|
265
|
-
y: Math.round(viewport.screenY + chromeTop + clickPoint.y),
|
|
266
|
-
}
|
|
267
|
-
: null;
|
|
268
|
-
return {
|
|
269
|
-
title,
|
|
270
|
-
url,
|
|
271
|
-
selectorHits,
|
|
272
|
-
deniedHits,
|
|
273
|
-
textHits,
|
|
274
|
-
originResponsePending,
|
|
275
|
-
turnstilePresent,
|
|
276
|
-
clickPoint,
|
|
277
|
-
clickTargetKind,
|
|
278
|
-
clickSource,
|
|
279
|
-
screenPoint,
|
|
280
|
-
viewport,
|
|
281
|
-
};
|
|
282
|
-
})()`;
|
|
126
|
+
export const CHALLENGE_INSPECT_SCRIPT = `(${inspectChallengePage.toString()})(${JSON.stringify({
|
|
127
|
+
challengeSelectors: CHALLENGE_SELECTORS,
|
|
128
|
+
deniedSelectors: DENIED_SELECTORS,
|
|
129
|
+
widgetSelectors: TURNSTILE_WIDGET_SELECTORS,
|
|
130
|
+
verifyButtonSelectors: TURNSTILE_VERIFY_BUTTON_SELECTORS,
|
|
131
|
+
frameSelectors: TURNSTILE_FRAME_SELECTORS,
|
|
132
|
+
titleNeedles: CHALLENGE_TITLE_NEEDLES,
|
|
133
|
+
textMarkers: CHALLENGE_TEXT_MARKERS,
|
|
134
|
+
originResponsePendingTextMarkers: ORIGIN_RESPONSE_PENDING_TEXT_MARKERS,
|
|
135
|
+
})})`;
|
|
283
136
|
function normalizeChallengeTitle(title) {
|
|
284
137
|
return title.trim().toLowerCase().replace(/…/g, '...');
|
|
285
138
|
}
|
|
@@ -311,12 +164,12 @@ export function classifyChallengeSnapshot(snapshot, headerPending = false) {
|
|
|
311
164
|
function snapshotInspected(snapshot) {
|
|
312
165
|
return snapshot.inspected !== false;
|
|
313
166
|
}
|
|
314
|
-
function isPending(kind, snapshot
|
|
167
|
+
function isPending(kind, snapshot) {
|
|
315
168
|
if (kind === 'js' || kind === 'turnstile') {
|
|
316
169
|
return true;
|
|
317
170
|
}
|
|
318
|
-
// 主文档 cf-mitigated
|
|
319
|
-
return !snapshot
|
|
171
|
+
// 主文档 cf-mitigated 可在验证后保留,解除等待仍需本次 DOM 检查完成
|
|
172
|
+
return !snapshotInspected(snapshot);
|
|
320
173
|
}
|
|
321
174
|
async function hasClearanceCookie(host) {
|
|
322
175
|
try {
|
|
@@ -338,8 +191,11 @@ async function readPageTitle(host) {
|
|
|
338
191
|
return live.title;
|
|
339
192
|
}
|
|
340
193
|
}
|
|
341
|
-
catch {
|
|
342
|
-
|
|
194
|
+
catch (error) {
|
|
195
|
+
if (isTerminalChallengeError(error)) {
|
|
196
|
+
throw error;
|
|
197
|
+
}
|
|
198
|
+
// 暂态读取失败时使用缓存标题
|
|
343
199
|
}
|
|
344
200
|
}
|
|
345
201
|
return host.getState()?.title ?? '';
|
|
@@ -400,6 +256,7 @@ function normalizeChallengeSnapshot(snapshot, fallback) {
|
|
|
400
256
|
textHits: Array.isArray(snapshot?.textHits) ? snapshot.textHits : [],
|
|
401
257
|
originResponsePending: Boolean(snapshot?.originResponsePending),
|
|
402
258
|
turnstilePresent: Boolean(snapshot?.turnstilePresent),
|
|
259
|
+
...(snapshot?.turnstileState ? { turnstileState: snapshot.turnstileState } : {}),
|
|
403
260
|
clickPoint,
|
|
404
261
|
clickTargetKind: snapshot?.clickTargetKind === 'verify' || snapshot?.clickTargetKind === 'widget'
|
|
405
262
|
? snapshot.clickTargetKind
|
|
@@ -410,9 +267,25 @@ function normalizeChallengeSnapshot(snapshot, fallback) {
|
|
|
410
267
|
inspected: true,
|
|
411
268
|
};
|
|
412
269
|
}
|
|
270
|
+
function isTerminalChallengeError(error) {
|
|
271
|
+
const source = getErrorSource(error);
|
|
272
|
+
return source === 'budget' || source === 'cancelled' || (source !== 'page' && isNativeExecutionResultUnknown(error));
|
|
273
|
+
}
|
|
274
|
+
function isChallengeAccessError(error) {
|
|
275
|
+
if (!(error instanceof Error) ||
|
|
276
|
+
getErrorSource(error) === 'page' ||
|
|
277
|
+
error instanceof TimeoutError ||
|
|
278
|
+
(error instanceof StructuredToolError && error.code === 'TIMEOUT')) {
|
|
279
|
+
return false;
|
|
280
|
+
}
|
|
281
|
+
const { error: detail } = JSON.parse(formatErrorResponse(error).content[0].text);
|
|
282
|
+
return (detail.code === 'FRAME_INJECTION_DENIED' ||
|
|
283
|
+
/Cannot access (?:a \S+ URL|contents of url)|Cannot execute on restricted URL|cannot be scripted/i.test(detail.message));
|
|
284
|
+
}
|
|
413
285
|
export async function readChallengeSnapshot(host, inspectTimeout = CHALLENGE_INSPECT_TIMEOUT_MS) {
|
|
414
286
|
const fallback = host.getState() ?? {};
|
|
415
287
|
const deadline = Date.now() + inspectTimeout;
|
|
288
|
+
let inspectionError;
|
|
416
289
|
if (host.inspectChallenge && host.getMode() === 'extension') {
|
|
417
290
|
try {
|
|
418
291
|
return normalizeChallengeSnapshot((await withNavigationBudget(() => host.inspectChallenge({
|
|
@@ -427,8 +300,15 @@ export async function readChallengeSnapshot(host, inspectTimeout = CHALLENGE_INS
|
|
|
427
300
|
}, remainingNavigationTimeout(deadline)), deadline)), fallback);
|
|
428
301
|
}
|
|
429
302
|
catch (error) {
|
|
303
|
+
if (isTerminalChallengeError(error) || isChallengeAccessError(error)) {
|
|
304
|
+
throw error;
|
|
305
|
+
}
|
|
306
|
+
inspectionError = error;
|
|
430
307
|
if (error instanceof TimeoutError) {
|
|
431
|
-
return
|
|
308
|
+
return {
|
|
309
|
+
...blankChallengeSnapshot(fallback.title ?? '', fallback.url ?? '', false),
|
|
310
|
+
inspectionError,
|
|
311
|
+
};
|
|
432
312
|
}
|
|
433
313
|
// isolated inspect 失败时,在剩余预算内改用 stealth/precise
|
|
434
314
|
}
|
|
@@ -438,19 +318,26 @@ export async function readChallengeSnapshot(host, inspectTimeout = CHALLENGE_INS
|
|
|
438
318
|
return normalizeChallengeSnapshot(await withNavigationBudget(() => host.evaluate(CHALLENGE_INSPECT_SCRIPT, mode, remainingNavigationTimeout(deadline)), deadline), fallback);
|
|
439
319
|
}
|
|
440
320
|
catch (error) {
|
|
321
|
+
if (isTerminalChallengeError(error) || isChallengeAccessError(error)) {
|
|
322
|
+
throw error;
|
|
323
|
+
}
|
|
324
|
+
inspectionError = error;
|
|
441
325
|
if (error instanceof TimeoutError) {
|
|
442
|
-
return
|
|
326
|
+
return {
|
|
327
|
+
...blankChallengeSnapshot(fallback.title ?? '', fallback.url ?? '', false),
|
|
328
|
+
inspectionError,
|
|
329
|
+
};
|
|
443
330
|
}
|
|
444
331
|
// 保留未完成检查的状态,由等待器继续判定
|
|
445
332
|
}
|
|
446
333
|
}
|
|
447
|
-
return blankChallengeSnapshot(fallback.title ?? '', fallback.url ?? '', false);
|
|
334
|
+
return { ...blankChallengeSnapshot(fallback.title ?? '', fallback.url ?? '', false), inspectionError };
|
|
448
335
|
}
|
|
449
336
|
export async function waitForChallenge(host, options) {
|
|
450
337
|
const timeout = options.timeout ?? DEFAULT_TIMEOUT;
|
|
451
338
|
const actionStatus = options.actionStatus ?? 'completed';
|
|
452
339
|
const now = options.now ?? Date.now;
|
|
453
|
-
const sleep = options.sleep ?? ((ms) =>
|
|
340
|
+
const sleep = options.sleep ?? ((ms) => delay(ms, undefined, { signal: options.signal }));
|
|
454
341
|
const startedAt = now();
|
|
455
342
|
const deadline = () => Date.now() + Math.max(1, timeout - (now() - startedAt));
|
|
456
343
|
let lastInspectAt = startedAt;
|
|
@@ -461,31 +348,131 @@ export async function waitForChallenge(host, options) {
|
|
|
461
348
|
let jsOnlyInterstitial = false;
|
|
462
349
|
let emptyInspectCount = 0;
|
|
463
350
|
let finalOriginResponseCheckStarted = false;
|
|
351
|
+
let browserEvents;
|
|
352
|
+
let observersSuspended = false;
|
|
353
|
+
let headerPendingObserved = false;
|
|
354
|
+
let inspectionError;
|
|
355
|
+
const timeoutError = (cause = inspectionError) => {
|
|
356
|
+
const waitedMs = Math.max(0, now() - startedAt);
|
|
357
|
+
if (clickedTurnstile || observedKind !== 'none' || headerPendingObserved) {
|
|
358
|
+
return new ChallengeTimeoutError(options.action, actionStatus, waitedMs, clickedTurnstile ? 'turnstile' : observedKind === 'none' ? 'js' : observedKind, host.getMode(), clickedTurnstile, browserEvents);
|
|
359
|
+
}
|
|
360
|
+
if (cause instanceof Error && isTerminalChallengeError(cause)) {
|
|
361
|
+
return cause;
|
|
362
|
+
}
|
|
363
|
+
const nativeContext = cause instanceof StructuredToolError || cause instanceof TimeoutError ? cause.context : undefined;
|
|
364
|
+
const error = new StructuredToolError('TIMEOUT', '页面状态检查超过请求期限,尚未取得访问验证证据', '独立读取当前页面核验已执行动作的结果', {
|
|
365
|
+
action: options.action,
|
|
366
|
+
actionExecuted: actionStatus === 'completed',
|
|
367
|
+
actionStatus,
|
|
368
|
+
failureStage: 'challenge_inspection',
|
|
369
|
+
verificationStatus: 'unavailable',
|
|
370
|
+
verificationActionExecuted: nativeContext?.actionExecuted ?? 'unknown',
|
|
371
|
+
verificationActionStatus: nativeContext?.actionStatus ?? 'unknown',
|
|
372
|
+
challengeState: 'unverified',
|
|
373
|
+
challengeKind: 'none',
|
|
374
|
+
waitedMs,
|
|
375
|
+
...(browserEvents ? { browserEvents } : {}),
|
|
376
|
+
retryable: false,
|
|
377
|
+
});
|
|
378
|
+
const toJSON = error.toJSON.bind(error);
|
|
379
|
+
return Object.assign(error, {
|
|
380
|
+
cause,
|
|
381
|
+
toJSON: () => ({
|
|
382
|
+
...toJSON(),
|
|
383
|
+
success: false,
|
|
384
|
+
...error.context,
|
|
385
|
+
mode: host.getMode(),
|
|
386
|
+
autoRetry: false,
|
|
387
|
+
}),
|
|
388
|
+
});
|
|
389
|
+
};
|
|
464
390
|
const readWithinBudget = async (operation) => {
|
|
391
|
+
let operationError;
|
|
465
392
|
try {
|
|
466
|
-
return await withNavigationBudget(
|
|
393
|
+
return await withNavigationBudget(async () => {
|
|
394
|
+
try {
|
|
395
|
+
return await operation();
|
|
396
|
+
}
|
|
397
|
+
catch (error) {
|
|
398
|
+
operationError = error;
|
|
399
|
+
throw error;
|
|
400
|
+
}
|
|
401
|
+
}, deadline(), options.signal);
|
|
467
402
|
}
|
|
468
403
|
catch (error) {
|
|
404
|
+
if (error === operationError && isTerminalChallengeError(error)) {
|
|
405
|
+
throw error;
|
|
406
|
+
}
|
|
469
407
|
if (error instanceof TimeoutError || (error instanceof StructuredToolError && error.code === 'TIMEOUT')) {
|
|
470
|
-
throw
|
|
408
|
+
throw timeoutError(error);
|
|
409
|
+
}
|
|
410
|
+
if (isChallengeAccessError(error)) {
|
|
411
|
+
const { error: detail } = JSON.parse(formatErrorResponse(error).content[0].text);
|
|
412
|
+
throw Object.assign(new StructuredToolError(detail.code, detail.message, detail.suggestion ?? '当前页面拒绝脚本访问,请检查页面类型与访问权限', {
|
|
413
|
+
...detail.context,
|
|
414
|
+
action: options.action,
|
|
415
|
+
actionExecuted: actionStatus === 'completed',
|
|
416
|
+
actionStatus,
|
|
417
|
+
failureStage: 'challenge_inspection',
|
|
418
|
+
verificationStatus: 'unavailable',
|
|
419
|
+
verificationActionExecuted: detail.context?.actionExecuted ?? false,
|
|
420
|
+
verificationActionStatus: detail.context?.actionStatus ?? 'not_started',
|
|
421
|
+
retryable: false,
|
|
422
|
+
}), { cause: error });
|
|
471
423
|
}
|
|
472
424
|
throw error;
|
|
473
425
|
}
|
|
474
426
|
};
|
|
427
|
+
const suspendObservers = async () => {
|
|
428
|
+
if (observersSuspended || !host.suspendBrowserEventsForChallenge) {
|
|
429
|
+
return;
|
|
430
|
+
}
|
|
431
|
+
browserEvents = await readWithinBudget(() => host.suspendBrowserEventsForChallenge());
|
|
432
|
+
if (browserEvents.suspended !== true || browserEvents.fetchEnabled === true) {
|
|
433
|
+
throw new StructuredToolError('CHALLENGE_OBSERVATION_CLEANUP_FAILED', '页面验证前未能释放当前请求控制,已保留实际状态', '读取 browserEvents 中的暂停请求及清理错误,处理后再等待页面验证', {
|
|
434
|
+
action: options.action,
|
|
435
|
+
actionExecuted: actionStatus === 'completed',
|
|
436
|
+
actionStatus,
|
|
437
|
+
verificationStatus: 'blocked',
|
|
438
|
+
browserEvents,
|
|
439
|
+
retryable: false,
|
|
440
|
+
});
|
|
441
|
+
}
|
|
442
|
+
observersSuspended = true;
|
|
443
|
+
};
|
|
475
444
|
while (true) {
|
|
476
445
|
const remainingBeforeInspect = timeout - (now() - startedAt);
|
|
477
446
|
if (remainingBeforeInspect <= 0) {
|
|
478
|
-
throw
|
|
447
|
+
throw timeoutError();
|
|
448
|
+
}
|
|
449
|
+
if (host.hasBrowserEventObservation?.() && host.browserEvents) {
|
|
450
|
+
const events = await readWithinBudget(() => host.browserEvents('read', { type: 'dialog', limit: 1000 }));
|
|
451
|
+
const dialog = Array.isArray(events.logs)
|
|
452
|
+
? events.logs.find((entry) => entry.state === 'pending')
|
|
453
|
+
: undefined;
|
|
454
|
+
if (dialog) {
|
|
455
|
+
throw new StructuredToolError('DIALOG_OPEN', '页面对话框等待处理,页面验证尚未执行', '使用 manage(action="dialog") 处理返回的 ref,再检查原操作结果', {
|
|
456
|
+
ref: dialog.ref,
|
|
457
|
+
actionExecuted: actionStatus === 'completed',
|
|
458
|
+
actionStatus,
|
|
459
|
+
verificationStatus: 'blocked',
|
|
460
|
+
retryable: false,
|
|
461
|
+
});
|
|
462
|
+
}
|
|
479
463
|
}
|
|
480
464
|
const header = await readWithinBudget(() => host.getChallengeState());
|
|
481
465
|
const headerPending = header?.state === 'pending';
|
|
466
|
+
headerPendingObserved = headerPending;
|
|
482
467
|
const title = await readWithinBudget(() => readPageTitle(host));
|
|
483
468
|
if (DENIED_TITLE_PREFIXES.some((prefix) => title.trim().toLowerCase().startsWith(prefix))) {
|
|
484
|
-
|
|
469
|
+
await suspendObservers();
|
|
470
|
+
throw new ChallengeDeniedError(options.action, actionStatus, Math.max(0, now() - startedAt), host.getMode(), browserEvents);
|
|
485
471
|
}
|
|
486
472
|
let snapshot;
|
|
487
473
|
if (titleLooksLikeChallenge(title)) {
|
|
488
474
|
observedKind = observedKind === 'none' ? 'js' : observedKind;
|
|
475
|
+
await suspendObservers();
|
|
489
476
|
const passiveGraceMs = host.getMode() === 'extension' ? CHALLENGE_EXTENSION_PASSIVE_GRACE_MS : CHALLENGE_INSPECT_GRACE_MS;
|
|
490
477
|
const elapsed = now() - startedAt;
|
|
491
478
|
const inspectChallengePage = elapsed >= passiveGraceMs &&
|
|
@@ -517,14 +504,19 @@ export async function waitForChallenge(host, options) {
|
|
|
517
504
|
snapshot = await readWithinBudget(() => readChallengeSnapshot(host, Math.min(CHALLENGE_INSPECT_TIMEOUT_MS, Math.max(1, timeout - (now() - startedAt)))));
|
|
518
505
|
lastInspectAt = now();
|
|
519
506
|
}
|
|
507
|
+
inspectionError = snapshot.inspectionError;
|
|
520
508
|
const kind = classifyChallengeSnapshot(snapshot, headerPending);
|
|
521
509
|
if (kind === 'denied') {
|
|
522
|
-
|
|
510
|
+
await suspendObservers();
|
|
511
|
+
throw new ChallengeDeniedError(options.action, actionStatus, Math.max(0, now() - startedAt), host.getMode(), browserEvents);
|
|
512
|
+
}
|
|
513
|
+
if (kind === 'turnstile' || (kind === 'js' && snapshot.inspected)) {
|
|
514
|
+
await suspendObservers();
|
|
523
515
|
}
|
|
524
516
|
if (kind !== 'none' && (kind === 'turnstile' || snapshotInspected(snapshot) || observedKind === 'none')) {
|
|
525
517
|
observedKind = kind;
|
|
526
518
|
}
|
|
527
|
-
if (!isPending(kind, snapshot
|
|
519
|
+
if (!isPending(kind, snapshot)) {
|
|
528
520
|
return {
|
|
529
521
|
resolved: true,
|
|
530
522
|
waitedMs: Math.max(0, now() - startedAt),
|
|
@@ -532,6 +524,7 @@ export async function waitForChallenge(host, options) {
|
|
|
532
524
|
clearanceCookiePresent: observedKind === 'none' ? false : await readWithinBudget(() => hasClearanceCookie(host)),
|
|
533
525
|
challengeKind: observedKind,
|
|
534
526
|
originResponsePending: snapshot.originResponsePending,
|
|
527
|
+
...(browserEvents ? { browserEvents } : {}),
|
|
535
528
|
};
|
|
536
529
|
}
|
|
537
530
|
const clickTargetKind = snapshot.clickTargetKind ?? (snapshot.clickPoint ? 'widget' : null);
|
|
@@ -552,16 +545,24 @@ export async function waitForChallenge(host, options) {
|
|
|
552
545
|
const clickPoint = snapshot.clickPoint;
|
|
553
546
|
try {
|
|
554
547
|
if (host.clickTurnstile) {
|
|
555
|
-
|
|
548
|
+
const click = () => host.clickTurnstile(clickSnapshot, Math.max(0, timeout - (now() - startedAt)), options.signal, (remaining = CHALLENGE_INSPECT_TIMEOUT_MS) => readWithinBudget(() => readChallengeSnapshot(host, Math.min(CHALLENGE_INSPECT_TIMEOUT_MS, remaining))));
|
|
549
|
+
// iframe 路径自行处理取消与有界释放,完成后才结束 tab 锁
|
|
550
|
+
if (clickSnapshot.clickSource === 'iframe') {
|
|
551
|
+
await click();
|
|
552
|
+
}
|
|
553
|
+
else {
|
|
554
|
+
await withNavigationBudget(click, clickDeadline, options.signal);
|
|
555
|
+
}
|
|
556
556
|
}
|
|
557
557
|
else {
|
|
558
|
-
await withNavigationBudget(() => host.mouseMove(clickPoint.x, clickPoint.y), clickDeadline);
|
|
559
|
-
await withNavigationBudget(() => host.mouseClick('left'), clickDeadline);
|
|
558
|
+
await withNavigationBudget(() => host.mouseMove(clickPoint.x, clickPoint.y), clickDeadline, options.signal);
|
|
559
|
+
await withNavigationBudget(() => host.mouseClick('left'), clickDeadline, options.signal);
|
|
560
560
|
}
|
|
561
561
|
}
|
|
562
562
|
catch (error) {
|
|
563
563
|
if (error instanceof TimeoutError ||
|
|
564
|
-
(error instanceof StructuredToolError && error.code === 'TIMEOUT')
|
|
564
|
+
(error instanceof StructuredToolError && error.code === 'TIMEOUT') ||
|
|
565
|
+
(error instanceof OsMouseError && error.context.failureStage === 'release')) {
|
|
565
566
|
Object.assign(error.context, {
|
|
566
567
|
action: options.action,
|
|
567
568
|
actionExecuted: actionStatus === 'completed',
|
|
@@ -584,16 +585,31 @@ export async function waitForChallenge(host, options) {
|
|
|
584
585
|
}
|
|
585
586
|
const elapsed = now() - startedAt;
|
|
586
587
|
if (elapsed >= timeout) {
|
|
587
|
-
throw
|
|
588
|
+
throw timeoutError();
|
|
588
589
|
}
|
|
589
|
-
await sleep(Math.min(CHALLENGE_POLL_MS, timeout - elapsed));
|
|
590
|
+
await readWithinBudget(() => sleep(Math.min(CHALLENGE_POLL_MS, timeout - elapsed)));
|
|
590
591
|
}
|
|
591
592
|
}
|
|
592
|
-
export async function resolveChallenge(host, action, actionStatus = 'completed', timeout) {
|
|
593
|
-
|
|
593
|
+
export async function resolveChallenge(host, action, actionStatus = 'completed', timeout, signal) {
|
|
594
|
+
try {
|
|
595
|
+
return await waitForChallenge(host, { action, actionStatus, timeout, signal });
|
|
596
|
+
}
|
|
597
|
+
catch (error) {
|
|
598
|
+
if (!signal?.aborted || (error instanceof OsMouseError && error.context.failureStage === 'release')) {
|
|
599
|
+
throw error;
|
|
600
|
+
}
|
|
601
|
+
throw new StructuredToolError('CANCELLED', error instanceof Error ? error.message : String(error), '请求已取消,请读取当前页面核验已执行动作的结果', {
|
|
602
|
+
action,
|
|
603
|
+
actionExecuted: actionStatus === 'completed',
|
|
604
|
+
actionStatus,
|
|
605
|
+
verificationStatus: 'cancelled',
|
|
606
|
+
verificationActionExecuted: 'unknown',
|
|
607
|
+
retryable: false,
|
|
608
|
+
});
|
|
609
|
+
}
|
|
594
610
|
}
|
|
595
611
|
export function challengeResultFields(result) {
|
|
596
|
-
if (result.challengeKind === 'none' && !result.originResponsePending) {
|
|
612
|
+
if (result.challengeKind === 'none' && !result.originResponsePending && !result.browserEvents) {
|
|
597
613
|
return {};
|
|
598
614
|
}
|
|
599
615
|
return {
|
|
@@ -603,6 +619,7 @@ export function challengeResultFields(result) {
|
|
|
603
619
|
clickedTurnstile: result.clickedTurnstile,
|
|
604
620
|
clearanceCookiePresent: result.clearanceCookiePresent,
|
|
605
621
|
...(result.originResponsePending ? { originResponsePending: true } : {}),
|
|
622
|
+
...(result.browserEvents ? { browserEvents: result.browserEvents } : {}),
|
|
606
623
|
};
|
|
607
624
|
}
|
|
608
625
|
//# sourceMappingURL=challenge.js.map
|