@ebowwa/ios-devices 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ebowwa/ios-devices",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "iOS device control library wrapping xcrun devicectl, libimobiledevice, and simctl",
   "type": "module",
   "main": "./dist/index.js",

package/src/device-ctl.ts

@@ -50,24 +50,30 @@ export class DeviceCtl {
       return this.parseDevicesFromText(result.stdout);
     }
 
-    const data = result.json as { devices?: Array<Record<string, unknown>> };
-    return (data.devices || []).map(this.parseDeviceFromJson);
+    // JSON structure is { result: { devices: [...] } }
+    const data = result.json as { result?: { devices?: Array<Record<string, unknown>> } };
+    const devices = data.result?.devices || [];
+    return devices.map((d) => this.parseDeviceFromJson(d));
   }
 
   private parseDeviceFromJson(device: Record<string, unknown>): IOSDevice {
+    const hardware = (device.hardwareProperties as Record<string, unknown>) || {};
+    const deviceProps = (device.deviceProperties as Record<string, unknown>) || {};
+    const connectionProps = (device.connectionProperties as Record<string, unknown>) || {};
+
     return {
-      identifier: device.udid as string || device.identifier as string,
-      name: device.name as string || device.deviceName as string || 'Unknown',
-      model: device.model as string || '',
-      modelCode: device.modelCode as string || '',
-      productType: device.productType as string || '',
-      osVersion: device.osVersion as string || device.productVersion as string || '',
-      osBuildVersion: device.buildVersion as string || '',
-      architecture: device.architecture as string || 'arm64e',
-      platform: this.detectPlatform(device.productType as string),
-      connectionType: this.detectConnectionType(device),
-      isTrusted: device.trusted as boolean ?? true,
-      isAvailable: device.available as boolean ?? true,
+      identifier: device.identifier as string || hardware.udid as string,
+      name: deviceProps.name as string || 'Unknown',
+      model: hardware.marketingName as string || '',
+      modelCode: hardware.hardwareModel as string || '',
+      productType: hardware.productType as string || '',
+      osVersion: deviceProps.osVersionNumber as string || '',
+      osBuildVersion: deviceProps.osBuildUpdate as string || '',
+      architecture: 'arm64e',
+      platform: this.detectPlatform(hardware.productType as string),
+      connectionType: this.detectConnectionType(connectionProps),
+      isTrusted: connectionProps.pairingState === 'paired',
+      isAvailable: connectionProps.tunnelState === 'connected' || connectionProps.pairingState === 'paired',
     };
   }
 
@@ -76,22 +82,32 @@ export class DeviceCtl {
     const devices: IOSDevice[] = [];
 
     for (const line of lines) {
-      // Parse format: "Device Name (iOS 18.1) [UDID]"
-      const match = line.match(/^(.+?)\s*\((.+?)\)\s*\[([A-F0-9-]+)\]/i);
-      if (match) {
+      // Parse table format: "Name   Hostname   Identifier   State   Model"
+      // Columns are separated by multiple spaces
+      const parts = line.split(/\s{2,}/).filter(p => p.trim());
+      if (parts.length >= 4 && parts[0] !== 'Name' && !parts[0].startsWith('-')) {
+        const name = parts[0].trim();
+        const identifier = parts[2].trim();
+        const state = parts[3].trim().toLowerCase();
+        const model = parts.length > 4 ? parts[4].trim() : '';
+
+        // Extract model code from parentheses if present, e.g., "iPhone 11 (iPhone12,1)"
+        const modelMatch = model.match(/\(([^)]+)\)/);
+        const modelCode = modelMatch ? modelMatch[1] : '';
+
         devices.push({
-          identifier: match[3],
-          name: match[1].trim(),
-          model: '',
-          modelCode: '',
-          productType: '',
-          osVersion: match[2],
+          identifier,
+          name,
+          model: model.replace(/\s*\([^)]+\)/, '').trim(),
+          modelCode,
+          productType: modelCode || model,
+          osVersion: '',
           osBuildVersion: '',
           architecture: 'arm64e',
-          platform: 'iOS',
+          platform: this.detectPlatform(model),
           connectionType: 'USB',
           isTrusted: true,
-          isAvailable: true,
+          isAvailable: state === 'connected',
         });
       }
     }
@@ -108,10 +124,9 @@ export class DeviceCtl {
     return 'iOS';
   }
 
-  private detectConnectionType(device: Record<string, unknown>): 'USB' | 'Network' | 'Wireless' {
-    if (device.connectionType) return device.connectionType as 'USB' | 'Network' | 'Wireless';
-    if (device.networkDevice === true) return 'Network';
-    if (device.wirelessEnabled === true) return 'Wireless';
+  private detectConnectionType(connectionProps: Record<string, unknown>): 'USB' | 'Network' | 'Wireless' {
+    const tunnelState = connectionProps.tunnelState as string;
+    if (tunnelState === 'connected') return 'Network';
     return 'USB';
   }