appium-android-driver 7.3.1 → 7.4.1

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.
Files changed (13) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/build/lib/commands/context.d.ts.map +1 -1
  3. package/build/lib/commands/context.js +4 -3
  4. package/build/lib/commands/context.js.map +1 -1
  5. package/build/lib/helpers/types.d.ts +1 -0
  6. package/build/lib/helpers/types.d.ts.map +1 -1
  7. package/build/lib/helpers/webview.d.ts.map +1 -1
  8. package/build/lib/helpers/webview.js +33 -17
  9. package/build/lib/helpers/webview.js.map +1 -1
  10. package/lib/commands/context.js +4 -3
  11. package/lib/helpers/types.ts +2 -0
  12. package/lib/helpers/webview.ts +39 -21
  13. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -1,3 +1,17 @@
1
+ ## [7.4.1](https://github.com/appium/appium-android-driver/compare/v7.4.0...v7.4.1) (2023-12-18)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * Respect adb remote host setting while collecting CDP info ([#890](https://github.com/appium/appium-android-driver/issues/890)) ([23e76dd](https://github.com/appium/appium-android-driver/commit/23e76ddd63d07bbf8b65c53181c7784140966d82))
7
+
8
+ ## [7.4.0](https://github.com/appium/appium-android-driver/compare/v7.3.1...v7.4.0) (2023-12-17)
9
+
10
+
11
+ ### Features
12
+
13
+ * add waitForWebviewMs for mobile:getContexts ([#860](https://github.com/appium/appium-android-driver/issues/860)) ([d0352fa](https://github.com/appium/appium-android-driver/commit/d0352faa2a892dee81182981586e1260c7d376d4))
14
+
1
15
  ## [7.3.1](https://github.com/appium/appium-android-driver/compare/v7.3.0...v7.3.1) (2023-11-06)
2
16
 
3
17
 
package/build/lib/commands/context.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":";AAqfA,gMAAsE;kBAGzD,OAAO,YAAY,EAAE,GAAG;AA/crC;;;GAGG;AACH,4BAHU,OAAO,UAAU,EAAE,YAAY,GAAG,SAAS,OAAO,WAAW,EAAE,aAAa,CAAC,CAscrF;yBA7euB,qBAAqB"}
1
+ {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":";AAsfA,gMAAsE;kBAGzD,OAAO,YAAY,EAAE,GAAG;AAhdrC;;;GAGG;AACH,4BAHU,OAAO,UAAU,EAAE,YAAY,GAAG,SAAS,OAAO,WAAW,EAAE,aAAa,CAAC,CAucrF;yBA9euB,qBAAqB"}
package/build/lib/commands/context.js CHANGED
@@ -73,14 +73,15 @@ const ContextMixin = {
73
73
  await this.switchContext(name, webviewsMapping);
74
74
  this.curContext = name;
75
75
  },
76
- async mobileGetContexts() {
77
- const opts = {
76
+ async mobileGetContexts(opts = {}) {
77
+ const _opts = {
78
78
  androidDeviceSocket: this.opts.androidDeviceSocket,
79
79
  ensureWebviewsHavePages: true,
80
80
  webviewDevtoolsPort: this.opts.webviewDevtoolsPort,
81
81
  enableWebviewDetailsCollection: true,
82
+ waitForWebviewMs: opts.waitForWebviewMs || 0,
82
83
  };
83
- return await helpers_1.WebviewHelpers.getWebViewsMapping(this.adb, opts);
84
+ return await helpers_1.WebviewHelpers.getWebViewsMapping(/** @type {ADB} */ (this.adb), _opts);
84
85
  },
85
86
  assignContexts(webviewsMapping) {
86
87
  const opts = Object.assign({ isChromeSession: this.isChromeSession }, this.opts);
package/build/lib/commands/context.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":"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"}
package/build/lib/helpers/types.d.ts CHANGED
@@ -65,6 +65,7 @@ export interface GetWebviewsOpts {
65
65
  * @privateRemarks This is referenced but was not previously declared
66
66
  */
67
67
  isChromeSession?: boolean;
68
+ waitForWebviewMs?: number | string;
68
69
  }
69
70
  export interface ProcessInfo {
70
71
  /**
package/build/lib/helpers/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../lib/helpers/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC;;OAEG;IACH,uBAAuB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzC;;;OAGG;IACH,8BAA8B,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CACjD;AAED,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC;;OAEG;IACH,uBAAuB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzC;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC;;OAEG;IACH,8BAA8B,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAChD;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7B;;;;;;;;;;;OAWG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,MAAM,IAAI,GAAG,GAAG,CAAC;AAEvB;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC;AAE9B,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;CACxB;AAED,MAAM,MAAM,aAAa,GAAG,IAAI,CAC9B,iBAAiB,EACjB,YAAY,GAAG,iBAAiB,GAAG,aAAa,GAAG,gBAAgB,CACpE,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../lib/helpers/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC;;OAEG;IACH,uBAAuB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzC;;;OAGG;IACH,8BAA8B,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CACjD;AAED,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC;;OAEG;IACH,uBAAuB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzC;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC;;OAEG;IACH,8BAA8B,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAChD;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACpC;AAED,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAC7B;;;;;;;;;;;OAWG;IACH,IAAI,CAAC,EAAE,YAAY,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,MAAM,IAAI,GAAG,GAAG,CAAC;AAEvB;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC;AAE9B,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;CACxB;AAED,MAAM,MAAM,aAAa,GAAG,IAAI,CAC9B,iBAAiB,EACjB,YAAY,GAAG,iBAAiB,GAAG,aAAa,GAAG,gBAAgB,CACpE,CAAC"}
package/build/lib/helpers/webview.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"webview.d.ts","sourceRoot":"","sources":["../../../lib/helpers/webview.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGvD,OAAO,KAAK,EAEV,eAAe,EACf,cAAc,EAGf,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AAEpC,QAAA,MAAM,UAAU,eAAe,CAAC;AAChC,QAAA,MAAM,WAAW,YAAY,CAAC;AAC9B,QAAA,MAAM,YAAY,aAAa,CAAC;AAChC,QAAA,MAAM,YAAY,aAAoB,CAAC;AAGvC,eAAO,MAAM,uBAAuB,QAAgD,CAAC;AAIrF,QAAA,MAAM,0BAA0B,UAK/B,CAAC;AAYF,UAAU,cAAc;IACtB;;;;;;;;;;;OAWG;IACH,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAEhE;;;;;;OAMG;IACH,iBAAiB,EAAE,CAAC,eAAe,EAAE,eAAe,EAAE,EAAE,IAAI,CAAC,EAAE,eAAe,KAAK,MAAM,EAAE,CAAC;IAE5F;;;;;;;;;;;;;;OAcG;IACH,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,eAAe,KAAK,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IAErF;;;;;;OAMG;IACH,iBAAiB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,KAAK,cAAc,GAAG,SAAS,CAAC;IAE7E;;;;;;;;OAQG;IAEH,sBAAsB,EAAE,CACtB,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,cAAc,GAAG,IAAI,KACnC,MAAM,CAAC;CACb;AA2PD,QAAA,MAAM,cAAc,EAAE,cAiNrB,CAAC;AAEF,OAAO,EAAC,YAAY,EAAE,0BAA0B,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAC,CAAC;AACzF,eAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"webview.d.ts","sourceRoot":"","sources":["../../../lib/helpers/webview.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAGvD,OAAO,KAAK,EAEV,eAAe,EACf,cAAc,EAGf,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AAGpC,QAAA,MAAM,UAAU,eAAe,CAAC;AAChC,QAAA,MAAM,WAAW,YAAY,CAAC;AAC9B,QAAA,MAAM,YAAY,aAAa,CAAC;AAChC,QAAA,MAAM,YAAY,aAAoB,CAAC;AAGvC,eAAO,MAAM,uBAAuB,QAAgD,CAAC;AAIrF,QAAA,MAAM,0BAA0B,UAK/B,CAAC;AAaF,UAAU,cAAc;IACtB;;;;;;;;;;;OAWG;IACH,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAEhE;;;;;;OAMG;IACH,iBAAiB,EAAE,CAAC,eAAe,EAAE,eAAe,EAAE,EAAE,IAAI,CAAC,EAAE,eAAe,KAAK,MAAM,EAAE,CAAC;IAE5F;;;;;;;;;;;;;;OAcG;IACH,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,eAAe,KAAK,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IAErF;;;;;;OAMG;IACH,iBAAiB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,KAAK,cAAc,GAAG,SAAS,CAAC;IAE7E;;;;;;;;OAQG;IAEH,sBAAsB,EAAE,CACtB,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE,MAAM,EAChB,cAAc,CAAC,EAAE,cAAc,GAAG,IAAI,KACnC,MAAM,CAAC;CACb;AA6PD,QAAA,MAAM,cAAc,EAAE,cA+NrB,CAAC;AAEF,OAAO,EAAC,YAAY,EAAE,0BAA0B,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAC,CAAC;AACzF,eAAe,cAAc,CAAC"}
package/build/lib/helpers/webview.js CHANGED
@@ -17,6 +17,7 @@ const node_os_1 = __importDefault(require("node:os"));
17
17
  const node_path_1 = __importDefault(require("node:path"));
18
18
  const portscanner_1 = require("portscanner");
19
19
  const logger_1 = __importDefault(require("../logger"));
20
+ const asyncbox_1 = require("asyncbox");
20
21
  const NATIVE_WIN = 'NATIVE_APP';
21
22
  exports.NATIVE_WIN = NATIVE_WIN;
22
23
  const WEBVIEW_WIN = 'WEBVIEW';
@@ -45,6 +46,7 @@ const WEBVIEWS_DETAILS_CACHE = new lru_cache_1.LRUCache({
45
46
  });
46
47
  const CDP_REQ_TIMEOUT = 2000; // ms
47
48
  const DEVTOOLS_PORT_ALLOCATION_GUARD = support_1.util.getLockFileGuard(node_path_1.default.resolve(node_os_1.default.tmpdir(), 'android_devtools_port_guard'), { timeout: 7, tryRecovery: true });
49
+ const WEBVIEW_WAIT_INTERVAL_MS = 200;
48
50
  function toDetailsCacheKey(adb, webview) {
49
51
  return `${adb?.curDeviceId}:${webview}`;
50
52
  }
@@ -141,11 +143,11 @@ async function webviewsFromProcs(adb, deviceSocket = null) {
141
143
  * @param socketName - The remote Unix socket name
142
144
  * @param webviewDevtoolsPort - The local port number or null to apply
143
145
  * autodetection
144
- * @returns The local port number if the remote socket has been forwarded
145
- * successfully or `null` otherwise
146
+ * @returns The host name and the port number to connect to if the
147
+ * remote socket has been forwarded successfully
146
148
  * @throws {Error} If there was an error while allocating the local port
147
149
  */
148
- async function allocateDevtoolsPort(adb, socketName, webviewDevtoolsPort = null) {
150
+ async function allocateDevtoolsChannel(adb, socketName, webviewDevtoolsPort = null) {
149
151
  // socket names come with '@', but this should not be a part of the abstract
150
152
  // remote port, so remove it
151
153
  const remotePort = socketName.replace(/^@/, '');
@@ -159,7 +161,7 @@ async function allocateDevtoolsPort(adb, socketName, webviewDevtoolsPort = null)
159
161
  logger_1.default.debug(`You could use the 'webviewDevtoolsPort' capability to customize ` +
160
162
  `the starting port number`);
161
163
  }
162
- return (await DEVTOOLS_PORT_ALLOCATION_GUARD(async () => {
164
+ const port = (await DEVTOOLS_PORT_ALLOCATION_GUARD(async () => {
163
165
  let localPort;
164
166
  try {
165
167
  localPort = await (0, portscanner_1.findAPortNotInUse)(startPort, endPort);
@@ -172,6 +174,7 @@ async function allocateDevtoolsPort(adb, socketName, webviewDevtoolsPort = null)
172
174
  await adb.adbExec(['forward', `tcp:${localPort}`, `localabstract:${remotePort}`]);
173
175
  return localPort;
174
176
  }));
177
+ return [adb.adbHost ?? '127.0.0.1', port];
175
178
  }
176
179
  /**
177
180
  * This is a wrapper for Chrome Debugger Protocol data collection.
@@ -209,23 +212,24 @@ async function collectWebviewsDetails(adb, webviewsMapping, opts = {}) {
209
212
  const detailCollectors = [];
210
213
  for (const item of webviewsMapping) {
211
214
  detailCollectors.push((async () => {
212
- let localPort;
215
+ let port;
216
+ let host;
213
217
  try {
214
- localPort = await allocateDevtoolsPort(adb, item.proc, webviewDevtoolsPort);
218
+ [host, port] = await allocateDevtoolsChannel(adb, item.proc, webviewDevtoolsPort);
215
219
  if (enableWebviewDetailsCollection) {
216
- item.info = await cdpInfo(localPort);
220
+ item.info = await cdpInfo(host, port);
217
221
  }
218
222
  if (ensureWebviewsHavePages) {
219
- item.pages = await cdpList(localPort);
223
+ item.pages = await cdpList(host, port);
220
224
  }
221
225
  }
222
226
  catch (e) {
223
227
  logger_1.default.debug(e);
224
228
  }
225
229
  finally {
226
- if (localPort) {
230
+ if (port) {
227
231
  try {
228
- await adb.removePortForward(localPort);
232
+ await adb.removePortForward(port);
229
233
  }
230
234
  catch (e) {
231
235
  logger_1.default.debug(e);
@@ -238,16 +242,16 @@ async function collectWebviewsDetails(adb, webviewsMapping, opts = {}) {
238
242
  logger_1.default.debug(`CDP data collection completed`);
239
243
  }
240
244
  // https://chromedevtools.github.io/devtools-protocol/
241
- async function cdpList(localPort) {
245
+ async function cdpList(host, port) {
242
246
  return (await (0, axios_1.default)({
243
- url: `http://127.0.0.1:${localPort}/json/list`,
247
+ url: `http://${host}:${port}/json/list`,
244
248
  timeout: CDP_REQ_TIMEOUT,
245
249
  })).data;
246
250
  }
247
251
  // https://chromedevtools.github.io/devtools-protocol/
248
- async function cdpInfo(localPort) {
252
+ async function cdpInfo(host, port) {
249
253
  return (await (0, axios_1.default)({
250
- url: `http://127.0.0.1:${localPort}/json/version`,
254
+ url: `http://${host}:${port}/json/version`,
251
255
  timeout: CDP_REQ_TIMEOUT,
252
256
  })).data;
253
257
  }
@@ -282,9 +286,21 @@ const WebviewHelpers = {
282
286
  logger_1.default.debug(`Found ${support_1.util.pluralize('webview', result.length, true)}: ${JSON.stringify(result)}`);
283
287
  return result;
284
288
  },
285
- async getWebViewsMapping(adb, { androidDeviceSocket = null, ensureWebviewsHavePages = true, webviewDevtoolsPort = null, enableWebviewDetailsCollection = true, } = {}) {
286
- logger_1.default.debug('Getting a list of available webviews');
287
- const webviewsMapping = (await webviewsFromProcs(adb, androidDeviceSocket));
289
+ async getWebViewsMapping(adb, { androidDeviceSocket = null, ensureWebviewsHavePages = true, webviewDevtoolsPort = null, enableWebviewDetailsCollection = true, waitForWebviewMs = 0, } = {}) {
290
+ logger_1.default.debug(`Getting a list of available webviews`);
291
+ if (!lodash_1.default.isNumber(waitForWebviewMs)) {
292
+ waitForWebviewMs = parseInt(waitForWebviewMs, 10) || 0;
293
+ }
294
+ let webviewsMapping;
295
+ const timer = new support_1.timing.Timer().start();
296
+ do {
297
+ webviewsMapping = (await webviewsFromProcs(adb, androidDeviceSocket));
298
+ if (webviewsMapping.length > 0) {
299
+ break;
300
+ }
301
+ logger_1.default.debug(`No webviews found in ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
302
+ await (0, asyncbox_1.sleep)(WEBVIEW_WAIT_INTERVAL_MS);
303
+ } while (timer.getDuration().asMilliSeconds < waitForWebviewMs);
288
304
  await collectWebviewsDetails(adb, webviewsMapping, {
289
305
  ensureWebviewsHavePages,
290
306
  enableWebviewDetailsCollection,
package/build/lib/helpers/webview.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"webview.js","sourceRoot":"","sources":["../../../lib/helpers/webview.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webview.js","sourceRoot":"","sources":["../../../lib/helpers/webview.ts"],"names":[],"mappings":"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"}
package/lib/commands/context.js CHANGED
@@ -81,14 +81,15 @@ const ContextMixin = {
81
81
  this.curContext = name;
82
82
  },
83
83
 
84
- async mobileGetContexts() {
85
- const opts = {
84
+ async mobileGetContexts(opts = {}) {
85
+ const _opts = {
86
86
  androidDeviceSocket: this.opts.androidDeviceSocket,
87
87
  ensureWebviewsHavePages: true,
88
88
  webviewDevtoolsPort: this.opts.webviewDevtoolsPort,
89
89
  enableWebviewDetailsCollection: true,
90
+ waitForWebviewMs: opts.waitForWebviewMs || 0,
90
91
  };
91
- return await WebviewHelpers.getWebViewsMapping(this.adb, opts);
92
+ return await WebviewHelpers.getWebViewsMapping(/** @type {ADB} */ (this.adb), _opts);
92
93
  },
93
94
 
94
95
  assignContexts(webviewsMapping) {
package/lib/helpers/types.ts CHANGED
@@ -69,6 +69,8 @@ export interface GetWebviewsOpts {
69
69
  * @privateRemarks This is referenced but was not previously declared
70
70
  */
71
71
  isChromeSession?: boolean;
72
+
73
+ waitForWebviewMs?: number | string;
72
74
  }
73
75
 
74
76
  export interface ProcessInfo {
package/lib/helpers/webview.ts CHANGED
@@ -3,7 +3,7 @@
3
3
  * @module
4
4
  */
5
5
 
6
- import {util} from '@appium/support';
6
+ import {util, timing} from '@appium/support';
7
7
  import {StringRecord} from '@appium/types';
8
8
  import axios from 'axios';
9
9
  import B from 'bluebird';
@@ -23,6 +23,7 @@ import type {
23
23
  WebviewProps,
24
24
  } from './types';
25
25
  import type {ADB} from 'appium-adb';
26
+ import {sleep} from 'asyncbox';
26
27
 
27
28
  const NATIVE_WIN = 'NATIVE_APP';
28
29
  const WEBVIEW_WIN = 'WEBVIEW';
@@ -50,6 +51,7 @@ const DEVTOOLS_PORT_ALLOCATION_GUARD = util.getLockFileGuard(
50
51
  path.resolve(os.tmpdir(), 'android_devtools_port_guard'),
51
52
  {timeout: 7, tryRecovery: true},
52
53
  );
54
+ const WEBVIEW_WAIT_INTERVAL_MS = 200;
53
55
 
54
56
  interface WebviewHelpers {
55
57
  /**
@@ -224,15 +226,15 @@ async function webviewsFromProcs(
224
226
  * @param socketName - The remote Unix socket name
225
227
  * @param webviewDevtoolsPort - The local port number or null to apply
226
228
  * autodetection
227
- * @returns The local port number if the remote socket has been forwarded
228
- * successfully or `null` otherwise
229
+ * @returns The host name and the port number to connect to if the
230
+ * remote socket has been forwarded successfully
229
231
  * @throws {Error} If there was an error while allocating the local port
230
232
  */
231
- async function allocateDevtoolsPort(
233
+ async function allocateDevtoolsChannel(
232
234
  adb: any,
233
235
  socketName: string,
234
236
  webviewDevtoolsPort: number | null = null,
235
- ): Promise<number> {
237
+ ): Promise<[string, number]> {
236
238
  // socket names come with '@', but this should not be a part of the abstract
237
239
  // remote port, so remove it
238
240
  const remotePort = socketName.replace(/^@/, '');
@@ -250,7 +252,7 @@ async function allocateDevtoolsPort(
250
252
  `the starting port number`,
251
253
  );
252
254
  }
253
- return (await DEVTOOLS_PORT_ALLOCATION_GUARD(async () => {
255
+ const port = (await DEVTOOLS_PORT_ALLOCATION_GUARD(async () => {
254
256
  let localPort: number;
255
257
  try {
256
258
  localPort = await findAPortNotInUse(startPort, endPort);
@@ -264,6 +266,7 @@ async function allocateDevtoolsPort(
264
266
  await adb.adbExec(['forward', `tcp:${localPort}`, `localabstract:${remotePort}`]);
265
267
  return localPort;
266
268
  })) as number;
269
+ return [adb.adbHost ?? '127.0.0.1', port];
267
270
  }
268
271
 
269
272
  /**
@@ -320,21 +323,22 @@ async function collectWebviewsDetails(
320
323
  for (const item of webviewsMapping) {
321
324
  detailCollectors.push(
322
325
  (async () => {
323
- let localPort: number | undefined;
326
+ let port: number|undefined;
327
+ let host: string|undefined;
324
328
  try {
325
- localPort = await allocateDevtoolsPort(adb, item.proc, webviewDevtoolsPort);
329
+ [host, port] = await allocateDevtoolsChannel(adb, item.proc, webviewDevtoolsPort);
326
330
  if (enableWebviewDetailsCollection) {
327
- item.info = await cdpInfo(localPort);
331
+ item.info = await cdpInfo(host, port);
328
332
  }
329
333
  if (ensureWebviewsHavePages) {
330
- item.pages = await cdpList(localPort);
334
+ item.pages = await cdpList(host, port);
331
335
  }
332
336
  } catch (e) {
333
337
  logger.debug(e);
334
338
  } finally {
335
- if (localPort) {
339
+ if (port) {
336
340
  try {
337
- await adb.removePortForward(localPort);
341
+ await adb.removePortForward(port);
338
342
  } catch (e) {
339
343
  logger.debug(e);
340
344
  }
@@ -348,20 +352,20 @@ async function collectWebviewsDetails(
348
352
  }
349
353
 
350
354
  // https://chromedevtools.github.io/devtools-protocol/
351
- async function cdpList(localPort: number): Promise<object[]> {
355
+ async function cdpList(host: string, port: number): Promise<object[]> {
352
356
  return (
353
357
  await axios({
354
- url: `http://127.0.0.1:${localPort}/json/list`,
358
+ url: `http://${host}:${port}/json/list`,
355
359
  timeout: CDP_REQ_TIMEOUT,
356
360
  })
357
361
  ).data;
358
362
  }
359
363
 
360
364
  // https://chromedevtools.github.io/devtools-protocol/
361
- async function cdpInfo(localPort: number): Promise<object[]> {
365
+ async function cdpInfo(host: string, port: number): Promise<object[]> {
362
366
  return (
363
367
  await axios({
364
- url: `http://127.0.0.1:${localPort}/json/version`,
368
+ url: `http://${host}:${port}/json/version`,
365
369
  timeout: CDP_REQ_TIMEOUT,
366
370
  })
367
371
  ).data;
@@ -416,13 +420,27 @@ const WebviewHelpers: WebviewHelpers = {
416
420
  ensureWebviewsHavePages = true,
417
421
  webviewDevtoolsPort = null,
418
422
  enableWebviewDetailsCollection = true,
423
+ waitForWebviewMs = 0,
419
424
  }: GetWebviewsOpts = {},
420
425
  ): Promise<WebviewsMapping[]> {
421
- logger.debug('Getting a list of available webviews');
422
- const webviewsMapping = (await webviewsFromProcs(
423
- adb,
424
- androidDeviceSocket,
425
- )) as WebviewsMapping[];
426
+ logger.debug(`Getting a list of available webviews`);
427
+
428
+ if (!_.isNumber(waitForWebviewMs)) {
429
+ waitForWebviewMs = parseInt(waitForWebviewMs, 10) || 0;
430
+ }
431
+
432
+ let webviewsMapping: WebviewsMapping[];
433
+ const timer = new timing.Timer().start();
434
+ do {
435
+ webviewsMapping = (await webviewsFromProcs(adb, androidDeviceSocket)) as WebviewsMapping[];
436
+
437
+ if (webviewsMapping.length > 0) {
438
+ break;
439
+ }
440
+
441
+ logger.debug(`No webviews found in ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
442
+ await sleep(WEBVIEW_WAIT_INTERVAL_MS);
443
+ } while (timer.getDuration().asMilliSeconds < waitForWebviewMs);
426
444
 
427
445
  await collectWebviewsDetails(adb, webviewsMapping, {
428
446
  ensureWebviewsHavePages,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-android-driver",
3
- "version": "7.3.1",
3
+ "version": "7.4.1",
4
4
  "description": "Android UiAutomator and Chrome support for Appium",
5
5
  "keywords": [
6
6
  "appium",
@@ -117,7 +117,7 @@
117
117
  "semantic-release": "^22.0.5",
118
118
  "sinon": "^17.0.0",
119
119
  "ts-node": "^10.9.1",
120
- "typescript": "^5.1.6",
120
+ "typescript": "~5.2",
121
121
  "xpath": "^0.x"
122
122
  },
123
123
  "peerDependencies": {