appium-android-driver 14.0.2 → 14.0.3

package/lib/commands/recordscreen.ts

@@ -1,15 +1,13 @@
+import path from 'node:path';
+
 import {fs, net, system, tempDir, timing, util} from '@appium/support';
 import type {NetOptions, HttpUploadOptions} from '@appium/support';
+import type {ADB} from 'appium-adb';
 import {waitForCondition} from 'asyncbox';
-import path from 'node:path';
 import {exec} from 'teen_process';
+
 import type {AndroidDriver} from '../driver.js';
-import type {ADB} from 'appium-adb';
-import type {
-  StartScreenRecordingOpts,
-  StopScreenRecordingOpts,
-  ScreenRecordingProperties,
-} from './types.js';
+import type {StartScreenRecordingOpts, StopScreenRecordingOpts, ScreenRecordingProperties} from './types.js';
 
 const RETRY_PAUSE = 300;
 const RETRY_TIMEOUT = 5000;
@@ -43,13 +41,7 @@ export async function startRecordingScreen(
   await verifyScreenRecordIsSupported(this.adb, this.isEmulator());
 
   let result = '';
-  const {
-    videoSize,
-    timeLimit = DEFAULT_RECORDING_TIME_SEC,
-    bugReport,
-    bitRate,
-    forceRestart,
-  } = options;
+  const {videoSize, timeLimit = DEFAULT_RECORDING_TIME_SEC, bugReport, bitRate, forceRestart} = options;
   if (!forceRestart) {
     result = await this.stopRecordingScreen(options);
   }
@@ -109,10 +101,7 @@ export async function startRecordingScreen(
  * @throws {Error} If screen recording is not supported, no recording was active,
  * or if the recording process cannot be stopped.
  */
-export async function stopRecordingScreen(
-  this: AndroidDriver,
-  options: StopScreenRecordingOpts = {},
-): Promise<string> {
+export async function stopRecordingScreen(this: AndroidDriver, options: StopScreenRecordingOpts = {}): Promise<string> {
   await verifyScreenRecordIsSupported(this.adb, this.isEmulator());
 
   const props = this._screenRecordingProperties;
@@ -130,9 +119,7 @@ export async function stopRecordingScreen(
   }
 
   if (!props) {
-    this.log.info(
-      `Screen recording has not been previously started by Appium. There is nothing to stop`,
-    );
+    this.log.info(`Screen recording has not been previously started by Appium. There is nothing to stop`);
     return '';
   }
 
@@ -140,9 +127,7 @@ export async function stopRecordingScreen(
     try {
       await props.recordingProcess.stop('SIGINT', PROCESS_SHUTDOWN_TIMEOUT);
     } catch {
-      throw this.log.errorWithException(
-        `Unable to stop screen recording within ${PROCESS_SHUTDOWN_TIMEOUT}ms`,
-      );
+      throw this.log.errorWithException(`Unable to stop screen recording within ${PROCESS_SHUTDOWN_TIMEOUT}ms`);
     }
     props.recordingProcess = null;
   }
@@ -177,9 +162,7 @@ export async function stopRecordingScreen(
     }
     if (util.isEmpty(options.remotePath)) {
       const {size} = await fs.stat(resultFilePath);
-      this.log.debug(
-        `The size of the resulting screen recording is ${util.toReadableSizeString(size)}`,
-      );
+      this.log.debug(`The size of the resulting screen recording is ${util.toReadableSizeString(size)}`);
     }
     return await uploadRecordedMedia(resultFilePath, options.remotePath, options);
   } finally {
@@ -307,14 +290,9 @@ async function mergeScreenRecords(this: AndroidDriver, mediaFiles: string[]): Pr
   const configFile = path.resolve(path.dirname(mediaFiles[0]), 'config.txt');
   await fs.writeFile(configFile, configContent, 'utf8');
   this.log.debug(`Generated ffmpeg merging config '${configFile}' with items:\n${configContent}`);
-  const result = path.resolve(
-    path.dirname(mediaFiles[0]),
-    `merge_${Math.floor(+new Date())}${DEFAULT_EXT}`,
-  );
+  const result = path.resolve(path.dirname(mediaFiles[0]), `merge_${Math.floor(+new Date())}${DEFAULT_EXT}`);
   const args = ['-safe', '0', '-f', 'concat', '-i', configFile, '-c', 'copy', result];
-  this.log.info(
-    `Initiating screen records merging using the command '${FFMPEG_BINARY} ${args.join(' ')}'`,
-  );
+  this.log.info(`Initiating screen records merging using the command '${FFMPEG_BINARY} ${args.join(' ')}'`);
   await exec(FFMPEG_BINARY, args);
   return result;
 }
@@ -327,13 +305,10 @@ async function terminateBackgroundScreenRecording(adb: ADB, force = true): Promi
 
   try {
     await adb.shell(['kill', force ? '-15' : '-2', ...screenrecordPids.map(String)]);
-    await waitForCondition(
-      async () => util.isEmpty(await adb.getProcessIdsByName(SCREENRECORD_BINARY)),
-      {
-        waitMs: PROCESS_SHUTDOWN_TIMEOUT,
-        intervalMs: 500,
-      },
-    );
+    await waitForCondition(async () => util.isEmpty(await adb.getProcessIdsByName(SCREENRECORD_BINARY)), {
+      waitMs: PROCESS_SHUTDOWN_TIMEOUT,
+      intervalMs: 500,
+    });
     return true;
   } catch (err) {
     throw new Error(`Unable to stop the background screen recording: ${(err as Error).message}`, {

package/lib/commands/resources.ts

@@ -1,5 +1,6 @@
 import {fs, tempDir, util} from '@appium/support';
 import type {StringRecord} from '@appium/types';
+
 import type {AndroidDriver, AndroidDriverOpts} from '../driver.js';
 import type {Locale} from './types.js';
 
@@ -10,10 +11,7 @@ import type {Locale} from './types.js';
  * the device's current language will be used.
  * @returns Promise that resolves to a mapping of string keys to their localized values.
  */
-export async function getStrings(
-  this: AndroidDriver,
-  language: string | null = null,
-): Promise<StringRecord> {
+export async function getStrings(this: AndroidDriver, language: string | null = null): Promise<StringRecord> {
   if (!language) {
     language = await this.adb.getDeviceLanguage();
     this.log.info(`No language specified, returning strings for: ${language}`);
@@ -105,11 +103,7 @@ async function extractStringsFromResources(
   }
 }
 
-async function fetchLocaleSuggestions(
-  this: AndroidDriver,
-  language?: string,
-  country?: string,
-): Promise<Locale[]> {
+async function fetchLocaleSuggestions(this: AndroidDriver, language?: string, country?: string): Promise<Locale[]> {
   const supportedLocales = await this.settingsApp.listSupportedLocales();
   const suggestedLocales = supportedLocales.filter(
     (locale) =>

package/lib/commands/shell.ts

@@ -2,8 +2,9 @@ import {util} from '@appium/support';
 import {errors} from 'appium/driver.js';
 import {exec} from 'teen_process';
 import type {ExecError} from 'teen_process';
-import {ADB_SHELL_FEATURE} from '../utils.js';
+
 import type {AndroidDriver} from '../driver.js';
+import {ADB_SHELL_FEATURE} from '../utils.js';
 
 /**
  * Executes a shell command on the device via ADB.
@@ -39,12 +40,7 @@ export async function mobileShell<T extends boolean>(
     throw new errors.InvalidArgumentError(`The 'command' argument is mandatory`);
   }
 
-  const adbArgs = [
-    ...this.adb.executable.defaultArgs,
-    'shell',
-    command,
-    ...(Array.isArray(args) ? args : [args]),
-  ];
+  const adbArgs = [...this.adb.executable.defaultArgs, 'shell', command, ...(Array.isArray(args) ? args : [args])];
   this.log.debug(`Running '${this.adb.executable.path} ${util.quote(adbArgs)}'`);
   try {
     const {stdout, stderr} = await exec(this.adb.executable.path, adbArgs, {timeout});

package/lib/commands/streamscreen.ts

@@ -1,14 +1,16 @@
-import {fs, logger, system, util} from '@appium/support';
-import {waitForCondition} from 'asyncbox';
 import {spawn} from 'node:child_process';
 import http from 'node:http';
 import net from 'node:net';
 import url from 'node:url';
+
+import {fs, logger, system, util} from '@appium/support';
+import type {AppiumLogger} from '@appium/types';
+import type {ADB} from 'appium-adb';
+import {waitForCondition} from 'asyncbox';
 import {checkPortStatus} from 'portscanner';
 import {SubProcess, exec} from 'teen_process';
+
 import type {AndroidDriver} from '../driver.js';
-import type {ADB} from 'appium-adb';
-import type {AppiumLogger} from '@appium/types';
 import type {DeviceInfo, InitGStreamerPipelineOpts} from './types.js';
 
 const RECORDING_INTERVAL_SEC = 5;
@@ -91,22 +93,16 @@ export async function mobileStartScreenStreaming(
   if (this._screenStreamingProps === undefined) {
     await verifyStreamingRequirements(this.adb);
   } else {
-    this.log.info(
-      `The screen streaming session is already running. ` +
-        `Stop it first in order to start a new one.`,
-    );
+    this.log.info(`The screen streaming session is already running. Stop it first in order to start a new one.`);
     return;
   }
   if ((await checkPortStatus(port, host)) === 'open') {
-    this.log.info(
-      `The port #${port} at ${host} is busy. ` + `Assuming the screen streaming is already running`,
-    );
+    this.log.info(`The port #${port} at ${host} is busy. Assuming the screen streaming is already running`);
     return;
   }
   if ((await checkPortStatus(tcpPort, TCP_HOST)) === 'open') {
     throw this.log.errorWithException(
-      `The port #${tcpPort} at ${TCP_HOST} is busy. ` +
-        `Make sure there are no leftovers from previous sessions.`,
+      `The port #${tcpPort} at ${TCP_HOST} is busy. Make sure there are no leftovers from previous sessions.`,
     );
   }
   this._screenStreamingProps = undefined;
@@ -139,12 +135,7 @@ export async function mobileStartScreenStreaming(
   let mjpegConnectTimeoutId: ReturnType<typeof setTimeout> | undefined;
   const mjpegConnectTimeoutPromise = new Promise<never>((_resolve, reject) => {
     mjpegConnectTimeoutId = setTimeout(
-      () =>
-        reject(
-          new Error(
-            `Cannot connect to the streaming server within ${STREAMING_STARTUP_TIMEOUT_MS}ms`,
-          ),
-        ),
+      () => reject(new Error(`Cannot connect to the streaming server within ${STREAMING_STARTUP_TIMEOUT_MS}ms`)),
       STREAMING_STARTUP_TIMEOUT_MS,
     );
   });
@@ -160,9 +151,7 @@ export async function mobileStartScreenStreaming(
         );
 
         if (pathname && currentPathname !== pathname) {
-          this.log.info(
-            'Rejecting the broadcast request since it does not match the given pathname',
-          );
+          this.log.info('Rejecting the broadcast request since it does not match the given pathname');
           res.writeHead(404, {
             Connection: 'close',
             'Content-Type': 'text/plain; charset=utf-8',
@@ -174,8 +163,7 @@ export async function mobileStartScreenStreaming(
 
         this.log.info('Starting MJPEG broadcast');
         res.writeHead(200, {
-          'Cache-Control':
-            'no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0',
+          'Cache-Control': 'no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0',
           Pragma: 'no-cache',
           Connection: 'close',
           'Content-Type': `multipart/x-mixed-replace; boundary=${BOUNDARY_STRING}`,
@@ -253,8 +241,7 @@ export async function mobileStopScreenStreaming(this: AndroidDriver): Promise<vo
     return;
   }
 
-  const {deviceStreamingProc, gstreamerPipeline, mjpegSocket, mjpegServer} =
-    this._screenStreamingProps;
+  const {deviceStreamingProc, gstreamerPipeline, mjpegSocket, mjpegServer} = this._screenStreamingProps;
 
   try {
     mjpegSocket.end();
@@ -296,9 +283,7 @@ function createStreamingLogger(streamName: string, udid: string): AppiumLogger {
 
 async function verifyStreamingRequirements(adb: ADB): Promise<void> {
   if (!(await adb.shell(['which', SCREENRECORD_BINARY])).trim()) {
-    throw new Error(
-      `The required '${SCREENRECORD_BINARY}' binary is not available on the device under test`,
-    );
+    throw new Error(`The required '${SCREENRECORD_BINARY}' binary is not available on the device under test`);
   }
 
   const gstreamerCheckPromises: Promise<void>[] = [];
@@ -349,8 +334,7 @@ async function getDeviceInfo(adb: ADB, log?: AppiumLogger): Promise<DeviceInfo>
     if (!match) {
       log?.debug(output);
       throw new Error(
-        `Cannot parse the device ${key} from the adb command output. ` +
-          `Check the server log for more details.`,
+        `Cannot parse the device ${key} from the adb command output. Check the server log for more details.`,
       );
     }
     result[key] = parseInt(match[1], 10);
@@ -416,9 +400,7 @@ async function initDeviceStreamingProc(
       intervalMs: 300,
     });
   } catch (e) {
-    throw log.errorWithException(
-      `Cannot start the screen streaming process. Original error: ${(e as Error).message}`,
-    );
+    throw log.errorWithException(`Cannot start the screen streaming process. Original error: ${(e as Error).message}`);
   } finally {
     deviceStreaming.stderr.removeListener('data', errorsListener);
     deviceStreaming.stdout.removeListener('data', startupListener);
@@ -501,9 +483,7 @@ async function initGstreamerPipeline(
     );
   } catch (e) {
     didFail = true;
-    throw log.errorWithException(
-      `Cannot start the screen streaming pipeline. Original error: ${(e as Error).message}`,
-    );
+    throw log.errorWithException(`Cannot start the screen streaming pipeline. Original error: ${(e as Error).message}`);
   } finally {
     if (!logPipelineDetails || didFail) {
       gstreamerPipeline.removeListener('output', gstOutputListener);

package/lib/commands/system-bars.ts

@@ -1,8 +1,9 @@
-import {errors} from 'appium/driver.js';
+import {util} from '@appium/support';
 import type {StringRecord} from '@appium/types';
+import {errors} from 'appium/driver.js';
+
 import type {AndroidDriver} from '../driver.js';
 import type {StatusBarCommand, WindowProperties} from './types.js';
-import {util} from '@appium/support';
 
 const WINDOW_TITLE_PATTERN = /^\s+Window\s#\d+\sWindow\{[0-9a-f]+\s\w+\s([\w-]+)\}:$/;
 const FRAME_PATTERN = /\bm?[Ff]rame=\[([0-9.-]+),([0-9.-]+)\]\[([0-9.-]+),([0-9.-]+)\]/;
@@ -38,12 +39,9 @@ export async function getSystemBars(this: AndroidDriver): Promise<StringRecord>
   try {
     stdout = await this.adb.shell(['dumpsys', 'window', 'windows']);
   } catch (e) {
-    throw new Error(
-      `Cannot retrieve system bars details. Original error: ${(e as Error).message}`,
-      {
-        cause: e,
-      },
-    );
+    throw new Error(`Cannot retrieve system bars details. Original error: ${(e as Error).message}`, {
+      cause: e,
+    });
   }
   return parseWindows.bind(this)(stdout);
 }
@@ -105,11 +103,7 @@ export async function mobilePerformStatusBarCommand(
  * @returns Parsed properties object
  * @throws {Error} If there was an issue while parsing the properties string
  */
-export function parseWindowProperties(
-  this: AndroidDriver,
-  name: string,
-  props: string[],
-): WindowProperties {
+export function parseWindowProperties(this: AndroidDriver, name: string, props: string[]): WindowProperties {
   const result = structuredClone(DEFAULT_WINDOW_PROPERTIES);
   const propLines = props.join('\n');
   const frameMatch = FRAME_PATTERN.exec(propLines);

package/lib/commands/time.ts

@@ -1,6 +1,7 @@
 import dayjs from 'dayjs';
-import utc from 'dayjs/plugin/utc.js';
 import customParseFormat from 'dayjs/plugin/customParseFormat.js';
+import utc from 'dayjs/plugin/utc.js';
+
 import type {AndroidDriver} from '../driver.js';
 
 dayjs.extend(utc);
@@ -14,13 +15,8 @@ const DATETIME_FORMAT_ISO8601 = 'YYYY-MM-DDTHH:mm:ssZ';
  * @param format The format string for the time. Defaults to ISO8601 format.
  * @returns Promise that resolves to the formatted device time string.
  */
-export async function getDeviceTime(
-  this: AndroidDriver,
-  format: string = DATETIME_FORMAT_ISO8601,
-): Promise<string> {
-  this.log.debug(
-    `Attempting to capture Android device date and time. The format specifier is '${format}'`,
-  );
+export async function getDeviceTime(this: AndroidDriver, format: string = DATETIME_FORMAT_ISO8601): Promise<string> {
+  this.log.debug(`Attempting to capture Android device date and time. The format specifier is '${format}'`);
   const deviceTimestamp = (await this.adb.shell(['date', '+%Y-%m-%dT%T%z'])).trim();
   this.log.debug(`Got device timestamp: ${deviceTimestamp}`);
   const parsedTimestamp = dayjs.utc(deviceTimestamp, 'YYYY-MM-DDTHH:mm:ssZZ');

package/lib/commands/types.ts

@@ -1,10 +1,12 @@
-import type {HTTPMethod, StringRecord} from '@appium/types';
-import type {AndroidDriverCaps} from '../driver.js';
-import type {SubProcess} from 'teen_process';
-import type {timing} from '@appium/support';
 import type {ChildProcess} from 'node:child_process';
-import type {Socket} from 'node:net';
 import type {Server} from 'node:http';
+import type {Socket} from 'node:net';
+
+import type {timing} from '@appium/support';
+import type {HTTPMethod, StringRecord} from '@appium/types';
+import type {SubProcess} from 'teen_process';
+
+import type {AndroidDriverCaps} from '../driver.js';
 
 /**
  * @privateRemarks probably better defined in `appium-adb`
@@ -21,8 +23,7 @@ export type GsmVoiceState = 'on' | 'off';
 
 export type PowerACState = 'on' | 'off';
 
-export type NetworkSpeed =
-  'gsm' | 'scsd' | 'gprs' | 'edge' | 'umts' | 'hsdpa' | 'lte' | 'evdo' | 'full';
+export type NetworkSpeed = 'gsm' | 'scsd' | 'gprs' | 'edge' | 'umts' | 'hsdpa' | 'lte' | 'evdo' | 'full';
 
 /**
  * Returned by `queryAppState`
@@ -138,9 +139,7 @@ export interface WebviewsMapping {
  * [8000, [9000, 9100]]
  * ```
  */
-export type PortSpec = Array<
-  number | string | [startPort: number | string, endPort: number | string]
->;
+export type PortSpec = Array<number | string | [startPort: number | string, endPort: number | string]>;
 
 export interface DoSetElementValueOpts {
   elementId: string;

package/lib/doctor/checks.ts

@@ -1,19 +1,18 @@
-import {resolveExecutablePath} from './utils.js';
-import {system, fs, doctor, console} from '@appium/support';
 import path from 'node:path';
-import {getAndroidBinaryPath, getSdkRootFromEnv} from 'appium-adb';
+
+import {system, fs, doctor, console} from '@appium/support';
 import type {IDoctorCheck, AppiumLogger, DoctorCheckResult} from '@appium/types';
+import {getAndroidBinaryPath, getSdkRootFromEnv} from 'appium-adb';
+
+import {resolveExecutablePath} from './utils.js';
 
 const JAVA_HOME_VAR_NAME = system.isWindows() ? '%JAVA_HOME%' : '$JAVA_HOME';
-const ENVIRONMENT_VARS_TUTORIAL_URL =
-  'https://github.com/appium/java-client/blob/master/docs/environment.md';
-const JAVA_HOME_TUTORIAL =
-  'https://docs.oracle.com/cd/E21454_01/html/821-2531/inst_jdk_javahome_t.html';
+const ENVIRONMENT_VARS_TUTORIAL_URL = 'https://github.com/appium/java-client/blob/master/docs/environment.md';
+const JAVA_HOME_TUTORIAL = 'https://docs.oracle.com/cd/E21454_01/html/821-2531/inst_jdk_javahome_t.html';
 const ANDROID_SDK_LINK1 = 'https://developer.android.com/studio#cmdline-tools';
 const ANDROID_SDK_LINK2 = 'https://developer.android.com/studio/intro/update#sdk-manager';
 const BUNDLETOOL_RELEASES_LINK = 'https://github.com/google/bundletool/releases/';
-const GSTREAMER_INSTALL_LINK =
-  'https://gstreamer.freedesktop.org/documentation/installing/index.html?gi-language=c';
+const GSTREAMER_INSTALL_LINK = 'https://gstreamer.freedesktop.org/documentation/installing/index.html?gi-language=c';
 const FFMPEG_INSTALL_LINK = 'https://www.ffmpeg.org/download.html';
 
 export interface EnvVarCheckOptions {
@@ -47,14 +46,10 @@ class EnvVarAndPathCheck implements IDoctorCheck {
 
     const stat = await fs.stat(varValue);
     if (this.opts.expectDir && !stat.isDirectory()) {
-      return doctor.nok(
-        `${this.varName} is expected to be a valid folder, got a file path instead`,
-      );
+      return doctor.nok(`${this.varName} is expected to be a valid folder, got a file path instead`);
     }
     if (this.opts.expectFile && stat.isDirectory()) {
-      return doctor.nok(
-        `${this.varName} is expected to be a valid file, got a folder path instead`,
-      );
+      return doctor.nok(`${this.varName} is expected to be a valid file, got a folder path instead`);
     }
 
     return doctor.ok(`${this.varName} is set to: ${varValue}`);
@@ -203,9 +198,7 @@ export class OptionalGstreamerCheck implements IDoctorCheck {
       ? doctor.okOptional(
           `${this.GSTREAMER_BINARY} and ${this.GST_INSPECT_BINARY} are installed at: ${gstreamerPath} and ${gstInspectPath}`,
         )
-      : doctor.nokOptional(
-          `${this.GSTREAMER_BINARY} and/or ${this.GST_INSPECT_BINARY} cannot be found`,
-        );
+      : doctor.nokOptional(`${this.GSTREAMER_BINARY} and/or ${this.GST_INSPECT_BINARY} cannot be found`);
   }
 
   async fix(): Promise<string> {

package/lib/driver.ts

@@ -10,12 +10,34 @@ import type {
 import type {ADB, LogcatListener} from 'appium-adb';
 import type {Chromedriver as AppiumChromedriver} from 'appium-chromedriver';
 import {BaseDriver} from 'appium/driver.js';
-import {ANDROID_DRIVER_CONSTRAINTS} from './constraints.js';
-import type {AndroidDriverConstraints} from './constraints.js';
-import {newMethodMap} from './method-map.js';
 import {SettingsApp} from 'io.appium.settings';
-import {parseArray, removeAllSessionWebSocketHandlers} from './utils.js';
-import {CHROME_BROWSER_PACKAGE_ACTIVITY} from './commands/context/helpers.js';
+import {LRUCache} from 'lru-cache';
+
+import {
+  getThirdPartyPackages,
+  uninstallOtherPackages,
+  installOtherApks,
+  installAUT,
+  resetAUT,
+  background,
+  mobileBackgroundApp,
+  getCurrentActivity,
+  getCurrentPackage,
+  mobileClearApp,
+  mobileInstallApp,
+  installApp,
+  mobileIsAppInstalled,
+  mobileRemoveApp,
+  mobileTerminateApp,
+  mobileListApps,
+  terminateApp,
+  removeApp,
+  activateApp,
+  queryAppState,
+  isAppInstalled,
+} from './commands/app-management.js';
+import {mobileGetUiMode, mobileSetUiMode} from './commands/appearance.js';
+import {mobileBluetooth} from './commands/bluetooth.js';
 import {
   getContexts,
   setContext,
@@ -38,12 +60,8 @@ import {
   setWindow,
   notifyBiDiContextChange,
 } from './commands/context/exports.js';
-import {
-  getDeviceInfoFromCaps,
-  createADB,
-  getLaunchInfo,
-  initDevice,
-} from './commands/device/common.js';
+import {CHROME_BROWSER_PACKAGE_ACTIVITY} from './commands/context/helpers.js';
+import {getDeviceInfoFromCaps, createADB, getLaunchInfo, initDevice} from './commands/device/common.js';
 import {
   fingerprint,
   mobileFingerprint,
@@ -64,32 +82,7 @@ import {
   sensorSet,
 } from './commands/device/emulator-actions.js';
 import {mobileExecEmuConsoleCommand} from './commands/device/emulator-console.js';
-import {
-  getThirdPartyPackages,
-  uninstallOtherPackages,
-  installOtherApks,
-  installAUT,
-  resetAUT,
-  background,
-  mobileBackgroundApp,
-  getCurrentActivity,
-  getCurrentPackage,
-  mobileClearApp,
-  mobileInstallApp,
-  installApp,
-  mobileIsAppInstalled,
-  mobileRemoveApp,
-  mobileTerminateApp,
-  mobileListApps,
-  terminateApp,
-  removeApp,
-  activateApp,
-  queryAppState,
-  isAppInstalled,
-} from './commands/app-management.js';
-import {mobileGetUiMode, mobileSetUiMode} from './commands/appearance.js';
 import {mobileDeviceidle} from './commands/deviceidle.js';
-import {mobileBluetooth} from './commands/bluetooth.js';
 import {
   getAttribute,
   getName,
@@ -121,6 +114,7 @@ import {
   mobileResetGeolocation,
 } from './commands/geolocation.js';
 import {performActions} from './commands/gestures.js';
+import {mobileInjectEmulatorCameraImage} from './commands/image-injection.js';
 import {
   isIMEActivated,
   availableIMEEngines,
@@ -145,6 +139,7 @@ import {
   longPressKeyCode,
   mobilePerformEditorAction,
 } from './commands/keyboard.js';
+import {reset, closeApp, launchApp} from './commands/legacy.js';
 import {lock, unlock, mobileUnlock, isLocked} from './commands/lock/exports.js';
 import {
   supportedLogTypes,
@@ -160,8 +155,6 @@ import {
   mobileStopMediaProjectionRecording,
 } from './commands/media-projection.js';
 import {mobileSendTrimMemory} from './commands/memory.js';
-import {mobileNfc} from './commands/nfc.js';
-import {mobileInjectEmulatorCameraImage} from './commands/image-injection.js';
 import {
   getWindowRect,
   getWindowSize,
@@ -183,12 +176,8 @@ import {
   toggleFlightMode,
   toggleWiFi,
 } from './commands/network.js';
-import {
-  getPerformanceData,
-  getPerformanceDataTypes,
-  mobileGetPerformanceData,
-} from './commands/performance.js';
-import {reset, closeApp, launchApp} from './commands/legacy.js';
+import {mobileNfc} from './commands/nfc.js';
+import {getPerformanceData, getPerformanceDataTypes, mobileGetPerformanceData} from './commands/performance.js';
 import {mobileChangePermissions, mobileGetPermissions} from './commands/permissions.js';
 import {startRecordingScreen, stopRecordingScreen} from './commands/recordscreen.js';
 import {getStrings, ensureDeviceLocale} from './commands/resources.js';
@@ -196,9 +185,12 @@ import {mobileShell} from './commands/shell.js';
 import {mobileStartScreenStreaming, mobileStopScreenStreaming} from './commands/streamscreen.js';
 import {getSystemBars, mobilePerformStatusBarCommand} from './commands/system-bars.js';
 import {getDeviceTime, mobileGetDeviceTime} from './commands/time.js';
-import {executeMethodMap} from './execute-method-map.js';
-import {LRUCache} from 'lru-cache';
 import type {ScreenRecordingProperties, ScreenStreamingProps} from './commands/types.js';
+import {ANDROID_DRIVER_CONSTRAINTS} from './constraints.js';
+import type {AndroidDriverConstraints} from './constraints.js';
+import {executeMethodMap} from './execute-method-map.js';
+import {newMethodMap} from './method-map.js';
+import {parseArray, removeAllSessionWebSocketHandlers} from './utils.js';
 
 export type AndroidDriverCaps = DriverCaps<AndroidDriverConstraints>;
 export type W3CAndroidDriverCaps = W3CDriverCaps<AndroidDriverConstraints>;
@@ -454,13 +446,7 @@ class AndroidDriver
   constructor(opts: InitialOpts = {} as InitialOpts, shouldValidateCaps = true) {
     super(opts, shouldValidateCaps);
 
-    this.locatorStrategies = [
-      'xpath',
-      'id',
-      'class name',
-      'accessibility id',
-      '-android uiautomator',
-    ];
+    this.locatorStrategies = ['xpath', 'id', 'class name', 'accessibility id', '-android uiautomator'];
     this.desiredCapConstraints = structuredClone(ANDROID_DRIVER_CONSTRAINTS);
     this.sessionChromedrivers = {};
     this.jwpProxyActive = false;
@@ -482,9 +468,7 @@ class AndroidDriver
   }
 
   get isChromeSession(): boolean {
-    return Object.keys(CHROME_BROWSER_PACKAGE_ACTIVITY).includes(
-      (this.opts.browserName || '').toLowerCase(),
-    );
+    return Object.keys(CHROME_BROWSER_PACKAGE_ACTIVITY).includes((this.opts.browserName || '').toLowerCase());
   }
 
   isEmulator(): boolean {
@@ -500,14 +484,10 @@ class AndroidDriver
     if (caps.browserName) {
       if (caps.app) {
         // warn if the capabilities have both `app` and `browser, although this is common with selenium grid
-        this.log.warn(
-          `The desired capabilities should generally not include both an 'app' and a 'browserName'`,
-        );
+        this.log.warn(`The desired capabilities should generally not include both an 'app' and a 'browserName'`);
       }
       if (caps.appPackage) {
-        throw this.log.errorWithException(
-          `The desired should not include both of an 'appPackage' and a 'browserName'`,
-        );
+        throw this.log.errorWithException(`The desired should not include both of an 'appPackage' and a 'browserName'`);
       }
     }
 
@@ -531,9 +511,7 @@ class AndroidDriver
       this.adb?.logcat?.removeAllListeners();
       await this.adb?.stopLogcat();
     } catch (e) {
-      this.log.warn(
-        `Cannot stop the logcat process. Original error: ${e instanceof Error ? e.message : String(e)}`,
-      );
+      this.log.warn(`Cannot stop the logcat process. Original error: ${e instanceof Error ? e.message : String(e)}`);
     }
 
     if (this._bidiServerLogListener) {