update

appium · Jan 3, 2025 · 06e28b7 · 06e28b7
1 parent f0d9e81
commit 06e28b7
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 44 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,5 @@
+import appiumConfig from '@appium/eslint-config-appium-ts';
+
+export default [
+  ...appiumConfig,
+];
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -39,7 +39,7 @@ async function getPids (pattern, opts = {}) {
       .filter(Number)
       .map((x) => `${x}`);
     return multi ? result : (_.isEmpty(result) ? [] : result[0]);
-  } catch (err) {
+  } catch {
     return [];
   }
 }
@@ -76,7 +76,7 @@ function fixOutputToArray (output) {
     .reduce((acc, x) => {
       try {
         return [...acc, JSON.parse(x)];
-      } catch (e) {
+      } catch {
         return acc;
       }
     }, []);

diff --git a/lib/tools/accessibility-commands.js b/lib/tools/accessibility-commands.js
@@ -27,7 +27,7 @@ accessibilityCommands.describePoint = async function describePoint (x, y) {
   log.debug(`Describing the UI at (${x}, ${y}) on the device '${this.udid}'`);
   try {
     return JSON.parse(await this.exec(['ui', 'describe-point'], [x, y]));
-  } catch (ign) {
+  } catch {
     return null;
   }
 };

diff --git a/lib/tools/system-commands.js b/lib/tools/system-commands.js
@@ -43,7 +43,7 @@ systemCallMethods.connect = async function connect (opts = {}) {
   for (const binary of [IDB_EXECUTABLE, IDB_COMPANION_EXECUTABLE]) {
     try {
       binaryPaths[binary] = await fs.which(binary);
-    } catch (e) {
+    } catch {
       throw new Error(`'${binary}' has not been found in PATH. ` +
         `Is it installed? Read https://www.fbidb.io for more details`);
     }
@@ -56,12 +56,12 @@ systemCallMethods.connect = async function connect (opts = {}) {
       // idb connect command looks for a running idb_companion process that associates with specified udid.
       // If not found, the command attempts to start the new idb_companion process that listens on an Unix domain socket.
       await tpExec(IDB_EXECUTABLE, ['connect', this.udid]);
-    } catch (connectionError) {
+    } catch {
       await retryInterval(2, 100, async () => {
         await this.disconnect();
         try {
           await tpExec(IDB_EXECUTABLE, ['kill']);
-        } catch (ign) {}
+        } catch {}
         await tpExec(IDB_EXECUTABLE, ['connect', this.udid]);
       });
     }
@@ -137,7 +137,7 @@ systemCallMethods.disconnect = async function disconnect () {
     // idb disconnect just removes the given udid from idb state.
     // It doesn't kill the idb_companion process associated with the udid.
     await tpExec(this.executable.path, ['disconnect', this.udid]);
-  } catch (ign) {}
+  } catch {}
 
   const companionPids = await getPids(COMPANION_PGREP_PATTERN(this.udid));
   if (_.isEmpty(companionPids)) {

diff --git a/lib/tools/video-commands.js b/lib/tools/video-commands.js
@@ -125,7 +125,7 @@ videoCommands.stopVideoStream = async function stopVideoStream (process = null)
   } else {
     try {
       await exec('pkill', [`-${KILL_SIGNAL}`, '-f', ['idb', 'video-stream', this.udid].join('.*')]);
-    } catch (ign) {}
+    } catch {}
   }
 };
 

diff --git a/test/functional/accessibility-commands-e2e-specs.js b/test/functional/accessibility-commands-e2e-specs.js
@@ -3,7 +3,7 @@ import { retryInterval } from 'asyncbox';
 import {
   prepareDevice, deleteDevice, ONLINE_TIMEOUT_MS
 } from '../helpers/device-helpers';
-import IDB from '../../lib/idb';
+import { IDB } from '../../lib/idb';
 
 describe('idb accessibility commands', function () {
   let idb;

diff --git a/test/functional/app-commands-e2e-specs.js b/test/functional/app-commands-e2e-specs.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import {
   prepareDevice, deleteDevice, ONLINE_TIMEOUT_MS
 } from '../helpers/device-helpers';
-import IDB from '../../lib/idb';
+import { IDB } from '../../lib/idb';
 import { waitForCondition } from 'asyncbox';
 
 const MAPS_BUNDLE_ID = 'com.apple.Maps';
@@ -63,7 +63,7 @@ describe('idb app commands', function () {
     const terminateMapsApp = async () => {
       try {
         await idb.terminateApp(MAPS_BUNDLE_ID);
-      } catch (ign) {}
+      } catch {}
     };
     await terminateMapsApp();
     const appProc = await idb.launchApp(MAPS_BUNDLE_ID, {

diff --git a/test/functional/crashlog-commands-e2e-specs.js b/test/functional/crashlog-commands-e2e-specs.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import {
   prepareDevice, deleteDevice, ONLINE_TIMEOUT_MS
 } from '../helpers/device-helpers';
-import IDB from '../../lib/idb';
+import { IDB } from '../../lib/idb';
 
 describe('idb crashlog commands', function () {
   let idb;

diff --git a/test/functional/idb-e2e-specs.js b/test/functional/idb-e2e-specs.js
@@ -1,5 +1,5 @@
 import {prepareDevice, deleteDevice, ONLINE_TIMEOUT_MS} from '../helpers/device-helpers';
-import IDB from '../../lib/idb';
+import { IDB } from '../../lib/idb';
 
 async function assertDeviceDescription(idb, udid) {
   const info = await idb.describeDevice();
@@ -42,7 +42,7 @@ describe('idb general', function () {
       await idb.disconnect();
       try {
         await simctl.shutdownDevice();
-      } catch (ign) {}
+      } catch {}
     });
 
     it('should be able to call connect/disconnect multiple times', async function () {
@@ -66,12 +66,12 @@ describe('idb general', function () {
     beforeEach(async function () {
       try {
         await idb.connect();
-      } catch (e) {}
+      } catch {}
     });
     afterEach(async function () {
       try {
         await idb.disconnect();
-      } catch (e) {}
+      } catch {}
     });
 
     it('should be able to call connect multiple times', async function () {

diff --git a/test/functional/interaction-commands-e2e-specs.js b/test/functional/interaction-commands-e2e-specs.js
@@ -1,7 +1,7 @@
 import {
   prepareDevice, deleteDevice, ONLINE_TIMEOUT_MS
 } from '../helpers/device-helpers';
-import IDB from '../../lib/idb';
+import { IDB } from '../../lib/idb';
 
 describe('idb interaction commands', function () {
   let simctl;

diff --git a/test/functional/misc-commands-e2e-specs.js b/test/functional/misc-commands-e2e-specs.js
@@ -1,7 +1,7 @@
 import {
   prepareDevice, deleteDevice, ONLINE_TIMEOUT_MS
 } from '../helpers/device-helpers';
-import IDB from '../../lib/idb';
+import { IDB } from '../../lib/idb';
 
 describe('idb misc commands', function () {
   let simctl;

diff --git a/test/functional/xctest-commands-e2e-specs.js b/test/functional/xctest-commands-e2e-specs.js
@@ -3,7 +3,7 @@ import axios from 'axios';
 import {
   prepareDevice, deleteDevice, ONLINE_TIMEOUT_MS
 } from '../helpers/device-helpers';
-import IDB from '../../lib/idb';
+import { IDB } from '../../lib/idb';
 import { retryInterval } from 'asyncbox';
 
 const WDA_BUNDLE_ID = 'com.facebook.WebDriverAgentRunner.xctrunner';

diff --git a/test/helpers/device-helpers.js b/test/helpers/device-helpers.js
@@ -1,6 +1,6 @@
 import { util } from '@appium/support';
 import { retryInterval } from 'asyncbox';
-import Simctl from 'node-simctl';
+import { Simctl } from 'node-simctl';
 
 const MODEL = process.env.DEVICE_NAME || 'iPhone 8';
 const PLATFORM_VERSION = process.env.PLATFORM_VERSION || '13.2';
@@ -26,7 +26,7 @@ async function deleteDevice (simctl) {
   if (simctl?.udid) {
     try {
       await simctl.shutdownDevice();
-    } catch (ign) {}
+    } catch {}
     await retryInterval(10, 1000, async () => await simctl.deleteDevice());
   }
 }