@capgo/capacitor-updater 5.34.0 → 5.38.0

package/ios/Sources/CapacitorUpdaterPlugin/BundleInfo.swift

@@ -16,21 +16,25 @@ import Foundation
     private let version: String
     private let checksum: String
     private let status: BundleStatus
+    private let link: String?
+    private let comment: String?
 
-    convenience init(id: String, version: String, status: BundleStatus, downloaded: Date, checksum: String) {
-        self.init(id: id, version: version, status: status, downloaded: downloaded.iso8601withFractionalSeconds, checksum: checksum)
+    convenience init(id: String, version: String, status: BundleStatus, downloaded: Date, checksum: String, link: String? = nil, comment: String? = nil) {
+        self.init(id: id, version: version, status: status, downloaded: downloaded.iso8601withFractionalSeconds, checksum: checksum, link: link, comment: comment)
     }
 
-    init(id: String, version: String, status: BundleStatus, downloaded: String = BundleInfo.DOWNLOADED_BUILTIN, checksum: String) {
+    init(id: String, version: String, status: BundleStatus, downloaded: String = BundleInfo.DOWNLOADED_BUILTIN, checksum: String, link: String? = nil, comment: String? = nil) {
         self.downloaded = downloaded.trim()
         self.id = id
         self.version = version
         self.checksum = checksum
         self.status = status
+        self.link = link
+        self.comment = comment
     }
 
     enum CodingKeys: String, CodingKey {
-        case downloaded, id, version, status, checksum
+        case downloaded, id, version, status, checksum, link, comment
     }
 
     public func isBuiltin() -> Bool {
@@ -62,11 +66,11 @@ import Foundation
     }
 
     public func setChecksum(checksum: String) -> BundleInfo {
-        return BundleInfo(id: self.id, version: self.version, status: self.status, downloaded: self.downloaded, checksum: checksum)
+        return BundleInfo(id: self.id, version: self.version, status: self.status, downloaded: self.downloaded, checksum: checksum, link: self.link, comment: self.comment)
     }
 
     public func setDownloaded(downloaded: Date) -> BundleInfo {
-        return BundleInfo(id: self.id, version: self.version, status: self.status, downloaded: downloaded, checksum: self.checksum)
+        return BundleInfo(id: self.id, version: self.version, status: self.status, downloaded: downloaded, checksum: self.checksum, link: self.link, comment: self.comment)
     }
 
     public func getId() -> String {
@@ -74,7 +78,7 @@ import Foundation
     }
 
     public func setId(id: String) -> BundleInfo {
-        return BundleInfo(id: id, version: self.version, status: self.status, downloaded: self.downloaded, checksum: self.checksum)
+        return BundleInfo(id: id, version: self.version, status: self.status, downloaded: self.downloaded, checksum: self.checksum, link: self.link, comment: self.comment)
     }
 
     public func getVersionName() -> String {
@@ -82,7 +86,7 @@ import Foundation
     }
 
     public func setVersionName(version: String) -> BundleInfo {
-        return BundleInfo(id: self.id, version: version, status: self.status, downloaded: self.downloaded, checksum: self.checksum)
+        return BundleInfo(id: self.id, version: version, status: self.status, downloaded: self.downloaded, checksum: self.checksum, link: self.link, comment: self.comment)
     }
 
     public func getStatus() -> String {
@@ -90,17 +94,40 @@ import Foundation
     }
 
     public func setStatus(status: String) -> BundleInfo {
-        return BundleInfo(id: self.id, version: self.version, status: BundleStatus(localizedString: status)!, downloaded: self.downloaded, checksum: self.checksum)
+        return BundleInfo(id: self.id, version: self.version, status: BundleStatus(localizedString: status)!, downloaded: self.downloaded, checksum: self.checksum, link: self.link, comment: self.comment)
+    }
+
+    public func getLink() -> String? {
+        return self.link
+    }
+
+    public func setLink(link: String?) -> BundleInfo {
+        return BundleInfo(id: self.id, version: self.version, status: self.status, downloaded: self.downloaded, checksum: self.checksum, link: link, comment: self.comment)
+    }
+
+    public func getComment() -> String? {
+        return self.comment
+    }
+
+    public func setComment(comment: String?) -> BundleInfo {
+        return BundleInfo(id: self.id, version: self.version, status: self.status, downloaded: self.downloaded, checksum: self.checksum, link: self.link, comment: comment)
     }
 
     public func toJSON() -> [String: String] {
-        return [
+        var result: [String: String] = [
             "id": self.getId(),
             "version": self.getVersionName(),
             "downloaded": self.getDownloaded(),
             "checksum": self.getChecksum(),
             "status": self.getStatus()
         ]
+        if let link = self.link {
+            result["link"] = link
+        }
+        if let comment = self.comment {
+            result["comment"] = comment
+        }
+        return result
     }
 
     public static func == (lhs: BundleInfo, rhs: BundleInfo) -> Bool {

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -54,7 +54,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isShakeMenuEnabled", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let pluginVersion: String = "5.31.0"
+    private let pluginVersion: String = "5.38.0"
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"
     static let channelUrlDefault = "https://plugin.capgo.app/channel_self"
@@ -92,6 +92,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     private var backgroundWork: DispatchWorkItem?
     private var taskRunning = false
     private var periodCheckDelay = 0
+
+    // Lock to ensure cleanup completes before downloads start
+    private let cleanupLock = NSLock()
+    private var cleanupComplete = false
+    private var cleanupThread: Thread?
     private var persistCustomId = false
     private var persistModifyUrl = false
     private var allowManualBundleError = false
@@ -185,7 +190,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             logger.info("Loaded persisted updateUrl")
         }
         autoUpdate = getConfig().getBoolean("autoUpdate", true)
-        appReadyTimeout = getConfig().getInt("appReadyTimeout", 10000)
+        appReadyTimeout = max(1000, getConfig().getInt("appReadyTimeout", 10000))  // Minimum 1 second
         implementation.timeout = Double(getConfig().getInt("responseTimeout", 20))
         resetWhenUpdate = getConfig().getBoolean("resetWhenUpdate", true)
         shakeMenuEnabled = getConfig().getBoolean("shakeMenu", false)
@@ -196,7 +201,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             periodCheckDelay = periodCheckDelayValue
         }
 
-        implementation.publicKey = getConfig().getString("publicKey", "")!
+        implementation.setPublicKey(getConfig().getString("publicKey") ?? "")
         implementation.notifyDownloadRaw = notifyDownload
         implementation.pluginVersion = self.pluginVersion
 
@@ -204,6 +209,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         implementation.setLogger(logger)
         CryptoCipher.setLogger(logger)
 
+        // Log public key prefix if encryption is enabled
+        if let keyId = implementation.getKeyId(), !keyId.isEmpty {
+            logger.info("Public key prefix: \(keyId)")
+        }
+
         // Initialize DelayUpdateUtils
         self.delayUpdateUtils = DelayUpdateUtils(currentVersionNative: currentVersionNative, logger: logger)
         let config = (self.bridge?.viewController as? CAPBridgeViewController)?.instanceDescriptor().legacyConfig
@@ -358,28 +368,74 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     private func cleanupObsoleteVersions() {
-        let previous = UserDefaults.standard.string(forKey: "LatestNativeBuildVersion") ?? "0"
-        if previous != "0" && self.currentBuildVersion != previous {
-            _ = self._reset(toLastSuccessful: false)
-            let res = implementation.list()
-            res.forEach { version in
-                logger.info("Deleting obsolete bundle: \(version.getId())")
-                let res = implementation.delete(id: version.getId())
-                if !res {
-                    logger.error("Delete failed, id \(version.getId()) doesn't exist")
+        cleanupThread = Thread {
+            self.cleanupLock.lock()
+            defer {
+                self.cleanupComplete = true
+                self.cleanupLock.unlock()
+                self.logger.info("Cleanup complete")
+            }
+
+            let previous = UserDefaults.standard.string(forKey: "LatestNativeBuildVersion") ?? UserDefaults.standard.string(forKey: "LatestVersionNative") ?? "0"
+            if previous != "0" && self.currentBuildVersion != previous {
+                _ = self._reset(toLastSuccessful: false)
+                let res = self.implementation.list()
+                for version in res {
+                    // Check if thread was cancelled
+                    if Thread.current.isCancelled {
+                        self.logger.warn("Cleanup was cancelled, stopping")
+                        return
+                    }
+                    self.logger.info("Deleting obsolete bundle: \(version.getId())")
+                    let res = self.implementation.delete(id: version.getId())
+                    if !res {
+                        self.logger.error("Delete failed, id \(version.getId()) doesn't exist")
+                    }
+                }
+
+                let storedBundles = self.implementation.list(raw: true)
+                let allowedIds = Set(storedBundles.compactMap { info -> String? in
+                    let id = info.getId()
+                    return id.isEmpty ? nil : id
+                })
+                self.implementation.cleanupDownloadDirectories(allowedIds: allowedIds, threadToCheck: Thread.current)
+                self.implementation.cleanupOrphanedTempFolders(threadToCheck: Thread.current)
+
+                // Check again before the expensive delta cache cleanup
+                if Thread.current.isCancelled {
+                    self.logger.warn("Cleanup was cancelled before delta cache cleanup")
+                    return
                 }
+                self.implementation.cleanupDeltaCache(threadToCheck: Thread.current)
             }
+            UserDefaults.standard.set(self.currentBuildVersion, forKey: "LatestNativeBuildVersion")
+            UserDefaults.standard.synchronize()
+        }
+        cleanupThread?.start()
 
-            let storedBundles = implementation.list(raw: true)
-            let allowedIds = Set(storedBundles.compactMap { info -> String? in
-                let id = info.getId()
-                return id.isEmpty ? nil : id
-            })
-            implementation.cleanupDownloadDirectories(allowedIds: allowedIds)
-            implementation.cleanupDeltaCache()
+        // Start a timeout watchdog thread to cancel cleanup if it takes too long
+        let timeout = Double(self.appReadyTimeout / 2) / 1000.0
+        Thread.detachNewThread {
+            Thread.sleep(forTimeInterval: timeout)
+            if let thread = self.cleanupThread, !thread.isFinished && !self.cleanupComplete {
+                self.logger.warn("Cleanup timeout exceeded (\(timeout)s), cancelling cleanup thread")
+                thread.cancel()
+            }
         }
-        UserDefaults.standard.set(self.currentBuildVersion, forKey: "LatestNativeBuildVersion")
-        UserDefaults.standard.synchronize()
+    }
+
+    private func waitForCleanupIfNeeded() {
+        if cleanupComplete {
+            return  // Already done, no need to wait
+        }
+
+        logger.info("Waiting for cleanup to complete before starting download...")
+
+        // Wait for cleanup to complete - blocks until lock is released
+        cleanupLock.lock()
+        cleanupLock.unlock()
+
+        logger.info("Cleanup finished, proceeding with download")
     }
 
     @objc func notifyDownload(id: String, percent: Int, ignoreMultipleOfTen: Bool = false, bundle: BundleInfo? = nil) {
@@ -1272,6 +1328,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             return
         }
         DispatchQueue.global(qos: .background).async {
+            // Wait for cleanup to complete before starting download
+            self.waitForCleanupIfNeeded()
             self.backgroundTaskID = UIApplication.shared.beginBackgroundTask(withName: "Finish Download Tasks") {
                 // End the task if time expires.
                 self.endBackGroundTask()
@@ -1337,9 +1395,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                             }
                         }
                         if res.manifest != nil {
-                            nextImpl = try self.implementation.downloadManifest(manifest: res.manifest!, version: latestVersionName, sessionKey: sessionKey)
+                            nextImpl = try self.implementation.downloadManifest(manifest: res.manifest!, version: latestVersionName, sessionKey: sessionKey, link: res.link, comment: res.comment)
                         } else {
-                            nextImpl = try self.implementation.download(url: downloadUrl, version: latestVersionName, sessionKey: sessionKey)
+                            nextImpl = try self.implementation.download(url: downloadUrl, version: latestVersionName, sessionKey: sessionKey, link: res.link, comment: res.comment)
                         }
                     }
                     guard let next = nextImpl else {

package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -26,6 +26,7 @@ import UIKit
     private let FALLBACK_VERSION: String = "pastVersion"
     private let NEXT_VERSION: String = "nextVersion"
     private var unzipPercent = 0
+    private let TEMP_UNZIP_PREFIX: String = "capgo_unzip_"
 
     // Add this line to declare cacheFolder
     private let cacheFolder: URL = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!.appendingPathComponent("capgo_downloads")
@@ -42,6 +43,9 @@ import UIKit
     public var deviceID = ""
     public var publicKey: String = ""
 
+    // Cached key ID calculated once from publicKey
+    private var cachedKeyId: String?
+
     // Flag to track if we received a 429 response - stops requests until app restart
     private static var rateLimitExceeded = false
 
@@ -79,6 +83,19 @@ import UIKit
         return String((0..<length).map { _ in letters.randomElement()! })
     }
 
+    public func setPublicKey(_ publicKey: String) {
+        self.publicKey = publicKey
+        if !publicKey.isEmpty {
+            self.cachedKeyId = CryptoCipher.calcKeyId(publicKey: publicKey)
+        } else {
+            self.cachedKeyId = nil
+        }
+    }
+
+    public func getKeyId() -> String? {
+        return self.cachedKeyId
+    }
+
     private var isDevEnvironment: Bool {
         #if DEBUG
         return true
@@ -258,7 +275,7 @@ import UIKit
     private func saveDownloaded(sourceZip: URL, id: String, base: URL, notify: Bool) throws {
         try prepareFolder(source: base)
         let destPersist: URL = base.appendingPathComponent(id)
-        let destUnZip: URL = libraryDir.appendingPathComponent(randomString(length: 10))
+        let destUnZip: URL = libraryDir.appendingPathComponent(TEMP_UNZIP_PREFIX + randomString(length: 10))
 
         self.unzipPercent = 0
         self.notifyDownload(id: id, percent: 75)
@@ -324,7 +341,8 @@ import UIKit
             is_prod: self.isProd(),
             action: nil,
             channel: nil,
-            defaultChannel: self.defaultChannel
+            defaultChannel: self.defaultChannel,
+            key_id: self.cachedKeyId
         )
     }
 
@@ -372,6 +390,12 @@ import UIKit
                 if let manifest = response.value?.manifest {
                     latest.manifest = manifest
                 }
+                if let link = response.value?.link {
+                    latest.link = link
+                }
+                if let comment = response.value?.comment {
+                    latest.comment = comment
+                }
             case let .failure(error):
                 self.logger.error("Error getting Latest \(response.value.debugDescription) \(error)")
                 latest.message = "Error getting Latest \(String(describing: response.value))"
@@ -400,11 +424,11 @@ import UIKit
     private var tempData = Data()
 
     private func verifyChecksum(file: URL, expectedHash: String) -> Bool {
-        let actualHash = CryptoCipher.calcChecksum(filePath: file)
+        let actualHash =    CryptoCipher.calcChecksum(filePath: file)
         return actualHash == expectedHash
     }
 
-    public func downloadManifest(manifest: [ManifestEntry], version: String, sessionKey: String) throws -> BundleInfo {
+    public func downloadManifest(manifest: [ManifestEntry], version: String, sessionKey: String, link: String? = nil, comment: String? = nil) throws -> BundleInfo {
         let id = self.randomString(length: 10)
         logger.info("downloadManifest start \(id)")
         let destFolder = self.getBundleDirectory(id: id)
@@ -414,7 +438,7 @@ import UIKit
         try FileManager.default.createDirectory(at: destFolder, withIntermediateDirectories: true, attributes: nil)
 
         // Create and save BundleInfo before starting the download process
-        let bundleInfo = BundleInfo(id: id, version: version, status: BundleStatus.DOWNLOADING, downloaded: Date(), checksum: "")
+        let bundleInfo = BundleInfo(id: id, version: version, status: BundleStatus.DOWNLOADING, downloaded: Date(), checksum: "", link: link, comment: comment)
         self.saveBundleInfo(id: id, bundle: bundleInfo)
 
         // Send stats for manifest download start
@@ -445,10 +469,16 @@ import UIKit
                 }
             }
 
+            // Check if file has .br extension for Brotli decompression
             let fileNameWithoutPath = (fileName as NSString).lastPathComponent
             let cacheFileName = "\(fileHash)_\(fileNameWithoutPath)"
             let cacheFilePath = cacheFolder.appendingPathComponent(cacheFileName)
-            let destFilePath = destFolder.appendingPathComponent(fileName)
+
+            // Check if file is Brotli compressed and remove .br extension from destination
+            let isBrotli = fileName.hasSuffix(".br")
+            let destFileName = isBrotli ? String(fileName.dropLast(3)) : fileName
+
+            let destFilePath = destFolder.appendingPathComponent(destFileName)
             let builtinFilePath = builtinFolder.appendingPathComponent(fileName)
 
             // Create necessary subdirectories in the destination folder
@@ -457,13 +487,18 @@ import UIKit
             dispatchGroup.enter()
 
             if FileManager.default.fileExists(atPath: builtinFilePath.path) && verifyChecksum(file: builtinFilePath, expectedHash: fileHash) {
-                try FileManager.default.copyItem(at: builtinFilePath, to: destFilePath)
-                logger.info("downloadManifest \(fileName) using builtin file \(id)")
-                completedFiles += 1
-                self.notifyDownload(id: id, percent: self.calcTotalPercent(percent: Int((Double(completedFiles) / Double(totalFiles)) * 100), min: 10, max: 70))
+                do {
+                    try FileManager.default.copyItem(at: builtinFilePath, to: destFilePath)
+                    logger.info("downloadManifest \(fileName) using builtin file \(id)")
+                    completedFiles += 1
+                    self.notifyDownload(id: id, percent: self.calcTotalPercent(percent: Int((Double(completedFiles) / Double(totalFiles)) * 100), min: 10, max: 70))
+                } catch {
+                    downloadError = error
+                    logger.error("Failed to copy builtin file \(fileName): \(error.localizedDescription)")
+                }
                 dispatchGroup.leave()
-            } else if FileManager.default.fileExists(atPath: cacheFilePath.path) && verifyChecksum(file: cacheFilePath, expectedHash: fileHash) {
-                try FileManager.default.copyItem(at: cacheFilePath, to: destFilePath)
+            } else if self.tryCopyFromCache(from: cacheFilePath, to: destFilePath, expectedHash: fileHash) {
+                // Successfully copied from cache
                 logger.info("downloadManifest \(fileName) copy from cache \(id)")
                 completedFiles += 1
                 self.notifyDownload(id: id, percent: self.calcTotalPercent(percent: Int((Double(completedFiles) / Double(totalFiles)) * 100), min: 10, max: 70))
@@ -502,15 +537,11 @@ import UIKit
                                 try FileManager.default.removeItem(at: tempFile)
                             }
 
-                            // Check if file has .br extension for Brotli decompression
-                            let isBrotli = fileName.hasSuffix(".br")
-                            let finalFileName = isBrotli ? String(fileName.dropLast(3)) : fileName
-                            let destFilePath = destFolder.appendingPathComponent(finalFileName)
-
+                            // Use the isBrotli and destFilePath already computed above
                             if isBrotli {
                                 // Decompress the Brotli data
                                 guard let decompressedData = self.decompressBrotli(data: finalData, fileName: fileName) else {
-                                    self.sendStats(action: "download_manifest_brotli_fail", versionName: "\(version):\(finalFileName)")
+                                    self.sendStats(action: "download_manifest_brotli_fail", versionName: "\(version):\(destFileName)")
                                     throw NSError(domain: "BrotliDecompressionError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Failed to decompress Brotli data for file \(fileName) at url \(downloadUrl)"])
                                 }
                                 finalData = decompressedData
@@ -525,7 +556,7 @@ import UIKit
                                 if calculatedChecksum != fileHash {
                                     // Delete the corrupt file before throwing error
                                     try? FileManager.default.removeItem(at: destFilePath)
-                                    self.sendStats(action: "download_manifest_checksum_fail", versionName: "\(version):\(finalFileName)")
+                                    self.sendStats(action: "download_manifest_checksum_fail", versionName: "\(version):\(destFileName)")
                                     throw NSError(domain: "ChecksumError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Computed checksum is not equal to required checksum (\(calculatedChecksum) != \(fileHash)) for file \(fileName) at url \(downloadUrl)"])
                                 }
                             }
@@ -570,6 +601,30 @@ import UIKit
         return updatedBundle
     }
 
+    /// Atomically try to copy a file from cache - returns true if successful, false if file doesn't exist or copy failed
+    /// This handles the race condition where OS can delete cache files between exists() check and copy
+    private func tryCopyFromCache(from source: URL, to destination: URL, expectedHash: String) -> Bool {
+        // First quick check - if file doesn't exist, don't bother
+        guard FileManager.default.fileExists(atPath: source.path) else {
+            return false
+        }
+
+        // Verify checksum before copy
+        guard verifyChecksum(file: source, expectedHash: expectedHash) else {
+            return false
+        }
+
+        // Try to copy - if it fails (file deleted by OS between check and copy), return false
+        do {
+            try FileManager.default.copyItem(at: source, to: destination)
+            return true
+        } catch {
+            // File was deleted between check and copy, or other IO error - caller should download instead
+            logger.debug("Cache copy failed (likely OS eviction): \(error.localizedDescription)")
+            return false
+        }
+    }
+
     private func decompressBrotli(data: Data, fileName: String) -> Data? {
         // Handle empty files
         if data.count == 0 {
@@ -683,7 +738,7 @@ import UIKit
         return status == COMPRESSION_STATUS_END ? decompressedData : nil
     }
 
-    public func download(url: URL, version: String, sessionKey: String) throws -> BundleInfo {
+    public func download(url: URL, version: String, sessionKey: String, link: String? = nil, comment: String? = nil) throws -> BundleInfo {
         let id: String = self.randomString(length: 10)
         let semaphore = DispatchSemaphore(value: 0)
         if version != getLocalUpdateVersion() {
@@ -750,7 +805,7 @@ import UIKit
                 semaphore.signal()
             }
         }
-        self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.DOWNLOADING, downloaded: Date(), checksum: checksum))
+        self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.DOWNLOADING, downloaded: Date(), checksum: checksum, link: link, comment: comment))
         let reachabilityManager = NetworkReachabilityManager()
         reachabilityManager?.startListening { status in
             switch status {
@@ -768,7 +823,7 @@ import UIKit
 
         if mainError != nil {
             logger.error("Failed to download: \(String(describing: mainError))")
-            self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.ERROR, downloaded: Date(), checksum: checksum))
+            self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.ERROR, downloaded: Date(), checksum: checksum, link: link, comment: comment))
             throw mainError!
         }
 
@@ -778,7 +833,7 @@ import UIKit
             try FileManager.default.moveItem(at: tempDataPath, to: finalPath)
         } catch {
             logger.error("Failed decrypt file : \(error)")
-            self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.ERROR, downloaded: Date(), checksum: checksum))
+            self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.ERROR, downloaded: Date(), checksum: checksum, link: link, comment: comment))
             cleanDownloadData()
             throw error
         }
@@ -791,7 +846,7 @@ import UIKit
 
         } catch {
             logger.error("Failed to unzip file: \(error)")
-            self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.ERROR, downloaded: Date(), checksum: checksum))
+            self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.ERROR, downloaded: Date(), checksum: checksum, link: link, comment: comment))
             // Best-effort cleanup of the decrypted zip file when unzip fails
             do {
                 if FileManager.default.fileExists(atPath: finalPath.path) {
@@ -806,7 +861,7 @@ import UIKit
 
         self.notifyDownload(id: id, percent: 90)
         logger.info("Downloading: 90% (wrapping up)")
-        let info = BundleInfo(id: id, version: version, status: BundleStatus.PENDING, downloaded: Date(), checksum: checksum)
+        let info = BundleInfo(id: id, version: version, status: BundleStatus.PENDING, downloaded: Date(), checksum: checksum, link: link, comment: comment)
         self.saveBundleInfo(id: id, bundle: info)
         self.cleanDownloadData()
 
@@ -981,6 +1036,16 @@ import UIKit
     }
 
     public func cleanupDeltaCache() {
+        cleanupDeltaCache(threadToCheck: nil)
+    }
+
+    public func cleanupDeltaCache(threadToCheck: Thread?) {
+        // Check if thread was cancelled
+        if let thread = threadToCheck, thread.isCancelled {
+            logger.warn("cleanupDeltaCache was cancelled before starting")
+            return
+        }
+
         let fileManager = FileManager.default
         guard fileManager.fileExists(atPath: cacheFolder.path) else {
             return
@@ -994,6 +1059,10 @@ import UIKit
     }
 
     public func cleanupDownloadDirectories(allowedIds: Set<String>) {
+        cleanupDownloadDirectories(allowedIds: allowedIds, threadToCheck: nil)
+    }
+
+    public func cleanupDownloadDirectories(allowedIds: Set<String>, threadToCheck: Thread?) {
         let bundleRoot = libraryDir.appendingPathComponent(bundleDirectory)
         let fileManager = FileManager.default
 
@@ -1005,6 +1074,12 @@ import UIKit
             let contents = try fileManager.contentsOfDirectory(at: bundleRoot, includingPropertiesForKeys: [.isDirectoryKey], options: [.skipsHiddenFiles])
 
             for url in contents {
+                // Check if thread was cancelled
+                if let thread = threadToCheck, thread.isCancelled {
+                    logger.warn("cleanupDownloadDirectories was cancelled")
+                    return
+                }
+
                 let resourceValues = try url.resourceValues(forKeys: [.isDirectoryKey])
                 if resourceValues.isDirectory != true {
                     continue
@@ -1029,6 +1104,43 @@ import UIKit
         }
     }
 
+    public func cleanupOrphanedTempFolders(threadToCheck: Thread?) {
+        let fileManager = FileManager.default
+
+        do {
+            let contents = try fileManager.contentsOfDirectory(at: libraryDir, includingPropertiesForKeys: [.isDirectoryKey], options: [.skipsHiddenFiles])
+
+            for url in contents {
+                // Check if thread was cancelled
+                if let thread = threadToCheck, thread.isCancelled {
+                    logger.warn("cleanupOrphanedTempFolders was cancelled")
+                    return
+                }
+
+                let resourceValues = try url.resourceValues(forKeys: [.isDirectoryKey])
+                if resourceValues.isDirectory != true {
+                    continue
+                }
+
+                let folderName = url.lastPathComponent
+
+                // Only delete folders with the temp unzip prefix
+                if !folderName.hasPrefix(TEMP_UNZIP_PREFIX) {
+                    continue
+                }
+
+                do {
+                    try fileManager.removeItem(at: url)
+                    logger.info("Deleted orphaned temp unzip folder: \(folderName)")
+                } catch {
+                    logger.error("Failed to delete orphaned temp folder: \(folderName) \(error.localizedDescription)")
+                }
+            }
+        } catch {
+            logger.error("Failed to enumerate library directory for temp folder cleanup: \(error.localizedDescription)")
+        }
+    }
+
     public func getBundleDirectory(id: String) -> URL {
         return libraryDir.appendingPathComponent(self.bundleDirectory).appendingPathComponent(id)
     }

package/ios/Sources/CapacitorUpdaterPlugin/CryptoCipher.swift

@@ -264,4 +264,23 @@ public struct CryptoCipher {
             throw CustomError.cannotDecode
         }
     }
+
+    /// Get first 4 characters of the public key for identification
+    /// Returns 4-character string or empty string if key is invalid/empty
+    public static func calcKeyId(publicKey: String) -> String {
+        if publicKey.isEmpty {
+            return ""
+        }
+
+        // Remove PEM headers and whitespace to get the raw key data
+        let cleanedKey = publicKey
+            .replacingOccurrences(of: "-----BEGIN RSA PUBLIC KEY-----", with: "")
+            .replacingOccurrences(of: "-----END RSA PUBLIC KEY-----", with: "")
+            .replacingOccurrences(of: "\n", with: "")
+            .replacingOccurrences(of: "\r", with: "")
+            .replacingOccurrences(of: " ", with: "")
+
+        // Return first 4 characters of the base64-encoded key
+        return String(cleanedKey.prefix(4))
+    }
 }

package/ios/Sources/CapacitorUpdaterPlugin/InternalUtils.swift

@@ -128,6 +128,7 @@ struct InfoObject: Codable {
     var action: String?
     var channel: String?
     var defaultChannel: String?
+    var key_id: String?
 }
 
 public struct ManifestEntry: Codable {
@@ -160,6 +161,8 @@ struct AppVersionDec: Decodable {
     let breaking: Bool?
     let data: [String: String]?
     let manifest: [ManifestEntry]?
+    let link: String?
+    let comment: String?
     // The HTTP status code is captured separately in CapgoUpdater; this struct only mirrors JSON.
 }
 
@@ -174,6 +177,8 @@ public class AppVersion: NSObject {
     var breaking: Bool?
     var data: [String: String]?
     var manifest: [ManifestEntry]?
+    var link: String?
+    var comment: String?
     var statusCode: Int = 0
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "5.34.0",
+  "version": "5.38.0",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",
@@ -37,6 +37,7 @@
     "ionic",
     "appflow alternative",
     "capawesome alternative",
+    "@capawesome/capacitor-live-update",
     "native"
   ],
   "scripts": {