@capgo/capacitor-updater 8.46.3 → 8.47.1

package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -21,6 +21,7 @@ import UIKit
     private let INFO_SUFFIX: String = "_info"
     private let FALLBACK_VERSION: String = "pastVersion"
     private let NEXT_VERSION: String = "nextVersion"
+    private let PREVIEW_FALLBACK_VERSION: String = "previewFallbackVersion"
     private var unzipPercent = 0
     private let TEMP_UNZIP_PREFIX: String = "capgo_unzip_"
 
@@ -37,6 +38,7 @@ import UIKit
     public var defaultChannel: String = ""
     public var appId: String = ""
     public var deviceID = ""
+    public var previewSession = false
     public var publicKey: String = ""
 
     // Cached key ID calculated once from publicKey
@@ -363,7 +365,7 @@ import UIKit
         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 {
+            if !previewSession && !CapgoUpdater.rateLimitExceeded && !CapgoUpdater.rateLimitStatisticSent {
                 CapgoUpdater.rateLimitStatisticSent = true
 
                 // Dispatch to background queue to avoid blocking the main thread
@@ -701,11 +703,11 @@ import UIKit
         }
     }
 
-    private func createInfoObject() -> InfoObject {
+    private func createInfoObject(appIdOverride: String? = nil) -> InfoObject {
         return InfoObject(
             platform: "ios",
             device_id: self.deviceID,
-            app_id: self.appId,
+            app_id: appIdOverride ?? self.appId,
             custom_id: self.customId,
             version_build: self.versionBuild,
             version_code: self.versionCode,
@@ -721,7 +723,7 @@ import UIKit
         )
     }
 
-    public func getLatest(url: URL, channel: String?) -> AppVersion {
+    public func getLatest(url: URL, channel: String?, appIdOverride: String? = nil) -> AppVersion {
         let latest: AppVersion = AppVersion()
         func applyLatestResponse(_ value: AppVersionDec?) {
             if let url = value?.url {
@@ -765,7 +767,7 @@ import UIKit
             }
         }
 
-        var parameters: InfoObject = self.createInfoObject()
+        var parameters: InfoObject = self.createInfoObject(appIdOverride: appIdOverride)
         if let channel = channel {
             parameters.defaultChannel = channel
         }
@@ -874,6 +876,132 @@ import UIKit
         return actualHash == expectedHash
     }
 
+    private func resolveManifestFileHash(entry: ManifestEntry, sessionKey: String) -> String? {
+        guard var fileHash = entry.file_hash, !fileHash.isEmpty else {
+            return nil
+        }
+        if !self.publicKey.isEmpty && !sessionKey.isEmpty {
+            do {
+                fileHash = try CryptoCipher.decryptChecksum(checksum: fileHash, publicKey: self.publicKey)
+            } catch {
+                logger.error("Checksum decryption failed while checking missing manifest files")
+                logger.debug("File: \(entry.file_name ?? "unknown"), Error: \(error.localizedDescription)")
+                return nil
+            }
+        }
+        return fileHash
+    }
+
+    private func isManifestEntryAvailableLocally(entry: ManifestEntry, sessionKey: String) -> Bool {
+        guard let fileName = entry.file_name,
+              let fileHash = resolveManifestFileHash(entry: entry, sessionKey: sessionKey) else {
+            return false
+        }
+
+        let builtinFolder = Bundle.main.bundleURL.appendingPathComponent("public")
+        let builtinFilePath = builtinFolder.appendingPathComponent(fileName)
+        if FileManager.default.fileExists(atPath: builtinFilePath.path) && verifyChecksum(file: builtinFilePath, expectedHash: fileHash) {
+            return true
+        }
+
+        let fileNameWithoutPath = (fileName as NSString).lastPathComponent
+        let isBrotli = fileName.hasSuffix(".br")
+        let cacheBaseName = isBrotli ? String(fileNameWithoutPath.dropLast(3)) : fileNameWithoutPath
+        let cacheFilePath = cacheFolder.appendingPathComponent("\(fileHash)_\(cacheBaseName)")
+        if FileManager.default.fileExists(atPath: cacheFilePath.path) && verifyChecksum(file: cacheFilePath, expectedHash: fileHash) {
+            return true
+        }
+
+        if isBrotli {
+            let legacyCacheFilePath = cacheFolder.appendingPathComponent("\(fileHash)_\(fileNameWithoutPath)")
+            if FileManager.default.fileExists(atPath: legacyCacheFilePath.path) && verifyChecksum(file: legacyCacheFilePath, expectedHash: fileHash) {
+                return true
+            }
+        }
+
+        return false
+    }
+
+    public func getMissingBundleFiles(manifest: [ManifestEntry], sessionKey: String) -> [ManifestEntry] {
+        return manifest.filter { entry in
+            !isManifestEntryAvailableLocally(entry: entry, sessionKey: sessionKey)
+        }
+    }
+
+    public func missingBundleFilesResult(manifest: [ManifestEntry], sessionKey: String) -> [String: Any] {
+        let missing = getMissingBundleFiles(manifest: manifest, sessionKey: sessionKey)
+        return [
+            "missing": missing.map { $0.toDict() },
+            "total": manifest.count,
+            "missingCount": missing.count,
+            "reusableCount": manifest.count - missing.count
+        ]
+    }
+
+    private func manifestSizeUrl(from updateUrl: URL) -> URL {
+        var components = URLComponents(url: updateUrl, resolvingAgainstBaseURL: false)
+        let path = components?.path ?? updateUrl.path
+        let trimmedPath = path.trimmingCharacters(in: CharacterSet(charactersIn: "/"))
+        components?.path = trimmedPath == ""
+            ? "/manifest_size"
+            : "/\(trimmedPath)/manifest_size"
+        components?.query = nil
+        return components?.url ?? updateUrl.appendingPathComponent("manifest_size")
+    }
+
+    private func unavailableBundleSizeResult(manifest: [ManifestEntry], error: String) -> [String: Any] {
+        return [
+            "totalSize": 0,
+            "knownFiles": 0,
+            "unknownFiles": manifest.count,
+            "files": manifest.map {
+                var dict = $0.toDict()
+                dict["error"] = error
+                return dict
+            }
+        ]
+    }
+
+    public func getBundleDownloadSize(updateUrl: URL, version: String?, manifest: [ManifestEntry]) -> [String: Any] {
+        if manifest.isEmpty {
+            return [
+                "totalSize": 0,
+                "knownFiles": 0,
+                "unknownFiles": 0,
+                "files": []
+            ]
+        }
+
+        var parameters = self.createInfoObject().toParameters()
+        parameters["version"] = version ?? ""
+        parameters["manifest"] = manifest.map { $0.toDict() }
+
+        guard let request = createRequest(url: manifestSizeUrl(from: updateUrl), method: "POST", parameters: parameters) else {
+            return unavailableBundleSizeResult(manifest: manifest, error: "request_error")
+        }
+
+        let result = performRequest(request, label: "getBundleDownloadSize")
+        if result.timedOut {
+            return unavailableBundleSizeResult(manifest: manifest, error: "timeout_error")
+        }
+        if let error = result.error {
+            logger.error("Error getting bundle download size")
+            logger.debug("Error: \(error.localizedDescription)")
+            return unavailableBundleSizeResult(manifest: manifest, error: "response_error")
+        }
+        guard let data = result.data,
+              let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+            return unavailableBundleSizeResult(manifest: manifest, error: "parse_error")
+        }
+
+        let statusCode = result.response?.statusCode ?? 0
+        if statusCode < 200 || statusCode >= 300 {
+            return unavailableBundleSizeResult(manifest: manifest, error: "response_error")
+        }
+
+        return json
+    }
+
     public func downloadManifest(manifest: [ManifestEntry], version: String, sessionKey: String, link: String? = nil, comment: String? = nil) throws -> BundleInfo {
         let id = self.randomString(length: 10)
         logger.info("downloadManifest start \(id)")
@@ -899,8 +1027,8 @@ import UIKit
 
         let totalFiles = manifest.count
 
-        // Configure concurrent operation count similar to Android: min(64, max(32, totalFiles))
-        manifestDownloadQueue.maxConcurrentOperationCount = min(64, max(32, totalFiles))
+        // Keep this bounded because each manifest operation waits on a URLSession callback.
+        manifestDownloadQueue.maxConcurrentOperationCount = min(8, max(1, totalFiles))
 
         // Thread-safe counters for concurrent operations
         let completedFiles = AtomicCounter()
@@ -1599,6 +1727,15 @@ import UIKit
             return false
         }
 
+        if let previewFallback = self.getPreviewFallbackBundle(),
+           !previewFallback.isDeleted(),
+           !previewFallback.isErrorStatus(),
+           previewFallback.getId() == id {
+            logger.info("Cannot delete the preview fallback bundle")
+            logger.debug("Bundle ID: \(id)")
+            return false
+        }
+
         // Check if this is the next bundle and prevent deletion if it is
         if let next = self.getNextBundle(),
            !next.isDeleted() &&
@@ -1883,6 +2020,21 @@ import UIKit
         return true
     }
 
+    func stagePreviewFallbackReload(bundle: BundleInfo) -> Bool {
+        guard !bundle.isErrorStatus() else {
+            return false
+        }
+        if bundle.isBuiltin() {
+            self.setCurrentBundle(bundle: self.DEFAULT_FOLDER)
+            return true
+        }
+        guard bundleExists(id: bundle.getId()) else {
+            return false
+        }
+        self.setCurrentBundle(bundle: self.getBundleDirectory(id: bundle.getId()).path)
+        return true
+    }
+
     func finalizePendingReload(bundle: BundleInfo, previousBundleName: String) {
         guard !bundle.isBuiltin() else {
             return
@@ -1922,9 +2074,11 @@ import UIKit
     public func setSuccess(bundle: BundleInfo, autoDeletePrevious: Bool) {
         self.setBundleStatus(id: bundle.getId(), status: BundleStatus.SUCCESS)
         let fallback: BundleInfo = self.getFallbackBundle()
+        let previewFallback = self.getPreviewFallbackBundle()
+        let fallbackIsPreviewFallback = previewFallback?.getId() == fallback.getId()
         logger.info("Fallback bundle is: \(fallback.toString())")
         logger.info("Version successfully loaded: \(bundle.toString())")
-        if autoDeletePrevious && !fallback.isBuiltin() && fallback.getId() != bundle.getId() {
+        if autoDeletePrevious && !fallback.isBuiltin() && fallback.getId() != bundle.getId() && !fallbackIsPreviewFallback {
             let res = self.delete(id: fallback.getId())
             if res {
                 logger.info("Deleted previous bundle")
@@ -2264,6 +2418,11 @@ import UIKit
     }
 
     private func sendStatsWithMetadata(action: String, versionName: String?, oldVersionName: String?, metadata: [String: String]?) {
+        if previewSession {
+            logger.debug("Skipping sendStats during preview session.")
+            return
+        }
+
         // Check if rate limit was exceeded
         if CapgoUpdater.rateLimitExceeded {
             logger.debug("Skipping sendStats due to rate limit (429). Stats will resume after app restart.")
@@ -2458,6 +2617,33 @@ import UIKit
         return self.getBundleInfo(id: id)
     }
 
+    public func getPreviewFallbackBundle() -> BundleInfo? {
+        guard let id = UserDefaults.standard.string(forKey: self.PREVIEW_FALLBACK_VERSION) else {
+            return nil
+        }
+        let bundle = self.getBundleInfo(id: id)
+        if !bundle.isBuiltin() && !self.bundleExists(id: id) {
+            _ = self.setPreviewFallbackBundle(fallback: nil)
+            return nil
+        }
+        return bundle
+    }
+
+    public func setPreviewFallbackBundle(fallback: String?) -> Bool {
+        guard let fallbackId = fallback else {
+            UserDefaults.standard.removeObject(forKey: self.PREVIEW_FALLBACK_VERSION)
+            UserDefaults.standard.synchronize()
+            return true
+        }
+        let newBundle: BundleInfo = self.getBundleInfo(id: fallbackId)
+        if !newBundle.isBuiltin() && !self.bundleExists(id: fallbackId) {
+            return false
+        }
+        UserDefaults.standard.set(fallbackId, forKey: self.PREVIEW_FALLBACK_VERSION)
+        UserDefaults.standard.synchronize()
+        return true
+    }
+
     public func setNextBundle(next: String?) -> Bool {
         guard let nextId: String = next else {
             UserDefaults.standard.removeObject(forKey: self.NEXT_VERSION)

package/ios/Sources/CapacitorUpdaterPlugin/InternalUtils.swift

@@ -240,6 +240,8 @@ public class AppVersion: NSObject {
     var breaking: Bool?
     var data: [String: String]?
     var manifest: [ManifestEntry]?
+    var missing: [String: Any]?
+    var downloadSize: [String: Any]?
     var link: String?
     var comment: String?
     var statusCode: Int = 0

package/ios/Sources/CapacitorUpdaterPlugin/ShakeMenu.swift

@@ -27,7 +27,8 @@ extension UIWindow {
     override open func motionEnded(_ motion: UIEvent.EventSubtype, with event: UIEvent?) {
         if motion == .motionShake {
             // Find the CapacitorUpdaterPlugin instance
-            guard let bridge = (rootViewController as? CAPBridgeProtocol),
+            guard let bridgeViewController = rootViewController as? CAPBridgeViewController,
+                  let bridge = bridgeViewController.bridge,
                   let plugin = bridge.plugin(withName: "CapacitorUpdaterPlugin") as? CapacitorUpdaterPlugin else {
                 return
             }
@@ -37,8 +38,9 @@ extension UIWindow {
                 return
             }
 
-            // Check if channel selector mode is enabled
-            if plugin.shakeChannelSelectorEnabled {
+            if plugin.hasActivePreviewSession() {
+                showDefaultMenu(plugin: plugin, bridge: bridge)
+            } else if plugin.shakeChannelSelectorEnabled {
                 showChannelSelector(plugin: plugin, bridge: bridge)
             } else {
                 showDefaultMenu(plugin: plugin, bridge: bridge)
@@ -54,6 +56,48 @@ extension UIWindow {
             return
         }
 
+        if !plugin.hasActivePreviewSession() {
+            showConfiguredDefaultMenu(plugin: plugin, bridge: bridge)
+            return
+        }
+
+        let appName = Bundle.main.infoDictionary?["CFBundleDisplayName"] as? String ?? "App"
+        let title = "Preview \(appName) Menu"
+        let message = "Reload the current preview or leave the test app."
+        let okButtonTitle = "Leave test app"
+        let reloadButtonTitle = "Reload app"
+        let cancelButtonTitle = "Close menu"
+
+        let alertShake = UIAlertController(title: title, message: message, preferredStyle: .alert)
+
+        alertShake.addAction(UIAlertAction(title: okButtonTitle, style: .default) { _ in
+            DispatchQueue.global(qos: .userInitiated).async {
+                if !plugin.leavePreviewSessionFromShakeMenu() {
+                    DispatchQueue.main.async {
+                        self.showError(message: "Could not leave the test app.", plugin: plugin)
+                    }
+                }
+            }
+        })
+
+        alertShake.addAction(UIAlertAction(title: reloadButtonTitle, style: .default) { _ in
+            DispatchQueue.main.async {
+                if !plugin.reloadPreviewSessionFromShakeMenu() {
+                    self.showError(message: "Could not reload the test app.", plugin: plugin)
+                }
+            }
+        })
+
+        alertShake.addAction(UIAlertAction(title: cancelButtonTitle, style: .default))
+
+        DispatchQueue.main.async {
+            if let topVC = UIApplication.topViewController() {
+                topVC.present(alertShake, animated: true)
+            }
+        }
+    }
+
+    private func showConfiguredDefaultMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
         let appName = Bundle.main.infoDictionary?["CFBundleDisplayName"] as? String ?? "App"
         let title = "Preview \(appName) Menu"
         let message = "What would you like to do?"

package/package.json

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