@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
@@ -1,7 +1,11 @@
1
- import { formatErrorResponse, setErrorPageContext } from '../core/errors.js';
1
+ import { formatErrorResponse, getErrorPageContext, getErrorSource, setErrorPageContext } from '../core/errors.js';
2
+ import { sanitizeUrlRecord } from './network-sanitizer.js';
2
3
  import { isControlledTempOutput, remainingNavigationTimeout, TEMP_OUTPUT_RETENTION } from '../core/utils.js';
3
- export async function withPageResponse(session, targetId, action, creatingPage = false, deadline) {
4
- return session.withTabLock(async () => {
4
+ export async function withPageResponse(session, targetId, action, creatingPage = false, deadline, signal, independentMetadata = false) {
5
+ const withContext = independentMetadata
6
+ ? session.withMetadataContext.bind(session)
7
+ : session.withTabLock.bind(session);
8
+ return withContext(async () => {
5
9
  const remaining = () => (deadline === undefined ? undefined : remainingNavigationTimeout(deadline));
6
10
  const defaultTargetIdBefore = session.getCurrentTargetId();
7
11
  const targetIdBefore = creatingPage ? null : (targetId ?? defaultTargetIdBefore);
@@ -9,8 +13,17 @@ export async function withPageResponse(session, targetId, action, creatingPage =
9
13
  let response;
10
14
  let failure;
11
15
  let failed = false;
16
+ let beforeReadFailed = false;
12
17
  try {
13
- before = targetIdBefore ? await session.getPageSnapshot(targetIdBefore, remaining()) : null;
18
+ try {
19
+ before = targetIdBefore ? await session.getPageSnapshot(targetIdBefore, remaining()) : null;
20
+ }
21
+ catch (error) {
22
+ beforeReadFailed = true;
23
+ throw error;
24
+ }
25
+ signal?.throwIfAborted();
26
+ session.assertRequestActive?.();
14
27
  response = await action();
15
28
  }
16
29
  catch (error) {
@@ -31,13 +44,30 @@ export async function withPageResponse(session, targetId, action, creatingPage =
31
44
  : (targetId ?? targetIdBefore ?? defaultTargetIdAfter);
32
45
  let after = null;
33
46
  let contextError;
47
+ const requestActive = () => {
48
+ try {
49
+ signal?.throwIfAborted();
50
+ session.assertRequestActive?.();
51
+ if ((failed && getErrorSource(failure) === 'budget') ||
52
+ (deadline !== undefined && Date.now() >= deadline)) {
53
+ contextError = '请求已结束,未继续读取页面状态';
54
+ return false;
55
+ }
56
+ return true;
57
+ }
58
+ catch (error) {
59
+ contextError = error instanceof Error ? error.message : String(error);
60
+ return false;
61
+ }
62
+ };
63
+ const activeAfterAction = requestActive();
34
64
  if (actualTargetId && failed && targetIdBefore && !before) {
35
65
  contextError = '操作前页面状态读取失败,未继续读取页面状态';
36
66
  }
37
- if (actualTargetId && (!failed || before || !targetIdBefore)) {
67
+ if (activeAfterAction && actualTargetId && (!failed || before || !targetIdBefore)) {
38
68
  try {
39
- const targets = await session.listTargets(remaining());
40
- if (targets.some((page) => page.targetId === actualTargetId)) {
69
+ const targets = await session.listTargets(remaining(), { preserveDefaultTarget: true });
70
+ if (requestActive() && targets.some((page) => page.targetId === actualTargetId)) {
41
71
  after = await session.getPageSnapshot(actualTargetId, remaining());
42
72
  }
43
73
  }
@@ -47,9 +77,9 @@ export async function withPageResponse(session, targetId, action, creatingPage =
47
77
  }
48
78
  let browserActiveTargetId = null;
49
79
  let browserActiveTargetStatus = 'unavailable';
50
- if (session.getMode() === 'extension') {
80
+ if (requestActive() && session.getMode() === 'extension') {
51
81
  try {
52
- const topology = await session.listTopology(remaining());
82
+ const topology = await session.listTopology(remaining(), { preserveDefaultTarget: true });
53
83
  if (topology) {
54
84
  browserActiveTargetId = topology.activeTargetId ?? null;
55
85
  browserActiveTargetStatus = 'reported';
@@ -75,14 +105,25 @@ export async function withPageResponse(session, targetId, action, creatingPage =
75
105
  : actualTargetId
76
106
  ? 'created'
77
107
  : 'none',
78
- before,
79
- after,
108
+ before: before ? sanitizeUrlRecord(before) : null,
109
+ after: after ? sanitizeUrlRecord(after) : null,
80
110
  defaultTargetIdBefore,
81
111
  defaultTargetIdAfter,
82
112
  defaultTargetChanged: defaultTargetIdBefore !== defaultTargetIdAfter,
83
113
  browserActiveTargetId,
84
114
  browserActiveTargetStatus,
85
115
  ...(contextError ? { contextError } : {}),
116
+ ...(failed
117
+ ? {
118
+ contextPhase: beforeReadFailed
119
+ ? 'before'
120
+ : getErrorPageContext(failure)?.contextPhase === 'precondition'
121
+ ? 'precondition'
122
+ : getErrorPageContext(failure)?.contextPhase === 'preparation'
123
+ ? 'preparation'
124
+ : 'action',
125
+ }
126
+ : {}),
86
127
  ...(targetRestoration ? { targetRestoration } : {}),
87
128
  };
88
129
  if (failed) {
@@ -95,9 +136,10 @@ export async function withPageResponse(session, targetId, action, creatingPage =
95
136
  first.text = JSON.stringify({ ...payload, pageContext, ...(temporaryOutput ? { retention: TEMP_OUTPUT_RETENTION } : {}) }, null, 2);
96
137
  }
97
138
  return response;
98
- }, deadline);
139
+ }, deadline, signal);
99
140
  }
100
- export function withPageContext(session, targetId, action, deadline) {
101
- return withPageResponse(session, targetId, () => session.withTabId(targetId, action, deadline), false, deadline);
141
+ export function withPageContext(session, targetId, action, deadline, signal, userAction) {
142
+ const run = () => session.withTabId(targetId, action, deadline);
143
+ return withPageResponse(session, targetId, userAction ? () => session.withUserAction(userAction, run) : run, false, deadline, signal);
102
144
  }
103
145
  //# sourceMappingURL=page-context.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"page-context.js","sourceRoot":"","sources":["../../src/tools/page-context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"page-context.js","sourceRoot":"","sources":["../../src/tools/page-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAGjH,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AAS5G,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAClC,OAAgB,EAChB,QAA4B,EAC5B,MAAwB,EACxB,YAAY,GAAG,KAAK,EACpB,QAAiB,EACjB,MAAoB,EACpB,mBAAmB,GAAG,KAAK;IAE3B,MAAM,WAAW,GAAG,mBAAmB;QACnC,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC;QAC3C,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACvC,OAAO,WAAW,CACd,KAAK,IAAI,EAAE;QACP,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC,CAAA;QACnG,MAAM,qBAAqB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAA;QAC1D,MAAM,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,qBAAqB,CAAC,CAAA;QAChF,IAAI,MAAM,GAAoB,IAAI,CAAA;QAClC,IAAI,QAAuB,CAAA;QAC3B,IAAI,OAAgB,CAAA;QACpB,IAAI,MAAM,GAAG,KAAK,CAAA;QAClB,IAAI,gBAAgB,GAAG,KAAK,CAAA;QAC5B,IAAI,CAAC;YACD,IAAI,CAAC;gBACD,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,eAAe,CAAC,cAAc,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YAC/F,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,gBAAgB,GAAG,IAAI,CAAA;gBACvB,MAAM,KAAK,CAAA;YACf,CAAC;YACD,MAAM,EAAE,cAAc,EAAE,CAAA;YACxB,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAA;YAC/B,QAAQ,GAAG,MAAM,MAAM,EAAE,CAAA;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,OAAO,GAAG,KAAK,CAAA;YACf,MAAM,GAAG,IAAI,CAAA;QACjB,CAAC;QACD,MAAM,KAAK,GAAG,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;QAClC,MAAM,IAAI,GAAY,KAAK,EAAE,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAC5E,MAAM,OAAO,GACT,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAE,IAAgC,CAAC,CAAC,CAAC,IAAI,CAAA;QACvG,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QAC7F,MAAM,aAAa,GAAG,OAAO,EAAE,KAA0D,CAAA;QACzF,MAAM,eAAe,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,IAAI,aAAa,EAAE,OAAO,CACvC,CAAA;QACvC,MAAM,SAAS,GAAG,OAAO,EAAE,eAAe,IAAI,eAAe,EAAE,eAAe,CAAA;QAC9E,MAAM,eAAe,GAAG,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAA;QACxE,MAAM,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAA;QACzD,MAAM,cAAc,GAAG,YAAY;YAC/B,CAAC,CAAC,CAAC,eAAe,IAAI,CAAC,MAAM,IAAI,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;YAClF,CAAC,CAAC,CAAC,QAAQ,IAAI,cAAc,IAAI,oBAAoB,CAAC,CAAA;QAC1D,IAAI,KAAK,GAAoB,IAAI,CAAA;QACjC,IAAI,YAAgC,CAAA;QACpC,MAAM,aAAa,GAAG,GAAG,EAAE;YACvB,IAAI,CAAC;gBACD,MAAM,EAAE,cAAc,EAAE,CAAA;gBACxB,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAA;gBAC/B,IACI,CAAC,MAAM,IAAI,cAAc,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;oBAChD,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,IAAI,QAAQ,CAAC,EACpD,CAAC;oBACC,YAAY,GAAG,iBAAiB,CAAA;oBAChC,OAAO,KAAK,CAAA;gBAChB,CAAC;gBACD,OAAO,IAAI,CAAA;YACf,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBACrE,OAAO,KAAK,CAAA;YAChB,CAAC;QACL,CAAC,CAAA;QACD,MAAM,iBAAiB,GAAG,aAAa,EAAE,CAAA;QACzC,IAAI,cAAc,IAAI,MAAM,IAAI,cAAc,IAAI,CAAC,MAAM,EAAE,CAAC;YACxD,YAAY,GAAG,uBAAuB,CAAA;QAC1C,CAAC;QACD,IAAI,iBAAiB,IAAI,cAAc,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;YAChF,IAAI,CAAC;gBACD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAA;gBACvF,IAAI,aAAa,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,cAAc,CAAC,EAAE,CAAC;oBAC9E,KAAK,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,cAAc,EAAE,SAAS,EAAE,CAAC,CAAA;gBACtE,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACzE,CAAC;QACL,CAAC;QACD,IAAI,qBAAqB,GAAkB,IAAI,CAAA;QAC/C,IAAI,yBAAyB,GAA+B,aAAa,CAAA;QACzE,IAAI,aAAa,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE,KAAK,WAAW,EAAE,CAAC;YACvD,IAAI,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAA;gBACzF,IAAI,QAAQ,EAAE,CAAC;oBACX,qBAAqB,GAAG,QAAQ,CAAC,cAAc,IAAI,IAAI,CAAA;oBACvD,yBAAyB,GAAG,UAAU,CAAA;gBAC1C,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACzE,CAAC;QACL,CAAC;QACD,MAAM,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAA;QACxD,MAAM,WAAW,GAAG;YAChB,QAAQ,EAAE,cAAc,IAAI,IAAI;YAChC,YAAY,EAAE,YAAY;gBACtB,CAAC,CAAC,eAAe;oBACb,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,MAAM,IAAI,QAAQ,EAAE,OAAO;wBAC3B,CAAC,CAAC,aAAa;wBACf,CAAC,CAAC,QAAQ;gBAChB,CAAC,CAAC,QAAQ;oBACR,CAAC,CAAC,UAAU;oBACZ,CAAC,CAAC,qBAAqB;wBACrB,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC,cAAc;4BACd,CAAC,CAAC,SAAS;4BACX,CAAC,CAAC,MAAM;YAClB,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI;YACjD,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;YAC9C,qBAAqB;YACrB,oBAAoB;YACpB,oBAAoB,EAAE,qBAAqB,KAAK,oBAAoB;YACpE,qBAAqB;YACrB,yBAAyB;YACzB,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzC,GAAG,CAAC,MAAM;gBACN,CAAC,CAAC;oBACI,YAAY,EAAE,gBAAgB;wBAC1B,CAAC,CAAC,QAAQ;wBACV,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,YAAY,KAAK,cAAc;4BAC7D,CAAC,CAAC,cAAc;4BAChB,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,YAAY,KAAK,aAAa;gCAC5D,CAAC,CAAC,aAAa;gCACf,CAAC,CAAC,QAAQ;iBACrB;gBACH,CAAC,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtD,CAAA;QACD,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,mBAAmB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;QACnD,CAAC;QACD,IAAI,KAAK,EAAE,IAAI,KAAK,MAAM,IAAI,OAAO,EAAE,CAAC;YACpC,MAAM,UAAU,GAAI,OAAO,CAAC,QAAgD,EAAE,UACvC,CAAA;YACvC,MAAM,eAAe,GACjB,CAAC,QAAQ,EAAE,OAAO;gBAClB,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,IAAI,CACvD,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,sBAAsB,CAAC,IAAI,CAAC,CACrE,CAAA;YACL,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CACvB,EAAE,GAAG,OAAO,EAAE,WAAW,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,qBAAqB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAC7F,IAAI,EACJ,CAAC,CACJ,CAAA;QACL,CAAC;QACD,OAAO,QAAS,CAAA;IACpB,CAAC,EACD,QAAQ,EACR,MAAM,CACT,CAAA;AACL,CAAC;AAED,MAAM,UAAU,eAAe,CAC3B,OAAgB,EAChB,QAA4B,EAC5B,MAAwB,EACxB,QAAiB,EACjB,MAAoB,EACpB,UAA2B;IAE3B,MAAM,GAAG,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;IAC/D,OAAO,gBAAgB,CACnB,OAAO,EACP,QAAQ,EACR,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAChE,KAAK,EACL,QAAQ,EACR,MAAM,CACT,CAAA;AACL,CAAC"}
@@ -26,6 +26,6 @@ export interface PostConditionResult extends Record<string, unknown> {
26
26
  retryable: boolean;
27
27
  error?: string;
28
28
  }
29
- export declare function waitForPostCondition(unifiedSession: ReturnType<typeof getUnifiedSession>, condition: PostCondition, operation: string, mode?: InputMode): Promise<PostConditionResult>;
29
+ export declare function waitForPostCondition(unifiedSession: ReturnType<typeof getUnifiedSession>, condition: PostCondition, operation: string, mode?: InputMode, deadline?: number, signal?: AbortSignal): Promise<PostConditionResult>;
30
30
  export {};
31
31
  //# sourceMappingURL=post-condition.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"post-condition.d.ts","sourceRoot":"","sources":["../../src/tools/post-condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAQ3D,eAAO,MAAM,mBAAmB;;;;;;;;iBAwB1B,CAAA;AAEN,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAA;AAC/D,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,aAAa,GAAG,aAAa,GAAG,OAAO,CAAA;AAEpF,UAAU,WAAW;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,mBAAoB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAChE,OAAO,EAAE,OAAO,CAAA;IAChB,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,SAAS,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB;AAwFD,wBAAsB,oBAAoB,CACtC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpD,SAAS,EAAE,aAAa,EACxB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,mBAAmB,CAAC,CAkD9B"}
1
+ {"version":3,"file":"post-condition.d.ts","sourceRoot":"","sources":["../../src/tools/post-condition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AASvB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAS3D,eAAO,MAAM,mBAAmB;;;;;;;;iBAwB1B,CAAA;AAEN,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAA;AAC/D,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,aAAa,GAAG,aAAa,GAAG,OAAO,CAAA;AAEpF,UAAU,WAAW;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,mBAAoB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAChE,OAAO,EAAE,OAAO,CAAA;IAChB,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,SAAS,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB;AAyLD,wBAAsB,oBAAoB,CACtC,cAAc,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,EACpD,SAAS,EAAE,aAAa,EACxB,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,SAAS,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,mBAAmB,CAAC,CAqE9B"}
@@ -1,5 +1,7 @@
1
1
  import { z } from 'zod';
2
2
  import { sanitizeErrorMessage } from '../core/error-sanitizer.js';
3
+ import { CDPError, getErrorSource, isNativeExecutionResultUnknown, StructuredToolError, TimeoutError, } from '../core/errors.js';
4
+ import { withNavigationBudget } from '../core/utils.js';
3
5
  const POST_CONDITION_DEFAULT_TIMEOUT_MS = 3000;
4
6
  const POST_CONDITION_MAX_TIMEOUT_MS = 60_000;
5
7
  const POST_CONDITION_DEFAULT_INTERVAL_MS = 100;
@@ -30,15 +32,64 @@ export const postConditionSchema = z
30
32
  .refine((value) => value.text || value.selector || value.urlIncludes || value.script, {
31
33
  message: 'postCondition 至少需要 text、selector、urlIncludes、script 之一',
32
34
  });
33
- function sleep(ms) {
34
- return new Promise((resolve) => setTimeout(resolve, ms));
35
+ async function sleep(ms, signal) {
36
+ const deadline = Date.now() + ms;
37
+ let timer;
38
+ try {
39
+ do {
40
+ await withNavigationBudget(() => new Promise((resolve) => {
41
+ timer = setTimeout(resolve, ms);
42
+ }), undefined, signal);
43
+ ms = deadline - Date.now();
44
+ } while (ms > 0);
45
+ }
46
+ finally {
47
+ clearTimeout(timer);
48
+ }
35
49
  }
36
50
  function remainingMs(timeout, startedAt) {
37
51
  return Math.max(0, timeout - (Date.now() - startedAt));
38
52
  }
39
- function isUnavailableError(message) {
40
- // noinspection LongLine — 保持不可用错误模式在一个正则中,避免分组语义变化
41
- return /frame|execution context|debugger|extension.*(?:disconnect|未连接)|not connected|cannot resolve cdp|failed to attach|restricted|cannot access/i.test(message);
53
+ class PostConditionScriptError extends Error {
54
+ }
55
+ class PostConditionReadError extends Error {
56
+ }
57
+ function isTransientContextError(error) {
58
+ const source = getErrorSource(error);
59
+ if (source === 'page' ||
60
+ (error instanceof CDPError && (error.context.nativeCode === -32601 || error.context.nativeCode === -32602))) {
61
+ return false;
62
+ }
63
+ const message = error instanceof Error ? error.message : String(error);
64
+ return /FRAME_STALE_CONTEXT|execution context.*(?:destroyed|not found|invalid)|cannot find context|cannot find object|could not find object|object.*(?:not found|invalid)/i.test(message);
65
+ }
66
+ function isUnavailableError(error) {
67
+ const source = getErrorSource(error);
68
+ if (error instanceof PostConditionScriptError ||
69
+ source === 'page' ||
70
+ (error instanceof CDPError && (error.context.nativeCode === -32601 || error.context.nativeCode === -32602))) {
71
+ return false;
72
+ }
73
+ if (source === 'transport' || source === 'context' || source === 'budget' || source === 'cancelled') {
74
+ return true;
75
+ }
76
+ if (error instanceof CDPError &&
77
+ ['Runtime.evaluate', 'Runtime.callFunctionOn', 'Runtime.runScript'].includes(String(error.context.method)) &&
78
+ isNativeExecutionResultUnknown(error)) {
79
+ return true;
80
+ }
81
+ if (error instanceof TimeoutError ||
82
+ (error instanceof StructuredToolError &&
83
+ error.code === 'EXECUTION_RESULT_UNKNOWN' &&
84
+ error.context.failureStage === 'rpc')) {
85
+ return true;
86
+ }
87
+ const message = error instanceof Error ? error.message : String(error);
88
+ // 原生调用失败与页面内抛出的同文案异常分别分类
89
+ return (isTransientContextError(error) ||
90
+ new RegExp('FRAME_(?:STALE_CONTEXT|EVALUATION_FAILED|EVALUATION_TIMEOUT)|no frame with given id|execution context|cannot find context with specified id|debugger.*(?:detach|not attached)|' +
91
+ 'extension.*(?:disconnect|未连接)|not connected|cannot resolve cdp|' +
92
+ 'failed to attach|restricted|cannot access', 'i').test(message));
42
93
  }
43
94
  function boundedError(error) {
44
95
  return sanitizeErrorMessage(error instanceof Error ? error.message : String(error)).slice(0, 500);
@@ -46,56 +97,97 @@ function boundedError(error) {
46
97
  async function checkPostCondition(unifiedSession, condition, timeout, mode) {
47
98
  const checks = [];
48
99
  const startedAt = Date.now();
49
- const nextTimeout = () => Math.max(1, remainingMs(timeout, startedAt));
100
+ const nextTimeout = () => {
101
+ const remaining = remainingMs(timeout, startedAt);
102
+ if (remaining <= 0) {
103
+ throw new PostConditionReadError('后置验证剩余 timeout 已用尽');
104
+ }
105
+ return remaining;
106
+ };
107
+ const read = async (code, args) => {
108
+ try {
109
+ return await unifiedSession.evaluate(code, mode, nextTimeout(), args, { staleContextRetry: 'readOnly' });
110
+ }
111
+ catch (error) {
112
+ if (isTransientContextError(error)) {
113
+ throw new PostConditionReadError(error instanceof Error ? error.message : String(error), {
114
+ cause: error,
115
+ });
116
+ }
117
+ throw error;
118
+ }
119
+ };
50
120
  if (condition.text !== undefined) {
51
- const result = await unifiedSession.evaluate(`(expected, exact) => {
121
+ const result = await read(`(expected, exact) => {
52
122
  const body = document.body
53
123
  if (!body) return { matched: false, actual: '' }
54
- const values = Array.from(body.querySelectorAll('input, textarea, select')).map((element) =>
55
- element instanceof HTMLSelectElement
56
- ? Array.from(element.selectedOptions)
57
- .map((option) => option.value || option.textContent || '')
58
- .join(' ')
59
- : element instanceof HTMLInputElement && element.type === 'password'
60
- ? ''
61
- : element instanceof HTMLInputElement || element instanceof HTMLTextAreaElement
62
- ? element.value || ''
63
- : '')
64
- const text = [body.textContent || '', ...values].join('\\n')
65
- return {
66
- matched: exact
67
- ? [body.textContent || '', ...values].some((value) => value === expected)
68
- : text.includes(expected),
69
- actual: text.slice(0, 500),
124
+ const visible = (element) => {
125
+ if (typeof element.checkVisibility === 'function') {
126
+ return element.checkVisibility({ checkOpacity: true, checkVisibilityCSS: true })
127
+ }
128
+ const style = getComputedStyle(element)
129
+ return element.getClientRects().length > 0 && style.display !== 'none' &&
130
+ style.visibility !== 'hidden' && style.visibility !== 'collapse' && style.opacity !== '0'
70
131
  }
71
- }`, mode, nextTimeout(), [condition.text, condition.exact === true]);
132
+ const values = Array.from(body.querySelectorAll('input, textarea, select'))
133
+ .filter(visible)
134
+ .map((element) =>
135
+ element instanceof HTMLSelectElement
136
+ ? Array.from(element.selectedOptions)
137
+ .map((option) => option.value || option.textContent || '')
138
+ .join(' ')
139
+ : element instanceof HTMLInputElement && element.type === 'password'
140
+ ? ''
141
+ : element instanceof HTMLInputElement || element instanceof HTMLTextAreaElement
142
+ ? element.value || ''
143
+ : '')
144
+ const sources = [visible(body) ? body.innerText || '' : '', ...values]
145
+ const text = sources.join('\\n')
146
+ const matchedSource = exact ? sources.find((value) => value === expected) : undefined
147
+ const index = exact ? (matchedSource === undefined ? -1 : text.indexOf(matchedSource)) : text.indexOf(expected)
148
+ const start = Math.max(0, index - 120)
149
+ return { matched: index >= 0, actual: text.slice(start, start + 500) }
150
+ }`, [condition.text, condition.exact === true]);
72
151
  checks.push({ name: 'text', matched: result.matched, actual: result.actual });
73
152
  }
74
153
  if (condition.selector !== undefined) {
75
- const count = await unifiedSession.evaluate('(selector) => document.querySelectorAll(selector).length', mode, nextTimeout(), [condition.selector]);
154
+ const count = await read('(selector) => document.querySelectorAll(selector).length', [
155
+ condition.selector,
156
+ ]);
76
157
  checks.push({ name: 'selector', matched: count > 0, actual: { count } });
77
158
  }
78
159
  if (condition.urlIncludes !== undefined) {
79
- const url = await unifiedSession.evaluate('location.href', mode, nextTimeout());
160
+ const url = await read('location.href');
80
161
  checks.push({ name: 'urlIncludes', matched: url.includes(condition.urlIncludes), actual: url.slice(0, 500) });
81
162
  }
82
163
  if (condition.script !== undefined) {
83
- const matched = await unifiedSession.evaluate(`async (source) => {
84
- const value = (0, eval)(source)
85
- return Boolean(await (typeof value === 'function' ? value() : value))
164
+ const result = await unifiedSession.evaluate(`async (source) => {
165
+ try {
166
+ const value = (0, eval)(source)
167
+ return { matched: Boolean(await (typeof value === 'function' ? value() : value)) }
168
+ } catch (error) {
169
+ let message = 'Page script threw an unprintable value'
170
+ try { message = String(error).slice(0, 500) } catch {}
171
+ return { matched: false, error: message }
172
+ }
86
173
  }`, mode, nextTimeout(), [condition.script]);
87
- checks.push({ name: 'script', matched, actual: matched });
174
+ if (result.error !== undefined) {
175
+ throw new PostConditionScriptError(result.error);
176
+ }
177
+ checks.push({ name: 'script', matched: result.matched, actual: result.matched });
88
178
  }
89
179
  return checks;
90
180
  }
91
- export async function waitForPostCondition(unifiedSession, condition, operation, mode) {
92
- const timeout = condition.timeout ?? POST_CONDITION_DEFAULT_TIMEOUT_MS;
93
- const interval = condition.interval ?? POST_CONDITION_DEFAULT_INTERVAL_MS;
181
+ export async function waitForPostCondition(unifiedSession, condition, operation, mode, deadline, signal) {
94
182
  const startedAt = Date.now();
183
+ const timeout = Math.max(0, Math.min(condition.timeout ?? POST_CONDITION_DEFAULT_TIMEOUT_MS, (deadline ?? Infinity) - startedAt));
184
+ const interval = condition.interval ?? POST_CONDITION_DEFAULT_INTERVAL_MS;
95
185
  let checks = [];
186
+ let readError;
96
187
  while (remainingMs(timeout, startedAt) > 0) {
97
188
  try {
98
- checks = await checkPostCondition(unifiedSession, condition, Math.max(1, remainingMs(timeout, startedAt)), mode);
189
+ checks = await withNavigationBudget(() => checkPostCondition(unifiedSession, condition, remainingMs(timeout, startedAt), mode), startedAt + timeout, signal);
190
+ readError = undefined;
99
191
  if (checks.every((check) => check.matched)) {
100
192
  return {
101
193
  matched: true,
@@ -108,29 +200,43 @@ export async function waitForPostCondition(unifiedSession, condition, operation,
108
200
  }
109
201
  }
110
202
  catch (error) {
111
- const message = boundedError(error);
112
- return {
113
- matched: false,
114
- verificationStatus: isUnavailableError(message) ? 'unavailable' : 'error',
115
- operation,
116
- elapsedMs: Date.now() - startedAt,
117
- checks,
118
- retryable: isUnavailableError(message),
119
- error: message,
120
- };
203
+ if (error instanceof PostConditionReadError ||
204
+ (!(error instanceof PostConditionScriptError) &&
205
+ getErrorSource(error) !== 'page' &&
206
+ getErrorSource(error) !== 'protocol' &&
207
+ remainingMs(timeout, startedAt) === 0)) {
208
+ readError = boundedError(error);
209
+ }
210
+ else {
211
+ const unavailable = isUnavailableError(error);
212
+ return {
213
+ matched: false,
214
+ verificationStatus: unavailable ? 'unavailable' : 'error',
215
+ operation,
216
+ elapsedMs: Date.now() - startedAt,
217
+ checks,
218
+ retryable: unavailable,
219
+ error: boundedError(error),
220
+ };
221
+ }
121
222
  }
122
- const waitMs = Math.min(interval, remainingMs(timeout, startedAt));
223
+ const remaining = remainingMs(timeout, startedAt);
224
+ const waitMs = Math.min(interval, remaining);
123
225
  if (waitMs > 0) {
124
- await sleep(waitMs);
226
+ await sleep(waitMs, signal);
227
+ }
228
+ if (remaining <= interval) {
229
+ break;
125
230
  }
126
231
  }
127
232
  return {
128
233
  matched: false,
129
- verificationStatus: 'not_matched',
234
+ verificationStatus: readError || timeout === 0 ? 'unavailable' : 'not_matched',
130
235
  operation,
131
236
  elapsedMs: Date.now() - startedAt,
132
237
  checks,
133
238
  retryable: true,
239
+ ...(readError ? { error: readError } : timeout === 0 ? { error: '后置验证开始前 timeout 已用尽' } : {}),
134
240
  };
135
241
  }
136
242
  //# sourceMappingURL=post-condition.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"post-condition.js","sourceRoot":"","sources":["../../src/tools/post-condition.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"post-condition.js","sourceRoot":"","sources":["../../src/tools/post-condition.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,9 @@
5
5
  */
6
6
  import { z } from 'zod';
7
7
  import type { Target } from '../core/types.js';
8
+ import type { SemanticTarget } from '../core/dom-helpers.js';
8
9
  export declare const pageTargetIdSchema: z.ZodOptional<z.ZodString>;
10
+ export declare const frameZodSchema: z.ZodOptional<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>, z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>]>>;
9
11
  export declare const pageConditionSchema: {
10
12
  expectedUrl: z.ZodOptional<z.ZodString>;
11
13
  expectedRevision: z.ZodOptional<z.ZodString>;
@@ -53,7 +55,7 @@ export declare const targetZodSchema: z.ZodPreprocess<z.ZodIntersection<z.ZodUni
53
55
  y: z.ZodNumber;
54
56
  }, z.core.$strip>]>, z.ZodObject<{
55
57
  nth: z.ZodOptional<z.ZodNumber>;
56
- }, z.core.$strip>>>;
58
+ }, z.core.$strip>>, unknown>;
57
59
  /**
58
60
  * 将 Target 对象解析为 find() 所需的查询参数
59
61
  *
@@ -62,9 +64,9 @@ export declare const targetZodSchema: z.ZodPreprocess<z.ZodIntersection<z.ZodUni
62
64
  *
63
65
  * exact 语义(默认 false):
64
66
  * - CSS 属性(placeholder/title/alt):false → *= 子串匹配,true → = 精确匹配
65
- * - text:false → Extension find 的 includes 子串匹配,true → xpath 精确匹配
66
- * - label:xpath 同时匹配 aria-label、<label for> 关联、<label> 内嵌控件
67
- * - role:无 name 时 CSS 匹配隐式+显式 role;有 name 时 xpath 匹配多来源可访问名称
67
+ * - text:false → Extension find 的 includes 子串匹配,true → DOM 精确匹配
68
+ * - label:按控件的标签和 aria-labelledby 引用计算名称
69
+ * - role:CSS 筛选候选,再按实际 role 和可访问名称过滤
68
70
  * - testId/css/xpath:exact 不影响
69
71
  * - role 值自动 lowercase(ARIA role 不区分大小写)
70
72
  */
@@ -75,5 +77,6 @@ export declare function targetToFindParams(target: Target & {
75
77
  text?: string;
76
78
  xpath?: string;
77
79
  nth?: number;
80
+ semantic?: SemanticTarget;
78
81
  };
79
82
  //# sourceMappingURL=schema.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/tools/schema.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAG9C,eAAO,MAAM,kBAAkB,4BAA+B,CAAA;AAC9D,eAAO,MAAM,mBAAmB;IAC5B,WAAW;IACX,gBAAgB;CAKnB,CAAA;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAKnG;AA+DD;;;;GAIG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAUN,CAAA;AA8FtB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;CACf,CAgGA"}
1
+ {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/tools/schema.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAE5D,eAAO,MAAM,kBAAkB,4BAA+B,CAAA;AAE9D,eAAO,MAAM,cAAc,oJAAyE,CAAA;AACpG,eAAO,MAAM,mBAAmB;IAC5B,WAAW;IACX,gBAAgB;CAKnB,CAAA;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAKnG;AA+DD;;;;GAIG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAUN,CAAA;AA8DtB;;;;;;;;;;;;;GAaG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,cAAc,CAAA;CAC5B,CAkCA"}