@capgo/capacitor-updater 8.51.18 → 8.51.19

package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java

@@ -146,7 +146,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     static final int APPLICATION_EXIT_REASON_USER_REQUESTED = 10;
     static final int APPLICATION_EXIT_REASON_DEPENDENCY_DIED = 12;
 
-    private final String pluginVersion = "8.51.18";
+    private final String pluginVersion = "8.51.19";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -96,7 +96,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     deinit {
         implementation.shutdown()
     }
-    private let pluginVersion: String = "8.51.18"
+    private let pluginVersion: String = "8.51.19"
     private let launchStartedAtMs = Int64(Date().timeIntervalSince1970 * 1000)
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"
@@ -3555,7 +3555,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     private func makeSplashscreenCall(callbackId: String, options: [String: Any], methodName: String) -> CAPPluginCall {
-        CAPPluginCall(callbackId: callbackId, options: options, success: { [weak self] (_, _) in
+        CAPPluginCall(callbackId: callbackId, methodName: methodName, options: options, success: { [weak self] (_, _) in
             guard let self = self else { return }
             self.logger.info(self.splashscreenCompletedMessage(methodName: methodName))
         }, error: { [weak self] (_) in
@@ -3846,7 +3846,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             return
         }
 
-        let scheduleTimeout = {
+        let scheduleTimeout = { [weak self] in
+            guard let self = self else { return }
             self.autoSplashscreenTimeoutWorkItem?.cancel()
 
             let workItem = DispatchWorkItem { [weak self] in

package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -172,7 +172,15 @@ import UIKit
         return nsError.domain == NSURLErrorDomain && nsError.code == NSURLErrorTimedOut
     }
 
-    private lazy var alamofireSession: Session = {
+    // lazy var is not thread-safe; concurrent manifest downloads can race first access when statsUrl is empty.
+    private var _alamofireSession: Session?
+    private let alamofireSessionLock = NSLock()
+    private var alamofireSession: Session {
+        alamofireSessionLock.lock()
+        defer { alamofireSessionLock.unlock() }
+        if let session = _alamofireSession {
+            return session
+        }
         let configuration = URLSessionConfiguration.ephemeral
         configuration.httpAdditionalHeaders = ["User-Agent": self.userAgent]
         configuration.httpCookieStorage = nil
@@ -180,8 +188,10 @@ import UIKit
         configuration.requestCachePolicy = .reloadIgnoringLocalCacheData
         configuration.urlCache = nil
         configuration.httpMaximumConnectionsPerHost = Self.manifestMaxConcurrentFiles
-        return Session(configuration: configuration)
-    }()
+        let session = Session(configuration: configuration)
+        _alamofireSession = session
+        return session
+    }
     private let networkResponseQueue = DispatchQueue(label: "ee.forgr.capacitor-updater.network-response", qos: .utility)
 
     public var notifyDownloadRaw: (String, Int, Bool, BundleInfo?) -> Void = { _, _, _, _  in }

package/ios/Sources/CapacitorUpdaterPlugin/CryptoCipher.swift

@@ -161,49 +161,43 @@ public struct CryptoCipher {
         let bufferSize = checksumBufferBytes()
         var sha256 = SHA256()
 
+        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)")
+                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 hexString(from: sha256)
     }
 
     final class RunningChecksum {
@@ -222,8 +216,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 {

package/ios/Sources/CapacitorUpdaterPlugin/DelayUpdateUtils.swift

@@ -151,59 +151,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/ios/Sources/CapacitorUpdaterPlugin/ShakeMenu.swift

@@ -792,9 +792,9 @@ extension UIWindow {
                                         message: "Update downloaded! Reload to apply version \(latest.version)?",
                                         plugin: plugin,
                                         bridge: bridge,
-                                        onReload: { [weak plugin] in
+                                        onReload: {
                                             _ = updater.set(bundle: bundle)
-                                            _ = plugin?._reload()
+                                            _ = plugin._reload()
                                         }
                                     )
                                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "8.51.18",
+  "version": "8.51.19",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",