appium-xcuitest-driver 7.35.0 → 7.35.1

package/lib/doctor/optional-checks.js

@@ -1,4 +1,3 @@
-/* eslint-disable require-await */
 import {resolveExecutablePath} from './utils';
 import {doctor} from 'appium/support';
 import '@colors/colors';

package/lib/doctor/required-checks.js

@@ -1,4 +1,3 @@
-/* eslint-disable require-await */
 import {fs, doctor} from 'appium/support';
 import {exec} from 'teen_process';
 import { getPath as getXcodePath } from 'appium-xcode';

package/lib/doctor/utils.js

@@ -12,6 +12,6 @@ export async function resolveExecutablePath(cmd) {
     if (executablePath && (await fs.exists(executablePath))) {
       return executablePath;
     }
-  } catch (err) {}
+  } catch {}
   return null;
 }

package/lib/driver.js

@@ -20,7 +20,7 @@ import {
 } from './app-utils';
 import commands from './commands';
 import {desiredCapConstraints} from './desired-caps';
-import DEVICE_CONNECTIONS_FACTORY from './device-connections-factory';
+import {DEVICE_CONNECTIONS_FACTORY} from './device-connections-factory';
 import {executeMethodMap} from './execute-method-map';
 import {newMethodMap} from './method-map';
 import { Pyidevice } from './real-device-clients/py-ios-device-client';
@@ -856,7 +856,7 @@ export class XCUITestDriver extends BaseDriver {
               // In case the bundle id process start got failed because of
               // auth popup in the device. Then, the bundle id process itself started. It is safe to stop it here.
               await this.mobileKillApp(this.wda.bundleIdForXctest);
-            } catch (ign) {};
+            } catch {};
             // Mostly it failed to start the WDA process as no the bundle id
             // e.g. '<bundle id of WDA> not found on device <udid>'
 
@@ -983,7 +983,7 @@ export class XCUITestDriver extends BaseDriver {
     if (shouldResetLocationServivce) {
       try {
         await this.mobileResetLocationService();
-      } catch (ignore) {
+      } catch {
         /* Ignore this error since mobileResetLocationService already logged the error */
       }
     }
@@ -1694,7 +1694,6 @@ export class XCUITestDriver extends BaseDriver {
   /**
    * Reset the current session (run the delete session and create session subroutines)
    */
-  // eslint-disable-next-line require-await
   async reset() {
     throw new Error(
       `The reset API has been deprecated and is not supported anymore. ` +

package/lib/ios-fs-helpers.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import B from 'bluebird';
+import B, {TimeoutError} from 'bluebird';
 import {fs, tempDir, mkdirp, zip, util, timing} from 'appium/support';
 import path from 'path';
 import log from './logger';
@@ -38,7 +38,7 @@ export async function pullFile(afcService, remotePath) {
 async function folderExists(folderPath) {
   try {
     return (await fs.stat(folderPath)).isDirectory();
-  } catch (e) {
+  } catch {
     return false;
   }
 }
@@ -137,7 +137,7 @@ async function remoteMkdirp(afcService, remoteRoot) {
   try {
     await afcService.listDirectory(remoteRoot);
     return;
-  } catch (e) {
+  } catch {
     // This means that the directory is missing and we got an object not found error.
     // Therefore, we are going to the parent
     await remoteMkdirp(afcService, path.dirname(remoteRoot));
@@ -261,7 +261,7 @@ export async function pushFolder(afcService, srcRootPath, dstRootPath, opts = {}
   // create the folder structure first
   try {
     await afcService.deleteDirectory(dstRootPath);
-  } catch (ign) {}
+  } catch {}
   await afcService.createDirectory(dstRootPath);
   for (const relativeFolderPath of foldersToPush) {
     // createDirectory does not accept folder names ending with a path separator
@@ -315,7 +315,7 @@ export async function pushFolder(afcService, srcRootPath, dstRootPath, opts = {}
         await B.any(pushPromises);
         const elapsedMs = timer.getDuration().asMilliSeconds;
         if (elapsedMs > timeoutMs) {
-          throw new B.TimeoutError(`Timed out after ${elapsedMs} ms`);
+          throw new TimeoutError(`Timed out after ${elapsedMs} ms`);
         }
       }
       _.remove(pushPromises, (p) => p.isFulfilled());
@@ -330,7 +330,7 @@ export async function pushFolder(afcService, srcRootPath, dstRootPath, opts = {}
       await _pushFile(relativeFilePath);
       const elapsedMs = timer.getDuration().asMilliSeconds;
       if (elapsedMs > timeoutMs) {
-        throw new B.TimeoutError(`Timed out after ${elapsedMs} ms`);
+        throw new TimeoutError(`Timed out after ${elapsedMs} ms`);
       }
     }
   }

package/lib/real-device-clients/py-ios-device-client.ts

@@ -40,7 +40,7 @@ export class Pyidevice extends BaseDeviceClient {
     try {
       this._binaryPath = await fs.which(BINARY_NAME);
       return true;
-    } catch (e) {
+    } catch {
       if (isStrict) {
         throw new Error(
           `${BINARY_NAME} binary cannot be found in PATH. ` +

package/lib/real-device.js

@@ -1,7 +1,7 @@
 import {timing, util, fs} from 'appium/support';
 import path from 'path';
 import {services, utilities, INSTRUMENT_CHANNEL} from 'appium-ios-device';
-import B from 'bluebird';
+import B, {TimeoutError} from 'bluebird';
 import defaultLogger from './logger';
 import _ from 'lodash';
 import {SAFARI_BUNDLE_ID} from './app-utils';
@@ -104,7 +104,7 @@ export class RealDevice {
     } catch (err) {
       this.log.debug(err.stack);
       let errMessage = `Cannot install the ${bundleId} application`;
-      if (err instanceof B.TimeoutError) {
+      if (err instanceof TimeoutError) {
         errMessage += `. Consider increasing the value of 'appPushTimeout' capability (the current value equals to ${timeoutMs}ms)`;
       }
       errMessage += `. Original error: ${err.message}`;

package/lib/simulator-management.js

@@ -1,5 +1,5 @@
 import {getSimulator} from 'appium-ios-simulator';
-import Simctl from 'node-simctl';
+import {Simctl} from 'node-simctl';
 import {resetTestProcesses} from 'appium-webdriveragent';
 import _ from 'lodash';
 import {util, timing} from 'appium/support';
@@ -24,7 +24,7 @@ export async function createSim() {
       deviceNames = (await simctl
         .getDevices(platformVersion, platform))
         .map(({deviceName}) => deviceName);
-    } catch (ign) {}
+    } catch {}
     throw new Error(
       `'deviceName' must be provided in order to create a new Simulator for ${platform} platform. ` +
         `Currently available device names: ${deviceNames}`,
@@ -179,7 +179,7 @@ export async function runSimulatorReset(enforceSimulatorShutdown = false) {
     // Terminate the app under test if it is still running on Simulator
     try {
       await device.terminateApp(bundleId);
-    } catch (err) {
+    } catch {
       this.log.warn(`Reset: failed to terminate Simulator application with id "${bundleId}"`);
     }
 

package/lib/utils.js

@@ -1,4 +1,4 @@
-import xcode from 'appium-xcode';
+import * as xcode from 'appium-xcode';
 import {errors} from 'appium/driver';
 import {fs, net, util} from 'appium/support';
 import B from 'bluebird';
@@ -6,7 +6,7 @@ import _ from 'lodash';
 import os from 'node:os';
 import path from 'node:path';
 import url from 'node:url';
-import semver from 'semver';
+import * as semver from 'semver';
 import {exec} from 'teen_process';
 import iosGenericSimulators from './ios-generic-simulators';
 import log from './logger';
@@ -123,7 +123,7 @@ async function clearLogs(locations) {
         try {
           const {stdout} = await exec('du', ['-sh', location]);
           size = stdout.trim().split(/\s+/)[0];
-        } catch (ign) {}
+        } catch {}
         try {
           log.debug(`Deleting '${location}'. ${size ? `Freeing ${size}.` : ''}`);
           await fs.rimraf(location);
@@ -248,7 +248,7 @@ const getModuleManifest = _.memoize(async function getModuleManifest() {
           return manifest;
         }
       }
-    } catch (ign) {}
+    } catch {}
     currentDir = path.dirname(currentDir);
     isAtFsRoot = currentDir.length <= path.dirname(currentDir).length;
   }
@@ -294,7 +294,7 @@ function normalizeCommandTimeouts(value) {
     if (!_.isPlainObject(result)) {
       throw new Error();
     }
-  } catch (err) {
+  } catch {
     throw log.errorWithException(
       `"commandTimeouts" capability should be a valid JSON object. "${value}" was given instead`,
     );
@@ -337,7 +337,7 @@ async function getPIDsListeningOnPort(port, filteringFunc = null) {
     // This only works since Mac OS X El Capitan
     const {stdout} = await exec('lsof', ['-ti', `tcp:${port}`]);
     result.push(...stdout.trim().split(/\n+/));
-  } catch (e) {
+  } catch {
     return result;
   }
 
@@ -428,7 +428,7 @@ function isLocalHost(urlString) {
   try {
     const hostname = /** @type {string} */ (url.parse(urlString).hostname);
     return ['localhost', '127.0.0.1', '::1', '::ffff:127.0.0.1'].includes(hostname);
-  } catch (ign) {
+  } catch {
     log.warn(`'${urlString}' cannot be parsed as a valid URL`);
   }
   return false;

package/lib/xcrun.js

@@ -5,7 +5,7 @@ const XCRUN = 'xcrun';
 async function requireXcrun() {
   try {
     return await fs.which(XCRUN);
-  } catch (e) {
+  } catch {
     throw new Error(
       `${XCRUN} has not been found in PATH. ` +
         `Please make sure XCode development tools are installed`,