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

Add user friendly errors v1

Author: NovaDev404

Sources/prostore/prostore.swift

@@ -17,13 +17,13 @@ struct ProStore: App {
 }
 
 struct MainSidebarView: View {
-    @State private var selected: SidebarItem? = .apps
+    @State private var selected: SidebarItem? = .store
 
     var body: some View {
         NavigationSplitView {
             List(selection: $selected) {
-                NavigationLink(value: SidebarItem.apps) {
-                    Label("Apps", systemImage: "square.grid.2x2.fill")
+                NavigationLink(value: SidebarItem.store) {
+                    Label("Store", systemImage: "cart.fill")
                 }
                 NavigationLink(value: SidebarItem.certificates) {
                     Label("Certificates", systemImage: "key")
@@ -44,7 +44,7 @@ struct MainSidebarView: View {
                         .navigationTitle("Certificates")
                         .navigationBarTitleDisplayMode(.large)
                 }
-            case .apps:
+            case .store:
                 NavigationStack {
                     AppsView(repoURLs: [
                         URL(string: "https://repository.apptesters.org/")!,
@@ -54,10 +54,9 @@ struct MainSidebarView: View {
                         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://aio.zxcvbn.fyi/r/repo.esign.json")!,
                         URL(string: "https://raw.githubusercontent.com/Neoncat-OG/TrollStore-IPAs/main/apps_esign.json")!
                     ])
-                        .navigationTitle("Apps")
+                        .navigationTitle("Store")
                         .navigationBarTitleDisplayMode(.large)
                 }
             case .about:
@@ -82,8 +81,10 @@ struct MainSidebarView: View {
 enum SidebarItem: Hashable {
     case updater
     case certificates
-    case apps
+    case store
     case about
 
 }
 
+
+

Sources/prostore/signing/DownloadSignManager.swift

@@ -1,4 +1,4 @@
-// DownloadSignManager.swift
+// DownloadSignManager.swift - Updated version
 import Foundation
 import Combine
 
@@ -7,6 +7,8 @@ class DownloadSignManager: ObservableObject {
     @Published var status: String = ""
     @Published var isProcessing: Bool = false
     @Published var showSuccess: Bool = false
+    @Published var showError: Bool = false
+    @Published var errorMessage: String = ""
 
     private var downloadTask: URLSessionDownloadTask?
     private var downloadProgressObservation: NSKeyValueObservation?
@@ -20,13 +22,32 @@ class DownloadSignManager: ObservableObject {
     private let installPortion: Double = 1.0 - (0.33 + 0.33) // ~0.34
 
     func downloadAndSign(app: AltApp) {
-        guard let downloadURL = app.downloadURL else {
-            self.status = "No download URL available"
+        // Reset error state
+        self.showError = false
+        self.errorMessage = ""
+        
+        // Validate certificate selection
+        guard let selectedCertFolder = UserDefaults.standard.string(forKey: "selectedCertificateFolder") else {
+            self.showError(message: "No certificate selected. Please select a certificate first.")
+            return
+        }
+        
+        // Validate certificate files exist
+        guard let certFiles = getCertificateFiles(for: selectedCertFolder) else {
+            self.showError(message: "Certificate files not found or incomplete. Please add a certificate.")
+            return
+        }
+        
+        // Check if pairing file exists (for installation)
+        let fm = FileManager.default
+        let pairingFile = getAppFolder().appendingPathComponent("pairingFile.plist")
+        if !fm.fileExists(atPath: pairingFile.path) {
+            self.showError(message: "Pairing file not found. Please follow setup to place pairing file in the 'ProStore' folder.")
             return
         }
 
-        guard let selectedCertFolder = UserDefaults.standard.string(forKey: "selectedCertificateFolder") else {
-            self.status = "No certificate selected"
+        guard let downloadURL = app.downloadURL else {
+            self.showError(message: "No download URL available for this app")
             return
         }
 
@@ -36,11 +57,17 @@ class DownloadSignManager: ObservableObject {
         self.showSuccess = false
 
         DispatchQueue.global(qos: .userInitiated).async {
-            self.performDownloadAndSign(downloadURL: downloadURL, appName: app.name, certFolder: selectedCertFolder)
+            self.performDownloadAndSign(
+                downloadURL: downloadURL,
+                appName: app.name,
+                p12URL: certFiles.p12URL,
+                provURL: certFiles.provURL,
+                password: certFiles.password
+            )
         }
     }
 
-    private func performDownloadAndSign(downloadURL: URL, appName: String, certFolder: String) {
+    private func performDownloadAndSign(downloadURL: URL, appName: String, p12URL: URL, provURL: URL, password: String) {
         // Step 1: Setup directories
         let fm = FileManager.default
         let appFolder = self.getAppFolder()
@@ -52,8 +79,7 @@ class DownloadSignManager: ObservableObject {
             }
         } catch {
             DispatchQueue.main.async {
-                self.status = "Failed to create temp directory: \(error.localizedDescription)"
-                self.isProcessing = false
+                self.showError(message: "Failed to create temp directory: \(error.localizedDescription)")
             }
             return
         }
@@ -69,22 +95,12 @@ class DownloadSignManager: ObservableObject {
 
             switch result {
             case .success:
-                // Step 3: Get certificate files
-                guard let (p12URL, provURL, password) = self.getCertificateFiles(for: certFolder) else {
-                    DispatchQueue.main.async {
-                        self.status = "Failed to get certificate files"
-                        self.isProcessing = false
-                    }
-                    return
-                }
-
-                // Step 4: Sign the IPA
+                // Step 3: Sign the IPA
                 self.signIPA(ipaURL: tempIPAURL, p12URL: p12URL, provURL: provURL, password: password, appName: appName)
 
             case .failure(let error):
                 DispatchQueue.main.async {
-                    self.status = "Download failed: \(error.localizedDescription)"
-                    self.isProcessing = false
+                    self.showError(message: "Download failed: \(error.localizedDescription)")
                 }
 
                 // Clean up temp file if it exists
@@ -108,9 +124,7 @@ class DownloadSignManager: ObservableObject {
 
             if let error = error as NSError?, error.domain == NSURLErrorDomain, error.code == NSURLErrorCancelled {
                 DispatchQueue.main.async {
-                    self.status = "Cancelled"
-                    self.isProcessing = false
-                    self.progress = 0.0
+                    self.showError(message: "Download cancelled")
                 }
                 completion(.failure(error))
                 return
@@ -166,7 +180,7 @@ class DownloadSignManager: ObservableObject {
         task.resume()
     }
 
-        private func getCertificateFiles(for folderName: String) -> (p12URL: URL, provURL: URL, password: String)? {
+    private func getCertificateFiles(for folderName: String) -> (p12URL: URL, provURL: URL, password: String)? {
         let fm = FileManager.default
         let certsDir = CertificateFileManager.shared.certificatesDirectory.appendingPathComponent(folderName)
 
@@ -194,15 +208,15 @@ class DownloadSignManager: ObservableObject {
             p12URL: p12URL,
             provURL: provURL,
             p12Password: password,
-progressUpdate: { [weak self] status, progress in
-    DispatchQueue.main.async {
-        guard let self = self else { return }
-        let overallProgress = self.downloadPortion + (progress * self.signPortion)
-        self.progress = overallProgress
-        let percentOfSign = Int(round(progress * 100))
-        self.status = "\(status)"
-    }
-},
+            progressUpdate: { [weak self] status, progress in
+                DispatchQueue.main.async {
+                    guard let self = self else { return }
+                    let overallProgress = self.downloadPortion + (progress * self.signPortion)
+                    self.progress = overallProgress
+                    let percentOfSign = Int(round(progress * 100))
+                    self.status = "\(status)"
+                }
+            },
             completion: { [weak self] result in
                 DispatchQueue.main.async {
                     guard let self = self else { return }
@@ -217,8 +231,7 @@ progressUpdate: { [weak self] status, progress in
                         try? FileManager.default.removeItem(at: ipaURL)
 
                     case .failure(let error):
-                        self.status = "❌ Signing failed: \(error.localizedDescription)"
-                        self.isProcessing = false
+                        self.showError(message: "❌ Signing failed: \(error.localizedDescription)")
                         try? FileManager.default.removeItem(at: ipaURL)
                     }
                 }
@@ -269,39 +282,65 @@ progressUpdate: { [weak self] status, progress in
 
             } catch {
                 await MainActor.run {
-                    self.status = "❌ Install failed: \(error.localizedDescription)"
-                    self.isProcessing = false
+                    self.showError(message: "❌ Install failed: \(error.localizedDescription)")
                     self.installationStream = nil
                     self.installationTask = nil
                 }
             }
         }
     }
 
-    func cancel() {
-        downloadTask?.cancel()
-        installationTask?.cancel()
-        installationStream = nil
-        installationTask = nil
-
-        // Remove observer
-        downloadProgressObservation = nil
+    private func showError(message: String) {
+        DispatchQueue.main.async {
+            self.progress = 1.0 // Set to 100%
+            self.status = message
+            self.errorMessage = message
+            self.showError = true
+            self.isProcessing = true // Keep progress bar visible
+            
+            // Hide progress bar after 5 seconds with red state
+            DispatchQueue.main.asyncAfter(deadline: .now() + 5) {
+                self.isProcessing = false
+                self.showError = false
+                self.progress = 0.0
+                self.status = ""
+                self.errorMessage = ""
+                
+                // Clean up any tasks
+                self.cancelTasks()
+            }
+        }
+    }
 
+    func cancel() {
+        cancelTasks()
+        
         DispatchQueue.main.async {
             self.isProcessing = false
+            self.showSuccess = false
+            self.showError = false
             self.status = "Cancelled"
             self.progress = 0.0
+            self.errorMessage = ""
         }
     }
+    
+    private func cancelTasks() {
+        downloadTask?.cancel()
+        installationTask?.cancel()
+        installationStream = nil
+        installationTask = nil
+        downloadProgressObservation = nil
+    }
 
     private func getAppFolder() -> URL {
         let fm = FileManager.default
-        let documents = fm.urls(for: .documentDirectory, in: .userDomainMask).first!
-        let appFolder = documents.appendingPathComponent("AppFolder")
+        let appFolder = fm.urls(for: .documentDirectory, in: .userDomainMask).first!
         if !fm.fileExists(atPath: appFolder.path) {
             try? fm.createDirectory(at: appFolder, withIntermediateDirectories: true)
         }
         return appFolder
     }
-
 }
+
+

Sources/prostore/signing/signer.swift

@@ -60,7 +60,7 @@ fileprivate class SigningManager {
     ) {
         DispatchQueue.global(qos: .userInitiated).async {
             do {
-                progressUpdate("📂 Preparing files", 0.0)
+                progressUpdate("📂 Preparing files...", 0.0)
                 let (tmpRoot, inputsDir, workDir) = try prepareTemporaryWorkspace()
                 defer {
                     cleanupTemporaryFiles(at: tmpRoot)
@@ -71,16 +71,16 @@ fileprivate class SigningManager {
                     provURL: provURL,
                     to: inputsDir
                 )
-                progressUpdate("🔓 Unzipping IPA", 0.25)
+                progressUpdate("🔓 Unzipping IPA...", 0.25)
                 try extractIPA(ipaURL: localIPA, to: workDir, progressUpdate: { progress in
                     // Convert 0.0-1.0 progress to 0.25-0.5 range
                     let overallProgress = 0.25 + (progress * 0.25)
                     let pct = Int(progress * 100)
-                    progressUpdate("🔓 Unzipping IPA", overallProgress)
+                    progressUpdate("🔓 Unzipping IPA...", overallProgress)
                 })
                 let payloadDir = workDir.appendingPathComponent("Payload")
                 let appDir = try findAppBundle(in: payloadDir)
-                progressUpdate("✍️ Signing \(appDir.lastPathComponent)", 0.5)
+                progressUpdate("✍️ Signing \(appDir.lastPathComponent)...", 0.5)
                 let sema = DispatchSemaphore(value: 0)
                 var signingError: Error?
 
@@ -102,7 +102,7 @@ fileprivate class SigningManager {
                     throw error
                 }
 
-                progressUpdate("📦 Zipping signed IPA", 0.75)
+                progressUpdate("📦 Zipping signed IPA...", 0.75)
                 let signedIPAURL = try createSignedIPA(
                     from: workDir,
                     originalIPAURL: ipaURL,
@@ -111,7 +111,7 @@ fileprivate class SigningManager {
                         // Convert 0.0-1.0 progress to 0.75-1.0 range
                         let overallProgress = 0.75 + (progress * 0.25)
                         let pct = Int(progress * 100)
-                        progressUpdate("📦 Zipping signed IPA", overallProgress)
+                        progressUpdate("📦 Zipping signed IPA...", overallProgress)
                     }
                 )
                 completion(.success(signedIPAURL))
@@ -227,3 +227,4 @@ fileprivate class SigningManager {
     }
 }
 
+

Sources/prostore/views/AppsDetailView.swift

@@ -229,13 +229,20 @@ public struct AppDetailView: View {
                     VStack(spacing: 8) {
                         HStack {
                             ProgressView(value: downloadManager.progress, total: 1.0)
-                                .progressViewStyle(LinearProgressViewStyle(tint: downloadManager.showSuccess ? .green : .blue))
+                                .progressViewStyle(LinearProgressViewStyle(
+                                    tint: downloadManager.showSuccess ? .green : 
+                                          (downloadManager.showError ? .red : .blue)
+                                ))
                                 .scaleEffect(x: 1, y: 1.5, anchor: .center)
 
                             if downloadManager.showSuccess {
                                 Image(systemName: "checkmark.circle.fill")
                                     .foregroundColor(.green)
                                     .font(.title2)
+                            } else if downloadManager.showError {
+                                Image(systemName: "xmark.circle.fill")
+                                    .foregroundColor(.red)
+                                    .font(.title2)
                             } else {
                                 Text("\(Int(downloadManager.progress * 100))%")
                                     .font(.caption)
@@ -247,13 +254,16 @@ public struct AppDetailView: View {
                         HStack {
                             Text(downloadManager.status)
                                 .font(.caption)
-                                .foregroundColor(downloadManager.showSuccess ? .green : .secondary)
-                                .lineLimit(1)
-                                .truncationMode(.middle)
+                                .foregroundColor(
+                                    downloadManager.showSuccess ? .green : 
+                                    (downloadManager.showError ? .red : .secondary)
+                                )
+                                .lineLimit(2) // Allow 2 lines for error messages
+                                .truncationMode(.tail)
 
                             Spacer()
 
-                            if !downloadManager.showSuccess {
+                            if !downloadManager.showSuccess && !downloadManager.showError {
                                 Button("Cancel") {
                                     downloadManager.cancel()
                                 }
@@ -292,5 +302,6 @@ public struct AppDetailView: View {
         }
         .animation(.easeInOut(duration: 0.3), value: downloadManager.isProcessing)
         .animation(.easeInOut(duration: 0.3), value: downloadManager.showSuccess)
+        .animation(.easeInOut(duration: 0.3), value: downloadManager.showError)
     }
 }