node-simctl 8.1.7 → 8.2.1

package/lib/subcommands/create.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import {log, LOG_PREFIX} from '../logger';
 import {retryInterval} from 'asyncbox';
 import {SIM_RUNTIME_NAME, normalizeVersion} from '../helpers';
@@ -36,7 +35,7 @@ export async function createDevice(
     runtimeIds.push(await this.getRuntimeForPlatformVersionViaJson(platformVersion, platform));
   } catch {}
 
-  if (_.isEmpty(runtimeIds)) {
+  if (runtimeIds.length === 0) {
     // at first make sure that the runtime id is the right one
     // in some versions of Xcode it will be a patch version
     let runtimeId: string;
@@ -95,7 +94,7 @@ export async function createDevice(
   // make sure that it gets out of the "Creating" state
   const retries = parseInt(`${timeout / 1000}`, 10);
   await retryInterval(retries, 1000, async () => {
-    const devices = _.flatMap(_.values(await this.getDevices()));
+    const devices = Object.values(await this.getDevices()).flatMap((entries) => entries);
     for (const device of devices) {
       if (device.udid === udid) {
         if (device.state === 'Creating') {

package/lib/subcommands/io.ts

@@ -1,8 +1,8 @@
 import {rimraf} from 'rimraf';
+import {randomUUID} from 'node:crypto';
 import path from 'node:path';
 import os from 'node:os';
 import fs from 'node:fs/promises';
-import {uuidV4} from '../helpers';
 import type {Simctl} from '../simctl';
 
 /**
@@ -17,7 +17,7 @@ import type {Simctl} from '../simctl';
  */
 export async function getScreenshot(this: Simctl): Promise<string> {
   const udid = this.requireUdid('io screenshot');
-  const pathToScreenshotPng = path.resolve(os.tmpdir(), `${await uuidV4()}.png`);
+  const pathToScreenshotPng = path.resolve(os.tmpdir(), `${randomUUID()}.png`);
   try {
     await this.exec('io', {
       args: [udid, 'screenshot', pathToScreenshotPng],

package/lib/subcommands/keychain.ts

@@ -1,33 +1,11 @@
 import os from 'node:os';
 import fs from 'node:fs/promises';
-import {uuidV4} from '../helpers';
+import {randomUUID} from 'node:crypto';
 import path from 'node:path';
-import _ from 'lodash';
 import {rimraf} from 'rimraf';
 import type {Simctl} from '../simctl';
 import type {CertOptions} from '../types';
 
-/**
- * @param payload - Certificate payload (string or Buffer)
- * @param onPayloadStored - Callback function to execute with the file path
- */
-async function handleRawPayload(
-  payload: string | Buffer,
-  onPayloadStored: (filePath: string) => Promise<any>,
-): Promise<void> {
-  const filePath = path.resolve(os.tmpdir(), `${await uuidV4()}.pem`);
-  try {
-    if (_.isBuffer(payload)) {
-      await fs.writeFile(filePath, payload);
-    } else {
-      await fs.writeFile(filePath, payload, 'utf8');
-    }
-    await onPayloadStored(filePath);
-  } finally {
-    await rimraf(filePath);
-  }
-}
-
 /**
  * Adds the given certificate to the Trusted Root Store on the simulator
  *
@@ -99,3 +77,24 @@ export async function resetKeychain(this: Simctl): Promise<void> {
     args: [this.requireUdid('keychain reset'), 'reset'],
   });
 }
+
+/**
+ * @param payload - Certificate payload (string or Buffer)
+ * @param onPayloadStored - Callback function to execute with the file path
+ */
+async function handleRawPayload(
+  payload: string | Buffer,
+  onPayloadStored: (filePath: string) => Promise<any>,
+): Promise<void> {
+  const filePath = path.resolve(os.tmpdir(), `${randomUUID()}.pem`);
+  try {
+    if (Buffer.isBuffer(payload)) {
+      await fs.writeFile(filePath, payload);
+    } else {
+      await fs.writeFile(filePath, payload, 'utf8');
+    }
+    await onPayloadStored(filePath);
+  } finally {
+    await rimraf(filePath);
+  }
+}

package/lib/subcommands/launch.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import {retryInterval} from 'asyncbox';
 import type {Simctl} from '../simctl';
 
@@ -25,7 +24,7 @@ export async function launchApp(
     const {stdout} = await this.exec('launch', {
       args: [this.requireUdid('launch'), bundleId],
     });
-    return _.trim(stdout) || '';
+    return stdout.trim() || '';
   });
   return result || '';
 }

package/lib/subcommands/list.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import {SIM_RUNTIME_NAME, normalizeVersion} from '../helpers';
 import {log, LOG_PREFIX} from '../logger';
 import type {Simctl} from '../simctl';
@@ -32,20 +31,16 @@ export async function getDevicesByParsing(
   //     ...
   // so, get the `-- iOS X.X --` line to find the sdk (X.X)
   // and the rest of the listing in order to later find the devices
-  const deviceSectionRe =
-    _.isEmpty(platform) || !platform
-      ? new RegExp(`\\-\\-\\s+(\\S+)\\s+(\\S+)\\s+\\-\\-(\\n\\s{4}.+)*`, 'mgi')
-      : new RegExp(
-          `\\-\\-\\s+${_.escapeRegExp(platform)}\\s+(\\S+)\\s+\\-\\-(\\n\\s{4}.+)*`,
-          'mgi',
-        );
+  const deviceSectionRe = !platform
+    ? new RegExp(`\\-\\-\\s+(\\S+)\\s+(\\S+)\\s+\\-\\-(\\n\\s{4}.+)*`, 'mgi')
+    : new RegExp(`\\-\\-\\s+${escapeRegExp(platform)}\\s+(\\S+)\\s+\\-\\-(\\n\\s{4}.+)*`, 'mgi');
   const matches: RegExpExecArray[] = [];
   let match: RegExpExecArray | null;
   // make an entry for each sdk version
   while ((match = deviceSectionRe.exec(stdout))) {
     matches.push(match);
   }
-  if (_.isEmpty(matches)) {
+  if (matches.length === 0) {
     throw new Error('Could not find device section');
   }
 
@@ -135,11 +130,10 @@ export async function getDevices(
      *   }
      * }
      */
-    const versionMatchRe =
-      _.isEmpty(platform) || !platform
-        ? new RegExp(`^([^\\s-]+)[\\s-](\\S+)`, 'i')
-        : new RegExp(`^${_.escapeRegExp(platform)}[\\s-](\\S+)`, 'i');
-    for (const [sdkNameRaw, entries] of _.toPairs(JSON.parse(stdout).devices)) {
+    const versionMatchRe = !platform
+      ? new RegExp(`^([^\\s-]+)[\\s-](\\S+)`, 'i')
+      : new RegExp(`^${escapeRegExp(platform)}[\\s-](\\S+)`, 'i');
+    for (const [sdkNameRaw, entries] of Object.entries(JSON.parse(stdout).devices)) {
       // there could be a longer name, so remove it
       const sdkName = sdkNameRaw.replace(SIM_RUNTIME_NAME, '');
       const versionMatch = versionMatchRe.exec(sdkName);
@@ -152,7 +146,7 @@ export async function getDevices(
       devices[sdk] = devices[sdk] || [];
       devices[sdk].push(
         ...(entries as any[])
-          .filter((el) => _.isUndefined(el.isAvailable) || el.isAvailable)
+          .filter((el) => el.isAvailable === undefined || el.isAvailable)
           .map((el: any) => {
             delete el.availability;
             return {
@@ -178,7 +172,7 @@ export async function getDevices(
   }
 
   let errMsg = `'${forSdk}' does not exist in the list of simctl SDKs.`;
-  const availableSDKs = _.keys(devices);
+  const availableSDKs = Object.keys(devices);
   errMsg += availableSDKs.length
     ? ` Only the following Simulator SDK versions are available on your system: ${availableSDKs.join(', ')}`
     : ` No Simulator SDK versions are available on your system. Please install some via Xcode preferences.`;
@@ -234,7 +228,7 @@ export async function getRuntimeForPlatformVersion(
     });
     // https://regex101.com/r/UykjQZ/1
     const runtimeRe = new RegExp(
-      `${_.escapeRegExp(platform)}\\s+(\\d+\\.\\d+)\\s+\\((\\d+\\.\\d+\\.*\\d*)`,
+      `${escapeRegExp(platform)}\\s+(\\d+\\.\\d+)\\s+\\((\\d+\\.\\d+\\.*\\d*)`,
       'i',
     );
     for (const line of stdout.split('\n')) {
@@ -322,3 +316,7 @@ export async function list(this: Simctl): Promise<any> {
     throw new Error(`Unable to parse simctl list: ${e.message}`);
   }
 }
+
+function escapeRegExp(value: string): string {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}

package/lib/subcommands/location.ts

@@ -1,20 +1,5 @@
 import type {Simctl} from '../simctl';
 
-/**
- * Formats the given location argument for simctl usage
- *
- * @param name Argument name
- * @param value Location argument value
- * @returns Formatted value, for example -73.768254
- */
-function formatArg(name: string, value: string | number): string {
-  const flt = parseFloat(`${value}`);
-  if (isNaN(flt)) {
-    throw new TypeError(`${name} must be a valid number, got '${value}' instead`);
-  }
-  return flt.toFixed(7);
-}
-
 /**
  * Set the Simulator location to a specific latitude and longitude.
  * This functionality is only available since Xcode 14.
@@ -47,3 +32,18 @@ export async function clearLocation(this: Simctl): Promise<void> {
     args: [this.requireUdid('location'), 'clear'],
   });
 }
+
+/**
+ * Formats the given location argument for simctl usage
+ *
+ * @param name Argument name
+ * @param value Location argument value
+ * @returns Formatted value, for example -73.768254
+ */
+function formatArg(name: string, value: string | number): string {
+  const flt = parseFloat(`${value}`);
+  if (isNaN(flt)) {
+    throw new TypeError(`${name} must be a valid number, got '${value}' instead`);
+  }
+  return flt.toFixed(7);
+}

package/lib/subcommands/push.ts

@@ -1,5 +1,5 @@
 import {rimraf} from 'rimraf';
-import {uuidV4} from '../helpers';
+import {randomUUID} from 'node:crypto';
 import path from 'node:path';
 import os from 'node:os';
 import fs from 'node:fs/promises';
@@ -26,7 +26,7 @@ import type {Simctl} from '../simctl';
  * @throws {Error} If the `udid` instance property is unset
  */
 export async function pushNotification(this: Simctl, payload: Record<string, any>): Promise<void> {
-  const dstPath = path.resolve(os.tmpdir(), `${await uuidV4()}.json`);
+  const dstPath = path.resolve(os.tmpdir(), `${randomUUID()}.json`);
   try {
     await fs.writeFile(dstPath, JSON.stringify(payload), 'utf8');
     await this.exec('push', {

package/lib/subcommands/shutdown.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import {log, LOG_PREFIX} from '../logger';
 import type {Simctl} from '../simctl';
 
@@ -15,7 +14,7 @@ export async function shutdownDevice(this: Simctl): Promise<void> {
       args: [this.requireUdid('shutdown')],
     });
   } catch (e: any) {
-    if (!_.includes(e.message, 'current state: Shutdown')) {
+    if (!e.message?.includes('current state: Shutdown')) {
       throw e;
     }
     log.debug(LOG_PREFIX, `Simulator already in 'Shutdown' state. Continuing`);

package/lib/subcommands/spawn.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import type {Simctl} from '../simctl';
 import type {TeenProcessExecResult, SubProcess} from 'teen_process';
 
@@ -18,12 +17,12 @@ export async function spawnProcess(
   args: string | string[],
   env: Record<string, any> = {},
 ): Promise<TeenProcessExecResult<string>> {
-  if (_.isEmpty(args)) {
+  if ((Array.isArray(args) && args.length === 0) || args === '') {
     throw new Error('Spawn arguments are required');
   }
 
   return await this.exec('spawn', {
-    args: [this.requireUdid('spawn'), ...(_.isArray(args) ? args : [args])],
+    args: [this.requireUdid('spawn'), ...(Array.isArray(args) ? args : [args])],
     env,
   });
 }
@@ -42,12 +41,12 @@ export async function spawnSubProcess(
   args: string | string[],
   env: Record<string, any> = {},
 ): Promise<SubProcess> {
-  if (_.isEmpty(args)) {
+  if ((Array.isArray(args) && args.length === 0) || args === '') {
     throw new Error('Spawn arguments are required');
   }
 
   return (await this.exec('spawn', {
-    args: [this.requireUdid('spawn'), ...(_.isArray(args) ? args : [args])],
+    args: [this.requireUdid('spawn'), ...(Array.isArray(args) ? args : [args])],
     env,
     asynchronous: true,
   })) as SubProcess;

package/lib/subcommands/ui.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import type {Simctl} from '../simctl';
 
 /**
@@ -14,7 +13,7 @@ export async function getAppearance(this: Simctl): Promise<string> {
   const {stdout} = await this.exec('ui', {
     args: [this.requireUdid('ui'), 'appearance'],
   });
-  return _.trim(stdout);
+  return stdout.trim();
 }
 
 /**
@@ -52,7 +51,7 @@ export async function getIncreaseContrast(this: Simctl): Promise<string> {
   const {stdout} = await this.exec('ui', {
     args: [this.requireUdid('ui'), 'increase_contrast'],
   });
-  return _.trim(stdout);
+  return stdout.trim();
 }
 
 /**
@@ -99,7 +98,7 @@ export async function getContentSize(this: Simctl): Promise<string> {
   const {stdout} = await this.exec('ui', {
     args: [this.requireUdid('ui'), 'content_size'],
   });
-  return _.trim(stdout);
+  return stdout.trim();
 }
 
 /**

package/package.json

@@ -6,7 +6,7 @@
     "ios",
     "simctl"
   ],
-  "version": "8.1.7",
+  "version": "8.2.1",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -33,12 +33,9 @@
   "dependencies": {
     "@appium/logger": "^2.0.0-rc.1",
     "asyncbox": "^6.0.1",
-    "bluebird": "^3.5.1",
-    "lodash": "^4.2.1",
     "rimraf": "^6.0.1",
     "semver": "^7.0.0",
     "teen_process": "^4.0.4",
-    "uuid": "^13.0.0",
     "which": "^6.0.0"
   },
   "scripts": {
@@ -65,8 +62,6 @@
     "@appium/types": "^1.0.0-rc.1",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/git": "^10.0.1",
-    "@types/bluebird": "^3.5.38",
-    "@types/lodash": "^4.14.196",
     "@types/mocha": "^10.0.1",
     "@types/node": "^25.0.0",
     "appium-xcode": "^6.0.0",