@capgo/capacitor-updater 8.51.7 → 8.51.9

package/ios/Sources/CapacitorUpdaterPlugin/CryptoCipher.swift

@@ -141,8 +141,43 @@ public struct CryptoCipher {
         }
     }
 
+    private static let twoGiB: UInt64 = 2 * 1024 * 1024 * 1024
+    private static let threeGiB: UInt64 = 3 * 1024 * 1024 * 1024
+    private static let fourGiB: UInt64 = 4 * 1024 * 1024 * 1024
+    private static let eightGiB: UInt64 = 8 * 1024 * 1024 * 1024
+    private static let flagshipIoBufferBytes = 5 * 1024 * 1024
+
+    /// Checksum and copy share one ladder. 64-wide peak RAM = 64 * buffer.
+    /// <2GB: 64KB. <3GB: 256KB. <4GB: 512KB. <8GB: 1MB. Else 5MB (flagship / unknown).
+    static func ioBufferBytes(_ physicalRamBytes: UInt64 = ProcessInfo.processInfo.physicalMemory) -> Int {
+        if physicalRamBytes == 0 {
+            return flagshipIoBufferBytes
+        }
+        if physicalRamBytes < twoGiB {
+            return 64 * 1024
+        }
+        if physicalRamBytes < threeGiB {
+            return 256 * 1024
+        }
+        if physicalRamBytes < fourGiB {
+            return 512 * 1024
+        }
+        if physicalRamBytes < eightGiB {
+            return 1024 * 1024
+        }
+        return flagshipIoBufferBytes
+    }
+
+    static func checksumBufferBytes(_ physicalRamBytes: UInt64 = ProcessInfo.processInfo.physicalMemory) -> Int {
+        return ioBufferBytes(physicalRamBytes)
+    }
+
+    static func copyBufferBytes(_ physicalRamBytes: UInt64 = ProcessInfo.processInfo.physicalMemory) -> Int {
+        return ioBufferBytes(physicalRamBytes)
+    }
+
     public static func calcChecksum(filePath: URL) -> String {
-        let bufferSize = 1024 * 1024 * 5 // 5 MB
+        let bufferSize = checksumBufferBytes()
         var sha256 = SHA256()
 
         do {
@@ -243,42 +278,19 @@ public struct CryptoCipher {
 
             let aesPrivateKey = AES128Key(iv: ivData, aes128Key: sessionKeyDataDecrypted, logger: logger)
 
-            let encryptedData: Data
-            do {
-                encryptedData = try Data(contentsOf: filePath)
-            } catch {
-                logger.error("Failed to read encrypted data")
-                logger.debug("Error: \(error)")
-                throw NSError(domain: "Failed to read encrypted data", code: 3, userInfo: nil)
-            }
-
-            if encryptedData.isEmpty {
+            let encryptedSize = (try FileManager.default.attributesOfItem(atPath: filePath.path)[.size] as? NSNumber)?.uint64Value ?? 0
+            if encryptedSize == 0 {
                 logger.error("Encrypted file data is empty")
                 throw NSError(domain: "Empty encrypted data", code: 6, userInfo: nil)
             }
 
-            guard let decryptedData = aesPrivateKey.decrypt(data: encryptedData) else {
-                logger.error("Failed to decrypt data")
-                throw NSError(domain: "Failed to decrypt data", code: 4, userInfo: nil)
-            }
-
-            if decryptedData.isEmpty {
+            try aesPrivateKey.decrypt(from: filePath, to: filePath)
+            let decryptedSize = (try FileManager.default.attributesOfItem(atPath: filePath.path)[.size] as? NSNumber)?.uint64Value ?? 0
+            if decryptedSize == 0 {
                 logger.error("Decrypted data is empty")
                 throw NSError(domain: "Empty decrypted data", code: 7, userInfo: nil)
             }
 
-            do {
-                try decryptedData.write(to: filePath, options: .atomic)
-                if !FileManager.default.fileExists(atPath: filePath.path) {
-                    logger.error("File was not created after write")
-                    throw NSError(domain: "File write failed", code: 8, userInfo: nil)
-                }
-            } catch {
-                logger.error("Error writing decrypted file")
-                logger.debug("Error: \(error)")
-                throw error
-            }
-
         } catch {
             logger.error("File decryption failed")
             throw CustomError.cannotDecode

package/ios/Sources/CapacitorUpdaterPlugin/ShakeMenu.swift

@@ -92,18 +92,26 @@ final class ThreeFingerPinchGestureRecognizer: UIGestureRecognizer {
 }
 
 extension UIApplication {
-    // swiftlint:disable:next line_length
-    public class func topViewController(_ base: UIViewController? = UIApplication.shared.windows.first?.rootViewController) -> UIViewController? {
-        if let nav = base as? UINavigationController {
+    public class func topViewController(_ base: UIViewController? = nil) -> UIViewController? {
+        let resolvedBase = base ?? keyWindowRootViewController
+        if let nav = resolvedBase as? UINavigationController {
             return topViewController(nav.visibleViewController)
         }
-        if let tab = base as? UITabBarController, let selected = tab.selectedViewController {
+        if let tab = resolvedBase as? UITabBarController, let selected = tab.selectedViewController {
             return topViewController(selected)
         }
-        if let presented = base?.presentedViewController {
+        if let presented = resolvedBase?.presentedViewController {
             return topViewController(presented)
         }
-        return base
+        return resolvedBase
+    }
+
+    private static var keyWindowRootViewController: UIViewController? {
+        let scenes = shared.connectedScenes.compactMap { $0 as? UIWindowScene }
+        let foregroundScenes = scenes.filter { $0.activationState == .foregroundActive }
+        let candidates = foregroundScenes.isEmpty ? scenes : foregroundScenes
+        let window = candidates.flatMap(\.windows).first(where: \.isKeyWindow) ?? candidates.first?.windows.first
+        return window?.rootViewController
     }
 }
 
@@ -184,6 +192,10 @@ extension CapacitorUpdaterPlugin: UIGestureRecognizerDelegate {
 }
 
 extension UIWindow {
+    private var menuHostViewController: UIViewController? {
+        UIApplication.topViewController(rootViewController)
+    }
+
     override open func motionEnded(_ motion: UIEvent.EventSubtype, with event: UIEvent?) {
         if motion == .motionShake {
             guard let bridgeViewController = rootViewController as? CAPBridgeViewController,
@@ -230,7 +242,7 @@ extension UIWindow {
     @discardableResult
     private func showDefaultMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) -> Bool {
         // Prevent multiple alerts from showing
-        guard let topVC = UIApplication.topViewController() else {
+        guard let topVC = self.menuHostViewController else {
             return false
         }
         if topVC.isKind(of: UIAlertController.self) {
@@ -365,7 +377,7 @@ extension UIWindow {
         })
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alertShake, animated: true)
             }
         }
@@ -388,7 +400,7 @@ extension UIWindow {
     }
 
     private func showPreviewSelector(plugin: CapacitorUpdaterPlugin) {
-        guard let topVC = UIApplication.topViewController() else {
+        guard let topVC = self.menuHostViewController else {
             return
         }
         if topVC.isKind(of: UIAlertController.self) {
@@ -456,7 +468,7 @@ extension UIWindow {
         alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }
@@ -479,7 +491,7 @@ extension UIWindow {
         }
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }
@@ -498,7 +510,7 @@ extension UIWindow {
     @discardableResult
     private func showChannelSelector(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) -> Bool {
         // Prevent multiple alerts from showing
-        guard let topVC = UIApplication.topViewController() else {
+        guard let topVC = self.menuHostViewController else {
             return false
         }
         if topVC.isKind(of: UIAlertController.self) {
@@ -582,7 +594,7 @@ extension UIWindow {
         }
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }
@@ -627,7 +639,7 @@ extension UIWindow {
         alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }
@@ -649,7 +661,7 @@ extension UIWindow {
         ])
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(progressAlert, animated: true) {
                     DispatchQueue.global(qos: .userInitiated).async {
                         // Set the channel - respect plugin's allowSetDefaultChannel config
@@ -806,7 +818,7 @@ extension UIWindow {
         alert.addAction(UIAlertAction(title: "OK", style: .default))
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }
@@ -818,7 +830,7 @@ extension UIWindow {
         alert.addAction(UIAlertAction(title: "OK", style: .default))
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }
@@ -844,7 +856,7 @@ extension UIWindow {
         })
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
+            if let topVC = self.menuHostViewController {
                 topVC.present(alert, animated: true)
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "8.51.7",
+  "version": "8.51.9",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",
@@ -81,11 +81,11 @@
     "generate:rsa-contract": "bun scripts/generate-rsa-contract-fixtures.mjs"
   },
   "devDependencies": {
-    "@capacitor/android": "^8.0.0",
-    "@capacitor/cli": "^8.0.0",
-    "@capacitor/core": "^8.0.0",
+    "@capacitor/android": "^8.5.0",
+    "@capacitor/cli": "^8.5.0",
+    "@capacitor/core": "^8.5.0",
     "@capacitor/docgen": "^0.3.0",
-    "@capacitor/ios": "^8.0.0",
+    "@capacitor/ios": "^8.5.0",
     "@ionic/eslint-config": "^0.4.0",
     "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^2.0.0",