appium-adb 14.3.5 → 14.4.0

package/build/lib/utils/lodash/core.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultsDeep = exports.pick = exports.zip = exports.intersectionWith = exports.defaults = exports.cloneDeep = void 0;
+const support_1 = require("@appium/support");
+const cloneDeep = (value) => {
+    if (typeof globalThis.structuredClone === 'function') {
+        return globalThis.structuredClone(value);
+    }
+    return JSON.parse(JSON.stringify(value));
+};
+exports.cloneDeep = cloneDeep;
+const defaults = (target, ...sources) => {
+    for (const source of sources) {
+        if (!source) {
+            continue;
+        }
+        for (const [key, value] of Object.entries(source)) {
+            if (target[key] === undefined) {
+                target[key] = value;
+            }
+        }
+    }
+    return target;
+};
+exports.defaults = defaults;
+const _defaultsDeep = (target, ...sources) => {
+    for (const source of sources) {
+        if (!source) {
+            continue;
+        }
+        for (const [key, value] of Object.entries(source)) {
+            const current = target[key];
+            if (current === undefined) {
+                target[key] = support_1.util.isPlainObject(value) || Array.isArray(value) ? (0, exports.cloneDeep)(value) : value;
+                continue;
+            }
+            if (support_1.util.isPlainObject(current) && support_1.util.isPlainObject(value)) {
+                _defaultsDeep(current, value);
+            }
+        }
+    }
+    return target;
+};
+const intersectionWith = (first, second, comparator) => first.filter((item) => second.some((other) => comparator(item, other)));
+exports.intersectionWith = intersectionWith;
+const zip = (arrA, arrB) => {
+    const length = Math.max(arrA.length, arrB.length);
+    return Array.from({ length }, (_, idx) => [arrA[idx], arrB[idx]]);
+};
+exports.zip = zip;
+const pick = (obj, keysArg) => keysArg.reduce((acc, key) => {
+    if (key in obj) {
+        acc[key] = obj[key];
+    }
+    return acc;
+}, {});
+exports.pick = pick;
+const defaultsDeep = (target, ...sources) => _defaultsDeep(target, ...sources);
+exports.defaultsDeep = defaultsDeep;
+//# sourceMappingURL=core.js.map

package/build/lib/utils/lodash/core.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../../lib/utils/lodash/core.ts"],"names":[],"mappings":"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"}

package/build/lib/utils/lodash/index.d.ts

@@ -0,0 +1,2 @@
+export * from './core';
+//# sourceMappingURL=index.d.ts.map

package/build/lib/utils/lodash/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../lib/utils/lodash/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC"}

package/build/lib/utils/lodash/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./core"), exports);
+//# sourceMappingURL=index.js.map

package/build/lib/utils/lodash/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/utils/lodash/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB"}

package/lib/adb.ts

@@ -1,6 +1,4 @@
-import _ from 'lodash';
 import os from 'node:os';
-import {DEFAULT_ADB_EXEC_TIMEOUT, requireSdkRoot, getSdkRootFromEnv} from './helpers';
 import {log} from './logger';
 import type {ADBOptions, ADBExecutable} from './types';
 import type {Logcat} from './logcat';
@@ -25,6 +23,14 @@ import * as appCommands from './tools/app-commands';
 import * as networkCommands from './tools/network-commands';
 import * as logcatCommands from './tools/logcat-commands';
 import * as processCommands from './tools/process-commands';
+import {
+  DEFAULT_ADB_EXEC_TIMEOUT,
+  cloneDeep,
+  defaultsDeep,
+  getSdkRootFromEnv,
+  pick,
+  requireSdkRoot,
+} from './utils';
 
 export const DEFAULT_ADB_PORT = 5037;
 export const DEFAULT_OPTS = {
@@ -320,8 +326,8 @@ export class ADB implements ADBOptions {
   getScreenOrientation = deviceSettingsCommands.getScreenOrientation;
 
   constructor(opts: ADBOptions = {} as ADBOptions) {
-    const options: ADBOptions = _.defaultsDeep(opts, _.cloneDeep(DEFAULT_OPTS));
-    _.defaultsDeep(this, options);
+    const options: ADBOptions = defaultsDeep(opts, cloneDeep(DEFAULT_OPTS));
+    defaultsDeep(this, options);
 
     // The above defaultsDeep call guarantees the 'executable' field to be always assigned
     this.executable = options.executable as ADBExecutable;
@@ -372,8 +378,10 @@ export class ADB implements ADBOptions {
    * @returns The resulting class instance.
    */
   clone(opts: ADBOptions = {} as ADBOptions): ADB {
-    const originalOptions = _.cloneDeep(_.pick(this, Object.keys(DEFAULT_OPTS)));
-    const cloneOptions = _.defaultsDeep(opts, originalOptions);
+    const originalOptions = cloneDeep(pick(this, Object.keys(DEFAULT_OPTS)));
+    const cloneOptions = defaultsDeep(opts, originalOptions) as ADBOptions & {
+      executable: ADBExecutable;
+    };
 
     // Reset default arguments created in the constructor.
     // Without this code, -H and -P can be injected into defaultArgs multiple times.

package/lib/index.ts

@@ -1,6 +1,6 @@
 export * from './adb';
 export {getAndroidBinaryPath} from './tools/system-calls';
-export {getSdkRootFromEnv} from './helpers';
+export {getSdkRootFromEnv} from './utils';
 export type * from './tools/types';
 export type * from './types';
 

package/lib/logcat.ts

@@ -1,5 +1,4 @@
 import {logger, util} from '@appium/support';
-import _ from 'lodash';
 import {EventEmitter} from 'node:events';
 import {SubProcess, exec} from 'teen_process';
 import {LRUCache} from 'lru-cache';
@@ -148,7 +147,7 @@ export class Logcat extends EventEmitter {
         result.push(toLogEntry(message, timestamp));
       }
     }
-    if (_.isInteger(recentLogIndex)) {
+    if (Number.isInteger(recentLogIndex)) {
       this.logIndexSinceLastRequest = recentLogIndex;
     }
     return result;
@@ -179,12 +178,8 @@ export class Logcat extends EventEmitter {
 
   private outputHandler(logLine: string, prefix: string = ''): void {
     const timestamp = Date.now();
-    let recentIndex = -1;
-    for (const key of this.logs.keys()) {
-      recentIndex = key;
-      break;
-    }
-    this.logs.set(++recentIndex, [logLine, timestamp]);
+    const recentIndex = this.logs.keys().next().value ?? -1;
+    this.logs.set(recentIndex + 1, [logLine, timestamp]);
     if (this.listenerCount('output')) {
       this.emit('output', toLogEntry(logLine, timestamp));
     }
@@ -225,7 +220,7 @@ function requireSpec(spec: string): string {
     );
     return `${resultTag}:${DEFAULT_PRIORITY}`;
   }
-  if (!SUPPORTED_PRIORITIES.some((p) => _.toLower(priority) === _.toLower(p))) {
+  if (!SUPPORTED_PRIORITIES.some((p) => priority.toLowerCase() === p.toLowerCase())) {
     log.info(
       `The priority value in spec '${spec}' is unknown. Supported values are: ${SUPPORTED_PRIORITIES}`,
     );
@@ -236,11 +231,11 @@ function requireSpec(spec: string): string {
 }
 
 function formatFilterSpecs(filterSpecs: string | string[]): string[] {
-  if (!_.isArray(filterSpecs)) {
+  if (!Array.isArray(filterSpecs)) {
     filterSpecs = [filterSpecs];
   }
   return filterSpecs
-    .filter((spec) => spec && _.isString(spec) && !spec.startsWith('-'))
+    .filter((spec) => spec && typeof spec === 'string' && !spec.startsWith('-'))
     .map((spec) => (spec.includes(':') ? requireSpec(spec) : spec));
 }
 

package/lib/tools/aab-utils.ts

@@ -2,11 +2,11 @@ import {log} from '../logger';
 import path from 'node:path';
 import {fs, tempDir, util} from '@appium/support';
 import {LRUCache} from 'lru-cache';
-import {unzipFile} from '../helpers';
 import AsyncLock from 'async-lock';
 import crypto from 'node:crypto';
 import type {ADB} from '../adb';
 import type {ApkCreationOptions, StringRecord} from './types';
+import {unzipFile} from '../utils';
 
 const AAB_CACHE = new LRUCache<string, string>({
   max: 10,

package/lib/tools/android-manifest.ts

@@ -1,11 +1,10 @@
-import _ from 'lodash';
 import {exec} from 'teen_process';
 import {log} from '../logger';
-import {unzipFile, APKS_EXTENSION, readPackageManifest} from '../helpers';
 import {fs, zip, tempDir, util} from '@appium/support';
 import path from 'node:path';
 import type {ADB} from '../adb';
 import type {APKInfo, PlatformInfo, StringRecord} from './types';
+import {APKS_EXTENSION, readPackageManifest, unzipFile} from '../utils';
 
 /**
  * Extract package and main activity name from application manifest.
@@ -150,6 +149,7 @@ export async function compileManifest(
     } catch (e1) {
       throw new Error(
         `Cannot compile the manifest. Original error: ${(e1 as Error).message || (e1 as {stderr?: string}).stderr}`,
+        {cause: e1},
       );
     }
   }
@@ -262,7 +262,7 @@ export async function getAndroidPlatformAndPath(sdkRoot: string): Promise<Platfo
       platformPath,
     };
   }
-  if (_.isEmpty(platformsMapping)) {
+  if (util.isEmpty(platformsMapping)) {
     log.warn(
       `Found zero platform folders at '${path.resolve(sdkRoot, 'platforms')}'. ` +
         `Do you have any Android SDKs installed?`,
@@ -273,7 +273,7 @@ export async function getAndroidPlatformAndPath(sdkRoot: string): Promise<Platfo
     };
   }
 
-  const recentSdkVersion = _.keys(platformsMapping).sort().reverse()[0];
+  const recentSdkVersion = Object.keys(platformsMapping).sort().reverse()[0];
   const result = platformsMapping[recentSdkVersion];
   log.debug(`Found the most recent Android platform: ${JSON.stringify(result)}`);
   return result;

package/lib/tools/apk-signing.ts

@@ -1,13 +1,12 @@
-import _ from 'lodash';
 import _fs from 'node:fs';
 import {exec, type ExecError} from 'teen_process';
 import path from 'node:path';
 import {log} from '../logger';
 import {tempDir, system, mkdirp, fs, util, zip} from '@appium/support';
 import {LRUCache} from 'lru-cache';
-import {getJavaForOs, getJavaHome, APKS_EXTENSION, getResourcePath} from '../helpers';
 import type {ADB} from '../adb';
 import type {StringRecord, SignedAppCacheValue, CertCheckOptions, KeystoreHash} from './types';
+import {APKS_EXTENSION, getJavaForOs, getJavaHome, getResourcePath} from '../utils';
 
 const DEFAULT_PRIVATE_KEY = path.join('keys', 'testkey.pk8');
 const DEFAULT_CERTIFICATE = path.join('keys', 'testkey.x509.pem');
@@ -45,7 +44,7 @@ export async function executeApksigner(this: ADB, args: string[]): Promise<strin
     ['stdout', stdout],
     ['stderr', stderr],
   ] as const) {
-    if (!_.trim(stream)) {
+    if (!stream?.trim()) {
       continue;
     }
 
@@ -90,6 +89,7 @@ export async function signWithDefaultCert(this: ADB, apk: string): Promise<void>
     throw new Error(
       `Could not sign '${apk}' with the default certificate. ` +
         `Original error: ${err.stderr || err.stdout || err.message}`,
+      {cause: e},
     );
   }
 }
@@ -161,6 +161,7 @@ export async function signWithCustomCert(this: ADB, apk: string): Promise<void>
       throw new Error(
         `Could not sign with custom certificate. ` +
           `Original error: ${execErr.stderr || execErr.message}`,
+        {cause: e},
       );
     }
   }
@@ -240,6 +241,7 @@ export async function zipAlignApk(this: ADB, apk: string): Promise<boolean> {
     }
     throw new Error(
       `zipAlignApk failed. Original error: ${err.message || (err as ExecError).stderr}`,
+      {cause: e},
     );
   }
 }
@@ -270,7 +272,7 @@ export async function checkApkCert(
   }
 
   const hashMatches = (apksignerOutput: string, expectedHashes: KeystoreHash): boolean => {
-    for (const [name, value] of _.toPairs(expectedHashes)) {
+    for (const [name, value] of Object.entries(expectedHashes)) {
       if (value && new RegExp(`digest:\\s+${value}\\b`, 'i').test(apksignerOutput)) {
         log.debug(`${name} hash did match for '${path.basename(actualAppPath)}'`);
         return true;
@@ -321,12 +323,12 @@ export async function checkApkCert(
   } catch (err) {
     const error = err as ExecError;
     // check if there is no signature
-    if (_.includes(error.stderr, APKSIGNER_VERIFY_FAIL)) {
+    if ((error.stderr ?? '').includes(APKSIGNER_VERIFY_FAIL)) {
       log.info(`'${actualAppPath}' is not signed`);
       return false;
     }
     const errMsg = error.stderr || error.stdout || error.message;
-    if (_.includes(errMsg, JAVA_PROPS_INIT_ERROR)) {
+    if (`${errMsg}`.includes(JAVA_PROPS_INIT_ERROR)) {
       // This error pops up randomly and we are not quite sure why.
       // My guess - a race condition in java vm initialization.
       // Nevertheless, lets make Appium to believe the file is already signed,
@@ -341,6 +343,7 @@ export async function checkApkCert(
     }
     throw new Error(
       `Cannot verify the signature of '${actualAppPath}'. ` + `Original error: ${errMsg}`,
+      {cause: err},
     );
   }
 }
@@ -383,7 +386,7 @@ export async function getKeystoreHash(this: ADB): Promise<KeystoreHash> {
       }
       result[hashName] = match[1].replace(/:/g, '').toLowerCase();
     }
-    if (_.isEmpty(result)) {
+    if (util.isEmpty(result)) {
       log.debug(stdout);
       throw new Error('Cannot parse the hash value from the keytool output');
     }
@@ -394,6 +397,7 @@ export async function getKeystoreHash(this: ADB): Promise<KeystoreHash> {
     throw new Error(
       `Cannot get the hash of '${this.keystorePath}' keystore. ` +
         `Original error: ${err.stderr || err.message}`,
+      {cause: e},
     );
   }
 }

package/lib/tools/apk-utils.ts

@@ -1,19 +1,20 @@
-import {
-  APKS_EXTENSION,
-  buildInstallArgs,
-  APK_INSTALL_TIMEOUT,
-  DEFAULT_ADB_EXEC_TIMEOUT,
-  readPackageManifest,
-} from '../helpers';
 import {exec, type ExecError} from 'teen_process';
 import {log} from '../logger';
 import path from 'node:path';
-import _ from 'lodash';
 import {fs, util, mkdirp, timing} from '@appium/support';
 import * as semver from 'semver';
 import os from 'node:os';
 import {LRUCache} from 'lru-cache';
 import type {ADB} from '../adb';
+import {
+  APKS_EXTENSION,
+  APK_INSTALL_TIMEOUT,
+  DEFAULT_ADB_EXEC_TIMEOUT,
+  buildInstallArgs,
+  cloneDeep,
+  defaults,
+  readPackageManifest,
+} from '../utils';
 import type {
   UninstallOptions,
   ShellExecOptions,
@@ -60,7 +61,7 @@ export async function uninstallApk(
     stdout = (await this.adbExec(cmd, {timeout: options.timeout})).trim();
   } catch (e) {
     const err = e as Error;
-    throw new Error(`Unable to uninstall APK. Original error: ${err.message}`);
+    throw new Error(`Unable to uninstall APK. Original error: ${err.message}`, {cause: e});
   }
   log.debug(`'adb ${cmd.join(' ')}' command output: ${stdout}`);
   if (stdout.includes('Success')) {
@@ -111,15 +112,15 @@ export async function cacheApk(
     let lsOutput: string | null = null;
     if (
       this._areExtendedLsOptionsSupported === true ||
-      !_.isBoolean(this._areExtendedLsOptionsSupported)
+      typeof this._areExtendedLsOptionsSupported !== 'boolean'
     ) {
       lsOutput = await this.shell([`ls -t -1 ${REMOTE_CACHE_ROOT} 2>&1 || echo ${errorMarker}`]);
     }
     if (
-      !_.isString(lsOutput) ||
+      typeof lsOutput !== 'string' ||
       (lsOutput.includes(errorMarker) && !lsOutput.includes(REMOTE_CACHE_ROOT))
     ) {
-      if (!_.isBoolean(this._areExtendedLsOptionsSupported)) {
+      if (typeof this._areExtendedLsOptionsSupported !== 'boolean') {
         log.debug(
           'The current Android API does not support extended ls options. ' +
             'Defaulting to no-options call',
@@ -172,9 +173,10 @@ export async function cacheApk(
     });
   }
   // Cleanup the invalid entries from the cache
-  _.difference([...this.remoteAppsCache.keys()], remoteCachedFiles.map(toHash)).forEach((hash) =>
-    (this.remoteAppsCache as LRUCache<string, string>).delete(hash),
-  );
+  const remoteCachedHashes = new Set(remoteCachedFiles.map(toHash));
+  [...this.remoteAppsCache.keys()]
+    .filter((cacheKey) => !remoteCachedHashes.has(cacheKey))
+    .forEach((hash) => (this.remoteAppsCache as LRUCache<string, string>).delete(hash));
   // Bump the cache record for the recently cached item
   this.remoteAppsCache.set(appHash, remotePath);
   // If the remote cache exceeds this.remoteAppsCacheLimit, remove the least recently used entries
@@ -182,7 +184,7 @@ export async function cacheApk(
     .map((x) => path.posix.join(REMOTE_CACHE_ROOT, x))
     .filter((x) => !(this.remoteAppsCache as LRUCache<string, string>).has(toHash(x)))
     .slice((this.remoteAppsCacheLimit as number) - [...this.remoteAppsCache.keys()].length);
-  if (!_.isEmpty(entriesToCleanup)) {
+  if (!util.isEmpty(entriesToCleanup)) {
     try {
       await this.shell(['rm', '-f', ...entriesToCleanup]);
       log.debug(`Deleted ${entriesToCleanup.length} expired application cache entries`);
@@ -213,8 +215,8 @@ export async function install(
     return await this.installApks(appPath, options);
   }
 
-  options = _.cloneDeep(options);
-  _.defaults(options, {
+  options = cloneDeep(options);
+  defaults(options, {
     replace: true,
     timeout:
       this.adbExecTimeout === DEFAULT_ADB_EXEC_TIMEOUT ? APK_INSTALL_TIMEOUT : this.adbExecTimeout,
@@ -238,11 +240,7 @@ export async function install(
     log.info(
       `The installation of '${path.basename(appPath)}' took ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`,
     );
-    const truncatedOutput =
-      !_.isString(output) || output.length <= 300
-        ? output
-        : `${output.substring(0, 150)}...${output.substring(output.length - 150)}`;
-    log.debug(`Install command stdout: ${truncatedOutput}`);
+    log.debug(`Install command stdout: ${util.truncateString(output, {length: 300})}`);
     if (/\[INSTALL[A-Z_]+FAILED[A-Z_]+\]/.test(output)) {
       if (this.isTestPackageOnlyError(output)) {
         const msg = `Set 'allowTestPackages' capability to true in order to allow test packages installation.`;
@@ -302,14 +300,14 @@ export async function getApplicationInstallState(
   const {versionCode: apkVersionCode, versionName: apkVersionNameStr} = apkInfo || {};
   const apkVersionName = semver.valid(semver.coerce(apkVersionNameStr));
 
-  if (!_.isInteger(apkVersionCode) || !_.isInteger(pkgVersionCode)) {
+  if (!Number.isInteger(apkVersionCode) || !Number.isInteger(pkgVersionCode)) {
     log.warn(`Cannot read version codes of '${appPath}' and/or '${pkg}'`);
-    if (!_.isString(apkVersionName) || !_.isString(pkgVersionName)) {
+    if (typeof apkVersionName !== 'string' || typeof pkgVersionName !== 'string') {
       log.warn(`Cannot read version names of '${appPath}' and/or '${pkg}'`);
       return this.APP_INSTALL_STATE.UNKNOWN;
     }
   }
-  if (_.isInteger(apkVersionCode) && _.isInteger(pkgVersionCode)) {
+  if (Number.isInteger(apkVersionCode) && Number.isInteger(pkgVersionCode)) {
     if ((pkgVersionCode as number) > (apkVersionCode as number)) {
       log.debug(
         `The version code of the installed '${pkg}' is greater than the application version code (${pkgVersionCode} > ${apkVersionCode})`,
@@ -319,8 +317,8 @@ export async function getApplicationInstallState(
     // Version codes might not be maintained. Check version names.
     if (pkgVersionCode === apkVersionCode) {
       if (
-        _.isString(apkVersionName) &&
-        _.isString(pkgVersionName) &&
+        typeof apkVersionName === 'string' &&
+        typeof pkgVersionName === 'string' &&
         semver.satisfies(pkgVersionName, `>=${apkVersionName}`)
       ) {
         log.debug(
@@ -330,7 +328,7 @@ export async function getApplicationInstallState(
           ? this.APP_INSTALL_STATE.NEWER_VERSION_INSTALLED
           : this.APP_INSTALL_STATE.SAME_VERSION_INSTALLED;
       }
-      if (!_.isString(apkVersionName) || !_.isString(pkgVersionName)) {
+      if (typeof apkVersionName !== 'string' || typeof pkgVersionName !== 'string') {
         log.debug(
           `The version name of the installed '${pkg}' is equal to application version name (${pkgVersionCode} === ${apkVersionCode})`,
         );
@@ -338,8 +336,8 @@ export async function getApplicationInstallState(
       }
     }
   } else if (
-    _.isString(apkVersionName) &&
-    _.isString(pkgVersionName) &&
+    typeof apkVersionName === 'string' &&
+    typeof pkgVersionName === 'string' &&
     semver.satisfies(pkgVersionName, `>=${apkVersionName}`)
   ) {
     log.debug(
@@ -467,7 +465,7 @@ export async function extractStringsFromApk(
     appPath = await this.extractLanguageApk(appPath, language);
   }
 
-  let apkStrings: StringRecord = {};
+  let apkStrings: StringRecord;
   let configMarker: string;
   try {
     await this.initAapt();
@@ -479,7 +477,7 @@ export async function extractStringsFromApk(
           'configurations',
           appPath,
         ]);
-        return _.uniq(stdout.split(os.EOL));
+        return util.uniq(stdout.split(os.EOL));
       },
       language,
       '(default)',
@@ -508,7 +506,7 @@ export async function extractStringsFromApk(
           'configurations',
           appPath,
         ]);
-        return _.uniq(stdout.split(os.EOL));
+        return util.uniq(stdout.split(os.EOL));
       },
       language,
       '',
@@ -525,18 +523,19 @@ export async function extractStringsFromApk(
       const error = e as Error;
       throw new Error(
         `Cannot extract resources from '${originalAppPath}'. ` + `Original error: ${error.message}`,
+        {cause: e},
       );
     }
   }
 
-  if (_.isEmpty(apkStrings)) {
+  if (util.isEmpty(apkStrings)) {
     log.warn(
       `No strings have been found in '${originalAppPath}' resources ` +
         `for '${configMarker || 'default'}' configuration`,
     );
   } else {
     log.info(
-      `Successfully extracted ${_.keys(apkStrings).length} strings from ` +
+      `Successfully extracted ${Object.keys(apkStrings).length} strings from ` +
         `'${originalAppPath}' resources for '${configMarker || 'default'}' configuration`,
     );
   }
@@ -609,10 +608,10 @@ export function parseAapt2Strings(rawOutput: string, configMarker: string): Stri
         if (startIdx === idx) {
           return [allLines[idx].substring(startCharPos + 1, terminationCharPos), idx];
         }
-        return [`${result}\\n${_.trimStart(allLines[idx].substring(0, terminationCharPos))}`, idx];
+        return [`${result}\\n${allLines[idx].substring(0, terminationCharPos).trimStart()}`, idx];
       }
       if (idx > startIdx) {
-        result += `\\n${_.trimStart(allLines[idx])}`;
+        result += `\\n${allLines[idx].trimStart()}`;
       } else {
         result += allLines[idx].substring(startCharPos + 1);
       }
@@ -628,7 +627,7 @@ export function parseAapt2Strings(rawOutput: string, configMarker: string): Stri
   let lineIndex = 0;
   while (lineIndex < allLines.length) {
     const trimmedLine = allLines[lineIndex].trim();
-    if (_.isEmpty(trimmedLine)) {
+    if (util.isEmpty(trimmedLine)) {
       ++lineIndex;
       continue;
     }
@@ -672,7 +671,7 @@ export function parseAapt2Strings(rawOutput: string, configMarker: string): Stri
         if (isInCurrentConfig) {
           const [content, idx] = extractContent(lineIndex);
           lineIndex = idx;
-          if (_.isString(content)) {
+          if (typeof content === 'string') {
             apkStrings[currentResourceId] = [
               ...(Array.isArray(apkStrings[currentResourceId])
                 ? apkStrings[currentResourceId]
@@ -684,7 +683,7 @@ export function parseAapt2Strings(rawOutput: string, configMarker: string): Stri
       } else if (trimmedLine.startsWith(`(${configMarker})`)) {
         const [content, idx] = extractContent(lineIndex);
         lineIndex = idx;
-        if (_.isString(content)) {
+        if (typeof content === 'string') {
           apkStrings[currentResourceId] = content;
         }
         currentResourceId = null;
@@ -718,7 +717,7 @@ export function parseAaptStrings(rawOutput: string, configMarker: string): Strin
   const quotedStringPattern = /"[^"\\]*(?:\\.[^"\\]*)*"/;
   for (const line of rawOutput.split(os.EOL)) {
     const trimmedLine = line.trim();
-    if (_.isEmpty(trimmedLine)) {
+    if (util.isEmpty(trimmedLine)) {
       continue;
     }
 

package/lib/tools/apks-utils.ts

@@ -1,13 +1,12 @@
 import {exec} from 'teen_process';
 import {log} from '../logger';
 import path from 'node:path';
-import _ from 'lodash';
 import {fs, tempDir, util} from '@appium/support';
 import {LRUCache} from 'lru-cache';
-import {getJavaForOs, unzipFile, buildInstallArgs, APK_INSTALL_TIMEOUT} from '../helpers';
 import AsyncLock from 'async-lock';
 import type {ADB} from '../adb';
 import type {InstallMultipleApksOptions, InstallApksOptions, StringRecord} from './types';
+import {APK_INSTALL_TIMEOUT, buildInstallArgs, getJavaForOs, unzipFile} from '../utils';
 
 const BASE_APK = 'base-master.apk';
 const LANGUAGE_APK = (lang: string) => `base-${lang}.apk`;
@@ -65,7 +64,7 @@ export async function execBundletool(this: ADB, args: string[], errorMsg: string
       env,
       timeout: BUNDLETOOL_TIMEOUT_MS,
     }));
-    log.debug(`Command stdout: ${_.truncate(stdout, {length: 300})}`);
+    log.debug(`Command stdout: ${util.truncateString(stdout, {length: 300})}`);
     return stdout;
   } catch (e) {
     const err = e as Error & {stdout?: string; stderr?: string};
@@ -75,7 +74,7 @@ export async function execBundletool(this: ADB, args: string[], errorMsg: string
     if (err.stderr) {
       log.debug(`Command stderr: ${err.stderr}`);
     }
-    throw new Error(`${errorMsg}. Original error: ${err.message}`);
+    throw new Error(`${errorMsg}. Original error: ${err.message}`, {cause: e});
   }
 }
 
@@ -240,7 +239,7 @@ export function isTestPackageOnlyError(output: string): boolean {
  * apks file is not a valid bundle
  */
 async function extractFromApks(apks: string, dstPath: string | string[]): Promise<string> {
-  const normalizedDstPath = _.isArray(dstPath) ? dstPath : [dstPath];
+  const normalizedDstPath = Array.isArray(dstPath) ? dstPath : [dstPath];
 
   return await APKS_CACHE_GUARD.acquire(apks, async () => {
     // It might be that the original file has been replaced,