appium-uiautomator2-driver 8.2.0 → 8.2.2

package/lib/commands/aut.ts

@@ -1,6 +1,7 @@
 import {utils} from 'appium-android-driver';
 import {fs} from 'appium/support.js';
 import {SETTINGS_HELPER_ID} from 'io.appium.settings';
+
 import type {AndroidUiautomator2Driver} from '../driver.js';
 import {APKS_EXTENSION, APK_EXTENSION} from '../extensions.js';
 import {SERVER_PACKAGE_ID, SERVER_TEST_PACKAGE_ID} from '../uiautomator2-server/index.js';
@@ -17,10 +18,7 @@ export async function prepareSessionApp(this: AndroidUiautomator2Driver): Promis
     // assume is on the device and just launch via the appPackage
     this.log.info(`Starting '${this.opts.appPackage}' directly on the device`);
   } else {
-    this.log.info(
-      `Neither 'app' nor 'appPackage' was set. Starting UiAutomator2 ` +
-        'without the target application',
-    );
+    this.log.info(`Neither 'app' nor 'appPackage' was set. Starting UiAutomator2 ` + 'without the target application');
   }
 }
 
@@ -49,9 +47,7 @@ export async function initAUT(this: AndroidUiautomator2Driver): Promise<void> {
     try {
       otherApps = utils.parseArray(this.opts.otherApps);
     } catch (e) {
-      throw this.log.errorWithException(
-        `Could not parse "otherApps" capability: ${(e as Error).message}`,
-      );
+      throw this.log.errorWithException(`Could not parse "otherApps" capability: ${(e as Error).message}`);
     }
     otherApps = await Promise.all(
       otherApps.map((app) => this.helpers.configureApp(app, [APK_EXTENSION, APKS_EXTENSION])),
@@ -80,9 +76,7 @@ export async function initAUT(this: AndroidUiautomator2Driver): Promise<void> {
     }
   } else {
     if (this.opts.fullReset) {
-      throw this.log.errorWithException(
-        'Full reset requires an app capability, use fastReset if app is not provided',
-      );
+      throw this.log.errorWithException('Full reset requires an app capability, use fastReset if app is not provided');
     }
     this.log.debug('No app capability. Assuming it is already on the device');
     if (this.opts.fastReset && this.opts.appPackage) {

package/lib/commands/battery.ts

@@ -6,11 +6,7 @@ import type {BatteryInfo} from './types.js';
  * @returns Battery information including level (0.0-1.0) and state (charging, discharging, etc.).
  */
 export async function mobileGetBatteryInfo(this: AndroidUiautomator2Driver): Promise<BatteryInfo> {
-  const result = (await this.uiautomator2.jwproxy.command(
-    '/appium/device/battery_info',
-    'GET',
-    {},
-  )) as {
+  const result = (await this.uiautomator2.jwproxy.command('/appium/device/battery_info', 'GET', {})) as {
     status: BatteryInfo['state'];
     level: number;
   };

package/lib/commands/element.ts

@@ -1,8 +1,9 @@
-import {PROTOCOLS} from 'appium/driver.js';
-import type {DoSetElementValueOpts} from 'appium-android-driver';
 import type {Element as AppiumElement, Position, Rect, Size} from '@appium/types';
-import type {AndroidUiautomator2Driver} from '../driver.js';
+import type {DoSetElementValueOpts} from 'appium-android-driver';
 import type {Chromedriver} from 'appium-chromedriver';
+import {PROTOCOLS} from 'appium/driver.js';
+
+import type {AndroidUiautomator2Driver} from '../driver.js';
 
 /**
  * Gets the currently active element.
@@ -23,13 +24,7 @@ export async function getAttribute(
   attribute: string,
   elementId: string,
 ): Promise<string> {
-  return String(
-    await this.uiautomator2.jwproxy.command(
-      `/element/${elementId}/attribute/${attribute}`,
-      'GET',
-      {},
-    ),
-  );
+  return String(await this.uiautomator2.jwproxy.command(`/element/${elementId}/attribute/${attribute}`, 'GET', {}));
 }
 
 /**
@@ -37,10 +32,7 @@ export async function getAttribute(
  * @param elementId - ID of the element.
  * @returns True if the element is displayed, false otherwise.
  */
-export async function elementDisplayed(
-  this: AndroidUiautomator2Driver,
-  elementId: string,
-): Promise<boolean> {
+export async function elementDisplayed(this: AndroidUiautomator2Driver, elementId: string): Promise<boolean> {
   return toBool(await this.getAttribute('displayed', elementId));
 }
 
@@ -49,10 +41,7 @@ export async function elementDisplayed(
  * @param elementId - ID of the element.
  * @returns True if the element is enabled, false otherwise.
  */
-export async function elementEnabled(
-  this: AndroidUiautomator2Driver,
-  elementId: string,
-): Promise<boolean> {
+export async function elementEnabled(this: AndroidUiautomator2Driver, elementId: string): Promise<boolean> {
   return toBool(await this.getAttribute('enabled', elementId));
 }
 
@@ -61,10 +50,7 @@ export async function elementEnabled(
  * @param elementId - ID of the element.
  * @returns True if the element is selected, false otherwise.
  */
-export async function elementSelected(
-  this: AndroidUiautomator2Driver,
-  elementId: string,
-): Promise<boolean> {
+export async function elementSelected(this: AndroidUiautomator2Driver, elementId: string): Promise<boolean> {
   return toBool(await this.getAttribute('selected', elementId));
 }
 
@@ -74,11 +60,7 @@ export async function elementSelected(
  * @returns The element tag name.
  */
 export async function getName(this: AndroidUiautomator2Driver, elementId: string): Promise<string> {
-  return (await this.uiautomator2.jwproxy.command(
-    `/element/${elementId}/name`,
-    'GET',
-    {},
-  )) as string;
+  return (await this.uiautomator2.jwproxy.command(`/element/${elementId}/name`, 'GET', {})) as string;
 }
 
 /**
@@ -86,15 +68,8 @@ export async function getName(this: AndroidUiautomator2Driver, elementId: string
  * @param elementId - ID of the element.
  * @returns The element position coordinates (x, y).
  */
-export async function getLocation(
-  this: AndroidUiautomator2Driver,
-  elementId: string,
-): Promise<Position> {
-  return (await this.uiautomator2.jwproxy.command(
-    `/element/${elementId}/location`,
-    'GET',
-    {},
-  )) as Position;
+export async function getLocation(this: AndroidUiautomator2Driver, elementId: string): Promise<Position> {
+  return (await this.uiautomator2.jwproxy.command(`/element/${elementId}/location`, 'GET', {})) as Position;
 }
 
 /**
@@ -110,10 +85,7 @@ export async function getSize(this: AndroidUiautomator2Driver, elementId: string
  * Sets the value of an element using the upstream driver API.
  * @param params - Options containing the element ID and value to set.
  */
-export async function doSetElementValue(
-  this: AndroidUiautomator2Driver,
-  params: DoSetElementValueOpts,
-): Promise<void> {
+export async function doSetElementValue(this: AndroidUiautomator2Driver, params: DoSetElementValueOpts): Promise<void> {
   await this.uiautomator2.jwproxy.command(`/element/${params.elementId}/value`, 'POST', params);
 }
 
@@ -156,13 +128,8 @@ export async function click(this: AndroidUiautomator2Driver, element: string): P
  * @param element - ID of the element.
  * @returns Base64-encoded PNG screenshot of the element.
  */
-export async function getElementScreenshot(
-  this: AndroidUiautomator2Driver,
-  element: string,
-): Promise<string> {
-  return String(
-    await this.uiautomator2.jwproxy.command(`/element/${element}/screenshot`, 'GET', {}),
-  );
+export async function getElementScreenshot(this: AndroidUiautomator2Driver, element: string): Promise<string> {
+  return String(await this.uiautomator2.jwproxy.command(`/element/${element}/screenshot`, 'GET', {}));
 }
 
 /**
@@ -178,10 +145,7 @@ export async function clear(this: AndroidUiautomator2Driver, elementId: string):
  * @param elementId - ID of the element.
  * @returns The element rectangle (x, y, width, height).
  */
-export async function getElementRect(
-  this: AndroidUiautomator2Driver,
-  elementId: string,
-): Promise<Rect> {
+export async function getElementRect(this: AndroidUiautomator2Driver, elementId: string): Promise<Rect> {
   if (!this.isWebContext()) {
     return (await this.uiautomator2.jwproxy.command(`/element/${elementId}/rect`, 'GET')) as Rect;
   }

package/lib/commands/find.ts

@@ -1,6 +1,7 @@
-import {cssToNativeLocator} from '../css/index.js';
 import type {Element as AppiumElement} from '@appium/types';
 import type {FindElementOpts} from 'appium-android-driver';
+
+import {cssToNativeLocator} from '../css/index.js';
 import type {AndroidUiautomator2Driver} from '../driver.js';
 
 // we override the xpath search for this first-visible-child selector, which
@@ -47,9 +48,7 @@ export async function doFindElementOrEls(
       this.opts.appPackage,
     ));
   }
-  return (await uiautomator2.jwproxy.command(
-    `/element${params.multiple ? 's' : ''}`,
-    'POST',
-    params,
-  )) as AppiumElement | AppiumElement[];
+  return (await uiautomator2.jwproxy.command(`/element${params.multiple ? 's' : ''}`, 'POST', params)) as
+    | AppiumElement
+    | AppiumElement[];
 }

package/lib/commands/gestures.ts

@@ -1,8 +1,9 @@
+import type {Element as AppiumElement, Position} from '@appium/types';
 import {errors} from 'appium/driver.js';
 import {util} from 'appium/support.js';
-import type {Element as AppiumElement, Position} from '@appium/types';
-import type {RelativeRect} from './types.js';
+
 import type {AndroidUiautomator2Driver} from '../driver.js';
+import type {RelativeRect} from './types.js';
 
 /**
  * Performs a simple click/tap gesture.
@@ -247,9 +248,7 @@ export async function mobileScrollBackTo(
   elementToId?: string,
 ): Promise<void> {
   if (!elementId || !elementToId) {
-    throw new errors.InvalidArgumentError(
-      `Both elementId and elementToId arguments must be provided`,
-    );
+    throw new errors.InvalidArgumentError(`Both elementId and elementToId arguments must be provided`);
   }
   await this.uiautomator2.jwproxy.command(
     `/appium/element/${util.unwrapElement(elementId)}/scroll_to/${util.unwrapElement(elementToId)}`,
@@ -290,12 +289,7 @@ function toPoint(x?: number, y?: number): Partial<Position> | undefined {
   return Number.isFinite(x) && Number.isFinite(y) ? {x, y} : undefined;
 }
 
-function toRect(
-  left?: number,
-  top?: number,
-  width?: number,
-  height?: number,
-): RelativeRect | undefined {
+function toRect(left?: number, top?: number, width?: number, height?: number): RelativeRect | undefined {
   return [left, top, width, height].some((v) => !Number.isFinite(v))
     ? undefined
     : ({left, top, width, height} as RelativeRect);

package/lib/commands/keyboard.ts

@@ -1,6 +1,7 @@
-import type {AndroidUiautomator2Driver} from '../driver.js';
 import type {SendKeysOpts} from 'appium-android-driver';
 
+import type {AndroidUiautomator2Driver} from '../driver.js';
+
 /**
  * Presses a key code with optional metastate and flags.
  * @param keycode - Android key code to press.
@@ -57,16 +58,12 @@ export async function mobilePressKey(
   isLongPress: boolean = false,
   source?: number,
 ): Promise<void> {
-  await this.uiautomator2.jwproxy.command(
-    `/appium/device/${isLongPress ? 'long_' : ''}press_keycode`,
-    'POST',
-    {
-      keycode,
-      metastate,
-      flags,
-      source,
-    },
-  );
+  await this.uiautomator2.jwproxy.command(`/appium/device/${isLongPress ? 'long_' : ''}press_keycode`, 'POST', {
+    keycode,
+    metastate,
+    flags,
+    source,
+  });
 }
 
 /**
@@ -75,10 +72,7 @@ export async function mobilePressKey(
  * @returns True if the input text has been successfully sent to adb.
  * @throws {errors.InvalidArgumentError} If the text argument is not provided.
  */
-export async function mobileType(
-  this: AndroidUiautomator2Driver,
-  text: string | number | boolean,
-): Promise<boolean> {
+export async function mobileType(this: AndroidUiautomator2Driver, text: string | number | boolean): Promise<boolean> {
   return await this.settingsApp.typeUnicode(String(text));
 }
 
@@ -86,10 +80,7 @@ export async function mobileType(
  * Sends keys to the current element.
  * @param params - Options containing the text to send and optional replace flag.
  */
-export async function doSendKeys(
-  this: AndroidUiautomator2Driver,
-  params: SendKeysOpts,
-): Promise<void> {
+export async function doSendKeys(this: AndroidUiautomator2Driver, params: SendKeysOpts): Promise<void> {
   await this.uiautomator2.jwproxy.command('/keys', 'POST', params);
 }
 

package/lib/commands/misc.ts

@@ -1,4 +1,5 @@
 import type {Orientation, StringRecord} from '@appium/types';
+
 import type {AndroidUiautomator2Driver} from '../driver.js';
 
 /**
@@ -21,10 +22,7 @@ export async function getOrientation(this: AndroidUiautomator2Driver): Promise<O
  * Sets the device orientation.
  * @param orientation - The desired orientation ('LANDSCAPE' or 'PORTRAIT').
  */
-export async function setOrientation(
-  this: AndroidUiautomator2Driver,
-  orientation: Orientation,
-): Promise<void> {
+export async function setOrientation(this: AndroidUiautomator2Driver, orientation: Orientation): Promise<void> {
   const normalizedOrientation = orientation.toUpperCase() as Orientation;
   await this.uiautomator2.jwproxy.command(`/orientation`, 'POST', {
     orientation: normalizedOrientation,
@@ -63,8 +61,6 @@ export async function mobileGetDeviceInfo(this: AndroidUiautomator2Driver): Prom
 /**
  * Resets the accessibility cache on the device.
  */
-export async function mobileResetAccessibilityCache(
-  this: AndroidUiautomator2Driver,
-): Promise<void> {
+export async function mobileResetAccessibilityCache(this: AndroidUiautomator2Driver): Promise<void> {
   await this.uiautomator2.jwproxy.command('/appium/reset_ax_cache', 'POST', {});
 }

package/lib/commands/screenshot.ts

@@ -1,23 +1,21 @@
+import type {StringRecord} from '@appium/types';
 import {imageUtil} from 'appium/support.js';
-import {isEmpty} from '../utils/index.js';
+
 import type {AndroidUiautomator2Driver} from '../driver.js';
+import {isEmpty} from '../utils/index.js';
 import type {Screenshot} from './types.js';
-import type {StringRecord} from '@appium/types';
 
 // Matches SurfaceFlinger output format:
 // Physical: Display 4619827259835644672 (HWC display 0): port=0 pnpId=GGL displayName="EMU_display_0"
 // Virtual: Display 11529215049243506835 (Virtual display): displayName="Emulator 2D Display" uniqueId="..."
-const DISPLAY_PATTERN =
-  /^Display\s+(\d+)\s+\((?:HWC\s+display\s+(\d+)|Virtual\s+display)\):.*?displayName="([^"]*)"/gm;
+const DISPLAY_PATTERN = /^Display\s+(\d+)\s+\((?:HWC\s+display\s+(\d+)|Virtual\s+display)\):.*?displayName="([^"]*)"/gm;
 
 /**
  * Parses SurfaceFlinger display output to extract display information.
  * @param displaysInfo - The raw output from `adb shell dumpsys SurfaceFlinger --display-id`
  * @returns A record mapping display IDs to their information (without payload)
  */
-export function parseSurfaceFlingerDisplays(
-  displaysInfo: string,
-): Record<string, Partial<Screenshot>> {
+export function parseSurfaceFlingerDisplays(displaysInfo: string): Record<string, Partial<Screenshot>> {
   const infos: Record<string, Partial<Screenshot>> = {};
   const lines = displaysInfo.split('\n');
 
@@ -30,9 +28,7 @@ export function parseSurfaceFlingerDisplays(
 
       // Determine if default: HWC display 0 is default, or first physical display if no HWC info
       const isDefault =
-        hwcId !== undefined
-          ? hwcId === '0'
-          : !line.includes('Virtual') && Object.keys(infos).length === 0;
+        hwcId !== undefined ? hwcId === '0' : !line.includes('Virtual') && Object.keys(infos).length === 0;
 
       infos[matchedDisplayId] = {
         id: matchedDisplayId,
@@ -103,8 +99,7 @@ export async function mobileScreenshots(
   const toB64Screenshot = async (dispId: string): Promise<string> =>
     (await this.adb.takeScreenshot(dispId)).toString('base64');
 
-  const displayIdStr: string | null =
-    displayId == null || displayId === '' ? null : String(displayId);
+  const displayIdStr: string | null = displayId == null || displayId === '' ? null : String(displayId);
 
   if (displayIdStr) {
     if (!infos[displayIdStr]) {
@@ -121,9 +116,7 @@ export async function mobileScreenshots(
     };
   }
 
-  const allInfos = Object.values(infos).filter(
-    (info): info is Partial<Screenshot> & {id: string} => !!info?.id,
-  );
+  const allInfos = Object.values(infos).filter((info): info is Partial<Screenshot> & {id: string} => !!info?.id);
   const screenshots = await Promise.all(allInfos.map((info) => toB64Screenshot(info.id)));
   for (let i = 0; i < allInfos.length; i++) {
     const info = allInfos[i];

package/lib/commands/viewport.ts

@@ -1,4 +1,5 @@
 import type {Rect, Size} from '@appium/types';
+
 import type {AndroidUiautomator2Driver} from '../driver.js';
 import type {RelativeRect} from './types.js';
 
@@ -7,11 +8,7 @@ import type {RelativeRect} from './types.js';
  * @returns The status bar height in pixels.
  */
 export async function getStatusBarHeight(this: AndroidUiautomator2Driver): Promise<number> {
-  const {statusBar} = (await this.uiautomator2.jwproxy.command(
-    `/appium/device/system_bars`,
-    'GET',
-    {},
-  )) as {
+  const {statusBar} = (await this.uiautomator2.jwproxy.command(`/appium/device/system_bars`, 'GET', {})) as {
     statusBar: number;
   };
   return statusBar;
@@ -69,11 +66,7 @@ export async function getWindowRect(this: AndroidUiautomator2Driver): Promise<Re
  * @returns The display density value.
  */
 export async function getDisplayDensity(this: AndroidUiautomator2Driver): Promise<number> {
-  return (await this.uiautomator2.jwproxy.command(
-    '/appium/device/display_density',
-    'GET',
-    {},
-  )) as number;
+  return (await this.uiautomator2.jwproxy.command('/appium/device/display_density', 'GET', {})) as number;
 }
 
 /**

package/lib/commands/windows.ts

@@ -21,9 +21,5 @@ export async function mobileListWindows(
  * Gets a list of all displays available on the device.
  */
 export async function mobileListDisplays(this: AndroidUiautomator2Driver): Promise<DisplayInfo[]> {
-  return (await this.uiautomator2.jwproxy.command(
-    '/appium/list_displays',
-    'POST',
-    {},
-  )) as DisplayInfo[];
+  return (await this.uiautomator2.jwproxy.command('/appium/list_displays', 'POST', {})) as DisplayInfo[];
 }

package/lib/css/index.ts

@@ -1,9 +1,10 @@
+import type {CssTransformer, NativeLocator, StrategyKey} from '@appium/css-locator-to-native';
 import {errors} from 'appium/driver.js';
+
 import {memoize} from '../utils/index.js';
 import {UI_AUTOMATOR_EMITTER_KEY, UI_AUTOMATOR_STRATEGY} from './constants.js';
 import {ATTRIBUTE_SCHEMA} from './schema.js';
 import {UiAutomatorEmitter} from './ui-automator-emitter.js';
-import type {CssTransformer, NativeLocator, StrategyKey} from '@appium/css-locator-to-native';
 
 export {UI_AUTOMATOR_STRATEGY} from './constants.js';
 
@@ -29,10 +30,7 @@ const getTransformCss = memoize(async function loadTransformCss(): Promise<CssTr
  * @param appPackage - Optional application package used to qualify resource ids
  * @returns Native locator strategy name and selector string
  */
-export async function cssToNativeLocator(
-  css: string,
-  appPackage?: string | null,
-): Promise<NativeLocator> {
+export async function cssToNativeLocator(css: string, appPackage?: string | null): Promise<NativeLocator> {
   try {
     const transformCss = await getTransformCss();
     return transformCss(css, {appPackage});

package/lib/css/ui-automator-emitter.ts

@@ -1,10 +1,6 @@
+import type {ParsedAttribute, ParsedRule, ParsedSelector, StrategyEmitter} from '@appium/css-locator-to-native';
+
 import {escapeRegExp} from '../utils/index.js';
-import type {
-  ParsedAttribute,
-  ParsedRule,
-  ParsedSelector,
-  StrategyEmitter,
-} from '@appium/css-locator-to-native';
 
 const BOOLEAN_ATTRS = new Set([
   'checkable',
@@ -136,9 +132,7 @@ export class UiAutomatorEmitter implements StrategyEmitter<UiAutomatorEmitterCon
 }
 
 function toSnakeCase(str: string): string {
-  const tokens = str
-    .split('-')
-    .map((token) => token.charAt(0).toUpperCase() + token.slice(1).toLowerCase());
+  const tokens = str.split('-').map((token) => token.charAt(0).toUpperCase() + token.slice(1).toLowerCase());
   const out = tokens.join('');
   return out.charAt(0).toLowerCase() + out.slice(1);
 }

package/lib/doctor/optional-checks.ts

@@ -1,5 +1,5 @@
-import {doctor} from 'appium-android-driver';
 import type {IDoctorCheck} from '@appium/types';
+import {doctor} from 'appium-android-driver';
 
 export const optionalBundletoolCheck: IDoctorCheck = doctor.optionalBundletoolCheck;
 export const optionalGstreamerCheck: IDoctorCheck = doctor.optionalGstreamerCheck;

package/lib/doctor/required-checks.ts

@@ -1,5 +1,5 @@
-import {doctor} from 'appium-android-driver';
 import type {IDoctorCheck} from '@appium/types';
+import {doctor} from 'appium-android-driver';
 
 export const androidHomeCheck: IDoctorCheck = doctor.androidHomeCheck;
 export const javaHomeCheck: IDoctorCheck = doctor.javaHomeCheck;

package/lib/driver.ts

@@ -12,30 +12,7 @@ import {DEFAULT_ADB_PORT, type ADB} from 'appium-adb';
 import {AndroidDriver, utils} from 'appium-android-driver';
 import {BaseDriver, DeviceSettings} from 'appium/driver.js';
 import {util} from 'appium/support.js';
-import UIAUTOMATOR2_CONSTRAINTS, {type Uiautomator2Constraints} from './constraints.js';
-import {newMethodMap} from './method-map.js';
-import {assignDefaults, memoize, MJpegStream} from './utils/index.js';
-import type {
-  Uiautomator2Settings,
-  Uiautomator2DeviceDetails,
-  Uiautomator2DriverCaps,
-  Uiautomator2DriverOpts,
-  Uiautomator2StartSessionOpts,
-  W3CUiautomator2DriverCaps,
-} from './types.js';
-import type {UiAutomator2Server} from './uiautomator2-server/index.js';
-import {
-  allocateMjpegServerPort,
-  allocateSystemPort,
-  initServer,
-  performExecution,
-  performPostExecSetup,
-  performPreExecSetup,
-  releaseMjpegServerPort,
-  releaseSystemPort,
-  requireServer,
-  startSession,
-} from './uiautomator2-server/index.js';
+
 import {
   mobileGetActionHistory,
   mobileScheduleAction,
@@ -86,14 +63,7 @@ import {
   mobileScrollGesture,
   mobileSwipeGesture,
 } from './commands/gestures.js';
-import {
-  pressKeyCode,
-  longPressKeyCode,
-  mobilePressKey,
-  mobileType,
-  doSendKeys,
-  keyevent,
-} from './commands/keyboard.js';
+import {pressKeyCode, longPressKeyCode, mobilePressKey, mobileType, doSendKeys, keyevent} from './commands/keyboard.js';
 import {
   getPageSource,
   getOrientation,
@@ -103,7 +73,6 @@ import {
   mobileGetDeviceInfo,
   mobileResetAccessibilityCache,
 } from './commands/misc.js';
-import {mobileListWindows, mobileListDisplays} from './commands/windows.js';
 import {setUrl, mobileDeepLink, back} from './commands/navigation.js';
 import {
   mobileScreenshots,
@@ -120,8 +89,33 @@ import {
   getWindowSize,
   mobileViewPortRect,
 } from './commands/viewport.js';
+import {mobileListWindows, mobileListDisplays} from './commands/windows.js';
+import UIAUTOMATOR2_CONSTRAINTS, {type Uiautomator2Constraints} from './constraints.js';
 import {executeMethodMap} from './execute-method-map.js';
+import {newMethodMap} from './method-map.js';
 import {sessionClaimHandler} from './session-claim-handler.js';
+import type {
+  Uiautomator2Settings,
+  Uiautomator2DeviceDetails,
+  Uiautomator2DriverCaps,
+  Uiautomator2DriverOpts,
+  Uiautomator2StartSessionOpts,
+  W3CUiautomator2DriverCaps,
+} from './types.js';
+import type {UiAutomator2Server} from './uiautomator2-server/index.js';
+import {
+  allocateMjpegServerPort,
+  allocateSystemPort,
+  initServer,
+  performExecution,
+  performPostExecSetup,
+  performPreExecSetup,
+  releaseMjpegServerPort,
+  releaseSystemPort,
+  requireServer,
+  startSession,
+} from './uiautomator2-server/index.js';
+import {assignDefaults, memoize, MJpegStream} from './utils/index.js';
 
 // NO_PROXY contains the paths that we never want to proxy to UiAutomator2 server.
 // TODO:  Add the list of paths that we never want to proxy to UiAutomator2 server.
@@ -348,14 +342,7 @@ class AndroidUiautomator2Driver
 
     super(opts, shouldValidateCaps);
 
-    this.locatorStrategies = [
-      'xpath',
-      'id',
-      'class name',
-      'accessibility id',
-      'css selector',
-      '-android uiautomator',
-    ];
+    this.locatorStrategies = ['xpath', 'id', 'class name', 'accessibility id', 'css selector', '-android uiautomator'];
     this.desiredCapConstraints = structuredClone(UIAUTOMATOR2_CONSTRAINTS);
     this.jwpProxyActive = false;
     this.jwpProxyAvoid = NO_PROXY;
@@ -442,9 +429,7 @@ class AndroidUiautomator2Driver
         try {
           activity = await this.adb.resolveLaunchableActivity(pkg);
         } catch (e) {
-          this.log.warn(
-            `Using the default ${pkg} activity ${activity}. Original error: ${(e as Error).message}`,
-          );
+          this.log.warn(`Using the default ${pkg} activity ${activity}. Original error: ${(e as Error).message}`);
         }
         this.opts.appPackage = this.caps.appPackage = pkg;
         this.opts.appActivity = this.caps.appActivity = activity;
@@ -496,11 +481,7 @@ class AndroidUiautomator2Driver
   override async getSession(): Promise<SingularSessionData<Uiautomator2Constraints>> {
     const sessionData = await BaseDriver.prototype.getSession.call(this);
     this.log.debug('Getting session details from server to mix in');
-    const uia2Data = (await this.requireUiautomator2().jwproxy.command(
-      '/',
-      'GET',
-      {},
-    )) as StringRecord;
+    const uia2Data = (await this.requireUiautomator2().jwproxy.command('/', 'GET', {})) as StringRecord;
     return {...sessionData, ...uia2Data};
   }
 
@@ -560,8 +541,7 @@ class AndroidUiautomator2Driver
       if (this.opts.appPackage) {
         if (
           !this.isChromeSession &&
-          ((!this.opts.dontStopAppOnReset && !this.opts.noReset) ||
-            (this.opts.noReset && this.opts.shouldTerminateApp))
+          ((!this.opts.dontStopAppOnReset && !this.opts.noReset) || (this.opts.noReset && this.opts.shouldTerminateApp))
         ) {
           try {
             await this.adb.forceStop(this.opts.appPackage);
@@ -570,9 +550,7 @@ class AndroidUiautomator2Driver
           }
         }
         if (this.opts.fullReset && !this.opts.skipUninstall) {
-          this.log.debug(
-            `Capability 'fullReset' set to 'true', Uninstalling '${this.opts.appPackage}'`,
-          );
+          this.log.debug(`Capability 'fullReset' set to 'true', Uninstalling '${this.opts.appPackage}'`);
           try {
             await this.adb.uninstallApk(this.opts.appPackage);
           } catch (err) {
@@ -647,10 +625,7 @@ class AndroidUiautomator2Driver
       this.jwpProxyAvoid = NO_PROXY;
     }
     if (this.opts.nativeWebScreenshot) {
-      this.jwpProxyAvoid = [
-        ...this.jwpProxyAvoid,
-        ['GET', new RegExp('^/session/[^/]+/screenshot')],
-      ];
+      this.jwpProxyAvoid = [...this.jwpProxyAvoid, ['GET', new RegExp('^/session/[^/]+/screenshot')]];
     }
 
     return this.jwpProxyAvoid;
@@ -672,9 +647,7 @@ class AndroidUiautomator2Driver
   }
 
   // needed to make the typechecker happy
-  override async getAppiumSessionCapabilities(): Promise<
-    SessionCapabilities<Uiautomator2Constraints>
-  > {
+  override async getAppiumSessionCapabilities(): Promise<SessionCapabilities<Uiautomator2Constraints>> {
     return (await super.getAppiumSessionCapabilities()) as SessionCapabilities<Uiautomator2Constraints>;
   }