Merge pull request #2 from ProStore-iOS/install-progress-and-user-friendly-errors

Add Install progress

Author: NovaDev404

README.md

@@ -46,14 +46,10 @@ The **best** alternative app store for iOS!
 ---
 
 ## Gallery
-Coming soon!
-<!--
 <img src="gallery/Screenshot1.png" width="550">&nbsp;
 <img src="gallery/Screenshot2.png" width="550">&nbsp;
 <img src="gallery/Screenshot3.png" width="550">&nbsp;
-<img src="gallery/Screenshot4.png" width="550">&nbsp;
-<img src="gallery/Screenshot5.png" width="550">
--->
+<img src="gallery/Screenshot4.png" width="550">
 
 ---
 
@@ -81,3 +77,4 @@ Coming soon!
 
 
 
+

Sources/prostore/install/installApp.swift

@@ -1,22 +1,81 @@
 // installApp.swift
 import Foundation
 import IDeviceSwift
+import Combine
 
 /// Installs a signed IPA on the device using InstallationProxy
-public func installApp(from ipaURL: URL) async throws {
+public func installApp(from ipaURL: URL) async throws -> AsyncThrowingStream<(progress: Double, status: String), Error> {
     print("Installing app from: \(ipaURL.path)")
 
-    // Start heartbeat to keep connection alive during long install
-    HeartbeatManager.shared.start()
+    return AsyncThrowingStream { continuation in
+        Task {
+            // Start heartbeat to keep connection alive during long install
+            HeartbeatManager.shared.start()
 
-    // Create view model to receive installation status updates
-    let viewModel = InstallerStatusViewModel()
+            // Create view model to receive installation status updates
+            let viewModel = InstallerStatusViewModel()
+            
+            // Observe progress updates
+            var cancellables = Set<AnyCancellable>()
+            
+            // Combine progress updates into a single stream
+            viewModel.$uploadProgress
+                .combineLatest(viewModel.$installProgress)
+                .sink { uploadProgress, installProgress in
+                    let overallProgress = (uploadProgress + installProgress) / 2.0
+                    let currentStage: String
+                    
+                    if uploadProgress < 1.0 {
+                        currentStage = "📤 Uploading..."
+                    } else if installProgress < 1.0 {
+                        currentStage = "📲 Installing..."
+                    } else {
+                        currentStage = "🏁 Finalizing..."
+                    }
+                    
+                    continuation.yield((progress: overallProgress, status: currentStage))
+                }
+                .store(in: &cancellables)
+            
+            // Handle completion
+            viewModel.$status
+                .sink { installerStatus in
+                    switch installerStatus {
+                    case .completed(.success):
+                        continuation.yield((progress: 1.0, status: "Successfully installed app!"))
+                        continuation.finish()
+                        cancellables.removeAll()
+                        
+                    case .completed(.failure(let error)):
+                        continuation.finish(throwing: error)
+                        cancellables.removeAll()
+                        
+                    case .broken(let error):
+                        continuation.finish(throwing: error)
+                        cancellables.removeAll()
+                        
+                    default:
+                        break
+                    }
+                }
+                .store(in: &cancellables)
 
-    // Create the installation proxy
-    let installer = await InstallationProxy(viewModel: viewModel)
+            do {
+                // Create the installation proxy
+                let installer = await InstallationProxy(viewModel: viewModel)
+                
+                // Perform the actual installation
+                try await installer.install(at: ipaURL)
+                
+                // Wait a moment for completion
+                try await Task.sleep(nanoseconds: 1_000_000_000) // 1 second
+                
+                print("Installation completed successfully!")
+            } catch {
+                continuation.finish(throwing: error)
+                cancellables.removeAll()
+            }
+        }
+    }
+}
 
-    // Perform the actual installation
-    try await installer.install(at: ipaURL)
-
-    print("Installation completed successfully!")
-}

Sources/prostore/prostore.swift

@@ -50,12 +50,12 @@ struct MainSidebarView: View {
                         URL(string: "https://repository.apptesters.org/")!,
                         URL(string: "https://wuxu1.github.io/wuxu-complete.json")!,
                         URL(string: "https://wuxu1.github.io/wuxu-complete-plus.json")!,
-                        URL(string: "https://raw.githubusercontent.com/RealBlackAstronaut/CelestialRepo/main/CelestialRepo.json")!,
+                        URL(string: "https://raw.githubusercontent.com/swaggyP36000/TrollStore-IPAs/main/apps_esign.json")!,
                         URL(string: "https://ipa.cypwn.xyz/cypwn.json")!,
                         URL(string: "https://quarksources.github.io/dist/quantumsource.min.json")!,
                         URL(string: "https://bit.ly/quantumsource-plus-min")!,
-                        URL(string: "https://raw.githubusercontent.com/Neoncat-OG/TrollStore-IPAs/main/apps_esign.json")!,
-                        URL(string: "https://quarksources.github.io/altstore-complete.json")!
+                        URL(string: "https://aio.zxcvbn.fyi/r/repo.esign.json")!,
+                        URL(string: "https://raw.githubusercontent.com/Neoncat-OG/TrollStore-IPAs/main/apps_esign.json")!
                     ])
                         .navigationTitle("Apps")
                         .navigationBarTitleDisplayMode(.large)
@@ -84,4 +84,6 @@ enum SidebarItem: Hashable {
     case certificates
     case apps
     case about
-}
+
+}
+