fix: handle legacy and cryptex DDI service discovery

StikDebug/Device/IdeviceFFIBridge.swift

@@ -39,7 +39,8 @@ private enum IdeviceBridge {
         }
 
         let code = Int(ffiError.pointee.code)
-        let message = string(from: ffiError.pointee.message) ?? fallback
+        let detail = string(from: ffiError.pointee.message) ?? fallback
+        let message = detail == fallback ? fallback : "\(fallback): \(detail)"
         idevice_error_free(ffiError)
         return makeError(domain: domain, code: code, message: message)
     }
@@ -264,17 +265,23 @@ private enum IdeviceBridge {
 extension JITEnableContext {
     func isDeveloperDiskImageMounted() throws -> Bool {
         try IdeviceBridge.withTunnelHandles(for: self) { adapter, handshake in
+            var cryptexQuerySucceeded = false
+            var cryptexQueryError: NSError?
+            if DeveloperDiskImageService.usesCryptexDDI {
                 var installed: UnsafeMutablePointer<InstalledCryptexC>?
-            let ffiError = cryptexd_installed_ddi(adapter, handshake, &installed)
-            let queryError = ffiError.map {
-                IdeviceBridge.consumeFFIError($0, fallback: "Failed to query installed DDI cryptex")
-            }
                 defer { cryptexd_free_installed_cryptex(installed) }
+                if let ffiError = cryptexd_installed_ddi(adapter, handshake, &installed) {
+                    cryptexQueryError = IdeviceBridge.consumeFFIError(ffiError, fallback: "Failed to query installed DDI cryptex")
+                } else {
+                    cryptexQuerySucceeded = true
                     if installed != nil {
                         return true
                     }
+                }
+            }
 
-            let legacyMounted = (try? IdeviceBridge.withConnectedClient(
+            do {
+                return try IdeviceBridge.withConnectedClient(
                     fallback: "Failed to connect to image mounter",
                     missingClientMessage: "Image mounter client was not created",
                     connect: { image_mounter_connect_rsd(adapter, handshake, $0) },
@@ -295,15 +302,14 @@ extension JITEnableContext {
                         )
                     }
                     return deviceCount > 0
-            }) ?? false
-            if legacyMounted {
-                return true
-            }
-            if let queryError {
-                throw queryError
                 }
+            } catch {
+                if cryptexQuerySucceeded {
                     return false
                 }
+                throw cryptexQueryError ?? (error as NSError)
+            }
+        }
     }
 
     func installCryptexDDI(from directoryPath: String) throws {

StikDebug/Device/JITEnableContext.swift

@@ -117,7 +117,8 @@ final class JITEnableContext {
         guard let ffiError else {
             return makeError(fallback)
         }
-        let message = nsString(from: ffiError.pointee.message, fallback: fallback)
+        let detail = nsString(from: ffiError.pointee.message, fallback: fallback)
+        let message = detail == fallback ? fallback : "\(fallback): \(detail)"
         let error = makeError(message, code: Int(ffiError.pointee.code))
         idevice_error_free(ffiError)
         return error
@@ -457,11 +458,7 @@ final class JITEnableContext {
     private func withConnectedRemoteServer<T>(
         _ body: (OpaquePointer) throws -> T
     ) throws -> T {
-        try ensureTunnel()
-        guard let adapter, let handshake else {
-            throw makeError("Tunnel is not connected")
-        }
-
+        try withFreshDebugTunnel(hostname: "StikDebugRemoteServer") { adapter, handshake in
             var remoteServer: OpaquePointer?
             if let ffiError = remote_server_connect_rsd(adapter, handshake, &remoteServer) {
                 throw error(from: ffiError, fallback: "Failed to connect remote server")
@@ -474,6 +471,7 @@ final class JITEnableContext {
             defer { remote_server_free(remoteServer) }
             return try body(remoteServer)
         }
+    }
 
     private func withProcessControl<T>(
         remoteServer: OpaquePointer,

StikDebug/Device/mountDDI.swift

@@ -27,6 +27,7 @@ func checkMountStatus() -> MountCheckResult {
     do {
         return try JITEnableContext.shared.isDeveloperDiskImageMounted() ? .mounted : .notMounted
     } catch {
+        LogManager.shared.addErrorLog("Failed to check DDI mount status: \(error.localizedDescription)")
         return .unreachable
     }
 }