execbro 2.17.1 → 2.18.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.
- package/build/__tests__/unit/networkInterceptorFetchMock.test.js +7 -0
- package/build/__tests__/unit/networkInterceptorFetchMock.test.js.map +1 -1
- package/build/__tests__/unit/networkMock.test.js +63 -0
- package/build/__tests__/unit/networkMock.test.js.map +1 -1
- package/build/__tests__/unit/networkMockTool.test.js +7 -0
- package/build/__tests__/unit/networkMockTool.test.js.map +1 -1
- package/build/__tests__/unit/redact.test.js +20 -2
- package/build/__tests__/unit/redact.test.js.map +1 -1
- package/build/__tests__/unit/sdkMirrorPoller.test.js +22 -0
- package/build/__tests__/unit/sdkMirrorPoller.test.js.map +1 -1
- package/build/__tests__/unit/textEntry.test.js +6 -0
- package/build/__tests__/unit/textEntry.test.js.map +1 -1
- package/build/core/guides.d.ts.map +1 -1
- package/build/core/guides.js +3 -0
- package/build/core/guides.js.map +1 -1
- package/build/core/mockRules.d.ts +2 -0
- package/build/core/mockRules.d.ts.map +1 -1
- package/build/core/mockRules.js +9 -1
- package/build/core/mockRules.js.map +1 -1
- package/build/core/networkInterceptor.d.ts.map +1 -1
- package/build/core/networkInterceptor.js +49 -11
- package/build/core/networkInterceptor.js.map +1 -1
- package/build/core/redact.d.ts +2 -0
- package/build/core/redact.d.ts.map +1 -1
- package/build/core/redact.js +9 -0
- package/build/core/redact.js.map +1 -1
- package/build/core/register.d.ts.map +1 -1
- package/build/core/register.js +5 -1
- package/build/core/register.js.map +1 -1
- package/build/core/sdkMirrorPoller.d.ts.map +1 -1
- package/build/core/sdkMirrorPoller.js +21 -2
- package/build/core/sdkMirrorPoller.js.map +1 -1
- package/build/core/textEntry.d.ts +1 -1
- package/build/core/textEntry.d.ts.map +1 -1
- package/build/core/textEntry.js +5 -5
- package/build/core/textEntry.js.map +1 -1
- package/build/index.d.ts.map +1 -1
- package/build/index.js +3 -1
- package/build/index.js.map +1 -1
- package/build/tools/interactionTools.d.ts.map +1 -1
- package/build/tools/interactionTools.js +11 -5
- package/build/tools/interactionTools.js.map +1 -1
- package/build/tools/metaTools.d.ts.map +1 -1
- package/build/tools/metaTools.js +4 -0
- package/build/tools/metaTools.js.map +1 -1
- package/build/tools/networkTools.d.ts.map +1 -1
- package/build/tools/networkTools.js +22 -7
- package/build/tools/networkTools.js.map +1 -1
- package/package.json +1 -1
- package/tools.json +2 -0
|
@@ -2,6 +2,7 @@ export interface MockRule {
|
|
|
2
2
|
id: string;
|
|
3
3
|
url: string;
|
|
4
4
|
method?: string;
|
|
5
|
+
operation?: string;
|
|
5
6
|
mode: "replace" | "tamper";
|
|
6
7
|
times?: number;
|
|
7
8
|
delayMs?: number;
|
|
@@ -27,6 +28,7 @@ export declare function clearConditionRules(device: string): number;
|
|
|
27
28
|
export declare function listRules(device: string): MockRule[];
|
|
28
29
|
export declare function recordHit(device: string, id: string): void;
|
|
29
30
|
export declare function serializeRules(device: string): string;
|
|
31
|
+
export declare function describeRuleMatch(r: Pick<MockRule, "method" | "url" | "operation">): string;
|
|
30
32
|
export declare function formatRuleList(device: string): string;
|
|
31
33
|
export declare function activeMockBanner(device?: string): string;
|
|
32
34
|
//# sourceMappingURL=mockRules.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockRules.d.ts","sourceRoot":"","sources":["../../src/core/mockRules.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,QAAQ;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"mockRules.d.ts","sourceRoot":"","sources":["../../src/core/mockRules.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,QAAQ;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IAOrB,MAAM,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAE9B,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,GAAG,MAAM,CAAC,CAAC;AAkB1D,wBAAgB,gBAAgB,IAAI,IAAI,CAGvC;AAwFD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAmDxD;AAID,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,QAAQ,CAatE;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAO9D;AAED,wBAAgB,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAYlD;AAMD,wBAAgB,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAKnD;AAGD,wBAAgB,gBAAgB,IAAI,MAAM,EAAE,CAE3C;AAMD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAO1D;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE,CAEpD;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAG1D;AAOD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAGrD;AAGD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,KAAK,GAAG,WAAW,CAAC,GAAG,MAAM,CAG3F;AASD,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAerD;AAUD,wBAAgB,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAgBxD"}
|
package/build/core/mockRules.js
CHANGED
|
@@ -111,8 +111,12 @@ export function validateUrlPattern(pattern) {
|
|
|
111
111
|
`it backtracks and would freeze the app's JS thread. Rewrite it or use a plain substring.`, "mock_pattern_slow");
|
|
112
112
|
}
|
|
113
113
|
}
|
|
114
|
+
const GRAPHQL_NAME = /^[_A-Za-z][_0-9A-Za-z]*$/;
|
|
114
115
|
export function addRule(device, input) {
|
|
115
116
|
validateUrlPattern(input.url);
|
|
117
|
+
if (input.operation !== undefined && !GRAPHQL_NAME.test(input.operation)) {
|
|
118
|
+
throw new UserInputError(`operation "${input.operation}" is not a GraphQL operation name. Pass the bare name, e.g. "GetUser", as get_network_requests shows it.`, "mock_operation_invalid");
|
|
119
|
+
}
|
|
116
120
|
const rule = { ...input, id: `m${nextId++}`, hits: 0 };
|
|
117
121
|
const list = rulesByDevice.get(device) ?? [];
|
|
118
122
|
list.push(rule);
|
|
@@ -176,6 +180,10 @@ export function serializeRules(device) {
|
|
|
176
180
|
const wire = listRules(device).map(({ hits: _hits, source: _source, ...rest }) => rest);
|
|
177
181
|
return JSON.stringify(wire);
|
|
178
182
|
}
|
|
183
|
+
export function describeRuleMatch(r) {
|
|
184
|
+
const op = r.operation ? ` op:${r.operation}` : "";
|
|
185
|
+
return `${r.method ?? "ANY"} ${r.url || "<any url>"}${op}`;
|
|
186
|
+
}
|
|
179
187
|
export function formatRuleList(device) {
|
|
180
188
|
const rules = listRules(device);
|
|
181
189
|
if (rules.length === 0)
|
|
@@ -184,7 +192,7 @@ export function formatRuleList(device) {
|
|
|
184
192
|
const status = r.status ? ` ${r.status}` : "";
|
|
185
193
|
const times = r.times ? ` (times:${r.times}${r.hits >= r.times ? ", spent" : ""})` : "";
|
|
186
194
|
const owner = r.source === "condition" ? " [owned by network_condition]" : "";
|
|
187
|
-
return `[${r.id}] ${r
|
|
195
|
+
return `[${r.id}] ${describeRuleMatch(r)} -> ${r.mode}${status}${times} hits=${r.hits}${owner}`;
|
|
188
196
|
});
|
|
189
197
|
return (lines.join("\n") +
|
|
190
198
|
"\n\nRules match in this order; a rule with hits=0 may be shadowed by one above it.");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockRules.js","sourceRoot":"","sources":["../../src/core/mockRules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"mockRules.js","sourceRoot":"","sources":["../../src/core/mockRules.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networkInterceptor.d.ts","sourceRoot":"","sources":["../../src/core/networkInterceptor.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAK7C,eAAO,MAAM,gBAAgB,QAAW,CAAC;AAEzC,eAAO,MAAM,iBAAiB,QAAY,CAAC;AAmB3C,wBAAgB,oBAAoB,CAAC,WAAW,UAAQ,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"networkInterceptor.d.ts","sourceRoot":"","sources":["../../src/core/networkInterceptor.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAK7C,eAAO,MAAM,gBAAgB,QAAW,CAAC;AAEzC,eAAO,MAAM,iBAAiB,QAAY,CAAC;AAmB3C,wBAAgB,oBAAoB,CAAC,WAAW,UAAQ,GAAG,MAAM,CA+wBhE;AAaD,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAmB7D;AAOD,wBAAgB,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAQpE;AAUD,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,SAAS,EAAE,WAAW,UAAQ,GAAG,IAAI,CAUjF;AAKD,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,SAAS,GAAG,MAAM,CAQvD;AAMD,wBAAgB,kBAAkB,CAC9B,IAAI,EAAE,KAAK,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GAChD,MAAM,GAAG,IAAI,CAWf;AAWD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAOpD;AAcD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAO7D;AAuBD,wBAAgB,qBAAqB,CACjC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,MAAM,GACnB,IAAI,CA2GN"}
|
|
@@ -6,6 +6,11 @@ export function getInterceptorScript(nativeFetch = false) {
|
|
|
6
6
|
return `(function() { try {
|
|
7
7
|
if (globalThis.__RN_NET_INJECTED__) return;
|
|
8
8
|
globalThis.__RN_NET_INJECTED__ = true;
|
|
9
|
+
// Capability flag for GraphQL operation rules. The guard above keeps an
|
|
10
|
+
// older interceptor in place for the life of the JS context, and that one
|
|
11
|
+
// ignores rule.operation, so it would mock EVERY request on the url. The
|
|
12
|
+
// push script holds operation rules back until this flag is present.
|
|
13
|
+
globalThis.__RN_NET_MOCK_OPS__ = true;
|
|
9
14
|
|
|
10
15
|
var _counter = 0;
|
|
11
16
|
var _prefix = 'js-' + Math.random().toString(36).substring(2, 6) + '-';
|
|
@@ -141,27 +146,55 @@ export function getInterceptorScript(nativeFetch = false) {
|
|
|
141
146
|
// a re-injection into a live context must not drop them.
|
|
142
147
|
if (!globalThis.__RN_NET_MOCKS__) globalThis.__RN_NET_MOCKS__ = [];
|
|
143
148
|
|
|
144
|
-
|
|
149
|
+
// Mirrors parseGraphQLOperation (graphqlOperation.ts): operationName wins,
|
|
150
|
+
// else the name in the document. A batched array body names several
|
|
151
|
+
// operations and gets one response, so it matches no operation rule.
|
|
152
|
+
function _gqlOperation(url, body) {
|
|
153
|
+
if (typeof body === 'string' && body) {
|
|
154
|
+
var p = null;
|
|
155
|
+
try { p = JSON.parse(body); } catch (e) {}
|
|
156
|
+
if (p && typeof p === 'object' && !Array.isArray(p)) {
|
|
157
|
+
if (typeof p.operationName === 'string' && p.operationName) return p.operationName;
|
|
158
|
+
if (typeof p.query === 'string') {
|
|
159
|
+
var named = /(?:^|[\\s{}])(?:query|mutation|subscription)\\s+([_A-Za-z][_0-9A-Za-z]*)/.exec(p.query);
|
|
160
|
+
if (named) return named[1];
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
// GET transport (Apollo useGETForQueries, persisted queries).
|
|
165
|
+
var q = /[?&]operationName=([^&#]*)/.exec(url);
|
|
166
|
+
if (q) { try { return decodeURIComponent(q[1]); } catch (e) { return q[1]; } }
|
|
167
|
+
return null;
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
function _ruleMatches(rule, method, url, body) {
|
|
145
171
|
try {
|
|
146
172
|
if (rule.method && String(rule.method).toUpperCase() !== method) return false;
|
|
147
173
|
var pat = String(rule.url === undefined || rule.url === null ? '' : rule.url);
|
|
174
|
+
var urlOk;
|
|
148
175
|
if (pat.length > 1 && pat.charAt(0) === '/' && pat.charAt(pat.length - 1) === '/') {
|
|
149
176
|
// Slash-wrapped means regex. Compiled per call rather than cached:
|
|
150
177
|
// the rule list is short and re-pushed on every context creation.
|
|
151
178
|
// The server rejects catastrophic patterns before they get here.
|
|
152
|
-
|
|
179
|
+
urlOk = new RegExp(pat.slice(1, -1)).test(url);
|
|
180
|
+
} else {
|
|
181
|
+
urlOk = url.indexOf(pat) !== -1;
|
|
153
182
|
}
|
|
154
|
-
|
|
183
|
+
if (!urlOk) return false;
|
|
184
|
+
// Every GraphQL call shares one URL, so the operation is the only
|
|
185
|
+
// thing that tells them apart. Parsed only when a rule asks for it.
|
|
186
|
+
if (rule.operation) return _gqlOperation(url, body) === rule.operation;
|
|
187
|
+
return true;
|
|
155
188
|
} catch (e) { return false; }
|
|
156
189
|
}
|
|
157
190
|
|
|
158
|
-
function _matchRule(method, url) {
|
|
191
|
+
function _matchRule(method, url, body) {
|
|
159
192
|
var rules = globalThis.__RN_NET_MOCKS__;
|
|
160
193
|
if (!rules || !rules.length) return null;
|
|
161
194
|
for (var i = 0; i < rules.length; i++) {
|
|
162
195
|
var r = rules[i];
|
|
163
196
|
if (!r || r.__spent) continue;
|
|
164
|
-
if (_ruleMatches(r, method, url)) {
|
|
197
|
+
if (_ruleMatches(r, method, url, body)) {
|
|
165
198
|
if (typeof r.times === 'number') {
|
|
166
199
|
r.__used = (r.__used || 0) + 1;
|
|
167
200
|
if (r.__used >= r.times) r.__spent = true;
|
|
@@ -468,7 +501,8 @@ export function getInterceptorScript(nativeFetch = false) {
|
|
|
468
501
|
var s = _getState(self);
|
|
469
502
|
if (s && !s.done && s.start === 0) {
|
|
470
503
|
s.start = Date.now();
|
|
471
|
-
var
|
|
504
|
+
var bodyText = _bodyToString(body);
|
|
505
|
+
var _rule = _matchRule(s.method, s.url, bodyText);
|
|
472
506
|
|
|
473
507
|
_report({
|
|
474
508
|
type: 'request',
|
|
@@ -477,7 +511,7 @@ export function getInterceptorScript(nativeFetch = false) {
|
|
|
477
511
|
url: s.url,
|
|
478
512
|
timestamp: s.start,
|
|
479
513
|
headers: s.headers,
|
|
480
|
-
body: _cap(
|
|
514
|
+
body: _cap(bodyText, _REQ_CAP),
|
|
481
515
|
// Tells the server this request will never reach the wire, so
|
|
482
516
|
// the CDP Network domain cannot possibly report it and the
|
|
483
517
|
// usual dedupe gate must not drop ours. Without it a mocked
|
|
@@ -640,7 +674,9 @@ export function getInterceptorScript(nativeFetch = false) {
|
|
|
640
674
|
var mUrl = (input && typeof input === 'object' && input.url) ? String(input.url) : String(input);
|
|
641
675
|
// CDP rows show absolute URLs, which is what a rule is copied from.
|
|
642
676
|
try { mUrl = new URL(mUrl, globalThis.location && globalThis.location.href).href; } catch (e) {}
|
|
643
|
-
|
|
677
|
+
// A Request object's body is a stream, unreadable synchronously,
|
|
678
|
+
// so an operation rule matches only an init.body string.
|
|
679
|
+
var mRule = _matchRule(mMethod, mUrl, init && init.body);
|
|
644
680
|
} catch (e) { mRule = null; }
|
|
645
681
|
if (mRule) return _mockFetch(origFetch, arguments, mRule, mMethod, mUrl, input, init);
|
|
646
682
|
}
|
|
@@ -745,9 +781,11 @@ export function getInterceptorScript(nativeFetch = false) {
|
|
|
745
781
|
} catch(e) {} })();`;
|
|
746
782
|
}
|
|
747
783
|
export function buildMockPushScript(rulesJson) {
|
|
748
|
-
return `(function(){
|
|
784
|
+
return `(function(){
|
|
785
|
+
function __eb_supported(r) { return !r.operation || !!globalThis.__RN_NET_MOCK_OPS__; }
|
|
786
|
+
try {
|
|
749
787
|
var __eb_prev = globalThis.__RN_NET_MOCKS__ || [];
|
|
750
|
-
var __eb_next = ${rulesJson};
|
|
788
|
+
var __eb_next = ${rulesJson}.filter(__eb_supported);
|
|
751
789
|
var __eb_byId = {};
|
|
752
790
|
for (var __eb_i = 0; __eb_i < __eb_prev.length; __eb_i++) {
|
|
753
791
|
if (__eb_prev[__eb_i] && __eb_prev[__eb_i].id) __eb_byId[__eb_prev[__eb_i].id] = __eb_prev[__eb_i];
|
|
@@ -760,7 +798,7 @@ export function buildMockPushScript(rulesJson) {
|
|
|
760
798
|
}
|
|
761
799
|
}
|
|
762
800
|
globalThis.__RN_NET_MOCKS__ = __eb_next;
|
|
763
|
-
} catch(e) { try { globalThis.__RN_NET_MOCKS__ = ${rulesJson}; } catch(e2) {} } })();`;
|
|
801
|
+
} catch(e) { try { globalThis.__RN_NET_MOCKS__ = ${rulesJson}.filter(__eb_supported); } catch(e2) {} } })();`;
|
|
764
802
|
}
|
|
765
803
|
export function pushMockRules(ws, rulesJson) {
|
|
766
804
|
ws.send(JSON.stringify({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networkInterceptor.js","sourceRoot":"","sources":["../../src/core/networkInterceptor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAI,CAAC;AAEzC,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,GAAG,IAAI,CAAC;AAmB3C,MAAM,UAAU,oBAAoB,CAAC,WAAW,GAAG,KAAK;IAOpD,OAAO
|
|
1
|
+
{"version":3,"file":"networkInterceptor.js","sourceRoot":"","sources":["../../src/core/networkInterceptor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAI,CAAC;AAEzC,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,GAAG,IAAI,CAAC;AAmB3C,MAAM,UAAU,oBAAoB,CAAC,WAAW,GAAG,KAAK;IAOpD,OAAO;;;;;;;;;;;qBAWU,gBAAgB;qBAChB,iBAAiB;;0BAEZ,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAyvBlC,CAAC;AACvB,CAAC;AAaD,MAAM,UAAU,mBAAmB,CAAC,SAAiB;IACjD,OAAO;;;;oBAIS,SAAS;;;;;;;;;;;;;mDAasB,SAAS,iDAAiD,CAAC;AAC9G,CAAC;AAOD,MAAM,UAAU,aAAa,CAAC,EAAa,EAAE,SAAiB;IAC1D,EAAE,CAAC,IAAI,CACH,IAAI,CAAC,SAAS,CAAC;QACX,EAAE,EAAE,gBAAgB,EAAE;QACtB,MAAM,EAAE,kBAAkB;QAC1B,MAAM,EAAE,EAAE,UAAU,EAAE,mBAAmB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;KACvE,CAAC,CACL,CAAC;AACN,CAAC;AAUD,MAAM,UAAU,wBAAwB,CAAC,EAAa,EAAE,WAAW,GAAG,KAAK;IACvE,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;QAC3B,EAAE,EAAE,gBAAgB,EAAE;QACtB,MAAM,EAAE,kBAAkB;QAC1B,MAAM,EAAE;YACJ,UAAU,EAAE,oBAAoB,CAAC,WAAW,CAAC;YAC7C,MAAM,EAAE,IAAI;SACf;KACJ,CAAC,CAAC;IACH,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;AAKD,MAAM,UAAU,iBAAiB,CAAC,EAAa;IAC3C,MAAM,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;QAC3B,EAAE;QACF,MAAM,EAAE,gBAAgB;KAC3B,CAAC,CAAC;IACH,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjB,OAAO,EAAE,CAAC;AACd,CAAC;AAMD,MAAM,UAAU,kBAAkB,CAC9B,IAA+C;IAE/C,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAE5C,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE5E,MAAM,MAAM,GAAG,aAAa,CAAC;IAC7B,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC;IACxB,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IAEzC,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC;AAWD,MAAM,UAAU,WAAW,CAAC,OAAe;IACvC,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAuB,CAAC;QACzD,OAAO,MAAM,EAAE,IAAI,KAAK,MAAM,CAAC;IACnC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC;AAcD,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAChD,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAyB,CAAC;QAC3D,OAAO,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC;AAOD,SAAS,cAAc,CAAC,KAAc;IAClC,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IAC5E,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;QACxE,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC1B,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;QACnB,CAAC;aAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE,CAAC;YAC7D,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;IACL,CAAC;IACD,OAAO,GAAG,CAAC;AACf,CAAC;AAKD,MAAM,UAAU,qBAAqB,CACjC,OAAe,EACf,aAA4B,EAC5B,UAAkB;IAElB,IAAI,KAA8B,CAAC;IACnC,IAAI,CAAC;QACD,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO;IACX,CAAC;IAED,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QAClE,OAAO;IACX,CAAC;IAED,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAExB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,MAAM,OAAO,GAAmB;YAC5B,SAAS,EAAE,EAAE;YACb,SAAS,EAAE,KAAK,CAAC,SAAS;gBACtB,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,SAAmB,CAAC;gBACrC,CAAC,CAAC,IAAI,IAAI,EAAE;YAChB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC;YACrC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC;YAC5B,OAAO,EAAE,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC;YACtC,QAAQ,EAAE,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;YACjE,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC;YAC3B,UAAU,EAAE,aAAa;YACzB,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,IAAI,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SACjD,CAAC;QACF,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC;SAAM,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,QAAQ,GACV,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;QAEpE,QAAQ,CAAC,MAAM,GAAG,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9E,QAAQ,CAAC,UAAU;YACf,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;QACxE,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC;QAC1B,QAAQ,CAAC,MAAM,GAAG;YACd,GAAG,QAAQ,CAAC,MAAM;YAClB,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE;YACxB,QAAQ;SACX,CAAC;QAIF,IAAI,KAAK,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;YACtC,QAAQ,CAAC,eAAe,GAAG,cAAc,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACrE,CAAC;QACD,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACrC,QAAQ,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QACvC,CAAC;QACD,IAAI,OAAO,KAAK,CAAC,aAAa,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;YAClF,QAAQ,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC;QACjD,CAAC;QACD,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACjC,QAAQ,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC;QACvC,CAAC;QAED,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxD,QAAQ,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;QAC7B,CAAC;QAED,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;SAAM,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAKzB,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ;YAAE,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAE1E,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC;QACvB,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ;YAAE,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QACrE,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;YAAE,QAAQ,CAAC,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC;QAC5E,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;SAAM,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAGzB,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACjC,QAAQ,CAAC,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC;YACnC,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QACpC,CAAC;IACL,CAAC;SAAM,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,QAAQ,GACV,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;QAEpE,QAAQ,CAAC,KAAK;YACV,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC;QACpE,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC;QAC1B,QAAQ,CAAC,MAAM,GAAG;YACd,GAAG,QAAQ,CAAC,MAAM;YAClB,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE;YACxB,QAAQ;SACX,CAAC;QACF,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;AACL,CAAC"}
|
package/build/core/redact.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
export declare function redactionEnabled(): boolean;
|
|
2
|
+
export declare const REDACTION_OFF_NOTE = "Note: redaction is off (EXECBRO_REDACT=off in the MCP server config), so credentials are shown in full and not captured into the vault. Remove the variable and restart the server to turn it back on.";
|
|
3
|
+
export declare function containsCredential(text: string): boolean;
|
|
2
4
|
export declare function redactSecrets(text: string, opts?: {
|
|
3
5
|
catalog?: boolean;
|
|
4
6
|
origin?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redact.d.ts","sourceRoot":"","sources":["../../src/core/redact.ts"],"names":[],"mappings":"AAyKA,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAQD,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,MAAM,CA+CrG"}
|
|
1
|
+
{"version":3,"file":"redact.d.ts","sourceRoot":"","sources":["../../src/core/redact.ts"],"names":[],"mappings":"AAyKA,wBAAgB,gBAAgB,IAAI,OAAO,CAE1C;AAQD,eAAO,MAAM,kBAAkB,2MAC6K,CAAC;AAO7M,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAIxD;AAQD,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,MAAM,CA+CrG"}
|
package/build/core/redact.js
CHANGED
|
@@ -54,6 +54,15 @@ function handleFor(value, kind, hits, origin) {
|
|
|
54
54
|
export function redactionEnabled() {
|
|
55
55
|
return process.env.EXECBRO_REDACT?.toLowerCase() !== "off";
|
|
56
56
|
}
|
|
57
|
+
export const REDACTION_OFF_NOTE = "Note: redaction is off (EXECBRO_REDACT=off in the MCP server config), so credentials are shown in full and not captured into the vault. Remove the variable and restart the server to turn it back on.";
|
|
58
|
+
export function containsCredential(text) {
|
|
59
|
+
if ([JWT, PROVIDER_KEY, AUTH_SCHEME, QUERY_PARAM, LOOSE_FIELD].some((re) => text.search(re) !== -1))
|
|
60
|
+
return true;
|
|
61
|
+
for (const m of text.matchAll(JSON_FIELD))
|
|
62
|
+
if (m[2] && !PLACEHOLDER.test(m[2]))
|
|
63
|
+
return true;
|
|
64
|
+
return false;
|
|
65
|
+
}
|
|
57
66
|
export function redactSecrets(text, opts = {}) {
|
|
58
67
|
const hits = new Set();
|
|
59
68
|
const origin = opts.origin;
|
package/build/core/redact.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redact.js","sourceRoot":"","sources":["../../src/core/redact.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"redact.js","sourceRoot":"","sources":["../../src/core/redact.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../src/core/register.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAyEzE,eAAO,MAAM,YAAY;YAA6B,GAAG;aAAW,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC;EAAK,CAAC;AAKrG,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAMtE;AAED,wBAAgB,yBAAyB,CACrC,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EACpC,mBAAmB,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,GAC/C,IAAI,
|
|
1
|
+
{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../src/core/register.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAyEzE,eAAO,MAAM,YAAY;YAA6B,GAAG;aAAW,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC;EAAK,CAAC;AAKrG,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAMtE;AAED,wBAAgB,yBAAyB,CACrC,MAAM,EAAE,SAAS,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EACpC,mBAAmB,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,OAAO,GAC/C,IAAI,CA6QN"}
|
package/build/core/register.js
CHANGED
|
@@ -7,7 +7,7 @@ import { chromiumGate } from "./chromiumCapabilities.js";
|
|
|
7
7
|
import { recordToolCall } from "./screenStaleness.js";
|
|
8
8
|
import { EnvironmentError, UserInputError } from "./errors.js";
|
|
9
9
|
import { estimateImageTokens } from "./toolHelpers.js";
|
|
10
|
-
import { redactSecrets, redactionEnabled } from "./redact.js";
|
|
10
|
+
import { containsCredential, redactSecrets, redactionEnabled, REDACTION_OFF_NOTE } from "./redact.js";
|
|
11
11
|
import { connectedApps, shouldShowFeedbackHint, markFeedbackHintShown, pushLogBox } from "./index.js";
|
|
12
12
|
import { ensureLicense, getUsageInfo } from "./license.js";
|
|
13
13
|
import { freezeSessionVerdict, isToolBlocked, usageWarningLine } from "../pro/usageGate.js";
|
|
@@ -103,6 +103,10 @@ export function registerToolWithTelemetry(server, toolName, config, handler, emp
|
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
|
+
else if (Array.isArray(result?.content)
|
|
107
|
+
&& result.content.some((item) => item.type === "text" && typeof item.text === "string" && containsCredential(item.text))) {
|
|
108
|
+
result.content.push({ type: "text", text: REDACTION_OFF_NOTE });
|
|
109
|
+
}
|
|
106
110
|
if (result?.isError) {
|
|
107
111
|
success = false;
|
|
108
112
|
errorOrigin = "returned";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/core/register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EACH,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,kBAAkB,GACrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,2BAA2B,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAoB,MAAM,aAAa,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../src/core/register.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdkMirrorPoller.d.ts","sourceRoot":"","sources":["../../src/core/sdkMirrorPoller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sdkMirrorPoller.d.ts","sourceRoot":"","sources":["../../src/core/sdkMirrorPoller.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,kBAAkB,OAAO,CAAC;AACvC,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AAqHtC,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,GAAE,MAAmB,GAAG,IAAI,CAShF;AAGD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAIvD;AAGD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,GAAE,MAAmB,GAAG,IAAI,CAIlF;AASD,wBAAgB,kBAAkB,IAAI,IAAI,CAOzC;AA2CD,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAgI7G;AAOD,wBAAsB,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAalE;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAwCzD;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAKxD;AAED,wBAAgB,uBAAuB,IAAI,IAAI,CAI9C"}
|
|
@@ -10,6 +10,18 @@ const consecutiveFailures = new Map();
|
|
|
10
10
|
const MAX_CONSECUTIVE_FAILURES = 5;
|
|
11
11
|
const cdpConsoleWindows = new Map();
|
|
12
12
|
const MAX_CONSOLE_WINDOWS = 20;
|
|
13
|
+
const absorbedMockRows = new WeakSet();
|
|
14
|
+
const MOCK_TWIN_WINDOW_MS = 2000;
|
|
15
|
+
const MOCK_TWIN_BODY_PREFIX = 1000;
|
|
16
|
+
function mockedTwin(mockRows, entry) {
|
|
17
|
+
const method = String(entry.method || "GET").toUpperCase();
|
|
18
|
+
const body = (entry.requestBody ?? "").slice(0, MOCK_TWIN_BODY_PREFIX);
|
|
19
|
+
return mockRows.find((row) => !absorbedMockRows.has(row) &&
|
|
20
|
+
row.method.toUpperCase() === method &&
|
|
21
|
+
row.url === entry.url &&
|
|
22
|
+
(row.postData ?? "").slice(0, MOCK_TWIN_BODY_PREFIX) === body &&
|
|
23
|
+
Math.abs(row.timestamp.getTime() - entry.timestamp) <= MOCK_TWIN_WINDOW_MS);
|
|
24
|
+
}
|
|
13
25
|
function pollingDisabled() {
|
|
14
26
|
return process.env.EXECBRO_DISABLE_SDK_MIRROR === "1";
|
|
15
27
|
}
|
|
@@ -100,20 +112,27 @@ export async function mirrorOnce(device) {
|
|
|
100
112
|
const deviceKey = bufferKeyFor(device);
|
|
101
113
|
if (parsed.runId) {
|
|
102
114
|
const previous = lastRunId.get(deviceKey);
|
|
103
|
-
if (previous && previous !== parsed.runId) {
|
|
115
|
+
if (previous && previous.runId !== parsed.runId && previous.epoch === getEpoch(deviceKey)) {
|
|
104
116
|
const next = bumpEpoch(deviceKey);
|
|
105
117
|
console.error(`[execbro] App restart detected on ${deviceKey} — now epoch ${next}`);
|
|
106
118
|
}
|
|
107
|
-
lastRunId.set(deviceKey, parsed.runId);
|
|
119
|
+
lastRunId.set(deviceKey, { runId: parsed.runId, epoch: getEpoch(deviceKey) });
|
|
108
120
|
}
|
|
109
121
|
const epoch = getEpoch(deviceKey);
|
|
110
122
|
const seen = seenSet(deviceKey);
|
|
111
123
|
let logs = 0;
|
|
112
124
|
let network = 0;
|
|
125
|
+
const mockRows = getNetworkBuffer(deviceKey).getAll().filter((r) => r.mocked && r.capturedBy === "interceptor");
|
|
113
126
|
for (const entry of parsed.network ?? []) {
|
|
114
127
|
const key = `n:${epoch}:${entry.id}`;
|
|
115
128
|
if (seen.has(key))
|
|
116
129
|
continue;
|
|
130
|
+
const twin = mockRows.length > 0 ? mockedTwin(mockRows, entry) : undefined;
|
|
131
|
+
if (twin) {
|
|
132
|
+
absorbedMockRows.add(twin);
|
|
133
|
+
seen.add(key);
|
|
134
|
+
continue;
|
|
135
|
+
}
|
|
117
136
|
if (entry.completed)
|
|
118
137
|
seen.add(key);
|
|
119
138
|
getNetworkBuffer(deviceKey).set(entry.id, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sdkMirrorPoller.js","sourceRoot":"","sources":["../../src/core/sdkMirrorPoller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACjH,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"sdkMirrorPoller.js","sourceRoot":"","sources":["../../src/core/sdkMirrorPoller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textEntry.d.ts","sourceRoot":"","sources":["../../src/core/textEntry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACzF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAyC,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACvG,OAAO,EAIH,KAAK,gBAAgB,EACxB,MAAM,sBAAsB,CAAC;AAG9B,MAAM,MAAM,aAAa,GAAG;IAExB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAGF,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,QAAQ,GAAG,KAAK,CAAC;AAE3D,MAAM,MAAM,eAAe,GAAG;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,SAAS,CAAC;IAKjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IAKnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;IAE9B,WAAW,CAAC,EAAE,MAAM,CAAC;IAMrB,SAAS,CAAC,EAAE,gBAAgB,CAAC;CAChC,CAAC;AAWF,MAAM,MAAM,aAAa,GAAG;IAExB,KAAK,EAAE,OAAO,CAAC;IAKf,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,eAAe,EAAE,SAAS,GAAG,cAAc,GAAG,IAAI,CAAC;CACtD,CAAC;AAEF,wBAAgB,aAAa,CAAC,CAAC,EAAE,eAAe,GAAG,aAAa,CAoB/D;AASD,MAAM,MAAM,aAAa,GAAG;IACxB,KAAK,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAClF,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"textEntry.d.ts","sourceRoot":"","sources":["../../src/core/textEntry.ts"],"names":[],"mappings":"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"}
|
package/build/core/textEntry.js
CHANGED
|
@@ -216,7 +216,7 @@ export async function enterText(args, deps) {
|
|
|
216
216
|
}
|
|
217
217
|
let landed = await readBack();
|
|
218
218
|
if (landed === undefined) {
|
|
219
|
-
const keyboard = await deps.raise();
|
|
219
|
+
const keyboard = await deps.raise?.();
|
|
220
220
|
return {
|
|
221
221
|
success: true,
|
|
222
222
|
...(kbNote ? { note: kbNote } : {}),
|
|
@@ -256,7 +256,7 @@ export async function enterText(args, deps) {
|
|
|
256
256
|
landed = await readBack();
|
|
257
257
|
}
|
|
258
258
|
if (appendedOntoUnknown && landed !== desired) {
|
|
259
|
-
const keyboard = await deps.raise();
|
|
259
|
+
const keyboard = await deps.raise?.();
|
|
260
260
|
return {
|
|
261
261
|
success: true,
|
|
262
262
|
...(kbNote ? { note: kbNote } : {}),
|
|
@@ -267,7 +267,7 @@ export async function enterText(args, deps) {
|
|
|
267
267
|
};
|
|
268
268
|
}
|
|
269
269
|
if (landed !== undefined && landed !== desired && isFieldTransform(desired, landed)) {
|
|
270
|
-
const keyboard = await deps.raise();
|
|
270
|
+
const keyboard = await deps.raise?.();
|
|
271
271
|
return {
|
|
272
272
|
success: true,
|
|
273
273
|
...(kbNote ? { note: kbNote } : {}),
|
|
@@ -281,7 +281,7 @@ export async function enterText(args, deps) {
|
|
|
281
281
|
}
|
|
282
282
|
if (landed !== desired) {
|
|
283
283
|
if (landed === undefined) {
|
|
284
|
-
const keyboard = await deps.raise();
|
|
284
|
+
const keyboard = await deps.raise?.();
|
|
285
285
|
return {
|
|
286
286
|
success: true, ...(kbNote ? { note: kbNote } : {}), path: first.path, verified: false, retried, keyboard,
|
|
287
287
|
error: "the rewrite could not be read back, so the result is unconfirmed"
|
|
@@ -303,7 +303,7 @@ export async function enterText(args, deps) {
|
|
|
303
303
|
: "")
|
|
304
304
|
};
|
|
305
305
|
}
|
|
306
|
-
const keyboard = await deps.raise();
|
|
306
|
+
const keyboard = await deps.raise?.();
|
|
307
307
|
return {
|
|
308
308
|
success: true,
|
|
309
309
|
...(kbNote ? { note: kbNote } : {}),
|