@pyrokine/mcp-chrome 3.0.0 → 3.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (144) hide show
  1. package/README.md +721 -303
  2. package/README_zh.md +750 -292
  3. package/dist/cdp/client.d.ts +7 -3
  4. package/dist/cdp/client.d.ts.map +1 -1
  5. package/dist/cdp/client.js +252 -63
  6. package/dist/cdp/client.js.map +1 -1
  7. package/dist/cdp/launcher.d.ts +1 -1
  8. package/dist/cdp/launcher.d.ts.map +1 -1
  9. package/dist/cdp/launcher.js +33 -12
  10. package/dist/cdp/launcher.js.map +1 -1
  11. package/dist/core/auto-wait.d.ts.map +1 -1
  12. package/dist/core/auto-wait.js +88 -52
  13. package/dist/core/auto-wait.js.map +1 -1
  14. package/dist/core/browser-driver.d.ts +76 -18
  15. package/dist/core/browser-driver.d.ts.map +1 -1
  16. package/dist/core/browser-driver.js.map +1 -1
  17. package/dist/core/browser-event-schema.d.ts +287 -0
  18. package/dist/core/browser-event-schema.d.ts.map +1 -0
  19. package/dist/core/browser-event-schema.js +104 -0
  20. package/dist/core/browser-event-schema.js.map +1 -0
  21. package/dist/core/browser-events.d.ts +99 -0
  22. package/dist/core/browser-events.d.ts.map +1 -0
  23. package/dist/core/browser-events.js +1312 -0
  24. package/dist/core/browser-events.js.map +1 -0
  25. package/dist/core/challenge-page.d.ts +39 -0
  26. package/dist/core/challenge-page.d.ts.map +1 -0
  27. package/dist/core/challenge-page.js +226 -0
  28. package/dist/core/challenge-page.js.map +1 -0
  29. package/dist/core/dom-helpers.d.ts +28 -0
  30. package/dist/core/dom-helpers.d.ts.map +1 -0
  31. package/dist/core/dom-helpers.js +311 -0
  32. package/dist/core/dom-helpers.js.map +1 -0
  33. package/dist/core/errors.d.ts +10 -4
  34. package/dist/core/errors.d.ts.map +1 -1
  35. package/dist/core/errors.js +63 -13
  36. package/dist/core/errors.js.map +1 -1
  37. package/dist/core/file-upload.d.ts +22 -0
  38. package/dist/core/file-upload.d.ts.map +1 -0
  39. package/dist/core/file-upload.js +194 -0
  40. package/dist/core/file-upload.js.map +1 -0
  41. package/dist/core/locator.d.ts +17 -2
  42. package/dist/core/locator.d.ts.map +1 -1
  43. package/dist/core/locator.js +156 -212
  44. package/dist/core/locator.js.map +1 -1
  45. package/dist/core/os-mouse.d.ts +11 -0
  46. package/dist/core/os-mouse.d.ts.map +1 -1
  47. package/dist/core/os-mouse.js +102 -29
  48. package/dist/core/os-mouse.js.map +1 -1
  49. package/dist/core/retry.d.ts.map +1 -1
  50. package/dist/core/retry.js +4 -1
  51. package/dist/core/retry.js.map +1 -1
  52. package/dist/core/session.d.ts +65 -14
  53. package/dist/core/session.d.ts.map +1 -1
  54. package/dist/core/session.js +1089 -273
  55. package/dist/core/session.js.map +1 -1
  56. package/dist/core/types.d.ts +5 -1
  57. package/dist/core/types.d.ts.map +1 -1
  58. package/dist/core/types.js +16 -1
  59. package/dist/core/types.js.map +1 -1
  60. package/dist/core/unified-session.d.ts +50 -41
  61. package/dist/core/unified-session.d.ts.map +1 -1
  62. package/dist/core/unified-session.js +938 -285
  63. package/dist/core/unified-session.js.map +1 -1
  64. package/dist/core/utils.d.ts +5 -4
  65. package/dist/core/utils.d.ts.map +1 -1
  66. package/dist/core/utils.js +73 -18
  67. package/dist/core/utils.js.map +1 -1
  68. package/dist/extension/bridge.d.ts +50 -19
  69. package/dist/extension/bridge.d.ts.map +1 -1
  70. package/dist/extension/bridge.js +289 -57
  71. package/dist/extension/bridge.js.map +1 -1
  72. package/dist/extension/http-server.d.ts +7 -2
  73. package/dist/extension/http-server.d.ts.map +1 -1
  74. package/dist/extension/http-server.js +219 -48
  75. package/dist/extension/http-server.js.map +1 -1
  76. package/dist/index.js +14 -1
  77. package/dist/index.js.map +1 -1
  78. package/dist/tools/browse.d.ts.map +1 -1
  79. package/dist/tools/browse.js +66 -32
  80. package/dist/tools/browse.js.map +1 -1
  81. package/dist/tools/browser-event-output.d.ts +7 -0
  82. package/dist/tools/browser-event-output.d.ts.map +1 -0
  83. package/dist/tools/browser-event-output.js +19 -0
  84. package/dist/tools/browser-event-output.js.map +1 -0
  85. package/dist/tools/challenge.d.ts +17 -5
  86. package/dist/tools/challenge.d.ts.map +1 -1
  87. package/dist/tools/challenge.js +113 -195
  88. package/dist/tools/challenge.js.map +1 -1
  89. package/dist/tools/cookies.d.ts.map +1 -1
  90. package/dist/tools/cookies.js +33 -8
  91. package/dist/tools/cookies.js.map +1 -1
  92. package/dist/tools/diagnostics.d.ts.map +1 -1
  93. package/dist/tools/diagnostics.js +14 -0
  94. package/dist/tools/diagnostics.js.map +1 -1
  95. package/dist/tools/evaluate.d.ts +6 -5
  96. package/dist/tools/evaluate.d.ts.map +1 -1
  97. package/dist/tools/evaluate.js +102 -52
  98. package/dist/tools/evaluate.js.map +1 -1
  99. package/dist/tools/extract.d.ts.map +1 -1
  100. package/dist/tools/extract.js +178 -124
  101. package/dist/tools/extract.js.map +1 -1
  102. package/dist/tools/input.d.ts.map +1 -1
  103. package/dist/tools/input.js +623 -271
  104. package/dist/tools/input.js.map +1 -1
  105. package/dist/tools/logs.d.ts.map +1 -1
  106. package/dist/tools/logs.js +50 -11
  107. package/dist/tools/logs.js.map +1 -1
  108. package/dist/tools/manage.d.ts.map +1 -1
  109. package/dist/tools/manage.js +127 -46
  110. package/dist/tools/manage.js.map +1 -1
  111. package/dist/tools/network-sanitizer.d.ts +1 -0
  112. package/dist/tools/network-sanitizer.d.ts.map +1 -1
  113. package/dist/tools/network-sanitizer.js +30 -1
  114. package/dist/tools/network-sanitizer.js.map +1 -1
  115. package/dist/tools/page-context.d.ts +4 -3
  116. package/dist/tools/page-context.d.ts.map +1 -1
  117. package/dist/tools/page-context.js +56 -14
  118. package/dist/tools/page-context.js.map +1 -1
  119. package/dist/tools/post-condition.d.ts +1 -1
  120. package/dist/tools/post-condition.d.ts.map +1 -1
  121. package/dist/tools/post-condition.js +153 -47
  122. package/dist/tools/post-condition.js.map +1 -1
  123. package/dist/tools/schema.d.ts +7 -4
  124. package/dist/tools/schema.d.ts.map +1 -1
  125. package/dist/tools/schema.js +32 -122
  126. package/dist/tools/schema.js.map +1 -1
  127. package/dist/tools/target-diagnostics.d.ts +10 -2
  128. package/dist/tools/target-diagnostics.d.ts.map +1 -1
  129. package/dist/tools/target-diagnostics.js +74 -21
  130. package/dist/tools/target-diagnostics.js.map +1 -1
  131. package/dist/tools/wait.d.ts.map +1 -1
  132. package/dist/tools/wait.js +108 -42
  133. package/dist/tools/wait.js.map +1 -1
  134. package/extension/dist/assets/{content.ts-C4imZ6A9.js → content.ts-BAMOcF3R.js} +1 -1
  135. package/extension/dist/assets/{content.ts-loader-CnJuCGhl.js → content.ts-loader-4F9a1EWZ.js} +1 -1
  136. package/extension/dist/assets/index.ts-B79g2ikq.js +19820 -0
  137. package/extension/dist/assets/{page-scripts-CMIY1zhd.js → page-scripts-CSxn58h1.js} +300 -410
  138. package/extension/dist/assets/{popup.html-CgtWL6Py.js → popup.html-DwwHo00N.js} +8 -6
  139. package/extension/dist/manifest.json +4 -4
  140. package/extension/dist/service-worker-loader.js +1 -1
  141. package/extension/dist/src/popup/popup.html +3 -3
  142. package/package.json +15 -7
  143. package/scripts/start-chrome.ps1 +9 -1
  144. package/extension/dist/assets/index.ts-GeHNZBml.js +0 -8972
@@ -37,6 +37,7 @@ export interface ChallengePageSnapshot {
37
37
  textHits: string[];
38
38
  originResponsePending: boolean;
39
39
  turnstilePresent: boolean;
40
+ turnstileState?: 'none' | 'pending' | 'completed' | 'expired';
40
41
  clickPoint: ChallengeClickPoint | null;
41
42
  clickTargetKind: ChallengeClickTargetKind | null;
42
43
  clickSource: ChallengeClickSource | null;
@@ -51,6 +52,7 @@ export interface ChallengeWaitResult {
51
52
  clearanceCookiePresent: boolean;
52
53
  challengeKind: Exclude<ChallengeKind, 'denied'>;
53
54
  originResponsePending: boolean;
55
+ browserEvents?: Record<string, unknown>;
54
56
  }
55
57
  export interface ChallengeHost {
56
58
  getMode(): 'extension' | 'cdp' | 'none';
@@ -73,7 +75,13 @@ export interface ChallengeHost {
73
75
  }): Promise<unknown>;
74
76
  mouseMove(x: number, y: number): Promise<void>;
75
77
  mouseClick(button?: 'left' | 'middle' | 'right' | 'back' | 'forward', clickCount?: number): Promise<void>;
76
- clickTurnstile?(snapshot: ChallengePageSnapshot, timeout?: number): Promise<void>;
78
+ clickTurnstile?(snapshot: ChallengePageSnapshot, timeout?: number, signal?: AbortSignal, refreshSnapshot?: (timeout?: number) => Promise<ChallengePageSnapshot>): Promise<void>;
79
+ suspendBrowserEventsForChallenge?(): Promise<Record<string, unknown>>;
80
+ hasBrowserEventObservation?(): boolean;
81
+ browserEvents?(action: 'read', command: {
82
+ type: 'dialog';
83
+ limit: number;
84
+ }): Promise<Record<string, unknown>>;
77
85
  }
78
86
  export declare abstract class ChallengeError extends Error {
79
87
  readonly action: string;
@@ -81,15 +89,16 @@ export declare abstract class ChallengeError extends Error {
81
89
  readonly waitedMs: number;
82
90
  readonly challengeKind: ChallengeKind;
83
91
  readonly mode: 'extension' | 'cdp' | 'none';
92
+ readonly browserEvents?: Record<string, unknown> | undefined;
84
93
  abstract readonly code: string;
85
94
  abstract readonly suggestion: string;
86
- protected constructor(message: string, action: string, actionStatus: 'not_started' | 'completed', waitedMs: number, challengeKind: ChallengeKind, mode: 'extension' | 'cdp' | 'none');
95
+ protected constructor(message: string, action: string, actionStatus: 'not_started' | 'completed', waitedMs: number, challengeKind: ChallengeKind, mode: 'extension' | 'cdp' | 'none', browserEvents?: Record<string, unknown> | undefined);
87
96
  }
88
97
  export declare class ChallengeTimeoutError extends ChallengeError {
89
98
  readonly clickedTurnstile: boolean;
90
99
  readonly code = "CHALLENGE_TIMEOUT";
91
100
  readonly suggestion: string;
92
- constructor(action: string, actionStatus: 'not_started' | 'completed', waitedMs: number, challengeKind: ChallengeKind, mode: 'extension' | 'cdp' | 'none', clickedTurnstile?: boolean);
101
+ constructor(action: string, actionStatus: 'not_started' | 'completed', waitedMs: number, challengeKind: ChallengeKind, mode: 'extension' | 'cdp' | 'none', clickedTurnstile?: boolean, browserEvents?: Record<string, unknown>);
93
102
  toJSON(): {
94
103
  success: boolean;
95
104
  action: string;
@@ -101,6 +110,7 @@ export declare class ChallengeTimeoutError extends ChallengeError {
101
110
  clickedTurnstile: boolean;
102
111
  mode: "cdp" | "extension" | "none";
103
112
  waitedMs: number;
113
+ browserEvents?: Record<string, unknown> | undefined;
104
114
  autoRetry: boolean;
105
115
  retryable: boolean;
106
116
  nextAction: string;
@@ -114,7 +124,7 @@ export declare class ChallengeTimeoutError extends ChallengeError {
114
124
  export declare class ChallengeDeniedError extends ChallengeError {
115
125
  readonly code = "CHALLENGE_DENIED";
116
126
  readonly suggestion = "\u8BE5\u9875\u9762\u8FD4\u56DE\u4E86 Cloudflare Access denied\uFF0C\u7B49\u5F85\u6216\u70B9\u51FB checkbox \u65E0\u6CD5\u7EE7\u7EED\u8BBF\u95EE";
117
- constructor(action: string, actionStatus: 'not_started' | 'completed', waitedMs: number, mode: 'extension' | 'cdp' | 'none');
127
+ constructor(action: string, actionStatus: 'not_started' | 'completed', waitedMs: number, mode: 'extension' | 'cdp' | 'none', browserEvents?: Record<string, unknown>);
118
128
  toJSON(): {
119
129
  success: boolean;
120
130
  action: string;
@@ -125,6 +135,7 @@ export declare class ChallengeDeniedError extends ChallengeError {
125
135
  challengeKind: string;
126
136
  mode: "cdp" | "extension" | "none";
127
137
  waitedMs: number;
138
+ browserEvents?: Record<string, unknown> | undefined;
128
139
  autoRetry: boolean;
129
140
  retryable: boolean;
130
141
  nextAction: string;
@@ -147,7 +158,8 @@ export declare function waitForChallenge(host: ChallengeHost, options: {
147
158
  actionStatus?: 'not_started' | 'completed';
148
159
  now?: () => number;
149
160
  sleep?: (ms: number) => Promise<void>;
161
+ signal?: AbortSignal;
150
162
  }): Promise<ChallengeWaitResult>;
151
- export declare function resolveChallenge(host: ChallengeHost, action: string, actionStatus?: 'not_started' | 'completed', timeout?: number): Promise<ChallengeWaitResult>;
163
+ export declare function resolveChallenge(host: ChallengeHost, action: string, actionStatus?: 'not_started' | 'completed', timeout?: number, signal?: AbortSignal): Promise<ChallengeWaitResult>;
152
164
  export declare function challengeResultFields(result: ChallengeWaitResult): Record<string, unknown>;
153
165
  //# sourceMappingURL=challenge.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"challenge.d.ts","sourceRoot":"","sources":["../../src/tools/challenge.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"challenge.d.ts","sourceRoot":"","sources":["../../src/tools/challenge.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,7 @@
1
+ import { setTimeout as delay } from 'node:timers/promises';
2
+ import { inspectChallengePage } from '../core/challenge-page.js';
1
3
  import { DEFAULT_TIMEOUT } from '../core/types.js';
2
- import { StructuredToolError, TimeoutError } from '../core/errors.js';
4
+ import { OsMouseError, 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;
@@ -43,13 +45,15 @@ export class ChallengeError extends Error {
43
45
  waitedMs;
44
46
  challengeKind;
45
47
  mode;
46
- constructor(message, action, actionStatus, waitedMs, challengeKind, mode) {
48
+ browserEvents;
49
+ constructor(message, action, actionStatus, waitedMs, challengeKind, mode, browserEvents) {
47
50
  super(message);
48
51
  this.action = action;
49
52
  this.actionStatus = actionStatus;
50
53
  this.waitedMs = waitedMs;
51
54
  this.challengeKind = challengeKind;
52
55
  this.mode = mode;
56
+ this.browserEvents = browserEvents;
53
57
  this.name = this.constructor.name;
54
58
  }
55
59
  }
@@ -57,13 +61,15 @@ export class ChallengeTimeoutError extends ChallengeError {
57
61
  clickedTurnstile;
58
62
  code = 'CHALLENGE_TIMEOUT';
59
63
  suggestion;
60
- constructor(action, actionStatus, waitedMs, challengeKind, mode, clickedTurnstile = false) {
61
- super(`页面访问验证未在超时内完成(已等待 ${waitedMs}ms)`, action, actionStatus, waitedMs, challengeKind, mode);
64
+ constructor(action, actionStatus, waitedMs, challengeKind, mode, clickedTurnstile = false, browserEvents) {
65
+ super(`页面访问验证未在超时内完成(已等待 ${waitedMs}ms)`, action, actionStatus, waitedMs, challengeKind, mode, browserEvents);
62
66
  this.clickedTurnstile = clickedTurnstile;
63
67
  this.suggestion =
64
- mode === 'cdp'
65
- ? '当前请求使用 CDP。先确认 Chrome Extension 已连接,再不传 port 重试;仅在需要独立浏览器时保留 CDP'
66
- : '增加 timeout 后重试同一操作。交互式验证码、IP 声誉和 Bot Fight Mode 无法仅靠等待或点击 checkbox 完成';
68
+ actionStatus === 'completed'
69
+ ? '原动作已执行,等待页面验证结束后核验业务结果,勿重放原动作'
70
+ : mode === 'cdp'
71
+ ? '当前请求使用 CDP。先确认 Chrome Extension 已连接,再不传 port 重试;仅在需要独立浏览器时保留 CDP'
72
+ : '增加 timeout 后重试同一操作。交互式验证码、IP 声誉和 Bot Fight Mode 无法仅靠等待或点击 checkbox 完成';
67
73
  }
68
74
  toJSON() {
69
75
  return {
@@ -77,9 +83,10 @@ export class ChallengeTimeoutError extends ChallengeError {
77
83
  clickedTurnstile: this.clickedTurnstile,
78
84
  mode: this.mode,
79
85
  waitedMs: this.waitedMs,
86
+ ...(this.browserEvents ? { browserEvents: this.browserEvents } : {}),
80
87
  autoRetry: false,
81
- retryable: true,
82
- nextAction: 'retry_with_longer_timeout',
88
+ retryable: this.actionStatus === 'not_started',
89
+ nextAction: this.actionStatus === 'completed' ? 'wait_and_verify' : 'retry_with_longer_timeout',
83
90
  error: {
84
91
  code: this.code,
85
92
  message: this.message,
@@ -91,8 +98,8 @@ export class ChallengeTimeoutError extends ChallengeError {
91
98
  export class ChallengeDeniedError extends ChallengeError {
92
99
  code = 'CHALLENGE_DENIED';
93
100
  suggestion = '该页面返回了 Cloudflare Access denied,等待或点击 checkbox 无法继续访问';
94
- constructor(action, actionStatus, waitedMs, mode) {
95
- super('页面拒绝访问(Cloudflare Access denied)', action, actionStatus, waitedMs, 'denied', mode);
101
+ constructor(action, actionStatus, waitedMs, mode, browserEvents) {
102
+ super('页面拒绝访问(Cloudflare Access denied)', action, actionStatus, waitedMs, 'denied', mode, browserEvents);
96
103
  }
97
104
  toJSON() {
98
105
  return {
@@ -105,6 +112,7 @@ export class ChallengeDeniedError extends ChallengeError {
105
112
  challengeKind: 'denied',
106
113
  mode: this.mode,
107
114
  waitedMs: this.waitedMs,
115
+ ...(this.browserEvents ? { browserEvents: this.browserEvents } : {}),
108
116
  autoRetry: false,
109
117
  retryable: false,
110
118
  nextAction: 'stop',
@@ -117,168 +125,16 @@ export class ChallengeDeniedError extends ChallengeError {
117
125
  }
118
126
  }
119
127
  //noinspection SpellCheckingInspection -- 模板中的浏览器 API 字段名
120
- export const CHALLENGE_INSPECT_SCRIPT = `(() => {
121
- const challengeSelectors = ${JSON.stringify(CHALLENGE_SELECTORS)};
122
- const deniedSelectors = ${JSON.stringify(DENIED_SELECTORS)};
123
- const widgetSelectors = ${JSON.stringify(TURNSTILE_WIDGET_SELECTORS)};
124
- const verifyButtonSelectors = ${JSON.stringify(TURNSTILE_VERIFY_BUTTON_SELECTORS)};
125
- const frameSelectors = ${JSON.stringify(TURNSTILE_FRAME_SELECTORS)};
126
- const titleNeedles = ${JSON.stringify(CHALLENGE_TITLE_NEEDLES)};
127
- const textMarkers = ${JSON.stringify(CHALLENGE_TEXT_MARKERS)};
128
- const originResponsePendingTextMarkers = ${JSON.stringify(ORIGIN_RESPONSE_PENDING_TEXT_MARKERS)};
129
- const title = document.title || '';
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 turnstileBox = findVisibleTurnstileBox();
188
- const hostVerify = Array.from(document.querySelectorAll(verifyButtonSelectors.join(','))).find(isVisible) ||
189
- Array.from(document.querySelectorAll('button')).find((el) => {
190
- const text = (el.textContent || '').trim();
191
- return isVisible(el) && (text === 'Verify you are human' || text === '请验证您是真人');
192
- });
193
- const useIframeClick = cloudflareFramePresent || (
194
- !hostVerify &&
195
- interstitialPending &&
196
- Boolean(document.querySelector('input[name="cf-turnstile-response"]'))
197
- );
198
- const turnstilePresent =
199
- widgetHits.length > 0 ||
200
- useIframeClick ||
201
- (interstitialPending && frameHits.length > 0) ||
202
- Boolean(turnstileBox);
203
- const pointFromRect = (rect, kind) => {
204
- if (!rect || rect.width < 8 || rect.height < 8) return null;
205
- const y = Math.round(rect.top + Math.min(rect.height, 65) / 2);
206
- if (kind === 'verify') {
207
- return { x: Math.round(rect.left + rect.width / 2), y };
208
- }
209
- const widgetWidth = Math.min(rect.width, 300);
210
- return { x: Math.round(rect.left + Math.min(20, Math.max(14, widgetWidth / 15))), y };
211
- };
212
- let clickPoint = null;
213
- let clickTargetKind = null;
214
- let clickSource = null;
215
- const setClickTarget = (el, kind) => {
216
- if (!el) return;
217
- bringIntoView(el);
218
- const point = pointFromRect(el.getBoundingClientRect(), kind);
219
- if (!point) return;
220
- clickPoint = point;
221
- clickTargetKind = kind;
222
- clickSource = isCloudflareFrame(el) || useIframeClick ? 'iframe' : 'page';
223
- };
224
- if (hostVerify) {
225
- setClickTarget(hostVerify, 'verify');
226
- }
227
- if (!clickPoint && turnstileBox) {
228
- const boxRect = turnstileBox.getBoundingClientRect();
229
- if (boxRect.width <= 340 && boxRect.height <= 85) {
230
- setClickTarget(turnstileBox, 'widget');
231
- }
232
- }
233
- if (!clickPoint && turnstilePresent) {
234
- const frame = Array.from(document.querySelectorAll(frameSelectors.join(','))).find(isVisible);
235
- if (frame) {
236
- setClickTarget(frame, 'widget');
237
- }
238
- }
239
- if (!clickPoint && turnstilePresent) {
240
- const widget = Array.from(document.querySelectorAll(widgetSelectors.join(','))).find(isVisible);
241
- if (widget) {
242
- setClickTarget(widget, 'widget');
243
- }
244
- }
245
- if (!clickPoint && turnstileBox) {
246
- setClickTarget(turnstileBox, 'widget');
247
- }
248
- const viewport = {
249
- screenX: Number(window.screenX),
250
- screenY: Number(window.screenY),
251
- innerWidth: Number(window.innerWidth),
252
- innerHeight: Number(window.innerHeight),
253
- outerWidth: Number(window.outerWidth),
254
- outerHeight: Number(window.outerHeight),
255
- devicePixelRatio: Number(window.devicePixelRatio || 1),
256
- };
257
- const horizontal = Math.max(0, viewport.outerWidth - viewport.innerWidth);
258
- const vertical = Math.max(0, viewport.outerHeight - viewport.innerHeight);
259
- const chromeLeft = Math.round(horizontal / 2);
260
- const chromeTop = Math.max(0, vertical - horizontal);
261
- const screenPoint = clickPoint
262
- ? {
263
- x: Math.round(viewport.screenX + chromeLeft + clickPoint.x),
264
- y: Math.round(viewport.screenY + chromeTop + clickPoint.y),
265
- }
266
- : null;
267
- return {
268
- title,
269
- url,
270
- selectorHits,
271
- deniedHits,
272
- textHits,
273
- originResponsePending,
274
- turnstilePresent,
275
- clickPoint,
276
- clickTargetKind,
277
- clickSource,
278
- screenPoint,
279
- viewport,
280
- };
281
- })()`;
128
+ export const CHALLENGE_INSPECT_SCRIPT = `(${inspectChallengePage.toString()})(${JSON.stringify({
129
+ challengeSelectors: CHALLENGE_SELECTORS,
130
+ deniedSelectors: DENIED_SELECTORS,
131
+ widgetSelectors: TURNSTILE_WIDGET_SELECTORS,
132
+ verifyButtonSelectors: TURNSTILE_VERIFY_BUTTON_SELECTORS,
133
+ frameSelectors: TURNSTILE_FRAME_SELECTORS,
134
+ titleNeedles: CHALLENGE_TITLE_NEEDLES,
135
+ textMarkers: CHALLENGE_TEXT_MARKERS,
136
+ originResponsePendingTextMarkers: ORIGIN_RESPONSE_PENDING_TEXT_MARKERS,
137
+ })})`;
282
138
  function normalizeChallengeTitle(title) {
283
139
  return title.trim().toLowerCase().replace(/…/g, '...');
284
140
  }
@@ -334,14 +190,14 @@ async function readPageTitle(host) {
334
190
  try {
335
191
  const live = await host.getLiveState();
336
192
  if (typeof live?.title === 'string') {
337
- return { title: live.title, live: true };
193
+ return live.title;
338
194
  }
339
195
  }
340
196
  catch {
341
197
  // 回退到缓存状态
342
198
  }
343
199
  }
344
- return { title: host.getState()?.title ?? '', live: false };
200
+ return host.getState()?.title ?? '';
345
201
  }
346
202
  function finitePoint(point) {
347
203
  return point &&
@@ -399,6 +255,7 @@ function normalizeChallengeSnapshot(snapshot, fallback) {
399
255
  textHits: Array.isArray(snapshot?.textHits) ? snapshot.textHits : [],
400
256
  originResponsePending: Boolean(snapshot?.originResponsePending),
401
257
  turnstilePresent: Boolean(snapshot?.turnstilePresent),
258
+ ...(snapshot?.turnstileState ? { turnstileState: snapshot.turnstileState } : {}),
402
259
  clickPoint,
403
260
  clickTargetKind: snapshot?.clickTargetKind === 'verify' || snapshot?.clickTargetKind === 'widget'
404
261
  ? snapshot.clickTargetKind
@@ -449,7 +306,7 @@ export async function waitForChallenge(host, options) {
449
306
  const timeout = options.timeout ?? DEFAULT_TIMEOUT;
450
307
  const actionStatus = options.actionStatus ?? 'completed';
451
308
  const now = options.now ?? Date.now;
452
- const sleep = options.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
309
+ const sleep = options.sleep ?? ((ms) => delay(ms, undefined, { signal: options.signal }));
453
310
  const startedAt = now();
454
311
  const deadline = () => Date.now() + Math.max(1, timeout - (now() - startedAt));
455
312
  let lastInspectAt = startedAt;
@@ -460,32 +317,67 @@ export async function waitForChallenge(host, options) {
460
317
  let jsOnlyInterstitial = false;
461
318
  let emptyInspectCount = 0;
462
319
  let finalOriginResponseCheckStarted = false;
320
+ let browserEvents;
321
+ let observersSuspended = false;
463
322
  const readWithinBudget = async (operation) => {
464
323
  try {
465
- return await withNavigationBudget(operation, deadline());
324
+ return await withNavigationBudget(operation, deadline(), options.signal);
466
325
  }
467
326
  catch (error) {
468
327
  if (error instanceof TimeoutError || (error instanceof StructuredToolError && error.code === 'TIMEOUT')) {
469
- throw new ChallengeTimeoutError(options.action, actionStatus, Math.max(0, now() - startedAt), clickedTurnstile ? 'turnstile' : observedKind, host.getMode(), clickedTurnstile);
328
+ throw new ChallengeTimeoutError(options.action, actionStatus, Math.max(0, now() - startedAt), clickedTurnstile ? 'turnstile' : observedKind, host.getMode(), clickedTurnstile, browserEvents);
470
329
  }
471
330
  throw error;
472
331
  }
473
332
  };
333
+ const suspendObservers = async () => {
334
+ if (observersSuspended || !host.suspendBrowserEventsForChallenge) {
335
+ return;
336
+ }
337
+ browserEvents = await readWithinBudget(() => host.suspendBrowserEventsForChallenge());
338
+ if (browserEvents.suspended !== true || browserEvents.fetchEnabled === true) {
339
+ throw new StructuredToolError('CHALLENGE_OBSERVATION_CLEANUP_FAILED', '页面验证前未能释放当前请求控制,已保留实际状态', '读取 browserEvents 中的暂停请求及清理错误,处理后再等待页面验证', {
340
+ action: options.action,
341
+ actionExecuted: actionStatus === 'completed',
342
+ actionStatus,
343
+ verificationStatus: 'blocked',
344
+ browserEvents,
345
+ retryable: false,
346
+ });
347
+ }
348
+ observersSuspended = true;
349
+ };
474
350
  while (true) {
475
351
  const remainingBeforeInspect = timeout - (now() - startedAt);
476
352
  if (remainingBeforeInspect <= 0) {
477
- throw new ChallengeTimeoutError(options.action, actionStatus, Math.max(0, now() - startedAt), clickedTurnstile ? 'turnstile' : observedKind, host.getMode(), clickedTurnstile);
353
+ throw new ChallengeTimeoutError(options.action, actionStatus, Math.max(0, now() - startedAt), clickedTurnstile ? 'turnstile' : observedKind, host.getMode(), clickedTurnstile, browserEvents);
354
+ }
355
+ if (host.hasBrowserEventObservation?.() && host.browserEvents) {
356
+ const events = await readWithinBudget(() => host.browserEvents('read', { type: 'dialog', limit: 1000 }));
357
+ const dialog = Array.isArray(events.logs)
358
+ ? events.logs.find((entry) => entry.state === 'pending')
359
+ : undefined;
360
+ if (dialog) {
361
+ throw new StructuredToolError('DIALOG_OPEN', '页面对话框等待处理,页面验证尚未执行', '使用 manage(action="dialog") 处理返回的 ref,再检查原操作结果', {
362
+ ref: dialog.ref,
363
+ actionExecuted: actionStatus === 'completed',
364
+ actionStatus,
365
+ verificationStatus: 'blocked',
366
+ retryable: false,
367
+ });
368
+ }
478
369
  }
479
370
  const header = await readWithinBudget(() => host.getChallengeState());
480
371
  const headerPending = header?.state === 'pending';
481
- const pageTitle = await readWithinBudget(() => readPageTitle(host));
482
- const title = pageTitle.title;
372
+ const title = await readWithinBudget(() => readPageTitle(host));
483
373
  if (DENIED_TITLE_PREFIXES.some((prefix) => title.trim().toLowerCase().startsWith(prefix))) {
484
- throw new ChallengeDeniedError(options.action, actionStatus, Math.max(0, now() - startedAt), host.getMode());
374
+ await suspendObservers();
375
+ throw new ChallengeDeniedError(options.action, actionStatus, Math.max(0, now() - startedAt), host.getMode(), browserEvents);
485
376
  }
486
377
  let snapshot;
487
378
  if (titleLooksLikeChallenge(title)) {
488
379
  observedKind = observedKind === 'none' ? 'js' : observedKind;
380
+ await suspendObservers();
489
381
  const passiveGraceMs = host.getMode() === 'extension' ? CHALLENGE_EXTENSION_PASSIVE_GRACE_MS : CHALLENGE_INSPECT_GRACE_MS;
490
382
  const elapsed = now() - startedAt;
491
383
  const inspectChallengePage = elapsed >= passiveGraceMs &&
@@ -513,16 +405,17 @@ export async function waitForChallenge(host, options) {
513
405
  snapshot = blankChallengeSnapshot(title, host.getState()?.url ?? '', false);
514
406
  }
515
407
  }
516
- else if (pageTitle.live && title.trim() !== '' && (!headerPending || host.getMode() === 'extension')) {
517
- snapshot = blankChallengeSnapshot(title, host.getState()?.url ?? '', true);
518
- }
519
408
  if (!snapshot) {
520
409
  snapshot = await readWithinBudget(() => readChallengeSnapshot(host, Math.min(CHALLENGE_INSPECT_TIMEOUT_MS, Math.max(1, timeout - (now() - startedAt)))));
521
410
  lastInspectAt = now();
522
411
  }
523
412
  const kind = classifyChallengeSnapshot(snapshot, headerPending);
524
413
  if (kind === 'denied') {
525
- throw new ChallengeDeniedError(options.action, actionStatus, Math.max(0, now() - startedAt), host.getMode());
414
+ await suspendObservers();
415
+ throw new ChallengeDeniedError(options.action, actionStatus, Math.max(0, now() - startedAt), host.getMode(), browserEvents);
416
+ }
417
+ if (kind === 'turnstile' || (kind === 'js' && snapshot.inspected)) {
418
+ await suspendObservers();
526
419
  }
527
420
  if (kind !== 'none' && (kind === 'turnstile' || snapshotInspected(snapshot) || observedKind === 'none')) {
528
421
  observedKind = kind;
@@ -535,6 +428,7 @@ export async function waitForChallenge(host, options) {
535
428
  clearanceCookiePresent: observedKind === 'none' ? false : await readWithinBudget(() => hasClearanceCookie(host)),
536
429
  challengeKind: observedKind,
537
430
  originResponsePending: snapshot.originResponsePending,
431
+ ...(browserEvents ? { browserEvents } : {}),
538
432
  };
539
433
  }
540
434
  const clickTargetKind = snapshot.clickTargetKind ?? (snapshot.clickPoint ? 'widget' : null);
@@ -555,16 +449,24 @@ export async function waitForChallenge(host, options) {
555
449
  const clickPoint = snapshot.clickPoint;
556
450
  try {
557
451
  if (host.clickTurnstile) {
558
- await withNavigationBudget(() => host.clickTurnstile(clickSnapshot, Math.max(0, timeout - (now() - startedAt))), clickDeadline);
452
+ const click = () => host.clickTurnstile(clickSnapshot, Math.max(0, timeout - (now() - startedAt)), options.signal, (remaining = CHALLENGE_INSPECT_TIMEOUT_MS) => readChallengeSnapshot(host, Math.min(CHALLENGE_INSPECT_TIMEOUT_MS, remaining)));
453
+ // iframe 路径自行处理取消与有界释放,完成后才结束 tab 锁
454
+ if (clickSnapshot.clickSource === 'iframe') {
455
+ await click();
456
+ }
457
+ else {
458
+ await withNavigationBudget(click, clickDeadline, options.signal);
459
+ }
559
460
  }
560
461
  else {
561
- await withNavigationBudget(() => host.mouseMove(clickPoint.x, clickPoint.y), clickDeadline);
562
- await withNavigationBudget(() => host.mouseClick('left'), clickDeadline);
462
+ await withNavigationBudget(() => host.mouseMove(clickPoint.x, clickPoint.y), clickDeadline, options.signal);
463
+ await withNavigationBudget(() => host.mouseClick('left'), clickDeadline, options.signal);
563
464
  }
564
465
  }
565
466
  catch (error) {
566
467
  if (error instanceof TimeoutError ||
567
- (error instanceof StructuredToolError && error.code === 'TIMEOUT')) {
468
+ (error instanceof StructuredToolError && error.code === 'TIMEOUT') ||
469
+ (error instanceof OsMouseError && error.context.failureStage === 'release')) {
568
470
  Object.assign(error.context, {
569
471
  action: options.action,
570
472
  actionExecuted: actionStatus === 'completed',
@@ -587,16 +489,31 @@ export async function waitForChallenge(host, options) {
587
489
  }
588
490
  const elapsed = now() - startedAt;
589
491
  if (elapsed >= timeout) {
590
- throw new ChallengeTimeoutError(options.action, actionStatus, Math.max(elapsed, timeout), clickedTurnstile ? 'turnstile' : observedKind === 'none' ? kind : observedKind, host.getMode(), clickedTurnstile);
492
+ throw new ChallengeTimeoutError(options.action, actionStatus, Math.max(elapsed, timeout), clickedTurnstile ? 'turnstile' : observedKind === 'none' ? kind : observedKind, host.getMode(), clickedTurnstile, browserEvents);
591
493
  }
592
- await sleep(Math.min(CHALLENGE_POLL_MS, timeout - elapsed));
494
+ await readWithinBudget(() => sleep(Math.min(CHALLENGE_POLL_MS, timeout - elapsed)));
593
495
  }
594
496
  }
595
- export async function resolveChallenge(host, action, actionStatus = 'completed', timeout) {
596
- return waitForChallenge(host, { action, actionStatus, timeout });
497
+ export async function resolveChallenge(host, action, actionStatus = 'completed', timeout, signal) {
498
+ try {
499
+ return await waitForChallenge(host, { action, actionStatus, timeout, signal });
500
+ }
501
+ catch (error) {
502
+ if (!signal?.aborted || (error instanceof OsMouseError && error.context.failureStage === 'release')) {
503
+ throw error;
504
+ }
505
+ throw new StructuredToolError('CANCELLED', error instanceof Error ? error.message : String(error), '请求已取消,请读取当前页面核验已执行动作的结果', {
506
+ action,
507
+ actionExecuted: actionStatus === 'completed',
508
+ actionStatus,
509
+ verificationStatus: 'cancelled',
510
+ verificationActionExecuted: 'unknown',
511
+ retryable: false,
512
+ });
513
+ }
597
514
  }
598
515
  export function challengeResultFields(result) {
599
- if (result.challengeKind === 'none' && !result.originResponsePending) {
516
+ if (result.challengeKind === 'none' && !result.originResponsePending && !result.browserEvents) {
600
517
  return {};
601
518
  }
602
519
  return {
@@ -606,6 +523,7 @@ export function challengeResultFields(result) {
606
523
  clickedTurnstile: result.clickedTurnstile,
607
524
  clearanceCookiePresent: result.clearanceCookiePresent,
608
525
  ...(result.originResponsePending ? { originResponsePending: true } : {}),
526
+ ...(result.browserEvents ? { browserEvents: result.browserEvents } : {}),
609
527
  };
610
528
  }
611
529
  //# sourceMappingURL=challenge.js.map