appium-remote-debugger 11.0.4 → 11.0.6

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.6](https://github.com/appium/appium-remote-debugger/compare/v11.0.5...v11.0.6) (2024-03-22)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * Improve page load detection logic ([#369](https://github.com/appium/appium-remote-debugger/issues/369)) ([418093b](https://github.com/appium/appium-remote-debugger/commit/418093b257ce4f85527493fca045f53712823418))
7
+
8
+ ## [11.0.5](https://github.com/appium/appium-remote-debugger/compare/v11.0.4...v11.0.5) (2024-03-22)
9
+
10
+
11
+ ### Bug Fixes
12
+
13
+ * Select all available app ids for the given bundle name ([#368](https://github.com/appium/appium-remote-debugger/issues/368)) ([c4f02b7](https://github.com/appium/appium-remote-debugger/commit/c4f02b7e98477adfd4b426c7e5cc4973dbc9e73f))
14
+
1
15
  ## [11.0.4](https://github.com/appium/appium-remote-debugger/compare/v11.0.3...v11.0.4) (2024-03-07)
2
16
 
3
17
 
@@ -37,9 +37,10 @@ declare class waitForDom {
37
37
  }
38
38
  /**
39
39
  * @this {import('../remote-debugger').RemoteDebugger}
40
+ * @param {number} [timeoutMs]
40
41
  * @returns {Promise<boolean>}
41
42
  */
42
- declare function checkPageIsReady(this: import("../remote-debugger").default): Promise<boolean>;
43
+ declare function checkPageIsReady(this: import("../remote-debugger").default, timeoutMs?: number | undefined): Promise<boolean>;
43
44
  /**
44
45
  * @this {import('../remote-debugger').RemoteDebugger}
45
46
  * @param {string} url
@@ -1 +1 @@
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,CAiGzB;;IApGD;;;;OAIG;IACH,6DAHW,MAAM,EAkGhB;IApFC,2BAA6B;IAO7B,uBAA8D;IAC9D,qBAAuB;;uBA/II,iBAAiB;cAEhC,UAAU"}
1
+ {"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":";;;;;;;;AAcA;;;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;;;;GAIG;AACH,+GAFa,QAAQ,OAAO,CAAC,CAkB5B;AAED;;;;GAIG;AACH,2EAHW,MAAM,GACJ,QAAQ,IAAI,CAAC,CA0HzB;;IA7HD;;;;OAIG;IACH,6DAHW,MAAM,EA2HhB;IA7GC,2BAA6B;IAS7B,uBAA8D;IAC9D,qBAAuB;;uBArJI,iBAAiB;cAEhC,UAAU"}
@@ -10,8 +10,10 @@ const support_1 = require("@appium/support");
10
10
  const lodash_1 = __importDefault(require("lodash"));
11
11
  const bluebird_1 = __importDefault(require("bluebird"));
12
12
  const base_driver_1 = require("@appium/base-driver");
13
+ const rpc_1 = require("../rpc");
13
14
  const DEFAULT_PAGE_READINESS_TIMEOUT_MS = 20 * 1000;
14
15
  const PAGE_READINESS_CHECK_INTERVAL_MS = 50;
16
+ const PAGE_READINESS_JS_MIN_CHECK_INTERVAL_MS = 1000;
15
17
  const CONSOLE_ENABLEMENT_TIMEOUT_MS = 20 * 1000;
16
18
  /**
17
19
  * @this {import('../remote-debugger').RemoteDebugger}
@@ -97,13 +99,15 @@ async function waitForDom(startPageLoadTimer) {
97
99
  }
98
100
  /**
99
101
  * @this {import('../remote-debugger').RemoteDebugger}
102
+ * @param {number} [timeoutMs]
100
103
  * @returns {Promise<boolean>}
101
104
  */
102
- async function checkPageIsReady() {
105
+ async function checkPageIsReady(timeoutMs) {
103
106
  (0, utils_1.checkParams)({ appIdKey: this.appIdKey });
104
107
  const readyCmd = 'document.readyState;';
105
108
  try {
106
- const readyState = await bluebird_1.default.resolve(this.execute(readyCmd, true)).timeout(this.pageReadyTimeout);
109
+ const readyState = await bluebird_1.default.resolve(this.execute(readyCmd, true))
110
+ .timeout(timeoutMs ?? this.pageReadyTimeout);
107
111
  logger_1.default.debug(`Document readyState is '${readyState}'`);
108
112
  return readyState === 'complete';
109
113
  }
@@ -136,6 +140,8 @@ async function navToUrl(url) {
136
140
  const readinessTimeoutMs = this.pageLoadMs || DEFAULT_PAGE_READINESS_TIMEOUT_MS;
137
141
  /** @type {(() => void)|undefined} */
138
142
  let onPageLoaded;
143
+ /** @type {(() => void)|undefined} */
144
+ let onTargetProvisioned;
139
145
  /** @type {NodeJS.Timeout|undefined|null} */
140
146
  let onPageLoadedTimeout;
141
147
  this.pageLoadDelay = support_1.util.cancellableDelay(readinessTimeoutMs);
@@ -167,6 +173,27 @@ async function navToUrl(url) {
167
173
  };
168
174
  // https://chromedevtools.github.io/devtools-protocol/tot/Page/#event-loadEventFired
169
175
  this.rpcClient?.once('Page.loadEventFired', onPageLoaded);
176
+ // Pages that have no proper DOM structure do not fire the `Page.loadEventFired` event
177
+ // so we rely on the very first event after target change, which is `onTargetProvisioned`
178
+ // and start sending `document.readyState` requests until we either succeed or
179
+ // another event/timeout happens
180
+ onTargetProvisioned = async () => {
181
+ while (isPageLoading) {
182
+ const pageReadyCheckStart = new support_1.timing.Timer().start();
183
+ try {
184
+ const isReady = await this.checkPageIsReady(PAGE_READINESS_JS_MIN_CHECK_INTERVAL_MS);
185
+ if (isReady && isPageLoading && onPageLoaded) {
186
+ return onPageLoaded();
187
+ }
188
+ }
189
+ catch (ign) { }
190
+ const msLeft = PAGE_READINESS_JS_MIN_CHECK_INTERVAL_MS - pageReadyCheckStart.getDuration().asMilliSeconds;
191
+ if (msLeft > 0 && isPageLoading) {
192
+ await bluebird_1.default.delay(msLeft);
193
+ }
194
+ }
195
+ };
196
+ this.rpcClient?.targetSubscriptions.once(rpc_1.rpcConstants.ON_TARGET_PROVISIONED_EVENT, onTargetProvisioned);
170
197
  this.rpcClient?.send('Page.navigate', {
171
198
  url,
172
199
  appIdKey: this.appIdKey,
@@ -192,6 +219,9 @@ async function navToUrl(url) {
192
219
  clearTimeout(onPageLoadedTimeout);
193
220
  onPageLoadedTimeout = null;
194
221
  }
222
+ if (onTargetProvisioned) {
223
+ this.rpcClient.targetSubscriptions.off(rpc_1.rpcConstants.ON_TARGET_PROVISIONED_EVENT, onTargetProvisioned);
224
+ }
195
225
  if (onPageLoaded) {
196
226
  this.rpcClient.off('Page.loadEventFired', onPageLoaded);
197
227
  }
@@ -1 +1 @@
1
- {"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"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"}
@@ -31,8 +31,8 @@ export class RemoteDebugger extends EventEmitter<[never]> {
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<boolean>} */
35
- checkPageIsReady: () => Promise<boolean>;
34
+ /** @type {(timeoutMs?: number) => Promise<boolean>} */
35
+ checkPageIsReady: (timeoutMs?: number) => Promise<boolean>;
36
36
  /** @type {(dict: Record<string, any>) => void} */
37
37
  updateAppsWithDict: (dict: Record<string, any>) => void;
38
38
  /** @type {(startPageLoadTimer?: import('@appium/support').timing.Timer) => Promise<void>} */
@@ -1 +1 @@
1
- {"version":3,"file":"remote-debugger.d.ts","sourceRoot":"","sources":["../../lib/remote-debugger.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"remote-debugger.d.ts","sourceRoot":"","sources":["../../lib/remote-debugger.js"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export const ON_TARGET_PROVISIONED_EVENT: "onTargetProvisioned";
2
+ //# sourceMappingURL=constants.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../lib/rpc/constants.js"],"names":[],"mappings":"AAAA,gEAAiE"}
@@ -0,0 +1,5 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ON_TARGET_PROVISIONED_EVENT = void 0;
4
+ exports.ON_TARGET_PROVISIONED_EVENT = 'onTargetProvisioned';
5
+ //# sourceMappingURL=constants.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../lib/rpc/constants.js"],"names":[],"mappings":";;;AAAa,QAAA,2BAA2B,GAAG,qBAAqB,CAAC"}
@@ -1,4 +1,5 @@
1
1
  import RpcClientSimulator from './rpc-client-simulator';
2
2
  import RpcClientRealDevice from './rpc-client-real-device';
3
- export { RpcClientSimulator, RpcClientRealDevice };
3
+ import * as rpcConstants from './constants';
4
+ export { RpcClientSimulator, RpcClientRealDevice, rpcConstants };
4
5
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/rpc/index.js"],"names":[],"mappings":"+BAA+B,wBAAwB;gCACvB,0BAA0B"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/rpc/index.js"],"names":[],"mappings":"+BAA+B,wBAAwB;gCACvB,0BAA0B;8BAC5B,aAAa"}
@@ -1,11 +1,36 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
2
25
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
27
  };
5
28
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.RpcClientRealDevice = exports.RpcClientSimulator = void 0;
29
+ exports.rpcConstants = exports.RpcClientRealDevice = exports.RpcClientSimulator = void 0;
7
30
  const rpc_client_simulator_1 = __importDefault(require("./rpc-client-simulator"));
8
31
  exports.RpcClientSimulator = rpc_client_simulator_1.default;
9
32
  const rpc_client_real_device_1 = __importDefault(require("./rpc-client-real-device"));
10
33
  exports.RpcClientRealDevice = rpc_client_real_device_1.default;
34
+ const rpcConstants = __importStar(require("./constants"));
35
+ exports.rpcConstants = rpcConstants;
11
36
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/rpc/index.js"],"names":[],"mappings":";;;;;;AAAA,kFAAwD;AAI/C,6BAJF,8BAAkB,CAIE;AAH3B,sFAA2D;AAG9B,8BAHtB,gCAAmB,CAGsB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/rpc/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kFAAwD;AAK/C,6BALF,8BAAkB,CAKE;AAJ3B,sFAA2D;AAI9B,8BAJtB,gCAAmB,CAIsB;AAHhD,0DAA4C;AAGM,oCAAY"}
@@ -23,6 +23,7 @@ export default class RpcClient {
23
23
  bundleId: any;
24
24
  platformVersion: any;
25
25
  _contexts: any[];
26
+ _targetSubscriptions: EventEmitter<[never]>;
26
27
  set isTargetBased(isTargetBased: any);
27
28
  get isTargetBased(): any;
28
29
  get contexts(): any[];
@@ -30,6 +31,7 @@ export default class RpcClient {
30
31
  get targets(): {};
31
32
  set shouldCheckForTarget(shouldCheckForTarget: boolean);
32
33
  get shouldCheckForTarget(): boolean;
34
+ get targetSubscriptions(): EventEmitter<[never]>;
33
35
  on(event: any, listener: any): this;
34
36
  once(event: any, listener: any): this;
35
37
  off(event: any, listener: any): this;
@@ -139,4 +141,5 @@ export default class RpcClient {
139
141
  }
140
142
  import RpcMessageHandler from './rpc-message-handler';
141
143
  import RemoteMessages from './remote-messages';
144
+ import { EventEmitter } from 'node:events';
142
145
  //# sourceMappingURL=rpc-client.d.ts.map
@@ -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,oCAEC;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,sCAsBC;IAED,yBAEC;IAxED,sBAEC;IAED,uBAEC;IAED,kBAEC;IAMD,wDAEC;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"}
1
+ {"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client.js"],"names":[],"mappings":"AA+BA;IAUE,uBAyCC;IAlDD,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;IAmD1B,oCAEC;IAND,2BAEC;IA9CC,eAA2B;IAC3B,iBAA6B;IAC7B,cAAc;IAEd,UAAgB;IAEhB,yBAA8C;IAC9C,gCAA4D;IAC5D,qBAAsC;IACtC,gCAA4D;IAE5D,4BAAoD;IAEpD,cAAwB;IACxB,qBAAsC;IAEtC,iBAAmB;IAEnB,4CAA8C;IAwDhD,sCAsBC;IAED,yBAEC;IA5ED,sBAEC;IAED,uBAEC;IAED,kBAEC;IAMD,wDAEC;IAND,oCAEC;IAcD,iDAEC;IAED,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,CAmDhB;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;8BAprB6B,uBAAuB;2BAL1B,mBAAmB;6BAOjB,aAAa"}
@@ -10,6 +10,8 @@ const lodash_1 = __importDefault(require("lodash"));
10
10
  const bluebird_1 = __importDefault(require("bluebird"));
11
11
  const rpc_message_handler_1 = __importDefault(require("./rpc-message-handler"));
12
12
  const support_1 = require("@appium/support");
13
+ const node_events_1 = require("node:events");
14
+ const constants_1 = require("./constants");
13
15
  const DATA_LOG_LENGTH = { length: 200 };
14
16
  const WAIT_FOR_TARGET_TIMEOUT = 10000;
15
17
  const WAIT_FOR_TARGET_INTERVAL = 1000;
@@ -45,6 +47,7 @@ class RpcClient {
45
47
  this.platformVersion = platformVersion;
46
48
  this._contexts = [];
47
49
  this._targets = {};
50
+ this._targetSubscriptions = new node_events_1.EventEmitter();
48
51
  // start with a best guess for the protocol
49
52
  this.isTargetBased = isTargetBased(isSafari, this.platformVersion);
50
53
  }
@@ -69,6 +72,9 @@ class RpcClient {
69
72
  set isConnected(connected) {
70
73
  this.connected = !!connected;
71
74
  }
75
+ get targetSubscriptions() {
76
+ return this._targetSubscriptions;
77
+ }
72
78
  on(event, listener) {
73
79
  // @ts-ignore messageHandler must be defined here
74
80
  this.messageHandler.on(event, listener);
@@ -368,8 +374,21 @@ class RpcClient {
368
374
  if (targetId === oldTargetId) {
369
375
  logger_1.default.debug(`Found provisional target for app '${app}'. Old target: '${oldTargetId}', new target: '${newTargetId}'. Updating`);
370
376
  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);
377
+ const opts = { appIdKey: app, pageIdKey: parseInt(page, 10) };
378
+ (async () => {
379
+ try {
380
+ // This is needed to enable the broadcast of page lifecycle events
381
+ await this.sendToDevice('Page.enable', opts, true);
382
+ }
383
+ catch (err) {
384
+ logger_1.default.warn(err.message);
385
+ }
386
+ this._targetSubscriptions.emit(constants_1.ON_TARGET_PROVISIONED_EVENT, {
387
+ ...opts,
388
+ oldTargetId,
389
+ targetId: newTargetId,
390
+ });
391
+ })();
373
392
  return;
374
393
  }
375
394
  }
@@ -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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"}
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";aA2Bc,EAAE,GAAG,CAAC;uBACI,GAAG,EAAE,KAAK,IAAI;mBACjB,KAAK,KAAK,IAAI;;;QAKrB,MAAM;aACN,OAAO;UACP,MAAM;cACN,MAAM;YACN,MAAM;cACN,OAAO;yBACP,OAAO,GAAC,MAAM;gBACd,GAAG,EAAE,GAAC,SAAS,GAAC,eAAe;;AAhB7C;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH,sCAHW,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,CAAC,MAAM,EAAE,OAAO,CAAC,CAgC7B;AAMD,wDAkBC;AAED;;;;;;GAMG;AACH,4CAJW,MAAM,WACN,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,MAAM,GAAC,SAAS,CA6B5B;AAyBD;;;;;;GAMG;AACH,sDAJW,MAAM,EAAE,WACR,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,MAAM,EAAE,CAqCpB;AAED,+CAQC;AAED,yEAYC;AAED;;GAEG;AACH,mCAFa,eAAe,CAmB3B;AAED,6CA8BC;AAvQD,sCAAgC;AAyQhC;;;;;GAKG;AACH,gEAMG;cA1SW,UAAU;cADV,QAAQ"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";aA2Bc,EAAE,GAAG,CAAC;uBACI,GAAG,EAAE,KAAK,IAAI;mBACjB,KAAK,KAAK,IAAI;;;QAKrB,MAAM;aACN,OAAO;UACP,MAAM;cACN,MAAM;YACN,MAAM;cACN,OAAO;yBACP,OAAO,GAAC,MAAM;gBACd,GAAG,EAAE,GAAC,SAAS,GAAC,eAAe;;AAhB7C;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH,sCAHW,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,CAAC,MAAM,EAAE,OAAO,CAAC,CAgC7B;AAMD,wDAkBC;AAED;;;;;;GAMG;AACH,4CAJW,MAAM,WACN,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,MAAM,GAAC,SAAS,CA6B5B;AAyBD;;;;;;GAMG;AACH,sDAJW,MAAM,EAAE,WACR,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,MAAM,EAAE,CAoCpB;AAED,+CAQC;AAED,yEAYC;AAED;;GAEG;AACH,mCAFa,eAAe,CAmB3B;AAED,6CA8BC;AAtQD,sCAAgC;AAwQhC;;;;;GAKG;AACH,gEAMG;cAzSW,UAAU;cADV,QAAQ"}
@@ -143,21 +143,21 @@ exports.getDebuggerAppKey = getDebuggerAppKey;
143
143
  *
144
144
  * @param {string} bundleId
145
145
  * @param {Record<string, any>} appDict
146
- * @returns {string|undefined}
146
+ * @returns {string[]}
147
147
  */
148
- function appIdForBundle(bundleId, appDict) {
149
- let appId;
148
+ function appIdsForBundle(bundleId, appDict) {
149
+ /** @type {Set<string>} */
150
+ const appIds = new Set();
150
151
  for (const [key, data] of lodash_1.default.toPairs(appDict)) {
151
152
  if (data.bundleId.endsWith(bundleId)) {
152
- appId = key;
153
- break;
153
+ appIds.add(key);
154
154
  }
155
155
  }
156
156
  // if nothing is found, try to get the generic app
157
- if (!appId && bundleId !== WEB_CONTENT_BUNDLE_ID) {
158
- return appIdForBundle(WEB_CONTENT_BUNDLE_ID, appDict);
157
+ if (appIds.size === 0 && bundleId !== WEB_CONTENT_BUNDLE_ID) {
158
+ return appIdsForBundle(WEB_CONTENT_BUNDLE_ID, appDict);
159
159
  }
160
- return appId;
160
+ return Array.from(appIds);
161
161
  }
162
162
  /**
163
163
  * Find app keys based on assigned bundleIds from appDict
@@ -171,7 +171,6 @@ function getPossibleDebuggerAppKeys(bundleIds, appDict) {
171
171
  logger_1.default.debug('Skip checking bundle identifiers because the bundleIds includes a wildcard');
172
172
  return lodash_1.default.uniq(Object.keys(appDict));
173
173
  }
174
- let proxiedAppIds = [];
175
174
  // go through the possible bundle identifiers
176
175
  const possibleBundleIds = lodash_1.default.uniq([
177
176
  WEB_CONTENT_BUNDLE_ID,
@@ -182,22 +181,23 @@ function getPossibleDebuggerAppKeys(bundleIds, appDict) {
182
181
  ...bundleIds,
183
182
  ]);
184
183
  logger_1.default.debug(`Checking for bundle identifiers: ${possibleBundleIds.join(', ')}`);
184
+ /** @type {Set<string>} */
185
+ const proxiedAppIds = new Set();
185
186
  for (const bundleId of possibleBundleIds) {
186
- const appId = appIdForBundle(bundleId, appDict);
187
187
  // now we need to determine if we should pick a proxy for this instead
188
- if (appId) {
189
- proxiedAppIds.push(appId);
188
+ for (const appId of appIdsForBundle(bundleId, appDict)) {
189
+ proxiedAppIds.add(appId);
190
190
  logger_1.default.debug(`Found app id key '${appId}' for bundle '${bundleId}'`);
191
191
  for (const [key, data] of lodash_1.default.toPairs(appDict)) {
192
192
  if (data.isProxy && data.hostId === appId) {
193
193
  logger_1.default.debug(`Found separate bundleId '${data.bundleId}' ` +
194
194
  `acting as proxy for '${bundleId}', with app id '${key}'`);
195
- proxiedAppIds.push(key);
195
+ proxiedAppIds.add(key);
196
196
  }
197
197
  }
198
198
  }
199
199
  }
200
- return lodash_1.default.uniq(proxiedAppIds);
200
+ return Array.from(proxiedAppIds);
201
201
  }
202
202
  exports.getPossibleDebuggerAppKeys = getPossibleDebuggerAppKeys;
203
203
  function checkParams(params) {
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}
@@ -5,9 +5,11 @@ import { timing, util } from '@appium/support';
5
5
  import _ from 'lodash';
6
6
  import B from 'bluebird';
7
7
  import { errors } from '@appium/base-driver';
8
+ import { rpcConstants } from '../rpc';
8
9
 
9
10
  const DEFAULT_PAGE_READINESS_TIMEOUT_MS = 20 * 1000;
10
11
  const PAGE_READINESS_CHECK_INTERVAL_MS = 50;
12
+ const PAGE_READINESS_JS_MIN_CHECK_INTERVAL_MS = 1000;
11
13
  const CONSOLE_ENABLEMENT_TIMEOUT_MS = 20 * 1000;
12
14
 
13
15
  /**
@@ -101,14 +103,16 @@ async function waitForDom (startPageLoadTimer) {
101
103
 
102
104
  /**
103
105
  * @this {import('../remote-debugger').RemoteDebugger}
106
+ * @param {number} [timeoutMs]
104
107
  * @returns {Promise<boolean>}
105
108
  */
106
- async function checkPageIsReady () {
109
+ async function checkPageIsReady (timeoutMs) {
107
110
  checkParams({appIdKey: this.appIdKey});
108
111
 
109
112
  const readyCmd = 'document.readyState;';
110
113
  try {
111
- const readyState = await B.resolve(this.execute(readyCmd, true)).timeout(this.pageReadyTimeout);
114
+ const readyState = await B.resolve(this.execute(readyCmd, true))
115
+ .timeout(timeoutMs ?? this.pageReadyTimeout);
112
116
  log.debug(`Document readyState is '${readyState}'`);
113
117
  return readyState === 'complete';
114
118
  } catch (err) {
@@ -141,6 +145,8 @@ async function navToUrl (url) {
141
145
  const readinessTimeoutMs = this.pageLoadMs || DEFAULT_PAGE_READINESS_TIMEOUT_MS;
142
146
  /** @type {(() => void)|undefined} */
143
147
  let onPageLoaded;
148
+ /** @type {(() => void)|undefined} */
149
+ let onTargetProvisioned;
144
150
  /** @type {NodeJS.Timeout|undefined|null} */
145
151
  let onPageLoadedTimeout;
146
152
  this.pageLoadDelay = util.cancellableDelay(readinessTimeoutMs);
@@ -176,6 +182,26 @@ async function navToUrl (url) {
176
182
  };
177
183
  // https://chromedevtools.github.io/devtools-protocol/tot/Page/#event-loadEventFired
178
184
  this.rpcClient?.once('Page.loadEventFired', onPageLoaded);
185
+ // Pages that have no proper DOM structure do not fire the `Page.loadEventFired` event
186
+ // so we rely on the very first event after target change, which is `onTargetProvisioned`
187
+ // and start sending `document.readyState` requests until we either succeed or
188
+ // another event/timeout happens
189
+ onTargetProvisioned = async () => {
190
+ while (isPageLoading) {
191
+ const pageReadyCheckStart = new timing.Timer().start();
192
+ try {
193
+ const isReady = await this.checkPageIsReady(PAGE_READINESS_JS_MIN_CHECK_INTERVAL_MS);
194
+ if (isReady && isPageLoading && onPageLoaded) {
195
+ return onPageLoaded();
196
+ }
197
+ } catch (ign) {}
198
+ const msLeft = PAGE_READINESS_JS_MIN_CHECK_INTERVAL_MS - pageReadyCheckStart.getDuration().asMilliSeconds;
199
+ if (msLeft > 0 && isPageLoading) {
200
+ await B.delay(msLeft);
201
+ }
202
+ }
203
+ };
204
+ this.rpcClient?.targetSubscriptions.once(rpcConstants.ON_TARGET_PROVISIONED_EVENT, onTargetProvisioned);
179
205
 
180
206
  this.rpcClient?.send('Page.navigate', {
181
207
  url,
@@ -201,6 +227,9 @@ async function navToUrl (url) {
201
227
  clearTimeout(onPageLoadedTimeout);
202
228
  onPageLoadedTimeout = null;
203
229
  }
230
+ if (onTargetProvisioned) {
231
+ this.rpcClient.targetSubscriptions.off(rpcConstants.ON_TARGET_PROVISIONED_EVENT, onTargetProvisioned);
232
+ }
204
233
  if (onPageLoaded) {
205
234
  this.rpcClient.off('Page.loadEventFired', onPageLoaded);
206
235
  }
@@ -55,7 +55,7 @@ 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<boolean>} */
58
+ /** @type {(timeoutMs?: number) => Promise<boolean>} */
59
59
  checkPageIsReady;
60
60
  /** @type {(dict: Record<string, any>) => void} */
61
61
  updateAppsWithDict;
@@ -0,0 +1 @@
1
+ export const ON_TARGET_PROVISIONED_EVENT = 'onTargetProvisioned';
package/lib/rpc/index.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import RpcClientSimulator from './rpc-client-simulator';
2
2
  import RpcClientRealDevice from './rpc-client-real-device';
3
+ import * as rpcConstants from './constants';
3
4
 
4
5
 
5
- export { RpcClientSimulator, RpcClientRealDevice };
6
+ export { RpcClientSimulator, RpcClientRealDevice, rpcConstants };
@@ -5,6 +5,8 @@ import _ from 'lodash';
5
5
  import B from 'bluebird';
6
6
  import RpcMessageHandler from './rpc-message-handler';
7
7
  import { util, timing } from '@appium/support';
8
+ import { EventEmitter } from 'node:events';
9
+ import { ON_TARGET_PROVISIONED_EVENT } from './constants';
8
10
 
9
11
 
10
12
  const DATA_LOG_LENGTH = {length: 200};
@@ -74,6 +76,7 @@ export default class RpcClient {
74
76
 
75
77
  this._contexts = [];
76
78
  this._targets = {};
79
+ this._targetSubscriptions = new EventEmitter();
77
80
 
78
81
  // start with a best guess for the protocol
79
82
  this.isTargetBased = isTargetBased(isSafari, this.platformVersion);
@@ -107,6 +110,10 @@ export default class RpcClient {
107
110
  this.connected = !!connected;
108
111
  }
109
112
 
113
+ get targetSubscriptions() {
114
+ return this._targetSubscriptions;
115
+ }
116
+
110
117
  on (event, listener) {
111
118
  // @ts-ignore messageHandler must be defined here
112
119
  this.messageHandler.on(event, listener);
@@ -430,8 +437,20 @@ export default class RpcClient {
430
437
  if (targetId === oldTargetId) {
431
438
  log.debug(`Found provisional target for app '${app}'. Old target: '${oldTargetId}', new target: '${newTargetId}'. Updating`);
432
439
  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);
440
+ const opts = {appIdKey: app, pageIdKey: parseInt(page, 10)};
441
+ (async () => {
442
+ try {
443
+ // This is needed to enable the broadcast of page lifecycle events
444
+ await this.sendToDevice('Page.enable', opts, true);
445
+ } catch (err) {
446
+ log.warn(err.message);
447
+ }
448
+ this._targetSubscriptions.emit(ON_TARGET_PROVISIONED_EVENT, {
449
+ ...opts,
450
+ oldTargetId,
451
+ targetId: newTargetId,
452
+ });
453
+ })();
435
454
  return;
436
455
  }
437
456
  }
package/lib/utils.js CHANGED
@@ -145,23 +145,23 @@ function getDebuggerAppKey (bundleId, appDict) {
145
145
  *
146
146
  * @param {string} bundleId
147
147
  * @param {Record<string, any>} appDict
148
- * @returns {string|undefined}
148
+ * @returns {string[]}
149
149
  */
150
- function appIdForBundle (bundleId, appDict) {
151
- let appId;
150
+ function appIdsForBundle (bundleId, appDict) {
151
+ /** @type {Set<string>} */
152
+ const appIds = new Set();
152
153
  for (const [key, data] of _.toPairs(appDict)) {
153
154
  if (data.bundleId.endsWith(bundleId)) {
154
- appId = key;
155
- break;
155
+ appIds.add(key);
156
156
  }
157
157
  }
158
158
 
159
159
  // if nothing is found, try to get the generic app
160
- if (!appId && bundleId !== WEB_CONTENT_BUNDLE_ID) {
161
- return appIdForBundle(WEB_CONTENT_BUNDLE_ID, appDict);
160
+ if (appIds.size === 0 && bundleId !== WEB_CONTENT_BUNDLE_ID) {
161
+ return appIdsForBundle(WEB_CONTENT_BUNDLE_ID, appDict);
162
162
  }
163
163
 
164
- return appId;
164
+ return Array.from(appIds);
165
165
  }
166
166
 
167
167
  /**
@@ -176,7 +176,6 @@ function getPossibleDebuggerAppKeys(bundleIds, appDict) {
176
176
  log.debug('Skip checking bundle identifiers because the bundleIds includes a wildcard');
177
177
  return _.uniq(Object.keys(appDict));
178
178
  }
179
- let proxiedAppIds = [];
180
179
 
181
180
  // go through the possible bundle identifiers
182
181
  const possibleBundleIds = _.uniq([
@@ -188,24 +187,24 @@ function getPossibleDebuggerAppKeys(bundleIds, appDict) {
188
187
  ...bundleIds,
189
188
  ]);
190
189
  log.debug(`Checking for bundle identifiers: ${possibleBundleIds.join(', ')}`);
190
+ /** @type {Set<string>} */
191
+ const proxiedAppIds = new Set();
191
192
  for (const bundleId of possibleBundleIds) {
192
- const appId = appIdForBundle(bundleId, appDict);
193
-
194
193
  // now we need to determine if we should pick a proxy for this instead
195
- if (appId) {
196
- proxiedAppIds.push(appId);
194
+ for (const appId of appIdsForBundle(bundleId, appDict)) {
195
+ proxiedAppIds.add(appId);
197
196
  log.debug(`Found app id key '${appId}' for bundle '${bundleId}'`);
198
197
  for (const [key, data] of _.toPairs(appDict)) {
199
198
  if (data.isProxy && data.hostId === appId) {
200
199
  log.debug(`Found separate bundleId '${data.bundleId}' ` +
201
200
  `acting as proxy for '${bundleId}', with app id '${key}'`);
202
- proxiedAppIds.push(key);
201
+ proxiedAppIds.add(key);
203
202
  }
204
203
  }
205
204
  }
206
205
  }
207
206
 
208
- return _.uniq(proxiedAppIds);
207
+ return Array.from(proxiedAppIds);
209
208
  }
210
209
 
211
210
  function checkParams (params) {
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "keywords": [
5
5
  "appium"
6
6
  ],
7
- "version": "11.0.4",
7
+ "version": "11.0.6",
8
8
  "author": "Appium Contributors",
9
9
  "license": "Apache-2.0",
10
10
  "repository": {