appium-remote-debugger 10.2.2 → 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 +13 -0
- package/build/lib/mixins/connect.js +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 +1 -1
- 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,16 @@
|
|
|
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
|
+
|
|
1
14
|
## [10.2.2](https://github.com/appium/appium-remote-debugger/compare/v10.2.1...v10.2.2) (2024-02-06)
|
|
2
15
|
|
|
3
16
|
|
|
@@ -258,7 +258,7 @@ async function selectPage(appIdKey, pageIdKey, skipReadyCheck = false) {
|
|
|
258
258
|
await this.rpcClient.selectPage(this.appIdKey, pageIdKey);
|
|
259
259
|
// make sure everything is ready to go
|
|
260
260
|
if (!skipReadyCheck && !await this.checkPageIsReady()) {
|
|
261
|
-
await this.
|
|
261
|
+
await this.waitForDom();
|
|
262
262
|
}
|
|
263
263
|
logger_1.default.debug(`Selected page after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
264
264
|
}
|
|
@@ -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>} */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-debugger.d.ts","sourceRoot":"","sources":["../../lib/remote-debugger.js"],"names":[],"mappings":";AAqBA;IAsBE,qBAAqB;IACrB,0BADW,MAAM,CACQ;IACzB,qBAAqB;IACrB,yBADW,MAAM,CACO;
|
|
1
|
+
{"version":3,"file":"remote-debugger.d.ts","sourceRoot":"","sources":["../../lib/remote-debugger.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-debugger.js","sourceRoot":"","sources":["../../lib/remote-debugger.js"],"names":[],"mappings":";;;;;;AAAA,mCAAsC;AACtC,sDAA2B;AAC3B,+BAA2C;AAC3C,mCAAqD;AACrD,qCAA0C;AAC1C,oDAAuB;AACvB,wDAAyB;AACzB,gDAAwB;AACxB,4DAAmC;AAEnC,MAAM,oBAAoB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"remote-debugger.js","sourceRoot":"","sources":["../../lib/remote-debugger.js"],"names":[],"mappings":";;;;;;AAAA,mCAAsC;AACtC,sDAA2B;AAC3B,+BAA2C;AAC3C,mCAAqD;AACrD,qCAA0C;AAC1C,oDAAuB;AACvB,wDAAyB;AACzB,gDAAwB;AACxB,4DAAmC;AAEnC,MAAM,oBAAoB,GAAG,KAAK,CAAC;AAiYjB,oDAAoB;AAhYtC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;AAElD,qFAAqF;AACrF,MAAM,uBAAuB,GAAG,IAAI,CAAC;AA6XG,0DAAuB;AA3X/D,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC,MAAM,uBAAuB,GAAG,IAAI,CAAC;AAGrC,MAAM,cAAe,SAAQ,qBAAY;IAiEvC;;;;;;;;;;;;;;;OAeG;IACH,YAAa,IAAI,GAAG,EAAE;QACpB,KAAK,EAAE,CAAC;QAER,8DAA8D;QAC9D,gBAAG,CAAC,IAAI,CAAC,2BAA2B,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,IAAA,qBAAa,GAAE,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAEtG,MAAM,EACJ,QAAQ,EACR,mBAAmB,GAAG,EAAE,EACxB,eAAe,EACf,QAAQ,GAAG,IAAI,EACf,aAAa,GAAG,KAAK,EACrB,YAAY,GAAG,KAAK,EACpB,UAAU,EACV,IAAI,EACJ,IAAI,GAAG,oBAAoB,EAC3B,UAAU,EACV,gBAAgB,GAAG,kBAAkB,EACrC,gBAAgB,EAChB,uBAAuB,GAAG,KAAK,EAC/B,eAAe,GAAG,KAAK,EACvB,mBAAmB,GAAG,KAAK,EAC3B,0BAA0B,GAAG,KAAK,EAClC,0BAA0B,EAC1B,eAAe,EACf,sBAAsB,GACvB,GAAG,IAAI,CAAC;QAET,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,gBAAG,CAAC,KAAK,CAAC,oBAAoB,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAEnD,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;QAEvD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QAEzC,IAAI,CAAC,mBAAmB,GAAG,gBAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC;QACpG,IAAI,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;QAC7D,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QAEvC,IAAI,gBAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC,EAAE;YAC3C,IAAI,CAAC,0BAA0B,GAAG,0BAA0B,CAAC;SAC9D;QAED,IAAI,CAAC,sBAAsB,GAAG,sBAAsB,CAAC;QAErD,IAAI,CAAC,KAAK,GAAG,IAAI,oBAAS,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK;QACH,6BAA6B;QAC7B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,4BAA4B,GAAG,KAAK,CAAC;QAE1C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;IAClC,CAAC;IAED,QAAQ;QACN,gBAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAEnC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QAEzB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QAEtB,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QAC1D,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;IAC3D,CAAC;IAED,aAAa;QACX,IAAI,CAAC,SAAS,GAAG,IAAI,wBAAkB,CAAC;YACtC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,YAAY,EAAE,IAAI,CAAC,gBAAgB;YACnC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;YAC7C,0BAA0B,EAAE,IAAI,CAAC,0BAA0B;YAC3D,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;YACnD,0BAA0B,EAAE,IAAI,CAAC,0BAA0B;SAC5D,CAAC,CAAC;IACL,CAAC;IAED,IAAI,WAAW;QACb,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACpF;QAED,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,EAAE;YAC7C,QAAQ,EAAE,gBAAgB;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAE,EAAE;QACrB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACpF;QAED,gBAAG,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC;QAChD,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,EAAE;YACjD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACpF;QAED,gBAAG,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAC7C,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE;YACzC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,sBAAsB,CAAE,SAAS,EAAE,QAAQ;QACzC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACpF;QAED,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACpF,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrD,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,yBAAyB,CAAE,SAAS;QAClC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACpF;QAED,KAAK,MAAM,QAAQ,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE;YACpE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;SACzC;IACH,CAAC;IAED,YAAY,CAAE,QAAQ;QACpB,gBAAG,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;QACvD,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;QAC9D,IAAI,CAAC,sBAAsB,CAAC,mCAAmC,EAAE,QAAQ,CAAC,CAAC;IAC7E,CAAC;IAED,WAAW;QACT,gBAAG,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;QACvD,IAAI,CAAC,yBAAyB,CAAC,sBAAsB,CAAC,CAAC;QACvD,IAAI,CAAC,yBAAyB,CAAC,mCAAmC,CAAC,CAAC;IACtE,CAAC;IAED,YAAY,CAAE,QAAQ;QACpB,gBAAG,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;QACnD,IAAI,CAAC,sBAAsB,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;IAED,WAAW;QACT,gBAAG,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;QACnD,IAAI,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,4BAA4B,CAAE,KAAK;QACrC,IAAI,CAAC,6BAA6B,GAAG,KAAK,CAAC;IAC7C,CAAC;IAED,IAAI,4BAA4B;QAC9B,OAAO,IAAI,CAAC,6BAA6B,CAAC;IAC5C,CAAC;IAED,mDAAmD;IACnD,KAAK,CAAC,iBAAiB,CAAE,KAAK;QAC5B,gBAAG,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACpF;QAED,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,wBAAwB,EAAE;YACzD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU;QACd,gBAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACpF;QAED,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAClD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAE,MAAM;QACrB,gBAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACpF;QAED,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,EAAE;YACjD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAAE,UAAU,EAAE,GAAG;QACjC,gBAAG,CAAC,KAAK,CAAC,oBAAoB,UAAU,SAAS,GAAG,GAAG,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACpF;QAED,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,EAAE;YACpD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,UAAU;YACV,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,cAAc,CAAE,SAAS,GAAG,uBAAuB;QACvD,gBAAG,CAAC,KAAK,CAAC,2BAA2B,SAAS,YAAY,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;SACpF;QAED,IAAI;YACF,IAAA,mBAAW,EAAC,EAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAC,CAAC,CAAC;SACnE;QAAC,OAAO,GAAG,EAAE;YACZ,gBAAG,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;YACpD,OAAO;SACR;QAED,MAAM,kBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE;YAC7C,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;aACrB,IAAI,CAAC,SAAS,SAAS;YACtB,gBAAG,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,OAAO,CAAE,GAAG;YAC5B,IAAI,GAAG,YAAY,kBAAC,CAAC,YAAY,EAAE;gBACjC,gBAAG,CAAC,KAAK,CAAC,sCAAsC,SAAS,IAAI,CAAC,CAAC;aAChE;iBAAM;gBACL,gBAAG,CAAC,KAAK,CAAC,8BAA8B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;aACxD;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,cAAc,CAAE,EAAE;QACtB,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;IACjC,CAAC;CACF;AAYC,wCAAc;AAVhB,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,eAAM,CAAC,EAAE;IAC1C,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;CACrC;AAED,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,eAAM,CAAC,EAAE;IAC7C,cAAc,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;CAC9B;AAED,kBAAe,cAAc,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client-simulator.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-simulator.js"],"names":[],"mappings":";AAQA;IAcI,UAAgB;IAChB,UAAgB;IAChB,kBAAgC;IAEhC,0BAAkB;IAClB,gBAA4B;IAG9B,wBA6EC;IA/BC,aAOE;IAqCJ,
|
|
1
|
+
{"version":3,"file":"rpc-client-simulator.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-simulator.js"],"names":[],"mappings":";AAQA;IAcI,UAAgB;IAChB,UAAgB;IAChB,kBAAgC;IAEhC,0BAAkB;IAClB,gBAA4B;IAG9B,wBA6EC;IA/BC,aAOE;IAqCJ,oCA4BC;IAED,kCAgBC;CACF;sBAnKqB,cAAc;gBADpB,KAAK"}
|
|
@@ -113,7 +113,9 @@ class RpcClientSimulator extends rpc_client_1.default {
|
|
|
113
113
|
// the connection was refused, so reject the connect promise
|
|
114
114
|
reject(err);
|
|
115
115
|
};
|
|
116
|
-
|
|
116
|
+
if (!this.socket) {
|
|
117
|
+
return reject(new Error('The RPC socket is not defined. Have you called `connect()` before sending a message?'));
|
|
118
|
+
}
|
|
117
119
|
this.socket.on('error', onSocketError);
|
|
118
120
|
this.service.sendMessage(cmd);
|
|
119
121
|
resolve();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client-simulator.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-simulator.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"rpc-client-simulator.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-simulator.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client.js"],"names":[],"mappings":"AA6BA;IAUE,uBAwCC;IAjDD,0CAA0C;IAC1C,gBADW,iBAAiB,GAAC,SAAS,CACvB;IAEf,uCAAuC;IACvC,gBADW,cAAc,GAAC,SAAS,CACpB;IAEf,sBAAsB;IACtB,WADW,OAAO,CACR;IAGR,aAAkB;IAClB,+BAAwD;IAcxD,cAAwB;IAkD1B,8BAEC;IAND,2BAEC;IA7CC,eAA2B;IAC3B,iBAA6B;IAC7B,cAAc;IAEd,UAAgB;IAEhB,yBAA8C;IAC9C,gCAA4D;IAC5D,qBAAsC;IACtC,gCAA4D;IAE5D,4BAAoD;IAEpD,cAAwB;IACxB,qBAAsC;IAEtC,iBAAmB;IAqDrB,4BAsBC;IAED,yBAEC;IAxED,sBAEC;IAED,uBAEC;IAED,kBAEC;IAMD,uCAEC;IAND,oCAEC;IAcD,oCAIC;IAED,sCAIC;IAED,qCAIC;IAIC,oBAAmC;IA0BrC;;;;;;OAMG;IACH,wBALW,MAAM,aACN,MAAM,gCAEJ,QAAQ,IAAI,CAAC,CAwBzB;IAED;;;;;;OAMG;IACH,cALW,MAAM,kFAGJ,QAAQ,GAAG,CAAC,CAgCxB;IAED;;;;;;OAMG;IACH,sBALW,MAAM,SACN,OAAO,MAAM,EAAE,GAAG,CAAC,0CAEjB,QAAQ,GAAG,CAAC,CAuGxB;IAED,yBAEC;IAED,4BAEC;IAGD,yCAEC;IAED,yBAEC;IAED;;;;;;OAMG;IACH,eALW,KAAK,cACL,MAAM,cACN,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CA0BhB;IAED;;;;;;;OAOG;IACH,kBANW,KAAK,cACL,MAAM,eACN,MAAM,eACN,MAAM,GACJ,IAAI,CAahB;IAED;;;;;;OAMG;IACH,kBALW,KAAK,cACL,MAAM,cACN,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,
|
|
1
|
+
{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client.js"],"names":[],"mappings":"AA6BA;IAUE,uBAwCC;IAjDD,0CAA0C;IAC1C,gBADW,iBAAiB,GAAC,SAAS,CACvB;IAEf,uCAAuC;IACvC,gBADW,cAAc,GAAC,SAAS,CACpB;IAEf,sBAAsB;IACtB,WADW,OAAO,CACR;IAGR,aAAkB;IAClB,+BAAwD;IAcxD,cAAwB;IAkD1B,8BAEC;IAND,2BAEC;IA7CC,eAA2B;IAC3B,iBAA6B;IAC7B,cAAc;IAEd,UAAgB;IAEhB,yBAA8C;IAC9C,gCAA4D;IAC5D,qBAAsC;IACtC,gCAA4D;IAE5D,4BAAoD;IAEpD,cAAwB;IACxB,qBAAsC;IAEtC,iBAAmB;IAqDrB,4BAsBC;IAED,yBAEC;IAxED,sBAEC;IAED,uBAEC;IAED,kBAEC;IAMD,uCAEC;IAND,oCAEC;IAcD,oCAIC;IAED,sCAIC;IAED,qCAIC;IAIC,oBAAmC;IA0BrC;;;;;;OAMG;IACH,wBALW,MAAM,aACN,MAAM,gCAEJ,QAAQ,IAAI,CAAC,CAwBzB;IAED;;;;;;OAMG;IACH,cALW,MAAM,kFAGJ,QAAQ,GAAG,CAAC,CAgCxB;IAED;;;;;;OAMG;IACH,sBALW,MAAM,SACN,OAAO,MAAM,EAAE,GAAG,CAAC,0CAEjB,QAAQ,GAAG,CAAC,CAuGxB;IAED,yBAEC;IAED,4BAEC;IAGD,yCAEC;IAED,yBAEC;IAED;;;;;;OAMG;IACH,eALW,KAAK,cACL,MAAM,cACN,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CA0BhB;IAED;;;;;;;OAOG;IACH,kBANW,KAAK,cACL,MAAM,eACN,MAAM,eACN,MAAM,GACJ,IAAI,CAahB;IAED;;;;;;OAMG;IACH,kBALW,KAAK,cACL,MAAM,cACN,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CAuChB;IAED;;;;OAIG;IACH,oBAJW,MAAM,aACN,MAAM,GACJ,GAAG,CAIf;IAED;;;;OAIG;IACH,qBAJW,MAAM,aACN,MAAM,GACJ,QAAQ,IAAI,CAAC,CAoCzB;IAjCC,+BAA+B;IAC/B,wDAAsD;IAkCxD;;;;;OAKG;IACH,yBAJW,MAAM,aACN,MAAM,GACJ,QAAQ,IAAI,CAAC,CAkBzB;IAED;;;;;;;OAOG;IACH,6BAJW,MAAM,aACN,MAAM,GACJ,QAAQ,IAAI,CAAC,CA+DzB;IAED;;;;OAIG;IACH,oBAHW,MAAM,GACJ,QAAQ,CAAC,MAAM,EAAE,OAAO,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAkDlD;IAED;;;;OAIG;IACH,+BAHW,KAAK,kBACL,OAAO,MAAM,EAAE,GAAG,CAAC,QAO7B;IAED,2BAGC;IAED;;;;OAIG;IACH,oBAHW,KAAK,qBACL,OAAO,MAAM,EAAE,GAAG,CAAC,QAK7B;CACF;8BAjqB6B,uBAAuB;2BAL1B,mBAAmB"}
|
|
@@ -368,6 +368,8 @@ class RpcClient {
|
|
|
368
368
|
if (targetId === oldTargetId) {
|
|
369
369
|
logger_1.default.debug(`Found provisional target for app '${app}'. Old target: '${oldTargetId}', new target: '${newTargetId}'. Updating`);
|
|
370
370
|
targets[page] = newTargetId;
|
|
371
|
+
// This is needed to enable the broadcast of page lifecycle events
|
|
372
|
+
this.sendToDevice('Page.enable', { appIdKey: app, pageIdKey: parseInt(page, 10) }, false);
|
|
371
373
|
return;
|
|
372
374
|
}
|
|
373
375
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client.js"],"names":[],"mappings":"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"}
|
package/lib/mixins/connect.js
CHANGED
|
@@ -285,7 +285,7 @@ async function selectPage (appIdKey, pageIdKey, skipReadyCheck = false) {
|
|
|
285
285
|
|
|
286
286
|
// make sure everything is ready to go
|
|
287
287
|
if (!skipReadyCheck && !await this.checkPageIsReady()) {
|
|
288
|
-
await this.
|
|
288
|
+
await this.waitForDom();
|
|
289
289
|
}
|
|
290
290
|
|
|
291
291
|
log.debug(`Selected page after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
package/lib/mixins/navigate.js
CHANGED
|
@@ -5,107 +5,98 @@ import { timing, util } from '@appium/support';
|
|
|
5
5
|
import _ from 'lodash';
|
|
6
6
|
import B from 'bluebird';
|
|
7
7
|
|
|
8
|
+
const DEFAULT_PAGE_READINESS_TIMEOUT_MS = 20 * 1000;
|
|
9
|
+
const PAGE_READINESS_CHECK_INTERVAL_MS = 50;
|
|
10
|
+
const CONSOLE_ENABLEMENT_TIMEOUT_MS = 1000;
|
|
8
11
|
|
|
9
12
|
/**
|
|
10
|
-
* @
|
|
13
|
+
* @this {import('../remote-debugger').RemoteDebugger}
|
|
14
|
+
* @returns {void}
|
|
11
15
|
*/
|
|
16
|
+
function frameDetached () {
|
|
17
|
+
this.emit(events.EVENT_FRAMES_DETACHED);
|
|
18
|
+
}
|
|
12
19
|
|
|
13
20
|
/**
|
|
14
21
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
15
22
|
* @returns {void}
|
|
16
23
|
*/
|
|
17
|
-
function
|
|
18
|
-
|
|
24
|
+
function cancelPageLoad () {
|
|
25
|
+
log.debug('Unregistering from page readiness notifications');
|
|
26
|
+
this.pageLoading = false;
|
|
27
|
+
if (this.pageLoadDelay) {
|
|
28
|
+
this.pageLoadDelay.cancel();
|
|
29
|
+
}
|
|
19
30
|
}
|
|
20
31
|
|
|
21
32
|
/**
|
|
22
33
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
23
|
-
* @param {timing.Timer
|
|
24
|
-
* @param {TPageLoadVerifyHook} [pageLoadVerifyHook]
|
|
34
|
+
* @param {timing.Timer|null|undefined} startPageLoadTimer
|
|
25
35
|
* @returns {Promise<void>}
|
|
26
36
|
*/
|
|
27
|
-
async function
|
|
28
|
-
|
|
37
|
+
async function waitForDom (startPageLoadTimer) {
|
|
38
|
+
log.debug('Waiting for page readiness');
|
|
39
|
+
const readinessTimeoutMs = this.pageLoadMs || DEFAULT_PAGE_READINESS_TIMEOUT_MS;
|
|
29
40
|
if (!_.isFunction(startPageLoadTimer?.getDuration)) {
|
|
30
41
|
log.debug(`Page load timer not a timer. Creating new timer`);
|
|
31
42
|
startPageLoadTimer = new timing.Timer().start();
|
|
32
43
|
}
|
|
33
44
|
|
|
34
|
-
|
|
45
|
+
let isPageLoading = true;
|
|
35
46
|
this.pageLoading = true;
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
47
|
+
this.pageLoadDelay = util.cancellableDelay(readinessTimeoutMs);
|
|
48
|
+
/** @type {B<void>} */
|
|
49
|
+
const pageReadinessPromise = B.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(
|
|
57
|
+
PAGE_READINESS_CHECK_INTERVAL_MS * Math.pow(2, retry),
|
|
58
|
+
readinessTimeoutMs - elapsedMs
|
|
59
|
+
);
|
|
60
|
+
await B.delay(intervalMs);
|
|
61
|
+
// we can get this called in the middle of trying to find a new app
|
|
62
|
+
if (!this.appIdKey) {
|
|
63
|
+
log.debug('Not connected to an application. Ignoring page readiess check');
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
if (!isPageLoading) {
|
|
45
67
|
return;
|
|
46
68
|
}
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
// we can get this called in the middle of trying to find a new app
|
|
50
|
-
if (!this.appIdKey) {
|
|
51
|
-
log.debug('Not connected to an application. Ignoring page load');
|
|
52
|
-
return;
|
|
53
|
-
}
|
|
54
69
|
|
|
55
|
-
|
|
56
|
-
|
|
70
|
+
if (await this.checkPageIsReady()) {
|
|
71
|
+
if (isPageLoading) {
|
|
72
|
+
log.debug(`Page is ready in ${elapsedMs}ms`);
|
|
73
|
+
isPageLoading = false;
|
|
74
|
+
}
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
if (elapsedMs > readinessTimeoutMs) {
|
|
78
|
+
log.info(`Timed out after ${readinessTimeoutMs}ms of waiting for the page readiness. Continuing anyway`);
|
|
79
|
+
isPageLoading = false;
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
retry++;
|
|
57
83
|
}
|
|
84
|
+
})());
|
|
85
|
+
/** @type {B<void>} */
|
|
86
|
+
const cancellationPromise = B.resolve((async () => {
|
|
87
|
+
try {
|
|
88
|
+
await this.pageLoadDelay;
|
|
89
|
+
} catch (ign) {}
|
|
90
|
+
})());
|
|
58
91
|
|
|
59
|
-
// if we are ready, or we've spend too much time on this
|
|
60
|
-
// @ts-ignore startPageLoadTimer is defined here
|
|
61
|
-
const elapsedMs = startPageLoadTimer.getDuration().asMilliSeconds;
|
|
62
|
-
if (await this.checkPageIsReady() || (this.pageLoadMs > 0 && elapsedMs > this.pageLoadMs)) {
|
|
63
|
-
log.debug('Page is ready');
|
|
64
|
-
this.pageLoading = false;
|
|
65
|
-
} else {
|
|
66
|
-
log.debug('Page was not ready, retrying');
|
|
67
|
-
await verify();
|
|
68
|
-
}
|
|
69
|
-
};
|
|
70
92
|
try {
|
|
71
|
-
await
|
|
93
|
+
await B.any([cancellationPromise, pageReadinessPromise]);
|
|
72
94
|
} finally {
|
|
73
|
-
|
|
74
|
-
log.debug(`Page load completed in ${startPageLoadTimer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
95
|
+
isPageLoading = false;
|
|
75
96
|
this.pageLoading = false;
|
|
97
|
+
this.pageLoadDelay = B.resolve();
|
|
76
98
|
}
|
|
77
99
|
}
|
|
78
|
-
/**
|
|
79
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
80
|
-
* @returns {void}
|
|
81
|
-
*/
|
|
82
|
-
function cancelPageLoad () {
|
|
83
|
-
log.debug('Unregistering from page readiness notifications');
|
|
84
|
-
this.pageLoading = false;
|
|
85
|
-
if (this.pageLoadDelay) {
|
|
86
|
-
this.pageLoadDelay.cancel();
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
/**
|
|
91
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
92
|
-
* @returns {Promise<void>}
|
|
93
|
-
*/
|
|
94
|
-
async function pageUnload () {
|
|
95
|
-
log.debug('Page unloading');
|
|
96
|
-
await this.waitForDom();
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
/**
|
|
100
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
101
|
-
* @param {timing.Timer|null|undefined} startPageLoadTimer
|
|
102
|
-
* @param {TPageLoadVerifyHook} [pageLoadVerifyHook]
|
|
103
|
-
* @returns {Promise<void>}
|
|
104
|
-
*/
|
|
105
|
-
async function waitForDom (startPageLoadTimer, pageLoadVerifyHook) {
|
|
106
|
-
log.debug('Waiting for dom...');
|
|
107
|
-
await this.pageLoad(startPageLoadTimer, pageLoadVerifyHook);
|
|
108
|
-
}
|
|
109
100
|
|
|
110
101
|
/**
|
|
111
102
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
@@ -114,11 +105,11 @@ async function waitForDom (startPageLoadTimer, pageLoadVerifyHook) {
|
|
|
114
105
|
async function checkPageIsReady () {
|
|
115
106
|
checkParams({appIdKey: this.appIdKey});
|
|
116
107
|
|
|
117
|
-
log.debug('Checking document readyState');
|
|
118
108
|
const readyCmd = 'document.readyState;';
|
|
119
|
-
let readyState = 'loading';
|
|
120
109
|
try {
|
|
121
|
-
readyState = await B.resolve(this.execute(readyCmd, true)).timeout(this.pageReadyTimeout);
|
|
110
|
+
const readyState = await B.resolve(this.execute(readyCmd, true)).timeout(this.pageReadyTimeout);
|
|
111
|
+
log.debug(`Document readyState is '${readyState}'`);
|
|
112
|
+
return readyState === 'complete';
|
|
122
113
|
} catch (err) {
|
|
123
114
|
if (!(err instanceof B.TimeoutError)) {
|
|
124
115
|
throw err;
|
|
@@ -126,113 +117,104 @@ async function checkPageIsReady () {
|
|
|
126
117
|
log.debug(`Page readiness check timed out after ${this.pageReadyTimeout}ms`);
|
|
127
118
|
return false;
|
|
128
119
|
}
|
|
129
|
-
log.debug(`Document readyState is '${readyState}'`);
|
|
130
|
-
|
|
131
|
-
return readyState === 'complete';
|
|
132
120
|
}
|
|
133
121
|
|
|
134
122
|
/**
|
|
135
123
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
136
124
|
* @param {string} url
|
|
137
|
-
* @param {TPageLoadVerifyHook} [pageLoadVerifyHook]
|
|
138
125
|
* @returns {Promise<void>}
|
|
139
126
|
*/
|
|
140
|
-
async function navToUrl (url
|
|
127
|
+
async function navToUrl (url) {
|
|
141
128
|
checkParams({appIdKey: this.appIdKey, pageIdKey: this.pageIdKey});
|
|
142
|
-
|
|
143
129
|
if (!this.rpcClient) {
|
|
144
130
|
throw new Error('rpcClient is undefined. Is the debugger connected?');
|
|
145
131
|
}
|
|
146
132
|
|
|
147
133
|
this._navigatingToPage = true;
|
|
134
|
+
log.debug(`Navigating to new URL: '${url}'`);
|
|
135
|
+
const readinessTimeoutMs = this.pageLoadMs || DEFAULT_PAGE_READINESS_TIMEOUT_MS;
|
|
136
|
+
/** @type {(() => void)|undefined} */
|
|
137
|
+
let onPageLoaded;
|
|
138
|
+
/** @type {NodeJS.Timeout|undefined|null} */
|
|
139
|
+
let onPageLoadedTimeout;
|
|
140
|
+
this.pageLoadDelay = util.cancellableDelay(readinessTimeoutMs);
|
|
141
|
+
this.pageLoading = true;
|
|
142
|
+
let isPageLoading = true;
|
|
143
|
+
const start = new timing.Timer().start();
|
|
144
|
+
|
|
145
|
+
/** @type {B<void>} */
|
|
146
|
+
const pageReadinessPromise = new B((resolve) => {
|
|
147
|
+
onPageLoadedTimeout = setTimeout(() => {
|
|
148
|
+
if (isPageLoading) {
|
|
149
|
+
isPageLoading = false;
|
|
150
|
+
log.info(
|
|
151
|
+
`Timed out after ${start.getDuration().asMilliSeconds.toFixed(0)}ms of waiting ` +
|
|
152
|
+
`for the ${url} page readiness. Continuing anyway`
|
|
153
|
+
);
|
|
154
|
+
}
|
|
155
|
+
return resolve();
|
|
156
|
+
}, readinessTimeoutMs);
|
|
148
157
|
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
158
|
+
onPageLoaded = () => {
|
|
159
|
+
if (isPageLoading) {
|
|
160
|
+
isPageLoading = false;
|
|
161
|
+
log.debug(`The page ${url} is ready in ${start.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
162
|
+
}
|
|
163
|
+
if (onPageLoadedTimeout) {
|
|
164
|
+
clearTimeout(onPageLoadedTimeout);
|
|
165
|
+
onPageLoadedTimeout = null;
|
|
166
|
+
}
|
|
167
|
+
return resolve();
|
|
168
|
+
};
|
|
169
|
+
// https://chromedevtools.github.io/devtools-protocol/tot/Page/#event-loadEventFired
|
|
170
|
+
this.rpcClient?.once('Page.loadEventFired', onPageLoaded);
|
|
154
171
|
|
|
155
|
-
|
|
172
|
+
this.rpcClient?.send('Page.navigate', {
|
|
156
173
|
url,
|
|
157
174
|
appIdKey: this.appIdKey,
|
|
158
175
|
pageIdKey: this.pageIdKey,
|
|
159
176
|
});
|
|
177
|
+
});
|
|
178
|
+
/** @type {B<void>} */
|
|
179
|
+
const cancellationPromise = B.resolve((async () => {
|
|
180
|
+
try {
|
|
181
|
+
await this.pageLoadDelay;
|
|
182
|
+
} catch (ign) {}
|
|
183
|
+
})());
|
|
160
184
|
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
await B.delay(1000);
|
|
164
|
-
}
|
|
165
|
-
|
|
166
|
-
// wait until the page has been navigated
|
|
167
|
-
await waitForFramePromise;
|
|
168
|
-
|
|
169
|
-
await this.waitForDom(new timing.Timer().start(), pageLoadVerifyHook);
|
|
170
|
-
|
|
171
|
-
// enable console logging, so we get the events (otherwise we only
|
|
172
|
-
// get notified when navigating to a local page
|
|
173
|
-
await this.rpcClient.send('Console.enable', {
|
|
174
|
-
appIdKey: this.appIdKey,
|
|
175
|
-
pageIdKey: this.pageIdKey,
|
|
176
|
-
});
|
|
185
|
+
try {
|
|
186
|
+
await B.any([cancellationPromise, pageReadinessPromise]);
|
|
177
187
|
} finally {
|
|
188
|
+
this.pageLoading = false;
|
|
189
|
+
isPageLoading = false;
|
|
178
190
|
this._navigatingToPage = false;
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
184
|
-
* @returns {Promise<any>}
|
|
185
|
-
*/
|
|
186
|
-
async function waitForFrameNavigated () {
|
|
187
|
-
let navEventListener;
|
|
188
|
-
return await new B(async (resolve) => {
|
|
189
|
-
log.debug('Waiting for frame navigated message...');
|
|
190
|
-
if (!this.rpcClient) {
|
|
191
|
-
throw new Error('rpcClient is undefined. Is the debugger connected?');
|
|
191
|
+
this.pageLoadDelay = B.resolve();
|
|
192
|
+
if (onPageLoadedTimeout && pageReadinessPromise.isFulfilled()) {
|
|
193
|
+
clearTimeout(onPageLoadedTimeout);
|
|
194
|
+
onPageLoadedTimeout = null;
|
|
192
195
|
}
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
// add a handler for the `Page.frameNavigated` message
|
|
196
|
-
// from the remote debugger
|
|
197
|
-
navEventListener = (err, value) => {
|
|
198
|
-
log.debug(`Frame navigated in ${start.getDuration().asMilliSeconds.toFixed(0)}ms from: ${value}`);
|
|
199
|
-
if (!this.allowNavigationWithoutReload && !this.pageLoading) {
|
|
200
|
-
resolve(value);
|
|
201
|
-
} else {
|
|
202
|
-
log.debug('Frame navigated but we were warned about it, not ' +
|
|
203
|
-
'considering page state unloaded');
|
|
204
|
-
this.allowNavigationWithoutReload = false;
|
|
205
|
-
}
|
|
206
|
-
if (this.navigationDelay) {
|
|
207
|
-
this.navigationDelay.cancel();
|
|
208
|
-
}
|
|
209
|
-
};
|
|
210
|
-
|
|
211
|
-
this.rpcClient.once('Page.frameNavigated', navEventListener);
|
|
212
|
-
|
|
213
|
-
// timeout, in case remote debugger doesn't respond,
|
|
214
|
-
// or takes a long time
|
|
215
|
-
if (!this.useNewSafari || this.pageLoadMs >= 0) {
|
|
216
|
-
// use pageLoadMs, or a small amount of time
|
|
217
|
-
const timeout = this.useNewSafari ? this.pageLoadMs : 500;
|
|
218
|
-
this.navigationDelay = util.cancellableDelay(timeout);
|
|
219
|
-
try {
|
|
220
|
-
await this.navigationDelay;
|
|
221
|
-
navEventListener(null, `${timeout}ms timeout`);
|
|
222
|
-
} catch (err) {
|
|
223
|
-
// nothing to do: we only get here if the remote debugger
|
|
224
|
-
// already notified of frame navigation, and the delay
|
|
225
|
-
// was cancelled
|
|
226
|
-
}
|
|
196
|
+
if (onPageLoaded) {
|
|
197
|
+
this.rpcClient.off('Page.loadEventFired', onPageLoaded);
|
|
227
198
|
}
|
|
228
|
-
}
|
|
229
|
-
|
|
230
|
-
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
// enable console logging, so we get the events (otherwise we only
|
|
202
|
+
// get notified when navigating to a local page
|
|
203
|
+
try {
|
|
204
|
+
await B.resolve(this.rpcClient.send('Console.enable', {
|
|
205
|
+
appIdKey: this.appIdKey,
|
|
206
|
+
pageIdKey: this.pageIdKey,
|
|
207
|
+
})).timeout(CONSOLE_ENABLEMENT_TIMEOUT_MS);
|
|
208
|
+
} catch (err) {
|
|
209
|
+
if (err instanceof B.TimeoutError) {
|
|
210
|
+
log.warn(
|
|
211
|
+
`Could not enable console events on the page '${this.pageIdKey}' (app '${this.appIdKey}') ` +
|
|
212
|
+
`within ${CONSOLE_ENABLEMENT_TIMEOUT_MS}ms. This might be an Inspector bug.`
|
|
213
|
+
);
|
|
214
|
+
} else {
|
|
215
|
+
throw err;
|
|
231
216
|
}
|
|
232
|
-
}
|
|
217
|
+
}
|
|
233
218
|
}
|
|
234
219
|
|
|
235
|
-
|
|
236
|
-
export default {
|
|
237
|
-
frameDetached, pageLoad, cancelPageLoad, pageUnload, waitForDom, checkPageIsReady, navToUrl, waitForFrameNavigated
|
|
238
|
-
};
|
|
220
|
+
export default {frameDetached, cancelPageLoad, waitForDom, checkPageIsReady, navToUrl};
|
package/lib/remote-debugger.js
CHANGED
|
@@ -55,21 +55,15 @@ class RemoteDebugger extends EventEmitter {
|
|
|
55
55
|
searchForApp;
|
|
56
56
|
/** @type {(appsDict:Record<string, any>, currentUrl: string?, ignoreAboutBlankUrl: boolean) => import('./mixins/connect').AppPages?} */
|
|
57
57
|
searchForPage;
|
|
58
|
-
/** @type {() => Promise<void>} */
|
|
59
|
-
pageUnload;
|
|
60
58
|
/** @type {() => Promise<boolean>} */
|
|
61
59
|
checkPageIsReady;
|
|
62
60
|
/** @type {(dict: Record<string, any>) => void} */
|
|
63
61
|
updateAppsWithDict;
|
|
64
|
-
/** @type {(startPageLoadTimer?: import('@appium/support').timing.Timer
|
|
62
|
+
/** @type {(startPageLoadTimer?: import('@appium/support').timing.Timer) => Promise<void>} */
|
|
65
63
|
waitForDom;
|
|
66
|
-
/** @type {(startPageLoadTimer?: import('@appium/support').timing.Timer?, pageLoadVerifyHook?: import('./mixins/navigate').TPageLoadVerifyHook) => Promise<void>} */
|
|
67
|
-
pageLoad;
|
|
68
64
|
/** @type {(command: string, override?: boolean) => Promise<any>} */
|
|
69
65
|
execute;
|
|
70
|
-
/** @type {() => Promise<any>} */
|
|
71
|
-
waitForFrameNavigated;
|
|
72
|
-
/** @type {(atom: string, args?: any[], frames?: string[]) => Promise<string>} */
|
|
66
|
+
/** @type {(command: string, args?: any[], frames?: string[]) => Promise<any>} */
|
|
73
67
|
executeAtom;
|
|
74
68
|
|
|
75
69
|
// Callbacks
|
|
@@ -130,7 +130,11 @@ export default class RpcClientSimulator extends RpcClient {
|
|
|
130
130
|
reject(err);
|
|
131
131
|
};
|
|
132
132
|
|
|
133
|
-
|
|
133
|
+
if (!this.socket) {
|
|
134
|
+
return reject(
|
|
135
|
+
new Error('The RPC socket is not defined. Have you called `connect()` before sending a message?')
|
|
136
|
+
);
|
|
137
|
+
}
|
|
134
138
|
this.socket.on('error', onSocketError);
|
|
135
139
|
this.service.sendMessage(cmd);
|
|
136
140
|
resolve();
|
package/lib/rpc/rpc-client.js
CHANGED
|
@@ -430,6 +430,8 @@ export default class RpcClient {
|
|
|
430
430
|
if (targetId === oldTargetId) {
|
|
431
431
|
log.debug(`Found provisional target for app '${app}'. Old target: '${oldTargetId}', new target: '${newTargetId}'. Updating`);
|
|
432
432
|
targets[page] = newTargetId;
|
|
433
|
+
// This is needed to enable the broadcast of page lifecycle events
|
|
434
|
+
this.sendToDevice('Page.enable', {appIdKey: app, pageIdKey: parseInt(page, 10)}, false);
|
|
433
435
|
return;
|
|
434
436
|
}
|
|
435
437
|
}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"keywords": [
|
|
5
5
|
"appium"
|
|
6
6
|
],
|
|
7
|
-
"version": "
|
|
7
|
+
"version": "11.0.0",
|
|
8
8
|
"author": "Appium Contributors",
|
|
9
9
|
"license": "Apache-2.0",
|
|
10
10
|
"repository": {
|
|
@@ -52,8 +52,6 @@
|
|
|
52
52
|
"dev": "npm run build -- --watch",
|
|
53
53
|
"lint": "eslint .",
|
|
54
54
|
"lint:fix": "npm run lint -- --fix",
|
|
55
|
-
"precommit-msg": "echo 'Pre-commit checks...' && exit 0",
|
|
56
|
-
"precommit-lint": "lint-staged",
|
|
57
55
|
"prepare": "npm run build",
|
|
58
56
|
"test": "mocha --exit --timeout 1m \"./test/unit/**/*-specs.js\"",
|
|
59
57
|
"e2e-test": "mocha --exit --timeout 1m \"./test/functional/**/*-specs.js\"",
|
|
@@ -62,15 +60,6 @@
|
|
|
62
60
|
"build:atoms:import": "node scripts/build-atoms.js",
|
|
63
61
|
"build:selenium": "node scripts/build-selenium.js"
|
|
64
62
|
},
|
|
65
|
-
"pre-commit": [
|
|
66
|
-
"precommit-msg",
|
|
67
|
-
"precommit-lint"
|
|
68
|
-
],
|
|
69
|
-
"lint-staged": {
|
|
70
|
-
"*.js": [
|
|
71
|
-
"eslint --fix"
|
|
72
|
-
]
|
|
73
|
-
},
|
|
74
63
|
"prettier": {
|
|
75
64
|
"bracketSpacing": false,
|
|
76
65
|
"printWidth": 100,
|
|
@@ -104,12 +93,10 @@
|
|
|
104
93
|
"eslint-plugin-import": "^2.28.0",
|
|
105
94
|
"eslint-plugin-mocha": "^10.1.0",
|
|
106
95
|
"eslint-plugin-promise": "^6.1.1",
|
|
107
|
-
"lint-staged": "^15.0.2",
|
|
108
96
|
"mocha": "^10.0.0",
|
|
109
97
|
"mocha-junit-reporter": "^2.0.0",
|
|
110
98
|
"mocha-multi-reporters": "^1.5.1",
|
|
111
99
|
"node-simctl": "^7.0.1",
|
|
112
|
-
"pre-commit": "^1.1.3",
|
|
113
100
|
"prettier": "^3.0.0",
|
|
114
101
|
"serve-static": "^1.14.1",
|
|
115
102
|
"semantic-release": "^23.0.0",
|