Fix another bug

Author: NovaDev404

Sources/prostore/install/installApp.swift

@@ -2,36 +2,29 @@ import Foundation
 import IDeviceSwift
 import Combine
 
-// MARK: - Error Transformer (existing helpers kept)
+// MARK: - Error Transformer
 private func transformInstallError(_ error: Error) -> Error {
     let nsError = error as NSError
     let errorString = String(describing: error)
 
-    var userMessage = extractUserReadableErrorMessage(from: error)
-
-    if let userMessage = userMessage, !userMessage.isEmpty {
+    if let userMessage = extractUserReadableErrorMessage(from: error), !userMessage.isEmpty {
         return NSError(domain: nsError.domain, code: nsError.code, userInfo: [NSLocalizedDescriptionKey: userMessage])
     }
 
     if errorString.contains("error 1.") {
         if errorString.contains("Missing Pairing") {
             return NSError(domain: nsError.domain, code: nsError.code, userInfo: [NSLocalizedDescriptionKey: "Missing pairing file. Please ensure pairing file exists in ProStore folder."])
         }
-
         if errorString.contains("Cannot connect to AFC") || errorString.contains("afc_client_connect") {
             return NSError(domain: nsError.domain, code: nsError.code, userInfo: [NSLocalizedDescriptionKey: "Cannot connect to AFC. Check USB connection, VPN, and accept trust dialog on device."])
         }
-
         if errorString.contains("installation_proxy") {
             return NSError(domain: nsError.domain, code: nsError.code, userInfo: [NSLocalizedDescriptionKey: "Installation service failed. The app may already be installed or device storage full."])
         }
-
         return NSError(domain: nsError.domain, code: nsError.code, userInfo: [NSLocalizedDescriptionKey: "Installation failed. Make sure: 1) VPN is on, 2) Device is connected via USB, 3) Trust dialog is accepted, 4) Pairing file is in ProStore folder."])
     }
 
-    let originalMessage = nsError.localizedDescription
-    let cleanedMessage = cleanGenericErrorMessage(originalMessage)
-
+    let cleanedMessage = cleanGenericErrorMessage(nsError.localizedDescription)
     return NSError(domain: nsError.domain, code: nsError.code, userInfo: [NSLocalizedDescriptionKey: cleanedMessage])
 }
 
@@ -41,7 +34,6 @@ private func extractUserReadableErrorMessage(from error: Error) -> String? {
     }
 
     let errorString = String(describing: error)
-
     let patterns = [
         "Missing Pairing": "Missing pairing file. Please check ProStore folder.",
         "Cannot connect to AFC": "Cannot connect to device. Check USB and VPN.",
@@ -51,10 +43,8 @@ private func extractUserReadableErrorMessage(from error: Error) -> String? {
         "Connection Failed:": "Connection to device failed."
     ]
 
-    for (pattern, message) in patterns {
-        if errorString.contains(pattern) {
-            return message
-        }
+    for (pattern, message) in patterns where errorString.contains(pattern) {
+        return message
     }
 
     let nsError = error as NSError
@@ -69,44 +59,34 @@ private func extractUserReadableErrorMessage(from error: Error) -> String? {
 
 private func cleanGenericErrorMessage(_ message: String) -> String {
     var cleaned = message
-
     let genericPrefixes = [
         "The operation couldn't be completed. ",
         "The operation could not be completed. ",
         "IDeviceSwift.IDeviceSwiftError ",
         "IDeviceSwiftError "
     ]
-
-    for prefix in genericPrefixes {
-        if cleaned.hasPrefix(prefix) {
-            cleaned = String(cleaned.dropFirst(prefix.count))
-            break
-        }
-    }
-
-    if cleaned.hasSuffix(".") {
-        cleaned = String(cleaned.dropLast())
+    for prefix in genericPrefixes where cleaned.hasPrefix(prefix) {
+        cleaned = String(cleaned.dropFirst(prefix.count))
+        break
     }
-
+    if cleaned.hasSuffix(".") { cleaned = String(cleaned.dropLast()) }
     if cleaned == "error 1" || cleaned == "error 1." {
         return "Device installation failed. Please check: 1) VPN connection, 2) USB cable, 3) Trust dialog, 4) Pairing file."
     }
-
     return cleaned.isEmpty ? "Unknown installation error" : cleaned
 }
 
 // MARK: - Install App
 /// Installs a signed IPA on the device using InstallationProxy
-public func installApp(from ipaURL: URL) async throws
--> AsyncThrowingStream<(progress: Double, status: String), Error> {
+public func installApp(from ipaURL: URL) async throws -> AsyncThrowingStream<(progress: Double, status: String), Error> {
 
-    // Pre-flight check: verify IPA exists
+    // Pre-flight IPA check
     let fileManager = FileManager.default
     guard fileManager.fileExists(atPath: ipaURL.path) else {
         throw NSError(domain: "InstallApp", code: -1, userInfo: [NSLocalizedDescriptionKey: "IPA file not found: \(ipaURL.lastPathComponent)"])
     }
 
-    // Check file size
+    // Validate file size
     do {
         let attributes = try fileManager.attributesOfItem(atPath: ipaURL.path)
         let fileSize = attributes[.size] as? Int64 ?? 0
@@ -119,109 +99,65 @@ public func installApp(from ipaURL: URL) async throws
 
     print("Installing app from: \(ipaURL.path)")
 
-    // === IMPORTANT: explicitly specify element and failure types so the compiler selects
-    // the continuation-style initializer (the one that passes `continuation` to the closure).
     typealias InstallUpdate = (progress: Double, status: String)
     typealias StreamContinuation = AsyncThrowingStream<InstallUpdate, Error>.Continuation
 
     return AsyncThrowingStream<InstallUpdate, Error> { continuation in
         var cancellables = Set<AnyCancellable>()
         var installTask: Task<Void, Never>?
 
-        // Explicitly annotate the termination parameter type so compiler is happy
-        continuation.onTermination = { @Sendable (reason: StreamContinuation.Termination) in
+        continuation.onTermination = { @Sendable reason in
             print("Install stream terminated: \(reason)")
             cancellables.removeAll()
-            // cancel running install task if still active
             installTask?.cancel()
         }
 
         installTask = Task {
-            // Start heartbeat to keep connection alive
             HeartbeatManager.shared.start()
-
-            // initialize view model same as UI code (important)
             let isIdevice = UserDefaults.standard.integer(forKey: "Feather.installationMethod") == 1
             let viewModel = InstallerStatusViewModel(isIdevice: isIdevice)
 
-            // Debug logging for status changes
-// Watch status for completion / errors (replace the previous $isCompleted sink)
-viewModel.$status
-    .sink { newStatus in
-        // If the view model exposes a computed Bool isCompleted, use it (safe regardless of enum shape)
-        if viewModel.isCompleted {
-            print("[Installer] detected completion via viewModel.isCompleted")
-            continuation.yield((1.0, "✅ Successfully installed app!"))
-            continuation.finish()
-            cancellables.removeAll()
-            return
-        }
-
-        // If the status enum contains an error / broken case, finish with that error
-        // This covers the case where broken carries an associated Error
-        if case .broken(let error) = newStatus {
-            print("[Installer] detected broken status ->", error)
-            continuation.finish(throwing: transformInstallError(error))
-            cancellables.removeAll()
-            return
-        }
-
-        // Optional: handle a status that carries failure inside .completed (if that variant exists)
-        // e.g. if your enum had `.completed(.failure(let e))` then add handling here.
-    }
-    .store(in: &cancellables)
+            // Status updates
+            viewModel.$status
+                .sink { newStatus in
+                    if viewModel.isCompleted {
+                        print("[Installer] detected completion via isCompleted")
+                        continuation.yield((1.0, "✅ Successfully installed app!"))
+                        continuation.finish()
+                        cancellables.removeAll()
+                    }
+                    if case .broken(let error) = newStatus {
+                        continuation.finish(throwing: transformInstallError(error))
+                        cancellables.removeAll()
+                    }
+                }
+                .store(in: &cancellables)
 
-            // Progress stream (combine upload & install progress)
+            // Progress stream (upload + install)
             viewModel.$uploadProgress
                 .combineLatest(viewModel.$installProgress)
-                .sink { uploadProgress, installProgress in
-                    let overall = (uploadProgress + installProgress) / 2.0
+                .sink { upload, install in
+                    let overall = (upload + install) / 2
                     let statusText: String
-                    if uploadProgress < 1.0 {
-                        statusText = "📤 Uploading..."
-                    } else if installProgress < 1.0 {
-                        statusText = "📲 Installing..."
-                    } else {
-                        statusText = "🏁 Finalizing..."
-                    }
-                    print("[Installer] progress upload:\(uploadProgress) install:\(installProgress) overall:\(overall)")
+                    if upload < 1.0 { statusText = "📤 Uploading..." }
+                    else if install < 1.0 { statusText = "📲 Installing..." }
+                    else { statusText = "🏁 Finalizing..." }
+                    print("[Installer] progress upload:\(upload) install:\(install) overall:\(overall)")
                     continuation.yield((overall, statusText))
                 }
                 .store(in: &cancellables)
 
-            // Robust completion detection: watch isCompleted
-            viewModel.$isCompleted
-                .sink { completed in
-                    if completed {
-                        print("[Installer] detected completion via isCompleted=true")
-                        continuation.yield((1.0, "✅ Successfully installed app!"))
-                        continuation.finish()
-                        cancellables.removeAll()
-                    }
-                }
-                .store(in: &cancellables)
-
             do {
                 let installer = await InstallationProxy(viewModel: viewModel)
-
-                // If your UI calls install(at: suspend:) when updating itself,
-                // replicate that logic here if you need that behaviour.
                 try await installer.install(at: ipaURL)
-
-                // small delay to let final progress propagate
                 try await Task.sleep(nanoseconds: 500_000_000)
-
                 print("Installation call returned — waiting for viewModel to report completion.")
-
-                // Note: we intentionally don't call continuation.finish() here -
-                // we rely on viewModel.$isCompleted to finish the stream so the
-                // installer has its normal lifecycle.
-
+                // Stream finishes when viewModel.isCompleted becomes true or status reports broken/error
             } catch {
                 print("[Installer] install threw error ->", error)
                 continuation.finish(throwing: transformInstallError(error))
                 cancellables.removeAll()
             }
         }
     }
-}
+}