@capawesome/capacitor-live-update 6.7.2 → 7.1.0

package/ios/Plugin/LiveUpdate.swift

@@ -1,6 +1,10 @@
 import Foundation
 import CryptoKit
+#if canImport(ZipArchive)
+import ZipArchive
+#else
 import SSZipArchive
+#endif
 import Capacitor
 import Alamofire
 import CommonCrypto
@@ -12,7 +16,6 @@ import CommonCrypto
     private let config: LiveUpdateConfig
     private let defaultWebAssetDir = "public" // DO NOT CHANGE! (See https://dub.sh/Buvz4yj)
     private let defaultServerPathKey = "serverBasePath" // DO NOT CHANGE! (See https://dub.sh/ceDl0zT)
-    private let host: String
     private let httpClient: LiveUpdateHttpClient
     private let libraryDirectoryUrl = FileManager.default.urls(for: .libraryDirectory, in: .userDomainMask).first!
     private let manifestFileName = "capawesome-live-update-manifest.json" // DO NOT CHANGE!
@@ -20,41 +23,31 @@ import CommonCrypto
     private let preferences: LiveUpdatePreferences
 
     private var rollbackDispatchWorkItem: DispatchWorkItem?
+    private var rollbackPerformed = false
 
     init(config: LiveUpdateConfig, plugin: LiveUpdatePlugin) {
         self.config = config
-        if (config.location != nil) && config.location == "eu" {
-            self.host = "api.cloud.capawesome.eu"
-        } else {
-            self.host = "api.cloud.capawesome.io"
-        }
         self.httpClient = LiveUpdateHttpClient(config: config)
         self.plugin = plugin
         self.preferences = LiveUpdatePreferences()
         super.init()
 
-        if config.enabled {
-            if wasUpdated() && config.resetOnUpdate {
-                CAPLog.print("[", LiveUpdatePlugin.tag, "] ", "App was updated. Resetting to default bundle.")
-                reset()
-            } else {
-                startRollbackTimer()
-            }
-            saveCurrentBundleShortVersionStringAndBundleVersion()
-        }
+        // Start the rollback timer to rollback to the default bundle
+        // if the app is not ready after a certain time
+        startRollbackTimer()
     }
 
     @objc public func deleteBundle(_ options: DeleteBundleOptions, completion: @escaping (Error?) -> Void) {
         let bundleId = options.getBundleId()
 
-        if !hasBundle(bundleId: bundleId) {
+        if !hasBundleById(bundleId) {
             let error = CustomError.bundleNotFound
             completion(error)
             return
         }
 
         do {
-            try deleteBundle(bundleId: bundleId)
+            try deleteBundleById(bundleId)
             completion(nil)
         } catch {
             completion(error)
@@ -65,10 +58,11 @@ import CommonCrypto
         let artifactType = options.getArtifactType()
         let bundleId = options.getBundleId()
         let checksum = options.getChecksum()
+        let signature = options.getSignature()
         let url = options.getUrl()
 
         // Check if the bundle already exists
-        if hasBundle(bundleId: bundleId) {
+        if hasBundleById(bundleId) {
             throw CustomError.bundleAlreadyExists
         }
 
@@ -76,22 +70,13 @@ import CommonCrypto
         if artifactType == .manifest {
             try await downloadBundleOfTypeManifest(bundleId: bundleId, url: url)
         } else {
-            try await downloadBundleOfTypeZip(bundleId: bundleId, url: url, checksum: checksum)
+            try await downloadBundleOfTypeZip(bundleId: bundleId, checksum: checksum, signature: signature, url: url)
         }
     }
 
     @objc public func fetchLatestBundle(_ options: FetchLatestBundleOptions) async throws -> FetchLatestBundleResult {
         let response: GetLatestBundleResponse? = try await self.fetchLatestBundle(options)
-        return FetchLatestBundleResult(artifactType: response?.artifactType, bundleId: response?.bundleId, downloadUrl: response?.url)
-    }
-
-    @objc public func getBundle(completion: @escaping (Result?, Error?) -> Void) {
-        var bundleId = getCurrentBundleId()
-        if bundleId == defaultWebAssetDir {
-            bundleId = nil
-        }
-        let result = GetBundleResult(bundleId: bundleId)
-        completion(result, nil)
+        return FetchLatestBundleResult(artifactType: response?.artifactType, bundleId: response?.bundleId, checksum: response?.checksum, customProperties: response?.customProperties, downloadUrl: response?.url, signature: response?.signature)
     }
 
     @objc public func getBundles(completion: @escaping (Result?, Error?) -> Void) {
@@ -107,10 +92,7 @@ import CommonCrypto
     }
 
     @objc public func getCurrentBundle(completion: @escaping (Result?, Error?) -> Void) {
-        var bundleId = getCurrentBundleId()
-        if bundleId == defaultWebAssetDir {
-            bundleId = nil
-        }
+        let bundleId = getCurrentBundleId()
         let result = GetCurrentBundleResult(bundleId: bundleId)
         completion(result, nil)
     }
@@ -129,10 +111,7 @@ import CommonCrypto
     }
 
     @objc public func getNextBundle(completion: @escaping (Result?, Error?) -> Void) {
-        var bundleId: String? = getNextBundleId()
-        if bundleId == defaultWebAssetDir {
-            bundleId = nil
-        }
+        let bundleId: String? = getNextBundleId()
         let result = GetNextBundleResult(bundleId: bundleId)
         completion(result, nil)
     }
@@ -149,12 +128,27 @@ import CommonCrypto
         completion(result, nil)
     }
 
-    @objc public func ready() {
+    @objc public func ready(completion: @escaping (Result?, Error?) -> Void) {
         CAPLog.print("[", LiveUpdatePlugin.tag, "] ", "App is ready.")
+        if config.readyTimeout <= 0 {
+            CAPLog.print("[", LiveUpdatePlugin.tag, "] ", "Ready timeout is set to 0. Automatic rollback is disabled.")
+        }
+        // Stop the rollback timer
         stopRollbackTimer()
+        // Delete unused bundles
         if config.autoDeleteBundles {
             deleteUnusedBundles()
         }
+        // Get the current and previous bundle IDs
+        let currentBundleId = getCurrentBundleId()
+        let previousBundleId = getPreviousBundleId()
+        // Return the result
+        let result = ReadyResult(currentBundleId: currentBundleId, previousBundleId: previousBundleId, rollback: rollbackPerformed)
+        completion(result, nil)
+        // Set the new previous bundle ID
+        setPreviousBundleId(bundleId: currentBundleId)
+        // Reset the rollback flag
+        rollbackPerformed = false
     }
 
     @objc public func reload() {
@@ -164,21 +158,7 @@ import CommonCrypto
     }
 
     @objc public func reset() {
-        self.setNextCapacitorServerPathToDefaultWebAssetDir()
-    }
-
-    @objc public func setBundle(_ options: SetBundleOptions, completion: @escaping (Error?) -> Void) {
-        let bundleId = options.getBundleId()
-
-        // Check if the bundle already exists
-        if !hasBundle(bundleId: bundleId) {
-            let error = CustomError.bundleNotFound
-            completion(error)
-            return
-        }
-
-        setNextBundle(bundleId: bundleId)
-        completion(nil)
+        self.setNextBundleById(nil)
     }
 
     @objc public func setChannel(_ options: SetChannelOptions, completion: @escaping (Error?) -> Void) {
@@ -199,8 +179,8 @@ import CommonCrypto
         let bundleId = options.getBundleId()
 
         if let bundleId = bundleId {
-            if hasBundle(bundleId: bundleId) {
-                setNextBundle(bundleId: bundleId)
+            if hasBundleById(bundleId) {
+                setNextBundleById(bundleId)
             } else {
                 let error = CustomError.bundleNotFound
                 completion(error)
@@ -223,14 +203,16 @@ import CommonCrypto
         }
         let artifactType = response.artifactType
         let latestBundleId = response.bundleId
+        let checksum = response.checksum
+        let signature = response.signature
         let downloadUrl = response.url
         // Check if bundle already exists
-        if hasBundle(bundleId: latestBundleId) {
+        if hasBundleById(latestBundleId) {
             var nextBundleId: String?
             let currentBundleId = self.getCurrentBundleId()
             if latestBundleId != currentBundleId {
                 // Set the next bundle
-                setNextBundle(bundleId: latestBundleId)
+                setNextBundleById(latestBundleId)
                 nextBundleId = latestBundleId
             }
             return SyncResult(nextBundleId: nextBundleId)
@@ -239,10 +221,10 @@ import CommonCrypto
         if artifactType == .manifest {
             try await downloadBundleOfTypeManifest(bundleId: latestBundleId, url: downloadUrl)
         } else {
-            try await downloadBundleOfTypeZip(bundleId: latestBundleId, url: downloadUrl, checksum: nil)
+            try await downloadBundleOfTypeZip(bundleId: latestBundleId, checksum: checksum, signature: signature, url: downloadUrl)
         }
         // Set the next bundle
-        setNextBundle(bundleId: latestBundleId)
+        setNextBundleById(latestBundleId)
         return SyncResult(nextBundleId: latestBundleId)
     }
 
@@ -271,12 +253,12 @@ import CommonCrypto
         try self.addBundle(bundleId: bundleId, directory: unzippedDirectory)
     }
 
-    private func buildCapacitorServerPathFor(bundleId: String) -> String {
+    private func buildCapacitorServerPathFor(bundleId: String?) -> String {
         let path: String
-        if bundleId == "public" {
-            path = Bundle.main.bundleURL.appendingPathComponent(bundleId).path
-        } else {
+        if let bundleId = bundleId {
             path = buildBundlePathFor(bundleId: bundleId)
+        } else {
+            path = Bundle.main.bundleURL.appendingPathComponent(defaultWebAssetDir).path
         }
         return path
     }
@@ -290,31 +272,28 @@ import CommonCrypto
         return url
     }
 
-    private func copyCurrentBundleFile(href: String, toDirectory: URL) throws {
-        guard let currentBundleId = getCurrentBundleId() else {
-            return
-        }
-
-        let destination = toDirectory.appendingPathComponent(href)
+    private func copyCurrentBundleFile(fileToCopy: ManifestItem, toDirectory: URL) throws {
+        let currentBundleId = getCurrentBundleId()
+        let destination = toDirectory.appendingPathComponent(fileToCopy.href)
         let parentDirectory = destination.deletingLastPathComponent()
         try FileManager.default.createDirectory(at: parentDirectory, withIntermediateDirectories: true, attributes: nil)
 
         let sourceURL: URL
-        if currentBundleId == defaultWebAssetDir {
-            guard let file = Bundle.main.url(forResource: href, withExtension: nil, subdirectory: defaultWebAssetDir) else {
+        if let currentBundleId = currentBundleId {
+            sourceURL = buildBundleURLFor(bundleId: currentBundleId).appendingPathComponent(fileToCopy.href)
+        } else {
+            guard let file = Bundle.main.url(forResource: fileToCopy.href, withExtension: nil, subdirectory: defaultWebAssetDir) else {
                 return
             }
             sourceURL = file
-        } else {
-            sourceURL = buildBundleURLFor(bundleId: currentBundleId).appendingPathComponent(href)
         }
 
         try FileManager.default.copyItem(at: sourceURL, to: destination)
     }
 
-    private func copyCurrentBundleFiles(hrefs: [String], toDirectory: URL) throws {
-        for href in hrefs {
-            try copyCurrentBundleFile(href: href, toDirectory: toDirectory)
+    private func copyCurrentBundleFiles(filesToCopy: [ManifestItem], toDirectory: URL) throws {
+        for fileToCopy in filesToCopy {
+            try copyCurrentBundleFile(fileToCopy: fileToCopy, toDirectory: toDirectory)
         }
     }
 
@@ -336,14 +315,14 @@ import CommonCrypto
         return temporaryDirectory
     }
 
-    private func deleteBundle(bundleId: String) throws {
+    private func deleteBundleById(_ bundleId: String) throws {
         // Delete the bundle directory
         let path = buildBundlePathFor(bundleId: bundleId)
         try FileManager.default.removeItem(atPath: path)
         // Reset the next bundle if it is the deleted bundle
         let nextBundleId = getNextBundleId()
         if bundleId == nextBundleId {
-            setNextCapacitorServerPathToDefaultWebAssetDir()
+            setNextBundleById(nil)
         }
     }
 
@@ -355,7 +334,7 @@ import CommonCrypto
         for bundleId in bundleIds {
             if bundleId != currentBundleId && bundleId != nextBundleId {
                 do {
-                    try deleteBundle(bundleId: bundleId)
+                    try deleteBundleById(bundleId)
                 } catch {
                     CAPLog.print("[", LiveUpdatePlugin.tag, "] ", "Failed to delete bundle with id: \(bundleId)")
                 }
@@ -363,12 +342,12 @@ import CommonCrypto
         }
     }
 
-    private func downloadAndVerifyFile(url: String, file: URL, checksum: String?) async throws {
+    private func downloadAndVerifyFile(url: String, file: URL, checksum: String?, signature: String?, callback: ((Progress) -> Void)?) async throws {
         let destination: DownloadRequest.Destination = { _, _ in
             return (file, [.createIntermediateDirectories])
         }
         let urlComponents = URLComponents(string: url)!
-        let result = try await httpClient.download(url: urlComponents.asURL(), destination: destination)
+        let result = try await httpClient.download(url: urlComponents.asURL(), destination: destination, callback: callback)
         if let error = result.error {
             CAPLog.print("[", LiveUpdatePlugin.tag, "] ", "Failed to download file: \(error)")
             if let urlError = error.underlyingError as? URLError {
@@ -381,31 +360,59 @@ import CommonCrypto
         guard let response = result.response else {
             throw CustomError.unknown
         }
-        let checksum = checksum == nil ? LiveUpdateHttpClient.getChecksumFromResponse(response: response) : checksum
-        let signature = LiveUpdateHttpClient.getSignatureFromResponse(response: response)
+        let checksum = checksum ?? LiveUpdateHttpClient.getChecksumFromResponse(response: response)
+        let signature = signature ?? LiveUpdateHttpClient.getSignatureFromResponse(response: response)
         try verifyFile(url: file, checksum: checksum, signature: signature)
     }
 
-    private func downloadBundleFile(baseUrl: String, href: String, directory: URL) async throws -> URL {
+    private func downloadBundleFile(baseUrl: String, href: String, directory: URL, callback: ((Progress) -> Void)?) async throws -> URL {
         let fileURL = directory.appendingPathComponent(href)
         var parameters = [String: String]()
         parameters["href"] = href
         var urlComponents = URLComponents(string: baseUrl)!
         urlComponents.queryItems = parameters.map { URLQueryItem(name: $0.key, value: $0.value) }
         let url = urlComponents.string!
-        try await self.downloadAndVerifyFile(url: url, file: fileURL, checksum: nil)
+        try await self.downloadAndVerifyFile(url: url, file: fileURL, checksum: nil, signature: nil, callback: callback)
         return fileURL
     }
 
-    private func downloadBundleFiles(url: String, hrefs: [String], directory: URL) async throws {
+    private func downloadBundleFiles(url: String, filesToDownload: [ManifestItem], directory: URL, callback: ((Progress) -> Void)?) async throws {
+        let totalBytesToDownload = Int64(filesToDownload.map { $0.sizeInBytes }.reduce(0, +))
+        actor TotalBytesDownloaded {
+            var value: Int64 = 0
+            func add(_ amount: Int64) {
+                value += amount
+            }
+        }
+        let totalBytesDownloaded = TotalBytesDownloaded()
         try await withThrowingTaskGroup(of: Void.self) { group in
-            for href in hrefs {
+            for fileToDownload in filesToDownload {
                 group.addTask {
-                    _ = try await self.downloadBundleFile(baseUrl: url, href: href, directory: directory)
+                    _ = try await self.downloadBundleFile(baseUrl: url, href: fileToDownload.href, directory: directory, callback: { progress in
+                        Task {
+                            // Progress is only reported if the file is downloaded in chunks
+                            if let callback = callback {
+                                let totalBytesDownloaded = await totalBytesDownloaded.value
+                                let totalProgress = Progress(totalUnitCount: totalBytesToDownload, completedUnitCount: progress.completedUnitCount + totalBytesDownloaded)
+                                callback(totalProgress)
+                            }
+                        }
+                    })
+                    // Emit the current progress in case the file was not downloaded in chunks
+                    if let callback = callback {
+                        await totalBytesDownloaded.add(Int64(fileToDownload.sizeInBytes))
+                        let totalBytesDownloaded = await totalBytesDownloaded.value
+                        let totalProgress = Progress(totalUnitCount: totalBytesToDownload, completedUnitCount: totalBytesDownloaded)
+                        callback(totalProgress)
+                    }
                 }
             }
-
             try await group.waitForAll()
+            // Call the callback one last time to make sure the progress is at 100%
+            if let callback = callback {
+                let totalProgress = Progress(totalUnitCount: totalBytesToDownload, completedUnitCount: totalBytesToDownload)
+                callback(totalProgress)
+            }
         }
     }
 
@@ -413,7 +420,7 @@ import CommonCrypto
         // Create a temporary directory
         let temporaryDirectory = try createTemporaryDirectory()
         // Download the latest manifest
-        let latestManifestFile = try await downloadBundleFile(baseUrl: url, href: manifestFileName, directory: temporaryDirectory)
+        let latestManifestFile = try await downloadBundleFile(baseUrl: url, href: manifestFileName, directory: temporaryDirectory, callback: nil)
         let latestManifest = try loadManifest(file: latestManifestFile)
         // Load the current manifest
         let currentManifest = try loadCurrentManifest()
@@ -427,18 +434,24 @@ import CommonCrypto
             itemsToDownload.append(contentsOf: latestManifest.items)
         }
         // Copy the files
-        try self.copyCurrentBundleFiles(hrefs: itemsToCopy.map { $0.href }, toDirectory: temporaryDirectory)
+        try self.copyCurrentBundleFiles(filesToCopy: itemsToCopy, toDirectory: temporaryDirectory)
         // Download the files
-        try await self.downloadBundleFiles(url: url, hrefs: itemsToDownload.map { $0.href }, directory: temporaryDirectory)
+        try await self.downloadBundleFiles(url: url, filesToDownload: itemsToDownload, directory: temporaryDirectory, callback: { progress in
+            let event = DownloadBundleProgressEvent(bundleId: bundleId, downloadedBytes: progress.completedUnitCount, totalBytes: progress.totalUnitCount)
+            self.notifyDownloadBundleProgressListeners(event)
+        })
         // Add the bundle
         try await addBundleOfTypeManifest(bundleId: bundleId, directory: temporaryDirectory)
     }
 
-    private func downloadBundleOfTypeZip(bundleId: String, url: String, checksum: String?) async throws {
+    private func downloadBundleOfTypeZip(bundleId: String, checksum: String?, signature: String?, url: String) async throws {
         let timestamp = String(Int(Date().timeIntervalSince1970))
         let temporaryZipFileUrl = self.cachesDirectoryUrl.appendingPathComponent(timestamp + ".zip")
         // Download the bundle
-        try await downloadAndVerifyFile(url: url, file: temporaryZipFileUrl, checksum: checksum)
+        try await downloadAndVerifyFile(url: url, file: temporaryZipFileUrl, checksum: checksum, signature: signature, callback: { progress in
+            let event = DownloadBundleProgressEvent(bundleId: bundleId, downloadedBytes: progress.completedUnitCount, totalBytes: progress.totalUnitCount)
+            self.notifyDownloadBundleProgressListeners(event)
+        })
         // Add the bundle
         try await addBundleOfTypeZip(bundleId: bundleId, zipFile: temporaryZipFileUrl)
     }
@@ -455,7 +468,7 @@ import CommonCrypto
         parameters["osVersion"] = await UIDevice.current.systemVersion
         parameters["platform"] = "1"
         parameters["pluginVersion"] = LiveUpdatePlugin.version
-        var urlComponents = URLComponents(string: "https://\(host)/v1/apps/\(config.appId ?? "")/bundles/latest")!
+        var urlComponents = URLComponents(string: "https://\(config.serverDomain)/v1/apps/\(config.appId ?? "")/bundles/latest")!
         urlComponents.queryItems = parameters.map { URLQueryItem(name: $0.key, value: $0.value) }
         let url = try urlComponents.asURL()
         CAPLog.print("[", LiveUpdatePlugin.tag, "] Fetching latest bundle: ", url)
@@ -517,12 +530,16 @@ import CommonCrypto
         return digest.map { String(format: "%02hhx", $0) }.joined()
     }
 
-    /// - Returns: The current bundle ID (`public` for the built-in bundle) or `nil` if no view controller was found.
+    /// - Returns: The current bundle ID or `nil` if no view controller was found (should never happen) or the default bundle is in use.
     private func getCurrentBundleId() -> String? {
         guard let path = getCurrentCapacitorServerPath() else {
             return nil
         }
-        return URL(fileURLWithPath: path).lastPathComponent
+        let bundleId = URL(fileURLWithPath: path).lastPathComponent
+        if bundleId == defaultWebAssetDir {
+            return nil
+        }
+        return bundleId
     }
 
     /// - Returns: The path to the current bundle directory or `nil` if no view controller was found.
@@ -538,21 +555,30 @@ import CommonCrypto
         return deviceId.lowercased()
     }
 
-    /// - Returns: The next bundle ID (`public` for the built-in bundle).
-    private func getNextBundleId() -> String {
+    /// - Returns: The next bundle ID or `nil` if the default bundle will be used.
+    private func getNextBundleId() -> String? {
         let path = getNextCapacitorServerPath()
-        return URL(fileURLWithPath: path).lastPathComponent
+        let bundleId = URL(fileURLWithPath: path).lastPathComponent
+        if bundleId == defaultWebAssetDir {
+            return nil
+        }
+        return bundleId
     }
 
     /// - Returns: The absolute path to the next bundle directory.
     private func getNextCapacitorServerPath() -> String {
-        let defaultCapacitorServerPath = buildCapacitorServerPathFor(bundleId: defaultWebAssetDir)
+        let defaultCapacitorServerPath = buildCapacitorServerPathFor(bundleId: nil)
         if let path = KeyValueStore.standard[self.defaultServerPathKey, as: String.self] {
             return path.isEmpty ? defaultCapacitorServerPath : path
         }
         return defaultCapacitorServerPath
     }
 
+    /// - Returns: The previous bundle ID or `nil` if the default bundle was used.
+    private func getPreviousBundleId() -> String? {
+        return preferences.getPreviousBundleId()
+    }
+
     private func getVersionCode() -> String {
         guard let appVersionCode = Bundle.main.infoDictionary?["CFBundleVersion"] as? String else {
             return ""
@@ -567,27 +593,24 @@ import CommonCrypto
         return appVersionName
     }
 
-    private func hasBundle(bundleId: String) -> Bool {
+    private func hasBundleById(_ bundleId: String) -> Bool {
         let path = buildBundlePathFor(bundleId: bundleId)
         return FileManager.default.fileExists(atPath: path)
     }
 
     private func loadCurrentManifest() throws -> Manifest? {
-        guard let currentBundleId = getCurrentBundleId() else {
-            return nil
-        }
-        if currentBundleId == defaultWebAssetDir {
-            let files = Bundle.main.urls(forResourcesWithExtension: nil, subdirectory: defaultWebAssetDir) ?? []
-            let manifestFileUrl = files.first { $0.lastPathComponent == manifestFileName }
-            if let manifestFileUrl = manifestFileUrl {
+        if let currentBundleId = getCurrentBundleId() {
+            let manifestFileUrl = buildBundleURLFor(bundleId: currentBundleId).appendingPathComponent(manifestFileName)
+            let manifestFileExists = FileManager.default.fileExists(atPath: manifestFileUrl.path)
+            if manifestFileExists {
                 return try loadManifest(file: manifestFileUrl)
             } else {
                 return nil
             }
         } else {
-            let manifestFileUrl = buildBundleURLFor(bundleId: currentBundleId).appendingPathComponent(manifestFileName)
-            let manifestFileExists = FileManager.default.fileExists(atPath: manifestFileUrl.path)
-            if manifestFileExists {
+            let files = Bundle.main.urls(forResourcesWithExtension: nil, subdirectory: defaultWebAssetDir) ?? []
+            let manifestFileUrl = files.first { $0.lastPathComponent == manifestFileName }
+            if let manifestFileUrl = manifestFileUrl {
                 return try loadManifest(file: manifestFileUrl)
             } else {
                 return nil
@@ -602,21 +625,24 @@ import CommonCrypto
         return Manifest(items: items)
     }
 
+    private func notifyDownloadBundleProgressListeners(_ event: DownloadBundleProgressEvent) {
+        plugin.notifyDownloadBundleProgressListeners(event)
+    }
+
     private func rollback() {
-        if getCurrentBundleId() == defaultWebAssetDir {
+        // Set the rollback flag
+        rollbackPerformed = true
+        // Set the new previous bundle ID
+        let currentBundleId = getCurrentBundleId()
+        setPreviousBundleId(bundleId: currentBundleId)
+        // Perform the rollback
+        if let _ = currentBundleId {
+            CAPLog.print("[", LiveUpdatePlugin.tag, "] ", "App is not ready. Rolling back to default bundle.")
+            setNextBundleById(nil)
+            setCurrentBundleById(nil)
+        } else {
             CAPLog.print("[", LiveUpdatePlugin.tag, "] ", "App is not ready. Default bundle is already in use.")
-            return
         }
-        CAPLog.print("[", LiveUpdatePlugin.tag, "] ", "App is not ready. Rolling back to default bundle.")
-        setNextCapacitorServerPathToDefaultWebAssetDir()
-        setCurrentCapacitorServerPathToDefaultWebAssetDir()
-    }
-
-    private func saveCurrentBundleShortVersionStringAndBundleVersion() {
-        let currentBundleShortVersionString = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
-        preferences.setLastBundleShortVersionString(currentBundleShortVersionString)
-        let currentBundleVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as? String
-        preferences.setLastBundleVersion(currentBundleVersion)
     }
 
     private func searchIndexHtmlFile(url: URL) -> URL? {
@@ -646,6 +672,12 @@ import CommonCrypto
         return nil
     }
 
+    /// - Parameter bundleId: The bundle ID to set as the current bundle. If `nil`, the default bundle will be used.
+    private func setCurrentBundleById(_ bundleId: String?) {
+        let path = buildCapacitorServerPathFor(bundleId: bundleId)
+        setCurrentCapacitorServerPath(path: path)
+    }
+
     private func setCurrentCapacitorServerPath(path: String) {
         guard let viewController = self.plugin.bridge?.viewController as? CAPBridgeViewController else {
             return
@@ -653,12 +685,8 @@ import CommonCrypto
         viewController.setServerBasePath(path: path)
     }
 
-    private func setCurrentCapacitorServerPathToDefaultWebAssetDir() {
-        let path = buildCapacitorServerPathFor(bundleId: defaultWebAssetDir)
-        setCurrentCapacitorServerPath(path: path)
-    }
-
-    private func setNextBundle(bundleId: String) {
+    /// - Parameter bundleId: The bundle ID to set as the next bundle. If `nil`, the default bundle will be used.
+    private func setNextBundleById(_ bundleId: String?) {
         let path = buildCapacitorServerPathFor(bundleId: bundleId)
         setNextCapacitorServerPath(path: path)
     }
@@ -673,12 +701,15 @@ import CommonCrypto
         }
     }
 
-    private func setNextCapacitorServerPathToDefaultWebAssetDir() {
-        let path = buildCapacitorServerPathFor(bundleId: defaultWebAssetDir)
-        setNextCapacitorServerPath(path: path)
+    /// - Parameter bundleId: The bundle ID to save as the previous bundle ID. If `nil`, the value will be removed.
+    private func setPreviousBundleId(bundleId: String?) {
+        preferences.setPreviousBundleId(bundleId)
     }
 
     private func startRollbackTimer() {
+        guard config.readyTimeout > 0 else {
+            return
+        }
         stopRollbackTimer()
         rollbackDispatchWorkItem = DispatchWorkItem { [weak self] in
             self?.rollback()
@@ -785,27 +816,6 @@ import CommonCrypto
         }
         return verificationResult
     }
-
-    private func wasUpdated() -> Bool {
-        guard let lastBundleShortVersionString = preferences.getLastBundleShortVersionString() else {
-            // If the last bundle short version is not set, the app may have been updated
-            return true
-        }
-        guard let lastBundleVersionString = preferences.getLastBundleVersion() else {
-            // If the last bundle version is not set, the app may have been updated
-            return true
-        }
-        guard let currentBundleShortVersionString = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String else {
-            // If the current bundle short version is not set, return true for safety reasons
-            return true
-        }
-        guard let currentBundleVersionString = Bundle.main.infoDictionary?["CFBundleVersion"] as? String else {
-            // If the current bundle version is not set, return true for safety reasons
-            return true
-        }
-        // `CFBundleVersion` is not unique across different versions of the app
-        return lastBundleShortVersionString + "_" + lastBundleVersionString != currentBundleShortVersionString + "_" + currentBundleVersionString
-    }
 }
 
 extension DispatchQueue {
@@ -820,3 +830,10 @@ extension DispatchQueue {
         }
     }
 }
+
+extension Progress {
+    convenience init(totalUnitCount: Int64, completedUnitCount: Int64) {
+        self.init(totalUnitCount: totalUnitCount)
+        self.completedUnitCount = completedUnitCount
+    }
+}

package/ios/Plugin/LiveUpdateConfig.swift

@@ -2,10 +2,8 @@ public struct LiveUpdateConfig {
     var appId: String?
     var autoDeleteBundles = false
     var defaultChannel: String?
-    var enabled = true
     var httpTimeout = 60000
-    var location: String?
     var publicKey: String?
-    var readyTimeout = 10000
-    var resetOnUpdate = true
+    var readyTimeout = 0
+    var serverDomain = "api.cloud.capawesome.io"
 }