appium-mac2-driver 3.3.0 → 3.3.2

package/lib/execute-method-map.ts

@@ -177,7 +177,7 @@ export const executeMethodMap = {
     },
   },
   'macos: startRecordingScreen': {
-    command: 'startRecordingScreen',
+    command: 'macosStartRecordingScreen',
     params: {
       required: ['deviceId'],
       optional: [
@@ -192,7 +192,7 @@ export const executeMethodMap = {
     },
   },
   'macos: stopRecordingScreen': {
-    command: 'stopRecordingScreen',
+    command: 'macosStopRecordingScreen',
     params: {
       optional: ['remotePath', 'user', 'pass', 'method', 'headers', 'fileFieldName', 'formFields'],
     },

package/lib/utils.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import {exec} from 'teen_process';
 import {node} from 'appium/support';
 
@@ -10,13 +9,19 @@ const MODULE_NAME = 'appium-mac2-driver';
  * @returns The full path to module root
  * @throws If the current module root folder cannot be determined
  */
-export const getModuleRoot = _.memoize(function getModuleRoot(): string {
+let moduleRootCache: string | null = null;
+
+export const getModuleRoot = function getModuleRoot(): string {
+  if (moduleRootCache) {
+    return moduleRootCache;
+  }
   const root = node.getModuleRootSync(MODULE_NAME, __filename);
   if (!root) {
     throw new Error(`Cannot find the root folder of the ${MODULE_NAME} Node.js module`);
   }
-  return root;
-});
+  moduleRootCache = root;
+  return moduleRootCache;
+};
 
 /**
  * Retrieves process ids of all the children processes created by the given
@@ -31,11 +36,32 @@ export async function listChildrenProcessIds(parentPid: number | string): Promis
   // USER  PID  %CPU %MEM  VSZ  RSS   TT  STAT STARTED  TIME COMMAND  PPID
   return stdout
     .split('\n')
-    .filter(_.trim)
+    .map((line) => line.trim())
+    .filter(Boolean)
     .map((line: string) => {
-      const [, pid, ...rest] = line.split(/\s+/).filter(_.trim);
-      return [pid, _.last(rest)];
+      const [, pid, ...rest] = line.split(/\s+/).filter(Boolean);
+      return [pid, rest.at(-1)];
     })
     .filter(([, ppid]) => ppid === `${parentPid}`)
     .map(([pid]) => String(pid));
 }
+
+export function clearArray<T>(items: T[]): void {
+  items.length = 0;
+}
+
+export function removeAllOccurrences<T>(items: T[], value: T): void {
+  let index = items.indexOf(value);
+  while (index >= 0) {
+    items.splice(index, 1);
+    index = items.indexOf(value);
+  }
+}
+
+export function isPlainObject(value: unknown): value is Record<string, unknown> {
+  if (value === null || typeof value !== 'object') {
+    return false;
+  }
+  const proto = Object.getPrototypeOf(value);
+  return proto === Object.prototype || proto === null;
+}

package/lib/wda-mac.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import path from 'node:path';
 import url from 'node:url';
 import axios from 'axios';
@@ -11,7 +10,7 @@ import {waitForCondition} from 'asyncbox';
 import {checkPortStatus} from 'portscanner';
 import {execSync} from 'node:child_process';
 import type {HTTPMethod, HTTPBody, ProxyResponse, ProxyOptions} from '@appium/types';
-import {listChildrenProcessIds, getModuleRoot} from './utils';
+import {listChildrenProcessIds, getModuleRoot, clearArray, removeAllOccurrences} from './utils';
 
 const log = logger.getLogger('WebDriverAgentMac');
 
@@ -232,7 +231,7 @@ class WDAMacProcess {
         return;
       }
 
-      const line = _.trim(stdout || stderr);
+      const line = (stdout ?? stderr ?? '').trim();
       if (line) {
         log.debug(`[${XCODEBUILD}] ${line}`);
       }
@@ -251,7 +250,7 @@ class WDAMacProcess {
     }
 
     const childrenPids = await this.listChildrenPids();
-    if (!_.isEmpty(childrenPids)) {
+    if (childrenPids.length > 0) {
       try {
         await exec('kill', childrenPids);
       } catch {}
@@ -265,7 +264,7 @@ class WDAMacProcess {
     }
 
     const childrenPids = await this.listChildrenPids();
-    if (!_.isEmpty(childrenPids)) {
+    if (childrenPids.length > 0) {
       try {
         await exec('kill', ['-9', ...childrenPids]);
       } catch {}
@@ -278,8 +277,8 @@ class WDAMacProcess {
   private hasSameOpts(opts: WDAMacProcessInitOptions): boolean {
     const {showServerLogs, systemPort, systemHost, bootstrapRoot} = opts;
     if (
-      (_.isBoolean(showServerLogs) && this._showServerLogs !== showServerLogs) ||
-      (_.isNil(showServerLogs) && this._showServerLogs !== DEFAULT_SHOW_SERVER_LOGS)
+      (typeof showServerLogs === 'boolean' && this._showServerLogs !== showServerLogs) ||
+      (showServerLogs == null && this._showServerLogs !== DEFAULT_SHOW_SERVER_LOGS)
     ) {
       return false;
     }
@@ -390,7 +389,9 @@ export class WDAMacServer {
         const childrenPids = await this._process.listChildrenPids();
         if (pid !== null) {
           RUNNING_PROCESS_IDS.push(...childrenPids, pid);
-          this._process.proc?.on('exit', () => void _.pull(RUNNING_PROCESS_IDS, pid));
+          this._process.proc?.on('exit', () => {
+            removeAllOccurrences(RUNNING_PROCESS_IDS, pid);
+          });
         }
         log.info(
           `The host process is ready within ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`,
@@ -468,13 +469,13 @@ export class WDAMacServer {
     }
 
     const {protocol, hostname, port, pathname} = parsedUrl;
-    if (_.isString(protocol)) {
+    if (typeof protocol === 'string') {
       scheme = protocol.split(':')[0];
     }
     return {
       scheme,
       host: hostname ?? DEFAULT_SYSTEM_HOST,
-      port: _.isEmpty(port) ? DEFAULT_SYSTEM_PORT : _.parseInt(port),
+      port: port.length === 0 ? DEFAULT_SYSTEM_PORT : Number.parseInt(port, 10),
       path: pathname === '/' ? '' : pathname,
     };
   }
@@ -484,7 +485,7 @@ export const WDA_MAC_SERVER = new WDAMacServer();
 
 // Private functions
 async function cleanupObsoleteProcesses(): Promise<void> {
-  if (!_.isEmpty(RUNNING_PROCESS_IDS)) {
+  if (RUNNING_PROCESS_IDS.length > 0) {
     log.debug(
       `Cleaning up ${RUNNING_PROCESS_IDS.length} obsolete ` +
         util.pluralize('process', RUNNING_PROCESS_IDS.length, false),
@@ -492,16 +493,16 @@ async function cleanupObsoleteProcesses(): Promise<void> {
     try {
       await exec('kill', ['-9', ...RUNNING_PROCESS_IDS.map(String)]);
     } catch {}
-    _.pullAll(RUNNING_PROCESS_IDS, RUNNING_PROCESS_IDS);
+    clearArray(RUNNING_PROCESS_IDS);
   }
 }
 
 process.once('exit', () => {
-  if (!_.isEmpty(RUNNING_PROCESS_IDS)) {
+  if (RUNNING_PROCESS_IDS.length > 0) {
     try {
       execSync(`kill -9 ${RUNNING_PROCESS_IDS.map(String).join(' ')}`);
     } catch {}
-    _.pullAll(RUNNING_PROCESS_IDS, RUNNING_PROCESS_IDS);
+    clearArray(RUNNING_PROCESS_IDS);
   }
 });