appium-android-driver 13.3.1 → 13.3.3

package/lib/commands/streamscreen.ts

@@ -1,6 +1,5 @@
 import {fs, logger, system, util} from '@appium/support';
 import {waitForCondition} from 'asyncbox';
-import _ from 'lodash';
 import {spawn} from 'node:child_process';
 import http from 'node:http';
 import net from 'node:net';
@@ -89,10 +88,9 @@ export async function mobileStartScreenStreaming(
 ): Promise<void> {
   this.assertFeatureEnabled(ADB_SCREEN_STREAMING_FEATURE);
 
-  if (_.isUndefined(this._screenStreamingProps)) {
+  if (this._screenStreamingProps === undefined) {
     await verifyStreamingRequirements(this.adb);
-  }
-  if (!_.isEmpty(this._screenStreamingProps)) {
+  } else {
     this.log.info(
       `The screen streaming session is already running. ` +
         `Stop it first in order to start a new one.`,
@@ -246,8 +244,8 @@ export async function mobileStartScreenStreaming(
  * If no streaming session is active, this method returns without error.
  */
 export async function mobileStopScreenStreaming(this: AndroidDriver): Promise<void> {
-  if (_.isEmpty(this._screenStreamingProps)) {
-    if (!_.isUndefined(this._screenStreamingProps)) {
+  if (!this._screenStreamingProps) {
+    if (this._screenStreamingProps !== undefined) {
       this.log.debug(`Screen streaming is not running. There is nothing to stop`);
     }
     return;
@@ -287,7 +285,7 @@ export async function mobileStopScreenStreaming(this: AndroidDriver): Promise<vo
 function createStreamingLogger(streamName: string, udid: string): AppiumLogger {
   return logger.getLogger(
     `${streamName}@` +
-      _.truncate(udid, {
+      util.truncateString(udid, {
         length: 8,
         omission: '',
       }),
@@ -295,7 +293,7 @@ function createStreamingLogger(streamName: string, udid: string): AppiumLogger {
 }
 
 async function verifyStreamingRequirements(adb: ADB): Promise<void> {
-  if (!_.trim(await adb.shell(['which', SCREENRECORD_BINARY]))) {
+  if (!(await adb.shell(['which', SCREENRECORD_BINARY])).trim()) {
     throw new Error(
       `The required '${SCREENRECORD_BINARY}' binary is not available on the device under test`,
     );
@@ -319,11 +317,11 @@ async function verifyStreamingRequirements(adb: ADB): Promise<void> {
   await Promise.all(gstreamerCheckPromises);
 
   const moduleCheckPromises: Promise<void>[] = [];
-  for (const [name, modName] of _.toPairs(REQUIRED_GST_PLUGINS)) {
+  for (const [name, modName] of Object.entries(REQUIRED_GST_PLUGINS)) {
     moduleCheckPromises.push(
       (async () => {
         const {stdout} = await exec(GST_INSPECT_BINARY, [name]);
-        if (!_.includes(stdout, modName)) {
+        if (!stdout?.includes(modName)) {
           throw new Error(
             `The required GStreamer plugin '${name}' from '${modName}' module is not installed. ` +
               `See ${GST_TUTORIAL_URL} for more details on how to install it.`,
@@ -366,9 +364,9 @@ async function initDeviceStreamingProc(
   opts: {width?: string | number; height?: string | number; bitRate?: string | number} = {},
 ): Promise<ReturnType<typeof spawn>> {
   const {width, height, bitRate} = opts;
-  const adjustedWidth = _.isUndefined(width) ? deviceInfo.width : parseInt(String(width), 10);
-  const adjustedHeight = _.isUndefined(height) ? deviceInfo.height : parseInt(String(height), 10);
-  const adjustedBitrate = _.isUndefined(bitRate) ? DEFAULT_BITRATE : parseInt(String(bitRate), 10);
+  const adjustedWidth = width === undefined ? deviceInfo.width : parseInt(String(width), 10);
+  const adjustedHeight = height === undefined ? deviceInfo.height : parseInt(String(height), 10);
+  const adjustedBitrate = bitRate === undefined ? DEFAULT_BITRATE : parseInt(String(bitRate), 10);
   let screenRecordCmd =
     SCREENRECORD_BINARY +
     ` --output-format=h264` +
@@ -396,7 +394,7 @@ async function initDeviceStreamingProc(
   const deviceStreamingLogger = createStreamingLogger(SCREENRECORD_BINARY, deviceInfo.udid);
   const errorsListener = (chunk: Buffer | string) => {
     const stderr = chunk.toString();
-    if (_.trim(stderr)) {
+    if (stderr?.trim()) {
       deviceStreamingLogger.debug(stderr);
     }
   };
@@ -404,7 +402,7 @@ async function initDeviceStreamingProc(
 
   const startupListener = (chunk: Buffer | string) => {
     if (!isStarted) {
-      isStarted = !_.isEmpty(chunk);
+      isStarted = !util.isEmpty(chunk);
     }
   };
   deviceStreaming.stdout.on('data', startupListener);
@@ -477,7 +475,7 @@ async function initGstreamerPipeline(
   });
   const gstreamerLogger = createStreamingLogger('gst', deviceInfo.udid);
   const gstOutputListener = (stdout: string, stderr: string) => {
-    if (_.trim(stderr || stdout)) {
+    if ((stderr || stdout)?.trim()) {
       gstreamerLogger.debug(stderr || stdout);
     }
   };

package/lib/commands/system-bars.ts

@@ -1,8 +1,8 @@
 import {errors} from 'appium/driver';
-import _ from 'lodash';
 import type {StringRecord} from '@appium/types';
 import type {AndroidDriver} from '../driver';
 import type {StatusBarCommand, WindowProperties} from './types';
+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.-]+)\]/;
@@ -64,15 +64,15 @@ export async function mobilePerformStatusBarCommand(
   component?: string,
 ): Promise<string> {
   const toStatusBarCommandCallable =
-    (cmd: string, argsCallable?: () => string[] | string) => async (): Promise<string> =>
-      await this.adb.shell([
-        'cmd',
-        'statusbar',
-        cmd,
-        ...(argsCallable ? _.castArray(argsCallable()) : []),
-      ]);
+    (cmd: string, argsCallable?: () => string[] | string) => async (): Promise<string> => {
+      let argsCallableArray = argsCallable ? argsCallable() : [];
+      if (!Array.isArray(argsCallableArray)) {
+        argsCallableArray = [argsCallableArray];
+      }
+      return await this.adb.shell(['cmd', 'statusbar', cmd, ...argsCallableArray]);
+    };
   const tileCommandArgsCallable = () => component as string;
-  const statusBarCommands = _.fromPairs(
+  const statusBarCommands = Object.fromEntries(
     (
       [
         ['expandNotifications', ['expand-notifications']],
@@ -90,7 +90,7 @@ export async function mobilePerformStatusBarCommand(
   if (!action) {
     throw new errors.InvalidArgumentError(
       `The '${command}' status bar command is unknown. Only the following commands ` +
-        `are supported: ${_.keys(statusBarCommands)}`,
+        `are supported: ${Object.keys(statusBarCommands)}`,
     );
   }
   return await action();
@@ -110,7 +110,7 @@ export function parseWindowProperties(
   name: string,
   props: string[],
 ): WindowProperties {
-  const result = _.cloneDeep(DEFAULT_WINDOW_PROPERTIES);
+  const result = structuredClone(DEFAULT_WINDOW_PROPERTIES);
   const propLines = props.join('\n');
   const frameMatch = FRAME_PATTERN.exec(propLines);
   if (!frameMatch) {
@@ -142,29 +142,29 @@ export function parseWindowProperties(
 export function parseWindows(this: AndroidDriver, lines: string): SystemBarsResult {
   const windows: StringRecord<string[]> = {};
   let currentWindowName: string | null = null;
-  for (const line of lines.split('\n').map(_.trimEnd)) {
-    const match = WINDOW_TITLE_PATTERN.exec(line);
+  for (const line of lines.split('\n').map((line) => String(line)?.trimEnd())) {
+    const match = WINDOW_TITLE_PATTERN.exec(line as any);
     if (match) {
       currentWindowName = match[1];
       windows[currentWindowName] = [];
       continue;
     }
-    if (_.trim(line).length === 0) {
+    if (String(line)?.trim()?.length === 0) {
       currentWindowName = null;
       continue;
     }
 
-    if (currentWindowName && _.isArray(windows[currentWindowName])) {
+    if (currentWindowName && Array.isArray(windows[currentWindowName])) {
       windows[currentWindowName].push(line);
     }
   }
-  if (_.isEmpty(windows)) {
+  if (util.isEmpty(windows)) {
     this.log.debug(lines);
     throw new Error('Cannot parse any window information from the dumpsys output');
   }
 
   const result: SystemBarsResult = {};
-  for (const [name, props] of _.toPairs(windows)) {
+  for (const [name, props] of Object.entries(windows)) {
     if (
       name.startsWith(STATUS_BAR_WINDOW_NAME_PREFIX) ||
       props.some((line: string) => STATUS_BAR_TYPE_PATTERN.test(line))
@@ -182,14 +182,14 @@ export function parseWindows(this: AndroidDriver, lines: string): SystemBarsResu
       ['statusBar', STATUS_BAR_WINDOW_NAME_PREFIX],
       ['navigationBar', NAVIGATION_BAR_WINDOW_NAME_PREFIX],
     ] as const
-  ).filter(([name]) => _.isNil(result[name as keyof SystemBarsResult]));
+  ).filter(([name]) => result[name as keyof SystemBarsResult] == null);
   for (const [window, namePrefix] of unmatchedWindows) {
     this.log.info(
       `No windows have been found whose title matches to ` +
         `'${namePrefix}'. Assuming it is invisible. ` +
-        `Only the following windows are available: ${_.keys(windows)}`,
+        `Only the following windows are available: ${Object.keys(windows)}`,
     );
-    result[window as keyof SystemBarsResult] = _.cloneDeep(DEFAULT_WINDOW_PROPERTIES);
+    result[window as keyof SystemBarsResult] = structuredClone(DEFAULT_WINDOW_PROPERTIES);
   }
   return result;
 }

package/lib/commands/time.ts

@@ -1,7 +1,12 @@
-import moment from 'moment-timezone';
+import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
 import type {AndroidDriver} from '../driver';
 
-const MOMENT_FORMAT_ISO8601 = 'YYYY-MM-DDTHH:mm:ssZ';
+dayjs.extend(utc);
+dayjs.extend(customParseFormat);
+
+const DATETIME_FORMAT_ISO8601 = 'YYYY-MM-DDTHH:mm:ssZ';
 
 /**
  * Gets the current device time.
@@ -11,20 +16,20 @@ const MOMENT_FORMAT_ISO8601 = 'YYYY-MM-DDTHH:mm:ssZ';
  */
 export async function getDeviceTime(
   this: AndroidDriver,
-  format: string = MOMENT_FORMAT_ISO8601,
+  format: string = DATETIME_FORMAT_ISO8601,
 ): Promise<string> {
   this.log.debug(
-    'Attempting to capture android device date and time. ' + `The format specifier is '${format}'`,
+    `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 = moment.utc(deviceTimestamp, 'YYYY-MM-DDTHH:mm:ssZZ');
+  const parsedTimestamp = dayjs.utc(deviceTimestamp, 'YYYY-MM-DDTHH:mm:ssZZ');
   if (!parsedTimestamp.isValid()) {
     this.log.warn('Cannot parse the returned timestamp. Returning as is');
     return deviceTimestamp;
   }
-  // @ts-expect-error private API
-  return parsedTimestamp.utcOffset(parsedTimestamp._tzm || 0).format(format);
+  const offset = parseOffset(deviceTimestamp);
+  return parsedTimestamp.utcOffset(offset).format(format);
 }
 
 /**
@@ -45,7 +50,7 @@ export async function mobileGetDeviceTime(this: AndroidDriver, format?: string):
  * @throws {Error} If the time zone identifier is not known.
  */
 export async function adjustTimeZone(this: AndroidDriver, zoneName: string): Promise<void> {
-  if (!moment.tz.names().includes(zoneName)) {
+  if (!isValidTimeZone(zoneName)) {
     throw new Error(
       `The provided time zone identifier '${zoneName}' is not known. ` +
         `Please choose a valid TZ identifier from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones`,
@@ -59,3 +64,16 @@ export async function adjustTimeZone(this: AndroidDriver, zoneName: string): Pro
   // https://cs.android.com/android/platform/superproject/+/master:frameworks/base/apex/jobscheduler/framework/java/android/app/IAlarmManager.aidl;l=1?q=IAlarmManager
   await this.adb.shell(['service', 'call', 'alarm', '3', 's16', zoneName]);
 }
+
+function parseOffset(timestamp: string): number {
+  const m = timestamp.match(/([+-])(\d{2})(\d{2})$/);
+  if (!m) {
+    return 0;
+  }
+  const sign = m[1] === '+' ? 1 : -1;
+  return sign * (Number(m[2]) * 60 + Number(m[3]));
+}
+
+function isValidTimeZone(zoneName: string): boolean {
+  return Intl.supportedValuesOf('timeZone').includes(zoneName);
+}

package/lib/driver.ts

@@ -7,7 +7,6 @@ import type {
   StringRecord,
   W3CDriverCaps,
 } from '@appium/types';
-import _ from 'lodash';
 import type {ADB, LogcatListener} from 'appium-adb';
 import type {default as AppiumChromedriver} from 'appium-chromedriver';
 import {BaseDriver} from 'appium/driver';
@@ -462,7 +461,7 @@ class AndroidDriver
       'accessibility id',
       '-android uiautomator',
     ];
-    this.desiredCapConstraints = _.cloneDeep(ANDROID_DRIVER_CONSTRAINTS);
+    this.desiredCapConstraints = structuredClone(ANDROID_DRIVER_CONSTRAINTS);
     this.sessionChromedrivers = {};
     this.jwpProxyActive = false;
 
@@ -483,8 +482,7 @@ class AndroidDriver
   }
 
   get isChromeSession(): boolean {
-    return _.includes(
-      Object.keys(CHROME_BROWSER_PACKAGE_ACTIVITY),
+    return Object.keys(CHROME_BROWSER_PACKAGE_ACTIVITY).includes(
       (this.opts.browserName || '').toLowerCase(),
     );
   }

package/lib/logger.ts

@@ -1,3 +1,4 @@
 import {logger} from '@appium/support';
+import type {AppiumLogger} from '@appium/types';
 
-export const log = logger.getLogger('AndroidDriver');
+export const log: AppiumLogger = logger.getLogger('AndroidDriver');

package/lib/utils.ts

@@ -1,7 +1,7 @@
-import _ from 'lodash';
 import {errors} from 'appium/driver';
 import type {LogEntry} from 'appium-adb';
 import type {AndroidDriver} from './driver';
+import {util} from '@appium/support';
 
 export type {LogEntry};
 
@@ -29,8 +29,8 @@ export function requireArgs(
   argNames: string | string[],
   opts: Record<string, any>,
 ): Record<string, any> {
-  for (const argName of _.isArray(argNames) ? argNames : [argNames]) {
-    if (!_.has(opts, argName)) {
+  for (const argName of Array.isArray(argNames) ? argNames : [argNames]) {
+    if (util.isPlainObject(opts) && !Object.hasOwn(opts, argName)) {
       throw new errors.InvalidArgumentError(`'${argName}' argument must be provided`);
     }
   }
@@ -48,9 +48,9 @@ export function parseArray(cap: string | string[]): string[] {
     parsedCaps = JSON.parse(cap as string);
   } catch {}
 
-  if (_.isArray(parsedCaps)) {
+  if (Array.isArray(parsedCaps)) {
     return parsedCaps;
-  } else if (_.isString(cap)) {
+  } else if (typeof cap === 'string') {
     return [cap];
   }
 
@@ -62,12 +62,12 @@ export function parseArray(cap: string | string[]): string[] {
  * @returns
  */
 export async function removeAllSessionWebSocketHandlers(this: AndroidDriver): Promise<void> {
-  if (!this.sessionId || !_.isFunction(this.server?.getWebSocketHandlers)) {
+  if (!this.sessionId || typeof this.server?.getWebSocketHandlers !== 'function') {
     return;
   }
 
   const activeHandlers = await this.server.getWebSocketHandlers(this.sessionId);
-  for (const pathname of _.keys(activeHandlers)) {
+  for (const pathname of Object.keys(activeHandlers)) {
     await this.server.removeWebSocketHandler(pathname);
   }
 }
@@ -78,8 +78,8 @@ export async function removeAllSessionWebSocketHandlers(this: AndroidDriver): Pr
  * @returns
  */
 export function nativeLogEntryToSeleniumEntry(x: LogEntryWithPrefix): LogEntry {
-  const msg = _.isEmpty(x.prefix) ? x.message : `[${x.prefix}] ${x.message}`;
-  return toLogRecord(x.timestamp ?? Date.now(), _.replace(msg, COLOR_CODE_PATTERN, ''));
+  const msg = util.isEmpty(x.prefix) ? x.message : `[${x.prefix}] ${x.message}`;
+  return toLogRecord(x.timestamp ?? Date.now(), msg.replace(COLOR_CODE_PATTERN, ''));
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-android-driver",
-  "version": "13.3.1",
+  "version": "13.3.3",
   "description": "Android UiAutomator and Chrome support for Appium",
   "keywords": [
     "appium",
@@ -52,11 +52,9 @@
     "appium-chromedriver": "^8.4.4",
     "asyncbox": "^6.1.0",
     "axios": "^1.16.0",
+    "dayjs": "^1.11.21",
     "io.appium.settings": "^7.1.3",
-    "lodash": "^4.17.4",
     "lru-cache": "^11.1.0",
-    "moment": "^2.24.0",
-    "moment-timezone": "^0.x",
     "portscanner": "^2.2.0",
     "semver": "^7.0.0",
     "teen_process": "^4.0.7",
@@ -70,7 +68,6 @@
     "@semantic-release/git": "^10.0.1",
     "@types/chai": "^5.2.3",
     "@types/chai-as-promised": "^8.0.2",
-    "@types/lodash": "^4.14.194",
     "@types/mocha": "^10.0.1",
     "@types/node": "^26.0.0",
     "@types/portscanner": "^2.1.1",