@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
@@ -0,0 +1,194 @@
1
+ import { createReadStream } from 'node:fs';
2
+ import { stat } from 'node:fs/promises';
3
+ import { homedir } from 'node:os';
4
+ import { basename, join, resolve } from 'node:path';
5
+ import { lookup } from 'mime-types';
6
+ import { StructuredToolError } from './errors.js';
7
+ const UPLOAD_BYTE_LIMIT = 50 * 1024 * 1024;
8
+ export async function prepareUploadFiles(paths, deadline, signal) {
9
+ const active = () => {
10
+ signal?.throwIfAborted();
11
+ if (Date.now() >= deadline) {
12
+ throw new Error('input timeout before upload assignment');
13
+ }
14
+ };
15
+ let total = 0;
16
+ const checkSize = (size) => {
17
+ if (size >= UPLOAD_BYTE_LIMIT) {
18
+ throw new StructuredToolError('UPLOAD_TOO_LARGE', '上传文件的总大小必须小于 50 MiB', '请减少文件数量或大小', { actionExecuted: false, actionStatus: 'not_started', limitBytes: UPLOAD_BYTE_LIMIT });
19
+ }
20
+ };
21
+ const files = [];
22
+ for (const [index, path] of paths.entries()) {
23
+ active();
24
+ const resolved = resolve(path === '~' ? homedir() : path.startsWith('~/') ? join(homedir(), path.slice(2)) : path);
25
+ let timer;
26
+ let onAbort;
27
+ try {
28
+ const stopped = new Promise((_resolve, reject) => {
29
+ timer = setTimeout(() => reject(new Error('input timeout before upload file preflight')), Math.max(0, Math.ceil(deadline - Date.now())));
30
+ onAbort = () => reject(signal?.reason ?? new Error('Upload cancelled before file preflight'));
31
+ signal?.addEventListener('abort', onAbort, { once: true });
32
+ if (signal?.aborted) {
33
+ onAbort();
34
+ }
35
+ });
36
+ const info = await Promise.race([stat(resolved), stopped]);
37
+ active();
38
+ if (!info.isFile()) {
39
+ // noinspection ExceptionCaughtLocallyJS
40
+ throw Object.assign(new Error('Not a regular file'), { code: 'NOT_REGULAR_FILE' });
41
+ }
42
+ total += info.size;
43
+ checkSize(total);
44
+ files.push({ path: resolved, name: basename(resolved), lastModified: info.mtimeMs, index });
45
+ }
46
+ catch (error) {
47
+ if (error instanceof StructuredToolError || signal?.aborted || Date.now() >= deadline) {
48
+ throw error;
49
+ }
50
+ throw fileReadError(index, basename(resolved), error);
51
+ }
52
+ finally {
53
+ clearTimeout(timer);
54
+ if (onAbort) {
55
+ signal?.removeEventListener('abort', onAbort);
56
+ }
57
+ }
58
+ }
59
+ total = 0;
60
+ const payloads = [];
61
+ for (const file of files) {
62
+ active();
63
+ const timeoutSignal = AbortSignal.timeout(Math.max(1, Math.ceil(deadline - Date.now())));
64
+ const readSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
65
+ const stream = createReadStream(file.path, { signal: readSignal, highWaterMark: 64 * 1024 });
66
+ try {
67
+ const chunks = [];
68
+ for await (const chunk of stream) {
69
+ active();
70
+ total += chunk.length;
71
+ checkSize(total);
72
+ chunks.push(chunk);
73
+ }
74
+ active();
75
+ payloads.push({
76
+ name: file.name,
77
+ mimeType: lookup(file.name) || 'application/octet-stream',
78
+ buffer: Buffer.concat(chunks).toString('base64'),
79
+ lastModified: file.lastModified,
80
+ });
81
+ }
82
+ catch (error) {
83
+ if (error instanceof StructuredToolError || readSignal.aborted) {
84
+ throw error;
85
+ }
86
+ throw fileReadError(file.index, file.name, error);
87
+ }
88
+ finally {
89
+ stream.destroy();
90
+ }
91
+ }
92
+ active();
93
+ return payloads;
94
+ }
95
+ function fileReadError(index, name, error) {
96
+ const code = error?.code ?? 'READ_FAILED';
97
+ return new StructuredToolError('UPLOAD_FILE_READ_FAILED', `无法读取第 ${index + 1} 个上传文件 ${name}(${code})`, '请检查 Server 机器上的文件路径、文件类型和读取权限', { fileIndex: index, name, reason: code, actionExecuted: false, actionStatus: 'not_started' });
98
+ }
99
+ // 函数会序列化到目标 frame,保持自包含,避免捕获 Node 或模块变量
100
+ // 校验异常统一转换为结构化执行状态
101
+ export function uploadInPage(operation, key, refId, deadline, count, payloads = []) {
102
+ const root = globalThis;
103
+ let actionExecuted = false;
104
+ try {
105
+ const previous = root[key];
106
+ if (operation === 'cleanup') {
107
+ if (previous) {
108
+ clearTimeout(previous.timer);
109
+ delete root[key];
110
+ }
111
+ return { success: true, actionExecuted: false, actionStatus: 'not_started' };
112
+ }
113
+ let element;
114
+ if (operation === 'prepare') {
115
+ const map = globalThis
116
+ .__mcpElementMap;
117
+ element = refId ? map?.[refId]?.deref() : this;
118
+ if (element instanceof HTMLLabelElement) {
119
+ element = element.control ?? undefined;
120
+ }
121
+ }
122
+ else {
123
+ element = previous?.element.deref();
124
+ if (previous) {
125
+ clearTimeout(previous.timer);
126
+ delete root[key];
127
+ }
128
+ }
129
+ if (Date.now() >= deadline) {
130
+ // noinspection ExceptionCaughtLocallyJS
131
+ throw new Error('input timeout before upload assignment');
132
+ }
133
+ if (!element?.isConnected || element.ownerDocument !== document) {
134
+ // noinspection ExceptionCaughtLocallyJS
135
+ throw new Error('上传目标已移除或页面已导航');
136
+ }
137
+ if (!(element instanceof HTMLInputElement) || element.type !== 'file') {
138
+ // noinspection ExceptionCaughtLocallyJS
139
+ throw new Error('upload target 必须是 input[type=file] 或关联的 label');
140
+ }
141
+ if (element.webkitdirectory) {
142
+ // noinspection ExceptionCaughtLocallyJS
143
+ throw new Error('upload 不支持目录上传');
144
+ }
145
+ if (count > 1 && !element.multiple) {
146
+ // noinspection ExceptionCaughtLocallyJS
147
+ throw new Error('上传多个文件需要 input[type=file][multiple]');
148
+ }
149
+ if (operation === 'prepare') {
150
+ root[key] = {
151
+ element: new WeakRef(element),
152
+ timer: setTimeout(() => delete root[key], Math.max(1, deadline - Date.now())),
153
+ };
154
+ return { success: true, actionExecuted: false, actionStatus: 'not_started' };
155
+ }
156
+ const transfer = new DataTransfer();
157
+ for (const payload of payloads) {
158
+ const binary = atob(payload.buffer);
159
+ const bytes = new Uint8Array(binary.length);
160
+ for (let i = 0; i < binary.length; ++i) {
161
+ bytes[i] = binary.charCodeAt(i);
162
+ }
163
+ transfer.items.add(new File([bytes], payload.name, { type: payload.mimeType, lastModified: payload.lastModified }));
164
+ }
165
+ if (Date.now() >= deadline) {
166
+ // noinspection ExceptionCaughtLocallyJS
167
+ throw new Error('input timeout before upload assignment');
168
+ }
169
+ actionExecuted = true;
170
+ element.files = transfer.files;
171
+ const files = Array.from(element.files ?? [], (file) => ({
172
+ name: file.name,
173
+ size: file.size,
174
+ mimeType: file.type,
175
+ lastModified: file.lastModified,
176
+ }));
177
+ if (files.length !== transfer.files.length ||
178
+ files.some((file, i) => file.name !== transfer.files[i].name || file.size !== transfer.files[i].size)) {
179
+ return { success: false, actionExecuted, actionStatus: 'failed', error: '浏览器未接受完整文件列表' };
180
+ }
181
+ element.dispatchEvent(new Event('input', { bubbles: true, composed: true }));
182
+ element.dispatchEvent(new Event('change', { bubbles: true }));
183
+ return { success: true, actionExecuted, actionStatus: 'completed', files };
184
+ }
185
+ catch (error) {
186
+ return {
187
+ success: false,
188
+ actionExecuted,
189
+ actionStatus: actionExecuted ? 'unknown' : 'not_started',
190
+ error: error instanceof Error ? error.message : '上传失败',
191
+ };
192
+ }
193
+ }
194
+ //# sourceMappingURL=file-upload.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"file-upload.js","sourceRoot":"","sources":["../../src/core/file-upload.ts"],"names":[],"mappings":"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"}
@@ -22,6 +22,10 @@ type NodeId = number;
22
22
  * Locator 选项
23
23
  */
24
24
  export interface LocatorOptions {
25
+ contextId?: number;
26
+ localPoint?: (timeout: number) => Promise<boolean>;
27
+ mapPoint?: (point: Point, timeout: number) => Promise<Point>;
28
+ mapViewportPoint?: (point: Point, timeout: number) => Promise<Point>;
25
29
  /** 超时时间(毫秒),默认 30000 */
26
30
  timeout?: number;
27
31
  /** 第 N 个匹配元素(从 0 开始,默认 0 即第一个) */
@@ -36,16 +40,23 @@ export declare class Locator {
36
40
  private cdp;
37
41
  private target;
38
42
  private sessionId?;
43
+ private options;
39
44
  private logs;
45
+ private observation;
40
46
  private readonly timeout;
41
47
  private readonly deadline;
42
48
  private readonly nth;
43
49
  private readonly getUrl?;
50
+ private readonly contextId?;
44
51
  constructor(cdp: CDPClient, target: Target, sessionId?: string | undefined, options?: LocatorOptions);
52
+ get lastObservation(): Readonly<{
53
+ matchCount: number | null;
54
+ lastLocatorState: string;
55
+ }>;
45
56
  /**
46
57
  * 查找元素,返回节点 ID(带重试)
47
58
  */
48
- find(): Promise<NodeId>;
59
+ find(retry?: boolean): Promise<NodeId>;
49
60
  /**
50
61
  * 获取元素中心坐标(用于点击)
51
62
  */
@@ -58,9 +69,10 @@ export declare class Locator {
58
69
  * 在找到的元素上执行函数
59
70
  *
60
71
  * @param fn 要执行的函数字符串,元素作为第一个参数
72
+ * @param retry 是否在定位失败时按当前预算重试
61
73
  * @returns 函数返回值
62
74
  */
63
- evaluateOn<T>(fn: string): Promise<T>;
75
+ evaluateOn<T>(fn: string, retry?: boolean): Promise<T>;
64
76
  /**
65
77
  * 查找元素的内部实现(单次尝试)
66
78
  */
@@ -113,6 +125,7 @@ export declare class Locator {
113
125
  * XPath 定位内部实现
114
126
  */
115
127
  private findByXPathInternal;
128
+ private queryDom;
116
129
  /**
117
130
  * 将 RemoteObject ID 转换为 NodeId
118
131
  */
@@ -132,6 +145,8 @@ export declare class Locator {
132
145
  * deadline 剩余时间(至少 1ms,防止 0 被当作无超时)
133
146
  */
134
147
  private remaining;
148
+ private observeMatches;
149
+ private notFound;
135
150
  /**
136
151
  * 记录日志
137
152
  */
@@ -1 +1 @@
1
- {"version":3,"file":"locator.d.ts","sourceRoot":"","sources":["../../src/core/locator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAGjD,OAAO,EACH,KAAK,GAAG,EAaR,KAAK,KAAK,EACV,KAAK,MAAM,EACd,MAAM,YAAY,CAAA;AAGnB;;GAEG;AACH,KAAK,MAAM,GAAG,MAAM,CAAA;AAOpB;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B,wBAAwB;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,kCAAkC;IAClC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;CACpC;AAuBD;;GAEG;AACH,qBAAa,OAAO;IAQZ,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS,CAAC;IATtB,OAAO,CAAC,IAAI,CAAe;IAC3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAQ;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAA0B;IAElD,YACY,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,YAAA,EAC1B,OAAO,GAAE,cAAmB,EAM/B;IAED;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,CAU5B;IAED;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,KAAK,CAAC,CAYxC;IAED;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,CAOnC;IAED;;;;;OAKG;IACG,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CA2B1C;IAED;;OAEG;YACW,YAAY;IAoC1B;;OAEG;YACW,mBAAmB;IAwDjC;;OAEG;YACW,UAAU;IAexB;;OAEG;YACW,WAAW;IAsEzB;;OAEG;YACW,iBAAiB;IAiB/B;;OAEG;YACW,WAAW;IAazB;;OAEG;YACW,SAAS;IAavB;;OAEG;YACW,YAAY;IAQ1B;;OAEG;YACW,SAAS;IAOvB;;OAEG;YACW,gBAAgB;IAqC9B;;OAEG;YACW,WAAW;IAOzB;;OAEG;YACW,iBAAiB;IAoC/B;;OAEG;YACW,mBAAmB;IAuCjC;;OAEG;YACW,gBAAgB;IAgB9B;;OAEG;YACW,WAAW;IAgBzB;;;;;OAKG;IACH,OAAO,CAAC,IAAI;IAIZ;;OAEG;IACH,OAAO,CAAC,SAAS;IAIjB;;OAEG;IACH,OAAO,CAAC,GAAG;CAGd"}
1
+ {"version":3,"file":"locator.d.ts","sourceRoot":"","sources":["../../src/core/locator.ts"],"names":[],"mappings":"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"}