address review comments

Author: navin772

src/index.ts

@@ -71,6 +71,7 @@ export type {
   ProcessControlService,
   ProcessLaunchOptions,
   OutputReceivedEvent,
+  SendMessageOptions,
   TestmanagerdService,
   TestmanagerdServiceWithConnection,
 } from './lib/types.js';

src/lib/types.ts

@@ -1756,6 +1756,16 @@ export interface InstallationProxyServiceWithConnection {
   remoteXPC: RemoteXpcConnection;
 }
 
+/**
+ * Options for sending a DTX message
+ */
+export interface SendMessageOptions {
+  /** Optional message arguments */
+  args?: any | null;
+  /** Whether a reply is expected (default: true) */
+  expectsReply?: boolean;
+}
+
 /**
  * Testmanagerd DTX service interface for XCTest session management
  */
@@ -1776,14 +1786,12 @@ export interface TestmanagerdService extends BaseService {
    * Send a DTX message on a channel
    * @param channel The channel code
    * @param selector The ObjectiveC method selector
-   * @param args Optional message arguments
-   * @param expectsReply Whether a reply is expected
+   * @param options Optional message options
    */
   sendMessage(
     channel: number,
     selector: string | null,
-    args?: any | null,
-    expectsReply?: boolean,
+    options?: SendMessageOptions,
   ): Promise<void>;
 
   /**

src/services/ios/base-service.ts

@@ -1,3 +1,5 @@
+import type net from 'node:net';
+
 import { getLogger } from '../../lib/logger.js';
 import { ServiceConnection } from '../../service-connection.js';
 
@@ -75,15 +77,15 @@ export class BaseService {
       throw error;
     }
   }
+}
 
-  /**
-   * Remove any SSL wrapper from the socket so raw binary protocols (DTX)
-   * can read/write directly. Both DVT and testmanagerd services require this.
-   */
-  protected stripSSL(socket: import('net').Socket): void {
-    if ('_sslobj' in socket) {
-      (socket as any)._sslobj = null;
-    }
+/**
+ * Remove any SSL wrapper from the socket so raw binary protocols (DTX)
+ * can read/write directly. Both DVT and testmanagerd services require this.
+ */
+export function stripSSL(socket: net.Socket): void {
+  if ('_sslobj' in socket) {
+    (socket as any)._sslobj = null;
   }
 }
 

src/services/ios/dvt/channel.ts

@@ -1,3 +1,4 @@
+import type { SendMessageOptions } from '../../../lib/types.js';
 import type { MessageAux } from './dtx-message.js';
 
 /**
@@ -9,8 +10,7 @@ export interface DTXServiceProvider {
   sendMessage(
     channel: number,
     selector: string | null,
-    args?: MessageAux | null,
-    expectsReply?: boolean,
+    options?: SendMessageOptions,
   ): Promise<void>;
 }
 
@@ -65,12 +65,10 @@ export class Channel {
   call(methodName: string): ChannelMethodCall {
     const selector = this.convertToSelector(methodName);
     return (async (args, expectsReply = true) => {
-      await this.service.sendMessage(
-        this.channelCode,
-        selector,
+      await this.service.sendMessage(this.channelCode, selector, {
         args,
         expectsReply,
-      );
+      });
     }) as ChannelMethodCall;
   }
 

src/services/ios/dvt/index.ts

@@ -1,14 +1,17 @@
-import net from 'node:net';
+import type net from 'node:net';
 
 import { getLogger } from '../../../lib/logger.js';
 import {
   PlistUID,
   createBinaryPlist,
   parseBinaryPlist,
 } from '../../../lib/plist/index.js';
-import type { PlistDictionary } from '../../../lib/types.js';
+import type {
+  PlistDictionary,
+  SendMessageOptions,
+} from '../../../lib/types.js';
 import { ServiceConnection } from '../../../service-connection.js';
-import { BaseService, type Service } from '../base-service.js';
+import { BaseService, type Service, stripSSL } from '../base-service.js';
 import { ChannelFragmenter } from './channel-fragmenter.js';
 import { Channel } from './channel.js';
 import { DTXMessage, DTX_CONSTANTS, MessageAux } from './dtx-message.js';
@@ -68,7 +71,7 @@ export class DVTSecureSocketProxyService extends BaseService {
     // DVT uses DTX binary protocol, connect without plist-based RSDCheckin
     this.connection = await this.startLockdownWithoutCheckin(service);
     this.socket = this.connection.getSocket();
-    this.stripSSL(this.socket);
+    stripSSL(this.socket);
 
     await this.performHandshake();
   }
@@ -101,7 +104,7 @@ export class DVTSecureSocketProxyService extends BaseService {
     args.appendInt(channelCode);
     args.appendObj(identifier);
 
-    await this.sendMessage(0, '_requestChannelWithCode:identifier:', args);
+    await this.sendMessage(0, '_requestChannelWithCode:identifier:', { args });
 
     const [ret] = await this.recvPlist();
 
@@ -119,15 +122,14 @@ export class DVTSecureSocketProxyService extends BaseService {
    * Send a DTX message on a channel
    * @param channel The channel code
    * @param selector The ObjectiveC method selector
-   * @param args Optional message arguments
-   * @param expectsReply Whether a reply is expected
+   * @param options Optional message options
    */
   async sendMessage(
     channel: number,
     selector: string | null = null,
-    args: MessageAux | null = null,
-    expectsReply: boolean = true,
+    options: SendMessageOptions = {},
   ): Promise<void> {
+    const { args = null, expectsReply = true } = options;
     if (!this.socket) {
       throw new Error('Not connected to DVT service');
     }
@@ -269,8 +271,7 @@ export class DVTSecureSocketProxyService extends BaseService {
         await this.sendMessage(
           DVTSecureSocketProxyService.BROADCAST_CHANNEL,
           '_channelCanceled:',
-          args,
-          false,
+          { args, expectsReply: false },
         );
       } catch (error) {
         log.debug('Error sending channel canceled message:', error);
@@ -298,7 +299,10 @@ export class DVTSecureSocketProxyService extends BaseService {
       'com.apple.private.DTXBlockCompression': 0,
       'com.apple.private.DTXConnection': 1,
     });
-    await this.sendMessage(0, '_notifyOfPublishedCapabilities:', args, false);
+    await this.sendMessage(0, '_notifyOfPublishedCapabilities:', {
+      args,
+      expectsReply: false,
+    });
 
     const [retData, aux] = await this.recvMessage();
     const ret = retData ? parseBinaryPlist(retData) : null;

src/services/ios/testmanagerd/index.ts

@@ -1,13 +1,16 @@
-import net from 'node:net';
+import type net from 'node:net';
 
 import { getLogger } from '../../../lib/logger.js';
 import {
   createBinaryPlist,
   parseBinaryPlist,
 } from '../../../lib/plist/index.js';
-import type { PlistDictionary } from '../../../lib/types.js';
+import type {
+  PlistDictionary,
+  SendMessageOptions,
+} from '../../../lib/types.js';
 import { ServiceConnection } from '../../../service-connection.js';
-import { BaseService, type Service } from '../base-service.js';
+import { BaseService, type Service, stripSSL } from '../base-service.js';
 import { ChannelFragmenter } from '../dvt/channel-fragmenter.js';
 import { Channel } from '../dvt/channel.js';
 import { DTXMessage, DTX_CONSTANTS, MessageAux } from '../dvt/dtx-message.js';
@@ -153,7 +156,7 @@ export class DvtTestmanagedProxyService extends BaseService {
     // testmanagerd uses DTX binary protocol, connect without plist-based RSDCheckin
     this.connection = await this.startLockdownWithoutCheckin(service);
     this.socket = this.connection.getSocket();
-    this.stripSSL(this.socket);
+    stripSSL(this.socket);
 
     await this.performHandshake();
   }
@@ -186,7 +189,7 @@ export class DvtTestmanagedProxyService extends BaseService {
     args.appendInt(channelCode);
     args.appendObj(identifier);
 
-    await this.sendMessage(0, '_requestChannelWithCode:identifier:', args);
+    await this.sendMessage(0, '_requestChannelWithCode:identifier:', { args });
 
     const [ret] = await this.recvPlist();
 
@@ -204,15 +207,14 @@ export class DvtTestmanagedProxyService extends BaseService {
    * Send a DTX message on a channel
    * @param channel The channel code
    * @param selector The ObjectiveC method selector
-   * @param args Optional message arguments
-   * @param expectsReply Whether a reply is expected
+   * @param options Optional message options
    */
   async sendMessage(
     channel: number,
     selector: string | null = null,
-    args: MessageAux | null = null,
-    expectsReply: boolean = true,
+    options: SendMessageOptions = {},
   ): Promise<void> {
+    const { args = null, expectsReply = true } = options;
     if (!this.socket) {
       throw new Error('Not connected to testmanagerd service');
     }
@@ -451,8 +453,7 @@ export class DvtTestmanagedProxyService extends BaseService {
           await this.sendMessage(
             DvtTestmanagedProxyService.BROADCAST_CHANNEL,
             '_channelCanceled:',
-            args,
-            false,
+            { args, expectsReply: false },
           );
         } catch (error) {
           if (this.isExpectedCloseError(error)) {
@@ -485,7 +486,10 @@ export class DvtTestmanagedProxyService extends BaseService {
       'com.apple.private.DTXBlockCompression': 0,
       'com.apple.private.DTXConnection': 1,
     });
-    await this.sendMessage(0, '_notifyOfPublishedCapabilities:', args, false);
+    await this.sendMessage(0, '_notifyOfPublishedCapabilities:', {
+      args,
+      expectsReply: false,
+    });
 
     const [retData, aux] = await this.recvMessage();
     const ret = retData ? parseBinaryPlist(retData) : null;

test/integration/testmanagerd-test.ts

@@ -18,13 +18,9 @@ const TESTMANAGERD_CHANNEL =
 async function safeClose(
   ...closeables: Array<{ close(): Promise<void> } | null | undefined>
 ): Promise<void> {
-  for (const c of closeables) {
-    try {
-      await c?.close();
-    } catch {
-      // Ignore close errors during cleanup
-    }
-  }
+  await Promise.allSettled(
+    closeables.map((c) => c?.close() ?? Promise.resolve()),
+  );
 }
 
 /**
@@ -99,7 +95,7 @@ describe('Testmanagerd Service', function () {
       await controlConnection!.testmanagerdService.sendMessage(
         channelCode,
         '_IDE_initiateControlSessionWithProtocolVersion:',
-        args,
+        { args },
       );
 
       const [result] =