appium-ios-remotexpc 2.1.1 → 2.1.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [2.1.2](https://github.com/appium/appium-ios-remotexpc/compare/v2.1.1...v2.1.2) (2026-05-23)
+
+### Code Refactoring
+
+* improve IORegistry query handling in DiagnosticService ([#222](https://github.com/appium/appium-ios-remotexpc/issues/222)) ([79a8b2c](https://github.com/appium/appium-ios-remotexpc/commit/79a8b2c265338cf897ab8e563c6697f2a0b2b324))
+
 ## [2.1.1](https://github.com/appium/appium-ios-remotexpc/compare/v2.1.0...v2.1.1) (2026-05-23)
 
 ### Bug Fixes

package/build/src/services/ios/diagnostic-service/index.d.ts

@@ -40,7 +40,18 @@ declare class DiagnosticsService extends BaseService implements DiagnosticsServi
     private connectToDiagnosticService;
     private sendRequest;
     private processIORegistryResponse;
-    private handleMultipartIORegistryResponse;
+    /**
+     * Sends an IORegistry request and returns the diagnostics response.
+     * The shim's StartService greeting is drained in connectToDiagnosticService,
+     * so this is a plain single send/recv — matches pymobiledevice3.
+     */
+    private queryIORegistry;
+    /**
+     * Extracts the IORegistry payload from a diagnostics response.
+     * @returns the IORegistry object, or null when the query matched no entry
+     * (the device replies { Status: 'Success' } with no Diagnostics)
+     */
+    private extractIORegistry;
 }
 export default DiagnosticsService;
 //# sourceMappingURL=index.d.ts.map

package/build/src/services/ios/diagnostic-service/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/services/ios/diagnostic-service/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,kBAAkB,IAAI,2BAA2B,EACjD,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIjD;;;;;GAKG;AACH,cAAM,kBACJ,SAAQ,WACR,YAAW,2BAA2B;IAEtC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,oDACmB;gBAEvC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IAazC;;;OAGG;IACG,QAAQ,IAAI,OAAO,CAAC,eAAe,CAAC;IAa1C;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAavC;;;;OAIG;IACG,UAAU,CAAC,OAAO,CAAC,EAAE;QACzB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,eAAe,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IA4CpD,OAAO,CAAC,gBAAgB;YAOV,0BAA0B;YAK1B,WAAW;IAoBzB,OAAO,CAAC,yBAAyB;YA0CnB,iCAAiC;CA6BhD;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/services/ios/diagnostic-service/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,kBAAkB,IAAI,2BAA2B,EACjD,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIjD;;;;;GAKG;AACH,cAAM,kBACJ,SAAQ,WACR,YAAW,2BAA2B;IAEtC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,oDACmB;gBAEvC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IAazC;;;OAGG;IACG,QAAQ,IAAI,OAAO,CAAC,eAAe,CAAC;IAa1C;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAavC;;;;OAIG;IACG,UAAU,CAAC,OAAO,CAAC,EAAE;QACzB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,eAAe,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAsCpD,OAAO,CAAC,gBAAgB;YAOV,0BAA0B;YAW1B,WAAW;IAoBzB,OAAO,CAAC,yBAAyB;IA0CjC;;;;OAIG;YACW,eAAe;IAkB7B;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;CAU1B;AAED,eAAe,kBAAkB,CAAC"}

package/build/src/services/ios/diagnostic-service/index.js

@@ -1,3 +1,4 @@
+import { util } from '@appium/support';
 import { getLogger } from '../../../lib/logger.js';
 import { PlistServiceDecoder } from '../../../lib/plist/plist-decoder.js';
 import { BaseService } from '../base-service.js';
@@ -84,10 +85,11 @@ class DiagnosticsService extends BaseService {
             const timeout = options?.timeout || 3000;
             log.debug('Sending IORegistry request...');
             const conn = await this.connectToDiagnosticService();
-            const response = await conn.sendPlistRequest(request, timeout);
-            log.debug(`IORegistry response size: ${JSON.stringify(response).length} bytes`);
+            const response = await this.queryIORegistry(conn, request, timeout);
             if (options?.returnRawJson) {
-                return await this.handleMultipartIORegistryResponse(conn, response, timeout);
+                // The query matched no entry when the device replies with a bare
+                // { Status: 'Success' } and no Diagnostics — surface an empty object.
+                return this.extractIORegistry(response) ?? {};
             }
             return this.processIORegistryResponse(response);
         }
@@ -103,8 +105,12 @@ class DiagnosticsService extends BaseService {
         };
     }
     async connectToDiagnosticService() {
-        const service = this.getServiceConfig();
-        return await this.startLockdownService(service);
+        const connection = await this.startLockdownService(this.getServiceConfig());
+        const startServiceResponse = await connection.receive();
+        if (startServiceResponse?.Request !== 'StartService') {
+            throw new Error(`Expected StartService response, got: ${JSON.stringify(startServiceResponse)}`);
+        }
+        return connection;
     }
     async sendRequest(request, timeout) {
         const conn = await this.connectToDiagnosticService();
@@ -147,22 +153,34 @@ class DiagnosticsService extends BaseService {
         }
         return [{ value: response }];
     }
-    async handleMultipartIORegistryResponse(conn, initialResponse, timeout) {
-        await new Promise((resolve) => setTimeout(resolve, 500));
-        const emptyRequest = {
-            Request: 'Status',
-        };
-        log.debug('Sending follow-up request for additional data');
-        const additionalResponse = await conn.sendPlistRequest(emptyRequest, timeout);
-        const hasDiagnostics = 'Diagnostics' in additionalResponse &&
-            typeof additionalResponse.Diagnostics === 'object' &&
-            additionalResponse.Diagnostics !== null &&
-            'IORegistry' in additionalResponse.Diagnostics;
-        if (additionalResponse.Status !== 'Success' && hasDiagnostics) {
-            throw new Error(`Error getting diagnostic data: ${additionalResponse}`);
-        }
-        log.debug('Using additional response with IORegistry data');
-        return additionalResponse.Diagnostics.IORegistry;
+    /**
+     * Sends an IORegistry request and returns the diagnostics response.
+     * The shim's StartService greeting is drained in connectToDiagnosticService,
+     * so this is a plain single send/recv — matches pymobiledevice3.
+     */
+    async queryIORegistry(conn, request, timeout) {
+        const response = await conn.sendPlistRequest(request, timeout);
+        if (util.isPlainObject(response) &&
+            'Status' in response &&
+            response.Status !== 'Success') {
+            throw new Error(`IORegistry query failed: ${JSON.stringify(response)}`);
+        }
+        return response;
+    }
+    /**
+     * Extracts the IORegistry payload from a diagnostics response.
+     * @returns the IORegistry object, or null when the query matched no entry
+     * (the device replies { Status: 'Success' } with no Diagnostics)
+     */
+    extractIORegistry(response) {
+        const diagnostics = response?.Diagnostics;
+        if (util.isPlainObject(diagnostics)) {
+            const ioRegistry = diagnostics.IORegistry;
+            if (util.isPlainObject(ioRegistry)) {
+                return ioRegistry;
+            }
+        }
+        return null;
     }
 }
 export default DiagnosticsService;

package/build/src/services/ios/diagnostic-service/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/services/ios/diagnostic-service/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/services/ios/diagnostic-service/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-ios-remotexpc",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
   "type": "module",

package/src/services/ios/diagnostic-service/index.ts

@@ -1,9 +1,12 @@
+import { util } from '@appium/support';
+
 import { getLogger } from '../../../lib/logger.js';
 import { PlistServiceDecoder } from '../../../lib/plist/plist-decoder.js';
 import type {
   DiagnosticsService as DiagnosticsServiceInterface,
   PlistDictionary,
 } from '../../../lib/types.js';
+import type { ServiceConnection } from '../../../service-connection.js';
 import { BaseService } from '../base-service.js';
 
 const log = getLogger('DiagnosticService');
@@ -110,18 +113,12 @@ class DiagnosticsService
       log.debug('Sending IORegistry request...');
 
       const conn = await this.connectToDiagnosticService();
-      const response = await conn.sendPlistRequest(request, timeout);
-
-      log.debug(
-        `IORegistry response size: ${JSON.stringify(response).length} bytes`,
-      );
+      const response = await this.queryIORegistry(conn, request, timeout);
 
       if (options?.returnRawJson) {
-        return await this.handleMultipartIORegistryResponse(
-          conn,
-          response,
-          timeout,
-        );
+        // The query matched no entry when the device replies with a bare
+        // { Status: 'Success' } and no Diagnostics — surface an empty object.
+        return this.extractIORegistry(response) ?? {};
       }
 
       return this.processIORegistryResponse(response);
@@ -138,9 +135,15 @@ class DiagnosticsService
     };
   }
 
-  private async connectToDiagnosticService() {
-    const service = this.getServiceConfig();
-    return await this.startLockdownService(service);
+  private async connectToDiagnosticService(): Promise<ServiceConnection> {
+    const connection = await this.startLockdownService(this.getServiceConfig());
+    const startServiceResponse = await connection.receive();
+    if (startServiceResponse?.Request !== 'StartService') {
+      throw new Error(
+        `Expected StartService response, got: ${JSON.stringify(startServiceResponse)}`,
+      );
+    }
+    return connection;
   }
 
   private async sendRequest(
@@ -205,34 +208,43 @@ class DiagnosticsService
     return [{ value: response } as PlistDictionary];
   }
 
-  private async handleMultipartIORegistryResponse(
-    conn: any,
-    initialResponse: any,
+  /**
+   * Sends an IORegistry request and returns the diagnostics response.
+   * The shim's StartService greeting is drained in connectToDiagnosticService,
+   * so this is a plain single send/recv — matches pymobiledevice3.
+   */
+  private async queryIORegistry(
+    conn: ServiceConnection,
+    request: PlistDictionary,
     timeout: number,
-  ): Promise<Record<string, any>> {
-    await new Promise((resolve) => setTimeout(resolve, 500));
-
-    const emptyRequest: PlistDictionary = {
-      Request: 'Status',
-    };
+  ): Promise<PlistDictionary> {
+    const response = await conn.sendPlistRequest(request, timeout);
 
-    log.debug('Sending follow-up request for additional data');
-
-    const additionalResponse = await conn.sendPlistRequest(
-      emptyRequest,
-      timeout,
-    );
-    const hasDiagnostics =
-      'Diagnostics' in additionalResponse &&
-      typeof additionalResponse.Diagnostics === 'object' &&
-      additionalResponse.Diagnostics !== null &&
-      'IORegistry' in additionalResponse.Diagnostics;
-    if (additionalResponse.Status !== 'Success' && hasDiagnostics) {
-      throw new Error(`Error getting diagnostic data: ${additionalResponse}`);
+    if (
+      util.isPlainObject(response) &&
+      'Status' in response &&
+      response.Status !== 'Success'
+    ) {
+      throw new Error(`IORegistry query failed: ${JSON.stringify(response)}`);
     }
 
-    log.debug('Using additional response with IORegistry data');
-    return additionalResponse.Diagnostics.IORegistry as Record<string, any>;
+    return response as PlistDictionary;
+  }
+
+  /**
+   * Extracts the IORegistry payload from a diagnostics response.
+   * @returns the IORegistry object, or null when the query matched no entry
+   * (the device replies { Status: 'Success' } with no Diagnostics)
+   */
+  private extractIORegistry(response: any): Record<string, any> | null {
+    const diagnostics = response?.Diagnostics;
+    if (util.isPlainObject(diagnostics)) {
+      const ioRegistry = diagnostics.IORegistry;
+      if (util.isPlainObject(ioRegistry)) {
+        return ioRegistry as Record<string, any>;
+      }
+    }
+    return null;
   }
 }