appium-android-driver 7.8.1 → 7.8.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.
Files changed (6) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/build/lib/helpers/webview.d.ts.map +1 -1
  3. package/build/lib/helpers/webview.js +12 -7
  4. package/build/lib/helpers/webview.js.map +1 -1
  5. package/lib/helpers/webview.ts +15 -11
  6. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
1
+ ## [7.8.2](https://github.com/appium/appium-android-driver/compare/v7.8.1...v7.8.2) (2024-01-22)
2
+
3
+
4
+ ### Bug Fixes
5
+
6
+ * set keepAlive false to parse webview pages correctly Node.js >=19 ([#902](https://github.com/appium/appium-android-driver/issues/902)) ([daee212](https://github.com/appium/appium-android-driver/commit/daee212bbe3dac8d2ee714defbc51516285db345))
7
+
1
8
  ## [7.8.1](https://github.com/appium/appium-android-driver/compare/v7.8.0...v7.8.1) (2024-01-13)
2
9
 
3
10
 
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;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"}
1
+ {"version":3,"file":"webview.d.ts","sourceRoot":"","sources":["../../../lib/helpers/webview.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAYH,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;AAgQD,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
@@ -15,6 +15,7 @@ const lodash_1 = __importDefault(require("lodash"));
15
15
  const lru_cache_1 = require("lru-cache");
16
16
  const node_os_1 = __importDefault(require("node:os"));
17
17
  const node_path_1 = __importDefault(require("node:path"));
18
+ const node_http_1 = __importDefault(require("node:http"));
18
19
  const portscanner_1 = require("portscanner");
19
20
  const logger_1 = __importDefault(require("../logger"));
20
21
  const asyncbox_1 = require("asyncbox");
@@ -242,18 +243,22 @@ async function collectWebviewsDetails(adb, webviewsMapping, opts = {}) {
242
243
  logger_1.default.debug(`CDP data collection completed`);
243
244
  }
244
245
  // https://chromedevtools.github.io/devtools-protocol/
245
- async function cdpList(host, port) {
246
+ async function cdpGetRequest(host, port, endpoint) {
246
247
  return (await (0, axios_1.default)({
247
- url: `http://${host}:${port}/json/list`,
248
+ url: `http://${host}:${port}${endpoint}`,
248
249
  timeout: CDP_REQ_TIMEOUT,
250
+ // We need to set this from Node.js v19 onwards.
251
+ // Otherwise, in situation with multiple webviews,
252
+ // the preceding webview pages will be incorrectly retrieved as the current ones.
253
+ // https://nodejs.org/en/blog/announcements/v19-release-announce#https11-keepalive-by-default
254
+ httpAgent: new node_http_1.default.Agent({ keepAlive: false }),
249
255
  })).data;
250
256
  }
251
- // https://chromedevtools.github.io/devtools-protocol/
257
+ async function cdpList(host, port) {
258
+ return cdpGetRequest(host, port, '/json/list');
259
+ }
252
260
  async function cdpInfo(host, port) {
253
- return (await (0, axios_1.default)({
254
- url: `http://${host}:${port}/json/version`,
255
- timeout: CDP_REQ_TIMEOUT,
256
- })).data;
261
+ return cdpGetRequest(host, port, '/json/version');
257
262
  }
258
263
  const WebviewHelpers = {
259
264
  async procFromWebview(adb, webview) {
package/build/lib/helpers/webview.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"webview.js","sourceRoot":"","sources":["../../../lib/helpers/webview.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAEH,6CAA6C;AAE7C,kDAA0B;AAC1B,wDAAyB;AACzB,oDAAuB;AACvB,yCAAmC;AACnC,sDAAyB;AACzB,0DAA6B;AAC7B,6CAA8C;AAG9C,uDAA+B;AAS/B,uCAA+B;AAE/B,MAAM,UAAU,GAAG,YAAY,CAAC;AA2jBkB,gCAAU;AA1jB5D,MAAM,WAAW,GAAG,SAAS,CAAC;AA0jB8C,kCAAW;AAzjBvF,MAAM,YAAY,GAAG,UAAU,CAAC;AAyjBxB,oCAAY;AAxjBpB,MAAM,YAAY,GAAG,GAAG,WAAW,GAAG,CAAC;AAwjBuB,oCAAY;AAvjB1E,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAAC,IAAI,YAAY,QAAQ,CAAC,CAAC;AACjE,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAAC,IAAI,YAAY,oBAAoB,CAAC,CAAC;AAChE,QAAA,uBAAuB,GAAG,6CAA6C,CAAC;AACrF,MAAM,wBAAwB,GAAG,6BAA6B,CAAC;AAC/D,MAAM,wBAAwB,GAAG,wBAAwB,CAAC;AAC1D,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AACjD,MAAM,0BAA0B,GAAG;IACjC,mBAAmB;IACnB,iBAAiB;IACjB,gBAAgB;IAChB,mBAAmB;CACpB,CAAC;AA4iBoB,gEAA0B;AA3iBhD,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAC5C,MAAM,sBAAsB,GAAG,IAAI,oBAAQ,CAAyB;IAClE,GAAG,EAAE,GAAG;IACR,cAAc,EAAE,IAAI;CACrB,CAAC,CAAC;AACH,MAAM,eAAe,GAAG,IAAI,CAAC,CAAC,KAAK;AACnC,MAAM,8BAA8B,GAAG,cAAI,CAAC,gBAAgB,CAC1D,mBAAI,CAAC,OAAO,CAAC,iBAAE,CAAC,MAAM,EAAE,EAAE,6BAA6B,CAAC,EACxD,EAAC,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,EAAC,CAChC,CAAC;AACF,MAAM,wBAAwB,GAAG,GAAG,CAAC;AAqErC,SAAS,iBAAiB,CAAC,GAAQ,EAAE,OAAe;IAClD,OAAO,GAAG,GAAG,EAAE,WAAW,IAAI,OAAO,EAAE,CAAC;AAC1C,CAAC;AAED;;;;;;;;;GASG;AACH,KAAK,UAAU,wBAAwB,CAAC,GAAQ;IAC9C,MAAM,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAW,CAAC;IACnE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAClC,iDAAiD;QACjD,MAAM,CAAC,EAAE,AAAD,EAAG,AAAD,EAAG,KAAK,EAAE,AAAD,EAAG,EAAE,EAAE,AAAD,EAAG,QAAQ,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjE,IAAI,CAAC,QAAQ,EAAE;YACb,SAAS;SACV;QACD,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC5B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;SAC9B;QACD,IAAI,KAAK,KAAK,UAAU,IAAI,EAAE,KAAK,IAAI,EAAE;YACvC,SAAS;SACV;QACD,IAAI,CAAC,+BAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC3C,SAAS;SACV;QAED,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;KACtB;IACD,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACpB,gBAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACjD,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAC1B,gBAAM,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;SAC3E;KACF;SAAM;QACL,gBAAM,CAAC,KAAK,CACV,UAAU,KAAK,CAAC,MAAM,oBAAoB,cAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI;YACzF,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CACxB,CAAC;KACH;IACD,gEAAgE;IAChE,OAAO,gBAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED;;;;;;;;;GASG;AACH,KAAK,UAAU,iBAAiB,CAC9B,GAAQ,EACR,eAA8B,IAAI;IAElC,MAAM,WAAW,GAAG,MAAM,wBAAwB,CAAC,GAAG,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAsC,EAAE,CAAC;IACvD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;QACpC,IAAI,YAAY,KAAK,wBAAwB,IAAI,UAAU,KAAK,IAAI,YAAY,EAAE,EAAE;YAClF,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,YAAY;aACtB,CAAC,CAAC;YACH,SAAS;SACV;QAED,MAAM,eAAe,GAAG,+BAAuB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjE,IAAI,CAAC,eAAe,EAAE;YACpB,SAAS;SACV;QACD,MAAM,iBAAiB,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,cAAc,GAAG,wBAAwB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjE,IAAI,CAAC,iBAAiB,IAAI,CAAC,cAAc,EAAE;YACzC,SAAS;SACV;QAED,IAAI,CAAC,YAAY,IAAI,UAAU,KAAK,IAAI,YAAY,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE;YACxE,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,iBAAiB;oBACxB,CAAC,CAAC,GAAG,YAAY,GAAG,iBAAiB,EAAE;oBACvC,CAAC,CAAC,8DAA8D;wBAC9D,GAAG,YAAY,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE;aAC1C,CAAC,CAAC;SACJ;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;;;;GAUG;AACH,KAAK,UAAU,uBAAuB,CACpC,GAAQ,EACR,UAAkB,EAClB,sBAAqC,IAAI;IAEzC,4EAA4E;IAC5E,4BAA4B;IAC5B,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAChD,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,oBAAoB,CAAC;IAChD,IAAI,mBAAmB,EAAE;QACvB,OAAO,GAAG,mBAAmB,GAAG,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;QACtD,SAAS,GAAG,mBAAmB,CAAC;KACjC;IACD,gBAAM,CAAC,KAAK,CACV,0BAA0B,UAAU,cAAc,GAAG,iBAAiB,SAAS,KAAK,OAAO,EAAE,CAC9F,CAAC;IACF,IAAI,CAAC,mBAAmB,EAAE;QACxB,gBAAM,CAAC,KAAK,CACV,kEAAkE;YAChE,0BAA0B,CAC7B,CAAC;KACH;IACD,MAAM,IAAI,GAAG,CAAC,MAAM,8BAA8B,CAAC,KAAK,IAAI,EAAE;QAC5D,IAAI,SAAiB,CAAC;QACtB,IAAI;YACF,SAAS,GAAG,MAAM,IAAA,+BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;SACzD;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CACb,2DAA2D;gBACzD,YAAY,SAAS,KAAK,OAAO,2CAA2C;gBAC5E,4DAA4D,CAC/D,CAAC;SACH;QACD,MAAM,GAAG,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,OAAO,SAAS,EAAE,EAAE,iBAAiB,UAAU,EAAE,CAAC,CAAC,CAAC;QAClF,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAW,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,WAAW,EAAE,IAAI,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,KAAK,UAAU,sBAAsB,CACnC,GAAQ,EACR,eAA+B,EAC/B,OAAgC,EAAE;IAElC,IAAI,gBAAC,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;QAC9B,OAAO;KACR;IAED,MAAM,EACJ,mBAAmB,GAAG,IAAI,EAC1B,uBAAuB,GAAG,IAAI,EAC9B,8BAA8B,GAAG,IAAI,GACtC,GAAG,IAAI,CAAC;IAET,IAAI,CAAC,uBAAuB,EAAE;QAC5B,gBAAM,CAAC,IAAI,CACT,2DAA2D;YACzD,qDAAqD,CACxD,CAAC;KACH;IAED,IAAI,CAAC,8BAA8B,EAAE;QACnC,gBAAM,CAAC,IAAI,CACT,iEAAiE;YAC/D,6FAA6F;YAC7F,mBAAmB,CACtB,CAAC;KACH;IAED,IAAI,CAAC,uBAAuB,IAAI,CAAC,8BAA8B,EAAE;QAC/D,OAAO;KACR;IAED,gEAAgE;IAChE,gBAAM,CAAC,KAAK,CAAC,0BAA0B,cAAI,CAAC,SAAS,CAAC,SAAS,EAAE,eAAe,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAClG,MAAM,gBAAgB,GAAoB,EAAE,CAAC;IAC7C,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE;QAClC,gBAAgB,CAAC,IAAI,CACnB,CAAC,KAAK,IAAI,EAAE;YACV,IAAI,IAAsB,CAAC;YAC3B,IAAI,IAAsB,CAAC;YAC3B,IAAI;gBACF,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,MAAM,uBAAuB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;gBAClF,IAAI,8BAA8B,EAAE;oBAClC,IAAI,CAAC,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBACvC;gBACD,IAAI,uBAAuB,EAAE;oBAC3B,IAAI,CAAC,KAAK,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBACxC;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,gBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACjB;oBAAS;gBACR,IAAI,IAAI,EAAE;oBACR,IAAI;wBACF,MAAM,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;qBACnC;oBAAC,OAAO,CAAC,EAAE;wBACV,gBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;qBACjB;iBACF;aACF;QACH,CAAC,CAAC,EAAE,CACL,CAAC;KACH;IACD,MAAM,kBAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC9B,gBAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;AAChD,CAAC;AAED,sDAAsD;AACtD,KAAK,UAAU,OAAO,CAAC,IAAY,EAAE,IAAY;IAC/C,OAAO,CACL,MAAM,IAAA,eAAK,EAAC;QACV,GAAG,EAAE,UAAU,IAAI,IAAI,IAAI,YAAY;QACvC,OAAO,EAAE,eAAe;KACzB,CAAC,CACH,CAAC,IAAI,CAAC;AACT,CAAC;AAED,sDAAsD;AACtD,KAAK,UAAU,OAAO,CAAC,IAAY,EAAE,IAAY;IAC/C,OAAO,CACL,MAAM,IAAA,eAAK,EAAC;QACV,GAAG,EAAE,UAAU,IAAI,IAAI,IAAI,eAAe;QAC1C,OAAO,EAAE,eAAe;KACzB,CAAC,CACH,CAAC,IAAI,CAAC;AACT,CAAC;AAED,MAAM,cAAc,GAAmB;IACrC,KAAK,CAAC,eAAe,CAAC,GAAQ,EAAE,OAAe;QAC7C,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,OAAO,GAAG,CAAC,CAAC;SAChE;QAED,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACxB,gBAAM,CAAC,KAAK,CAAC,GAAG,OAAO,kBAAkB,GAAG,EAAE,CAAC,CAAC;QAChD,gBAAM,CAAC,KAAK,CAAC,qCAAqC,OAAO,GAAG,CAAC,CAAC;QAC9D,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACxC,gBAAM,CAAC,KAAK,CAAC,sBAAsB,GAAG,GAAG,CAAC,CAAC;QAC3C,OAAO,GAAG,CAAC;IACb,CAAC;IAED,iBAAiB,CACf,eAAkC,EAClC,EAAC,uBAAuB,GAAG,IAAI,EAAE,eAAe,GAAG,KAAK,KAAqB,EAAE;QAE/E,IAAI,eAAe,EAAE;YACnB,OAAO,CAAC,YAAY,CAAC,CAAC;SACvB;QAED,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,KAAK,MAAM,EAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAC,IAAI,eAAe,EAAE;YACjE,IAAI,uBAAuB,IAAI,KAAK,EAAE,MAAM,KAAK,CAAC,EAAE;gBAClD,gBAAM,CAAC,IAAI,CACT,yBAAyB,OAAO,SAAS,IAAI,IAAI;oBAC/C,yCAAyC,CAC5C,CAAC;gBACF,SAAS;aACV;YACD,IAAI,WAAW,EAAE;gBACf,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC1B;SACF;QACD,gBAAM,CAAC,KAAK,CACV,SAAS,cAAI,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CACrF,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,GAAQ,EACR,EACE,mBAAmB,GAAG,IAAI,EAC1B,uBAAuB,GAAG,IAAI,EAC9B,mBAAmB,GAAG,IAAI,EAC1B,8BAA8B,GAAG,IAAI,EACrC,gBAAgB,GAAG,CAAC,MACD,EAAE;QAEvB,gBAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAErD,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;YACjC,gBAAgB,GAAG,QAAQ,CAAC,gBAAgB,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;SACxD;QAED,IAAI,eAAkC,CAAC;QACvC,MAAM,KAAK,GAAG,IAAI,gBAAM,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;QACzC,GAAG;YACD,eAAe,GAAG,CAAC,MAAM,iBAAiB,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAsB,CAAC;YAE3F,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC9B,MAAM;aACP;YAED,gBAAM,CAAC,KAAK,CAAC,wBAAwB,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACxF,MAAM,IAAA,gBAAK,EAAC,wBAAwB,CAAC,CAAC;SACvC,QAAQ,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,GAAG,gBAAgB,EAAE;QAEhE,MAAM,sBAAsB,CAAC,GAAG,EAAE,eAAe,EAAE;YACjD,uBAAuB;YACvB,8BAA8B;YAC9B,mBAAmB;SACpB,CAAC,CAAC;QAEH,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;YAC5C,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,cAAc,CAAC;YACvC,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC;YAElC,IAAI,MAAM,GAAG,OAAO,CAAC;YACrB,IAAI,OAAsD,CAAC;YAC3D,IAAI,CAAC,mBAAmB,EAAE;gBACxB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnD,IAAI;oBACF,sEAAsE;oBACtE,6CAA6C;oBAC7C,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;oBACxF,MAAM,GAAG,GAAG,YAAY,GAAG,GAAG,EAAE,CAAC;oBACjC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACnD,OAAO,GAAG;wBACR,IAAI,EAAE,GAAG;wBACT,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;qBAClC,CAAC;iBACH;gBAAC,OAAO,CAAC,EAAE;oBACV,gBAAM,CAAC,IAAI,CAAE,CAAW,CAAC,OAAO,CAAC,CAAC;oBAClC,SAAS;iBACV;aACF;YAED,cAAc,CAAC,WAAW,GAAG,MAAM,CAAC;YACpC,MAAM,GAAG,GAAG,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC3C,IAAI,IAAI,IAAI,OAAO,EAAE;gBACnB,sBAAsB,CAAC,GAAG,CAAC,GAAG,EAAE,EAAC,IAAI,EAAE,OAAO,EAAC,CAAC,CAAC;aAClD;iBAAM,IAAI,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAC1C,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACpC;SACF;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,iBAAiB,CAAC,GAAQ,EAAE,OAAe;QACzC,MAAM,GAAG,GAAG,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,sBAAsB,CACpB,IAAS,EACT,QAAgB,EAChB,cAAsC;QAEtC,MAAM,IAAI,GAAsD,EAAC,aAAa,EAAE,EAAE,EAAQ,CAAC;QAE3F,MAAM,cAAc,GAClB,IAAI,CAAC,aAAa,EAAE,cAAc;YAClC,IAAI,CAAC,UAAU;YACf,cAAc,EAAE,IAAI,EAAE,CAAC,iBAAiB,CAAC,CAAC;QAC5C,IAAI,cAAc,EAAE;YAClB,8EAA8E;YAE9E,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,cAAc,CAAC;SACpD;QACD,IAAI,gBAAC,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE;YACzC,IAAI,CAAC,aAAa,CAAC,oBAAoB,GAAG,IAAI,CAAC,mBAAmB,CAAC;SACpE;QACD,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC7B,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC;SAC/D;QACD,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC9B,IAAI,CAAC,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC,qBAAqB,CAAC;SACjE;QACD,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC7B,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC;SAC/D;aAAM,IAAI,cAAc,EAAE,OAAO,EAAE,IAAI,IAAI,cAAc,EAAE,OAAO,EAAE,EAAE,EAAE;YACvE,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC;SACjE;QACD,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,kBAAkB,EAAE;YACtD,IAAI,CAAC,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC;SACvD;QACD,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;SAC/C;QACD,MAAM,QAAQ,GAAG,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,KAAK,QAAQ,CAAC;QAC3E,IAAI,gBAAC,CAAC,QAAQ,CAAC,0BAA0B,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,QAAQ,EAAE;YACzF,2EAA2E;YAC3E,0EAA0E;YAC1E,sCAAsC;YACtC,IAAI,QAAQ,EAAE;gBACZ,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,mBAAmB,CAAC;aACzD;YACD,OAAO,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;YAC1C,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;SAC1C;QACD,yBAAyB;QACzB,IAAI,CAAC,aAAa,CAAC,mBAAmB,GAAG,QAAQ,CAAC;QAElD,IAAI,gBAAC,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,gBAAC,CAAC,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;YAClF,IAAI,IAAI,CAAC,YAAY,EAAE;gBACrB,gBAAM,CAAC,IAAI,CACT,gFAAgF,CACjF,CAAC;aACH;YACD,6DAA6D;YAC7D,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,YAAY,CAAC;SAClE;QACD,IAAI,IAAI,CAAC,wBAAwB,EAAE;YACjC,gBAAM,CAAC,IAAI,CACT,+DAA+D;gBAC7D,6EAA6E,CAChF,CAAC;YACF,MAAM,OAAO,GAAG,EAAC,WAAW,EAAE,KAAK,EAAC,CAAC;YACrC,2EAA2E;YAC3E,6DAA6D;YAC7D,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY;gBACnC,CAAC,CAAC,6DAA6D;oBAC7D,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC;gBAC/C,CAAC,CAAC,OAAO,CAAC;SACb;QAED,IAAI,IAAI,CAAC,aAAa,EAAE,SAAS,EAAE;YACjC,+BAA+B;YAC/B,IAAI,CAAC,aAAa,CAAC,IAAI,GAAG;gBACxB,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,IAAI,EAAE,CAAC;gBAClC,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS;aAChC,CAAC;YACF,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;SACrC;QAED,gBAAM,CAAC,KAAK,CACV,2CAA2C,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAC1F,CAAC;QAEF,MAAM,iBAAiB,GAAa,EAAE,CAAC;QACvC,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;YACtD,IAAI,gBAAC,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE;gBAC1C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;aAC/B;iBAAM;gBACL,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC7B;SACF;QACD,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;YACjC,gBAAM,CAAC,IAAI,CACT,+DAA+D;gBAC7D,gCAAgC,CACnC,CAAC;YACF,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE;gBACvC,gBAAM,CAAC,IAAI,CAAC,KAAK,OAAO,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;aAC9E;SACF;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC;AAGF,kBAAe,cAAc,CAAC"}
1
+ {"version":3,"file":"webview.js","sourceRoot":"","sources":["../../../lib/helpers/webview.ts"],"names":[],"mappings":"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"}
package/lib/helpers/webview.ts CHANGED
@@ -11,6 +11,7 @@ import _ from 'lodash';
11
11
  import {LRUCache} from 'lru-cache';
12
12
  import os from 'node:os';
13
13
  import path from 'node:path';
14
+ import http from 'node:http';
14
15
  import {findAPortNotInUse} from 'portscanner';
15
16
  import type {WebviewsMapping} from '../commands/types';
16
17
  import type {AndroidDriverCaps} from '../driver';
@@ -323,8 +324,8 @@ async function collectWebviewsDetails(
323
324
  for (const item of webviewsMapping) {
324
325
  detailCollectors.push(
325
326
  (async () => {
326
- let port: number|undefined;
327
- let host: string|undefined;
327
+ let port: number | undefined;
328
+ let host: string | undefined;
328
329
  try {
329
330
  [host, port] = await allocateDevtoolsChannel(adb, item.proc, webviewDevtoolsPort);
330
331
  if (enableWebviewDetailsCollection) {
@@ -352,23 +353,26 @@ async function collectWebviewsDetails(
352
353
  }
353
354
 
354
355
  // https://chromedevtools.github.io/devtools-protocol/
355
- async function cdpList(host: string, port: number): Promise<object[]> {
356
+ async function cdpGetRequest(host: string, port: number, endpoint: string): Promise<object[]> {
356
357
  return (
357
358
  await axios({
358
- url: `http://${host}:${port}/json/list`,
359
+ url: `http://${host}:${port}${endpoint}`,
359
360
  timeout: CDP_REQ_TIMEOUT,
361
+ // We need to set this from Node.js v19 onwards.
362
+ // Otherwise, in situation with multiple webviews,
363
+ // the preceding webview pages will be incorrectly retrieved as the current ones.
364
+ // https://nodejs.org/en/blog/announcements/v19-release-announce#https11-keepalive-by-default
365
+ httpAgent: new http.Agent({keepAlive: false}),
360
366
  })
361
367
  ).data;
362
368
  }
363
369
 
364
- // https://chromedevtools.github.io/devtools-protocol/
370
+ async function cdpList(host: string, port: number): Promise<object[]> {
371
+ return cdpGetRequest(host, port, '/json/list');
372
+ }
373
+
365
374
  async function cdpInfo(host: string, port: number): Promise<object[]> {
366
- return (
367
- await axios({
368
- url: `http://${host}:${port}/json/version`,
369
- timeout: CDP_REQ_TIMEOUT,
370
- })
371
- ).data;
375
+ return cdpGetRequest(host, port, '/json/version');
372
376
  }
373
377
 
374
378
  const WebviewHelpers: WebviewHelpers = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "appium-android-driver",
3
- "version": "7.8.1",
3
+ "version": "7.8.2",
4
4
  "description": "Android UiAutomator and Chrome support for Appium",
5
5
  "keywords": [
6
6
  "appium",