@capgo/capacitor-updater 6.14.25 → 6.14.29

package/ios/{Plugin/CapacitorUpdater.swift → Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift}

@@ -14,7 +14,8 @@ import Alamofire
 import Compression
 import UIKit
 
-@objc public class CapacitorUpdater: NSObject {
+@objc public class CapgoUpdater: NSObject {
+    private var logger: Logger!
 
     private let versionCode: String = Bundle.main.versionCode ?? ""
     private let versionOs = UIDevice.current.systemVersion
@@ -29,7 +30,6 @@ import UIKit
     // Add this line to declare cacheFolder
     private let cacheFolder: URL = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!.appendingPathComponent("capgo_downloads")
 
-    public static let TAG: String = "✨  Capacitor-updater:"
     public let CAP_SERVER_PATH: String = "serverBasePath"
     public var versionBuild: String = ""
     public var customId: String = ""
@@ -44,12 +44,31 @@ import UIKit
     public var publicKey: String = ""
     public var hasOldPrivateKeyPropertyInConfig: Bool = false
 
+    // Flag to track if we received a 429 response - stops requests until app restart
+    private static var rateLimitExceeded = false
+
+    private var userAgent: String {
+        let safePluginVersion = PLUGIN_VERSION.isEmpty ? "unknown" : PLUGIN_VERSION
+        let safeAppId = appId.isEmpty ? "unknown" : appId
+        return "CapacitorUpdater/\(safePluginVersion) (\(safeAppId)) ios/\(versionOs)"
+    }
+
+    private lazy var alamofireSession: Session = {
+        let configuration = URLSessionConfiguration.default
+        configuration.httpAdditionalHeaders = ["User-Agent": self.userAgent]
+        return Session(configuration: configuration)
+    }()
+
     public var notifyDownloadRaw: (String, Int, Bool) -> Void = { _, _, _  in }
     public func notifyDownload(id: String, percent: Int, ignoreMultipleOfTen: Bool = false) {
         notifyDownloadRaw(id, percent, ignoreMultipleOfTen)
     }
     public var notifyDownload: (String, Int) -> Void = { _, _  in }
 
+    public func setLogger(_ logger: Logger) {
+        self.logger = logger
+    }
+
     private func calcTotalPercent(percent: Int, min: Int, max: Int) -> Int {
         return (percent * (max - min)) / 100 + min
     }
@@ -71,6 +90,18 @@ import UIKit
         return !self.isDevEnvironment && !self.isAppStoreReceiptSandbox() && !self.hasEmbeddedMobileProvision()
     }
 
+    /**
+     * Check if a 429 (Too Many Requests) response was received and set the flag
+     */
+    private func checkAndHandleRateLimitResponse(statusCode: Int?) -> Bool {
+        if statusCode == 429 {
+            CapgoUpdater.rateLimitExceeded = true
+            logger.warn("Rate limit exceeded (429). Stopping all stats and channel requests until app restart.")
+            return true
+        }
+        return false
+    }
+
     // MARK: Private
     private func hasEmbeddedMobileProvision() -> Bool {
         guard Bundle.main.path(forResource: "embedded", ofType: "mobileprovision") == nil else {
@@ -110,7 +141,7 @@ import UIKit
             do {
                 try FileManager.default.createDirectory(atPath: source.path, withIntermediateDirectories: true, attributes: nil)
             } catch {
-                print("\(CapacitorUpdater.TAG) Cannot createDirectory \(source.path)")
+                logger.error("Cannot createDirectory \(source.path)")
                 throw CustomError.cannotCreateDirectory
             }
         }
@@ -120,7 +151,7 @@ import UIKit
         do {
             try FileManager.default.removeItem(atPath: source.path)
         } catch {
-            print("\(CapacitorUpdater.TAG) File not removed. \(source.path)")
+            logger.error("File not removed. \(source.path)")
             throw CustomError.cannotDeleteDirectory
         }
     }
@@ -137,14 +168,14 @@ import UIKit
                 return false
             }
         } catch {
-            print("\(CapacitorUpdater.TAG) File not moved. source: \(source.path) dest: \(dest.path)")
+            logger.error("File not moved. source: \(source.path) dest: \(dest.path)")
             throw CustomError.cannotUnflat
         }
     }
 
     private func unzipProgressHandler(entry: String, zipInfo: unz_file_info, entryNumber: Int, total: Int, destUnZip: URL, id: String, unzipError: inout NSError?) {
         if entry.contains("\\") {
-            print("\(CapacitorUpdater.TAG) unzip: Windows path is not supported, please use unix path as required by zip RFC: \(entry)")
+            logger.error("unzip: Windows path is not supported, please use unix path as required by zip RFC: \(entry)")
             self.sendStats(action: "windows_path_fail")
         }
 
@@ -227,7 +258,7 @@ import UIKit
                 try FileManager.default.removeItem(at: sourceZip)
             }
         } catch {
-            print("\(CapacitorUpdater.TAG) Could not delete source zip at \(sourceZip.path): \(error)")
+            logger.error("Could not delete source zip at \(sourceZip.path): \(error)")
         }
     }
 
@@ -257,8 +288,8 @@ import UIKit
         if let channel = channel {
             parameters.defaultChannel = channel
         }
-        print("\(CapacitorUpdater.TAG) Auto-update parameters: \(parameters)")
-        let request = AF.request(url, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
+        logger.info("Auto-update parameters: \(parameters)")
+        let request = alamofireSession.request(url, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
 
         request.validate().responseDecodable(of: AppVersionDec.self) { response in
             switch response.result {
@@ -275,6 +306,9 @@ import UIKit
                 if let major = response.value?.major {
                     latest.major = major
                 }
+                if let breaking = response.value?.breaking {
+                    latest.breaking = breaking
+                }
                 if let error = response.value?.error {
                     latest.error = error
                 }
@@ -291,7 +325,7 @@ import UIKit
                     latest.manifest = manifest
                 }
             case let .failure(error):
-                print("\(CapacitorUpdater.TAG) Error getting Latest", response.value ?? "", error )
+                self.logger.error("Error getting Latest \(response.value.debugDescription) \(error)")
                 latest.message = "Error getting Latest \(String(describing: response.value))"
                 latest.error = "response_error"
             }
@@ -304,7 +338,7 @@ import UIKit
     private func setCurrentBundle(bundle: String) {
         UserDefaults.standard.set(bundle, forKey: self.CAP_SERVER_PATH)
         UserDefaults.standard.synchronize()
-        print("\(CapacitorUpdater.TAG) Current bundle set to: \((bundle ).isEmpty ? BundleInfo.ID_BUILTIN : bundle)")
+        logger.info("Current bundle set to: \((bundle ).isEmpty ? BundleInfo.ID_BUILTIN : bundle)")
     }
 
     private var tempDataPath: URL {
@@ -323,7 +357,7 @@ import UIKit
 
     public func downloadManifest(manifest: [ManifestEntry], version: String, sessionKey: String) throws -> BundleInfo {
         let id = self.randomString(length: 10)
-        print("\(CapacitorUpdater.TAG) downloadManifest start \(id)")
+        logger.info("downloadManifest start \(id)")
         let destFolder = self.getBundleDirectory(id: id)
         let builtinFolder = Bundle.main.bundleURL.appendingPathComponent("public")
 
@@ -351,12 +385,16 @@ import UIKit
             }
 
             if !self.hasOldPrivateKeyPropertyInConfig && !self.publicKey.isEmpty && !sessionKey.isEmpty {
+                // V2 Encryption (publicKey)
                 do {
-                    fileHash = try CryptoCipherV2.decryptChecksum(checksum: fileHash, publicKey: self.publicKey, version: version)
+                    fileHash = try CryptoCipherV2.decryptChecksum(checksum: fileHash, publicKey: self.publicKey)
                 } catch {
                     downloadError = error
-                    print("\(CapacitorUpdater.TAG) CryptoCipherV2.decryptChecksum error \(id) \(fileName) error: \(error)")
+                    logger.error("CryptoCipherV2.decryptChecksum error \(id) \(fileName) error: \(error)")
                 }
+            } else if self.hasOldPrivateKeyPropertyInConfig {
+                // V1 Encryption (privateKey) - deprecated but supported
+                // V1 doesn't decrypt checksum, uses different method
             }
 
             let fileNameWithoutPath = (fileName as NSString).lastPathComponent
@@ -372,19 +410,19 @@ import UIKit
 
             if FileManager.default.fileExists(atPath: builtinFilePath.path) && verifyChecksum(file: builtinFilePath, expectedHash: fileHash) {
                 try FileManager.default.copyItem(at: builtinFilePath, to: destFilePath)
-                print("\(CapacitorUpdater.TAG) downloadManifest \(fileName) using builtin file \(id)")
+                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))
                 dispatchGroup.leave()
             } else if FileManager.default.fileExists(atPath: cacheFilePath.path) && verifyChecksum(file: cacheFilePath, expectedHash: fileHash) {
                 try FileManager.default.copyItem(at: cacheFilePath, to: destFilePath)
-                print("\(CapacitorUpdater.TAG) downloadManifest \(fileName) copy from cache \(id)")
+                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))
                 dispatchGroup.leave()
             } else {
                 // File not in cache, download, decompress, and save to both cache and destination
-                AF.download(downloadUrl).responseData { response in
+                self.alamofireSession.download(downloadUrl).responseData { response in
                     defer { dispatchGroup.leave() }
 
                     switch response.result {
@@ -399,9 +437,10 @@ import UIKit
                                 }
                             }
 
-                            // Add decryption step if public key is set and sessionKey is provided
+                            // Add decryption step if encryption keys are set
                             var finalData = data
-                            if !self.publicKey.isEmpty && !sessionKey.isEmpty {
+                            if !self.hasOldPrivateKeyPropertyInConfig && !self.publicKey.isEmpty && !sessionKey.isEmpty {
+                                // V2 Encryption (publicKey)
                                 let tempFile = self.cacheFolder.appendingPathComponent("temp_\(UUID().uuidString)")
                                 try finalData.write(to: tempFile)
                                 do {
@@ -410,19 +449,36 @@ import UIKit
                                     self.sendStats(action: "decrypt_fail", versionName: version)
                                     throw error
                                 }
-                                // TODO: try and do             self.sendStats(action: "decrypt_fail", versionName: version) if fail
+                                finalData = try Data(contentsOf: tempFile)
+                            } else if self.hasOldPrivateKeyPropertyInConfig && !sessionKey.isEmpty {
+                                // V1 Encryption (privateKey) - deprecated but supported
+                                let tempFile = self.cacheFolder.appendingPathComponent("temp_\(UUID().uuidString)")
+                                try finalData.write(to: tempFile)
+                                do {
+                                    try CryptoCipherV1.decryptFile(filePath: tempFile, privateKey: self.privateKey, sessionKey: sessionKey, version: version)
+                                } catch {
+                                    self.sendStats(action: "decrypt_fail", versionName: version)
+                                    throw error
+                                }
                                 finalData = try Data(contentsOf: tempFile)
                                 try FileManager.default.removeItem(at: tempFile)
                             }
 
-                            // Decompress the Brotli data
-                            guard let decompressedData = self.decompressBrotli(data: finalData, fileName: fileName) else {
-                                throw NSError(domain: "BrotliDecompressionError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Failed to decompress Brotli data for file \(fileName) at url \(downloadUrl)"])
+                            // 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)
+
+                            if isBrotli {
+                                // Decompress the Brotli data
+                                guard let decompressedData = self.decompressBrotli(data: finalData, fileName: fileName) else {
+                                    throw NSError(domain: "BrotliDecompressionError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Failed to decompress Brotli data for file \(fileName) at url \(downloadUrl)"])
+                                }
+                                finalData = decompressedData
                             }
-                            finalData = decompressedData
 
                             try finalData.write(to: destFilePath)
-                            if !self.hasOldPrivateKeyPropertyInConfig && !self.publicKey.isEmpty && !sessionKey.isEmpty {
+                            if !self.publicKey.isEmpty && !sessionKey.isEmpty {
                                 // assume that calcChecksum != null
                                 let calculatedChecksum = CryptoCipherV2.calcChecksum(filePath: destFilePath)
                                 if calculatedChecksum != fileHash {
@@ -435,13 +491,13 @@ import UIKit
 
                             completedFiles += 1
                             self.notifyDownload(id: id, percent: self.calcTotalPercent(percent: Int((Double(completedFiles) / Double(totalFiles)) * 100), min: 10, max: 70))
-                            print("\(CapacitorUpdater.TAG) downloadManifest \(id) \(fileName) downloaded, decompressed\(!self.publicKey.isEmpty && !sessionKey.isEmpty ? ", decrypted" : ""), and cached")
+                            self.logger.info("downloadManifest \(id) \(fileName) downloaded\(isBrotli ? ", decompressed" : "")\(!self.publicKey.isEmpty && !sessionKey.isEmpty ? ", decrypted" : ""), and cached")
                         } catch {
                             downloadError = error
-                            NSLog("\(CapacitorUpdater.TAG) downloadManifest \(id) \(fileName) error: \(error.localizedDescription)")
+                            self.logger.error("downloadManifest \(id) \(fileName) error: \(error.localizedDescription)")
                         }
                     case .failure(let error):
-                        NSLog("\(CapacitorUpdater.TAG) downloadManifest \(id) \(fileName) download error: \(error.localizedDescription). Debug response: \(response.debugDescription).")
+                        self.logger.error("downloadManifest \(id) \(fileName) download error: \(error.localizedDescription). Debug response: \(response.debugDescription).")
                     }
                 }
             }
@@ -460,7 +516,7 @@ import UIKit
         let updatedBundle = bundleInfo.setStatus(status: BundleStatus.PENDING.localizedString)
         self.saveBundleInfo(id: id, bundle: updatedBundle)
 
-        print("\(CapacitorUpdater.TAG) downloadManifest done \(id)")
+        logger.info("downloadManifest done \(id)")
         return updatedBundle
     }
 
@@ -501,7 +557,7 @@ import UIKit
         var status = compression_stream_init(streamPointer, COMPRESSION_STREAM_DECODE, COMPRESSION_BROTLI)
 
         guard status != COMPRESSION_STATUS_ERROR else {
-            print("\(CapacitorUpdater.TAG) Error: Failed to initialize Brotli stream for \(fileName). Status: \(status)")
+            logger.error("Error: Failed to initialize Brotli stream for \(fileName). Status: \(status)")
             return nil
         }
 
@@ -523,7 +579,7 @@ import UIKit
                     if let baseAddress = rawBufferPointer.baseAddress {
                         streamPointer.pointee.src_ptr = baseAddress.assumingMemoryBound(to: UInt8.self)
                     } else {
-                        print("\(CapacitorUpdater.TAG) Error: Failed to get base address for \(fileName)")
+                        logger.error("Error: Failed to get base address for \(fileName)")
                         status = COMPRESSION_STATUS_ERROR
                         return
                     }
@@ -533,7 +589,7 @@ import UIKit
             if status == COMPRESSION_STATUS_ERROR {
                 let maxBytes = min(32, data.count)
                 let hexDump = data.prefix(maxBytes).map { String(format: "%02x", $0) }.joined(separator: " ")
-                print("\(CapacitorUpdater.TAG) Error: Brotli decompression failed for \(fileName). First \(maxBytes) bytes: \(hexDump)")
+                logger.error("Error: Brotli decompression failed for \(fileName). First \(maxBytes) bytes: \(hexDump)")
                 break
             }
 
@@ -547,18 +603,18 @@ import UIKit
             if status == COMPRESSION_STATUS_END {
                 break
             } else if status == COMPRESSION_STATUS_ERROR {
-                print("\(CapacitorUpdater.TAG) Error: Brotli process failed for \(fileName). Status: \(status)")
+                logger.error("Error: Brotli process failed for \(fileName). Status: \(status)")
                 if let text = String(data: data, encoding: .utf8) {
                     let asciiCount = text.unicodeScalars.filter { $0.isASCII }.count
                     let totalCount = text.unicodeScalars.count
                     if totalCount > 0 && Double(asciiCount) / Double(totalCount) >= 0.8 {
-                        print("\(CapacitorUpdater.TAG) Error: Input appears to be plain text: \(text)")
+                        logger.error("Error: Input appears to be plain text: \(text)")
                     }
                 }
 
                 let maxBytes = min(32, data.count)
                 let hexDump = data.prefix(maxBytes).map { String(format: "%02x", $0) }.joined(separator: " ")
-                print("\(CapacitorUpdater.TAG) Error: Raw data (\(fileName)): \(hexDump)")
+                logger.error("Error: Raw data (\(fileName)): \(hexDump)")
 
                 return nil
             }
@@ -569,7 +625,7 @@ import UIKit
             }
 
             if input.count == 0 {
-                print("\(CapacitorUpdater.TAG) Error: Zero input size for \(fileName)")
+                logger.error("Error: Zero input size for \(fileName)")
                 break
             }
         }
@@ -598,11 +654,13 @@ import UIKit
         let monitor = ClosureEventMonitor()
         monitor.requestDidCompleteTaskWithError = { (_, _, error) in
             if error != nil {
-                print("\(CapacitorUpdater.TAG) Downloading failed - ClosureEventMonitor activated")
+                self.logger.error("Downloading failed - ClosureEventMonitor activated")
                 mainError = error as NSError?
             }
         }
-        let session = Session(eventMonitors: [monitor])
+        let configuration = URLSessionConfiguration.default
+        configuration.httpAdditionalHeaders = ["User-Agent": self.userAgent]
+        let session = Session(configuration: configuration, eventMonitors: [monitor])
 
         let request = session.streamRequest(url, headers: requestHeaders).validate().onHTTPResponse(perform: { response  in
             if let contentLength = response.headers.value(for: "Content-Length") {
@@ -629,11 +687,11 @@ import UIKit
                     }
 
                 } else {
-                    print("\(CapacitorUpdater.TAG) Download failed")
+                    self.logger.error("Download failed")
                 }
 
             case .complete:
-                print("\(CapacitorUpdater.TAG) Download complete, total received bytes: \(totalReceivedBytes)")
+                self.logger.info("Download complete, total received bytes: \(totalReceivedBytes)")
                 self.notifyDownload(id: id, percent: 70, ignoreMultipleOfTen: true)
                 semaphore.signal()
             }
@@ -655,69 +713,68 @@ import UIKit
         reachabilityManager?.stopListening()
 
         if mainError != nil {
-            print("\(CapacitorUpdater.TAG) Failed to download: \(String(describing: mainError))")
+            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))
             throw mainError!
         }
 
         let finalPath = tempDataPath.deletingLastPathComponent().appendingPathComponent("\(id)")
         do {
-            var checksumDecrypted = checksum
-            do {
-                if !self.hasOldPrivateKeyPropertyInConfig {
-                    try CryptoCipherV2.decryptFile(filePath: tempDataPath, publicKey: self.publicKey, sessionKey: sessionKey, version: version)
-                } else {
-                    try CryptoCipher.decryptFile(filePath: tempDataPath, privateKey: self.privateKey, sessionKey: sessionKey, version: version)
-                }
-            } catch {
-                self.sendStats(action: "decrypt_fail", versionName: version)
-                throw error
+            if !self.hasOldPrivateKeyPropertyInConfig {
+                // V2 Encryption (publicKey)
+                try CryptoCipherV2.decryptFile(filePath: tempDataPath, publicKey: self.publicKey, sessionKey: sessionKey, version: version)
+            } else {
+                // V1 Encryption (privateKey) - deprecated but supported
+                try CryptoCipherV1.decryptFile(filePath: tempDataPath, privateKey: self.privateKey, sessionKey: sessionKey, version: version)
             }
             try FileManager.default.moveItem(at: tempDataPath, to: finalPath)
         } catch {
-            print("\(CapacitorUpdater.TAG) Failed decrypt file : \(error)")
+            logger.error("Failed decrypt file : \(error)")
             self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.ERROR, downloaded: Date(), checksum: checksum))
             cleanDownloadData()
             throw error
         }
 
         do {
-            if !self.hasOldPrivateKeyPropertyInConfig && !sessionKey.isEmpty {
-                checksum = CryptoCipherV2.calcChecksum(filePath: finalPath)
-            } else {
-                checksum = CryptoCipher.calcChecksum(filePath: finalPath)
-            }
-            print("\(CapacitorUpdater.TAG) Downloading: 80% (unzipping)")
+            checksum = CryptoCipherV2.calcChecksum(filePath: finalPath)
+            logger.info("Downloading: 80% (unzipping)")
             try self.saveDownloaded(sourceZip: finalPath, id: id, base: self.libraryDir.appendingPathComponent(self.bundleDirectory), notify: true)
 
         } catch {
-            print("\(CapacitorUpdater.TAG) Failed to unzip file: \(error)")
+            logger.error("Failed to unzip file: \(error)")
             self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.ERROR, downloaded: Date(), checksum: checksum))
+            // Best-effort cleanup of the decrypted zip file when unzip fails
+            do {
+                if FileManager.default.fileExists(atPath: finalPath.path) {
+                    try FileManager.default.removeItem(at: finalPath)
+                }
+            } catch {
+                logger.error("Could not delete failed zip at \(finalPath.path): \(error)")
+            }
             cleanDownloadData()
-            // todo: cleanup zip attempts
             throw error
         }
 
         self.notifyDownload(id: id, percent: 90)
-        print("\(CapacitorUpdater.TAG) Downloading: 90% (wrapping up)")
+        logger.info("Downloading: 90% (wrapping up)")
         let info = BundleInfo(id: id, version: version, status: BundleStatus.PENDING, downloaded: Date(), checksum: checksum)
         self.saveBundleInfo(id: id, bundle: info)
         self.cleanDownloadData()
         self.notifyDownload(id: id, percent: 100)
-        print("\(CapacitorUpdater.TAG) Downloading: 100% (complete)")
+        logger.info("Downloading: 100% (complete)")
         return info
     }
     private func ensureResumableFilesExist() {
         let fileManager = FileManager.default
         if !fileManager.fileExists(atPath: tempDataPath.path) {
             if !fileManager.createFile(atPath: tempDataPath.path, contents: Data()) {
-                print("\(CapacitorUpdater.TAG) Cannot ensure that a file at \(tempDataPath.path) exists")
+                logger.error("Cannot ensure that a file at \(tempDataPath.path) exists")
             }
         }
 
         if !fileManager.fileExists(atPath: updateInfo.path) {
             if !fileManager.createFile(atPath: updateInfo.path, contents: Data()) {
-                print("\(CapacitorUpdater.TAG) Cannot ensure that a file at \(updateInfo.path) exists")
+                logger.error("Cannot ensure that a file at \(updateInfo.path) exists")
             }
         }
     }
@@ -729,7 +786,7 @@ import UIKit
             do {
                 try fileManager.removeItem(at: tempDataPath)
             } catch {
-                print("\(CapacitorUpdater.TAG) Could not delete file at \(tempDataPath): \(error)")
+                logger.error("Could not delete file at \(tempDataPath): \(error)")
             }
         }
         // Deleting update.dat
@@ -737,7 +794,7 @@ import UIKit
             do {
                 try fileManager.removeItem(at: updateInfo)
             } catch {
-                print("\(CapacitorUpdater.TAG) Could not delete file at \(updateInfo): \(error)")
+                logger.error("Could not delete file at \(updateInfo): \(error)")
             }
         }
     }
@@ -756,7 +813,7 @@ import UIKit
                 fileHandle.closeFile()
             }
         } catch {
-            print("Failed to write data starting at byte \(byteOffset): \(error)")
+            logger.error("Failed to write data starting at byte \(byteOffset): \(error)")
         }
         self.tempData.removeAll() // Clearing tempData to avoid writing the same data multiple times
     }
@@ -765,7 +822,7 @@ import UIKit
         do {
             try "\(version)".write(to: updateInfo, atomically: true, encoding: .utf8)
         } catch {
-            print("\(CapacitorUpdater.TAG) Failed to save progress: \(error)")
+            logger.error("Failed to save progress: \(error)")
         }
     }
     private func getLocalUpdateVersion() -> String { // Return the version that was tried to be downloaded on last download attempt
@@ -787,7 +844,7 @@ import UIKit
                 return fileSize.int64Value
             }
         } catch {
-            print("\(CapacitorUpdater.TAG) Could not retrieve already downloaded data size : \(error)")
+            logger.error("Could not retrieve already downloaded data size : \(error)")
         }
         return 0
     }
@@ -799,7 +856,7 @@ import UIKit
             do {
                 let files: [String] = try FileManager.default.contentsOfDirectory(atPath: dest.path)
                 var res: [BundleInfo] = []
-                print("\(CapacitorUpdater.TAG) list File : \(dest.path)")
+                logger.info("list File : \(dest.path)")
                 if dest.exist {
                     for id: String in files {
                         res.append(self.getBundleInfo(id: id))
@@ -807,12 +864,12 @@ import UIKit
                 }
                 return res
             } catch {
-                print("\(CapacitorUpdater.TAG) No version available \(dest.path)")
+                logger.info("No version available \(dest.path)")
                 return []
             }
         } else {
             guard let regex = try? NSRegularExpression(pattern: "^[0-9A-Za-z]{10}_info$") else {
-                print("\(CapacitorUpdater.TAG) Invald regex ?????")
+                logger.error("Invalid regex ?????")
                 return []
             }
             return UserDefaults.standard.dictionaryRepresentation().keys.filter {
@@ -831,7 +888,7 @@ import UIKit
     public func delete(id: String, removeInfo: Bool) -> Bool {
         let deleted: BundleInfo = self.getBundleInfo(id: id)
         if deleted.isBuiltin() || self.getCurrentBundleId() == id {
-            print("\(CapacitorUpdater.TAG) Cannot delete \(id)")
+            logger.info("Cannot delete \(id)")
             return false
         }
 
@@ -840,7 +897,7 @@ import UIKit
            !next.isDeleted() &&
             !next.isErrorStatus() &&
             next.getId() == id {
-            print("\(CapacitorUpdater.TAG) Cannot delete the next bundle \(id)")
+            logger.info("Cannot delete the next bundle \(id)")
             return false
         }
 
@@ -848,7 +905,7 @@ import UIKit
         do {
             try FileManager.default.removeItem(atPath: destPersist.path)
         } catch {
-            print("\(CapacitorUpdater.TAG) Folder \(destPersist.path), not removed.")
+            logger.error("Folder \(destPersist.path), not removed.")
             // even if, we don;t care. Android doesn't care
             if removeInfo {
                 self.removeBundleInfo(id: id)
@@ -861,7 +918,7 @@ import UIKit
         } else {
             self.saveBundleInfo(id: id, bundle: deleted.setStatus(status: BundleStatus.DELETED.localizedString))
         }
-        print("\(CapacitorUpdater.TAG) bundle delete \(deleted.getVersionName())")
+        logger.info("bundle delete \(deleted.getVersionName())")
         self.sendStats(action: "delete", versionName: deleted.getVersionName())
         return true
     }
@@ -870,6 +927,42 @@ import UIKit
         return self.delete(id: id, removeInfo: true)
     }
 
+    public func cleanupDownloadDirectories(allowedIds: Set<String>) {
+        let bundleRoot = libraryDir.appendingPathComponent(bundleDirectory)
+        let fileManager = FileManager.default
+
+        guard fileManager.fileExists(atPath: bundleRoot.path) else {
+            return
+        }
+
+        do {
+            let contents = try fileManager.contentsOfDirectory(at: bundleRoot, includingPropertiesForKeys: [.isDirectoryKey], options: [.skipsHiddenFiles])
+
+            for url in contents {
+                let resourceValues = try url.resourceValues(forKeys: [.isDirectoryKey])
+                if resourceValues.isDirectory != true {
+                    continue
+                }
+
+                let id = url.lastPathComponent
+
+                if allowedIds.contains(id) {
+                    continue
+                }
+
+                do {
+                    try fileManager.removeItem(at: url)
+                    self.removeBundleInfo(id: id)
+                    logger.info("Deleted orphan bundle directory: \(id)")
+                } catch {
+                    logger.error("Failed to delete orphan bundle directory: \(id) \(error.localizedDescription)")
+                }
+            }
+        } catch {
+            logger.error("Failed to enumerate bundle directory for cleanup: \(error.localizedDescription)")
+        }
+    }
+
     public func getBundleDirectory(id: String) -> URL {
         return libraryDir.appendingPathComponent(self.bundleDirectory).appendingPathComponent(id)
     }
@@ -914,7 +1007,7 @@ import UIKit
     public func autoReset() {
         let currentBundle: BundleInfo = self.getCurrentBundle()
         if !currentBundle.isBuiltin() && !self.bundleExists(id: currentBundle.getId()) {
-            print("\(CapacitorUpdater.TAG) Folder at bundle path does not exist. Triggering reset.")
+            logger.info("Folder at bundle path does not exist. Triggering reset.")
             self.reset()
         }
     }
@@ -924,7 +1017,7 @@ import UIKit
     }
 
     public func reset(isInternal: Bool) {
-        print("\(CapacitorUpdater.TAG) reset: \(isInternal)")
+        logger.info("reset: \(isInternal)")
         let currentBundleName = self.getCurrentBundle().getVersionName()
         self.setCurrentBundle(bundle: "")
         self.setFallbackBundle(fallback: Optional<BundleInfo>.none)
@@ -937,14 +1030,14 @@ import UIKit
     public func setSuccess(bundle: BundleInfo, autoDeletePrevious: Bool) {
         self.setBundleStatus(id: bundle.getId(), status: BundleStatus.SUCCESS)
         let fallback: BundleInfo = self.getFallbackBundle()
-        print("\(CapacitorUpdater.TAG) Fallback bundle is: \(fallback.toString())")
-        print("\(CapacitorUpdater.TAG) Version successfully loaded: \(bundle.toString())")
+        logger.info("Fallback bundle is: \(fallback.toString())")
+        logger.info("Version successfully loaded: \(bundle.toString())")
         if autoDeletePrevious && !fallback.isBuiltin() && fallback.getId() != bundle.getId() {
             let res = self.delete(id: fallback.getId())
             if res {
-                print("\(CapacitorUpdater.TAG) Deleted previous bundle: \(fallback.toString())")
+                logger.info("Deleted previous bundle: \(fallback.toString())")
             } else {
-                print("\(CapacitorUpdater.TAG) Failed to delete previous bundle: \(fallback.toString())")
+                logger.error("Failed to delete previous bundle: \(fallback.toString())")
             }
         }
         self.setFallbackBundle(fallback: bundle)
@@ -956,8 +1049,17 @@ import UIKit
 
     func unsetChannel() -> SetChannel {
         let setChannel: SetChannel = SetChannel()
+
+        // Check if rate limit was exceeded
+        if CapgoUpdater.rateLimitExceeded {
+            logger.debug("Skipping unsetChannel due to rate limit (429). Requests will resume after app restart.")
+            setChannel.message = "Rate limit exceeded"
+            setChannel.error = "rate_limit_exceeded"
+            return setChannel
+        }
+
         if (self.channelUrl ).isEmpty {
-            print("\(CapacitorUpdater.TAG) Channel URL is not set")
+            logger.error("Channel URL is not set")
             setChannel.message = "Channel URL is not set"
             setChannel.error = "missing_config"
             return setChannel
@@ -965,24 +1067,30 @@ import UIKit
         let semaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
         let parameters: InfoObject = self.createInfoObject()
 
-        let request = AF.request(self.channelUrl, method: .delete, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
+        let request = alamofireSession.request(self.channelUrl, method: .delete, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
 
         request.validate().responseDecodable(of: SetChannelDec.self) { response in
+            // Check for 429 rate limit
+            if self.checkAndHandleRateLimitResponse(statusCode: response.response?.statusCode) {
+                setChannel.message = "Rate limit exceeded"
+                setChannel.error = "rate_limit_exceeded"
+                semaphore.signal()
+                return
+            }
+
             switch response.result {
             case .success:
-                if let status = response.value?.status {
-                    setChannel.status = status
-                }
-                if let error = response.value?.error {
-                    setChannel.error = error
-                }
-                if let message = response.value?.message {
-                    setChannel.message = message
+                if let responseValue = response.value {
+                    if let error = responseValue.error {
+                        setChannel.error = error
+                    } else {
+                        setChannel.status = responseValue.status ?? ""
+                        setChannel.message = responseValue.message ?? ""
+                    }
                 }
             case let .failure(error):
-                print("\(CapacitorUpdater.TAG) Error unset Channel", response.value ?? "", error)
-                setChannel.message = "Error unset Channel \(String(describing: response.value))"
-                setChannel.error = "response_error"
+                self.logger.error("Error unset Channel \(error)")
+                setChannel.error = "Request failed: \(error.localizedDescription)"
             }
             semaphore.signal()
         }
@@ -992,8 +1100,17 @@ import UIKit
 
     func setChannel(channel: String) -> SetChannel {
         let setChannel: SetChannel = SetChannel()
+
+        // Check if rate limit was exceeded
+        if CapgoUpdater.rateLimitExceeded {
+            logger.debug("Skipping setChannel due to rate limit (429). Requests will resume after app restart.")
+            setChannel.message = "Rate limit exceeded"
+            setChannel.error = "rate_limit_exceeded"
+            return setChannel
+        }
+
         if (self.channelUrl ).isEmpty {
-            print("\(CapacitorUpdater.TAG) Channel URL is not set")
+            logger.error("Channel URL is not set")
             setChannel.message = "Channel URL is not set"
             setChannel.error = "missing_config"
             return setChannel
@@ -1002,24 +1119,30 @@ import UIKit
         var parameters: InfoObject = self.createInfoObject()
         parameters.channel = channel
 
-        let request = AF.request(self.channelUrl, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
+        let request = alamofireSession.request(self.channelUrl, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
 
         request.validate().responseDecodable(of: SetChannelDec.self) { response in
+            // Check for 429 rate limit
+            if self.checkAndHandleRateLimitResponse(statusCode: response.response?.statusCode) {
+                setChannel.message = "Rate limit exceeded"
+                setChannel.error = "rate_limit_exceeded"
+                semaphore.signal()
+                return
+            }
+
             switch response.result {
             case .success:
-                if let status = response.value?.status {
-                    setChannel.status = status
-                }
-                if let error = response.value?.error {
-                    setChannel.error = error
-                }
-                if let message = response.value?.message {
-                    setChannel.message = message
+                if let responseValue = response.value {
+                    if let error = responseValue.error {
+                        setChannel.error = error
+                    } else {
+                        setChannel.status = responseValue.status ?? ""
+                        setChannel.message = responseValue.message ?? ""
+                    }
                 }
             case let .failure(error):
-                print("\(CapacitorUpdater.TAG) Error set Channel", response.value ?? "", error)
-                setChannel.message = "Error set Channel \(String(describing: response.value))"
-                setChannel.error = "response_error"
+                self.logger.error("Error set Channel \(error)")
+                setChannel.error = "Request failed: \(error.localizedDescription)"
             }
             semaphore.signal()
         }
@@ -1029,36 +1152,48 @@ import UIKit
 
     func getChannel() -> GetChannel {
         let getChannel: GetChannel = GetChannel()
+
+        // Check if rate limit was exceeded
+        if CapgoUpdater.rateLimitExceeded {
+            logger.debug("Skipping getChannel due to rate limit (429). Requests will resume after app restart.")
+            getChannel.message = "Rate limit exceeded"
+            getChannel.error = "rate_limit_exceeded"
+            return getChannel
+        }
+
         if (self.channelUrl ).isEmpty {
-            print("\(CapacitorUpdater.TAG) Channel URL is not set")
+            logger.error("Channel URL is not set")
             getChannel.message = "Channel URL is not set"
             getChannel.error = "missing_config"
             return getChannel
         }
         let semaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
         let parameters: InfoObject = self.createInfoObject()
-        let request = AF.request(self.channelUrl, method: .put, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
+        let request = alamofireSession.request(self.channelUrl, method: .put, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
 
         request.validate().responseDecodable(of: GetChannelDec.self) { response in
             defer {
                 semaphore.signal()
             }
+
+            // Check for 429 rate limit
+            if self.checkAndHandleRateLimitResponse(statusCode: response.response?.statusCode) {
+                getChannel.message = "Rate limit exceeded"
+                getChannel.error = "rate_limit_exceeded"
+                return
+            }
+
             switch response.result {
             case .success:
-                if let status = response.value?.status {
-                    getChannel.status = status
-                }
-                if let error = response.value?.error {
-                    getChannel.error = error
-                }
-                if let message = response.value?.message {
-                    getChannel.message = message
-                }
-                if let channel = response.value?.channel {
-                    getChannel.channel = channel
-                }
-                if let allowSet = response.value?.allowSet {
-                    getChannel.allowSet = allowSet
+                if let responseValue = response.value {
+                    if let error = responseValue.error {
+                        getChannel.error = error
+                    } else {
+                        getChannel.status = responseValue.status ?? ""
+                        getChannel.message = responseValue.message ?? ""
+                        getChannel.channel = responseValue.channel ?? ""
+                        getChannel.allowSet = responseValue.allowSet ?? true
+                    }
                 }
             case let .failure(error):
                 if let data = response.data, let bodyString = String(data: data, encoding: .utf8) {
@@ -1069,18 +1204,105 @@ import UIKit
                     }
                 }
 
-                print("\(CapacitorUpdater.TAG) Error get Channel", response.value ?? "", error)
-                getChannel.message = "Error get Channel \(String(describing: response.value)))"
-                getChannel.error = "response_error"
+                self.logger.error("Error get Channel \(error)")
+                getChannel.error = "Request failed: \(error.localizedDescription)"
             }
         }
         semaphore.wait()
         return getChannel
     }
 
+    func listChannels() -> ListChannels {
+        let listChannels: ListChannels = ListChannels()
+
+        // Check if rate limit was exceeded
+        if CapgoUpdater.rateLimitExceeded {
+            logger.debug("Skipping listChannels due to rate limit (429). Requests will resume after app restart.")
+            listChannels.error = "rate_limit_exceeded"
+            return listChannels
+        }
+
+        if (self.channelUrl).isEmpty {
+            logger.error("Channel URL is not set")
+            listChannels.error = "Channel URL is not set"
+            return listChannels
+        }
+
+        let semaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
+
+        // Auto-detect values
+        let appId = self.appId
+        let platform = "ios"
+        let isEmulator = self.isEmulator()
+        let isProd = self.isProd()
+
+        // Create query parameters
+        var urlComponents = URLComponents(string: self.channelUrl)
+        urlComponents?.queryItems = [
+            URLQueryItem(name: "app_id", value: appId),
+            URLQueryItem(name: "platform", value: platform),
+            URLQueryItem(name: "is_emulator", value: String(isEmulator)),
+            URLQueryItem(name: "is_prod", value: String(isProd))
+        ]
+
+        guard let url = urlComponents?.url else {
+            logger.error("Invalid channel URL")
+            listChannels.error = "Invalid channel URL"
+            return listChannels
+        }
+
+        let request = alamofireSession.request(url, method: .get, requestModifier: { $0.timeoutInterval = self.timeout })
+
+        request.validate().responseDecodable(of: ListChannelsDec.self) { response in
+            defer {
+                semaphore.signal()
+            }
+
+            // Check for 429 rate limit
+            if self.checkAndHandleRateLimitResponse(statusCode: response.response?.statusCode) {
+                listChannels.error = "rate_limit_exceeded"
+                return
+            }
+
+            switch response.result {
+            case .success:
+                if let responseValue = response.value {
+                    // Check for server-side errors
+                    if let error = responseValue.error {
+                        listChannels.error = error
+                        return
+                    }
+
+                    // Backend returns direct array, so channels should be populated by our custom decoder
+                    if let channels = responseValue.channels {
+                        listChannels.channels = channels.map { channel in
+                            var channelDict: [String: Any] = [:]
+                            channelDict["id"] = channel.id ?? ""
+                            channelDict["name"] = channel.name ?? ""
+                            channelDict["public"] = channel.public ?? false
+                            channelDict["allow_self_set"] = channel.allow_self_set ?? false
+                            return channelDict
+                        }
+                    }
+                }
+            case let .failure(error):
+                self.logger.error("Error list channels \(error)")
+                listChannels.error = "Request failed: \(error.localizedDescription)"
+            }
+        }
+        semaphore.wait()
+        return listChannels
+    }
+
     private let operationQueue = OperationQueue()
 
     func sendStats(action: String, versionName: String? = nil, oldVersionName: String? = "") {
+        // Check if rate limit was exceeded
+        if CapgoUpdater.rateLimitExceeded {
+            logger.debug("Skipping sendStats due to rate limit (429). Stats will resume after app restart.")
+            return
+        }
+
         guard !statsUrl.isEmpty else {
             return
         }
@@ -1095,22 +1317,28 @@ import UIKit
 
         let operation = BlockOperation {
             let semaphore = DispatchSemaphore(value: 0)
-            AF.request(
+            self.alamofireSession.request(
                 self.statsUrl,
                 method: .post,
                 parameters: parameters,
                 encoder: JSONParameterEncoder.default,
                 requestModifier: { $0.timeoutInterval = self.timeout }
             ).responseData { response in
+                // Check for 429 rate limit
+                if self.checkAndHandleRateLimitResponse(statusCode: response.response?.statusCode) {
+                    semaphore.signal()
+                    return
+                }
+
                 switch response.result {
                 case .success:
-                    print("\(CapacitorUpdater.TAG) Stats sent for \(action), version \(versionName)")
+                    self.logger.info("Stats sent for \(action), version \(versionName)")
                 case let .failure(error):
-                    print("\(CapacitorUpdater.TAG) Error sending stats: ", response.value ?? "", error.localizedDescription)
+                    self.logger.error("Error sending stats: \(response.value?.debugDescription ?? "") \(error.localizedDescription)")
                 }
                 semaphore.signal()
             }
-            semaphore.signal()
+            semaphore.wait()
         }
         operationQueue.addOperation(operation)
 
@@ -1121,7 +1349,6 @@ import UIKit
         if id != nil {
             trueId = id!
         }
-        // print("\(CapacitorUpdater.TAG) Getting info for bundle [\(trueId)]")
         let result: BundleInfo
         if BundleInfo.ID_BUILTIN == trueId {
             result = BundleInfo(id: trueId, version: "", status: BundleStatus.SUCCESS, checksum: "")
@@ -1131,11 +1358,10 @@ import UIKit
             do {
                 result = try UserDefaults.standard.getObj(forKey: "\(trueId)\(self.INFO_SUFFIX)", castTo: BundleInfo.self)
             } catch {
-                print("\(CapacitorUpdater.TAG) Failed to parse info for bundle [\(trueId)]", error.localizedDescription)
+                logger.error("Failed to parse info for bundle [\(trueId)] \(error.localizedDescription)")
                 result = BundleInfo(id: trueId, version: "", status: BundleStatus.PENDING, checksum: "")
             }
         }
-        // print("\(CapacitorUpdater.TAG) Returning info bundle [\(result.toString())]")
         return result
     }
 
@@ -1155,26 +1381,26 @@ import UIKit
 
     public func saveBundleInfo(id: String, bundle: BundleInfo?) {
         if bundle != nil && (bundle!.isBuiltin() || bundle!.isUnknown()) {
-            print("\(CapacitorUpdater.TAG) Not saving info for bundle [\(id)]", bundle?.toString() ?? "")
+            logger.info("Not saving info for bundle [\(id)] \(bundle?.toString() ?? "")")
             return
         }
         if bundle == nil {
-            print("\(CapacitorUpdater.TAG) Removing info for bundle [\(id)]")
+            logger.info("Removing info for bundle [\(id)]")
             UserDefaults.standard.removeObject(forKey: "\(id)\(self.INFO_SUFFIX)")
         } else {
             let update = bundle!.setId(id: id)
-            print("\(CapacitorUpdater.TAG) Storing info for bundle [\(id)]", update.toString())
+            logger.info("Storing info for bundle [\(id)] \(update.toString())")
             do {
                 try UserDefaults.standard.setObj(update, forKey: "\(id)\(self.INFO_SUFFIX)")
             } catch {
-                print("\(CapacitorUpdater.TAG) Failed to save info for bundle [\(id)]", error.localizedDescription)
+                logger.error("Failed to save info for bundle [\(id)] \(error.localizedDescription)")
             }
         }
         UserDefaults.standard.synchronize()
     }
 
     private func setBundleStatus(id: String, status: BundleStatus) {
-        print("\(CapacitorUpdater.TAG) Setting status for bundle [\(id)] to \(status)")
+        logger.info("Setting status for bundle [\(id)] to \(status)")
         let info = self.getBundleInfo(id: id)
         self.saveBundleInfo(id: id, bundle: info.setStatus(status: status.localizedString))
     }