@capgo/cordova-updater 8.1.4 → 8.2.1

package/src/ios/CordovaUpdaterPlugin.swift

@@ -10,7 +10,6 @@ import Cordova
 #endif
 import UIKit
 import WebKit
-import Version
 
 /**
  * Please read the Capacitor iOS Plugin Development Guide
@@ -88,7 +87,7 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
     }()
 
                 public var implementation = CapgoUpdater()
-    private let pluginVersion: String = "8.1.4"
+    private let pluginVersion: String = "8.2.1"
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"
     static let channelUrlDefault = "https://plugin.capgo.app/channel_self"
@@ -139,7 +138,7 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
     // Note: DELAY_CONDITION_PREFERENCES is now defined in DelayUpdateUtils.DELAY_CONDITION_PREFERENCES
     private var updateUrl = ""
     private var backgroundTaskID: UIBackgroundTaskIdentifier = UIBackgroundTaskIdentifier.invalid
-    private var currentVersionNative: Version = "0.0.0"
+    private var currentVersionNative = CapgoSemanticVersion(major: 0, minor: 0, patch: 0)
     private var currentBuildVersion: String = "0"
     private var autoUpdate = false
     private var autoUpdateMode = CordovaUpdaterPlugin.autoUpdateModeOff
@@ -200,6 +199,8 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
     private var isLeavingPreviewForIncomingLink = false
     private var previewTransitionClearWorkItem: DispatchWorkItem?
     let semaphoreReady = DispatchSemaphore(value: 0)
+    private var readyGuardArmed = false
+    private var readyGeneration = 0
 
     private var delayUpdateUtils: DelayUpdateUtils!
 
@@ -243,7 +244,7 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
             fatalError("Cannot get version name")
         }
         do {
-            currentVersionNative = try Version(versionName)
+            currentVersionNative = try CapgoSemanticVersion(versionName)
         } catch {
             logger.error("Cannot parse versionName \(versionName)")
         }
@@ -285,6 +286,7 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
         periodCheckDelay = Self.normalizedPeriodCheckDelaySeconds(readConfigInt("periodCheckDelay", 0))
 
         implementation.setPublicKey(readConfigString("publicKey") ?? "")
+        implementation.allowHttpsToHttpRedirect = readConfigBool("allowHttpsToHttpRedirect", false)
         implementation.notifyDownloadRaw = notifyDownload
         implementation.notifyListeners = { [weak self] eventName, data in
             let emit = {
@@ -473,13 +475,21 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
         )
     }
 
-    private func syncKeepUrlPathFlag(enabled: Bool) {
-        let script: String
+    private func keepUrlPathFlagScriptSource(enabled: Bool) -> String {
         if enabled {
-            script = "(function(){ try { localStorage.setItem('\(keepUrlPathFlagKey)', '1'); } catch (err) {} window.__capgoKeepUrlPathAfterReload = true; var evt; try { evt = new CustomEvent('CapacitorUpdaterKeepUrlPathAfterReload', { detail: { enabled: true } }); } catch (e) { evt = document.createEvent('CustomEvent'); evt.initCustomEvent('CapacitorUpdaterKeepUrlPathAfterReload', false, false, { enabled: true }); } window.dispatchEvent(evt); })();"
-        } else {
-            script = "(function(){ try { localStorage.removeItem('\(keepUrlPathFlagKey)'); } catch (err) {} delete window.__capgoKeepUrlPathAfterReload; var evt; try { evt = new CustomEvent('CapacitorUpdaterKeepUrlPathAfterReload', { detail: { enabled: false } }); } catch (e) { evt = document.createEvent('CustomEvent'); evt.initCustomEvent('CapacitorUpdaterKeepUrlPathAfterReload', false, false, { enabled: false }); } window.dispatchEvent(evt); })();"
+            return "(function(){ try { localStorage.setItem('\(keepUrlPathFlagKey)', '1'); } catch (err) {} window.__capgoKeepUrlPathAfterReload = true; var evt; try { evt = new CustomEvent('CapacitorUpdaterKeepUrlPathAfterReload', { detail: { enabled: true } }); } catch (e) { evt = document.createEvent('CustomEvent'); evt.initCustomEvent('CapacitorUpdaterKeepUrlPathAfterReload', false, false, { enabled: true }); } window.dispatchEvent(evt); })();"
         }
+        return "(function(){ try { localStorage.removeItem('\(keepUrlPathFlagKey)'); } catch (err) {} delete window.__capgoKeepUrlPathAfterReload; var evt; try { evt = new CustomEvent('CapacitorUpdaterKeepUrlPathAfterReload', { detail: { enabled: false } }); } catch (e) { evt = document.createEvent('CustomEvent'); evt.initCustomEvent('CapacitorUpdaterKeepUrlPathAfterReload', false, false, { enabled: false }); } window.dispatchEvent(evt); })();"
+    }
+
+    private func addKeepUrlPathDocumentStartScript(to controller: WKUserContentController, enabled: Bool) {
+        let userScript = WKUserScript(source: keepUrlPathFlagScriptSource(enabled: enabled), injectionTime: .atDocumentStart, forMainFrameOnly: true)
+        controller.addUserScript(userScript)
+        self.keepUrlPathFlagLastValue = enabled
+    }
+
+    private func syncKeepUrlPathFlag(enabled: Bool) {
+        let script = keepUrlPathFlagScriptSource(enabled: enabled)
         DispatchQueue.main.async { [weak self] in
             guard let self = self, let webView = self.updaterWebView else {
                 return
@@ -545,8 +555,10 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
         var dest: URL
         if BundleInfo.ID_BUILTIN == id {
             dest = Bundle.main.resourceURL!.appendingPathComponent("public")
+        } else if let bundleDir = try? self.implementation.getBundleDirectory(id: id) {
+            dest = bundleDir
         } else {
-            dest = self.implementation.getBundleDirectory(id: id)
+            dest = Bundle.main.resourceURL!.appendingPathComponent("public")
         }
 
         if !FileManager.default.fileExists(atPath: dest.path) {
@@ -1594,7 +1606,19 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
             throw makePreviewError("Invalid download URL")
         }
 
+        if !self.implementation.publicKey.isEmpty && !CryptoCipher.isValidSessionKey(sessionKey) {
+            self.logger.error("Public key present but no valid session key provided")
+            self.implementation.sendStats(action: "session_key_required", versionName: version)
+            throw makePreviewError("Session key required when public key is present")
+        }
+
         var checksum = rawChecksum
+        if manifestEntries == nil && checksum.isEmpty {
+            self.logger.error("No checksum provided")
+            self.implementation.sendStats(action: "checksum_required", versionName: version)
+            throw makePreviewError("Checksum required")
+        }
+
         let next: BundleInfo
         if let manifestEntries = manifestEntries {
             next = try self.implementation.downloadManifest(manifest: manifestEntries, version: version, sessionKey: sessionKey)
@@ -1602,29 +1626,20 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
             next = try self.implementation.download(url: url, version: version, sessionKey: sessionKey)
         }
 
-        if self.implementation.publicKey != "" && checksum == "" {
-            self.logger.error("Public key present but no checksum provided")
-            self.implementation.sendStats(action: "checksum_required", versionName: next.getVersionName())
-            let id = next.getId()
-            let resDel = self.implementation.delete(id: id)
-            if !resDel {
-                self.logger.error("Delete failed, id \(id) doesn't exist")
-            }
-            throw ObjectSavableError.checksum
-        }
-
-        checksum = try CryptoCipher.decryptChecksum(checksum: checksum, publicKey: self.implementation.publicKey)
-        CryptoCipher.logChecksumInfo(label: "Bundle checksum", hexChecksum: next.getChecksum())
-        CryptoCipher.logChecksumInfo(label: "Expected checksum", hexChecksum: checksum)
-        if (checksum != "" || self.implementation.publicKey != "") && next.getChecksum() != checksum {
-            self.logger.error("Error checksum \(next.getChecksum()) \(checksum)")
-            self.implementation.sendStats(action: "checksum_fail", versionName: next.getVersionName())
-            let id = next.getId()
-            let resDel = self.implementation.delete(id: id)
-            if !resDel {
-                self.logger.error("Delete failed, id \(id) doesn't exist")
+        if manifestEntries == nil {
+            checksum = try CryptoCipher.decryptChecksum(checksum: checksum, publicKey: self.implementation.publicKey)
+            CryptoCipher.logChecksumInfo(label: "Bundle checksum", hexChecksum: next.getChecksum())
+            CryptoCipher.logChecksumInfo(label: "Expected checksum", hexChecksum: checksum)
+            if next.getChecksum() != checksum {
+                self.logger.error("Error checksum \(next.getChecksum()) \(checksum)")
+                self.implementation.sendStats(action: "checksum_fail", versionName: next.getVersionName())
+                let id = next.getId()
+                let resDel = self.implementation.delete(id: id)
+                if !resDel {
+                    self.logger.error("Delete failed, id \(id) doesn't exist")
+                }
+                throw ObjectSavableError.checksum
             }
-            throw ObjectSavableError.checksum
         }
 
         self.logger.info("Good checksum \(next.getChecksum()) \(checksum)")
@@ -1676,8 +1691,10 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
         let id = self.implementation.getCurrentBundleId()
         if BundleInfo.ID_BUILTIN == id {
             return Bundle.main.resourceURL!.appendingPathComponent("public")
+        } else if let bundleDir = try? self.implementation.getBundleDirectory(id: id) {
+            return bundleDir
         } else {
-            return self.implementation.getBundleDirectory(id: id)
+            return Bundle.main.resourceURL!.appendingPathComponent("public")
         }
     }
 
@@ -1685,6 +1702,7 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
         let id = self.implementation.getCurrentBundleId()
         let dest = self.currentReloadDestination()
         logger.info("Reloading \(id)")
+        self.armReadyGuard(webView: self.updaterWebView)
 
         if self.keepUrlPathAfterReload {
             self.syncKeepUrlPathFlag(enabled: true)
@@ -2889,11 +2907,19 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
         self.saveCallForAsyncHandling(call)
         DispatchQueue.global(qos: .utility).async {
             let configDefaultChannel = self.readConfigString("defaultChannel", "")!
-            let res = self.implementation.unsetChannel(defaultChannelKey: self.defaultChannelDefaultsKey, configDefaultChannel: configDefaultChannel)
+            let res = self.implementation.unsetChannel(
+                defaultChannelKey: self.defaultChannelDefaultsKey,
+                configDefaultChannel: configDefaultChannel,
+                allowSetDefaultChannel: self.allowSetDefaultChannel
+            )
             if res.error != "" {
-                self.rejectCall(call, message: res.error, code: "UNSETCHANNEL_FAILED", data: [
-                    "message": res.error,
-                    "error": res.error.contains("Channel URL") ? "missing_config" : "request_failed"
+                let errorCode = res.error == "disabled_by_config"
+                    ? "disabled_by_config"
+                    : (res.error.contains("Channel URL") ? "missing_config" : "request_failed")
+                let message = res.message.isEmpty ? res.error : res.message
+                self.rejectCall(call, message: message, code: "UNSETCHANNEL_FAILED", data: [
+                    "message": message,
+                    "error": errorCode
                 ])
             } else {
                 guard self.persistDefaultChannelStateFromDefaults() else {
@@ -3116,7 +3142,90 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
         ])
     }
 
+    static func shouldAcceptReadyCall(guardArmed: Bool, expectedGeneration: Int, reportedGeneration: Int?) -> Bool {
+        if !guardArmed {
+            return true
+        }
+        guard let reportedGeneration else {
+            return false
+        }
+        return reportedGeneration == expectedGeneration
+    }
+
+    static func readyGenerationScript(_ generation: Int) -> String {
+        return "(function(){window.__CAPGO_READY_GEN=\(generation);})();"
+    }
+
+    static func readyGenerationBootstrapScript(_ generation: Int) -> String {
+        return """
+        (function(){
+          var slot = { value: \(generation) };
+          window.__capgoReadyGenSlot = slot;
+          Object.defineProperty(window, '__CAPGO_READY_GEN', { get: function() { return slot.value; }, configurable: true });
+        })();
+        """
+    }
+
+    private func reinstallDocumentStartUserScripts(webView: WKWebView, readyGeneration: Int) {
+        let controller = webView.configuration.userContentController
+        controller.removeAllUserScripts()
+        self.keepUrlPathFlagLastValue = nil
+        let readyScript = WKUserScript(
+            source: CordovaUpdaterPlugin.readyGenerationBootstrapScript(readyGeneration),
+            injectionTime: .atDocumentStart,
+            forMainFrameOnly: true
+        )
+        controller.addUserScript(readyScript)
+        if self.keepUrlPathAfterReload {
+            self.addKeepUrlPathDocumentStartScript(to: controller, enabled: true)
+        }
+        self.webViewStatsReporter?.reinstallDocumentStartScript(on: webView)
+    }
+
+    private func armReadyGuard(webView: WKWebView?) {
+        self.readyGeneration += 1
+        let generation = self.readyGeneration
+        self.readyGuardArmed = true
+        guard let webView else {
+            logger.warn("Cannot stamp notifyAppReady generation without a webview")
+            self.readyGuardArmed = false
+            return
+        }
+        let installScripts = {
+            self.reinstallDocumentStartUserScripts(webView: webView, readyGeneration: generation)
+        }
+        if Thread.isMainThread {
+            installScripts()
+        } else {
+            DispatchQueue.main.sync(execute: installScripts)
+        }
+    }
+
+    private func reportedReadyGeneration(_ call: CAPPluginCall) -> Int? {
+        if let value = call.getValue("loadGeneration") as? Int {
+            return value
+        }
+        if let number = call.getValue("loadGeneration") as? NSNumber {
+            return number.intValue
+        }
+        return nil
+    }
+
+    private func acceptsReadyCall(_ call: CAPPluginCall) -> Bool {
+        let reported = self.readyGuardArmed ? self.reportedReadyGeneration(call) : nil
+        return CordovaUpdaterPlugin.shouldAcceptReadyCall(
+            guardArmed: self.readyGuardArmed,
+            expectedGeneration: self.readyGeneration,
+            reportedGeneration: reported
+        )
+    }
+
     func notifyAppReady(_ call: CAPPluginCall) {
+        if !self.acceptsReadyCall(call) {
+            logger.info("Ignoring notifyAppReady from a page that is no longer current")
+            call.resolve(["bundle": self.implementation.getCurrentBundle().toJSON()])
+            return
+        }
         self.semaphoreDown()
         let bundle = self.implementation.getCurrentBundle()
         self.implementation.setSuccess(bundle: bundle, autoDeletePrevious: self.autoDeletePrevious)
@@ -4123,6 +4232,28 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
             if latestVersionName != "" && current.getVersionName() != latestVersionName {
                 do {
                     self.logger.info("New bundle: \(latestVersionName) found. Current is: \(current.getVersionName()). \(messageUpdate)")
+                    if !self.implementation.publicKey.isEmpty && !CryptoCipher.isValidSessionKey(sessionKey) {
+                        self.logger.error("Public key present but no valid session key provided")
+                        self.implementation.sendStats(action: "session_key_required", versionName: latestVersionName)
+                        self.endBackGroundTaskWithNotif(
+                            msg: "Session key required when public key is present",
+                            latestVersionName: latestVersionName,
+                            current: current,
+                            plannedDirectUpdate: plannedDirectUpdate
+                        )
+                        return
+                    }
+                    if res.manifest == nil && (res.checksum ?? "").isEmpty {
+                        self.logger.error("No checksum provided")
+                        self.implementation.sendStats(action: "checksum_required", versionName: latestVersionName)
+                        self.endBackGroundTaskWithNotif(
+                            msg: "Checksum required",
+                            latestVersionName: latestVersionName,
+                            current: current,
+                            plannedDirectUpdate: plannedDirectUpdate
+                        )
+                        return
+                    }
                     var nextImpl = self.implementation.getBundleInfoByVersionName(version: latestVersionName)
                     if nextImpl == nil || nextImpl?.isDeleted() == true {
                         if nextImpl?.isDeleted() == true {
@@ -4169,7 +4300,7 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
                     res.checksum = try CryptoCipher.decryptChecksum(checksum: res.checksum, publicKey: self.implementation.publicKey)
                     CryptoCipher.logChecksumInfo(label: "Bundle checksum", hexChecksum: next.getChecksum())
                     CryptoCipher.logChecksumInfo(label: "Expected checksum", hexChecksum: res.checksum)
-                    if res.checksum != "" && next.getChecksum() != res.checksum && res.manifest == nil {
+                    if res.manifest == nil && next.getChecksum() != res.checksum {
                         self.logger.error("Error checksum \(next.getChecksum()) \(res.checksum)")
                         self.implementation.sendStats(action: "checksum_fail", versionName: next.getVersionName())
                         let id = next.getId()
@@ -4584,8 +4715,8 @@ public class CordovaUpdaterPlugin: CDVPlugin, CDVPluginSchemeHandler {
                         // Determine update availability by comparing versions
                         if let availableVersion = availableVersion {
                             do {
-                                let currentVer = try Version(currentVersionName)
-                                let availableVer = try Version(availableVersion)
+                                let currentVer = try CapgoSemanticVersion(currentVersionName)
+                                let availableVer = try CapgoSemanticVersion(availableVersion)
                                 if availableVer > currentVer {
                                     result["updateAvailability"] = AppUpdateAvailability.updateAvailable.rawValue
                                 } else {

package/src/ios/CryptoCipher.swift

@@ -160,50 +160,46 @@ public struct CryptoCipher {
     public static func calcChecksum(filePath: URL) -> String {
         let bufferSize = checksumBufferBytes()
         var sha256 = SHA256()
+        var readFailed = false
 
+        let fileHandle: FileHandle
         do {
-            let fileHandle: FileHandle
+            fileHandle = try FileHandle(forReadingFrom: filePath)
+        } catch {
+            logger.error("Cannot open file for checksum calculation")
+            logger.debug("Path: \(filePath.path), Error: \(error)")
+            return ""
+        }
+
+        defer {
             do {
-                fileHandle = try FileHandle(forReadingFrom: filePath)
+                try fileHandle.close()
             } catch {
-                logger.error("Cannot open file for checksum calculation")
-                logger.debug("Path: \(filePath.path), Error: \(error)")
-                return ""
+                logger.error("Error closing file during checksum")
+                logger.debug("Error: \(error)")
             }
+        }
 
-            defer {
-                do {
-                    try fileHandle.close()
-                } catch {
-                    logger.error("Error closing file during checksum")
-                    logger.debug("Error: \(error)")
-                }
+        while autoreleasepool(invoking: {
+            let fileData: Data
+            do {
+                fileData = try fileHandle.read(upToCount: bufferSize) ?? Data()
+            } catch {
+                logger.error("Error reading file during checksum")
+                logger.debug("Error: \(error)")
+                readFailed = true
+                return false
             }
 
-            while autoreleasepool(invoking: {
-                let fileData: Data
-                do {
-                    fileData = try fileHandle.read(upToCount: bufferSize) ?? Data()
-                } catch {
-                    logger.error("Error reading file during checksum")
-                    logger.debug("Error: \(error)")
-                    return false
-                }
-
-                if fileData.count > 0 {
-                    sha256.update(data: fileData)
-                    return true // Continue
-                } else {
-                    return false // End of file
-                }
-            }) {}
+            if fileData.count > 0 {
+                sha256.update(data: fileData)
+                return true // Continue
+            } else {
+                return false // End of file
+            }
+        }) {}
 
-            return hexString(from: sha256)
-        } catch {
-            logger.error("Cannot calculate checksum")
-            logger.debug("Path: \(filePath.path), Error: \(error)")
-            return ""
-        }
+        return readFailed ? "" : hexString(from: sha256)
     }
 
     final class RunningChecksum {
@@ -222,8 +218,7 @@ public struct CryptoCipher {
     }
 
     static func hexString(from sha256: SHA256) -> String {
-        var copy = sha256
-        return copy.finalize().compactMap { String(format: "%02x", $0) }.joined()
+        return sha256.finalize().compactMap { String(format: "%02x", $0) }.joined()
     }
 
     static func shortPathKey(_ fileName: String) -> String {
@@ -232,8 +227,16 @@ public struct CryptoCipher {
         return String(hexString(from: sha256).prefix(16))
     }
 
+    public static func isValidSessionKey(_ sessionKey: String) -> Bool {
+        if sessionKey.isEmpty {
+            return false
+        }
+        let sessionKeyParts = sessionKey.components(separatedBy: ":")
+        return sessionKeyParts.count == 2 && !sessionKeyParts[0].isEmpty && !sessionKeyParts[1].isEmpty
+    }
+
     public static func decryptFile(filePath: URL, publicKey: String, sessionKey: String, version: String) throws {
-        if publicKey.isEmpty || sessionKey.isEmpty || sessionKey.components(separatedBy: ":").count != 2 {
+        if publicKey.isEmpty || !isValidSessionKey(sessionKey) {
             logger.info("Encryption not set, no public key or session, ignored")
             return
         }

package/src/ios/DelayUpdateUtils.swift

@@ -13,7 +13,6 @@
 //
 
 import Foundation
-import Version
 
 public class DelayUpdateUtils {
 
@@ -23,7 +22,7 @@ public class DelayUpdateUtils {
     // swiftlint:enable identifier_name
     private let logger: Logger
 
-    private let currentVersionNative: Version
+    private let currentVersionNative: CapgoSemanticVersion
 
     public enum CancelDelaySource {
         case killed
@@ -39,7 +38,7 @@ public class DelayUpdateUtils {
         }
     }
 
-    public init(currentVersionNative: Version, logger: Logger) {
+    public init(currentVersionNative: CapgoSemanticVersion, logger: Logger) {
         self.currentVersionNative = currentVersionNative
         self.logger = logger
     }
@@ -117,7 +116,7 @@ public class DelayUpdateUtils {
             case "nativeVersion":
                 if let value = value, !value.isEmpty {
                     do {
-                        let versionLimit = try Version(value)
+                        let versionLimit = try CapgoSemanticVersion(value)
                         if currentVersionNative >= versionLimit {
                             // swiftlint:disable:next line_length
                             logger.info("Native version delay (value: \(value)) condition removed due to above limit at index \(index)")
@@ -151,59 +150,34 @@ public class DelayUpdateUtils {
     }
 
     public func setMultiDelay(delayConditions: String) -> Bool {
-        do {
-            UserDefaults.standard.set(delayConditions, forKey: DelayUpdateUtils.DELAY_CONDITION_PREFERENCES)
-            UserDefaults.standard.synchronize()
-            logger.info("Delay update saved")
-            return true
-        } catch {
-            logger.error("Failed to delay update, [Error calling 'setMultiDelay()']: \(error)")
-            return false
-        }
+        UserDefaults.standard.set(delayConditions, forKey: DelayUpdateUtils.DELAY_CONDITION_PREFERENCES)
+        UserDefaults.standard.synchronize()
+        logger.info("Delay update saved")
+        return true
     }
 
     public func setBackgroundTimestamp(_ backgroundTimestamp: Int64) {
-        do {
-            UserDefaults.standard.set(backgroundTimestamp, forKey: DelayUpdateUtils.BACKGROUND_TIMESTAMP_KEY)
-            UserDefaults.standard.synchronize()
-            logger.info("Background timestamp saved")
-        } catch {
-            logger.error("Failed to save background timestamp, [Error calling 'setBackgroundTimestamp()']: \(error)")
-        }
+        UserDefaults.standard.set(backgroundTimestamp, forKey: DelayUpdateUtils.BACKGROUND_TIMESTAMP_KEY)
+        UserDefaults.standard.synchronize()
+        logger.info("Background timestamp saved")
     }
 
     public func unsetBackgroundTimestamp() {
-        do {
-            UserDefaults.standard.removeObject(forKey: DelayUpdateUtils.BACKGROUND_TIMESTAMP_KEY)
-            UserDefaults.standard.synchronize()
-            logger.info("Background timestamp removed")
-        } catch {
-            // swiftlint:disable:next line_length
-            logger.error("Failed to remove background timestamp, [Error calling 'unsetBackgroundTimestamp()']: \(error)")
-        }
+        UserDefaults.standard.removeObject(forKey: DelayUpdateUtils.BACKGROUND_TIMESTAMP_KEY)
+        UserDefaults.standard.synchronize()
+        logger.info("Background timestamp removed")
     }
 
     private func getBackgroundTimestamp() -> Int64 {
-        do {
-            let key = DelayUpdateUtils.BACKGROUND_TIMESTAMP_KEY
-            let timestamp = UserDefaults.standard.object(forKey: key) as? Int64 ?? 0
-            return timestamp
-        } catch {
-            logger.error("Failed to get background timestamp, [Error calling 'getBackgroundTimestamp()']: \(error)")
-            return 0
-        }
+        let key = DelayUpdateUtils.BACKGROUND_TIMESTAMP_KEY
+        return UserDefaults.standard.object(forKey: key) as? Int64 ?? 0
     }
 
     public func cancelDelay(source: String) -> Bool {
-        do {
-            UserDefaults.standard.removeObject(forKey: DelayUpdateUtils.DELAY_CONDITION_PREFERENCES)
-            UserDefaults.standard.synchronize()
-            logger.info("All delays canceled from \(source)")
-            return true
-        } catch {
-            logger.error("Failed to cancel update delay: \(error)")
-            return false
-        }
+        UserDefaults.standard.removeObject(forKey: DelayUpdateUtils.DELAY_CONDITION_PREFERENCES)
+        UserDefaults.standard.synchronize()
+        logger.info("All delays canceled from \(source)")
+        return true
     }
 
     // MARK: - Helper methods

package/src/ios/Logger.swift

@@ -3,6 +3,8 @@ import os.log
 import WebKit
 
 public class Logger {
+    static let maxWebViewLogPayloadBytes = 4096
+
     public enum LogLevel: Int {
         case silent = 0
         case error
@@ -173,20 +175,94 @@ public class Logger {
         if let label = _labels[level] {
             log(atLevel: level, label: label, tag: tag, message: message)
             if let webView = self.webView {
-                DispatchQueue.main.async {
-                    let combined = "\(label) \(self.tag) : \(message)"
-                    let jsArg = self.toJSStringLiteral(combined)
-                    webView.evaluateJavaScript("console.\(level.asString())(\(jsArg))", completionHandler: nil)
+                let logTag = self.tag
+                DispatchQueue.main.async { [weak self] in
+                    guard let self else { return }
+                    if let script = self.buildWebViewConsoleScript(level: level, label: label, tag: logTag, message: message) {
+                        webView.evaluateJavaScript(script, completionHandler: nil)
+                    }
                 }
             }
         }
     }
 
-    private func toJSStringLiteral(_ value: String) -> String {
+    func consoleMethodName(for level: LogLevel) -> String? {
+        switch level {
+        case .error:
+            return "error"
+        case .warn:
+            return "warn"
+        case .info:
+            return "info"
+        case .debug:
+            return "debug"
+        case .silent:
+            return nil
+        }
+    }
+
+    private func utf8SequenceLength(_ lead: UInt8) -> Int {
+        if (lead & 0x80) == 0 {
+            return 1
+        }
+        if (lead & 0xE0) == 0xC0 {
+            return 2
+        }
+        if (lead & 0xF0) == 0xE0 {
+            return 3
+        }
+        if (lead & 0xF8) == 0xF0 {
+            return 4
+        }
+        return 0
+    }
+
+    func capWebViewLogPayload(_ payload: String) -> String {
+        let suffix = "..."
+        let maxPayloadBytes = Logger.maxWebViewLogPayloadBytes
+        let payloadBytes = Array(payload.utf8.prefix(maxPayloadBytes + 1))
+        if payloadBytes.count <= maxPayloadBytes {
+            return payload
+        }
+
+        var end = maxPayloadBytes
+        while end > 0 && (payloadBytes[end - 1] & 0xC0) == 0x80 {
+            end -= 1
+        }
+        while end > 0 {
+            let leadIndex = end - 1
+            let lead = payloadBytes[leadIndex]
+            let seqLength = utf8SequenceLength(lead)
+            if seqLength == 0 {
+                end -= 1
+                continue
+            }
+            if leadIndex + seqLength <= maxPayloadBytes {
+                end = leadIndex + seqLength
+                break
+            }
+            end -= 1
+        }
+
+        return String(decoding: payloadBytes[0..<end], as: UTF8.self) + suffix
+    }
+
+    func buildWebViewConsoleScript(level: LogLevel, label: String, tag: String, message: String) -> String? {
+        guard let consoleMethod = consoleMethodName(for: level) else {
+            return nil
+        }
+
+        let payload = capWebViewLogPayload("\(label) \(tag) : \(message)")
+        return "console.\(consoleMethod)(\(toJSStringLiteral(payload)))"
+    }
+
+    func toJSStringLiteral(_ value: String) -> String {
         // Prefer JSON encoding to produce a valid JS string literal
         if let data = try? JSONEncoder().encode(value),
            let encoded = String(data: data, encoding: .utf8) {
             return encoded
+                .replacingOccurrences(of: "\u{2028}", with: "\\u2028")
+                .replacingOccurrences(of: "\u{2029}", with: "\\u2029")
         }
 
         // Fallback manual escaping (unlikely to be used)