@ebowwa/ios-devices 1.0.0 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"device-ctl.d.ts","sourceRoot":"","sources":["../src/device-ctl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"device-ctl.d.ts","sourceRoot":"","sources":["../src/device-ctl.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAQH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,aAAa,EAEnB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAAmB;gBAEtB,OAAO,GAAE,gBAAqB;IAI1C,OAAO,CAAC,QAAQ;IAQhB;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAazC,OAAO,CAAC,mBAAmB;IAqB3B,OAAO,CAAC,oBAAoB;IAsC5B,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,oBAAoB;IAM5B;;OAEG;IACG,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IA4BpE,OAAO,CAAC,0BAA0B;IAwBlC;;OAEG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,UAAU,CAAC;IAUpE;;OAEG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IA0B3D;;OAEG;IACG,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAIpD;;OAEG;IACG,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAQtD;;OAEG;IACG,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAItD;;OAEG;IACG,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,GAAG,WAAW,GAAG,sBAAsB,GAAG,gBAAgB,GAAG,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC;IAWrK;;OAEG;IACG,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAW7D,OAAO,CAAC,sBAAsB;IAkB9B;;OAEG;IACG,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE;QAAE,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IAgBzJ;;OAEG;IACG,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAYnG;;OAEG;IACG,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAOjG;;OAEG;IACG,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAO3E;;OAEG;IACG,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAO1E;;OAEG;IACG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAO9E;;OAEG;IACG,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAgBxD;;OAEG;IACG,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAWzD,OAAO,CAAC,iBAAiB;IAyBzB;;OAEG;IACG,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAO3E;;OAEG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAO9E;;OAEG;IACG,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAYjG;;OAEG;IACG,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAWpE,OAAO,CAAC,kBAAkB;IAuB1B;;OAEG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAOjG;;OAEG;IACG,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAWnG;;OAEG;IACG,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAclH;;OAEG;IACG,kBAAkB,CAAC,OAAO,GAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC,aAAa,CAAC;CAalH"}
package/dist/index.js CHANGED
@@ -4277,22 +4277,26 @@ class DeviceCtl {
4277
4277
  return this.parseDevicesFromText(result.stdout);
4278
4278
  }
4279
4279
  const data = result.json;
4280
- return (data.devices || []).map(this.parseDeviceFromJson);
4280
+ const devices = data.result?.devices || [];
4281
+ return devices.map((d) => this.parseDeviceFromJson(d));
4281
4282
  }
4282
4283
  parseDeviceFromJson(device) {
4284
+ const hardware = device.hardwareProperties || {};
4285
+ const deviceProps = device.deviceProperties || {};
4286
+ const connectionProps = device.connectionProperties || {};
4283
4287
  return {
4284
- identifier: device.udid || device.identifier,
4285
- name: device.name || device.deviceName || "Unknown",
4286
- model: device.model || "",
4287
- modelCode: device.modelCode || "",
4288
- productType: device.productType || "",
4289
- osVersion: device.osVersion || device.productVersion || "",
4290
- osBuildVersion: device.buildVersion || "",
4291
- architecture: device.architecture || "arm64e",
4292
- platform: this.detectPlatform(device.productType),
4293
- connectionType: this.detectConnectionType(device),
4294
- isTrusted: device.trusted ?? true,
4295
- isAvailable: device.available ?? true
4288
+ identifier: device.identifier || hardware.udid,
4289
+ name: deviceProps.name || "Unknown",
4290
+ model: hardware.marketingName || "",
4291
+ modelCode: hardware.hardwareModel || "",
4292
+ productType: hardware.productType || "",
4293
+ osVersion: deviceProps.osVersionNumber || "",
4294
+ osBuildVersion: deviceProps.osBuildUpdate || "",
4295
+ architecture: "arm64e",
4296
+ platform: this.detectPlatform(hardware.productType),
4297
+ connectionType: this.detectConnectionType(connectionProps),
4298
+ isTrusted: connectionProps.pairingState === "paired",
4299
+ isAvailable: connectionProps.tunnelState === "connected" || connectionProps.pairingState === "paired"
4296
4300
  };
4297
4301
  }
4298
4302
  parseDevicesFromText(text) {
@@ -4300,21 +4304,27 @@ class DeviceCtl {
4300
4304
  `);
4301
4305
  const devices = [];
4302
4306
  for (const line of lines) {
4303
- const match = line.match(/^(.+?)\s*\((.+?)\)\s*\[([A-F0-9-]+)\]/i);
4304
- if (match) {
4307
+ const parts = line.split(/\s{2,}/).filter((p) => p.trim());
4308
+ if (parts.length >= 4 && parts[0] !== "Name" && !parts[0].startsWith("-")) {
4309
+ const name = parts[0].trim();
4310
+ const identifier = parts[2].trim();
4311
+ const state = parts[3].trim().toLowerCase();
4312
+ const model = parts.length > 4 ? parts[4].trim() : "";
4313
+ const modelMatch = model.match(/\(([^)]+)\)/);
4314
+ const modelCode = modelMatch ? modelMatch[1] : "";
4305
4315
  devices.push({
4306
- identifier: match[3],
4307
- name: match[1].trim(),
4308
- model: "",
4309
- modelCode: "",
4310
- productType: "",
4311
- osVersion: match[2],
4316
+ identifier,
4317
+ name,
4318
+ model: model.replace(/\s*\([^)]+\)/, "").trim(),
4319
+ modelCode,
4320
+ productType: modelCode || model,
4321
+ osVersion: "",
4312
4322
  osBuildVersion: "",
4313
4323
  architecture: "arm64e",
4314
- platform: "iOS",
4324
+ platform: this.detectPlatform(model),
4315
4325
  connectionType: "USB",
4316
4326
  isTrusted: true,
4317
- isAvailable: true
4327
+ isAvailable: state === "connected"
4318
4328
  });
4319
4329
  }
4320
4330
  }
@@ -4333,13 +4343,10 @@ class DeviceCtl {
4333
4343
  return "visionOS";
4334
4344
  return "iOS";
4335
4345
  }
4336
- detectConnectionType(device) {
4337
- if (device.connectionType)
4338
- return device.connectionType;
4339
- if (device.networkDevice === true)
4346
+ detectConnectionType(connectionProps) {
4347
+ const tunnelState = connectionProps.tunnelState;
4348
+ if (tunnelState === "connected")
4340
4349
  return "Network";
4341
- if (device.wirelessEnabled === true)
4342
- return "Wireless";
4343
4350
  return "USB";
4344
4351
  }
4345
4352
  async getDeviceInfo(deviceId) {
@@ -5361,5 +5368,5 @@ export {
5361
5368
  AppInstallResultSchema
5362
5369
  };
5363
5370
 
5364
- //# debugId=32D42F844E902E0864756E2164756E21
5371
+ //# debugId=F2B21BB00347A4C564756E2164756E21
5365
5372
  //# sourceMappingURL=index.js.map