@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.
Files changed (105) hide show
  1. package/README.md +213 -158
  2. package/README_zh.md +245 -187
  3. package/dist/anti-detection/behavior.js +1 -1
  4. package/dist/anti-detection/behavior.js.map +1 -1
  5. package/dist/anti-detection/injection.d.ts.map +1 -1
  6. package/dist/anti-detection/injection.js +2 -1
  7. package/dist/anti-detection/injection.js.map +1 -1
  8. package/dist/cdp/client.d.ts +2 -2
  9. package/dist/cdp/client.d.ts.map +1 -1
  10. package/dist/cdp/client.js +7 -4
  11. package/dist/cdp/client.js.map +1 -1
  12. package/dist/core/browser-driver.d.ts +3 -2
  13. package/dist/core/browser-driver.d.ts.map +1 -1
  14. package/dist/core/browser-driver.js +1 -0
  15. package/dist/core/browser-driver.js.map +1 -1
  16. package/dist/core/errors.d.ts +9 -0
  17. package/dist/core/errors.d.ts.map +1 -1
  18. package/dist/core/errors.js +16 -1
  19. package/dist/core/errors.js.map +1 -1
  20. package/dist/core/os-mouse.d.ts +65 -0
  21. package/dist/core/os-mouse.d.ts.map +1 -0
  22. package/dist/core/os-mouse.js +334 -0
  23. package/dist/core/os-mouse.js.map +1 -0
  24. package/dist/core/session.d.ts +14 -4
  25. package/dist/core/session.d.ts.map +1 -1
  26. package/dist/core/session.js +159 -54
  27. package/dist/core/session.js.map +1 -1
  28. package/dist/core/types.d.ts +10 -0
  29. package/dist/core/types.d.ts.map +1 -1
  30. package/dist/core/types.js +2 -0
  31. package/dist/core/types.js.map +1 -1
  32. package/dist/core/unified-session.d.ts +24 -3
  33. package/dist/core/unified-session.d.ts.map +1 -1
  34. package/dist/core/unified-session.js +143 -25
  35. package/dist/core/unified-session.js.map +1 -1
  36. package/dist/extension/bridge.d.ts +16 -0
  37. package/dist/extension/bridge.d.ts.map +1 -1
  38. package/dist/extension/bridge.js +27 -0
  39. package/dist/extension/bridge.js.map +1 -1
  40. package/dist/extension/http-server.d.ts.map +1 -1
  41. package/dist/extension/http-server.js +6 -1
  42. package/dist/extension/http-server.js.map +1 -1
  43. package/dist/tools/browse.d.ts +1 -1
  44. package/dist/tools/browse.d.ts.map +1 -1
  45. package/dist/tools/browse.js +72 -26
  46. package/dist/tools/browse.js.map +1 -1
  47. package/dist/tools/challenge.d.ts +153 -0
  48. package/dist/tools/challenge.d.ts.map +1 -0
  49. package/dist/tools/challenge.js +573 -0
  50. package/dist/tools/challenge.js.map +1 -0
  51. package/dist/tools/cookies.d.ts.map +1 -1
  52. package/dist/tools/cookies.js +8 -4
  53. package/dist/tools/cookies.js.map +1 -1
  54. package/dist/tools/diagnostics.d.ts +2 -2
  55. package/dist/tools/diagnostics.d.ts.map +1 -1
  56. package/dist/tools/diagnostics.js +26 -8
  57. package/dist/tools/diagnostics.js.map +1 -1
  58. package/dist/tools/evaluate.d.ts.map +1 -1
  59. package/dist/tools/evaluate.js +61 -9
  60. package/dist/tools/evaluate.js.map +1 -1
  61. package/dist/tools/extract.d.ts.map +1 -1
  62. package/dist/tools/extract.js +110 -51
  63. package/dist/tools/extract.js.map +1 -1
  64. package/dist/tools/input.d.ts.map +1 -1
  65. package/dist/tools/input.js +148 -22
  66. package/dist/tools/input.js.map +1 -1
  67. package/dist/tools/logs.js +2 -2
  68. package/dist/tools/logs.js.map +1 -1
  69. package/dist/tools/manage.d.ts.map +1 -1
  70. package/dist/tools/manage.js +20 -7
  71. package/dist/tools/manage.js.map +1 -1
  72. package/dist/tools/network-sanitizer.d.ts.map +1 -1
  73. package/dist/tools/network-sanitizer.js +1 -0
  74. package/dist/tools/network-sanitizer.js.map +1 -1
  75. package/dist/tools/png.js +5 -3
  76. package/dist/tools/png.js.map +1 -1
  77. package/dist/tools/post-condition.d.ts.map +1 -1
  78. package/dist/tools/post-condition.js +12 -3
  79. package/dist/tools/post-condition.js.map +1 -1
  80. package/dist/tools/target-diagnostics.d.ts +7 -0
  81. package/dist/tools/target-diagnostics.d.ts.map +1 -1
  82. package/dist/tools/target-diagnostics.js +18 -1
  83. package/dist/tools/target-diagnostics.js.map +1 -1
  84. package/dist/tools/wait.d.ts.map +1 -1
  85. package/dist/tools/wait.js +41 -39
  86. package/dist/tools/wait.js.map +1 -1
  87. package/extension/dist/assets/{index.ts-GG6dPUPX.js → index.ts-Bqcu2qiN.js} +286 -9
  88. package/extension/dist/manifest.json +1 -1
  89. package/extension/dist/service-worker-loader.js +1 -1
  90. package/extension/dist/src/popup/popup.html +44 -44
  91. package/package.json +8 -7
  92. package/dist/extension/native-host-installer.d.ts +0 -21
  93. package/dist/extension/native-host-installer.d.ts.map +0 -1
  94. package/dist/extension/native-host-installer.js +0 -147
  95. package/dist/extension/native-host-installer.js.map +0 -1
  96. package/dist/extension/socket-server.d.ts +0 -32
  97. package/dist/extension/socket-server.d.ts.map +0 -1
  98. package/dist/extension/socket-server.js +0 -177
  99. package/dist/extension/socket-server.js.map +0 -1
  100. package/dist/extension/ws-server.d.ts +0 -40
  101. package/dist/extension/ws-server.d.ts.map +0 -1
  102. package/dist/extension/ws-server.js +0 -246
  103. package/dist/extension/ws-server.js.map +0 -1
  104. package/dist/native-host/index.js +0 -280
  105. package/dist/native-host/mcp-chrome-host +0 -2
@@ -0,0 +1,573 @@
1
+ import { DEFAULT_TIMEOUT } from '../core/types.js';
2
+ export const CHALLENGE_POLL_MS = 500;
3
+ export const TURNSTILE_CLICK_COOLDOWN_MS = 2_000;
4
+ export const CHALLENGE_INSPECT_TIMEOUT_MS = 3_000;
5
+ export const CHALLENGE_INSPECT_GRACE_MS = 3_000;
6
+ export const CHALLENGE_EXTENSION_PASSIVE_GRACE_MS = 8_000;
7
+ export const CHALLENGE_TITLE_NEEDLES = ['just a moment', 'ddos-guard', '请稍候'];
8
+ const DENIED_TITLE_PREFIXES = ['access denied', 'attention required! | cloudflare'];
9
+ export const CHALLENGE_TEXT_MARKERS = [
10
+ '正在进行安全验证',
11
+ '验证您不是自动程序',
12
+ 'checking your browser before accessing',
13
+ 'please wait while we check your browser',
14
+ 'enable javascript and cookies to continue',
15
+ ];
16
+ export const ORIGIN_RESPONSE_PENDING_TEXT_MARKERS = ['验证成功。正在等待', 'verification successful. waiting for'];
17
+ export const CHALLENGE_SELECTORS = [
18
+ '#cf-challenge-running',
19
+ '.ray_id',
20
+ '.attack-box',
21
+ '#cf-please-wait',
22
+ '#challenge-spinner',
23
+ '#trk_jschal_js',
24
+ '.lds-ring',
25
+ 'td.info #js_info',
26
+ 'div.vc div.text-box h2',
27
+ ];
28
+ export const TURNSTILE_WIDGET_SELECTORS = ['#turnstile-wrapper', '.cf-turnstile'];
29
+ export const TURNSTILE_VERIFY_BUTTON_SELECTORS = [
30
+ 'input[type="button"][value="Verify you are human"]',
31
+ 'input[type="button"][value="请验证您是真人"]',
32
+ ];
33
+ export const TURNSTILE_FRAME_SELECTORS = ['iframe[src*="challenges.cloudflare.com"]', 'iframe[src*="turnstile"]'];
34
+ export const DENIED_SELECTORS = [
35
+ 'div.cf-error-title span.cf-code-label span',
36
+ '#cf-error-details div.cf-error-overview h1',
37
+ ];
38
+ export class ChallengeError extends Error {
39
+ action;
40
+ actionStatus;
41
+ waitedMs;
42
+ challengeKind;
43
+ mode;
44
+ constructor(message, action, actionStatus, waitedMs, challengeKind, mode) {
45
+ super(message);
46
+ this.action = action;
47
+ this.actionStatus = actionStatus;
48
+ this.waitedMs = waitedMs;
49
+ this.challengeKind = challengeKind;
50
+ this.mode = mode;
51
+ this.name = this.constructor.name;
52
+ }
53
+ }
54
+ export class ChallengeTimeoutError extends ChallengeError {
55
+ clickedTurnstile;
56
+ code = 'CHALLENGE_TIMEOUT';
57
+ suggestion;
58
+ constructor(action, actionStatus, waitedMs, challengeKind, mode, clickedTurnstile = false) {
59
+ super(`页面访问验证未在超时内完成(已等待 ${waitedMs}ms)`, action, actionStatus, waitedMs, challengeKind, mode);
60
+ this.clickedTurnstile = clickedTurnstile;
61
+ this.suggestion =
62
+ mode === 'cdp'
63
+ ? '当前请求使用 CDP。先确认 Chrome Extension 已连接,再不传 port 重试;仅在需要独立浏览器时保留 CDP'
64
+ : '增加 timeout 后重试同一操作。交互式验证码、IP 声誉和 Bot Fight Mode 无法仅靠等待或点击 checkbox 完成';
65
+ }
66
+ toJSON() {
67
+ return {
68
+ success: false,
69
+ action: this.action,
70
+ actionExecuted: this.actionStatus === 'completed',
71
+ actionStatus: this.actionStatus,
72
+ verificationStatus: 'failed',
73
+ challengeState: 'pending',
74
+ challengeKind: this.challengeKind,
75
+ clickedTurnstile: this.clickedTurnstile,
76
+ mode: this.mode,
77
+ waitedMs: this.waitedMs,
78
+ autoRetry: false,
79
+ retryable: true,
80
+ nextAction: 'retry_with_longer_timeout',
81
+ error: {
82
+ code: this.code,
83
+ message: this.message,
84
+ suggestion: this.suggestion,
85
+ },
86
+ };
87
+ }
88
+ }
89
+ export class ChallengeDeniedError extends ChallengeError {
90
+ code = 'CHALLENGE_DENIED';
91
+ suggestion = '该页面返回了 Cloudflare Access denied,等待或点击 checkbox 无法继续访问';
92
+ constructor(action, actionStatus, waitedMs, mode) {
93
+ super('页面拒绝访问(Cloudflare Access denied)', action, actionStatus, waitedMs, 'denied', mode);
94
+ }
95
+ toJSON() {
96
+ return {
97
+ success: false,
98
+ action: this.action,
99
+ actionExecuted: this.actionStatus === 'completed',
100
+ actionStatus: this.actionStatus,
101
+ verificationStatus: 'blocked',
102
+ challengeState: 'denied',
103
+ challengeKind: 'denied',
104
+ mode: this.mode,
105
+ waitedMs: this.waitedMs,
106
+ autoRetry: false,
107
+ retryable: false,
108
+ nextAction: 'stop',
109
+ error: {
110
+ code: this.code,
111
+ message: this.message,
112
+ suggestion: this.suggestion,
113
+ },
114
+ };
115
+ }
116
+ }
117
+ //noinspection SpellCheckingInspection -- 模板中的浏览器 API 字段名
118
+ export const CHALLENGE_INSPECT_SCRIPT = `(() => {
119
+ const challengeSelectors = ${JSON.stringify(CHALLENGE_SELECTORS)};
120
+ const deniedSelectors = ${JSON.stringify(DENIED_SELECTORS)};
121
+ const widgetSelectors = ${JSON.stringify(TURNSTILE_WIDGET_SELECTORS)};
122
+ const verifyButtonSelectors = ${JSON.stringify(TURNSTILE_VERIFY_BUTTON_SELECTORS)};
123
+ const frameSelectors = ${JSON.stringify(TURNSTILE_FRAME_SELECTORS)};
124
+ const titleNeedles = ${JSON.stringify(CHALLENGE_TITLE_NEEDLES)};
125
+ const textMarkers = ${JSON.stringify(CHALLENGE_TEXT_MARKERS)};
126
+ const originResponsePendingTextMarkers = ${JSON.stringify(ORIGIN_RESPONSE_PENDING_TEXT_MARKERS)};
127
+ const title = document.title || '';
128
+ const url = location.href || '';
129
+ const visibleBodyText = (
130
+ document.body && document.body.innerText ? document.body.innerText : ''
131
+ ).replace(/\\s+/g, ' ');
132
+ const isVisible = (el) => {
133
+ if (!el) return false;
134
+ const style = window.getComputedStyle(el);
135
+ if (style.display === 'none' || style.visibility === 'hidden' || Number(style.opacity) === 0) return false;
136
+ const rect = el.getBoundingClientRect();
137
+ return rect.width > 0 && rect.height > 0;
138
+ };
139
+ const bringIntoView = (el) => {
140
+ if (!el || typeof el.scrollIntoView !== 'function') return;
141
+ el.scrollIntoView({ block: 'center', inline: 'nearest' });
142
+ };
143
+ const hits = (selectors) => selectors.filter((selector) => {
144
+ try { return Array.from(document.querySelectorAll(selector)).some(isVisible); } catch { return false; }
145
+ });
146
+ const isCloudflareFrame = (el) => {
147
+ if (!el) return false;
148
+ const tag = String(el.tagName || '').toUpperCase();
149
+ if (tag === 'IFRAME') {
150
+ const src = String(el.getAttribute('src') || el.src || '');
151
+ return src.includes('challenges.cloudflare.com') || src.includes('turnstile');
152
+ }
153
+ return Boolean(el.closest && el.closest(frameSelectors.join(',')));
154
+ };
155
+ const selectorHits = hits(challengeSelectors);
156
+ const deniedHits = hits(deniedSelectors);
157
+ const widgetHits = hits(widgetSelectors);
158
+ const frameHits = hits(frameSelectors);
159
+ const cloudflareFramePresent = Array.from(document.querySelectorAll('iframe')).some((el) => isCloudflareFrame(el));
160
+ const normalizedTitle = title.trim().toLowerCase().replace(/…/g, '...');
161
+ const titlePending = titleNeedles.some((needle) => normalizedTitle.includes(String(needle).toLowerCase()));
162
+ const textHits = textMarkers.filter((marker) => visibleBodyText.toLowerCase().includes(String(marker).toLowerCase()));
163
+ const originResponsePending = originResponsePendingTextMarkers.some((marker) =>
164
+ visibleBodyText.toLowerCase().includes(String(marker).toLowerCase())
165
+ );
166
+ const interstitialPending = selectorHits.length > 0 || titlePending || textHits.length > 0;
167
+ const findVisibleTurnstileBox = () => {
168
+ const input = document.querySelector('input[name="cf-turnstile-response"]');
169
+ if (!input) return null;
170
+ const candidates = [];
171
+ let node = input.parentElement;
172
+ while (node && node !== document.documentElement) {
173
+ if (isVisible(node)) {
174
+ const rect = node.getBoundingClientRect();
175
+ if (rect.width >= 120 && rect.height >= 40) candidates.push(node);
176
+ }
177
+ node = node.parentElement;
178
+ }
179
+ if (candidates.length === 0) return null;
180
+ return candidates.find((el) => {
181
+ const rect = el.getBoundingClientRect();
182
+ return rect.width >= 250 && rect.width <= 340 && rect.height >= 50 && rect.height <= 85;
183
+ }) || candidates[0];
184
+ };
185
+ const turnstileBox = findVisibleTurnstileBox();
186
+ const hostVerify = Array.from(document.querySelectorAll(verifyButtonSelectors.join(','))).find(isVisible);
187
+ const useIframeClick = cloudflareFramePresent || (
188
+ !hostVerify &&
189
+ interstitialPending &&
190
+ Boolean(document.querySelector('input[name="cf-turnstile-response"]'))
191
+ );
192
+ const turnstilePresent =
193
+ widgetHits.length > 0 ||
194
+ useIframeClick ||
195
+ (interstitialPending && frameHits.length > 0) ||
196
+ Boolean(turnstileBox);
197
+ const pointFromRect = (rect, kind) => {
198
+ if (!rect || rect.width < 8 || rect.height < 8) return null;
199
+ const y = Math.round(rect.top + Math.min(rect.height, 65) / 2);
200
+ if (kind === 'verify') {
201
+ return { x: Math.round(rect.left + rect.width / 2), y };
202
+ }
203
+ const widgetWidth = Math.min(rect.width, 300);
204
+ return { x: Math.round(rect.left + Math.min(20, Math.max(14, widgetWidth / 15))), y };
205
+ };
206
+ let clickPoint = null;
207
+ let clickTargetKind = null;
208
+ let clickSource = null;
209
+ const setClickTarget = (el, kind) => {
210
+ if (!el) return;
211
+ bringIntoView(el);
212
+ const point = pointFromRect(el.getBoundingClientRect(), kind);
213
+ if (!point) return;
214
+ clickPoint = point;
215
+ clickTargetKind = kind;
216
+ clickSource = isCloudflareFrame(el) || useIframeClick ? 'iframe' : 'page';
217
+ };
218
+ if (hostVerify) {
219
+ setClickTarget(hostVerify, 'verify');
220
+ }
221
+ if (!clickPoint && turnstileBox) {
222
+ const boxRect = turnstileBox.getBoundingClientRect();
223
+ if (boxRect.width <= 340 && boxRect.height <= 85) {
224
+ setClickTarget(turnstileBox, 'widget');
225
+ }
226
+ }
227
+ if (!clickPoint && turnstilePresent) {
228
+ const frame = Array.from(document.querySelectorAll(frameSelectors.join(','))).find(isVisible);
229
+ if (frame) {
230
+ setClickTarget(frame, 'widget');
231
+ }
232
+ }
233
+ if (!clickPoint && turnstilePresent) {
234
+ const widget = Array.from(document.querySelectorAll(widgetSelectors.join(','))).find(isVisible);
235
+ if (widget) {
236
+ setClickTarget(widget, 'widget');
237
+ }
238
+ }
239
+ if (!clickPoint && turnstilePresent) {
240
+ const nodes = Array.from(document.querySelectorAll('div'));
241
+ for (const node of nodes) {
242
+ if (!isVisible(node)) continue;
243
+ const rect = node.getBoundingClientRect();
244
+ if (rect.width >= 280 && rect.width <= 320 && rect.height >= 50 && rect.height <= 80) {
245
+ setClickTarget(node, 'widget');
246
+ break;
247
+ }
248
+ }
249
+ }
250
+ if (!clickPoint && turnstileBox) {
251
+ setClickTarget(turnstileBox, 'widget');
252
+ }
253
+ const viewport = {
254
+ screenX: Number(window.screenX),
255
+ screenY: Number(window.screenY),
256
+ innerWidth: Number(window.innerWidth),
257
+ innerHeight: Number(window.innerHeight),
258
+ outerWidth: Number(window.outerWidth),
259
+ outerHeight: Number(window.outerHeight),
260
+ devicePixelRatio: Number(window.devicePixelRatio || 1),
261
+ };
262
+ const horizontal = Math.max(0, viewport.outerWidth - viewport.innerWidth);
263
+ const vertical = Math.max(0, viewport.outerHeight - viewport.innerHeight);
264
+ const chromeLeft = Math.round(horizontal / 2);
265
+ const chromeTop = Math.max(0, vertical - horizontal);
266
+ const screenPoint = clickPoint
267
+ ? {
268
+ x: Math.round(viewport.screenX + chromeLeft + clickPoint.x),
269
+ y: Math.round(viewport.screenY + chromeTop + clickPoint.y),
270
+ }
271
+ : null;
272
+ return {
273
+ title,
274
+ url,
275
+ selectorHits,
276
+ deniedHits,
277
+ textHits,
278
+ originResponsePending,
279
+ turnstilePresent,
280
+ clickPoint,
281
+ clickTargetKind,
282
+ clickSource,
283
+ screenPoint,
284
+ viewport,
285
+ };
286
+ })()`;
287
+ function normalizeChallengeTitle(title) {
288
+ return title.trim().toLowerCase().replace(/…/g, '...');
289
+ }
290
+ export function titleLooksLikeChallenge(title) {
291
+ const normalized = normalizeChallengeTitle(title);
292
+ return CHALLENGE_TITLE_NEEDLES.some((needle) => normalized.includes(needle.toLowerCase()));
293
+ }
294
+ export function classifyChallengeSnapshot(snapshot, headerPending = false) {
295
+ const title = normalizeChallengeTitle(snapshot.title);
296
+ if (DENIED_TITLE_PREFIXES.some((prefix) => title.startsWith(prefix)) || snapshot.deniedHits.length > 0) {
297
+ return 'denied';
298
+ }
299
+ if (snapshot.turnstilePresent) {
300
+ return 'turnstile';
301
+ }
302
+ if (snapshot.originResponsePending) {
303
+ return 'none';
304
+ }
305
+ if (titleLooksLikeChallenge(snapshot.title) ||
306
+ snapshot.selectorHits.length > 0 ||
307
+ (snapshot.textHits?.length ?? 0) > 0) {
308
+ return 'js';
309
+ }
310
+ if (!snapshotInspected(snapshot) && headerPending) {
311
+ return 'js';
312
+ }
313
+ return 'none';
314
+ }
315
+ function snapshotInspected(snapshot) {
316
+ return snapshot.inspected !== false;
317
+ }
318
+ function isPending(kind, snapshot, headerPending) {
319
+ if (kind === 'js' || kind === 'turnstile') {
320
+ return true;
321
+ }
322
+ // 主文档 cf-mitigated 只表示曾经进入 Challenge;页面标题和 DOM 恢复后即视为已过
323
+ return !snapshot.inspected && headerPending;
324
+ }
325
+ async function hasClearanceCookie(host) {
326
+ try {
327
+ const cookies = await host.getCookies({ name: 'cf_clearance' });
328
+ if (!Array.isArray(cookies)) {
329
+ return false;
330
+ }
331
+ return cookies.some((cookie) => cookie?.name === 'cf_clearance');
332
+ }
333
+ catch {
334
+ return false;
335
+ }
336
+ }
337
+ async function readPageTitle(host) {
338
+ if (host.getLiveState) {
339
+ try {
340
+ const live = await host.getLiveState();
341
+ if (typeof live?.title === 'string') {
342
+ return { title: live.title, live: true };
343
+ }
344
+ }
345
+ catch {
346
+ // 回退到缓存状态
347
+ }
348
+ }
349
+ return { title: host.getState()?.title ?? '', live: false };
350
+ }
351
+ function finitePoint(point) {
352
+ return point &&
353
+ typeof point.x === 'number' &&
354
+ typeof point.y === 'number' &&
355
+ Number.isFinite(point.x) &&
356
+ Number.isFinite(point.y)
357
+ ? { x: point.x, y: point.y }
358
+ : null;
359
+ }
360
+ function finiteViewport(viewport) {
361
+ if (!viewport ||
362
+ !Number.isFinite(viewport.screenX) ||
363
+ !Number.isFinite(viewport.screenY) ||
364
+ !Number.isFinite(viewport.innerWidth) ||
365
+ !Number.isFinite(viewport.innerHeight) ||
366
+ !Number.isFinite(viewport.outerWidth) ||
367
+ !Number.isFinite(viewport.outerHeight)) {
368
+ return null;
369
+ }
370
+ return {
371
+ screenX: Number(viewport.screenX),
372
+ screenY: Number(viewport.screenY),
373
+ innerWidth: Number(viewport.innerWidth),
374
+ innerHeight: Number(viewport.innerHeight),
375
+ outerWidth: Number(viewport.outerWidth),
376
+ outerHeight: Number(viewport.outerHeight),
377
+ devicePixelRatio: Number.isFinite(viewport.devicePixelRatio) ? Number(viewport.devicePixelRatio) : 1,
378
+ };
379
+ }
380
+ function blankChallengeSnapshot(title, url, inspected) {
381
+ return {
382
+ title,
383
+ url,
384
+ selectorHits: [],
385
+ deniedHits: [],
386
+ textHits: [],
387
+ originResponsePending: false,
388
+ turnstilePresent: false,
389
+ clickPoint: null,
390
+ clickTargetKind: null,
391
+ clickSource: null,
392
+ screenPoint: null,
393
+ viewport: null,
394
+ inspected,
395
+ };
396
+ }
397
+ function normalizeChallengeSnapshot(snapshot, fallback) {
398
+ const clickPoint = finitePoint(snapshot?.clickPoint);
399
+ return {
400
+ title: snapshot?.title ?? fallback.title ?? '',
401
+ url: snapshot?.url ?? fallback.url ?? '',
402
+ selectorHits: Array.isArray(snapshot?.selectorHits) ? snapshot.selectorHits : [],
403
+ deniedHits: Array.isArray(snapshot?.deniedHits) ? snapshot.deniedHits : [],
404
+ textHits: Array.isArray(snapshot?.textHits) ? snapshot.textHits : [],
405
+ originResponsePending: Boolean(snapshot?.originResponsePending),
406
+ turnstilePresent: Boolean(snapshot?.turnstilePresent),
407
+ clickPoint,
408
+ clickTargetKind: snapshot?.clickTargetKind === 'verify' || snapshot?.clickTargetKind === 'widget'
409
+ ? snapshot.clickTargetKind
410
+ : null,
411
+ clickSource: snapshot?.clickSource === 'iframe' || snapshot?.clickSource === 'page' ? snapshot.clickSource : null,
412
+ screenPoint: finitePoint(snapshot?.screenPoint),
413
+ viewport: finiteViewport(snapshot?.viewport),
414
+ inspected: true,
415
+ };
416
+ }
417
+ export async function readChallengeSnapshot(host, inspectTimeout = CHALLENGE_INSPECT_TIMEOUT_MS) {
418
+ const fallback = host.getState() ?? {};
419
+ const startedAt = Date.now();
420
+ if (host.inspectChallenge && host.getMode() === 'extension') {
421
+ try {
422
+ return normalizeChallengeSnapshot((await host.inspectChallenge({
423
+ challengeSelectors: CHALLENGE_SELECTORS,
424
+ deniedSelectors: DENIED_SELECTORS,
425
+ widgetSelectors: TURNSTILE_WIDGET_SELECTORS,
426
+ verifyButtonSelectors: TURNSTILE_VERIFY_BUTTON_SELECTORS,
427
+ frameSelectors: TURNSTILE_FRAME_SELECTORS,
428
+ titleNeedles: CHALLENGE_TITLE_NEEDLES,
429
+ textMarkers: CHALLENGE_TEXT_MARKERS,
430
+ originResponsePendingTextMarkers: ORIGIN_RESPONSE_PENDING_TEXT_MARKERS,
431
+ }, Math.max(1, inspectTimeout))), fallback);
432
+ }
433
+ catch {
434
+ // isolated inspect 失败时改用 stealth/precise
435
+ }
436
+ }
437
+ try {
438
+ return normalizeChallengeSnapshot(await host.evaluate(CHALLENGE_INSPECT_SCRIPT, 'stealth', Math.max(1, inspectTimeout)), fallback);
439
+ }
440
+ catch {
441
+ const remaining = Math.max(1, inspectTimeout - (Date.now() - startedAt));
442
+ try {
443
+ return normalizeChallengeSnapshot(await host.evaluate(CHALLENGE_INSPECT_SCRIPT, 'precise', remaining), fallback);
444
+ }
445
+ catch {
446
+ return blankChallengeSnapshot(fallback.title ?? '', fallback.url ?? '', false);
447
+ }
448
+ }
449
+ }
450
+ export async function waitForChallenge(host, options) {
451
+ const timeout = options.timeout ?? DEFAULT_TIMEOUT;
452
+ const actionStatus = options.actionStatus ?? 'completed';
453
+ const now = options.now ?? Date.now;
454
+ const sleep = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
455
+ const startedAt = now();
456
+ let lastInspectAt = startedAt;
457
+ let clickedTurnstile = false;
458
+ const clickedTargetKinds = new Set();
459
+ let pendingClick = null;
460
+ let observedKind = 'none';
461
+ let jsOnlyInterstitial = false;
462
+ let emptyInspectCount = 0;
463
+ let finalOriginResponseCheckStarted = false;
464
+ while (true) {
465
+ const remainingBeforeInspect = timeout - (now() - startedAt);
466
+ const header = await host.getChallengeState();
467
+ const headerPending = header?.state === 'pending';
468
+ const pageTitle = await readPageTitle(host);
469
+ const title = pageTitle.title;
470
+ if (DENIED_TITLE_PREFIXES.some((prefix) => title.trim().toLowerCase().startsWith(prefix))) {
471
+ throw new ChallengeDeniedError(options.action, actionStatus, Math.max(0, now() - startedAt), host.getMode());
472
+ }
473
+ let snapshot;
474
+ if (titleLooksLikeChallenge(title)) {
475
+ observedKind = observedKind === 'none' ? 'js' : observedKind;
476
+ const passiveGraceMs = host.getMode() === 'extension' ? CHALLENGE_EXTENSION_PASSIVE_GRACE_MS : CHALLENGE_INSPECT_GRACE_MS;
477
+ const elapsed = now() - startedAt;
478
+ const inspectChallengePage = elapsed >= passiveGraceMs &&
479
+ (jsOnlyInterstitial
480
+ ? remainingBeforeInspect <= CHALLENGE_INSPECT_TIMEOUT_MS && !finalOriginResponseCheckStarted
481
+ : now() - lastInspectAt >= TURNSTILE_CLICK_COOLDOWN_MS);
482
+ if (inspectChallengePage) {
483
+ snapshot = await readChallengeSnapshot(host, Math.min(CHALLENGE_INSPECT_TIMEOUT_MS, Math.max(1, remainingBeforeInspect)));
484
+ lastInspectAt = now();
485
+ if (jsOnlyInterstitial) {
486
+ finalOriginResponseCheckStarted = true;
487
+ }
488
+ if (snapshot.turnstilePresent || snapshot.clickPoint) {
489
+ jsOnlyInterstitial = false;
490
+ emptyInspectCount = 0;
491
+ }
492
+ else if (snapshot.inspected) {
493
+ emptyInspectCount += 1;
494
+ if (emptyInspectCount >= 2) {
495
+ jsOnlyInterstitial = true;
496
+ }
497
+ }
498
+ }
499
+ else {
500
+ snapshot = blankChallengeSnapshot(title, host.getState()?.url ?? '', false);
501
+ }
502
+ }
503
+ else if (pageTitle.live && title.trim() !== '' && (!headerPending || host.getMode() === 'extension')) {
504
+ snapshot = blankChallengeSnapshot(title, host.getState()?.url ?? '', true);
505
+ }
506
+ if (!snapshot) {
507
+ snapshot = await readChallengeSnapshot(host, Math.min(CHALLENGE_INSPECT_TIMEOUT_MS, Math.max(1, remainingBeforeInspect)));
508
+ lastInspectAt = now();
509
+ }
510
+ const kind = classifyChallengeSnapshot(snapshot, headerPending);
511
+ if (kind === 'denied') {
512
+ throw new ChallengeDeniedError(options.action, actionStatus, Math.max(0, now() - startedAt), host.getMode());
513
+ }
514
+ if (kind !== 'none' && (kind === 'turnstile' || snapshotInspected(snapshot) || observedKind === 'none')) {
515
+ observedKind = kind;
516
+ }
517
+ if (!isPending(kind, snapshot, headerPending)) {
518
+ return {
519
+ resolved: true,
520
+ waitedMs: Math.max(0, now() - startedAt),
521
+ clickedTurnstile,
522
+ clearanceCookiePresent: observedKind === 'none' ? false : await hasClearanceCookie(host),
523
+ challengeKind: observedKind,
524
+ originResponsePending: snapshot.originResponsePending,
525
+ };
526
+ }
527
+ const clickTargetKind = snapshot.clickTargetKind ?? (snapshot.clickPoint ? 'widget' : null);
528
+ if (snapshot.clickPoint && clickTargetKind && !clickedTargetKinds.has(clickTargetKind)) {
529
+ const samePoint = pendingClick &&
530
+ pendingClick.kind === clickTargetKind &&
531
+ pendingClick.x === snapshot.clickPoint.x &&
532
+ pendingClick.y === snapshot.clickPoint.y;
533
+ if (!samePoint) {
534
+ pendingClick = { kind: clickTargetKind, x: snapshot.clickPoint.x, y: snapshot.clickPoint.y };
535
+ }
536
+ else {
537
+ if (host.clickTurnstile) {
538
+ await host.clickTurnstile(snapshot);
539
+ }
540
+ else {
541
+ await host.mouseMove(snapshot.clickPoint.x, snapshot.clickPoint.y);
542
+ await host.mouseClick('left');
543
+ }
544
+ clickedTargetKinds.add(clickTargetKind);
545
+ clickedTurnstile = true;
546
+ pendingClick = null;
547
+ lastInspectAt = startedAt;
548
+ }
549
+ }
550
+ const elapsed = now() - startedAt;
551
+ if (elapsed >= timeout) {
552
+ throw new ChallengeTimeoutError(options.action, actionStatus, Math.max(elapsed, timeout), clickedTurnstile ? 'turnstile' : observedKind === 'none' ? kind : observedKind, host.getMode(), clickedTurnstile);
553
+ }
554
+ await sleep(Math.min(CHALLENGE_POLL_MS, timeout - elapsed));
555
+ }
556
+ }
557
+ export async function resolveChallenge(host, action, actionStatus = 'completed', timeout) {
558
+ return waitForChallenge(host, { action, actionStatus, timeout });
559
+ }
560
+ export function challengeResultFields(result) {
561
+ if (result.challengeKind === 'none' && !result.originResponsePending) {
562
+ return {};
563
+ }
564
+ return {
565
+ challengeResolved: true,
566
+ challengeKind: result.challengeKind,
567
+ waitedMs: result.waitedMs,
568
+ clickedTurnstile: result.clickedTurnstile,
569
+ clearanceCookiePresent: result.clearanceCookiePresent,
570
+ ...(result.originResponsePending ? { originResponsePending: true } : {}),
571
+ };
572
+ }
573
+ //# sourceMappingURL=challenge.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"challenge.js","sourceRoot":"","sources":["../../src/tools/challenge.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../src/tools/cookies.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;AAyRxE;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAS3D"}
1
+ {"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../src/tools/cookies.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAA;AA6RxE;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAS3D"}
@@ -15,7 +15,10 @@ import { CWD_PATH_PREFIX, formatErrorResponse, formatResponse, getUnifiedSession
15
15
  const cookiesSchema = z.object({
16
16
  action: z.enum(['get', 'set', 'delete', 'clear']).describe('操作类型'),
17
17
  url: z.string().optional().describe('URL 过滤(get/clear/set/delete)'),
18
- name: z.string().optional().describe('Cookie 名称(get/set/delete 必填;clear 可作过滤)'),
18
+ name: z
19
+ .string()
20
+ .optional()
21
+ .describe('Cookie 名称(get/set/delete 必填;clear 时只能作为 url/domain 范围内的附加过滤)'),
19
22
  domain: z.string().optional().describe('域名过滤(get/clear)'),
20
23
  path: z.string().optional().describe('路径过滤(get)或设置路径(set)'),
21
24
  secure: z.boolean().optional().describe('只返回 secure cookies(get)或设置 secure 属性(set)'),
@@ -184,8 +187,8 @@ async function handleCookies(args) {
184
187
  });
185
188
  }
186
189
  case 'clear': {
187
- // 强制过滤:禁止无参数清全站(避免误删用户登录态)
188
- if (!args.url && !args.domain && !args.name) {
190
+ // clear 必须限定到站点或域名,单独 name 会跨站删除同名 cookie
191
+ if (!args.url && !args.domain) {
189
192
  return {
190
193
  content: [
191
194
  {
@@ -193,7 +196,8 @@ async function handleCookies(args) {
193
196
  text: JSON.stringify({
194
197
  error: {
195
198
  code: 'INVALID_ARGUMENT',
196
- message: 'cookies action=clear 必须带 name/domain/url 至少一个过滤参数(避免误删用户登录态)',
199
+ message: 'cookies action=clear 必须带 url 或 domain 过滤参数;' +
200
+ 'name 只能在该范围内进一步过滤,避免误删其他站点的同名 cookie',
197
201
  },
198
202
  }),
199
203
  },