Remove the annyo stuff

Author: NovaDev404

Sources/prostore/install/installApp.swift

@@ -1,34 +1,52 @@
+// installAppStream.swift
 import Foundation
 import Combine
 import IDeviceSwift
 
-public func installAppWithStatus(from ipaURL: URL, viewModel: InstallerViewModel) async throws {
-    var cancellables = Set<AnyCancellable>()
+public func installAppWithStatusStream(from ipaURL: URL) -> AsyncThrowingStream<InstallerStatusViewModel.InstallerStatus, Error> {
+    AsyncThrowingStream { continuation in
+        // create a local view model for the InstallationProxy internals
+        let localVM = InstallerStatusViewModel()
+        var cancellables = Set<AnyCancellable>()
 
-    viewModel.$uploadProgress
-        .sink { progress in
-            DispatchQueue.main.async {
-                let percent = Int(progress * 100)
-                viewModel.status = .uploading(percent: percent)
-                viewModel.progress = 0.5 + (progress * 0.25)
+        // Observe progress and forward into the AsyncStream
+        localVM.$uploadProgress
+            .sink { progress in
+                let pct = Int(progress * 100)
+                continuation.yield(.uploading(percent: pct))
             }
-        }
-        .store(in: &cancellables)
+            .store(in: &cancellables)
 
-    viewModel.$installProgress
-        .sink { progress in
-            DispatchQueue.main.async {
-                let percent = Int(progress * 100)
-                viewModel.status = .installing(percent: percent)
-                viewModel.progress = 0.75 + (progress * 0.25)
+        localVM.$installProgress
+            .sink { progress in
+                let pct = Int(progress * 100)
+                continuation.yield(.installing(percent: pct))
             }
-        }
-        .store(in: &cancellables)
+            .store(in: &cancellables)
 
-    // DON'T reassign viewModel.status inside a sink on viewModel.$status —
-    // that just creates a loop. If you want to react to status changes elsewhere,
-    // observe it and map to UI strings there.
+        // Optionally map other status changes
+        localVM.$status
+            .sink { status in
+                continuation.yield(status)
+            }
+            .store(in: &cancellables)
 
-    let installer = InstallationProxy(viewModel: viewModel)
-    try await installer.install(at: ipaURL)
+        Task {
+            do {
+                let installer = InstallationProxy(viewModel: localVM)
+                try await installer.install(at: ipaURL)
+                continuation.yield(.success)
+                continuation.finish()
+            } catch {
+                // forward failure as an enum + error finishing
+                continuation.yield(.failure(message: error.localizedDescription))
+                continuation.finish(throwing: error)
+            }
+        }
+
+        // on stream termination, cancel Combine sinks
+        continuation.onTermination = { @Sendable _ in
+            cancellables.forEach { $0.cancel() }
+        }
+    }
 }

Sources/prostore/signing/DownloadSignManager.swift

@@ -191,39 +191,26 @@ private func signAndInstallIPA(
                 }
 
                 // Create a view model for installation progress
-// Create a view model for installation progress
-let installerViewModel = InstallerViewModel()
+// inside your Task after signing completes
+let stream = installAppWithStatusStream(from: signedIPAURL)
 
 Task {
     do {
-        try await installAppWithStatus(from: signedIPAURL, viewModel: installerViewModel)
-
-        // Observe the viewModel status to update your UI
-        installerViewModel.$status
-            .receive(on: DispatchQueue.main)
-            .sink { status in
+        for try await status in stream {
+            DispatchQueue.main.async {
                 switch status {
-                case .idle:
-                    break
-                case .uploading(let percent), .installing(let percent):
-                    self.progress = Double(percent) / 100.0
+                case .idle: break
+                case .uploading(let pct), .installing(let pct):
+                    self.progress = Double(pct) / 100.0
                     self.status = status.pretty
                 case .success:
-                    self.status = InstallerViewModel.InstallerStatus.success.pretty
-                case .failure(let message):
-                    self.status = InstallerViewModel.InstallerStatus.failure(message: message).pretty
+                    self.status = status.pretty
+                case .failure(let msg):
+                    self.status = status.pretty
                 case .message(let text):
                     self.status = text
                 }
             }
-            .store(in: &self.cancellables)
-
-        // Hide the bar 3 seconds after install is complete
-        DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
-            self.isProcessing = false
-            self.showSuccess = false
-            self.progress = 0.0
-            self.status = ""
         }
     } catch {
         DispatchQueue.main.async {
@@ -233,6 +220,7 @@ Task {
     }
 }
 
+
                 // Clean up original downloaded IPA
                 try? FileManager.default.removeItem(at: ipaURL)