@mcesystems/apple-kit 1.0.95 → 1.0.97

package/dist/resources/plist/certificate-trust.xml

@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>PayloadContent</key>
-    <array>
-        <dict>
-            <key>PayloadCertificateFileName</key>
-            <string>{{certificateFileName}}</string>
-            <key>PayloadContent</key>
-            <data>
-{{certificateBase64}}
-            </data>
-            <key>PayloadDescription</key>
-            <string>{{certificateDescription}}</string>
-            <key>PayloadDisplayName</key>
-            <string>{{certificateDisplayName}}</string>
-            <key>PayloadIdentifier</key>
-            <string>{{payloadId}}</string>
-            <key>PayloadType</key>
-            <string>com.apple.security.root</string>
-            <key>PayloadUUID</key>
-            <string>{{certificateUuid}}</string>
-            <key>PayloadVersion</key>
-            <integer>1</integer>
-        </dict>
-    </array>
-    <key>PayloadDisplayName</key>
-    <string>{{profileDisplayName}}</string>
-    <key>PayloadIdentifier</key>
-    <string>{{profileId}}</string>
-    <key>PayloadOrganization</key>
-    <string>{{organizationName}}</string>
-    <key>PayloadRemovalDisallowed</key>
-    <{{removalDisallowed}}/>
-    <key>PayloadType</key>
-    <string>Configuration</string>
-    <key>PayloadUUID</key>
-    <string>{{profileUuid}}</string>
-    <key>PayloadVersion</key>
-    <integer>1</integer>
-</dict>
-</plist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>PayloadContent</key>
+    <array>
+        <dict>
+            <key>PayloadCertificateFileName</key>
+            <string>{{certificateFileName}}</string>
+            <key>PayloadContent</key>
+            <data>
+{{certificateBase64}}
+            </data>
+            <key>PayloadDescription</key>
+            <string>{{certificateDescription}}</string>
+            <key>PayloadDisplayName</key>
+            <string>{{certificateDisplayName}}</string>
+            <key>PayloadIdentifier</key>
+            <string>{{payloadId}}</string>
+            <key>PayloadType</key>
+            <string>com.apple.security.root</string>
+            <key>PayloadUUID</key>
+            <string>{{certificateUuid}}</string>
+            <key>PayloadVersion</key>
+            <integer>1</integer>
+        </dict>
+    </array>
+    <key>PayloadDisplayName</key>
+    <string>{{profileDisplayName}}</string>
+    <key>PayloadIdentifier</key>
+    <string>{{profileId}}</string>
+    <key>PayloadOrganization</key>
+    <string>{{organizationName}}</string>
+    <key>PayloadRemovalDisallowed</key>
+    <{{removalDisallowed}}/>
+    <key>PayloadType</key>
+    <string>Configuration</string>
+    <key>PayloadUUID</key>
+    <string>{{profileUuid}}</string>
+    <key>PayloadVersion</key>
+    <integer>1</integer>
+</dict>
+</plist>

package/dist/resources/plist/wifi-enterprise.xml

@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>PayloadContent</key>
-    <array>
-        <dict>
-            <key>AutoJoin</key>
-            <{{autoJoin}}/>
-            <key>EncryptionType</key>
-            <string>WPA2</string>
-            <key>HIDDEN_NETWORK</key>
-            <{{hiddenNetwork}}/>
-            <key>IsHotspot</key>
-            <false/>
-            <key>PayloadDescription</key>
-            <string>Configures WiFi settings for {{ssid}}</string>
-            <key>PayloadDisplayName</key>
-            <string>WiFi ({{ssid}})</string>
-            <key>PayloadIdentifier</key>
-            <string>{{payloadId}}</string>
-            <key>PayloadType</key>
-            <string>com.apple.wifi.managed</string>
-            <key>PayloadUUID</key>
-            <string>{{payloadUuid}}</string>
-            <key>PayloadVersion</key>
-            <integer>1</integer>
-            <key>ProxyType</key>
-            <string>None</string>
-            <key>SSID_STR</key>
-            <string>{{ssid}}</string>
-            <key>EAPClientConfiguration</key>
-            <dict>
-                <key>AcceptEAPTypes</key>
-                <array>
-                    <integer>{{eapTypeNumber}}</integer>
-                </array>
-                {{#if username}}<key>UserName</key><string>{{username}}</string>{{/if}}
-                {{#if password}}<key>UserPassword</key><string>{{password}}</string>{{/if}}
-                {{#if acceptAnyCertificate}}<key>TLSAllowTrustExceptions</key><true/>{{/if}}
-            </dict>
-        </dict>
-    </array>
-    <key>PayloadDisplayName</key>
-    <string>{{displayName}}</string>
-    <key>PayloadIdentifier</key>
-    <string>{{profileId}}</string>
-    <key>PayloadOrganization</key>
-    <string>{{organizationName}}</string>
-    <key>PayloadRemovalDisallowed</key>
-    <false/>
-    <key>PayloadType</key>
-    <string>Configuration</string>
-    <key>PayloadUUID</key>
-    <string>{{profileUuid}}</string>
-    <key>PayloadVersion</key>
-    <integer>1</integer>
-</dict>
-</plist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>PayloadContent</key>
+    <array>
+        <dict>
+            <key>AutoJoin</key>
+            <{{autoJoin}}/>
+            <key>EncryptionType</key>
+            <string>WPA2</string>
+            <key>HIDDEN_NETWORK</key>
+            <{{hiddenNetwork}}/>
+            <key>IsHotspot</key>
+            <false/>
+            <key>PayloadDescription</key>
+            <string>Configures WiFi settings for {{ssid}}</string>
+            <key>PayloadDisplayName</key>
+            <string>WiFi ({{ssid}})</string>
+            <key>PayloadIdentifier</key>
+            <string>{{payloadId}}</string>
+            <key>PayloadType</key>
+            <string>com.apple.wifi.managed</string>
+            <key>PayloadUUID</key>
+            <string>{{payloadUuid}}</string>
+            <key>PayloadVersion</key>
+            <integer>1</integer>
+            <key>ProxyType</key>
+            <string>None</string>
+            <key>SSID_STR</key>
+            <string>{{ssid}}</string>
+            <key>EAPClientConfiguration</key>
+            <dict>
+                <key>AcceptEAPTypes</key>
+                <array>
+                    <integer>{{eapTypeNumber}}</integer>
+                </array>
+                {{#if username}}<key>UserName</key><string>{{username}}</string>{{/if}}
+                {{#if password}}<key>UserPassword</key><string>{{password}}</string>{{/if}}
+                {{#if acceptAnyCertificate}}<key>TLSAllowTrustExceptions</key><true/>{{/if}}
+            </dict>
+        </dict>
+    </array>
+    <key>PayloadDisplayName</key>
+    <string>{{displayName}}</string>
+    <key>PayloadIdentifier</key>
+    <string>{{profileId}}</string>
+    <key>PayloadOrganization</key>
+    <string>{{organizationName}}</string>
+    <key>PayloadRemovalDisallowed</key>
+    <false/>
+    <key>PayloadType</key>
+    <string>Configuration</string>
+    <key>PayloadUUID</key>
+    <string>{{profileUuid}}</string>
+    <key>PayloadVersion</key>
+    <integer>1</integer>
+</dict>
+</plist>

package/dist/resources/plist/wifi-standard.xml

@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>PayloadContent</key>
-    <array>
-        <dict>
-            <key>AutoJoin</key>
-            <{{autoJoin}}/>
-            <key>EncryptionType</key>
-            <string>{{encryptionType}}</string>
-            <key>HIDDEN_NETWORK</key>
-            <{{hiddenNetwork}}/>
-            <key>IsHotspot</key>
-            <false/>
-            {{#if password}}<key>Password</key><string>{{password}}</string>{{/if}}
-            <key>PayloadDescription</key>
-            <string>Configures WiFi settings for {{ssid}}</string>
-            <key>PayloadDisplayName</key>
-            <string>WiFi ({{ssid}})</string>
-            <key>PayloadIdentifier</key>
-            <string>{{payloadId}}</string>
-            <key>PayloadType</key>
-            <string>com.apple.wifi.managed</string>
-            <key>PayloadUUID</key>
-            <string>{{payloadUuid}}</string>
-            <key>PayloadVersion</key>
-            <integer>1</integer>
-            <key>ProxyType</key>
-            <string>None</string>
-            <key>SSID_STR</key>
-            <string>{{ssid}}</string>
-        </dict>
-    </array>
-    <key>PayloadDisplayName</key>
-    <string>{{displayName}}</string>
-    <key>PayloadIdentifier</key>
-    <string>{{profileId}}</string>
-    <key>PayloadOrganization</key>
-    <string>{{organizationName}}</string>
-    <key>PayloadRemovalDisallowed</key>
-    <false/>
-    <key>PayloadType</key>
-    <string>Configuration</string>
-    <key>PayloadUUID</key>
-    <string>{{profileUuid}}</string>
-    <key>PayloadVersion</key>
-    <integer>1</integer>
-</dict>
-</plist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>PayloadContent</key>
+    <array>
+        <dict>
+            <key>AutoJoin</key>
+            <{{autoJoin}}/>
+            <key>EncryptionType</key>
+            <string>{{encryptionType}}</string>
+            <key>HIDDEN_NETWORK</key>
+            <{{hiddenNetwork}}/>
+            <key>IsHotspot</key>
+            <false/>
+            {{#if password}}<key>Password</key><string>{{password}}</string>{{/if}}
+            <key>PayloadDescription</key>
+            <string>Configures WiFi settings for {{ssid}}</string>
+            <key>PayloadDisplayName</key>
+            <string>WiFi ({{ssid}})</string>
+            <key>PayloadIdentifier</key>
+            <string>{{payloadId}}</string>
+            <key>PayloadType</key>
+            <string>com.apple.wifi.managed</string>
+            <key>PayloadUUID</key>
+            <string>{{payloadUuid}}</string>
+            <key>PayloadVersion</key>
+            <integer>1</integer>
+            <key>ProxyType</key>
+            <string>None</string>
+            <key>SSID_STR</key>
+            <string>{{ssid}}</string>
+        </dict>
+    </array>
+    <key>PayloadDisplayName</key>
+    <string>{{displayName}}</string>
+    <key>PayloadIdentifier</key>
+    <string>{{profileId}}</string>
+    <key>PayloadOrganization</key>
+    <string>{{organizationName}}</string>
+    <key>PayloadRemovalDisallowed</key>
+    <false/>
+    <key>PayloadType</key>
+    <string>Configuration</string>
+    <key>PayloadUUID</key>
+    <string>{{profileUuid}}</string>
+    <key>PayloadVersion</key>
+    <integer>1</integer>
+</dict>
+</plist>

package/dist/types/index.d.ts

@@ -295,16 +295,26 @@ export declare class AppleDeviceKit {
 	private readonly activationFlow;
 	private readonly proxyActions;
 	private tunnelProcess;
+	private tunnelReadyPromise;
 	private static readonly IOS_17_VERSION;
 	constructor(udid: string, logicalPort: number, usbmuxdAddress?: string);
+	/**
+	 * Returns a promise that resolves when the tunnel is ready (or immediately if not needed).
+	 * Reuses the same in-flight promise so constructor and methods don't race.
+	 */
+	private getTunnelReady;
 	/**
 	 * Check if iOS version requires tunneling (iOS 17+)
 	 */
 	private requiresTunneling;
 	/**
-	 * Ensure tunnel is started for iOS 17+ devices
+	 * Ensure tunnel is started for iOS 17+ devices. Safe to call multiple times; reuses in-flight setup.
 	 */
 	private ensureTunnel;
+	/**
+	 * Internal tunnel startup. Called once per tunnel lifecycle; getTunnelReady() caches this promise.
+	 */
+	private runEnsureTunnel;
 	/**
 	 * Stop tunnel for a device
 	 */
@@ -496,7 +506,7 @@ export declare class IosClient {
 		version: string;
 	}[]>;
 	devMode(): Promise<IosCommandResult>;
-	tunnelStart(userspace?: boolean): Promise<import("child_process").ChildProcessByStdio<null, import("stream").Readable, import("stream").Readable>>;
+	tunnelStart(userspace?: boolean, pairRecordPath?: string): Promise<ChildProcess>;
 	fsyncPull({ app, srcPath, dstPath, }: {
 		app: string;
 		srcPath: string;
@@ -524,42 +534,11 @@ export declare class IosClient {
 		path?: string;
 	}): Promise<IosFsyncTreeResult>;
 }
-declare class DeviceActions {
-	private readonly udid;
-	private readonly iosClient;
-	constructor(udid: string, iosClient: IosClient);
-	info(): Promise<LockdownInfo>;
-	listDevices(): Promise<IosListResult>;
-	wipe(): Promise<void>;
-	removeProfile(profileIdentifier: string): Promise<void>;
-	listProfiles(): Promise<IosProfileListResult>;
-	pair(): Promise<boolean>;
-	trustDevice({ timeout, pollInterval, onWaitingForTrust, signal, }: {
-		timeout?: number;
-		pollInterval?: number;
-		onWaitingForTrust?: () => void;
-		signal?: AbortSignal;
-	}): Promise<boolean>;
-	waitForPairing({ timeout, pollInterval, signal, }: {
-		timeout?: number;
-		pollInterval?: number;
-		signal?: AbortSignal;
-	}): Promise<boolean>;
-	/**
-	 * Returns true if device is paired and trusted.
-	 * Uses info() which only succeeds when full pairing is established (user has accepted Trust).
-	 * Prefer this over lockdown file check since file location/timing can vary by platform.
-	 */
-	private isPairedViaInfo;
-	isWifiConnected(timeoutMs?: number): Promise<string | undefined>;
-	unpair(): Promise<boolean>;
-}
 export declare class ActivationFlow {
 	private readonly udid;
 	private readonly iosClient;
-	private readonly deviceActions;
 	private mdmClient;
-	constructor(udid: string, iosClient: IosClient, deviceActions: DeviceActions);
+	constructor(udid: string, iosClient: IosClient);
 	run(steps?: string[], signal?: AbortSignal, config?: ActivationFlowConfig): {
 		promise: Promise<(() => Promise<void>) | undefined>;
 		events: EventEmitter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcesystems/apple-kit",
-  "version": "1.0.95",
+  "version": "1.0.97",
   "description": "iOS device management toolkit using libimobiledevice command-line tools",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -39,8 +39,8 @@
     "tsx": "^4.21.0",
     "plist": "^3.1.0",
     "ts-retry-promise": "^0.8.1",
-    "@mcesystems/mdm-client-g4": "1.0.95",
-    "@mcesystems/tool-debug-g4": "1.0.95"
+    "@mcesystems/mdm-client-g4": "1.0.97",
+    "@mcesystems/tool-debug-g4": "1.0.97"
   },
   "devDependencies": {
     "@types/node": "^22.10.2",

package/resources/wintun-LICENSE.txt

@@ -0,0 +1,84 @@
+Prebuilt Binaries License
+-------------------------
+
+1. DEFINITIONS. "Software" means the precise contents of the "wintun.dll"
+   files that are included in the .zip file that contains this document as
+   downloaded from wintun.net/builds.
+
+2. LICENSE GRANT. WireGuard LLC grants to you a non-exclusive and
+   non-transferable right to use Software for lawful purposes under certain
+   obligations and limited rights as set forth in this agreement.
+
+3. RESTRICTIONS. Software is owned and copyrighted by WireGuard LLC. It is
+   licensed, not sold. Title to Software and all associated intellectual
+   property rights are retained by WireGuard. You must not:
+   a. reverse engineer, decompile, disassemble, extract from, or otherwise
+      modify the Software;
+   b. modify or create derivative work based upon Software in whole or in
+      parts, except insofar as only the API interfaces of the "wintun.h" file
+      distributed alongside the Software (the "Permitted API") are used;
+   c. remove any proprietary notices, labels, or copyrights from the Software;
+   d. resell, redistribute, lease, rent, transfer, sublicense, or otherwise
+      transfer rights of the Software without the prior written consent of
+      WireGuard LLC, except insofar as the Software is distributed alongside
+      other software that uses the Software only via the Permitted API;
+   e. use the name of WireGuard LLC, the WireGuard project, the Wintun
+      project, or the names of its contributors to endorse or promote products
+      derived from the Software without specific prior written consent.
+
+4. LIMITED WARRANTY. THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF
+   ANY KIND. WIREGUARD LLC HEREBY EXCLUDES AND DISCLAIMS ALL IMPLIED OR
+   STATUTORY WARRANTIES, INCLUDING ANY WARRANTIES OF MERCHANTABILITY, FITNESS
+   FOR A PARTICULAR PURPOSE, QUALITY, NON-INFRINGEMENT, TITLE, RESULTS,
+   EFFORTS, OR QUIET ENJOYMENT. THERE IS NO WARRANTY THAT THE PRODUCT WILL BE
+   ERROR-FREE OR WILL FUNCTION WITHOUT INTERRUPTION. YOU ASSUME THE ENTIRE
+   RISK FOR THE RESULTS OBTAINED USING THE PRODUCT. TO THE EXTENT THAT
+   WIREGUARD LLC MAY NOT DISCLAIM ANY WARRANTY AS A MATTER OF APPLICABLE LAW,
+   THE SCOPE AND DURATION OF SUCH WARRANTY WILL BE THE MINIMUM PERMITTED UNDER
+   SUCH LAW. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
+   WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR
+   A PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE
+   EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
+
+5. LIMITATION OF LIABILITY. To the extent not prohibited by law, in no event
+   WireGuard LLC or any third-party-developer will be liable for any lost
+   revenue, profit or data or for special, indirect, consequential, incidental
+   or punitive damages, however caused regardless of the theory of liability,
+   arising out of or related to the use of or inability to use Software, even
+   if WireGuard LLC has been advised of the possibility of such damages.
+   Solely you are responsible for determining the appropriateness of using
+   Software and accept full responsibility for all risks associated with its
+   exercise of rights under this agreement, including but not limited to the
+   risks and costs of program errors, compliance with applicable laws, damage
+   to or loss of data, programs or equipment, and unavailability or
+   interruption of operations. The foregoing limitations will apply even if
+   the above stated warranty fails of its essential purpose. You acknowledge,
+   that it is in the nature of software that software is complex and not
+   completely free of errors. In no event shall WireGuard LLC or any
+   third-party-developer be liable to you under any theory for any damages
+   suffered by you or any user of Software or for any special, incidental,
+   indirect, consequential or similar damages (including without limitation
+   damages for loss of business profits, business interruption, loss of
+   business information or any other pecuniary loss) arising out of the use or
+   inability to use Software, even if WireGuard LLC has been advised of the
+   possibility of such damages and regardless of the legal or quitable theory
+   (contract, tort, or otherwise) upon which the claim is based.
+
+6. TERMINATION. This agreement is affected until terminated. You may
+   terminate this agreement at any time. This agreement will terminate
+   immediately without notice from WireGuard LLC if you fail to comply with
+   the terms and conditions of this agreement. Upon termination, you must
+   delete Software and all copies of Software and cease all forms of
+   distribution of Software.
+
+7. SEVERABILITY. If any provision of this agreement is held to be
+   unenforceable, this agreement will remain in effect with the provision
+   omitted, unless omission would frustrate the intent of the parties, in
+   which case this agreement will immediately terminate.
+
+8. RESERVATION OF RIGHTS. All rights not expressly granted in this agreement
+   are reserved by WireGuard LLC. For example, WireGuard LLC reserves the
+   right at any time to cease development of Software, to alter distribution
+   details, features, specifications, capabilities, functions, licensing
+   terms, release dates, APIs, ABIs, general availability, or other
+   characteristics of the Software.