appium-remote-debugger 14.0.3 → 14.0.5
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/CHANGELOG.md +12 -0
- package/build/lib/mixins/connect.js +1 -1
- package/build/lib/mixins/connect.js.map +1 -1
- package/build/lib/mixins/execute.d.ts +1 -1
- package/build/lib/mixins/execute.d.ts.map +1 -1
- package/build/lib/mixins/execute.js +3 -7
- package/build/lib/mixins/execute.js.map +1 -1
- package/build/lib/mixins/navigate.d.ts.map +1 -1
- package/build/lib/mixins/navigate.js +15 -14
- package/build/lib/mixins/navigate.js.map +1 -1
- package/build/lib/rpc/rpc-client.d.ts +5 -4
- package/build/lib/rpc/rpc-client.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client.js +82 -42
- package/build/lib/rpc/rpc-client.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/lib/mixins/connect.js +1 -1
- package/lib/mixins/execute.js +3 -9
- package/lib/mixins/navigate.js +19 -15
- package/lib/rpc/rpc-client.js +84 -39
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [14.0.5](https://github.com/appium/appium-remote-debugger/compare/v14.0.4...v14.0.5) (2025-08-29)
|
|
2
|
+
|
|
3
|
+
### Bug Fixes
|
|
4
|
+
|
|
5
|
+
* Update page initialization logic to avoid conflicts ([#438](https://github.com/appium/appium-remote-debugger/issues/438)) ([cb03aa3](https://github.com/appium/appium-remote-debugger/commit/cb03aa394b3df07db70e5cdbd0efd00f96430a78))
|
|
6
|
+
|
|
7
|
+
## [14.0.4](https://github.com/appium/appium-remote-debugger/compare/v14.0.3...v14.0.4) (2025-08-28)
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* Avoid deadlocks ([#437](https://github.com/appium/appium-remote-debugger/issues/437)) ([6634146](https://github.com/appium/appium-remote-debugger/commit/66341464459dc60bfd96d6e97e13aa63ad7c0205))
|
|
12
|
+
|
|
1
13
|
## [14.0.3](https://github.com/appium/appium-remote-debugger/compare/v14.0.2...v14.0.3) (2025-08-27)
|
|
2
14
|
|
|
3
15
|
### Bug Fixes
|
|
@@ -152,7 +152,7 @@ async function selectPage(appIdKey, pageIdKey, skipReadyCheck = false) {
|
|
|
152
152
|
this.log.debug(`Selecting page '${pageIdKey}' on app '${fullAppIdKey}' and forwarding socket setup`);
|
|
153
153
|
const timer = new support_1.timing.Timer().start();
|
|
154
154
|
await this.requireRpcClient().selectPage(fullAppIdKey, pageIdKey);
|
|
155
|
-
if (!skipReadyCheck
|
|
155
|
+
if (!skipReadyCheck) {
|
|
156
156
|
await this.waitForDom();
|
|
157
157
|
}
|
|
158
158
|
this.log.debug(`Selected page after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ export function executeAtomAsync(this: import("../remote-debugger").RemoteDebugg
|
|
|
19
19
|
/**
|
|
20
20
|
* @this {RemoteDebugger}
|
|
21
21
|
* @param {string} command
|
|
22
|
-
* @param {boolean} [override]
|
|
22
|
+
* @param {boolean} [override] - Deprecated and unused
|
|
23
23
|
* @returns {Promise<any>}
|
|
24
24
|
*/
|
|
25
25
|
export function execute(this: import("../remote-debugger").RemoteDebugger, command: string, override?: boolean): Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/mixins/execute.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/mixins/execute.js"],"names":[],"mappings":"AAoBA;;;;;;;;GAQG;AACH,qFALW,MAAM,SACN,GAAG,EAAE,WACL,MAAM,EAAE,GACN,OAAO,CAAC,GAAG,CAAC,CAQxB;AAED;;;;;;GAMG;AACH,0FALW,MAAM,SACN,GAAG,EAAE,WACL,MAAM,EAAE,GACN,OAAO,CAAC,GAAG,CAAC,CAoFxB;AAED;;;;;GAKG;AAEH,oFALW,MAAM,aACN,OAAO,GACL,OAAO,CAAC,GAAG,CAAC,CA0BxB;AAED;;;;;GAKG;AACH,0FAJW,MAAM,MACN,GAAG,SACH,GAAG,EAAE,gBAuBf;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}
|
|
@@ -28,7 +28,7 @@ const RPC_RESPONSE_TIMEOUT_MS = 5000;
|
|
|
28
28
|
async function executeAtom(atom, args = [], frames = []) {
|
|
29
29
|
this.log.debug(`Executing atom '${atom}' with 'args=${JSON.stringify(args)}; frames=${frames}'`);
|
|
30
30
|
const script = await (0, atoms_1.getScriptForAtom)(atom, args, frames);
|
|
31
|
-
const value = await this.execute(script
|
|
31
|
+
const value = await this.execute(script);
|
|
32
32
|
this.log.debug(`Received result for atom '${atom}' execution: ${lodash_1.default.truncate((0, utils_1.simpleStringify)(value), { length: utils_1.RESPONSE_LOG_LENGTH })}`);
|
|
33
33
|
return value;
|
|
34
34
|
}
|
|
@@ -121,15 +121,11 @@ async function executeAtomAsync(atom, args = [], frames = []) {
|
|
|
121
121
|
/**
|
|
122
122
|
* @this {RemoteDebugger}
|
|
123
123
|
* @param {string} command
|
|
124
|
-
* @param {boolean} [override]
|
|
124
|
+
* @param {boolean} [override] - Deprecated and unused
|
|
125
125
|
* @returns {Promise<any>}
|
|
126
126
|
*/
|
|
127
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
127
128
|
async function execute(command, override) {
|
|
128
|
-
// if the page is not loaded yet, wait for it
|
|
129
|
-
if ((0, property_accessors_1.getPageLoading)(this) && !override) {
|
|
130
|
-
this.log.debug('Trying to execute but page is not loaded.');
|
|
131
|
-
await this.waitForDom();
|
|
132
|
-
}
|
|
133
129
|
const { appIdKey, pageIdKey } = (0, utils_1.checkParams)({
|
|
134
130
|
appIdKey: (0, property_accessors_1.getAppIdKey)(this),
|
|
135
131
|
pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/mixins/execute.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/mixins/execute.js"],"names":[],"mappings":";;;;;AA6BA,kCAMC;AASD,4CAkFC;AASD,0BAuBC;AAQD,oCAqBC;AA3LD,qDAA6C;AAC7C,oCAKkB;AAClB,oCAA4C;AAC5C,6CAA+C;AAC/C,uCAAyC;AACzC,oDAAuB;AACvB,6DAI8B;AAE9B,qFAAqF;AACrF,MAAM,uBAAuB,GAAG,IAAI,CAAC;AAErC;;;;;;;;GAQG;AACI,KAAK,UAAU,WAAW,CAAE,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE;IAC7D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,IAAI,gBAAgB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,MAAM,GAAG,CAAC,CAAC;IACjG,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAgB,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,IAAI,gBAAgB,gBAAC,CAAC,QAAQ,CAAC,IAAA,uBAAe,EAAC,KAAK,CAAC,EAAE,EAAC,MAAM,EAAE,2BAAmB,EAAC,CAAC,EAAE,CAAC,CAAC;IACrI,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,gBAAgB,CAAE,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE;IAClE,+CAA+C;IAC/C,MAAM,QAAQ,GAAG,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;QACpG,QAAQ,EAAE,IAAA,gCAAW,EAAC,IAAI,CAAC;QAC3B,SAAS,EAAE,IAAA,iCAAY,EAAC,IAAI,CAAC;QAC7B,aAAa,EAAE,KAAK;KACrB,EAAE,IAAI,CAAC,CAAC,CAAC;IAEV,0EAA0E;IAC1E,gBAAgB;IAChB,MAAM,WAAW,GAAG,4BAA4B,cAAI,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;IAClF,MAAM,MAAM,GACV;aACS,WAAW;;;;aAIX,WAAW;aACX,WAAW;aACX,WAAW,GAAG,CAAC;IAC1B,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,kBAAkB,EAAE;QAC7C,UAAU,EAAE,MAAM;KACnB,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;IAE5C,yDAAyD;IACzD,MAAM,aAAa,GACjB;eACW,WAAW;eACX,WAAW;MACpB,CAAC;IACL,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,IAAA,wBAAgB,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;IAE9E,sCAAsC;IACtC,IAAI,GAAG,CAAC;IACR,MAAM,iBAAiB,GAAG,IAAI,CAAC,CAAC,iCAAiC;IACjE,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,QAAQ,CAAC,sBAAsB,EAAE;YAC3C,eAAe;YACf,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,IAAI;YACrB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,sCAAsC,CAAC,EAAE,CAAC;YAClE,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,iEAAiE;QACjE,MAAM,SAAS,GAAG,GAAG,CAAC;QACtB,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC;QACvE,oEAAoE;QACpE,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,OAAO,GAAG,SAAS,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,KAAK,GAAG,IAAI,gBAAM,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;QACzC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,OAAO,gCAAgC,CAAC,CAAC;QACzE,GAAG,GAAG,MAAM,IAAA,wBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,KAAK,IAAI,EAAE;YACvD,iEAAiE;YACjE,4BAA4B;YAC5B,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,kBAAkB,EAAE;gBAClD,UAAU,EAAE,0BAA0B,WAAW,UAAU;gBAC3D,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;YACH,IAAI,QAAQ,EAAE,CAAC;gBACb,oEAAoE;gBACpE,wCAAwC;gBACxC,OAAO,MAAM,QAAQ,CAAC,kBAAkB,EAAE;oBACxC,UAAU,EAAE,UAAU,WAAW,QAAQ;oBACzC,aAAa,EAAE,IAAI;iBACpB,CAAC,CAAC;YACL,CAAC;YACD,oEAAoE;YACpE,MAAM,IAAI,oBAAM,CAAC,YAAY,CAAC,4CAA4C;gBAC5C,gBAAgB,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QACvG,CAAC,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,IAAI,CAAC;YACH,gCAAgC;YAChC,MAAM,IAAI,CAAC,WAAW,CACpB,gBAAgB,EAAE,CAAC,iBAAiB,WAAW,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,iBAAiB,CAAC,EAAE,MAAM,CAC7F,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IACD,OAAO,IAAA,qBAAa,EAAC,GAAG,CAAC,CAAC;AAC5B,CAAC;AAED;;;;;GAKG;AACH,6DAA6D;AACtD,KAAK,UAAU,OAAO,CAAE,OAAO,EAAE,QAAQ;IAC9C,MAAM,EAAC,QAAQ,EAAE,SAAS,EAAC,GAAG,IAAA,mBAAW,EAAC;QACxC,QAAQ,EAAE,IAAA,gCAAW,EAAC,IAAI,CAAC;QAC3B,SAAS,EAAE,IAAA,iCAAY,EAAC,IAAI,CAAC;KAC9B,CAAC,CAAC;IAEH,IAAI,IAAA,+CAA0B,EAAC,IAAI,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,SAAS,CAAC,yBAAyB;IACvC,0CAA0C,CAAC,CAAC,QAAQ,CAAC;IACrD,2CAA2C,CAAC,CAAC,SAAS,CAAC,CACxD,CAAC;IACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,gBAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAC,MAAM,EAAE,EAAE,EAAC,CAAC,GAAG,CAAC,CAAC;IACrF,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,kBAAkB,EAAE;QACnD,UAAU,EAAE,OAAO;QACnB,aAAa,EAAE,IAAI;QACnB,QAAQ;QACR,SAAS;KACV,CAAC,CAAC;IACH,OAAO,IAAA,qBAAa,EAAC,GAAG,CAAC,CAAC;AAC5B,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,YAAY,CAAE,QAAQ,EAAE,EAAE,EAAE,IAAI;IACpD,MAAM,EAAC,QAAQ,EAAE,SAAS,EAAC,GAAG,IAAA,mBAAW,EAAC;QACxC,QAAQ,EAAE,IAAA,gCAAW,EAAC,IAAI,CAAC;QAC3B,SAAS,EAAE,IAAA,iCAAY,EAAC,IAAI,CAAC;KAC9B,CAAC,CAAC;IAEH,IAAI,IAAA,+CAA0B,EAAC,IAAI,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,wBAAwB,EAAE;QAC3E,QAAQ;QACR,mBAAmB,EAAE,EAAE;QACvB,SAAS,EAAE,IAAI;QACf,aAAa,EAAE,IAAI;QACnB,QAAQ;QACR,SAAS;KACV,CAAC,CAAC;IAEH,OAAO,IAAA,qBAAa,EAAC,GAAG,CAAC,CAAC;AAC5B,CAAC;AAED;;GAEG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"AA4BA;;;GAGG;AACH,kFAFa,IAAI,CAIhB;AAED;;;GAGG;AACH,mFAFa,IAAI,CAMhB;AAED;;;;;;;GAOG;AACH,sGAHW,MAAM,GACJ,OAAO,CAenB;AAED;;;;GAIG;AACH,mGAHW,MAAM,CAAC,KAAK,OAAC,GACX,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"AA4BA;;;GAGG;AACH,kFAFa,IAAI,CAIhB;AAED;;;GAGG;AACH,mFAFa,IAAI,CAMhB;AAED;;;;;;;GAOG;AACH,sGAHW,MAAM,GACJ,OAAO,CAenB;AAED;;;;GAIG;AACH,mGAHW,MAAM,CAAC,KAAK,OAAC,GACX,OAAO,CAAC,IAAI,CAAC,CA+DzB;AAED;;;;GAIG;AACH,gGAHW,MAAM,GACJ,OAAO,CAAC,OAAO,CAAC,CAuB5B;AAED;;;;GAIG;AACH,iFAHW,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CAwFzB;AAhPD,uDAA2D;6BAmP9C,OAAO,oBAAoB,EAAE,cAAc;uBAjQ3B,iBAAiB"}
|
|
@@ -101,12 +101,9 @@ function isPageLoadingCompleted(readyState) {
|
|
|
101
101
|
* @returns {Promise<void>}
|
|
102
102
|
*/
|
|
103
103
|
async function waitForDom(startPageLoadTimer) {
|
|
104
|
-
this.log.debug('Waiting for page readiness');
|
|
105
104
|
const readinessTimeoutMs = this.pageLoadMs;
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
startPageLoadTimer = new support_1.timing.Timer().start();
|
|
109
|
-
}
|
|
105
|
+
this.log.debug(`Waiting up to ${readinessTimeoutMs}ms for the page to be ready`);
|
|
106
|
+
const timer = startPageLoadTimer ?? new support_1.timing.Timer().start();
|
|
110
107
|
let isPageLoading = true;
|
|
111
108
|
(0, property_accessors_1.setPageLoading)(this, true);
|
|
112
109
|
(0, property_accessors_1.setPageLoadDelay)(this, support_1.util.cancellableDelay(readinessTimeoutMs));
|
|
@@ -115,8 +112,7 @@ async function waitForDom(startPageLoadTimer) {
|
|
|
115
112
|
let retry = 0;
|
|
116
113
|
while (isPageLoading) {
|
|
117
114
|
// if we are ready, or we've spend too much time on this
|
|
118
|
-
|
|
119
|
-
const elapsedMs = startPageLoadTimer.getDuration().asMilliSeconds;
|
|
115
|
+
const elapsedMs = timer.getDuration().asMilliSeconds;
|
|
120
116
|
// exponential retry
|
|
121
117
|
const intervalMs = Math.min(PAGE_READINESS_CHECK_INTERVAL_MS * Math.pow(2, retry), readinessTimeoutMs - elapsedMs);
|
|
122
118
|
await bluebird_1.default.delay(intervalMs);
|
|
@@ -128,7 +124,8 @@ async function waitForDom(startPageLoadTimer) {
|
|
|
128
124
|
if (!isPageLoading) {
|
|
129
125
|
return;
|
|
130
126
|
}
|
|
131
|
-
|
|
127
|
+
const maxWaitMs = (readinessTimeoutMs - elapsedMs) * 0.95;
|
|
128
|
+
if (await this.checkPageIsReady(maxWaitMs)) {
|
|
132
129
|
if (isPageLoading) {
|
|
133
130
|
this.log.debug(`Page is ready in ${elapsedMs}ms`);
|
|
134
131
|
isPageLoading = false;
|
|
@@ -168,17 +165,21 @@ async function checkPageIsReady(timeoutMs) {
|
|
|
168
165
|
const readyCmd = 'document.readyState;';
|
|
169
166
|
const actualTimeoutMs = timeoutMs ?? (0, property_accessors_1.getPageReadyTimeout)(this);
|
|
170
167
|
try {
|
|
171
|
-
const readyState = await bluebird_1.default.resolve(this.execute(readyCmd
|
|
168
|
+
const readyState = await bluebird_1.default.resolve(this.execute(readyCmd))
|
|
172
169
|
.timeout(actualTimeoutMs);
|
|
173
|
-
this.log.debug(
|
|
174
|
-
|
|
170
|
+
this.log.debug(JSON.stringify({
|
|
171
|
+
readyState,
|
|
172
|
+
pageLoadStrategy: (0, property_accessors_1.getPageLoadStartegy)(this) ?? PAGE_LOAD_STRATEGY.NORMAL,
|
|
173
|
+
}));
|
|
175
174
|
return this.isPageLoadingCompleted(readyState);
|
|
176
175
|
}
|
|
177
176
|
catch (err) {
|
|
178
|
-
if (
|
|
179
|
-
|
|
177
|
+
if (err instanceof bluebird_1.TimeoutError) {
|
|
178
|
+
this.log.debug(`Page readiness check timed out after ${actualTimeoutMs}ms`);
|
|
179
|
+
}
|
|
180
|
+
else {
|
|
181
|
+
this.log.warn(`Page readiness check has failed. Original error: ${err.message}`);
|
|
180
182
|
}
|
|
181
|
-
this.log.debug(`Page readiness check timed out after ${actualTimeoutMs}ms`);
|
|
182
183
|
return false;
|
|
183
184
|
}
|
|
184
185
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCA,sCAEC;AAMD,wCAIC;AAUD,wDAaC;AAOD,
|
|
1
|
+
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"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"}
|
|
@@ -54,6 +54,7 @@ export class RpcClient {
|
|
|
54
54
|
* @returns {boolean}
|
|
55
55
|
*/
|
|
56
56
|
get isConnected(): boolean;
|
|
57
|
+
_provisionedPages: Set<any>;
|
|
57
58
|
/**
|
|
58
59
|
* @param {boolean} isTargetBased
|
|
59
60
|
*/
|
|
@@ -178,9 +179,9 @@ export class RpcClient {
|
|
|
178
179
|
* @param {import('../types').AppIdKey} appIdKey
|
|
179
180
|
* @param {import('../types').PageIdKey} pageIdKey
|
|
180
181
|
* @param {import('../types').TargetId} [targetId]
|
|
181
|
-
* @returns {Promise<
|
|
182
|
+
* @returns {Promise<boolean>}
|
|
182
183
|
*/
|
|
183
|
-
_initializePage(appIdKey: import("../types").AppIdKey, pageIdKey: import("../types").PageIdKey, targetId?: import("../types").TargetId): Promise<
|
|
184
|
+
_initializePage(appIdKey: import("../types").AppIdKey, pageIdKey: import("../types").PageIdKey, targetId?: import("../types").TargetId): Promise<boolean>;
|
|
184
185
|
/**
|
|
185
186
|
*
|
|
186
187
|
* @param {import('../types').AppIdKey} appIdKey
|
|
@@ -207,10 +208,10 @@ export class RpcClient {
|
|
|
207
208
|
*
|
|
208
209
|
* @param {import('../types').AppIdKey} appIdKey
|
|
209
210
|
* @param {import('../types').PageIdKey} pageIdKey
|
|
210
|
-
* @param {import('../types').TargetId}
|
|
211
|
+
* @param {import('../types').TargetId} targetId
|
|
211
212
|
* @returns {Promise<void>}
|
|
212
213
|
*/
|
|
213
|
-
_resumeTarget(appIdKey: import("../types").AppIdKey, pageIdKey: import("../types").PageIdKey, targetId
|
|
214
|
+
_resumeTarget(appIdKey: import("../types").AppIdKey, pageIdKey: import("../types").PageIdKey, targetId: import("../types").TargetId): Promise<void>;
|
|
214
215
|
/**
|
|
215
216
|
*
|
|
216
217
|
* @param {import('../types').AppIdKey} appIdKey
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client.js"],"names":[],"mappings":"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"}
|
|
@@ -15,11 +15,15 @@ const node_events_1 = require("node:events");
|
|
|
15
15
|
const async_lock_1 = __importDefault(require("async-lock"));
|
|
16
16
|
const DATA_LOG_LENGTH = { length: 200 };
|
|
17
17
|
const MIN_WAIT_FOR_TARGET_TIMEOUT_MS = 30000;
|
|
18
|
+
// Sometimes page initialization can take a long time, especially in slow CI environments,
|
|
19
|
+
// although we still should not allow it to take forever
|
|
20
|
+
const PAGE_INIT_TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
|
|
18
21
|
const WAIT_FOR_TARGET_INTERVAL_MS = 100;
|
|
19
22
|
const MIN_PLATFORM_FOR_TARGET_BASED = '12.2';
|
|
20
23
|
// `Target.exists` protocol method was removed from WebKit in 13.4
|
|
21
24
|
const MIN_PLATFORM_NO_TARGET_EXISTS = '13.4';
|
|
22
25
|
const NO_TARGET_SUPPORTED_ERROR = `'target' domain was not found`;
|
|
26
|
+
const MISSING_TARGET_ERROR_PATTERN = /Missing target/i;
|
|
23
27
|
const NO_TARGET_PRESENT_YET_ERRORS = [
|
|
24
28
|
`domain was not found`,
|
|
25
29
|
`some arguments of method`,
|
|
@@ -65,6 +69,7 @@ class RpcClient {
|
|
|
65
69
|
this._contexts = [];
|
|
66
70
|
this._targets = {};
|
|
67
71
|
this._targetSubscriptions = new node_events_1.EventEmitter();
|
|
72
|
+
this._provisionedPages = new Set();
|
|
68
73
|
// start with a best guess for the protocol
|
|
69
74
|
this.isTargetBased = platformVersion ? isTargetBased(isSafari, platformVersion) : true;
|
|
70
75
|
}
|
|
@@ -305,7 +310,7 @@ class RpcClient {
|
|
|
305
310
|
messageHandled = false;
|
|
306
311
|
// do not log receipts
|
|
307
312
|
// @ts-ignore messageHandler must be defined
|
|
308
|
-
this.messageHandler.once(msgId.toString(),
|
|
313
|
+
this.messageHandler.once(msgId.toString(), (err) => {
|
|
309
314
|
if (err) {
|
|
310
315
|
// we are not waiting for this, and if it errors it is most likely
|
|
311
316
|
// a protocol change. Log and check during testing
|
|
@@ -321,7 +326,7 @@ class RpcClient {
|
|
|
321
326
|
}
|
|
322
327
|
else if (this.messageHandler.listeners(cmd.__selector).length) {
|
|
323
328
|
// @ts-ignore messageHandler must be defined
|
|
324
|
-
this.messageHandler.prependOnceListener(cmd.__selector,
|
|
329
|
+
this.messageHandler.prependOnceListener(cmd.__selector, (err, ...args) => {
|
|
325
330
|
if (err) {
|
|
326
331
|
return reject(err);
|
|
327
332
|
}
|
|
@@ -332,7 +337,7 @@ class RpcClient {
|
|
|
332
337
|
}
|
|
333
338
|
else if (hasSocketData) {
|
|
334
339
|
// @ts-ignore messageHandler must be defined
|
|
335
|
-
this.messageHandler.once(msgId.toString(),
|
|
340
|
+
this.messageHandler.once(msgId.toString(), (err, value) => {
|
|
336
341
|
if (err) {
|
|
337
342
|
return reject(new Error(`Remote debugger error with code '${err.code}': ${err.message}`));
|
|
338
343
|
}
|
|
@@ -407,54 +412,74 @@ class RpcClient {
|
|
|
407
412
|
logger_1.default.info(`Received 'Target.targetCreated' event for app '${app}' with no pending request: ${JSON.stringify(targetInfo)}`);
|
|
408
413
|
return;
|
|
409
414
|
}
|
|
415
|
+
const pageInitTimeoutMs = Math.max(this.pageLoadTimeoutMs ?? 0, PAGE_INIT_TIMEOUT_MS);
|
|
416
|
+
if (!lodash_1.default.isPlainObject(this.targets[appIdKey])) {
|
|
417
|
+
this.targets[appIdKey] = {
|
|
418
|
+
lock: new async_lock_1.default({ maxOccupationTime: pageInitTimeoutMs }),
|
|
419
|
+
};
|
|
420
|
+
}
|
|
421
|
+
const timer = new support_1.timing.Timer().start();
|
|
410
422
|
if (targetInfo.isProvisional) {
|
|
411
|
-
logger_1.default.debug(`Provisional target created for app '${appIdKey}' and page '${pageIdKey}': '${targetInfo
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
logger_1.default.debug(`The target ${targetInfo.targetId}@${appIdKey} is paused`);
|
|
416
|
-
const appTargetsMap = this.targets[appIdKey];
|
|
417
|
-
if (appTargetsMap) {
|
|
418
|
-
await appTargetsMap.lock.acquire(appIdKey, async () => {
|
|
423
|
+
logger_1.default.debug(`Provisional target created for app '${appIdKey}' and page '${pageIdKey}': '${JSON.stringify(targetInfo)}'`);
|
|
424
|
+
this._provisionedPages.add(pageIdKey);
|
|
425
|
+
try {
|
|
426
|
+
await this.targets[appIdKey].lock.acquire(pageIdKey, async () => {
|
|
419
427
|
try {
|
|
420
428
|
await this._initializePage(appIdKey, pageIdKey, targetInfo.targetId);
|
|
421
429
|
}
|
|
422
430
|
finally {
|
|
423
|
-
|
|
431
|
+
if (targetInfo.isPaused) {
|
|
432
|
+
await this._resumeTarget(appIdKey, pageIdKey, targetInfo.targetId);
|
|
433
|
+
}
|
|
434
|
+
else {
|
|
435
|
+
logger_1.default.debug(`Provisional target ${targetInfo.targetId}@${appIdKey} is not paused, so not resuming`);
|
|
436
|
+
}
|
|
424
437
|
}
|
|
425
438
|
});
|
|
426
439
|
}
|
|
440
|
+
catch (e) {
|
|
441
|
+
logger_1.default.warn(`Cannot complete the initialization of the provisional target '${targetInfo.targetId}' ` +
|
|
442
|
+
`after ${timer.getDuration().asMilliSeconds}ms: ${e.message}`);
|
|
443
|
+
}
|
|
427
444
|
return;
|
|
428
445
|
}
|
|
429
446
|
logger_1.default.debug(`Target created for app '${appIdKey}' and page '${pageIdKey}': ${JSON.stringify(targetInfo)}`);
|
|
430
|
-
if (
|
|
431
|
-
this.targets[appIdKey] = {
|
|
432
|
-
lock: new async_lock_1.default(),
|
|
433
|
-
};
|
|
434
|
-
}
|
|
435
|
-
else if (lodash_1.default.has(this.targets[appIdKey], pageIdKey)) {
|
|
447
|
+
if (lodash_1.default.has(this.targets[appIdKey], pageIdKey)) {
|
|
436
448
|
logger_1.default.debug(`There is already a target for this app and page ('${this.targets[appIdKey][pageIdKey]}'). ` +
|
|
437
449
|
`This might cause problems`);
|
|
438
450
|
}
|
|
439
451
|
this.targets[appIdKey][pageIdKey] = targetInfo.targetId;
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
452
|
+
try {
|
|
453
|
+
await this.send('Target.setPauseOnStart', {
|
|
454
|
+
pauseOnStart: true,
|
|
455
|
+
appIdKey,
|
|
456
|
+
pageIdKey,
|
|
457
|
+
});
|
|
458
|
+
}
|
|
459
|
+
catch (e) {
|
|
460
|
+
logger_1.default.debug(`Cannot setup pause on start for app '${appIdKey}' and page '${pageIdKey}': ${e.message}`);
|
|
461
|
+
}
|
|
462
|
+
try {
|
|
463
|
+
await this.targets[appIdKey].lock.acquire(pageIdKey, async () => {
|
|
464
|
+
try {
|
|
465
|
+
if (this._provisionedPages.has(pageIdKey)) {
|
|
466
|
+
logger_1.default.debug(`Page '${pageIdKey}' has been already provisioned`);
|
|
467
|
+
this._provisionedPages.delete(pageIdKey);
|
|
468
|
+
}
|
|
469
|
+
else {
|
|
470
|
+
await this._initializePage(appIdKey, pageIdKey);
|
|
471
|
+
}
|
|
455
472
|
}
|
|
456
|
-
|
|
457
|
-
|
|
473
|
+
finally {
|
|
474
|
+
if (targetInfo.isPaused) {
|
|
475
|
+
await this._resumeTarget(appIdKey, pageIdKey, targetInfo.targetId);
|
|
476
|
+
}
|
|
477
|
+
}
|
|
478
|
+
});
|
|
479
|
+
}
|
|
480
|
+
catch (e) {
|
|
481
|
+
logger_1.default.warn(e.message);
|
|
482
|
+
}
|
|
458
483
|
}
|
|
459
484
|
/**
|
|
460
485
|
*
|
|
@@ -535,6 +560,7 @@ class RpcClient {
|
|
|
535
560
|
*/
|
|
536
561
|
async selectPage(appIdKey, pageIdKey) {
|
|
537
562
|
this._pendingTargetNotification = [appIdKey, pageIdKey];
|
|
563
|
+
this._provisionedPages.clear();
|
|
538
564
|
// go through the steps that the Desktop Safari system
|
|
539
565
|
// goes through to initialize the Web Inspector session
|
|
540
566
|
const sendOpts = {
|
|
@@ -566,7 +592,7 @@ class RpcClient {
|
|
|
566
592
|
* @param {import('../types').AppIdKey} appIdKey
|
|
567
593
|
* @param {import('../types').PageIdKey} pageIdKey
|
|
568
594
|
* @param {import('../types').TargetId} [targetId]
|
|
569
|
-
* @returns {Promise<
|
|
595
|
+
* @returns {Promise<boolean>}
|
|
570
596
|
*/
|
|
571
597
|
async _initializePage(appIdKey, pageIdKey, targetId) {
|
|
572
598
|
const sendOpts = {
|
|
@@ -593,11 +619,14 @@ class RpcClient {
|
|
|
593
619
|
}
|
|
594
620
|
catch (err) {
|
|
595
621
|
logger_1.default.info(`Cannot enable domain '${domain}' during initialization: ${err.message}`);
|
|
622
|
+
if (MISSING_TARGET_ERROR_PATTERN.test(err.message)) {
|
|
623
|
+
return false;
|
|
624
|
+
}
|
|
596
625
|
}
|
|
597
626
|
}
|
|
598
627
|
logger_1.default.debug(`Simple initialization of page '${pageIdKey}' for app '${appIdKey}' completed ` +
|
|
599
628
|
`in ${timer.getDuration().asMilliSeconds}ms`);
|
|
600
|
-
return;
|
|
629
|
+
return true;
|
|
601
630
|
}
|
|
602
631
|
// The sequence of commands here is important
|
|
603
632
|
const domainsToOptsMap = {
|
|
@@ -668,16 +697,23 @@ class RpcClient {
|
|
|
668
697
|
}
|
|
669
698
|
catch (err) {
|
|
670
699
|
logger_1.default.info(`Cannot set logging channel level for '${source}': ${err.message}`);
|
|
700
|
+
if (MISSING_TARGET_ERROR_PATTERN.test(err.message)) {
|
|
701
|
+
return false;
|
|
702
|
+
}
|
|
671
703
|
}
|
|
672
704
|
}
|
|
673
705
|
}
|
|
674
706
|
}
|
|
675
707
|
catch (err) {
|
|
676
708
|
logger_1.default.info(`Cannot enable domain '${domain}' during full initialization: ${err.message}`);
|
|
709
|
+
if (MISSING_TARGET_ERROR_PATTERN.test(err.message)) {
|
|
710
|
+
return false;
|
|
711
|
+
}
|
|
677
712
|
}
|
|
678
713
|
}
|
|
679
714
|
logger_1.default.debug(`Full initialization of page '${pageIdKey}' for app '${appIdKey}' completed ` +
|
|
680
715
|
`in ${timer.getDuration().asMilliSeconds}ms`);
|
|
716
|
+
return true;
|
|
681
717
|
}
|
|
682
718
|
/**
|
|
683
719
|
*
|
|
@@ -759,7 +795,7 @@ class RpcClient {
|
|
|
759
795
|
*
|
|
760
796
|
* @param {import('../types').AppIdKey} appIdKey
|
|
761
797
|
* @param {import('../types').PageIdKey} pageIdKey
|
|
762
|
-
* @param {import('../types').TargetId}
|
|
798
|
+
* @param {import('../types').TargetId} targetId
|
|
763
799
|
* @returns {Promise<void>}
|
|
764
800
|
*/
|
|
765
801
|
async _resumeTarget(appIdKey, pageIdKey, targetId) {
|
|
@@ -771,7 +807,9 @@ class RpcClient {
|
|
|
771
807
|
});
|
|
772
808
|
logger_1.default.debug(`Successfully resumed the target ${targetId}@${appIdKey}`);
|
|
773
809
|
}
|
|
774
|
-
catch {
|
|
810
|
+
catch (e) {
|
|
811
|
+
logger_1.default.warn(`Could not resume the target ${targetId}@${appIdKey}: ${e.message}`);
|
|
812
|
+
}
|
|
775
813
|
}
|
|
776
814
|
/**
|
|
777
815
|
*
|
|
@@ -784,9 +822,11 @@ class RpcClient {
|
|
|
784
822
|
throw new Error(`No targets found for app '${appIdKey}'`);
|
|
785
823
|
}
|
|
786
824
|
const lock = appTargetsMap.lock;
|
|
787
|
-
|
|
788
|
-
|
|
789
|
-
|
|
825
|
+
const timer = new support_1.timing.Timer().start();
|
|
826
|
+
await lock.acquire(pageIdKey, async () => await bluebird_1.default.delay(0));
|
|
827
|
+
const durationMs = timer.getDuration().asMilliSeconds;
|
|
828
|
+
if (durationMs > 10) {
|
|
829
|
+
logger_1.default.debug(`Waited ${durationMs}ms until the page ${pageIdKey}@${appIdKey} is initialized`);
|
|
790
830
|
}
|
|
791
831
|
}
|
|
792
832
|
}
|