appium-remote-debugger 10.2.1 → 11.0.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/CHANGELOG.md +20 -0
- package/build/lib/mixins/connect.d.ts.map +1 -1
- package/build/lib/mixins/connect.js +4 -3
- package/build/lib/mixins/connect.js.map +1 -1
- package/build/lib/mixins/navigate.d.ts +15 -45
- package/build/lib/mixins/navigate.d.ts.map +1 -1
- package/build/lib/mixins/navigate.js +132 -144
- package/build/lib/mixins/navigate.js.map +1 -1
- package/build/lib/remote-debugger.d.ts +4 -10
- package/build/lib/remote-debugger.d.ts.map +1 -1
- package/build/lib/remote-debugger.js.map +1 -1
- package/build/lib/rpc/rpc-client-simulator.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client-simulator.js +3 -1
- package/build/lib/rpc/rpc-client-simulator.js.map +1 -1
- package/build/lib/rpc/rpc-client.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client.js +2 -0
- package/build/lib/rpc/rpc-client.js.map +1 -1
- package/lib/mixins/connect.js +4 -3
- package/lib/mixins/navigate.js +139 -157
- package/lib/remote-debugger.js +2 -8
- package/lib/rpc/rpc-client-simulator.js +5 -1
- package/lib/rpc/rpc-client.js +2 -0
- package/package.json +1 -14
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,23 @@
|
|
|
1
|
+
## [11.0.0](https://github.com/appium/appium-remote-debugger/compare/v10.2.2...v11.0.0) (2024-02-14)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### ⚠ BREAKING CHANGES
|
|
5
|
+
|
|
6
|
+
* Removed the pageUnload API
|
|
7
|
+
* Removed the waitForFrameNavigated API
|
|
8
|
+
* Removed the pageLoadVerifyHook argument from waitForDom and from navToUrl APIs
|
|
9
|
+
|
|
10
|
+
### Features
|
|
11
|
+
|
|
12
|
+
* Properly perform page readiness validation ([#356](https://github.com/appium/appium-remote-debugger/issues/356)) ([a2fbd5a](https://github.com/appium/appium-remote-debugger/commit/a2fbd5aab52f246755fbdbf64cfecf1b6dd5a949))
|
|
13
|
+
|
|
14
|
+
## [10.2.2](https://github.com/appium/appium-remote-debugger/compare/v10.2.1...v10.2.2) (2024-02-06)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* Properly log retries count ([#354](https://github.com/appium/appium-remote-debugger/issues/354)) ([33f6155](https://github.com/appium/appium-remote-debugger/commit/33f61553617d7af6ea8dd221d0865dfd88e81a70))
|
|
20
|
+
|
|
1
21
|
## [10.2.1](https://github.com/appium/appium-remote-debugger/compare/v10.2.0...v10.2.1) (2024-01-16)
|
|
2
22
|
|
|
3
23
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":";;;;;;;;;;;;cAoBc,MAAM;cACN,OAAO,MAAM,EAAE,GAAG,CAAC;;;QAKnB,MAAM;cACN,MAAM;;AATpB;;;;GAIG;AAEH;;;;GAIG;AAGH;;;GAGG;AACH,6FASC;AAED;;;GAGG;AACH,qHA2CC;AAED;;;;GAIG;AACH,yEAFa,QAAQ,IAAI,CAAC,CAQzB;AAED;;;;;;;GAOG;AACH,oFALW,MAAM,oFAGJ,QAAQ,QAAQ,EAAE,CAAC,CA0D/B;;IAhED;;;;;;;OAOG;IACH,qEALW,MAAM,mFA6DhB;IAhCK,cAAwB;;AAkC9B;;;;;;;GAOG;AACH,sFALW,MAAM,mBACN,MAAM,uBACN,OAAO,GACL,QAAQ,QAAQ,QAAE,
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":";;;;;;;;;;;;cAoBc,MAAM;cACN,OAAO,MAAM,EAAE,GAAG,CAAC;;;QAKnB,MAAM;cACN,MAAM;;AATpB;;;;GAIG;AAEH;;;;GAIG;AAGH;;;GAGG;AACH,6FASC;AAED;;;GAGG;AACH,qHA2CC;AAED;;;;GAIG;AACH,yEAFa,QAAQ,IAAI,CAAC,CAQzB;AAED;;;;;;;GAOG;AACH,oFALW,MAAM,oFAGJ,QAAQ,QAAQ,EAAE,CAAC,CA0D/B;;IAhED;;;;;;;OAOG;IACH,qEALW,MAAM,mFA6DhB;IAhCK,cAAwB;;AAkC9B;;;;;;;GAOG;AACH,sFALW,MAAM,mBACN,MAAM,uBACN,OAAO,GACL,QAAQ,QAAQ,QAAE,CA0D9B;AAED;;;;;;;GAOG;AACH,qFALW,OAAO,MAAM,EAAE,GAAG,CAAC,eACnB,MAAM,qDAEJ,QAAQ,QAgBpB;AAED;;;;;;;GAOG;AACH,kFALW,MAAM,aACN,MAAM,yCAEJ,QAAQ,IAAI,CAAC,CAqBzB;;IA3BD;;;;;;;OAOG;IACH,kEALW,MAAM,aACN,MAAM,wCAuBhB;IAlBC,iBAAiC;IACjC,kBAA0B;;AAyD5B;;;;;GAKG;AACH,sFAHW,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CAsBhB;;IA1BD;;;;;OAKG;IACH,8DAHW,OAAO,MAAM,EAAE,GAAG,CAAC,EAuB7B;IAjBC,6BAAiC;IAe/B,6BAA8D"}
|
|
@@ -165,8 +165,9 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
|
|
|
165
165
|
const bundleIds = this.includeSafari && !this.isSafari
|
|
166
166
|
? [this.bundleId, ...this.additionalBundleIds, SAFARI_BUNDLE_ID]
|
|
167
167
|
: [this.bundleId, ...this.additionalBundleIds];
|
|
168
|
+
let retryCount = 0;
|
|
168
169
|
try {
|
|
169
|
-
return await (0, asyncbox_1.retryInterval)(maxTries, SELECT_APP_RETRY_SLEEP_MS, async (
|
|
170
|
+
return await (0, asyncbox_1.retryInterval)(maxTries, SELECT_APP_RETRY_SLEEP_MS, async () => {
|
|
170
171
|
if (!this.rpcClient) {
|
|
171
172
|
throw new Error('rpcClient is undefined. Is the debugger connected?');
|
|
172
173
|
}
|
|
@@ -209,7 +210,7 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
|
|
|
209
210
|
}
|
|
210
211
|
retryCount++;
|
|
211
212
|
throw new Error('Failed to find an app to select');
|
|
212
|
-
}
|
|
213
|
+
});
|
|
213
214
|
}
|
|
214
215
|
catch (ign) {
|
|
215
216
|
logger_1.default.errorAndThrow(`Could not connect to a valid app after ${maxTries} tries.`);
|
|
@@ -257,7 +258,7 @@ async function selectPage(appIdKey, pageIdKey, skipReadyCheck = false) {
|
|
|
257
258
|
await this.rpcClient.selectPage(this.appIdKey, pageIdKey);
|
|
258
259
|
// make sure everything is ready to go
|
|
259
260
|
if (!skipReadyCheck && !await this.checkPageIsReady()) {
|
|
260
|
-
await this.
|
|
261
|
+
await this.waitForDom();
|
|
261
262
|
}
|
|
262
263
|
logger_1.default.debug(`Selected page after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
263
264
|
}
|
|
@@ -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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"}
|
|
@@ -1,41 +1,16 @@
|
|
|
1
1
|
declare namespace _default {
|
|
2
2
|
export { frameDetached };
|
|
3
|
-
export { pageLoad };
|
|
4
3
|
export { cancelPageLoad };
|
|
5
|
-
export { pageUnload };
|
|
6
4
|
export { waitForDom };
|
|
7
5
|
export { checkPageIsReady };
|
|
8
6
|
export { navToUrl };
|
|
9
|
-
export { waitForFrameNavigated };
|
|
10
7
|
}
|
|
11
8
|
export default _default;
|
|
12
|
-
export type TPageLoadVerifyHook = (() => Promise<any> | void) | undefined;
|
|
13
|
-
/**
|
|
14
|
-
* @typedef {(() => Promise<any>|void)|undefined} TPageLoadVerifyHook
|
|
15
|
-
*/
|
|
16
9
|
/**
|
|
17
10
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
18
11
|
* @returns {void}
|
|
19
12
|
*/
|
|
20
13
|
declare function frameDetached(this: import("../remote-debugger").default): void;
|
|
21
|
-
/**
|
|
22
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
23
|
-
* @param {timing.Timer?} startPageLoadTimer
|
|
24
|
-
* @param {TPageLoadVerifyHook} [pageLoadVerifyHook]
|
|
25
|
-
* @returns {Promise<void>}
|
|
26
|
-
*/
|
|
27
|
-
declare function pageLoad(this: import("../remote-debugger").default, startPageLoadTimer: timing.Timer | null, pageLoadVerifyHook?: TPageLoadVerifyHook): Promise<void>;
|
|
28
|
-
declare class pageLoad {
|
|
29
|
-
/**
|
|
30
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
31
|
-
* @param {timing.Timer?} startPageLoadTimer
|
|
32
|
-
* @param {TPageLoadVerifyHook} [pageLoadVerifyHook]
|
|
33
|
-
* @returns {Promise<void>}
|
|
34
|
-
*/
|
|
35
|
-
constructor(this: import("../remote-debugger").default, startPageLoadTimer: timing.Timer | null, pageLoadVerifyHook?: TPageLoadVerifyHook);
|
|
36
|
-
pageLoading: boolean;
|
|
37
|
-
pageLoadDelay: B<any>;
|
|
38
|
-
}
|
|
39
14
|
/**
|
|
40
15
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
41
16
|
* @returns {void}
|
|
@@ -44,18 +19,22 @@ declare function cancelPageLoad(this: import("../remote-debugger").default): voi
|
|
|
44
19
|
declare class cancelPageLoad {
|
|
45
20
|
pageLoading: boolean;
|
|
46
21
|
}
|
|
47
|
-
/**
|
|
48
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
49
|
-
* @returns {Promise<void>}
|
|
50
|
-
*/
|
|
51
|
-
declare function pageUnload(this: import("../remote-debugger").default): Promise<void>;
|
|
52
22
|
/**
|
|
53
23
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
54
24
|
* @param {timing.Timer|null|undefined} startPageLoadTimer
|
|
55
|
-
* @param {TPageLoadVerifyHook} [pageLoadVerifyHook]
|
|
56
25
|
* @returns {Promise<void>}
|
|
57
26
|
*/
|
|
58
|
-
declare function waitForDom(this: import("../remote-debugger").default, startPageLoadTimer: timing.Timer | null | undefined
|
|
27
|
+
declare function waitForDom(this: import("../remote-debugger").default, startPageLoadTimer: timing.Timer | null | undefined): Promise<void>;
|
|
28
|
+
declare class waitForDom {
|
|
29
|
+
/**
|
|
30
|
+
* @this {import('../remote-debugger').RemoteDebugger}
|
|
31
|
+
* @param {timing.Timer|null|undefined} startPageLoadTimer
|
|
32
|
+
* @returns {Promise<void>}
|
|
33
|
+
*/
|
|
34
|
+
constructor(this: import("../remote-debugger").default, startPageLoadTimer: timing.Timer | null | undefined);
|
|
35
|
+
pageLoading: boolean;
|
|
36
|
+
pageLoadDelay: B<void>;
|
|
37
|
+
}
|
|
59
38
|
/**
|
|
60
39
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
61
40
|
* @returns {Promise<boolean>}
|
|
@@ -64,28 +43,19 @@ declare function checkPageIsReady(this: import("../remote-debugger").default): P
|
|
|
64
43
|
/**
|
|
65
44
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
66
45
|
* @param {string} url
|
|
67
|
-
* @param {TPageLoadVerifyHook} [pageLoadVerifyHook]
|
|
68
46
|
* @returns {Promise<void>}
|
|
69
47
|
*/
|
|
70
|
-
declare function navToUrl(this: import("../remote-debugger").default, url: string
|
|
48
|
+
declare function navToUrl(this: import("../remote-debugger").default, url: string): Promise<void>;
|
|
71
49
|
declare class navToUrl {
|
|
72
50
|
/**
|
|
73
51
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
74
52
|
* @param {string} url
|
|
75
|
-
* @param {TPageLoadVerifyHook} [pageLoadVerifyHook]
|
|
76
53
|
* @returns {Promise<void>}
|
|
77
54
|
*/
|
|
78
|
-
constructor(this: import("../remote-debugger").default, url: string
|
|
55
|
+
constructor(this: import("../remote-debugger").default, url: string);
|
|
79
56
|
_navigatingToPage: boolean;
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
83
|
-
* @returns {Promise<any>}
|
|
84
|
-
*/
|
|
85
|
-
declare function waitForFrameNavigated(this: import("../remote-debugger").default): Promise<any>;
|
|
86
|
-
declare class waitForFrameNavigated {
|
|
87
|
-
allowNavigationWithoutReload: boolean;
|
|
88
|
-
navigationDelay: B<any>;
|
|
57
|
+
pageLoadDelay: B<void>;
|
|
58
|
+
pageLoading: boolean;
|
|
89
59
|
}
|
|
90
60
|
import { timing } from '@appium/support';
|
|
91
61
|
import B from 'bluebird';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":";;;;;;;;AAWA;;;GAGG;AACH,4EAFa,IAAI,CAIhB;AAED;;;GAGG;AACH,6EAFa,IAAI,CAQhB;;IAJC,qBAAwB;;AAM1B;;;;GAIG;AACH,4FAHW,OAAO,KAAK,GAAC,IAAI,GAAC,SAAS,GACzB,QAAQ,IAAI,CAAC,CAgEzB;;IAnED;;;;OAIG;IACH,4EAHW,OAAO,KAAK,GAAC,IAAI,GAAC,SAAS,EAiErC;IArDC,qBAAuB;IACvB,uBAA8D;;AAsDhE;;;GAGG;AACH,+EAFa,QAAQ,OAAO,CAAC,CAiB5B;AAED;;;;GAIG;AACH,2EAHW,MAAM,GACJ,QAAQ,IAAI,CAAC,CA6FzB;;IAhGD;;;;OAIG;IACH,6DAHW,MAAM,EA8FhB;IArFC,2BAA6B;IAO7B,uBAA8D;IAC9D,qBAAuB;;uBAzII,iBAAiB;cAEhC,UAAU"}
|
|
@@ -9,9 +9,9 @@ const events_1 = __importDefault(require("./events"));
|
|
|
9
9
|
const support_1 = require("@appium/support");
|
|
10
10
|
const lodash_1 = __importDefault(require("lodash"));
|
|
11
11
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
const DEFAULT_PAGE_READINESS_TIMEOUT_MS = 20 * 1000;
|
|
13
|
+
const PAGE_READINESS_CHECK_INTERVAL_MS = 50;
|
|
14
|
+
const CONSOLE_ENABLEMENT_TIMEOUT_MS = 1000;
|
|
15
15
|
/**
|
|
16
16
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
17
17
|
* @returns {void}
|
|
@@ -21,99 +21,90 @@ function frameDetached() {
|
|
|
21
21
|
}
|
|
22
22
|
/**
|
|
23
23
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
24
|
-
* @
|
|
25
|
-
|
|
24
|
+
* @returns {void}
|
|
25
|
+
*/
|
|
26
|
+
function cancelPageLoad() {
|
|
27
|
+
logger_1.default.debug('Unregistering from page readiness notifications');
|
|
28
|
+
this.pageLoading = false;
|
|
29
|
+
if (this.pageLoadDelay) {
|
|
30
|
+
this.pageLoadDelay.cancel();
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* @this {import('../remote-debugger').RemoteDebugger}
|
|
35
|
+
* @param {timing.Timer|null|undefined} startPageLoadTimer
|
|
26
36
|
* @returns {Promise<void>}
|
|
27
37
|
*/
|
|
28
|
-
async function
|
|
29
|
-
|
|
38
|
+
async function waitForDom(startPageLoadTimer) {
|
|
39
|
+
logger_1.default.debug('Waiting for page readiness');
|
|
40
|
+
const readinessTimeoutMs = this.pageLoadMs || DEFAULT_PAGE_READINESS_TIMEOUT_MS;
|
|
30
41
|
if (!lodash_1.default.isFunction(startPageLoadTimer?.getDuration)) {
|
|
31
42
|
logger_1.default.debug(`Page load timer not a timer. Creating new timer`);
|
|
32
43
|
startPageLoadTimer = new support_1.timing.Timer().start();
|
|
33
44
|
}
|
|
34
|
-
|
|
45
|
+
let isPageLoading = true;
|
|
35
46
|
this.pageLoading = true;
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
47
|
+
this.pageLoadDelay = support_1.util.cancellableDelay(readinessTimeoutMs);
|
|
48
|
+
/** @type {B<void>} */
|
|
49
|
+
const pageReadinessPromise = bluebird_1.default.resolve((async () => {
|
|
50
|
+
let retry = 0;
|
|
51
|
+
while (isPageLoading) {
|
|
52
|
+
// if we are ready, or we've spend too much time on this
|
|
53
|
+
// @ts-ignore startPageLoadTimer is defined here
|
|
54
|
+
const elapsedMs = startPageLoadTimer.getDuration().asMilliSeconds;
|
|
55
|
+
// exponential retry
|
|
56
|
+
const intervalMs = Math.min(PAGE_READINESS_CHECK_INTERVAL_MS * Math.pow(2, retry), readinessTimeoutMs - elapsedMs);
|
|
57
|
+
await bluebird_1.default.delay(intervalMs);
|
|
58
|
+
// we can get this called in the middle of trying to find a new app
|
|
59
|
+
if (!this.appIdKey) {
|
|
60
|
+
logger_1.default.debug('Not connected to an application. Ignoring page readiess check');
|
|
45
61
|
return;
|
|
46
62
|
}
|
|
63
|
+
if (!isPageLoading) {
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
if (await this.checkPageIsReady()) {
|
|
67
|
+
if (isPageLoading) {
|
|
68
|
+
logger_1.default.debug(`Page is ready in ${elapsedMs}ms`);
|
|
69
|
+
isPageLoading = false;
|
|
70
|
+
}
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
if (elapsedMs > readinessTimeoutMs) {
|
|
74
|
+
logger_1.default.info(`Timed out after ${readinessTimeoutMs}ms of waiting for the page readiness. Continuing anyway`);
|
|
75
|
+
isPageLoading = false;
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
retry++;
|
|
47
79
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
if (lodash_1.default.isFunction(pageLoadVerifyHook)) {
|
|
54
|
-
await pageLoadVerifyHook();
|
|
55
|
-
}
|
|
56
|
-
// if we are ready, or we've spend too much time on this
|
|
57
|
-
// @ts-ignore startPageLoadTimer is defined here
|
|
58
|
-
const elapsedMs = startPageLoadTimer.getDuration().asMilliSeconds;
|
|
59
|
-
if (await this.checkPageIsReady() || (this.pageLoadMs > 0 && elapsedMs > this.pageLoadMs)) {
|
|
60
|
-
logger_1.default.debug('Page is ready');
|
|
61
|
-
this.pageLoading = false;
|
|
62
|
-
}
|
|
63
|
-
else {
|
|
64
|
-
logger_1.default.debug('Page was not ready, retrying');
|
|
65
|
-
await verify();
|
|
80
|
+
})());
|
|
81
|
+
/** @type {B<void>} */
|
|
82
|
+
const cancellationPromise = bluebird_1.default.resolve((async () => {
|
|
83
|
+
try {
|
|
84
|
+
await this.pageLoadDelay;
|
|
66
85
|
}
|
|
67
|
-
|
|
86
|
+
catch (ign) { }
|
|
87
|
+
})());
|
|
68
88
|
try {
|
|
69
|
-
await
|
|
89
|
+
await bluebird_1.default.any([cancellationPromise, pageReadinessPromise]);
|
|
70
90
|
}
|
|
71
91
|
finally {
|
|
72
|
-
|
|
73
|
-
logger_1.default.debug(`Page load completed in ${startPageLoadTimer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
92
|
+
isPageLoading = false;
|
|
74
93
|
this.pageLoading = false;
|
|
94
|
+
this.pageLoadDelay = bluebird_1.default.resolve();
|
|
75
95
|
}
|
|
76
96
|
}
|
|
77
|
-
/**
|
|
78
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
79
|
-
* @returns {void}
|
|
80
|
-
*/
|
|
81
|
-
function cancelPageLoad() {
|
|
82
|
-
logger_1.default.debug('Unregistering from page readiness notifications');
|
|
83
|
-
this.pageLoading = false;
|
|
84
|
-
if (this.pageLoadDelay) {
|
|
85
|
-
this.pageLoadDelay.cancel();
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
/**
|
|
89
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
90
|
-
* @returns {Promise<void>}
|
|
91
|
-
*/
|
|
92
|
-
async function pageUnload() {
|
|
93
|
-
logger_1.default.debug('Page unloading');
|
|
94
|
-
await this.waitForDom();
|
|
95
|
-
}
|
|
96
|
-
/**
|
|
97
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
98
|
-
* @param {timing.Timer|null|undefined} startPageLoadTimer
|
|
99
|
-
* @param {TPageLoadVerifyHook} [pageLoadVerifyHook]
|
|
100
|
-
* @returns {Promise<void>}
|
|
101
|
-
*/
|
|
102
|
-
async function waitForDom(startPageLoadTimer, pageLoadVerifyHook) {
|
|
103
|
-
logger_1.default.debug('Waiting for dom...');
|
|
104
|
-
await this.pageLoad(startPageLoadTimer, pageLoadVerifyHook);
|
|
105
|
-
}
|
|
106
97
|
/**
|
|
107
98
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
108
99
|
* @returns {Promise<boolean>}
|
|
109
100
|
*/
|
|
110
101
|
async function checkPageIsReady() {
|
|
111
102
|
(0, utils_1.checkParams)({ appIdKey: this.appIdKey });
|
|
112
|
-
logger_1.default.debug('Checking document readyState');
|
|
113
103
|
const readyCmd = 'document.readyState;';
|
|
114
|
-
let readyState = 'loading';
|
|
115
104
|
try {
|
|
116
|
-
readyState = await bluebird_1.default.resolve(this.execute(readyCmd, true)).timeout(this.pageReadyTimeout);
|
|
105
|
+
const readyState = await bluebird_1.default.resolve(this.execute(readyCmd, true)).timeout(this.pageReadyTimeout);
|
|
106
|
+
logger_1.default.debug(`Document readyState is '${readyState}'`);
|
|
107
|
+
return readyState === 'complete';
|
|
117
108
|
}
|
|
118
109
|
catch (err) {
|
|
119
110
|
if (!(err instanceof bluebird_1.default.TimeoutError)) {
|
|
@@ -122,100 +113,97 @@ async function checkPageIsReady() {
|
|
|
122
113
|
logger_1.default.debug(`Page readiness check timed out after ${this.pageReadyTimeout}ms`);
|
|
123
114
|
return false;
|
|
124
115
|
}
|
|
125
|
-
logger_1.default.debug(`Document readyState is '${readyState}'`);
|
|
126
|
-
return readyState === 'complete';
|
|
127
116
|
}
|
|
128
117
|
/**
|
|
129
118
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
130
119
|
* @param {string} url
|
|
131
|
-
* @param {TPageLoadVerifyHook} [pageLoadVerifyHook]
|
|
132
120
|
* @returns {Promise<void>}
|
|
133
121
|
*/
|
|
134
|
-
async function navToUrl(url
|
|
122
|
+
async function navToUrl(url) {
|
|
135
123
|
(0, utils_1.checkParams)({ appIdKey: this.appIdKey, pageIdKey: this.pageIdKey });
|
|
136
124
|
if (!this.rpcClient) {
|
|
137
125
|
throw new Error('rpcClient is undefined. Is the debugger connected?');
|
|
138
126
|
}
|
|
139
127
|
this._navigatingToPage = true;
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
128
|
+
logger_1.default.debug(`Navigating to new URL: '${url}'`);
|
|
129
|
+
const readinessTimeoutMs = this.pageLoadMs || DEFAULT_PAGE_READINESS_TIMEOUT_MS;
|
|
130
|
+
/** @type {(() => void)|undefined} */
|
|
131
|
+
let onPageLoaded;
|
|
132
|
+
/** @type {NodeJS.Timeout|undefined|null} */
|
|
133
|
+
let onPageLoadedTimeout;
|
|
134
|
+
this.pageLoadDelay = support_1.util.cancellableDelay(readinessTimeoutMs);
|
|
135
|
+
this.pageLoading = true;
|
|
136
|
+
let isPageLoading = true;
|
|
137
|
+
const start = new support_1.timing.Timer().start();
|
|
138
|
+
/** @type {B<void>} */
|
|
139
|
+
const pageReadinessPromise = new bluebird_1.default((resolve) => {
|
|
140
|
+
onPageLoadedTimeout = setTimeout(() => {
|
|
141
|
+
if (isPageLoading) {
|
|
142
|
+
isPageLoading = false;
|
|
143
|
+
logger_1.default.info(`Timed out after ${start.getDuration().asMilliSeconds.toFixed(0)}ms of waiting ` +
|
|
144
|
+
`for the ${url} page readiness. Continuing anyway`);
|
|
145
|
+
}
|
|
146
|
+
return resolve();
|
|
147
|
+
}, readinessTimeoutMs);
|
|
148
|
+
onPageLoaded = () => {
|
|
149
|
+
if (isPageLoading) {
|
|
150
|
+
isPageLoading = false;
|
|
151
|
+
logger_1.default.debug(`The page ${url} is ready in ${start.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
152
|
+
}
|
|
153
|
+
if (onPageLoadedTimeout) {
|
|
154
|
+
clearTimeout(onPageLoadedTimeout);
|
|
155
|
+
onPageLoadedTimeout = null;
|
|
156
|
+
}
|
|
157
|
+
return resolve();
|
|
158
|
+
};
|
|
159
|
+
// https://chromedevtools.github.io/devtools-protocol/tot/Page/#event-loadEventFired
|
|
160
|
+
this.rpcClient?.once('Page.loadEventFired', onPageLoaded);
|
|
161
|
+
this.rpcClient?.send('Page.navigate', {
|
|
145
162
|
url,
|
|
146
163
|
appIdKey: this.appIdKey,
|
|
147
164
|
pageIdKey: this.pageIdKey,
|
|
148
165
|
});
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
166
|
+
});
|
|
167
|
+
/** @type {B<void>} */
|
|
168
|
+
const cancellationPromise = bluebird_1.default.resolve((async () => {
|
|
169
|
+
try {
|
|
170
|
+
await this.pageLoadDelay;
|
|
152
171
|
}
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
// get notified when navigating to a local page
|
|
158
|
-
await this.rpcClient.send('Console.enable', {
|
|
159
|
-
appIdKey: this.appIdKey,
|
|
160
|
-
pageIdKey: this.pageIdKey,
|
|
161
|
-
});
|
|
172
|
+
catch (ign) { }
|
|
173
|
+
})());
|
|
174
|
+
try {
|
|
175
|
+
await bluebird_1.default.any([cancellationPromise, pageReadinessPromise]);
|
|
162
176
|
}
|
|
163
177
|
finally {
|
|
178
|
+
this.pageLoading = false;
|
|
179
|
+
isPageLoading = false;
|
|
164
180
|
this._navigatingToPage = false;
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
* @returns {Promise<any>}
|
|
170
|
-
*/
|
|
171
|
-
async function waitForFrameNavigated() {
|
|
172
|
-
let navEventListener;
|
|
173
|
-
return await new bluebird_1.default(async (resolve) => {
|
|
174
|
-
logger_1.default.debug('Waiting for frame navigated message...');
|
|
175
|
-
if (!this.rpcClient) {
|
|
176
|
-
throw new Error('rpcClient is undefined. Is the debugger connected?');
|
|
181
|
+
this.pageLoadDelay = bluebird_1.default.resolve();
|
|
182
|
+
if (onPageLoadedTimeout && pageReadinessPromise.isFulfilled()) {
|
|
183
|
+
clearTimeout(onPageLoadedTimeout);
|
|
184
|
+
onPageLoadedTimeout = null;
|
|
177
185
|
}
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
};
|
|
195
|
-
this.rpcClient.once('Page.frameNavigated', navEventListener);
|
|
196
|
-
// timeout, in case remote debugger doesn't respond,
|
|
197
|
-
// or takes a long time
|
|
198
|
-
if (!this.useNewSafari || this.pageLoadMs >= 0) {
|
|
199
|
-
// use pageLoadMs, or a small amount of time
|
|
200
|
-
const timeout = this.useNewSafari ? this.pageLoadMs : 500;
|
|
201
|
-
this.navigationDelay = support_1.util.cancellableDelay(timeout);
|
|
202
|
-
try {
|
|
203
|
-
await this.navigationDelay;
|
|
204
|
-
navEventListener(null, `${timeout}ms timeout`);
|
|
205
|
-
}
|
|
206
|
-
catch (err) {
|
|
207
|
-
// nothing to do: we only get here if the remote debugger
|
|
208
|
-
// already notified of frame navigation, and the delay
|
|
209
|
-
// was cancelled
|
|
210
|
-
}
|
|
186
|
+
if (onPageLoaded) {
|
|
187
|
+
this.rpcClient.off('Page.loadEventFired', onPageLoaded);
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
// enable console logging, so we get the events (otherwise we only
|
|
191
|
+
// get notified when navigating to a local page
|
|
192
|
+
try {
|
|
193
|
+
await bluebird_1.default.resolve(this.rpcClient.send('Console.enable', {
|
|
194
|
+
appIdKey: this.appIdKey,
|
|
195
|
+
pageIdKey: this.pageIdKey,
|
|
196
|
+
})).timeout(CONSOLE_ENABLEMENT_TIMEOUT_MS);
|
|
197
|
+
}
|
|
198
|
+
catch (err) {
|
|
199
|
+
if (err instanceof bluebird_1.default.TimeoutError) {
|
|
200
|
+
logger_1.default.warn(`Could not enable console events on the page '${this.pageIdKey}' (app '${this.appIdKey}') ` +
|
|
201
|
+
`within ${CONSOLE_ENABLEMENT_TIMEOUT_MS}ms. This might be an Inspector bug.`);
|
|
211
202
|
}
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
this.rpcClient?.off('Page.frameNavigated', navEventListener);
|
|
203
|
+
else {
|
|
204
|
+
throw err;
|
|
215
205
|
}
|
|
216
|
-
}
|
|
206
|
+
}
|
|
217
207
|
}
|
|
218
|
-
exports.default = {
|
|
219
|
-
frameDetached, pageLoad, cancelPageLoad, pageUnload, waitForDom, checkPageIsReady, navToUrl, waitForFrameNavigated
|
|
220
|
-
};
|
|
208
|
+
exports.default = { frameDetached, cancelPageLoad, waitForDom, checkPageIsReady, navToUrl };
|
|
221
209
|
//# sourceMappingURL=navigate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":";;;;;AAAA,uDAA4B;AAC5B,oCAAuC;AACvC,sDAA8B;AAC9B,6CAA+C;AAC/C,oDAAuB;AACvB,wDAAyB;
|
|
1
|
+
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"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"}
|
|
@@ -31,22 +31,16 @@ export class RemoteDebugger extends EventEmitter {
|
|
|
31
31
|
searchForApp: (currentUrl: string | null, maxTries: number, ignoreAboutBlankUrl: boolean) => Promise<Record<string, any>>;
|
|
32
32
|
/** @type {(appsDict:Record<string, any>, currentUrl: string?, ignoreAboutBlankUrl: boolean) => import('./mixins/connect').AppPages?} */
|
|
33
33
|
searchForPage: (appsDict: Record<string, any>, currentUrl: string | null, ignoreAboutBlankUrl: boolean) => import('./mixins/connect').AppPages | null;
|
|
34
|
-
/** @type {() => Promise<void>} */
|
|
35
|
-
pageUnload: () => Promise<void>;
|
|
36
34
|
/** @type {() => Promise<boolean>} */
|
|
37
35
|
checkPageIsReady: () => Promise<boolean>;
|
|
38
36
|
/** @type {(dict: Record<string, any>) => void} */
|
|
39
37
|
updateAppsWithDict: (dict: Record<string, any>) => void;
|
|
40
|
-
/** @type {(startPageLoadTimer?: import('@appium/support').timing.Timer
|
|
41
|
-
waitForDom: (startPageLoadTimer?: import('@appium/support').timing.Timer
|
|
42
|
-
/** @type {(startPageLoadTimer?: import('@appium/support').timing.Timer?, pageLoadVerifyHook?: import('./mixins/navigate').TPageLoadVerifyHook) => Promise<void>} */
|
|
43
|
-
pageLoad: (startPageLoadTimer?: import('@appium/support').timing.Timer | null, pageLoadVerifyHook?: import('./mixins/navigate').TPageLoadVerifyHook) => Promise<void>;
|
|
38
|
+
/** @type {(startPageLoadTimer?: import('@appium/support').timing.Timer) => Promise<void>} */
|
|
39
|
+
waitForDom: (startPageLoadTimer?: import('@appium/support').timing.Timer) => Promise<void>;
|
|
44
40
|
/** @type {(command: string, override?: boolean) => Promise<any>} */
|
|
45
41
|
execute: (command: string, override?: boolean) => Promise<any>;
|
|
46
|
-
/** @type {() => Promise<any>} */
|
|
47
|
-
|
|
48
|
-
/** @type {(atom: string, args?: any[], frames?: string[]) => Promise<string>} */
|
|
49
|
-
executeAtom: (atom: string, args?: any[], frames?: string[]) => Promise<string>;
|
|
42
|
+
/** @type {(command: string, args?: any[], frames?: string[]) => Promise<any>} */
|
|
43
|
+
executeAtom: (command: string, args?: any[], frames?: string[]) => Promise<any>;
|
|
50
44
|
/** @type {(err: Error?, appIdKey: string, pageDict: Record<string, any>) => Promise<void>} */
|
|
51
45
|
onPageChange: (err: Error | null, appIdKey: string, pageDict: Record<string, any>) => Promise<void>;
|
|
52
46
|
/** @type {(err: Error?, apps: Record<string, any>) => Promise<void>} */
|