@capgo/capacitor-updater 8.0.1 → 8.1.0

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,11 +30,10 @@ 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 = ""
-    public var PLUGIN_VERSION: String = ""
+    public var pluginVersion: String = ""
     public var timeout: Double = 20
     public var statsUrl: String = ""
     public var channelUrl: String = ""
@@ -42,12 +42,34 @@ import UIKit
     public var deviceID = ""
     public var publicKey: String = ""
 
-    public var notifyDownloadRaw: (String, Int, Bool) -> Void = { _, _, _  in }
-    public func notifyDownload(id: String, percent: Int, ignoreMultipleOfTen: Bool = false) {
-        notifyDownloadRaw(id, percent, ignoreMultipleOfTen)
+    // Flag to track if we received a 429 response - stops requests until app restart
+    private static var rateLimitExceeded = false
+
+    // Flag to track if we've already sent the rate limit statistic - prevents infinite loop
+    private static var rateLimitStatisticSent = false
+
+    private var userAgent: String {
+        let safePluginVersion = pluginVersion.isEmpty ? "unknown" : pluginVersion
+        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, BundleInfo?) -> Void = { _, _, _, _  in }
+    public func notifyDownload(id: String, percent: Int, ignoreMultipleOfTen: Bool = false, bundle: BundleInfo? = nil) {
+        notifyDownloadRaw(id, percent, ignoreMultipleOfTen, bundle)
     }
     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
     }
@@ -69,6 +91,64 @@ 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 {
+            // Send a statistic about the rate limit BEFORE setting the flag
+            // Only send once to prevent infinite loop if the stat request itself gets rate limited
+            if !CapgoUpdater.rateLimitExceeded && !CapgoUpdater.rateLimitStatisticSent {
+                CapgoUpdater.rateLimitStatisticSent = true
+
+                // Dispatch to background queue to avoid blocking the main thread
+                DispatchQueue.global(qos: .utility).async {
+                    self.sendRateLimitStatistic()
+                }
+            }
+            CapgoUpdater.rateLimitExceeded = true
+            logger.warn("Rate limit exceeded (429). Stopping all stats and channel requests until app restart.")
+            return true
+        }
+        return false
+    }
+
+    /**
+     * Send a synchronous statistic about rate limiting
+     * Note: This method uses a semaphore to block until the request completes.
+     * It MUST be called from a background queue to avoid blocking the main thread.
+     */
+    private func sendRateLimitStatistic() {
+        guard !statsUrl.isEmpty else {
+            return
+        }
+
+        let current = getCurrentBundle()
+        var parameters = createInfoObject()
+        parameters.action = "rate_limit_reached"
+        parameters.version_name = current.getVersionName()
+        parameters.old_version_name = ""
+
+        // Send synchronously using semaphore (safe because we're on a background queue)
+        let semaphore = DispatchSemaphore(value: 0)
+        self.alamofireSession.request(
+            self.statsUrl,
+            method: .post,
+            parameters: parameters,
+            encoder: JSONParameterEncoder.default,
+            requestModifier: { $0.timeoutInterval = self.timeout }
+        ).responseData { response in
+            switch response.result {
+            case .success:
+                self.logger.info("Rate limit statistic sent")
+            case let .failure(error):
+                self.logger.error("Error sending rate limit statistic: \(error.localizedDescription)")
+            }
+            semaphore.signal()
+        }
+        semaphore.wait()
+    }
+
     // MARK: Private
     private func hasEmbeddedMobileProvision() -> Bool {
         guard Bundle.main.path(forResource: "embedded", ofType: "mobileprovision") == nil else {
@@ -108,7 +188,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
             }
         }
@@ -118,7 +198,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
         }
     }
@@ -135,58 +215,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 decryptFileV2(filePath: URL, sessionKey: String, version: String) throws {
-        if self.publicKey.isEmpty || sessionKey.isEmpty  || sessionKey.components(separatedBy: ":").count != 2 {
-            print("\(CapacitorUpdater.TAG) Cannot find public key or sessionKey")
-            return
-        }
-        do {
-            guard let rsaPublicKey: RSAPublicKey = .load(rsaPublicKey: self.publicKey) else {
-                print("cannot decode publicKey", self.publicKey)
-                throw CustomError.cannotDecode
-            }
-
-            let sessionKeyArray: [String] = sessionKey.components(separatedBy: ":")
-            guard let ivData: Data = Data(base64Encoded: sessionKeyArray[0]) else {
-                print("cannot decode sessionKey", sessionKey)
-                throw CustomError.cannotDecode
-            }
-
-            guard let sessionKeyDataEncrypted = Data(base64Encoded: sessionKeyArray[1]) else {
-                throw NSError(domain: "Invalid session key data", code: 1, userInfo: nil)
-            }
-
-            guard let sessionKeyDataDecrypted = rsaPublicKey.decrypt(data: sessionKeyDataEncrypted) else {
-                throw NSError(domain: "Failed to decrypt session key data", code: 2, userInfo: nil)
-            }
-
-            let aesPrivateKey = AES128Key(iv: ivData, aes128Key: sessionKeyDataDecrypted)
-
-            guard let encryptedData = try? Data(contentsOf: filePath) else {
-                throw NSError(domain: "Failed to read encrypted data", code: 3, userInfo: nil)
-            }
-
-            guard let decryptedData = aesPrivateKey.decrypt(data: encryptedData) else {
-                throw NSError(domain: "Failed to decrypt data", code: 4, userInfo: nil)
-            }
-
-            try decryptedData.write(to: filePath)
-
-        } catch {
-            print("\(CapacitorUpdater.TAG) Cannot decode: \(filePath.path)", error)
-            self.sendStats(action: "decrypt_fail", versionName: version)
-            throw CustomError.cannotDecode
-        }
-    }
-
     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")
         }
 
@@ -255,12 +291,22 @@ import UIKit
 
         if !success || unzipError != nil {
             self.sendStats(action: "unzip_fail")
+            try? FileManager.default.removeItem(at: destUnZip)
             throw unzipError ?? CustomError.cannotUnzip
         }
 
         if try unflatFolder(source: destUnZip, dest: destPersist) {
             try deleteFolder(source: destUnZip)
         }
+
+        // Cleanup: remove the downloaded/decrypted zip after successful extraction
+        do {
+            if FileManager.default.fileExists(atPath: sourceZip.path) {
+                try FileManager.default.removeItem(at: sourceZip)
+            }
+        } catch {
+            logger.error("Could not delete source zip at \(sourceZip.path): \(error)")
+        }
     }
 
     private func createInfoObject() -> InfoObject {
@@ -273,7 +319,7 @@ import UIKit
             version_code: self.versionCode,
             version_os: self.versionOs,
             version_name: self.getCurrentBundle().getVersionName(),
-            plugin_version: self.PLUGIN_VERSION,
+            plugin_version: self.pluginVersion,
             is_emulator: self.isEmulator(),
             is_prod: self.isProd(),
             action: nil,
@@ -289,12 +335,13 @@ 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 {
             case .success:
+                latest.statusCode = response.response?.statusCode ?? 0
                 if let url = response.value?.url {
                     latest.url = url
                 }
@@ -307,6 +354,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
                 }
@@ -322,10 +372,17 @@ 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):
-                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"
+                latest.statusCode = response.response?.statusCode ?? 0
             }
             semaphore.signal()
         }
@@ -336,7 +393,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 {
@@ -347,36 +404,15 @@ import UIKit
         return FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("update.dat")
     }
     private var tempData = Data()
-    
+
     private func verifyChecksum(file: URL, expectedHash: String) -> Bool {
-        let actualHash = CryptoCipherV2.calcChecksum(filePath: file)
+        let actualHash =    CryptoCipher.calcChecksum(filePath: file)
         return actualHash == expectedHash
     }
 
-    public func decryptChecksum(checksum: String, version: String) throws -> String {
-        if self.publicKey.isEmpty {
-            return checksum
-        }
-        do {
-            let checksumBytes: Data = Data(base64Encoded: checksum)!
-            guard let rsaPublicKey: RSAPublicKey = .load(rsaPublicKey: self.publicKey) else {
-                print("cannot decode publicKey", self.publicKey)
-                throw CustomError.cannotDecode
-            }
-            guard let decryptedChecksum = rsaPublicKey.decrypt(data: checksumBytes) else {
-                throw NSError(domain: "Failed to decrypt session key data", code: 2, userInfo: nil)
-            }
-            return decryptedChecksum.base64EncodedString()
-        } catch {
-            print("\(CapacitorUpdater.TAG) Cannot decrypt checksum: \(checksum)", error)
-            self.sendStats(action: "decrypt_fail", versionName: version)
-            throw CustomError.cannotDecode
-        }
-    }
-
-    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)
-        print("\(CapacitorUpdater.TAG) downloadManifest start \(id)")
+        logger.info("downloadManifest start \(id)")
         let destFolder = self.getBundleDirectory(id: id)
         let builtinFolder = Bundle.main.bundleURL.appendingPathComponent("public")
 
@@ -384,9 +420,12 @@ 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
+        self.sendStats(action: "download_manifest_start", versionName: version)
+
         // Notify the start of the download process
         self.notifyDownload(id: id, percent: 0, ignoreMultipleOfTen: true)
 
@@ -405,17 +444,23 @@ import UIKit
 
             if !self.publicKey.isEmpty && !sessionKey.isEmpty {
                 do {
-                    fileHash = try CryptoCipherV2.decryptChecksum(checksum: fileHash, publicKey: self.publicKey, version: version)
+                    fileHash = try CryptoCipher.decryptChecksum(checksum: fileHash, publicKey: self.publicKey)
                 } catch {
                     downloadError = error
-                    print("\(CapacitorUpdater.TAG) CryptoCipherV2.decryptChecksum error \(id) \(fileName) error: \(error)")
+                    logger.error("CryptoCipher.decryptChecksum error \(id) \(fileName) error: \(error)")
                 }
             }
 
+            // 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
@@ -424,20 +469,30 @@ import UIKit
             dispatchGroup.enter()
 
             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)")
-                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)
-                print("\(CapacitorUpdater.TAG) 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))
+                do {
+                    try FileManager.default.copyItem(at: cacheFilePath, to: destFilePath)
+                    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))
+                } catch {
+                    downloadError = error
+                    logger.error("Failed to copy cached file \(fileName): \(error.localizedDescription)")
+                }
                 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 {
@@ -445,10 +500,11 @@ import UIKit
                         do {
                             let statusCode = response.response?.statusCode ?? 200
                             if statusCode < 200 || statusCode >= 300 {
+                                self.sendStats(action: "download_manifest_file_fail", versionName: "\(version):\(fileName)")
                                 if let stringData = String(data: data, encoding: .utf8) {
-                                    throw NSError(domain: "StatusCodeError", code: 2, userInfo: [NSLocalizedDescriptionKey: "Failed to fetch. Status code (\(statusCode)) invalid. Data: \(stringData)"])
+                                    throw NSError(domain: "StatusCodeError", code: 2, userInfo: [NSLocalizedDescriptionKey: "Failed to fetch. Status code (\(statusCode)) invalid. Data: \(stringData) for file \(fileName) at url \(downloadUrl)"])
                                 } else {
-                                    throw NSError(domain: "StatusCodeError", code: 2, userInfo: [NSLocalizedDescriptionKey: "Failed to fetch. Status code (\(statusCode)) invalid"])
+                                    throw NSError(domain: "StatusCodeError", code: 2, userInfo: [NSLocalizedDescriptionKey: "Failed to fetch. Status code (\(statusCode)) invalid for file \(fileName) at url \(downloadUrl)"])
                                 }
                             }
 
@@ -458,7 +514,7 @@ import UIKit
                                 let tempFile = self.cacheFolder.appendingPathComponent("temp_\(UUID().uuidString)")
                                 try finalData.write(to: tempFile)
                                 do {
-                                    try CryptoCipherV2.decryptFile(filePath: tempFile, publicKey: self.publicKey, sessionKey: sessionKey, version: version)
+                                    try CryptoCipher.decryptFile(filePath: tempFile, publicKey: self.publicKey, sessionKey: sessionKey, version: version)
                                 } catch {
                                     self.sendStats(action: "decrypt_fail", versionName: version)
                                     throw error
@@ -468,18 +524,27 @@ import UIKit
                                 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"])
+                            // 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):\(destFileName)")
+                                    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.publicKey.isEmpty && !sessionKey.isEmpty {
                                 // assume that calcChecksum != null
-                                let calculatedChecksum = CryptoCipherV2.calcChecksum(filePath: destFilePath)
+                                let calculatedChecksum = CryptoCipher.calcChecksum(filePath: destFilePath)
+                                CryptoCipher.logChecksumInfo(label: "Calculated checksum", hexChecksum: calculatedChecksum)
+                                CryptoCipher.logChecksumInfo(label: "Expected checksum", hexChecksum: fileHash)
                                 if calculatedChecksum != fileHash {
-                                    throw NSError(domain: "ChecksumError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Computed checksum is not equal to required checksum (\(calculatedChecksum) != \(fileHash))"])
+                                    // Delete the corrupt file before throwing error
+                                    try? FileManager.default.removeItem(at: destFilePath)
+                                    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)"])
                                 }
                             }
 
@@ -488,13 +553,15 @@ 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
-                            print("\(CapacitorUpdater.TAG) downloadManifest \(id) \(fileName) error: \(error)")
+                            self.logger.error("downloadManifest \(id) \(fileName) error: \(error.localizedDescription)")
                         }
                     case .failure(let error):
-                        print("\(CapacitorUpdater.TAG) downloadManifest \(id) \(fileName) download error: \(error). Debug response: \(response.debugDescription).")
+                        downloadError = error
+                        self.sendStats(action: "download_manifest_file_fail", versionName: "\(version):\(fileName)")
+                        self.logger.error("downloadManifest \(id) \(fileName) download error: \(error.localizedDescription). Debug response: \(response.debugDescription).")
                     }
                 }
             }
@@ -513,19 +580,52 @@ import UIKit
         let updatedBundle = bundleInfo.setStatus(status: BundleStatus.PENDING.localizedString)
         self.saveBundleInfo(id: id, bundle: updatedBundle)
 
-        print("\(CapacitorUpdater.TAG) downloadManifest done \(id)")
+        // Send stats for manifest download complete
+        self.sendStats(action: "download_manifest_complete", versionName: version)
+
+        self.notifyDownload(id: id, percent: 100, bundle: updatedBundle)
+        logger.info("downloadManifest done \(id)")
         return updatedBundle
     }
 
     private func decompressBrotli(data: Data, fileName: String) -> Data? {
+        // Handle empty files
+        if data.count == 0 {
+            return data
+        }
+
+        // Handle the special EMPTY_BROTLI_STREAM case
+        if data.count == 3 && data[0] == 0x1B && data[1] == 0x00 && data[2] == 0x06 {
+            return Data()
+        }
+
+        // For small files, check if it's a minimal Brotli wrapper
+        if data.count > 3 {
+            let maxBytes = min(32, data.count)
+            let hexDump = data.prefix(maxBytes).map { String(format: "%02x", $0) }.joined(separator: " ")
+            // Handle our minimal wrapper pattern
+            if data[0] == 0x1B && data[1] == 0x00 && data[2] == 0x06 && data.last == 0x03 {
+                let range = data.index(data.startIndex, offsetBy: 3)..<data.index(data.endIndex, offsetBy: -1)
+                return data[range]
+            }
+
+            // Handle brotli.compress minimal wrapper (quality 0)
+            if data[0] == 0x0b && data[1] == 0x02 && data[2] == 0x80 && data.last == 0x03 {
+                let range = data.index(data.startIndex, offsetBy: 3)..<data.index(data.endIndex, offsetBy: -1)
+                return data[range]
+            }
+        }
+
+        // For all other cases, try standard decompression
         let outputBufferSize = 65536
         var outputBuffer = [UInt8](repeating: 0, count: outputBufferSize)
         var decompressedData = Data()
 
         let streamPointer = UnsafeMutablePointer<compression_stream>.allocate(capacity: 1)
         var status = compression_stream_init(streamPointer, COMPRESSION_STREAM_DECODE, COMPRESSION_BROTLI)
+
         guard status != COMPRESSION_STATUS_ERROR else {
-            print("\(CapacitorUpdater.TAG) Unable to initialize the decompression stream. \(fileName)")
+            logger.error("Error: Failed to initialize Brotli stream for \(fileName). Status: \(status)")
             return nil
         }
 
@@ -547,7 +647,7 @@ import UIKit
                     if let baseAddress = rawBufferPointer.baseAddress {
                         streamPointer.pointee.src_ptr = baseAddress.assumingMemoryBound(to: UInt8.self)
                     } else {
-                        print("\(CapacitorUpdater.TAG) Error: Unable to get base address of input data. \(fileName)")
+                        logger.error("Error: Failed to get base address for \(fileName)")
                         status = COMPRESSION_STATUS_ERROR
                         return
                     }
@@ -555,6 +655,9 @@ 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: " ")
+                logger.error("Error: Brotli decompression failed for \(fileName). First \(maxBytes) bytes: \(hexDump)")
                 break
             }
 
@@ -568,15 +671,19 @@ import UIKit
             if status == COMPRESSION_STATUS_END {
                 break
             } else if status == COMPRESSION_STATUS_ERROR {
-                print("\(CapacitorUpdater.TAG) Error during Brotli decompression. \(fileName)")
-                // Try to decode as text if mostly ASCII
+                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) Compressed data as 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: " ")
+                logger.error("Error: Raw data (\(fileName)): \(hexDump)")
+
                 return nil
             }
 
@@ -586,6 +693,7 @@ import UIKit
             }
 
             if input.count == 0 {
+                logger.error("Error: Zero input size for \(fileName)")
                 break
             }
         }
@@ -593,7 +701,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() {
@@ -606,6 +714,10 @@ import UIKit
         var lastSentProgress = 0
         var totalReceivedBytes: Int64 = loadDownloadProgress() // Retrieving the amount of already downloaded data if exist, defined at 0 otherwise
         let requestHeaders: HTTPHeaders = ["Range": "bytes=\(totalReceivedBytes)-"]
+
+        // Send stats for zip download start
+        self.sendStats(action: "download_zip_start", versionName: version)
+
         // Opening connection for streaming the bytes
         if totalReceivedBytes == 0 {
             self.notifyDownload(id: id, percent: 0, ignoreMultipleOfTen: true)
@@ -614,11 +726,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") {
@@ -645,16 +759,16 @@ 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()
             }
         }
-        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 {
@@ -671,55 +785,67 @@ import UIKit
         reachabilityManager?.stopListening()
 
         if mainError != nil {
-            print("\(CapacitorUpdater.TAG) Failed to download: \(String(describing: mainError))")
-            self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.ERROR, downloaded: Date(), checksum: checksum))
+            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, link: link, comment: comment))
             throw mainError!
         }
 
         let finalPath = tempDataPath.deletingLastPathComponent().appendingPathComponent("\(id)")
         do {
-            try self.decryptFileV2(filePath: tempDataPath, sessionKey: sessionKey, version: version)
+            try CryptoCipher.decryptFile(filePath: tempDataPath, publicKey: self.publicKey, sessionKey: sessionKey, version: version)
             try FileManager.default.moveItem(at: tempDataPath, to: finalPath)
         } catch {
-            print("\(CapacitorUpdater.TAG) Failed decrypt file : \(error)")
-            self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.ERROR, downloaded: Date(), checksum: checksum))
+            logger.error("Failed decrypt file : \(error)")
+            self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.ERROR, downloaded: Date(), checksum: checksum, link: link, comment: comment))
             cleanDownloadData()
             throw error
         }
 
         do {
-            checksum = CryptoCipherV2.calcChecksum(filePath: finalPath)
-            print("\(CapacitorUpdater.TAG) Downloading: 80% (unzipping)")
+            checksum = CryptoCipher.calcChecksum(filePath: finalPath)
+            CryptoCipher.logChecksumInfo(label: "Calculated bundle checksum", hexChecksum: checksum)
+            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)")
-            self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.ERROR, downloaded: Date(), checksum: checksum))
+            logger.error("Failed to unzip file: \(error)")
+            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) {
+                    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)")
-        let info = BundleInfo(id: id, version: version, status: BundleStatus.PENDING, downloaded: Date(), checksum: checksum)
+        logger.info("Downloading: 90% (wrapping up)")
+        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()
-        self.notifyDownload(id: id, percent: 100)
-        print("\(CapacitorUpdater.TAG) Downloading: 100% (complete)")
+
+        // Send stats for zip download complete
+        self.sendStats(action: "download_zip_complete", versionName: version)
+
+        self.notifyDownload(id: id, percent: 100, bundle: info)
+        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")
             }
         }
     }
@@ -731,7 +857,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
@@ -739,7 +865,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)")
             }
         }
     }
@@ -758,7 +884,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
     }
@@ -767,7 +893,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
@@ -789,7 +915,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
     }
@@ -801,7 +927,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))
@@ -809,12 +935,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 {
@@ -833,7 +959,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
         }
 
@@ -842,7 +968,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
         }
 
@@ -850,7 +976,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)
@@ -863,7 +989,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
     }
@@ -872,6 +998,55 @@ import UIKit
         return self.delete(id: id, removeInfo: true)
     }
 
+    public func cleanupDeltaCache() {
+        let fileManager = FileManager.default
+        guard fileManager.fileExists(atPath: cacheFolder.path) else {
+            return
+        }
+        do {
+            try fileManager.removeItem(at: cacheFolder)
+            logger.info("Cleaned up delta cache folder")
+        } catch {
+            logger.error("Failed to cleanup delta cache: \(error.localizedDescription)")
+        }
+    }
+
+    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)
     }
@@ -916,7 +1091,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()
         }
     }
@@ -926,7 +1101,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)
@@ -939,14 +1114,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,46 +1131,41 @@ import UIKit
         self.setBundleStatus(id: bundle.getId(), status: BundleStatus.ERROR)
     }
 
-    func unsetChannel() -> SetChannel {
+    func unsetChannel(defaultChannelKey: String, configDefaultChannel: String) -> SetChannel {
         let setChannel: SetChannel = SetChannel()
-        if (self.channelUrl ).isEmpty {
-            print("\(CapacitorUpdater.TAG) Channel URL is not set")
-            setChannel.message = "Channel URL is not set"
-            setChannel.error = "missing_config"
-            return setChannel
-        }
-        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 })
+        // Clear persisted defaultChannel and revert to config value
+        UserDefaults.standard.removeObject(forKey: defaultChannelKey)
+        UserDefaults.standard.synchronize()
+        self.defaultChannel = configDefaultChannel
+        self.logger.info("Persisted defaultChannel cleared, reverted to config value: \(configDefaultChannel)")
 
-        request.validate().responseDecodable(of: SetChannelDec.self) { response in
-            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
-                }
-            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"
-            }
-            semaphore.signal()
-        }
-        semaphore.wait()
+        setChannel.status = "ok"
+        setChannel.message = "Channel override removed"
         return setChannel
     }
 
-    func setChannel(channel: String) -> SetChannel {
+    func setChannel(channel: String, defaultChannelKey: String, allowSetDefaultChannel: Bool) -> SetChannel {
         let setChannel: SetChannel = SetChannel()
+
+        // Check if setting defaultChannel is allowed
+        if !allowSetDefaultChannel {
+            logger.error("setChannel is disabled by allowSetDefaultChannel config")
+            setChannel.message = "setChannel is disabled by configuration"
+            setChannel.error = "disabled_by_config"
+            return 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
@@ -1004,24 +1174,36 @@ 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 {
+                        // Success - persist defaultChannel
+                        self.defaultChannel = channel
+                        UserDefaults.standard.set(channel, forKey: defaultChannelKey)
+                        UserDefaults.standard.synchronize()
+                        self.logger.info("defaultChannel persisted locally: \(channel)")
+
+                        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()
         }
@@ -1031,36 +1213,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) {
@@ -1071,18 +1265,113 @@ 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)
+
+        // Create info object and convert to query parameters
+        let infoObject = self.createInfoObject()
+
+        // Create query parameters from InfoObject
+        var urlComponents = URLComponents(string: self.channelUrl)
+        var queryItems: [URLQueryItem] = []
+
+        // Convert InfoObject to dictionary using Mirror
+        let mirror = Mirror(reflecting: infoObject)
+        for child in mirror.children {
+            if let key = child.label, let value = child.value as? CustomStringConvertible {
+                queryItems.append(URLQueryItem(name: key, value: String(describing: value)))
+            } else if let key = child.label {
+                // Handle optional values
+                let mirror = Mirror(reflecting: child.value)
+                if let value = mirror.children.first?.value {
+                    queryItems.append(URLQueryItem(name: key, value: String(describing: value)))
+                }
+            }
+        }
+
+        urlComponents?.queryItems = queryItems
+
+        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
         }
@@ -1097,22 +1386,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)
 
@@ -1123,7 +1418,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: "")
@@ -1133,11 +1427,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
     }
 
@@ -1157,26 +1450,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))
     }