appium-android-driver 5.14.0 → 5.14.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [5.14.2](https://github.com/appium/appium-android-driver/compare/v5.14.1...v5.14.2) (2023-08-14)
+
+
+### Bug Fixes
+
+* relax webview matching logic of devtools_remote ([#836](https://github.com/appium/appium-android-driver/issues/836)) ([7c52b81](https://github.com/appium/appium-android-driver/commit/7c52b8197279df2cfa0e9bfa402de9db74704175))
+
+## [5.14.1](https://github.com/appium/appium-android-driver/compare/v5.14.0...v5.14.1) (2023-08-14)
+
+
+### Miscellaneous Chores
+
+* use newer typescript ([#837](https://github.com/appium/appium-android-driver/issues/837)) ([eb59e9a](https://github.com/appium/appium-android-driver/commit/eb59e9a9b70e1a722f0ca34bff67a3c5a8ea849b))
+
 ## [5.14.0](https://github.com/appium/appium-android-driver/compare/v5.13.6...v5.14.0) (2023-06-20)
 
 

package/build/lib/android-helpers.d.ts

@@ -131,6 +131,6 @@ export const APP_STATE: Readonly<{
 }>;
 export function prepareAvdArgs(adb: any, opts: any): any[];
 export function ensureNetworkSpeed(adb: any, networkSpeed: any): any;
-import Bootstrap from "./bootstrap";
-import { helpers as unlocker } from "./unlock-helpers";
+import Bootstrap from './bootstrap';
+import { helpers as unlocker } from './unlock-helpers';
 //# sourceMappingURL=android-helpers.d.ts.map

package/build/lib/android-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"android-helpers.d.ts","sourceRoot":"","sources":["../../lib/android-helpers.js"],"names":[],"mappings":";;IAiHA,uDAmCC;IAED,oEAuCC;IAED;;;;;;;;;;;OAWG;IACH,uHAaC;IAED;;;OA4FC;IAGD,mDASC;IAED,8DAeC;IAED;;;;;mBA8BC;IAED,6DAsDC;IAED,+DAsCC;IAED;;;;OAIG;IACH,qFAgBC;IAED;;;;;OAKG;IACH,kHAQC;IAED;;;;;OAKG;IACH,qFAUC;IAED,4DAYC;IAED,sEAiCC;IAED,2DA+BC;IAED,wFAQC;IAED;;;;;;;;OAQG;IACH,2FA0DC;IAED;;;;;;;;;;;;;OAaG;IACH,+EAiCC;IAED,gFAsCC;IAED,wEAUC;IAED,8DA6DC;IAED,qDAMC;IAED,mEAMC;IAED,uDAEC;IAED,gDAEC;IAED,8FASC;IAED;;;;;OAKG;IACH,4CAaC;IAED;;;;;;OAMG;IACH,wDAoBC;IAED;;;;;;;;OAQG;IACH,0DAmBC;IAED;;;;;;OAMG;IACH,yDAGC;;;;AA55BD,0DAAoD;AAKpD;;;;;GAKG;AAYH,2DAqBC;AA9BD,qEAOC"}
+{"version":3,"file":"android-helpers.d.ts","sourceRoot":"","sources":["../../lib/android-helpers.js"],"names":[],"mappings":";;IAiHA,uDAmCC;IAED,oEAuCC;IAED;;;;;;;;;;;OAWG;IACH,uHAaC;IAED;;;OA4FC;IAGD,mDASC;IAED,8DAeC;IAED;;;;;mBA8BC;IAED,6DAsDC;IAED,+DAsCC;IAED;;;;OAIG;IACH,qFAgBC;IAED;;;;;OAKG;IACH,kHAQC;IAED;;;;;OAKG;IACH,qFAUC;IAED,4DAYC;IAED,sEAiCC;IAED,2DA+BC;IAED,wFAQC;IAED;;;;;;;;OAQG;IACH,2FA0DC;IAED;;;;;;;;;;;;;OAaG;IACH,+EAiCC;IAED,gFAsCC;IAED,wEAUC;IAED,8DA6DC;IAED,qDAMC;IAED,mEAMC;IAED,uDAEC;IAED,gDAEC;IAED,8FASC;IAED;;;;;OAKG;IACH,4CAaC;IAED;;;;;;OAMG;IACH,wDAoBC;IAED;;;;;;;;OAQG;IACH,0DAmBC;IAED;;;;;;OAMG;IACH,yDAGC;;;;AA55BD,0DAAoD;AAKpD;;;;;GAKG;AAYH,2DAqBC;AA9BD,qEAOC;sBAlEqB,aAAa;oCAO5B,kBAAkB"}

package/build/lib/bootstrap.d.ts

@@ -20,10 +20,10 @@ export class AndroidBootstrap {
     _ignoreUnexpectedShutdown: any;
 }
 export namespace COMMAND_TYPES {
-    const ACTION: string;
-    const SHUTDOWN: string;
+    let ACTION: string;
+    let SHUTDOWN: string;
 }
-import B from "bluebird";
-import net from "net";
-import UiAutomator from "./uiautomator";
+import B from 'bluebird';
+import net from 'net';
+import UiAutomator from './uiautomator';
 //# sourceMappingURL=bootstrap.d.ts.map

package/build/lib/bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../lib/bootstrap.js"],"names":[],"mappings":";;AAuCA;IACE,kEAKC;IAJC,SAAc;IACd,mBAA4B;IAC5B,eAA0B;IA4K5B,uCAGC;IAED,oCAEC;IA/KD,mCASC;IANG,iDAEE;IAMN,iGA4EC;IArEG,aAMC;IA6CG,qCAA6D;IAoBrE,iDA4CC;IAED,mDAGC;IAED,0BAaC;IADC,4CAAuB;IAIzB,sBAUC;IAIC,+BAAuC;CAM1C"}
+{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../lib/bootstrap.js"],"names":[],"mappings":";;AAuCA;IACE,kEAKC;IAJC,SAAc;IACd,mBAA4B;IAC5B,eAA0B;IA4K5B,uCAGC;IAED,oCAEC;IA/KD,mCASC;IANG,iDAEE;IAMN,iGA4EC;IArEG,aAMC;IA6CG,qCAA6D;IAoBrE,iDA4CC;IAED,mDAGC;IAED,0BAaC;IADC,4CAAuB;IAIzB,sBAUC;IAIC,+BAAuC;CAM1C;;;;;cA1Na,UAAU;gBAJR,KAAK;wBADG,eAAe"}

package/build/lib/commands/context.d.ts

@@ -90,5 +90,5 @@ export namespace helpers {
 }
 export function setupNewChromedriver(opts: any, curDeviceId: any, adb: any, context?: null): Promise<Chromedriver>;
 declare let extensions: {};
-import Chromedriver from "appium-chromedriver";
+import Chromedriver from 'appium-chromedriver';
 //# sourceMappingURL=context.d.ts.map

package/build/lib/commands/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":";;;;;UAwDc,MAAM;;;;;aACN,MAAM;;;;;;;;;;WAIL,UAAa;;;IAzC5B,2CAIC;IAED,qCAGC;IAED,8CAqBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAuCG;IAEH;;;;OAIG;IACH,gDAQC;;;IAED,wDAMC;IAED,uEAoBC;IAUD,sCAEC;IAED,sCAEC;IAED,iCAEC;IAGD,mFAuEC;IAGD,0CAKC;IAGD,yDAcC;IAID,kDAcC;IAED,uDAEC;IAED,2CAIC;IAED,+CAiBC;IAED,6CAqCC;IAuED,sDAOC;IAED,4GAiDC;;AAjDD,mHAiDC;AA1cgC,2BAAe"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../lib/commands/context.js"],"names":[],"mappings":";;;;;UAwDc,MAAM;;;;;aACN,MAAM;;;;;;;;;;WAIL,UAAa;;;IAzC5B,2CAIC;IAED,qCAGC;IAED,8CAqBC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAuCG;IAEH;;;;OAIG;IACH,gDAQC;;;IAED,wDAMC;IAED,uEAoBC;IAUD,sCAEC;IAED,sCAEC;IAED,iCAEC;IAGD,mFAuEC;IAGD,0CAKC;IAGD,yDAcC;IAID,kDAcC;IAED,uDAEC;IAED,2CAIC;IAED,+CAiBC;IAED,6CAqCC;IAuED,sDAOC;IAED,4GAiDC;;AAjDD,mHAiDC;AA1cgC,2BAAe;yBAbvB,qBAAqB"}

package/build/lib/commands/log.d.ts

@@ -21,17 +21,17 @@ export let helpers: {};
 declare namespace extensions {
     namespace supportedLogTypes {
         namespace logcat {
-            const description: string;
+            let description: string;
             function getter(self: any): Promise<any>;
         }
         namespace bugreport {
-            const description_1: string;
+            let description_1: string;
             export { description_1 as description };
             export function getter_1(self: any): Promise<any>;
             export { getter_1 as getter };
         }
         namespace server {
-            const description_2: string;
+            let description_2: string;
             export { description_2 as description };
             export function getter_2(self: any): {
                 timestamp: any;

package/build/lib/desired-caps.d.ts

@@ -2,351 +2,351 @@ export default desiredCapConstraints;
 declare let desiredCapConstraints: {};
 export namespace commonCapConstraints {
     namespace platformName {
-        const isString: boolean;
-        const inclusionCaseInsensitive: string[];
-        const presence: boolean;
+        let isString: boolean;
+        let inclusionCaseInsensitive: string[];
+        let presence: boolean;
     }
     namespace app {
-        const isString_1: boolean;
+        let isString_1: boolean;
         export { isString_1 as isString };
     }
     namespace appActivity {
-        const isString_2: boolean;
+        let isString_2: boolean;
         export { isString_2 as isString };
     }
     namespace appPackage {
-        const isString_3: boolean;
+        let isString_3: boolean;
         export { isString_3 as isString };
     }
     namespace appWaitActivity {
-        const isString_4: boolean;
+        let isString_4: boolean;
         export { isString_4 as isString };
     }
     namespace appWaitPackage {
-        const isString_5: boolean;
+        let isString_5: boolean;
         export { isString_5 as isString };
     }
     namespace appWaitDuration {
-        const isNumber: boolean;
+        let isNumber: boolean;
     }
     namespace deviceReadyTimeout {
-        const isNumber_1: boolean;
+        let isNumber_1: boolean;
         export { isNumber_1 as isNumber };
     }
     namespace androidCoverage {
-        const isString_6: boolean;
+        let isString_6: boolean;
         export { isString_6 as isString };
     }
     namespace androidDeviceReadyTimeout {
-        const isNumber_2: boolean;
+        let isNumber_2: boolean;
         export { isNumber_2 as isNumber };
     }
     namespace androidDeviceSocket {
-        const isString_7: boolean;
+        let isString_7: boolean;
         export { isString_7 as isString };
     }
     namespace androidInstallTimeout {
-        const isNumber_3: boolean;
+        let isNumber_3: boolean;
         export { isNumber_3 as isNumber };
     }
     namespace adbPort {
-        const isNumber_4: boolean;
+        let isNumber_4: boolean;
         export { isNumber_4 as isNumber };
     }
     namespace remoteAdbHost {
-        const isString_8: boolean;
+        let isString_8: boolean;
         export { isString_8 as isString };
     }
     namespace adbExecTimeout {
-        const isNumber_5: boolean;
+        let isNumber_5: boolean;
         export { isNumber_5 as isNumber };
     }
     namespace avd {
-        const isString_9: boolean;
+        let isString_9: boolean;
         export { isString_9 as isString };
     }
     namespace avdLaunchTimeout {
-        const isNumber_6: boolean;
+        let isNumber_6: boolean;
         export { isNumber_6 as isNumber };
     }
     namespace avdReadyTimeout {
-        const isNumber_7: boolean;
+        let isNumber_7: boolean;
         export { isNumber_7 as isNumber };
     }
-    const avdArgs: {};
+    let avdArgs: {};
     namespace avdEnv {
-        const isObject: boolean;
+        let isObject: boolean;
     }
     namespace useKeystore {
-        const isBoolean: boolean;
+        let isBoolean: boolean;
     }
     namespace keystorePath {
-        const isString_10: boolean;
+        let isString_10: boolean;
         export { isString_10 as isString };
     }
     namespace keystorePassword {
-        const isString_11: boolean;
+        let isString_11: boolean;
         export { isString_11 as isString };
     }
     namespace keyAlias {
-        const isString_12: boolean;
+        let isString_12: boolean;
         export { isString_12 as isString };
     }
     namespace keyPassword {
-        const isString_13: boolean;
+        let isString_13: boolean;
         export { isString_13 as isString };
     }
     namespace webviewDevtoolsPort {
-        const isNumber_8: boolean;
+        let isNumber_8: boolean;
         export { isNumber_8 as isNumber };
     }
     namespace ensureWebviewsHavePages {
-        const isBoolean_1: boolean;
+        let isBoolean_1: boolean;
         export { isBoolean_1 as isBoolean };
     }
     namespace enableWebviewDetailsCollection {
-        const isBoolean_2: boolean;
+        let isBoolean_2: boolean;
         export { isBoolean_2 as isBoolean };
     }
     namespace chromeDriverPort {
-        const isNumber_9: boolean;
+        let isNumber_9: boolean;
         export { isNumber_9 as isNumber };
     }
     namespace chromedriverPort {
-        const isNumber_10: boolean;
+        let isNumber_10: boolean;
         export { isNumber_10 as isNumber };
     }
     namespace chromedriverPorts {
-        const isArray: boolean;
+        let isArray: boolean;
     }
     namespace chromedriverArgs {
-        const isObject_1: boolean;
+        let isObject_1: boolean;
         export { isObject_1 as isObject };
     }
     namespace chromedriverExecutable {
-        const isString_14: boolean;
+        let isString_14: boolean;
         export { isString_14 as isString };
     }
     namespace chromedriverExecutableDir {
-        const isString_15: boolean;
+        let isString_15: boolean;
         export { isString_15 as isString };
     }
     namespace chromedriverChromeMappingFile {
-        const isString_16: boolean;
+        let isString_16: boolean;
         export { isString_16 as isString };
     }
     namespace chromedriverUseSystemExecutable {
-        const isBoolean_3: boolean;
+        let isBoolean_3: boolean;
         export { isBoolean_3 as isBoolean };
     }
     namespace chromedriverDisableBuildCheck {
-        const isBoolean_4: boolean;
+        let isBoolean_4: boolean;
         export { isBoolean_4 as isBoolean };
     }
     namespace chromeLoggingPrefs {
-        const isObject_2: boolean;
+        let isObject_2: boolean;
         export { isObject_2 as isObject };
     }
     namespace autoWebviewTimeout {
-        const isNumber_11: boolean;
+        let isNumber_11: boolean;
         export { isNumber_11 as isNumber };
     }
     namespace autoWebviewName {
-        const isString_17: boolean;
+        let isString_17: boolean;
         export { isString_17 as isString };
     }
     namespace intentAction {
-        const isString_18: boolean;
+        let isString_18: boolean;
         export { isString_18 as isString };
     }
     namespace intentCategory {
-        const isString_19: boolean;
+        let isString_19: boolean;
         export { isString_19 as isString };
     }
     namespace intentFlags {
-        const isString_20: boolean;
+        let isString_20: boolean;
         export { isString_20 as isString };
     }
     namespace optionalIntentArguments {
-        const isString_21: boolean;
+        let isString_21: boolean;
         export { isString_21 as isString };
     }
     namespace dontStopAppOnReset {
-        const isBoolean_5: boolean;
+        let isBoolean_5: boolean;
         export { isBoolean_5 as isBoolean };
     }
     namespace unicodeKeyboard {
-        const isBoolean_6: boolean;
+        let isBoolean_6: boolean;
         export { isBoolean_6 as isBoolean };
     }
     namespace resetKeyboard {
-        const isBoolean_7: boolean;
+        let isBoolean_7: boolean;
         export { isBoolean_7 as isBoolean };
     }
     namespace noSign {
-        const isBoolean_8: boolean;
+        let isBoolean_8: boolean;
         export { isBoolean_8 as isBoolean };
     }
     namespace recreateChromeDriverSessions {
-        const isBoolean_9: boolean;
+        let isBoolean_9: boolean;
         export { isBoolean_9 as isBoolean };
     }
     namespace autoLaunch {
-        const isBoolean_10: boolean;
+        let isBoolean_10: boolean;
         export { isBoolean_10 as isBoolean };
     }
     namespace nativeWebScreenshot {
-        const isBoolean_11: boolean;
+        let isBoolean_11: boolean;
         export { isBoolean_11 as isBoolean };
     }
     namespace androidScreenshotPath {
-        const isString_22: boolean;
+        let isString_22: boolean;
         export { isString_22 as isString };
     }
     namespace androidInstallPath {
-        const isString_23: boolean;
+        let isString_23: boolean;
         export { isString_23 as isString };
     }
     namespace clearSystemFiles {
-        const isBoolean_12: boolean;
+        let isBoolean_12: boolean;
         export { isBoolean_12 as isBoolean };
     }
     namespace extractChromeAndroidPackageFromContextName {
-        const isBoolean_13: boolean;
+        let isBoolean_13: boolean;
         export { isBoolean_13 as isBoolean };
     }
     namespace autoGrantPermissions {
-        const isBoolean_14: boolean;
+        let isBoolean_14: boolean;
         export { isBoolean_14 as isBoolean };
     }
     namespace sharedPreferences {
-        const isObject_3: boolean;
+        let isObject_3: boolean;
         export { isObject_3 as isObject };
     }
     namespace networkSpeed {
-        const isString_24: boolean;
+        let isString_24: boolean;
         export { isString_24 as isString };
     }
     namespace gpsEnabled {
-        const isBoolean_15: boolean;
+        let isBoolean_15: boolean;
         export { isBoolean_15 as isBoolean };
     }
     namespace isHeadless {
-        const isBoolean_16: boolean;
+        let isBoolean_16: boolean;
         export { isBoolean_16 as isBoolean };
     }
     namespace showChromedriverLog {
-        const isBoolean_17: boolean;
+        let isBoolean_17: boolean;
         export { isBoolean_17 as isBoolean };
     }
     namespace skipUnlock {
-        const isBoolean_18: boolean;
+        let isBoolean_18: boolean;
         export { isBoolean_18 as isBoolean };
     }
     namespace clearDeviceLogsOnStart {
-        const isBoolean_19: boolean;
+        let isBoolean_19: boolean;
         export { isBoolean_19 as isBoolean };
     }
     namespace unlockType {
-        const isString_25: boolean;
+        let isString_25: boolean;
         export { isString_25 as isString };
     }
     namespace unlockKey {
-        const isString_26: boolean;
+        let isString_26: boolean;
         export { isString_26 as isString };
     }
     namespace unlockStrategy {
-        const isString_27: boolean;
+        let isString_27: boolean;
         export { isString_27 as isString };
-        const inclusionCaseInsensitive_1: string[];
+        let inclusionCaseInsensitive_1: string[];
         export { inclusionCaseInsensitive_1 as inclusionCaseInsensitive };
     }
     namespace otherApps {
-        const isString_28: boolean;
+        let isString_28: boolean;
         export { isString_28 as isString };
     }
     namespace uninstallOtherPackages {
-        const isString_29: boolean;
+        let isString_29: boolean;
         export { isString_29 as isString };
     }
     namespace allowTestPackages {
-        const isBoolean_20: boolean;
+        let isBoolean_20: boolean;
         export { isBoolean_20 as isBoolean };
     }
     namespace pageLoadStrategy {
-        const isString_30: boolean;
+        let isString_30: boolean;
         export { isString_30 as isString };
     }
     namespace localeScript {
-        const isString_31: boolean;
+        let isString_31: boolean;
         export { isString_31 as isString };
     }
     namespace skipDeviceInitialization {
-        const isBoolean_21: boolean;
+        let isBoolean_21: boolean;
         export { isBoolean_21 as isBoolean };
     }
     namespace remoteAppsCacheLimit {
-        const isNumber_12: boolean;
+        let isNumber_12: boolean;
         export { isNumber_12 as isNumber };
     }
     namespace buildToolsVersion {
-        const isString_32: boolean;
+        let isString_32: boolean;
         export { isString_32 as isString };
     }
     namespace skipLogcatCapture {
-        const isBoolean_22: boolean;
+        let isBoolean_22: boolean;
         export { isBoolean_22 as isBoolean };
     }
     namespace chromeOptions {
-        const isObject_4: boolean;
+        let isObject_4: boolean;
         export { isObject_4 as isObject };
     }
     namespace enablePerformanceLogging {
-        const isBoolean_23: boolean;
+        let isBoolean_23: boolean;
         export { isBoolean_23 as isBoolean };
     }
     namespace userProfile {
-        const isNumber_13: boolean;
+        let isNumber_13: boolean;
         export { isNumber_13 as isNumber };
     }
     namespace browserName {
-        const isString_33: boolean;
+        let isString_33: boolean;
         export { isString_33 as isString };
     }
     namespace enforceAppInstall {
-        const isBoolean_24: boolean;
+        let isBoolean_24: boolean;
         export { isBoolean_24 as isBoolean };
     }
     namespace suppressKillServer {
-        const isBoolean_25: boolean;
+        let isBoolean_25: boolean;
         export { isBoolean_25 as isBoolean };
     }
     namespace allowOfflineDevices {
-        const isBoolean_26: boolean;
+        let isBoolean_26: boolean;
         export { isBoolean_26 as isBoolean };
     }
     namespace ignoreHiddenApiPolicyError {
-        const isBoolean_27: boolean;
+        let isBoolean_27: boolean;
         export { isBoolean_27 as isBoolean };
     }
     namespace unlockSuccessTimeout {
-        const isNumber_14: boolean;
+        let isNumber_14: boolean;
         export { isNumber_14 as isNumber };
     }
     namespace mockLocationApp {
-        const isString_34: boolean;
+        let isString_34: boolean;
         export { isString_34 as isString };
     }
     namespace logcatFormat {
-        const isString_35: boolean;
+        let isString_35: boolean;
         export { isString_35 as isString };
     }
     namespace logcatFilterSpecs {
-        const isArray_1: boolean;
+        let isArray_1: boolean;
         export { isArray_1 as isArray };
     }
     namespace allowDelayAdb {
-        const isBoolean_28: boolean;
+        let isBoolean_28: boolean;
         export { isBoolean_28 as isBoolean };
     }
 }

package/build/lib/driver.d.ts

@@ -1,5 +1,5 @@
 export default AndroidDriver;
-export class AndroidDriver extends BaseDriver<any, import("@appium/base-driver/node_modules/@appium/types").StringRecord<any>, import("@appium/base-driver/node_modules/@appium/types").StringRecord<any>, import("@appium/base-driver/node_modules/@appium/types").StringRecord<any>> {
+export class AndroidDriver extends BaseDriver<any, import("@appium/base-driver/node_modules/@appium/types").StringRecord, import("@appium/base-driver/node_modules/@appium/types").StringRecord, import("@appium/base-driver/node_modules/@appium/types").DefaultCreateSessionResult<any>, void, import("@appium/base-driver/node_modules/@appium/types").StringRecord> {
     static newMethodMap: {
         readonly '/session/:sessionId/timeouts/implicit_wait': {
             readonly POST: {
@@ -425,6 +425,6 @@ export class AndroidDriver extends BaseDriver<any, import("@appium/base-driver/n
     getProxyAvoidList(sessionId: any): (string | RegExp)[][];
     canProxy(sessionId: any): boolean;
 }
-import { BaseDriver } from "@appium/base-driver";
-import { DeviceSettings } from "@appium/base-driver";
+import { BaseDriver } from 'appium/driver';
+import { DeviceSettings } from 'appium/driver';
 //# sourceMappingURL=driver.d.ts.map

package/build/lib/driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.js"],"names":[],"mappings":";AAmCA;IAEE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAmC;IAEnC,qDA0BC;IAhBC,0BAA+C;IAC/C,yBAA8B;IAC9B,wBAA2B;IAC3B,qCAAsC;IACtC;;OACoE;IACpE,kBAAwB;IACxB,eAAoB;IACpB,oDAAgC;IAOhC,gBAA2C;IAG7C,8HAkIC;IA/FG,wCAA6D;IA8B7D,SASE;IA0DN,sBAEC;IAED,wCAaC;IAED,2BAGC;IAED,+BAEC;IAED,sDAIC;IAED,qCA6EC;IA1EC,gBAA+D;IAoB3D,iDAAuC;IAU3C,qEAA8F;IA8ChG,iCAYC;IAED,yBAwDC;IAED,iCAKC;IAED,qCAKC;IAGD,2DAEC;IAED,+BAwDC;IAED,yCA4BC;IAED,uBAKC;IAED,wCAQC;IAED,qCAIC;IAED,yDAIC;IAED,kCAKC;CACF"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.js"],"names":[],"mappings":";AAmCA;IAEE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAmC;IAEnC,qDA0BC;IAhBC,0BAA+C;IAC/C,yBAA8B;IAC9B,wBAA2B;IAC3B,qCAAsC;IACtC;;OACoE;IACpE,kBAAwB;IACxB,eAAoB;IACpB,oDAAgC;IAOhC,gBAA2C;IAG7C,8HAkIC;IA/FG,wCAA6D;IA8B7D,SASE;IA0DN,sBAEC;IAED,wCAaC;IAED,2BAGC;IAED,+BAEC;IAED,sDAIC;IAED,qCA6EC;IA1EC,gBAA+D;IAoB3D,iDAAuC;IAU3C,qEAA8F;IA8ChG,iCAYC;IAED,yBAwDC;IAED,iCAKC;IAED,qCAKC;IAGD,2DAEC;IAED,+BAwDC;IAED,yCA4BC;IAED,uBAKC;IAED,wCAQC;IAED,qCAIC;IAED,yDAIC;IAED,kCAKC;CACF;2BA9gB0C,eAAe;+BAAf,eAAe"}

package/build/lib/uiautomator.d.ts

@@ -13,12 +13,12 @@ export class UiAutomator extends events {
     killUiAutomatorOnDevice(): Promise<void>;
 }
 export namespace UiAutomator {
-    const EVENT_ERROR: string;
-    const EVENT_CHANGED: string;
-    const STATE_STOPPING: string;
-    const STATE_STOPPED: string;
-    const STATE_STARTING: string;
-    const STATE_ONLINE: string;
+    let EVENT_ERROR: string;
+    let EVENT_CHANGED: string;
+    let STATE_STOPPING: string;
+    let STATE_STOPPED: string;
+    let STATE_STARTING: string;
+    let STATE_ONLINE: string;
 }
-import events from "events";
+import events from 'events';
 //# sourceMappingURL=uiautomator.d.ts.map

package/build/lib/uiautomator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uiautomator.d.ts","sourceRoot":"","sources":["../../lib/uiautomator.js"],"names":[],"mappings":";;AAMA;IACE,sBAOC;IAFC,SAAc;IACd,iBAAkC;IAGpC,2GA6CC;IA7BG,UAA2C;IA+B/C,0BAQC;IAED,8CAQC;IAED,8BAIC;IAFC,WAAkB;IAIpB,yCAMC;CAEF"}
+{"version":3,"file":"uiautomator.d.ts","sourceRoot":"","sources":["../../lib/uiautomator.js"],"names":[],"mappings":";;AAMA;IACE,sBAOC;IAFC,SAAc;IACd,iBAAkC;IAGpC,2GA6CC;IA7BG,UAA2C;IA+B/C,0BAQC;IAED,8CAQC;IAED,8BAIC;IAFC,WAAkB;IAIpB,yCAMC;CAEF;;;;;;;;;mBAjGkB,QAAQ"}

package/build/lib/webview-helpers.d.ts

@@ -176,7 +176,7 @@ export namespace helpers {
      *
      * @return {Array<WebviewsMapping>} webviewsMapping
      */
-    function getWebViewsMapping(adb: any, { androidDeviceSocket, ensureWebviewsHavePages, webviewDevtoolsPort, enableWebviewDetailsCollection }?: GetWebviewsOpts): WebviewsMapping[];
+    function getWebViewsMapping(adb: any, { androidDeviceSocket, ensureWebviewsHavePages, webviewDevtoolsPort, enableWebviewDetailsCollection, }?: GetWebviewsOpts): WebviewsMapping[];
     /**
      * @typedef {Object} ProcessInfo
      * @property {string} name The process name
@@ -220,4 +220,5 @@ export const WEBVIEW_WIN: "WEBVIEW";
 export const WEBVIEW_BASE: string;
 export const CHROMIUM_WIN: "CHROMIUM";
 export const KNOWN_CHROME_PACKAGE_NAMES: string[];
+export const DEVTOOLS_SOCKET_PATTERN: RegExp;
 //# sourceMappingURL=webview-helpers.d.ts.map

package/build/lib/webview-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webview-helpers.d.ts","sourceRoot":"","sources":["../../lib/webview-helpers.js"],"names":[],"mappings":";;;;;;UA0Fc,MAAM;;;;aAEN,MAAM;;;;;;UAyFN,MAAM;;;;;aACN,MAAM;;;;;;;;;;WAIL,UAAa;;;;;;;0BAMb,MAAM,GAAC,MAAM;;;;;6BAEb,OAAO;;;;;;oCAER,OAAO;;;;;;yBAsJP,MAAM;;;;;6BACN,OAAO;;;;;yBAEP,MAAM;;;;;;oCAEN,OAAO;;;;;;UAOP,MAAM;;;;aACN,MAAM;;;;;;;;WAEL,UAAa;;;;;;UA0Ed,MAAM;;;;QACL,MAAM;;;;;;aAKN,WAAW;;;;;;;;;;;;;;;IAzJ1B;;;;;;;;;;;OAWG;IACH,4DAYC;IAED;;;;;;OAMG;IACH,yIAqBC;IAED;;;;;;;;;;OAUG;IAEH;;;;;;;OAOG;IAEH;;;;;;;;;;;;;;;;;OAiBG;IACH,kLAgDC;IAED;;;;OAIG;IAEH;;;;;;;;;;;;OAYG;IAEH;;;;;;OAMG;IACH,6EAGC;IAED;;;;;;;;;OASG;IACH,yGAsFC;;AAviBD,sCAAgC;AAChC,oCAA8B;AAE9B,kCAAuC;AADvC,sCAAgC;AAQhC,kDAKE"}
+{"version":3,"file":"webview-helpers.d.ts","sourceRoot":"","sources":["../../lib/webview-helpers.js"],"names":[],"mappings":";;;;;;UA4Fc,MAAM;;;;aAEN,MAAM;;;;;;UA+FN,MAAM;;;;;aACN,MAAM;;;;;;;;;;WAIL,UAAa;;;;;;;0BAMb,MAAM,GAAC,MAAM;;;;;6BAEb,OAAO;;;;;;oCAER,OAAO;;;;;;yBAoKP,MAAM;;;;;6BACN,OAAO;;;;;yBAEP,MAAM;;;;;;oCAEN,OAAO;;;;;;UAOP,MAAM;;;;aACN,MAAM;;;;;;;;WAEL,UAAa;;;;;;UA6Ed,MAAM;;;;QACL,MAAM;;;;;;aAKN,WAAW;;;;;;;;;;;;;;;IAhK1B;;;;;;;;;;;OAWG;IACH,4DAYC;IAED;;;;;;OAMG;IACH,yIAyBC;IAED;;;;;;;;;;OAUG;IAEH;;;;;;;OAOG;IAEH;;;;;;;;;;;;;;;;;OAiBG;IACH,mLAmDC;IAED;;;;OAIG;IAEH;;;;;;;;;;;;OAYG;IAEH;;;;;;OAMG;IACH,6EAGC;IAED;;;;;;;;;OASG;IACH,yGA0FC;;AApkBD,sCAAgC;AAChC,oCAA8B;AAE9B,kCAAuC;AADvC,sCAAgC;AAQhC,kDAKE;AATF,6CAA8E"}

package/build/lib/webview-helpers.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KNOWN_CHROME_PACKAGE_NAMES = exports.CHROMIUM_WIN = exports.WEBVIEW_BASE = exports.WEBVIEW_WIN = exports.NATIVE_WIN = exports.helpers = void 0;
+exports.DEVTOOLS_SOCKET_PATTERN = exports.KNOWN_CHROME_PACKAGE_NAMES = exports.CHROMIUM_WIN = exports.WEBVIEW_BASE = exports.WEBVIEW_WIN = exports.NATIVE_WIN = exports.helpers = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const logger_1 = __importDefault(require("./logger"));
 const axios_1 = __importDefault(require("axios"));
@@ -23,7 +23,8 @@ const WEBVIEW_BASE = `${WEBVIEW_WIN}_`;
 exports.WEBVIEW_BASE = WEBVIEW_BASE;
 const WEBVIEW_PID_PATTERN = new RegExp(`^${WEBVIEW_BASE}(\\d+)`);
 const WEBVIEW_PKG_PATTERN = new RegExp(`^${WEBVIEW_BASE}([^\\d\\s][\\w.]*)`);
-const DEVTOOLS_SOCKET_PATTERN = /@[\w.]+_devtools_remote_?(\d+)?\b/;
+const DEVTOOLS_SOCKET_PATTERN = /@[\w.]+_devtools_remote_?([\w.]+_)?(\d+)?\b/;
+exports.DEVTOOLS_SOCKET_PATTERN = DEVTOOLS_SOCKET_PATTERN;
 const CROSSWALK_SOCKET_PATTERN = /@([\w.]+)_devtools_remote\b/;
 const CHROMIUM_DEVTOOLS_SOCKET = 'chrome_devtools_remote';
 const CHROME_PACKAGE_NAME = 'com.android.chrome';
@@ -123,15 +124,16 @@ async function webviewsFromProcs(adb, deviceSocket = null) {
         if (!socketNameMatch) {
             continue;
         }
+        const matchedSocketName = socketNameMatch[2];
         const crosswalkMatch = CROSSWALK_SOCKET_PATTERN.exec(socketName);
-        if (!socketNameMatch[1] && !crosswalkMatch) {
+        if (!matchedSocketName && !crosswalkMatch) {
             continue;
         }
-        if (deviceSocket && socketName === `@${deviceSocket}` || !deviceSocket) {
+        if ((deviceSocket && socketName === `@${deviceSocket}`) || !deviceSocket) {
             webviews.push({
                 proc: socketName,
-                webview: socketNameMatch[1]
-                    ? `${WEBVIEW_BASE}${socketNameMatch[1]}`
+                webview: matchedSocketName
+                    ? `${WEBVIEW_BASE}${matchedSocketName}`
                     : `${WEBVIEW_BASE}${crosswalkMatch[1]}`,
             });
         }
@@ -158,8 +160,7 @@ async function allocateDevtoolsPort(adb, socketName, webviewDevtoolsPort = null)
         endPort = webviewDevtoolsPort + (endPort - startPort);
         startPort = webviewDevtoolsPort;
     }
-    logger_1.default.debug(`Forwarding remote port ${remotePort} to a local ` +
-        `port in range ${startPort}..${endPort}`);
+    logger_1.default.debug(`Forwarding remote port ${remotePort} to a local ` + `port in range ${startPort}..${endPort}`);
     if (!webviewDevtoolsPort) {
         logger_1.default.debug(`You could use the 'webviewDevtoolsPort' capability to customize ` +
             `the starting port number`);
@@ -362,7 +363,7 @@ helpers.parseWebviewNames = function parseWebviewNames(webviewsMapping, { ensure
  *
  * @return {Array<WebviewsMapping>} webviewsMapping
  */
-helpers.getWebViewsMapping = async function getWebViewsMapping(adb, { androidDeviceSocket = null, ensureWebviewsHavePages = true, webviewDevtoolsPort = null, enableWebviewDetailsCollection = true } = {}) {
+helpers.getWebViewsMapping = async function getWebViewsMapping(adb, { androidDeviceSocket = null, ensureWebviewsHavePages = true, webviewDevtoolsPort = null, enableWebviewDetailsCollection = true, } = {}) {
     logger_1.default.debug('Getting a list of available webviews');
     const webviewsMapping = await webviewsFromProcs(adb, androidDeviceSocket);
     await collectWebviewsDetails(adb, webviewsMapping, {
@@ -445,9 +446,9 @@ helpers.getWebviewDetails = function getWebviewDetails(adb, webview) {
  */
 helpers.createChromedriverCaps = function createChromedriverCaps(opts, deviceId, webViewDetails) {
     const caps = { chromeOptions: {} };
-    const androidPackage = opts.chromeOptions?.androidPackage
-        || opts.appPackage
-        || webViewDetails?.info?.['Android-Package'];
+    const androidPackage = opts.chromeOptions?.androidPackage ||
+        opts.appPackage ||
+        webViewDetails?.info?.['Android-Package'];
     if (androidPackage) {
         // chromedriver raises an invalid argument error when androidPackage is 'null'
         caps.chromeOptions.androidPackage = androidPackage;
@@ -497,17 +498,14 @@ helpers.createChromedriverCaps = function createChromedriverCaps(opts, deviceId,
             `the 'chromeLoggingPrefs' cap instead, with a 'performance' key set to 'ALL'`);
         const newPref = { performance: 'ALL' };
         // don't overwrite other logging prefs that have been sent in if they exist
-        caps.loggingPrefs = caps.loggingPrefs
-            ? Object.assign({}, caps.loggingPrefs, newPref)
-            : newPref;
+        caps.loggingPrefs = caps.loggingPrefs ? Object.assign({}, caps.loggingPrefs, newPref) : newPref;
     }
     if (opts.chromeOptions?.Arguments) {
         // merge `Arguments` and `args`
         opts.chromeOptions.args = [...(opts.chromeOptions.args || []), ...opts.chromeOptions.Arguments];
         delete opts.chromeOptions.Arguments;
     }
-    logger_1.default.debug('Precalculated Chromedriver capabilities: ' +
-        JSON.stringify(caps.chromeOptions, null, 2));
+    logger_1.default.debug('Precalculated Chromedriver capabilities: ' + JSON.stringify(caps.chromeOptions, null, 2));
     const protectedCapNames = [];
     for (const [opt, val] of lodash_1.default.toPairs(opts.chromeOptions)) {
         if (lodash_1.default.isUndefined(caps.chromeOptions[opt])) {

package/build/lib/webview-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"webview-helpers.js","sourceRoot":"","sources":["../../lib/webview-helpers.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,sDAA8B;AAC9B,kDAA0B;AAC1B,6CAAuC;AACvC,6CAAgD;AAChD,0DAA4B;AAC5B,wDAAyB;AACzB,gDAAwB;AACxB,4CAAoB;AAEpB,MAAM,UAAU,GAAG,YAAY,CAAC;AA0iBd,gCAAU;AAziB5B,MAAM,WAAW,GAAG,SAAS,CAAC;AAyiBA,kCAAW;AAxiBzC,MAAM,YAAY,GAAG,UAAU,CAAC;AAwiByB,oCAAY;AAviBrE,MAAM,YAAY,GAAG,GAAG,WAAW,GAAG,CAAC;AAuiBI,oCAAY;AAtiBvD,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAAC,IAAI,YAAY,QAAQ,CAAC,CAAC;AACjE,MAAM,mBAAmB,GAAG,IAAI,MAAM,CAAC,IAAI,YAAY,oBAAoB,CAAC,CAAC;AAC7E,MAAM,uBAAuB,GAAG,mCAAmC,CAAC;AACpE,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;AA2hBqE,gEAA0B;AA1hBjG,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAC5C,MAAM,sBAAsB,GAAG,IAAI,mBAAG,CAAC;IACrC,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,cAAI,CAAC,OAAO,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,6BAA6B,CAAC,EACxD,EAAC,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,EAAC,CAChC,CAAC;AAEF,MAAM,OAAO,GAAG,EAAE,CAAC;AA+gBV,0BAAO;AA7gBhB,SAAS,iBAAiB,CAAE,GAAG,EAAE,OAAO;IACtC,OAAO,GAAG,GAAG,EAAE,WAAW,IAAI,OAAO,EAAE,CAAC;AAC1C,CAAC;AAED;;;;;;;;;GASG;AACH,KAAK,UAAU,wBAAwB,CAAE,GAAG;IAC1C,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC;IACvD,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAClC,iDAAiD;QACjD,MAAM,CAAC,EAAC,EAAC,EAAE,KAAK,EAAC,EAAE,EAAE,EAAC,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7D,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,uBAAuB,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,CAAC,UAAU,KAAK,CAAC,MAAM,oBAAoB,cAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI;YACtG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;KAC1B;IACD,gEAAgE;IAChE,OAAO,gBAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED;;;;;GAKG;AACH;;;;;;;;;;;GAWG;AACH,KAAK,UAAU,iBAAiB,CAAE,GAAG,EAAE,YAAY,GAAG,IAAI;IACxD,MAAM,WAAW,GAAG,MAAM,wBAAwB,CAAC,GAAG,CAAC,CAAC;IACxD,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,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,uBAAuB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjE,IAAI,CAAC,eAAe,EAAE;YACpB,SAAS;SACV;QACD,MAAM,cAAc,GAAG,wBAAwB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE;YAC1C,SAAS;SACV;QAED,IAAI,YAAY,IAAI,UAAU,KAAK,IAAI,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE;YACtE,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;oBACzB,CAAC,CAAC,GAAG,YAAY,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE;oBACxC,CAAC,CAAC,GAAG,YAAY,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE;aAC1C,CAAC,CAAC;SACJ;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;;;;;;;;GAUG;AACH,KAAK,UAAU,oBAAoB,CAAE,GAAG,EAAE,UAAU,EAAE,mBAAmB,GAAG,IAAI;IAC9E,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,CAAC,0BAA0B,UAAU,cAAc;QAC7D,iBAAiB,SAAS,KAAK,OAAO,EAAE,CAAC,CAAC;IAC5C,IAAI,CAAC,mBAAmB,EAAE;QACxB,gBAAM,CAAC,KAAK,CAAC,kEAAkE;YAC7E,0BAA0B,CAAC,CAAC;KAC/B;IACD,OAAO,MAAM,8BAA8B,CAAC,KAAK,IAAI,EAAE;QACrD,IAAI,SAAS,CAAC;QACd,IAAI;YACF,SAAS,GAAG,MAAM,IAAA,+BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;SACzD;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,2DAA2D;gBACzE,YAAY,SAAS,KAAK,OAAO,2CAA2C;gBAC5E,4DAA4D,CAAC,CAAC;SACjE;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,CAAC;AACL,CAAC;AAED;;;;;;;;;GASG;AAEH;;;;;;;;;GASG;AAEH;;;;;;;;;;;;;GAaG;AACH,KAAK,UAAU,sBAAsB,CAAE,GAAG,EAAE,eAAe,EAAE,IAAI,GAAG,EAAE;IACpE,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,CAAC,2DAA2D;YACrE,qDAAqD,CAAC,CAAC;KAC1D;IAED,IAAI,CAAC,8BAA8B,EAAE;QACnC,gBAAM,CAAC,IAAI,CAAC,iEAAiE;YAC3E,6FAA6F;YAC7F,mBAAmB,CAAC,CAAC;KACxB;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,GAAG,EAAE,CAAC;IAC5B,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE;QAClC,gBAAgB,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;YAChC,IAAI,SAAS,CAAC;YACd,IAAI;gBACF,SAAS,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;gBAC5E,IAAI,8BAA8B,EAAE;oBAClC,IAAI,CAAC,IAAI,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;iBACtC;gBACD,IAAI,uBAAuB,EAAE;oBAC3B,IAAI,CAAC,KAAK,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;iBACvC;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,gBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aACjB;oBAAS;gBACR,IAAI,SAAS,EAAE;oBACb,IAAI;wBACF,MAAM,GAAG,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;qBACxC;oBAAC,OAAO,CAAC,EAAE;wBACV,gBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;qBACjB;iBACF;aACF;QACH,CAAC,CAAC,EAAE,CAAC,CAAC;KACP;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,CAAE,SAAS;IAC/B,OAAO,CAAC,MAAM,IAAA,eAAK,EAAC;QAClB,GAAG,EAAE,oBAAoB,SAAS,YAAY;QAC9C,OAAO,EAAE,eAAe;KACzB,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,sDAAsD;AACtD,KAAK,UAAU,OAAO,CAAE,SAAS;IAC/B,OAAO,CAAC,MAAM,IAAA,eAAK,EAAC;QAClB,GAAG,EAAE,oBAAoB,SAAS,eAAe;QACjD,OAAO,EAAE,eAAe;KACzB,CAAC,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED;;;;;;;;;;;GAWG;AACH,OAAO,CAAC,eAAe,GAAG,KAAK,UAAU,eAAe,CAAE,GAAG,EAAE,OAAO;IACpE,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,OAAO,GAAG,CAAC,CAAC;KAChE;IAED,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IACxB,gBAAM,CAAC,KAAK,CAAC,GAAG,OAAO,kBAAkB,GAAG,EAAE,CAAC,CAAC;IAChD,gBAAM,CAAC,KAAK,CAAC,qCAAqC,OAAO,GAAG,CAAC,CAAC;IAC9D,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACxC,gBAAM,CAAC,KAAK,CAAC,sBAAsB,GAAG,GAAG,CAAC,CAAC;IAC3C,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,OAAO,CAAC,iBAAiB,GAAG,SAAS,iBAAiB,CAAE,eAAe,EAAE,EACvE,uBAAuB,GAAG,IAAI,EAC9B,eAAe,GAAG,KAAK,EACxB,GAAG,EAAE;IACJ,IAAI,eAAe,EAAE;QACnB,OAAO,CAAC,YAAY,CAAC,CAAC;KACvB;IAED,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,MAAM,EAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAC,IAAI,eAAe,EAAE;QACjE,IAAI,uBAAuB,IAAI,KAAK,EAAE,MAAM,KAAK,CAAC,EAAE;YAClD,gBAAM,CAAC,IAAI,CAAC,yBAAyB,OAAO,SAAS,IAAI,IAAI;gBAC3D,yCAAyC,CAAC,CAAC;YAC7C,SAAS;SACV;QACD,IAAI,WAAW,EAAE;YACf,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC1B;KACF;IACD,gBAAM,CAAC,KAAK,CAAC,SAAS,cAAI,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACnG,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF;;;;;;;;;;GAUG;AAEH;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,CAAC,kBAAkB,GAAG,KAAK,UAAU,kBAAkB,CAAE,GAAG,EAAE,EACnE,mBAAmB,GAAG,IAAI,EAC1B,uBAAuB,GAAG,IAAI,EAC9B,mBAAmB,GAAG,IAAI,EAC1B,8BAA8B,GAAG,IAAI,EACtC,GAAG,EAAE;IACJ,gBAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IAE1E,MAAM,sBAAsB,CAAC,GAAG,EAAE,eAAe,EAAE;QACjD,uBAAuB;QACvB,8BAA8B;QAC9B,mBAAmB;KACpB,CAAC,CAAC;IAEH,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;QAC5C,MAAM,EAAC,OAAO,EAAE,IAAI,EAAC,GAAG,cAAc,CAAC;QACvC,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC;QAElC,IAAI,MAAM,GAAG,OAAO,CAAC;QACrB,IAAI,OAAO,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,mBAAmB,EAAE;YACxB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnD,IAAI;gBACF,sEAAsE;gBACtE,6CAA6C;gBAC7C,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;gBACjF,MAAM,GAAG,GAAG,YAAY,GAAG,GAAG,EAAE,CAAC;gBACjC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnD,OAAO,GAAG;oBACR,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;iBAClC,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,gBAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBACvB,SAAS;aACV;SACF;QAED,cAAc,CAAC,WAAW,GAAG,MAAM,CAAC;QACpC,MAAM,GAAG,GAAG,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC3C,IAAI,IAAI,IAAI,OAAO,EAAE;YACnB,sBAAsB,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;SACpD;aAAM,IAAI,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC1C,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SACpC;KACF;IACD,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAEF;;;;GAIG;AAEH;;;;;;;;;;;;GAYG;AAEH;;;;;;GAMG;AACH,OAAO,CAAC,iBAAiB,GAAG,SAAS,iBAAiB,CAAE,GAAG,EAAE,OAAO;IAClE,MAAM,GAAG,GAAG,iBAAiB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC5C,OAAO,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACzC,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACH,OAAO,CAAC,sBAAsB,GAAG,SAAS,sBAAsB,CAAE,IAAI,EAAE,QAAQ,EAAE,cAAc;IAC9F,MAAM,IAAI,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;IAEnC,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,EAAE,cAAc;WACpD,IAAI,CAAC,UAAU;WACf,cAAc,EAAE,IAAI,EAAE,CAAC,iBAAiB,CAAC,CAAC;IAC/C,IAAI,cAAc,EAAE;QAClB,8EAA8E;QAC9E,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,cAAc,CAAC;KACpD;IACD,IAAI,gBAAC,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE;QACzC,IAAI,CAAC,aAAa,CAAC,oBAAoB,GAAG,IAAI,CAAC,mBAAmB,CAAC;KACpE;IACD,IAAI,IAAI,CAAC,oBAAoB,EAAE;QAC7B,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC;KAC/D;IACD,IAAI,IAAI,CAAC,qBAAqB,EAAE;QAC9B,IAAI,CAAC,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC,qBAAqB,CAAC;KACjE;IACD,IAAI,IAAI,CAAC,oBAAoB,EAAE;QAC7B,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC;KAC/D;SAAM,IAAI,cAAc,EAAE,OAAO,EAAE,IAAI,IAAI,cAAc,EAAE,OAAO,EAAE,EAAE,EAAE;QACvE,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC;KACjE;IACD,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,kBAAkB,EAAE;QACtD,IAAI,CAAC,aAAa,CAAC,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC;KACvD;IACD,IAAI,IAAI,CAAC,gBAAgB,EAAE;QACzB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;KAC/C;IACD,MAAM,QAAQ,GAAG,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,KAAK,QAAQ,CAAC;IAC3E,IAAI,gBAAC,CAAC,QAAQ,CAAC,0BAA0B,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,IAAI,QAAQ,EAAE;QACzF,2EAA2E;QAC3E,0EAA0E;QAC1E,sCAAsC;QACtC,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,aAAa,CAAC,cAAc,GAAG,mBAAmB,CAAC;SACzD;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QAC1C,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;KAC1C;IACD,yBAAyB;IACzB,IAAI,CAAC,aAAa,CAAC,mBAAmB,GAAG,QAAQ,CAAC;IAElD,IAAI,gBAAC,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,gBAAC,CAAC,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;QAClF,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,gBAAM,CAAC,IAAI,CAAC,gFAAgF,CAAC,CAAC;SAC/F;QACD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,YAAY,CAAC;KAClE;IACD,IAAI,IAAI,CAAC,wBAAwB,EAAE;QACjC,gBAAM,CAAC,IAAI,CAAC,+DAA+D;YACzE,6EAA6E,CAAC,CAAC;QACjF,MAAM,OAAO,GAAG,EAAC,WAAW,EAAE,KAAK,EAAC,CAAC;QACrC,2EAA2E;QAC3E,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY;YACnC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC;YAC/C,CAAC,CAAC,OAAO,CAAC;KACb;IAED,IAAI,IAAI,CAAC,aAAa,EAAE,SAAS,EAAE;QACjC,+BAA+B;QAC/B,IAAI,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAChG,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;KACrC;IAED,gBAAM,CAAC,KAAK,CAAC,2CAA2C;QACtD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAE/C,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;QACtD,IAAI,gBAAC,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE;YAC1C,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;SAC/B;aAAM;YACL,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC7B;KACF;IACD,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE;QACjC,gBAAM,CAAC,IAAI,CAAC,+DAA+D;YACzE,gCAAgC,CAAC,CAAC;QACpC,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE;YACvC,gBAAM,CAAC,IAAI,CAAC,KAAK,OAAO,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC;SAC9E;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"webview-helpers.js","sourceRoot":"","sources":["../../lib/webview-helpers.js"],"names":[],"mappings":"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"}

package/lib/webview-helpers.js

@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import logger from './logger';
 import axios from 'axios';
-import { util } from '@appium/support';
-import { findAPortNotInUse } from 'portscanner';
+import {util} from '@appium/support';
+import {findAPortNotInUse} from 'portscanner';
 import LRU from 'lru-cache';
 import B from 'bluebird';
 import path from 'path';
@@ -14,7 +14,7 @@ const CHROMIUM_WIN = 'CHROMIUM';
 const WEBVIEW_BASE = `${WEBVIEW_WIN}_`;
 const WEBVIEW_PID_PATTERN = new RegExp(`^${WEBVIEW_BASE}(\\d+)`);
 const WEBVIEW_PKG_PATTERN = new RegExp(`^${WEBVIEW_BASE}([^\\d\\s][\\w.]*)`);
-const DEVTOOLS_SOCKET_PATTERN = /@[\w.]+_devtools_remote_?(\d+)?\b/;
+const DEVTOOLS_SOCKET_PATTERN = /@[\w.]+_devtools_remote_?([\w.]+_)?(\d+)?\b/;
 const CROSSWALK_SOCKET_PATTERN = /@([\w.]+)_devtools_remote\b/;
 const CHROMIUM_DEVTOOLS_SOCKET = 'chrome_devtools_remote';
 const CHROME_PACKAGE_NAME = 'com.android.chrome';
@@ -37,7 +37,7 @@ const DEVTOOLS_PORT_ALLOCATION_GUARD = util.getLockFileGuard(
 
 const helpers = {};
 
-function toDetailsCacheKey (adb, webview) {
+function toDetailsCacheKey(adb, webview) {
   return `${adb?.curDeviceId}:${webview}`;
 }
 
@@ -51,13 +51,13 @@ function toDetailsCacheKey (adb, webview) {
  *
  * @return {Array.<string>} - a list of matching webview socket names (including the leading '@')
  */
-async function getPotentialWebviewProcs (adb) {
+async function getPotentialWebviewProcs(adb) {
   const out = await adb.shell(['cat', '/proc/net/unix']);
   const names = [];
   const allMatches = [];
   for (const line of out.split('\n')) {
     // Num RefCount Protocol Flags Type St Inode Path
-    const [,,, flags,, st,, sockPath] = line.trim().split(/\s+/);
+    const [, , , flags, , st, , sockPath] = line.trim().split(/\s+/);
     if (!sockPath) {
       continue;
     }
@@ -79,8 +79,10 @@ async function getPotentialWebviewProcs (adb) {
       logger.debug(`Other sockets are: ${JSON.stringify(allMatches, null, 2)}`);
     }
   } else {
-    logger.debug(`Parsed ${names.length} active devtools ${util.pluralize('socket', names.length, false)}: ` +
-      JSON.stringify(names));
+    logger.debug(
+      `Parsed ${names.length} active devtools ${util.pluralize('socket', names.length, false)}: ` +
+        JSON.stringify(names)
+    );
   }
   // sometimes the webview process shows up multiple times per app
   return _.uniq(names);
@@ -104,7 +106,7 @@ async function getPotentialWebviewProcs (adb) {
  *
  * @return {Array.<WebviewProc>}
  */
-async function webviewsFromProcs (adb, deviceSocket = null) {
+async function webviewsFromProcs(adb, deviceSocket = null) {
   const socketNames = await getPotentialWebviewProcs(adb);
   const webviews = [];
   for (const socketName of socketNames) {
@@ -120,16 +122,17 @@ async function webviewsFromProcs (adb, deviceSocket = null) {
     if (!socketNameMatch) {
       continue;
     }
+    const matchedSocketName = socketNameMatch[2];
     const crosswalkMatch = CROSSWALK_SOCKET_PATTERN.exec(socketName);
-    if (!socketNameMatch[1] && !crosswalkMatch) {
+    if (!matchedSocketName && !crosswalkMatch) {
       continue;
     }
 
-    if (deviceSocket && socketName === `@${deviceSocket}` || !deviceSocket) {
+    if ((deviceSocket && socketName === `@${deviceSocket}`) || !deviceSocket) {
       webviews.push({
         proc: socketName,
-        webview: socketNameMatch[1]
-          ? `${WEBVIEW_BASE}${socketNameMatch[1]}`
+        webview: matchedSocketName
+          ? `${WEBVIEW_BASE}${matchedSocketName}`
           : `${WEBVIEW_BASE}${crosswalkMatch[1]}`,
       });
     }
@@ -148,7 +151,7 @@ async function webviewsFromProcs (adb, deviceSocket = null) {
  * successfully or `null` otherwise
  * @throws {Error} If there was an error while allocating the local port
  */
-async function allocateDevtoolsPort (adb, socketName, webviewDevtoolsPort = null) {
+async function allocateDevtoolsPort(adb, socketName, webviewDevtoolsPort = null) {
   // socket names come with '@', but this should not be a part of the abstract
   // remote port, so remove it
   const remotePort = socketName.replace(/^@/, '');
@@ -157,20 +160,25 @@ async function allocateDevtoolsPort (adb, socketName, webviewDevtoolsPort = null
     endPort = webviewDevtoolsPort + (endPort - startPort);
     startPort = webviewDevtoolsPort;
   }
-  logger.debug(`Forwarding remote port ${remotePort} to a local ` +
-    `port in range ${startPort}..${endPort}`);
+  logger.debug(
+    `Forwarding remote port ${remotePort} to a local ` + `port in range ${startPort}..${endPort}`
+  );
   if (!webviewDevtoolsPort) {
-    logger.debug(`You could use the 'webviewDevtoolsPort' capability to customize ` +
-      `the starting port number`);
+    logger.debug(
+      `You could use the 'webviewDevtoolsPort' capability to customize ` +
+        `the starting port number`
+    );
   }
   return await DEVTOOLS_PORT_ALLOCATION_GUARD(async () => {
     let localPort;
     try {
       localPort = await findAPortNotInUse(startPort, endPort);
     } catch (e) {
-      throw new Error(`Cannot find any free port to forward the Devtools socket ` +
-        `in range ${startPort}..${endPort}. You could set the starting port number ` +
-        `manually by providing the 'webviewDevtoolsPort' capability`);
+      throw new Error(
+        `Cannot find any free port to forward the Devtools socket ` +
+          `in range ${startPort}..${endPort}. You could set the starting port number ` +
+          `manually by providing the 'webviewDevtoolsPort' capability`
+      );
     }
     await adb.adbExec(['forward', `tcp:${localPort}`, `localabstract:${remotePort}`]);
     return localPort;
@@ -213,7 +221,7 @@ async function allocateDevtoolsPort (adb, socketName, webviewDevtoolsPort = null
  * `enableWebviewDetailsCollection` properties are falsy then no details collection
  * is performed
  */
-async function collectWebviewsDetails (adb, webviewsMapping, opts = {}) {
+async function collectWebviewsDetails(adb, webviewsMapping, opts = {}) {
   if (_.isEmpty(webviewsMapping)) {
     return;
   }
@@ -225,14 +233,18 @@ async function collectWebviewsDetails (adb, webviewsMapping, opts = {}) {
   } = opts;
 
   if (!ensureWebviewsHavePages) {
-    logger.info(`Not checking whether webviews have active pages; use the ` +
-      `'ensureWebviewsHavePages' cap to turn this check on`);
+    logger.info(
+      `Not checking whether webviews have active pages; use the ` +
+        `'ensureWebviewsHavePages' cap to turn this check on`
+    );
   }
 
   if (!enableWebviewDetailsCollection) {
-    logger.info(`Not collecting web view details. Details collection might help ` +
-      `to make Chromedriver initialization more precise. Use the 'enableWebviewDetailsCollection' ` +
-      `cap to turn it on`);
+    logger.info(
+      `Not collecting web view details. Details collection might help ` +
+        `to make Chromedriver initialization more precise. Use the 'enableWebviewDetailsCollection' ` +
+        `cap to turn it on`
+    );
   }
 
   if (!ensureWebviewsHavePages && !enableWebviewDetailsCollection) {
@@ -243,47 +255,53 @@ async function collectWebviewsDetails (adb, webviewsMapping, opts = {}) {
   logger.debug(`Collecting CDP data of ${util.pluralize('webview', webviewsMapping.length, true)}`);
   const detailCollectors = [];
   for (const item of webviewsMapping) {
-    detailCollectors.push((async () => {
-      let localPort;
-      try {
-        localPort = await allocateDevtoolsPort(adb, item.proc, webviewDevtoolsPort);
-        if (enableWebviewDetailsCollection) {
-          item.info = await cdpInfo(localPort);
-        }
-        if (ensureWebviewsHavePages) {
-          item.pages = await cdpList(localPort);
-        }
-      } catch (e) {
-        logger.debug(e);
-      } finally {
-        if (localPort) {
-          try {
-            await adb.removePortForward(localPort);
-          } catch (e) {
-            logger.debug(e);
+    detailCollectors.push(
+      (async () => {
+        let localPort;
+        try {
+          localPort = await allocateDevtoolsPort(adb, item.proc, webviewDevtoolsPort);
+          if (enableWebviewDetailsCollection) {
+            item.info = await cdpInfo(localPort);
+          }
+          if (ensureWebviewsHavePages) {
+            item.pages = await cdpList(localPort);
+          }
+        } catch (e) {
+          logger.debug(e);
+        } finally {
+          if (localPort) {
+            try {
+              await adb.removePortForward(localPort);
+            } catch (e) {
+              logger.debug(e);
+            }
           }
         }
-      }
-    })());
+      })()
+    );
   }
   await B.all(detailCollectors);
   logger.debug(`CDP data collection completed`);
 }
 
 // https://chromedevtools.github.io/devtools-protocol/
-async function cdpList (localPort) {
-  return (await axios({
-    url: `http://127.0.0.1:${localPort}/json/list`,
-    timeout: CDP_REQ_TIMEOUT,
-  })).data;
+async function cdpList(localPort) {
+  return (
+    await axios({
+      url: `http://127.0.0.1:${localPort}/json/list`,
+      timeout: CDP_REQ_TIMEOUT,
+    })
+  ).data;
 }
 
 // https://chromedevtools.github.io/devtools-protocol/
-async function cdpInfo (localPort) {
-  return (await axios({
-    url: `http://127.0.0.1:${localPort}/json/version`,
-    timeout: CDP_REQ_TIMEOUT,
-  })).data;
+async function cdpInfo(localPort) {
+  return (
+    await axios({
+      url: `http://127.0.0.1:${localPort}/json/version`,
+      timeout: CDP_REQ_TIMEOUT,
+    })
+  ).data;
 }
 
 /**
@@ -298,7 +316,7 @@ async function cdpInfo (localPort) {
  * @returns {string} - the package name of the app running the webview
  * @throws {Error} If there was a failure while retrieving the process name
  */
-helpers.procFromWebview = async function procFromWebview (adb, webview) {
+helpers.procFromWebview = async function procFromWebview(adb, webview) {
   const pidMatch = WEBVIEW_PID_PATTERN.exec(webview);
   if (!pidMatch) {
     throw new Error(`Could not find PID for webview '${webview}'`);
@@ -319,10 +337,10 @@ helpers.procFromWebview = async function procFromWebview (adb, webview) {
  * @param {GetWebviewsOpts} opts See note on getWebViewsMapping
  * @return {Array.<string>} - a list of webview names
  */
-helpers.parseWebviewNames = function parseWebviewNames (webviewsMapping, {
-  ensureWebviewsHavePages = true,
-  isChromeSession = false
-} = {}) {
+helpers.parseWebviewNames = function parseWebviewNames(
+  webviewsMapping,
+  {ensureWebviewsHavePages = true, isChromeSession = false} = {}
+) {
   if (isChromeSession) {
     return [CHROMIUM_WIN];
   }
@@ -330,15 +348,19 @@ helpers.parseWebviewNames = function parseWebviewNames (webviewsMapping, {
   const result = [];
   for (const {webview, pages, proc, webviewName} of webviewsMapping) {
     if (ensureWebviewsHavePages && pages?.length === 0) {
-      logger.info(`Skipping the webview '${webview}' at '${proc}' ` +
-        `since it has reported having zero pages`);
+      logger.info(
+        `Skipping the webview '${webview}' at '${proc}' ` +
+          `since it has reported having zero pages`
+      );
       continue;
     }
     if (webviewName) {
       result.push(webviewName);
     }
   }
-  logger.debug(`Found ${util.pluralize('webview', result.length, true)}: ${JSON.stringify(result)}`);
+  logger.debug(
+    `Found ${util.pluralize('webview', result.length, true)}: ${JSON.stringify(result)}`
+  );
   return result;
 };
 
@@ -381,12 +403,15 @@ helpers.parseWebviewNames = function parseWebviewNames (webviewsMapping, {
  *
  * @return {Array<WebviewsMapping>} webviewsMapping
  */
-helpers.getWebViewsMapping = async function getWebViewsMapping (adb, {
-  androidDeviceSocket = null,
-  ensureWebviewsHavePages = true,
-  webviewDevtoolsPort = null,
-  enableWebviewDetailsCollection = true
-} = {}) {
+helpers.getWebViewsMapping = async function getWebViewsMapping(
+  adb,
+  {
+    androidDeviceSocket = null,
+    ensureWebviewsHavePages = true,
+    webviewDevtoolsPort = null,
+    enableWebviewDetailsCollection = true,
+  } = {}
+) {
   logger.debug('Getting a list of available webviews');
   const webviewsMapping = await webviewsFromProcs(adb, androidDeviceSocket);
 
@@ -423,7 +448,7 @@ helpers.getWebViewsMapping = async function getWebViewsMapping (adb, {
     webviewMapping.webviewName = wvName;
     const key = toDetailsCacheKey(adb, wvName);
     if (info || process) {
-      WEBVIEWS_DETAILS_CACHE.set(key, { info, process });
+      WEBVIEWS_DETAILS_CACHE.set(key, {info, process});
     } else if (WEBVIEWS_DETAILS_CACHE.has(key)) {
       WEBVIEWS_DETAILS_CACHE.delete(key);
     }
@@ -458,7 +483,7 @@ helpers.getWebViewsMapping = async function getWebViewsMapping (adb, {
  * @param {string} webview The name of the web view
  * @returns {?WebViewDetails} Either `undefined` or the recent web view details
  */
-helpers.getWebviewDetails = function getWebviewDetails (adb, webview) {
+helpers.getWebviewDetails = function getWebviewDetails(adb, webview) {
   const key = toDetailsCacheKey(adb, webview);
   return WEBVIEWS_DETAILS_CACHE.get(key);
 };
@@ -473,12 +498,13 @@ helpers.getWebviewDetails = function getWebviewDetails (adb, webview) {
  * @returns {Object} The capabilities object.
  * See https://chromedriver.chromium.org/capabilities for more details.
  */
-helpers.createChromedriverCaps = function createChromedriverCaps (opts, deviceId, webViewDetails) {
-  const caps = { chromeOptions: {} };
+helpers.createChromedriverCaps = function createChromedriverCaps(opts, deviceId, webViewDetails) {
+  const caps = {chromeOptions: {}};
 
-  const androidPackage = opts.chromeOptions?.androidPackage
-    || opts.appPackage
-    || webViewDetails?.info?.['Android-Package'];
+  const androidPackage =
+    opts.chromeOptions?.androidPackage ||
+    opts.appPackage ||
+    webViewDetails?.info?.['Android-Package'];
   if (androidPackage) {
     // chromedriver raises an invalid argument error when androidPackage is 'null'
     caps.chromeOptions.androidPackage = androidPackage;
@@ -524,13 +550,13 @@ helpers.createChromedriverCaps = function createChromedriverCaps (opts, deviceId
     caps.loggingPrefs = opts.chromeLoggingPrefs || opts.loggingPrefs;
   }
   if (opts.enablePerformanceLogging) {
-    logger.warn(`The 'enablePerformanceLogging' cap is deprecated; simply use ` +
-      `the 'chromeLoggingPrefs' cap instead, with a 'performance' key set to 'ALL'`);
+    logger.warn(
+      `The 'enablePerformanceLogging' cap is deprecated; simply use ` +
+        `the 'chromeLoggingPrefs' cap instead, with a 'performance' key set to 'ALL'`
+    );
     const newPref = {performance: 'ALL'};
     // don't overwrite other logging prefs that have been sent in if they exist
-    caps.loggingPrefs = caps.loggingPrefs
-      ? Object.assign({}, caps.loggingPrefs, newPref)
-      : newPref;
+    caps.loggingPrefs = caps.loggingPrefs ? Object.assign({}, caps.loggingPrefs, newPref) : newPref;
   }
 
   if (opts.chromeOptions?.Arguments) {
@@ -539,8 +565,9 @@ helpers.createChromedriverCaps = function createChromedriverCaps (opts, deviceId
     delete opts.chromeOptions.Arguments;
   }
 
-  logger.debug('Precalculated Chromedriver capabilities: ' +
-    JSON.stringify(caps.chromeOptions, null, 2));
+  logger.debug(
+    'Precalculated Chromedriver capabilities: ' + JSON.stringify(caps.chromeOptions, null, 2)
+  );
 
   const protectedCapNames = [];
   for (const [opt, val] of _.toPairs(opts.chromeOptions)) {
@@ -551,8 +578,10 @@ helpers.createChromedriverCaps = function createChromedriverCaps (opts, deviceId
     }
   }
   if (!_.isEmpty(protectedCapNames)) {
-    logger.info('The following Chromedriver capabilities cannot be overridden ' +
-      'by the provided chromeOptions:');
+    logger.info(
+      'The following Chromedriver capabilities cannot be overridden ' +
+        'by the provided chromeOptions:'
+    );
     for (const optName of protectedCapNames) {
       logger.info(`  ${optName} (${JSON.stringify(opts.chromeOptions[optName])})`);
     }
@@ -562,4 +591,12 @@ helpers.createChromedriverCaps = function createChromedriverCaps (opts, deviceId
 };
 
 export default helpers;
-export { helpers, NATIVE_WIN, WEBVIEW_WIN, WEBVIEW_BASE, CHROMIUM_WIN, KNOWN_CHROME_PACKAGE_NAMES };
+export {
+  helpers,
+  NATIVE_WIN,
+  WEBVIEW_WIN,
+  WEBVIEW_BASE,
+  CHROMIUM_WIN,
+  KNOWN_CHROME_PACKAGE_NAMES,
+  DEVTOOLS_SOCKET_PATTERN,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-android-driver",
-  "version": "5.14.0",
+  "version": "5.14.2",
   "description": "Android UiAutomator and Chrome support for Appium",
   "keywords": [
     "appium",
@@ -115,7 +115,7 @@
     "semantic-release": "^20.0.2",
     "sinon": "^15.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^4.9.5",
+    "typescript": "^5.1.6",
     "xpath": "^0.x"
   },
   "peerDependencies": {