chore: Bump eslint version

eslint.config.mjs

@@ -0,0 +1,5 @@
+import appiumConfig from '@appium/eslint-config-appium-ts';
+
+export default [
+  ...appiumConfig,
+];

lib/commands/app-management.js

@@ -165,7 +165,7 @@ export async function terminateApp(appId, options = {}) {
       waitMs: timeout,
       intervalMs: 100,
     });
-  } catch (e) {
+  } catch {
     if (!_.isEmpty(currentPids) && !_.isEmpty(_.difference(pids, currentPids))) {
       this.log.warn(
         `Some of processes belonging to the '${appId}' applcation are still running ` +
@@ -283,7 +283,7 @@ export async function background(seconds) {
       this.log.debug(`Activating app '${appPackage}' in order to restore it`);
       await this.adb.activateApp(/** @type {string} */ (appPackage));
       return true;
-    } catch (ign) {}
+    } catch {}
     args =
       (appPackage === this.opts.appPackage && appActivity === this.opts.appActivity) ||
       (appPackage === this.opts.appWaitPackage &&
@@ -344,7 +344,7 @@ export async function resetAUT(opts = null) {
   if (isInstalled) {
     try {
       await this.adb.forceStop(appPackage);
-    } catch (ign) {}
+    } catch {}
     // fullReset has priority over fastReset
     if (!fullReset && fastReset) {
       const output = await this.adb.clear(appPackage);

lib/commands/context/exports.js

@@ -1,6 +1,5 @@
-/* eslint-disable require-await */
 import {util} from '@appium/support';
-import Chromedriver from 'appium-chromedriver';
+import {Chromedriver} from 'appium-chromedriver';
 import {errors, PROTOCOLS} from 'appium/driver';
 import _ from 'lodash';
 import {

lib/commands/context/helpers.js

@@ -8,7 +8,7 @@ import B from 'bluebird';
 import os from 'node:os';
 import path from 'node:path';
 import http from 'node:http';
-import Chromedriver from 'appium-chromedriver';
+import {Chromedriver} from 'appium-chromedriver';
 import {toDetailsCacheKey, getWebviewDetails, WEBVIEWS_DETAILS_CACHE} from './cache';
 import dns from 'node:dns/promises';
 
@@ -317,7 +317,7 @@ async function allocateDevtoolsChannel(socketName, webviewDevtoolsPort = null) {
     let localPort;
     try {
       localPort = await findAPortNotInUse(startPort, endPort);
-    } catch (e) {
+    } catch {
       throw new Error(
         `Cannot find any free port to forward the Devtools socket ` +
           `in range ${startPort}..${endPort}. You could set the starting port number ` +
@@ -649,7 +649,7 @@ async function getChromedriverPort(portSpec) {
     try {
       foundPort = await findAPortNotInUse(port, stopPort);
       break;
-    } catch (e) {
+    } catch {
       this.log.debug(`Nothing in port range ${port}:${stopPort} was available`);
     }
   }
@@ -715,7 +715,6 @@ export async function setupNewChromedriver(opts, curDeviceId, context) {
   const chromedriver = new Chromedriver({
     port: String(opts.chromedriverPort),
     executable: opts.chromedriverExecutable,
-    // eslint-disable-next-line object-shorthand
     adb: /** @type {any} */ (this.adb),
     cmdArgs: /** @type {string[]} */ (opts.chromedriverArgs),
     verbose: !!opts.showChromedriverLog,

lib/commands/device/common.js

@@ -1,4 +1,4 @@
-import semver from 'semver';
+import * as semver from 'semver';
 import _ from 'lodash';
 import B from 'bluebird';
 import path from 'node:path';

lib/commands/device/utils.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import {util} from '@appium/support';
-import ADB from 'appium-adb';
+import {ADB} from 'appium-adb';
 import {retryInterval} from 'asyncbox';
 import {
   path as SETTINGS_APK_PATH,

lib/commands/file-actions.js

@@ -339,7 +339,7 @@ function createFSTests(adb) {
     const fullCmd = runAs ? `run-as ${runAs} ${checkCmd}` : checkCmd;
     try {
       return _.includes(await adb.shell([fullCmd]), passFlag);
-    } catch (ign) {
+    } catch {
       return false;
     }
   };

lib/commands/geolocation.js

@@ -137,7 +137,7 @@ export async function setMockLocationApp(appId) {
     if (await this.adb.fileExists(MOCK_APP_IDS_STORE)) {
       try {
         pkgIds = JSON.parse(await this.adb.shell(['cat', MOCK_APP_IDS_STORE]));
-      } catch (ign) {}
+      } catch {}
     }
     if (pkgIds.includes(appId)) {
       return;
@@ -172,7 +172,7 @@ async function resetMockLocation() {
     if (await this.adb.fileExists(MOCK_APP_IDS_STORE)) {
       try {
         pkgIds = JSON.parse(await this.adb.shell(['cat', MOCK_APP_IDS_STORE]));
-      } catch (ign) {}
+      } catch {}
     }
     const thirdPartyPkgIds = await thirdPartyPkgIdsPromise;
     // Only include currently installed packages
@@ -194,7 +194,7 @@ async function resetMockLocation() {
         (async () => {
           try {
             await this.adb.shell(['appops', 'set', pkgId, 'android:mock_location', 'deny']);
-          } catch (ign) {}
+          } catch {}
         })(),
       ),
     );

lib/commands/ime.js

@@ -5,7 +5,6 @@ import {errors} from 'appium/driver';
  * @returns {Promise<boolean>}
  */
 export async function isIMEActivated() {
-  // eslint-disable-line require-await
   // IME is always activated on Android devices
   return true;
 }

lib/commands/legacy.js

@@ -5,23 +5,20 @@ const ISSUE_URL = 'https://github.com/appium/appium/issues/15807';
 /**
  * @this {AndroidDriver}
  */
-// eslint-disable-next-line require-await
 export async function launchApp () {
   throw new errors.UnsupportedOperationError(`This API is not supported anymore. See ${ISSUE_URL}`);
 }
 
 /**
  * @this {AndroidDriver}
  */
-// eslint-disable-next-line require-await
 export async function closeApp () {
   throw new errors.UnsupportedOperationError(`This API is not supported anymore. See ${ISSUE_URL}`);
 }
 
 /**
  * @this {AndroidDriver}
  */
-// eslint-disable-next-line require-await
 export async function reset () {
   throw new errors.UnsupportedOperationError(`This API is not supported anymore. See ${ISSUE_URL}`);
 }

lib/commands/lock/helpers.js

@@ -195,7 +195,7 @@ export async function pinUnlock(capabilities) {
       let el;
       try {
         el = await this.findElOrEls('id', `com.android.keyguard:id/key${pin}`, false);
-      } catch (ign) {
+      } catch {
         return await pinUnlockWithKeyEvent.bind(this)(capabilities);
       }
       await this.click(util.unwrapElement(el));
@@ -347,7 +347,7 @@ export async function verifyUnlock(timeoutMs = null) {
       waitMs: timeoutMs ?? 2000,
       intervalMs: 500,
     });
-  } catch (ign) {
+  } catch {
     throw new Error('The device has failed to be unlocked');
   }
   this.log.info('The device has been successfully unlocked');

lib/commands/log.js

@@ -98,7 +98,7 @@ export async function mobileStartLogsBroadcast() {
       if (!_.isEmpty(this._logcatWebsocketListener)) {
         try {
           this.adb.removeLogcatListener(this._logcatWebsocketListener);
-        } catch (ign) {}
+        } catch {}
         this._logcatWebsocketListener = undefined;
       }
 

lib/commands/recordscreen.js

@@ -114,7 +114,7 @@ export async function stopRecordingScreen(options = {}) {
         'SIGINT',
         PROCESS_SHUTDOWN_TIMEOUT,
       );
-    } catch (e) {
+    } catch {
       throw this.log.errorWithException(
         `Unable to stop screen recording within ${PROCESS_SHUTDOWN_TIMEOUT}ms`,
       );
@@ -277,7 +277,7 @@ async function scheduleScreenRecord(recordingProperties) {
       waitMs: RETRY_TIMEOUT,
       intervalMs: RETRY_PAUSE,
     });
-  } catch (e) {
+  } catch {
     throw new Error(
       `The expected screen record file '${pathOnDevice}' does not exist after ${RETRY_TIMEOUT}ms. ` +
         `Is ${SCREENRECORD_BINARY} utility available and operational on the device under test?`,
@@ -297,7 +297,7 @@ async function scheduleScreenRecord(recordingProperties) {
 async function mergeScreenRecords(mediaFiles) {
   try {
     await fs.which(FFMPEG_BINARY);
-  } catch (e) {
+  } catch {
     throw new Error(
       `${FFMPEG_BINARY} utility is not available in PATH. Please install it from https://www.ffmpeg.org/`,
     );

lib/commands/streamscreen.js

@@ -261,7 +261,7 @@ async function verifyStreamingRequirements(adb) {
       (async () => {
         try {
           await fs.which(binaryName);
-        } catch (e) {
+        } catch {
           throw new Error(
             `The '${binaryName}' binary is not available in the PATH on the host system. ` +
               `See ${GST_TUTORIAL_URL} for more details on how to install it.`,
@@ -472,7 +472,7 @@ async function initGstreamerPipeline(deviceStreamingProc, deviceInfo, log, opts)
       async () => {
         try {
           return (await checkPortStatus(tcpPort, TCP_HOST)) === 'open';
-        } catch (ign) {
+        } catch {
           return false;
         }
       },

lib/doctor/checks.js

@@ -137,7 +137,7 @@ export class AndroidSdkCheck {
     for (const binary of this.TOOL_NAMES) {
       try {
         this.log.info(`     '${binary}' exists in ${await getAndroidBinaryPath(binary)}`);
-      } catch (e) {
+      } catch {
         missingBinaries.push(binary);
       }
     }

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;
 }

lib/driver.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-
 import type {
   DriverCaps,
   DriverOpts,
@@ -10,11 +8,11 @@ import type {
   W3CDriverCaps,
 } from '@appium/types';
 import _ from 'lodash';
-import ADB from 'appium-adb';
+import {ADB} from 'appium-adb';
 import type {LogcatListener} from 'appium-adb';
 import type {default as AppiumChromedriver} from 'appium-chromedriver';
 import {BaseDriver} from 'appium/driver';
-import ANDROID_DRIVER_CONSTRAINTS, {AndroidDriverConstraints} from './constraints';
+import {ANDROID_DRIVER_CONSTRAINTS, AndroidDriverConstraints} from './constraints';
 import {newMethodMap} from './method-map';
 import {SettingsApp} from 'io.appium.settings';
 import {parseArray, removeAllSessionWebSocketHandlers} from './utils';

lib/utils.js

@@ -31,7 +31,7 @@ export function parseArray(cap) {
   try {
     // @ts-ignore this is fine
     parsedCaps = JSON.parse(cap);
-  } catch (ign) {}
+  } catch {}
 
   if (_.isArray(parsedCaps)) {
     return parsedCaps;

package.json

@@ -68,7 +68,7 @@
     "ws": "^8.0.0"
   },
   "devDependencies": {
-    "@appium/eslint-config-appium-ts": "^0.x",
+    "@appium/eslint-config-appium-ts": "^1.0.0",
     "@appium/test-support": "^3.0.20",
     "@appium/tsconfig": "^0.x",
     "@appium/types": "^0.x",

test/unit/commands/app-management-specs.js

@@ -2,7 +2,7 @@ import sinon from 'sinon';
 import {AndroidDriver} from '../../../lib/driver';
 import {fs} from '@appium/support';
 import B from 'bluebird';
-import ADB from 'appium-adb';
+import {ADB} from 'appium-adb';
 import { errors } from 'appium/driver';
 
 /** @type {AndroidDriver} */
@@ -163,7 +163,6 @@ describe('App Management', function () {
       driver.adb.activateApp.notCalled.should.be.true;
     });
     it('should bring app to background and back if waiting for other pkg / activity', async function () {
-      //eslint-disable-line
       const appPackage = 'somepkg';
       const appActivity = 'someacv';
       const appWaitPackage = 'somewaitpkg';

test/unit/commands/context-specs.js

@@ -8,7 +8,7 @@ import {
   setupNewChromedriver,
 } from '../../../lib/commands/context/helpers';
 import {AndroidDriver} from '../../../lib/driver';
-import Chromedriver from 'appium-chromedriver';
+import {Chromedriver} from 'appium-chromedriver';
 import {errors} from 'appium/driver';
 
 /** @type {AndroidDriver} */

test/unit/commands/device-specs.js

@@ -1,5 +1,5 @@
 import sinon from 'sinon';
-import ADB from 'appium-adb';
+import {ADB} from 'appium-adb';
 import _ from 'lodash';
 import {AndroidDriver} from '../../../lib/driver';
 import {prepareAvdArgs, prepareEmulator} from '../../../lib/commands/device/utils';

test/unit/commands/file-actions-specs.js

@@ -1,7 +1,7 @@
 import sinon from 'sinon';
 import {AndroidDriver} from '../../../lib/driver';
 import * as support from '@appium/support';
-import ADB from 'appium-adb';
+import {ADB} from 'appium-adb';
 
 /** @type {AndroidDriver} */
 let driver;

test/unit/commands/geolocation-specs.js

@@ -1,5 +1,5 @@
 import sinon from 'sinon';
-import ADB from 'appium-adb';
+import {ADB} from 'appium-adb';
 import { AndroidDriver } from '../../../lib/driver';
 import { setMockLocationApp } from '../../../lib/commands/geolocation';
 

test/unit/commands/ime-specs.js

@@ -1,6 +1,6 @@
 import sinon from 'sinon';
 import {AndroidDriver} from '../../../lib/driver';
-import ADB from 'appium-adb';
+import {ADB} from 'appium-adb';
 import {errors} from 'appium/driver';
 
 describe('IME', function () {

test/unit/commands/keyboard-specs.js

@@ -1,6 +1,6 @@
 import sinon from 'sinon';
 import {AndroidDriver} from '../../../lib/driver';
-import ADB from 'appium-adb';
+import {ADB} from 'appium-adb';
 
 /** @type {AndroidDriver} */
 let driver;

test/unit/commands/lock-specs.js

@@ -1,5 +1,5 @@
 import sinon from 'sinon';
-import ADB from 'appium-adb';
+import {ADB} from 'appium-adb';
 import { AndroidDriver } from '../../../lib/driver';
 import {
   validateUnlockCapabilities,

test/unit/commands/log-specs.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import sinon from 'sinon';
-import ADB from 'appium-adb';
+import {ADB} from 'appium-adb';
 import os from 'os';
 import {AndroidDriver} from '../../../lib/driver';
 

test/unit/commands/misc-specs.js

@@ -1,6 +1,6 @@
 import sinon from 'sinon';
 import {AndroidDriver} from '../../../lib/driver';
-import ADB from 'appium-adb';
+import {ADB} from 'appium-adb';
 
 /** @type {AndroidDriver} */
 let driver;

test/unit/commands/network-specs.js

@@ -1,5 +1,5 @@
 import sinon from 'sinon';
-import ADB from 'appium-adb';
+import {ADB} from 'appium-adb';
 import {AndroidDriver} from '../../../lib/driver';
 import B from 'bluebird';
 import { SettingsApp } from 'io.appium.settings';