appium-remote-debugger 11.0.0 → 11.0.2
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
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
## [11.0.2](https://github.com/appium/appium-remote-debugger/compare/v11.0.1...v11.0.2) (2024-02-14)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* Only wait for Console.enable RPC response if page load finishes ([#360](https://github.com/appium/appium-remote-debugger/issues/360)) ([7b9a107](https://github.com/appium/appium-remote-debugger/commit/7b9a107016983a90c1505ed8958d19c545709969))
|
|
7
|
+
|
|
8
|
+
## [11.0.1](https://github.com/appium/appium-remote-debugger/compare/v11.0.0...v11.0.1) (2024-02-14)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Miscellaneous Chores
|
|
12
|
+
|
|
13
|
+
* throw timeout error if Console.enable times out ([#359](https://github.com/appium/appium-remote-debugger/issues/359)) ([1ea7086](https://github.com/appium/appium-remote-debugger/commit/1ea70862feacd5cf997a633999fa9dce441c757c))
|
|
14
|
+
|
|
1
15
|
## [11.0.0](https://github.com/appium/appium-remote-debugger/compare/v10.2.2...v11.0.0) (2024-02-14)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -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":";;;;;;;;AAYA;;;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,CA4FzB;;IA/FD;;;;OAIG;IACH,6DAHW,MAAM,EA6FhB;IApFC,2BAA6B;IAO7B,uBAA8D;IAC9D,qBAAuB;;uBA1II,iBAAiB;cAEhC,UAAU"}
|
|
@@ -9,9 +9,10 @@ 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
|
+
const base_driver_1 = require("@appium/base-driver");
|
|
12
13
|
const DEFAULT_PAGE_READINESS_TIMEOUT_MS = 20 * 1000;
|
|
13
14
|
const PAGE_READINESS_CHECK_INTERVAL_MS = 50;
|
|
14
|
-
const CONSOLE_ENABLEMENT_TIMEOUT_MS = 1000;
|
|
15
|
+
const CONSOLE_ENABLEMENT_TIMEOUT_MS = 20 * 1000;
|
|
15
16
|
/**
|
|
16
17
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
17
18
|
* @returns {void}
|
|
@@ -134,6 +135,7 @@ async function navToUrl(url) {
|
|
|
134
135
|
this.pageLoadDelay = support_1.util.cancellableDelay(readinessTimeoutMs);
|
|
135
136
|
this.pageLoading = true;
|
|
136
137
|
let isPageLoading = true;
|
|
138
|
+
let didPageFinishLoad = false;
|
|
137
139
|
const start = new support_1.timing.Timer().start();
|
|
138
140
|
/** @type {B<void>} */
|
|
139
141
|
const pageReadinessPromise = new bluebird_1.default((resolve) => {
|
|
@@ -154,6 +156,7 @@ async function navToUrl(url) {
|
|
|
154
156
|
clearTimeout(onPageLoadedTimeout);
|
|
155
157
|
onPageLoadedTimeout = null;
|
|
156
158
|
}
|
|
159
|
+
didPageFinishLoad = true;
|
|
157
160
|
return resolve();
|
|
158
161
|
};
|
|
159
162
|
// https://chromedevtools.github.io/devtools-protocol/tot/Page/#event-loadEventFired
|
|
@@ -193,16 +196,14 @@ async function navToUrl(url) {
|
|
|
193
196
|
await bluebird_1.default.resolve(this.rpcClient.send('Console.enable', {
|
|
194
197
|
appIdKey: this.appIdKey,
|
|
195
198
|
pageIdKey: this.pageIdKey,
|
|
196
|
-
})).timeout(CONSOLE_ENABLEMENT_TIMEOUT_MS);
|
|
199
|
+
}, didPageFinishLoad)).timeout(CONSOLE_ENABLEMENT_TIMEOUT_MS);
|
|
197
200
|
}
|
|
198
201
|
catch (err) {
|
|
199
202
|
if (err instanceof bluebird_1.default.TimeoutError) {
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
}
|
|
203
|
-
else {
|
|
204
|
-
throw err;
|
|
203
|
+
throw new base_driver_1.errors.TimeoutError(`Could not enable console events after the page load within ` +
|
|
204
|
+
`${CONSOLE_ENABLEMENT_TIMEOUT_MS}ms. The Web Inspector/Safari may need to be restarted.`);
|
|
205
205
|
}
|
|
206
|
+
throw err;
|
|
206
207
|
}
|
|
207
208
|
}
|
|
208
209
|
exports.default = { frameDetached, cancelPageLoad, waitForDom, checkPageIsReady, navToUrl };
|
|
@@ -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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"}
|
package/lib/mixins/navigate.js
CHANGED
|
@@ -4,10 +4,11 @@ import events from './events';
|
|
|
4
4
|
import { timing, util } from '@appium/support';
|
|
5
5
|
import _ from 'lodash';
|
|
6
6
|
import B from 'bluebird';
|
|
7
|
+
import { errors } from '@appium/base-driver';
|
|
7
8
|
|
|
8
9
|
const DEFAULT_PAGE_READINESS_TIMEOUT_MS = 20 * 1000;
|
|
9
10
|
const PAGE_READINESS_CHECK_INTERVAL_MS = 50;
|
|
10
|
-
const CONSOLE_ENABLEMENT_TIMEOUT_MS = 1000;
|
|
11
|
+
const CONSOLE_ENABLEMENT_TIMEOUT_MS = 20 * 1000;
|
|
11
12
|
|
|
12
13
|
/**
|
|
13
14
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
@@ -140,6 +141,7 @@ async function navToUrl (url) {
|
|
|
140
141
|
this.pageLoadDelay = util.cancellableDelay(readinessTimeoutMs);
|
|
141
142
|
this.pageLoading = true;
|
|
142
143
|
let isPageLoading = true;
|
|
144
|
+
let didPageFinishLoad = false;
|
|
143
145
|
const start = new timing.Timer().start();
|
|
144
146
|
|
|
145
147
|
/** @type {B<void>} */
|
|
@@ -164,6 +166,7 @@ async function navToUrl (url) {
|
|
|
164
166
|
clearTimeout(onPageLoadedTimeout);
|
|
165
167
|
onPageLoadedTimeout = null;
|
|
166
168
|
}
|
|
169
|
+
didPageFinishLoad = true;
|
|
167
170
|
return resolve();
|
|
168
171
|
};
|
|
169
172
|
// https://chromedevtools.github.io/devtools-protocol/tot/Page/#event-loadEventFired
|
|
@@ -204,16 +207,13 @@ async function navToUrl (url) {
|
|
|
204
207
|
await B.resolve(this.rpcClient.send('Console.enable', {
|
|
205
208
|
appIdKey: this.appIdKey,
|
|
206
209
|
pageIdKey: this.pageIdKey,
|
|
207
|
-
})).timeout(CONSOLE_ENABLEMENT_TIMEOUT_MS);
|
|
210
|
+
}, didPageFinishLoad)).timeout(CONSOLE_ENABLEMENT_TIMEOUT_MS);
|
|
208
211
|
} catch (err) {
|
|
209
212
|
if (err instanceof B.TimeoutError) {
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
`within ${CONSOLE_ENABLEMENT_TIMEOUT_MS}ms. This might be an Inspector bug.`
|
|
213
|
-
);
|
|
214
|
-
} else {
|
|
215
|
-
throw err;
|
|
213
|
+
throw new errors.TimeoutError(`Could not enable console events after the page load within ` +
|
|
214
|
+
`${CONSOLE_ENABLEMENT_TIMEOUT_MS}ms. The Web Inspector/Safari may need to be restarted.`);
|
|
216
215
|
}
|
|
216
|
+
throw err;
|
|
217
217
|
}
|
|
218
218
|
}
|
|
219
219
|
|