appium-remote-debugger 12.1.3 → 12.1.5

package/lib/atoms.js

@@ -28,7 +28,7 @@ async function getAtom (atomName) {
     const atomFileName = path.resolve(getModuleRoot(), 'atoms', `${atomName}.js`);
     try {
       ATOMS_CACHE[atomName] = await fs.readFile(atomFileName);
-    } catch (e) {
+    } catch {
       throw new Error(`Unable to load Atom '${atomName}' from file '${atomFileName}'`);
     }
   }

package/lib/mixins/connect.js

@@ -3,7 +3,7 @@ import {
   WEB_CONTENT_BUNDLE_ID,
   appIdsForBundle,
 } from '../utils';
-import events from './events';
+import { events } from './events';
 import { timing, util } from '@appium/support';
 import { retryInterval, waitForCondition } from 'asyncbox';
 import _ from 'lodash';
@@ -85,7 +85,7 @@ export async function connect (timeout = APP_CONNECT_TIMEOUT_MS) {
           `Retrieved ${util.pluralize('application', _.size(getAppDict(this)), true)} ` +
           `within ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`
         );
-      } catch (err) {
+      } catch {
         this.log.debug(`Timed out waiting for applications to be reported`);
       }
     }

package/lib/mixins/execute.js

@@ -122,7 +122,7 @@ export async function executeAtomAsync (atom, args = [], frames = []) {
       await this.executeAtom(
         'execute_script', [`delete window.${promiseName};`, [null, null], subcommandTimeout], frames
       );
-    } catch (ign) {}
+    } catch {}
   }
   return convertResult(res);
 }

package/lib/mixins/message-handlers.js

@@ -1,4 +1,4 @@
-import events from './events';
+import { events } from './events';
 import {
   pageArrayFromDict,
   appInfoFromDict,
@@ -27,7 +27,6 @@ import {
  * @param {Record<string, any>} pageDict
  * @returns {Promise<void>}
  */
-// eslint-disable-next-line require-await
 export async function onPageChange (err, appIdKey, pageDict) {
   if (_.isEmpty(pageDict)) {
     return;
@@ -69,7 +68,6 @@ export async function onPageChange (err, appIdKey, pageDict) {
  * @param {Record<string, any>} dict
  * @returns {Promise<void>}
  */
-// eslint-disable-next-line require-await
 export async function onAppConnect (err, dict) {
   const appIdKey = dict.WIRApplicationIdentifierKey;
   this.log.debug(`Notified that new application '${appIdKey}' has connected`);
@@ -110,7 +108,6 @@ export function onAppDisconnect (err, dict) {
  * @param {Record<string, any>} dict
  * @returns {Promise<void>}
  */
-// eslint-disable-next-line require-await
 export async function onAppUpdate (err, dict) {
   this.log.debug(`Notified that an application has been updated`);
   updateAppsWithDict.bind(this)(dict);
@@ -146,7 +143,6 @@ export function onCurrentState (err, state) {
  * @param {Record<string, any>} apps
  * @returns {Promise<void>}
  */
-// eslint-disable-next-line require-await
 export async function onConnectedApplicationList (err, apps) {
   this.log.debug(`Received connected applications list: ${_.keys(apps).join(', ')}`);
 

package/lib/mixins/misc.js

@@ -1,5 +1,5 @@
 import { checkParams } from '../utils';
-import B from 'bluebird';
+import B, { TimeoutError as BTimeoutError } from 'bluebird';
 import {
   getAppIdKey,
   getPageIdKey,
@@ -72,7 +72,7 @@ export async function garbageCollect (timeoutMs = GARBAGE_COLLECT_TIMEOUT_MS) {
       appIdKey: getAppIdKey(this),
       pageIdKey: getPageIdKey(this),
     });
-  } catch (err) {
+  } catch {
     this.log.debug(`Unable to collect garbage at this time`);
     return;
   }
@@ -86,7 +86,7 @@ export async function garbageCollect (timeoutMs = GARBAGE_COLLECT_TIMEOUT_MS) {
     ).timeout(timeoutMs);
     this.log.debug(`Garbage collection successful`);
   } catch (e) {
-    if (e instanceof B.TimeoutError) {
+    if (e instanceof BTimeoutError) {
       this.log.debug(`Garbage collection timed out after ${timeoutMs}ms`);
     } else {
       this.log.debug(`Unable to collect garbage: ${e.message}`);

package/lib/mixins/navigate.js

@@ -1,8 +1,8 @@
 import { checkParams, pageArrayFromDict } from '../utils';
-import events from './events';
+import { events } from './events';
 import { timing, util } from '@appium/support';
 import _ from 'lodash';
-import B from 'bluebird';
+import B, { TimeoutError as BTimeoutError } from 'bluebird';
 import { errors } from '@appium/base-driver';
 import { rpcConstants } from '../rpc';
 import {
@@ -128,7 +128,7 @@ export async function waitForDom (startPageLoadTimer) {
   const cancellationPromise = B.resolve((async () => {
     try {
       await getPageLoadDelay(this);
-    } catch (ign) {}
+    } catch {}
   })());
 
   try {
@@ -159,7 +159,7 @@ export async function checkPageIsReady (timeoutMs) {
       `The pageLoadStrategy is '${getPageLoadStartegy(this) ?? PAGE_LOAD_STRATEGY.NORMAL}'`);
     return this.isPageLoadingCompleted(readyState);
   } catch (err) {
-    if (!(err instanceof B.TimeoutError)) {
+    if (!(err instanceof BTimeoutError)) {
       throw err;
     }
     this.log.debug(`Page readiness check timed out after ${actualTimeoutMs}ms`);
@@ -180,7 +180,7 @@ export async function navToUrl (url) {
 
   try {
     new URL(url);
-  } catch (e) {
+  } catch {
     throw new TypeError(`'${url}' is not a valid URL`);
   }
 
@@ -213,7 +213,7 @@ export async function navToUrl (url) {
           if (isReady && isPageLoading && onPageLoaded) {
             return onPageLoaded();
           }
-        } catch (ign) {}
+        } catch {}
         const msLeft = PAGE_READINESS_JS_MIN_CHECK_INTERVAL_MS - pageReadyCheckStart.getDuration().asMilliSeconds;
         if (msLeft > 0 && isPageLoading) {
           await B.delay(msLeft);
@@ -299,7 +299,7 @@ export async function navToUrl (url) {
   const cancellationPromise = B.resolve((async () => {
     try {
       await getPageLoadDelay(this);
-    } catch (ign) {}
+    } catch {}
   })());
 
   try {
@@ -332,7 +332,7 @@ export async function navToUrl (url) {
       pageIdKey: getPageIdKey(this),
     }, didPageFinishLoad)).timeout(CONSOLE_ENABLEMENT_TIMEOUT_MS);
   } catch (err) {
-    if (err instanceof B.TimeoutError) {
+    if (err instanceof BTimeoutError) {
       throw new errors.TimeoutError(`Could not enable console events after the page load within ` +
         `${CONSOLE_ENABLEMENT_TIMEOUT_MS}ms. The Web Inspector/Safari may need to be restarted.`);
     }

package/lib/remote-debugger-real-device.ts

@@ -1,4 +1,4 @@
-import RemoteDebugger from './remote-debugger';
+import { RemoteDebugger } from './remote-debugger';
 import { RpcClientRealDevice } from './rpc';
 import type { RemoteDebuggerRealDeviceOptions } from './types';
 

package/lib/rpc/index.js

@@ -1,5 +1,5 @@
-import RpcClientSimulator from './rpc-client-simulator';
-import RpcClientRealDevice from './rpc-client-real-device';
+import { RpcClientSimulator } from './rpc-client-simulator';
+import { RpcClientRealDevice } from './rpc-client-real-device';
 import * as rpcConstants from './constants';
 
 

package/lib/rpc/remote-messages.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import getProtocolCommand from '../protocol';
+import { getProtocolCommand } from '../protocol';
 
 
 const OBJECT_GROUP = 'console';

package/lib/rpc/rpc-client-real-device.js

@@ -1,5 +1,5 @@
 import log from '../logger';
-import RpcClient from './rpc-client';
+import { RpcClient } from './rpc-client';
 import { services } from 'appium-ios-device';
 
 
@@ -47,7 +47,7 @@ export class RpcClientRealDevice extends RpcClient {
   /**
    * @override
    */
-  async sendMessage (cmd) { // eslint-disable-line require-await
+  async sendMessage (cmd) {
     this.service.sendMessage(cmd);
   }
 

package/lib/rpc/rpc-client-simulator.js

@@ -2,7 +2,7 @@ import log from '../logger';
 import _ from 'lodash';
 import B from 'bluebird';
 import net from 'net';
-import RpcClient from './rpc-client';
+import { RpcClient } from './rpc-client';
 import { services } from 'appium-ios-device';
 
 export class RpcClientSimulator extends RpcClient {
@@ -170,7 +170,7 @@ export class RpcClientSimulator extends RpcClient {
       try {
         // @ts-ignore socket must be defined
         this.socket.removeListener('error', onSocketError);
-      } catch (ign) {}
+      } catch {}
     });
   }
 

package/lib/rpc/rpc-client.js

@@ -1,4 +1,4 @@
-import RemoteMessages from './remote-messages';
+import { RemoteMessages } from './remote-messages';
 import { waitForCondition } from 'asyncbox';
 import log from '../logger';
 import _ from 'lodash';
@@ -435,11 +435,11 @@ export class RpcClient {
     });
   }
 
-  async connect () { // eslint-disable-line require-await
+  async connect () {
     throw new Error(`Sub-classes need to implement a 'connect' function`);
   }
 
-  async disconnect () { // eslint-disable-line require-await
+  async disconnect () {
     this.messageHandler?.removeAllListeners();
   }
 
@@ -448,7 +448,7 @@ export class RpcClient {
    * @returns {Promise<void>}
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async sendMessage (command) { // eslint-disable-line require-await
+  async sendMessage (command) {
     throw new Error(`Sub-classes need to implement a 'sendMessage' function`);
   }
 
@@ -457,7 +457,7 @@ export class RpcClient {
    * @returns {Promise<void>}
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async receive (data) { // eslint-disable-line require-await
+  async receive (data) {
     throw new Error(`Sub-classes need to implement a 'receive' function`);
   }
 

package/lib/rpc/rpc-message-handler.js

@@ -82,7 +82,7 @@ export default class RpcMessageHandler extends EventEmitters {
     }
   }
 
-  async dispatchDataMessage (msgId, method, params, result, error) { // eslint-disable-line require-await
+  async dispatchDataMessage (msgId, method, params, result, error) {
     if (!_.isEmpty(msgId)) {
       log.debug(`Handling message (id: '${msgId}')`);
     }

package/lib/utils.js

@@ -140,7 +140,7 @@ export function deferredPromise () {
   let resolve;
   /** @type {(err?: Error) => void} */
   let reject;
-  const promise = new B((res, rej) => { // eslint-disable-line promise/param-names
+  const promise = new B((res, rej) => {
     resolve = res;
     reject = rej;
   });
@@ -164,7 +164,7 @@ export function convertResult (res) {
   } else if (_.isString(res)) {
     try {
       res = JSON.parse(res);
-    } catch (err) {
+    } catch {
       // we might get a serialized object, but we might not
       // if we get here, it is just a value
     }

package/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "appium"
   ],
-  "version": "12.1.3",
+  "version": "12.1.5",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -34,7 +34,7 @@
   ],
   "dependencies": {
     "@appium/base-driver": "^9.0.0",
-    "@appium/support": "^5.0.3",
+    "@appium/support": "^6.0.0",
     "appium-ios-device": "^2.0.0",
     "asyncbox": "^3.0.0",
     "bluebird": "^3.4.7",
@@ -64,7 +64,7 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@appium/eslint-config-appium-ts": "^0.x",
+    "@appium/eslint-config-appium-ts": "^1.x",
     "@appium/tsconfig": "^0.x",
     "@appium/types": "^0.x",
     "@semantic-release/changelog": "^6.0.1",

package/scripts/common.js

@@ -27,7 +27,7 @@ const LAST_UPDATE_FILE = path.resolve(ATOMS_DIRECTORY, 'lastupdate');
 async function rmDir (dir) {
   try {
     await fs.promises.access(dir, fs.constants.R_OK);
-  } catch (e) {
+  } catch {
     return;
   }