appium-remote-debugger 15.7.2 → 15.8.0

package/lib/rpc/remote-messages.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import {getProtocolCommand} from '../protocol';
 import type {
   RawRemoteCommand,
@@ -15,6 +14,12 @@ const MINIMAL_COMMAND = 'getMinimalCommand';
 const FULL_COMMAND = 'getFullCommand';
 const DIRECT_COMMAND = 'getDirectCommand';
 
+function omitNilValues<T extends Record<string, any>>(obj: T): Partial<T> {
+  return Object.fromEntries(
+    Object.entries(obj).filter(([, value]) => value !== null && value !== undefined),
+  ) as Partial<T>;
+}
+
 // mapping of commands to the function for getting the command
 // defaults to `getMinimalCommand`, so no need to have those listed here
 const COMMANDS = {
@@ -117,7 +122,7 @@ export class RemoteMessages {
     return {
       __argument: {
         WIRApplicationIdentifierKey: appIdKey,
-        WIRIndicateEnabledKey: _.isNil(enabled) ? true : enabled,
+        WIRIndicateEnabledKey: enabled == null ? true : enabled,
         WIRConnectionIdentifierKey: connId,
         WIRPageIdentifierKey: pageIdKey,
       },
@@ -191,7 +196,7 @@ export class RemoteMessages {
       },
       __selector: '_rpc_forwardSocketData:',
     };
-    return _.omitBy(plist, _.isNil) as RawRemoteCommand;
+    return omitNilValues(plist) as RawRemoteCommand;
   }
 
   /**
@@ -227,7 +232,7 @@ export class RemoteMessages {
       },
       __selector: '_rpc_forwardSocketData:',
     };
-    return _.omitBy(plist, _.isNil) as RawRemoteCommand;
+    return omitNilValues(plist) as RawRemoteCommand;
   }
 
   /**
@@ -254,7 +259,7 @@ export class RemoteMessages {
       },
       __selector: '_rpc_forwardSocketData:',
     };
-    return _.omitBy(plist, _.isNil) as RawRemoteCommand;
+    return omitNilValues(plist) as RawRemoteCommand;
   }
 
   /**

package/lib/rpc/rpc-client-real-device-shim.ts

@@ -1,9 +1,9 @@
 import {log} from '../logger';
+import {isPlainObject} from '../utils';
 import {RpcClient} from './rpc-client';
 import type {RemoteCommand, RpcClientOptions} from '../types';
 import type {StringRecord} from '@appium/types';
 import type {WebInspectorService, RemoteXpcConnection} from 'appium-ios-remotexpc';
-import _ from 'lodash';
 
 /**
  * Options specific to RpcClientRealDeviceShim.
@@ -190,7 +190,7 @@ export class RpcClientRealDeviceShim extends RpcClient {
     };
 
     // Convert buffer data to strings where necessary
-    if (_.isPlainObject(message.__argument)) {
+    if (isPlainObject(message.__argument)) {
       const args = {...message.__argument};
 
       // Handle WIRMessageDataKey and WIRSocketDataKey which may be buffers
@@ -213,7 +213,7 @@ export class RpcClientRealDeviceShim extends RpcClient {
    * @returns The translated arguments for the shim service.
    */
   private translateArguments(args: any): StringRecord {
-    if (!_.isPlainObject(args)) {
+    if (!isPlainObject(args)) {
       return {};
     }
 

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

@@ -1,6 +1,4 @@
 import {log} from '../logger';
-import _ from 'lodash';
-import B from 'bluebird';
 import net from 'node:net';
 import {RpcClient} from './rpc-client';
 import {services} from 'appium-ios-device';
@@ -110,7 +108,7 @@ export class RpcClientSimulator extends RpcClient {
     this.service.listenMessage(this.receive.bind(this));
 
     // connect the socket
-    return await new B<void>((resolve, reject) => {
+    return await new Promise<void>((resolve, reject) => {
       // only resolve this function when we are actually connected
       if (!this.socket) {
         return reject(new Error('RPC socket is not connected. Please contact developers'));
@@ -157,7 +155,7 @@ export class RpcClientSimulator extends RpcClient {
   override async sendMessage(cmd: RemoteCommand): Promise<void> {
     let onSocketError: ((err: Error) => void) | undefined;
 
-    return await new B<void>((resolve, reject) => {
+    return await new Promise<void>((resolve, reject) => {
       // handle socket problems
       onSocketError = (err: Error) => {
         log.error(`Socket error: ${err.message}`);
@@ -196,7 +194,7 @@ export class RpcClientSimulator extends RpcClient {
     }
 
     for (const key of ['WIRMessageDataKey', 'WIRDestinationKey', 'WIRSocketDataKey']) {
-      if (!_.isUndefined(data[key])) {
+      if (data[key] !== undefined) {
         data[key] = data[key].toString('utf8');
       }
     }