@capgo/capacitor-updater 7.43.3 → 7.45.10

package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -54,10 +54,31 @@ import UIKit
     private var statsFlushTimer: Timer?
     private static let statsFlushInterval: TimeInterval = 1.0
 
+    private static func sanitizeHeaderValue(_ value: String) -> String {
+        if value.isEmpty {
+            return "unknown"
+        }
+
+        let filteredScalars = value.unicodeScalars.filter { scalar in
+            let cp = scalar.value
+            let isVisibleAscii = (0x20...0x7E).contains(cp)
+            let isIso88591 = (0xA0...0xFF).contains(cp)
+            return isVisibleAscii || isIso88591
+        }
+
+        let sanitized = String(String.UnicodeScalarView(filteredScalars)).trimmingCharacters(in: .whitespacesAndNewlines)
+        return sanitized.isEmpty ? "unknown" : sanitized
+    }
+
+    static func buildUserAgent(appId: String, pluginVersion: String, versionOs: String) -> String {
+        let safePluginVersion = sanitizeHeaderValue(pluginVersion)
+        let safeAppId = sanitizeHeaderValue(appId)
+        let safeVersionOs = sanitizeHeaderValue(versionOs)
+        return "CapacitorUpdater/\(safePluginVersion) (\(safeAppId)) ios/\(safeVersionOs)"
+    }
+
     private var userAgent: String {
-        let safePluginVersion = pluginVersion.isEmpty ? "unknown" : pluginVersion
-        let safeAppId = appId.isEmpty ? "unknown" : appId
-        return "CapacitorUpdater/\(safePluginVersion) (\(safeAppId)) ios/\(versionOs)"
+        CapgoUpdater.buildUserAgent(appId: appId, pluginVersion: pluginVersion, versionOs: versionOs)
     }
 
     private lazy var alamofireSession: Session = {
@@ -71,6 +92,7 @@ import UIKit
         notifyDownloadRaw(id, percent, ignoreMultipleOfTen, bundle)
     }
     public var notifyDownload: (String, Int) -> Void = { _, _  in }
+    public var notifyListeners: (String, [String: Any]) -> Void = { _, _ in }
 
     public func setLogger(_ logger: Logger) {
         self.logger = logger
@@ -456,6 +478,47 @@ import UIKit
     public func getLatest(url: URL, channel: String?) -> AppVersion {
         let semaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
         let latest: AppVersion = AppVersion()
+        func applyLatestResponse(_ value: AppVersionDec?) {
+            if let url = value?.url {
+                latest.url = url
+            }
+            if let checksum = value?.checksum {
+                latest.checksum = checksum
+            }
+            if let version = value?.version {
+                latest.version = version
+            }
+            if let major = value?.major {
+                latest.major = major
+            }
+            if let breaking = value?.breaking {
+                latest.breaking = breaking
+            }
+            if let error = value?.error {
+                latest.error = error
+            }
+            if let kind = value?.kind {
+                latest.kind = kind
+            }
+            if let message = value?.message {
+                latest.message = message
+            }
+            if let sessionKey = value?.session_key {
+                latest.sessionKey = sessionKey
+            }
+            if let data = value?.data {
+                latest.data = data
+            }
+            if let manifest = value?.manifest {
+                latest.manifest = manifest
+            }
+            if let link = value?.link {
+                latest.link = link
+            }
+            if let comment = value?.comment {
+                latest.comment = comment
+            }
+        }
         var parameters: InfoObject = self.createInfoObject()
         if let channel = channel {
             parameters.defaultChannel = channel
@@ -467,48 +530,32 @@ import UIKit
             switch response.result {
             case .success:
                 latest.statusCode = response.response?.statusCode ?? 0
-                if let url = response.value?.url {
-                    latest.url = url
-                }
-                if let checksum = response.value?.checksum {
-                    latest.checksum = checksum
-                }
-                if let version = response.value?.version {
-                    latest.version = version
-                }
-                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
-                }
-                if let message = response.value?.message {
-                    latest.message = message
-                }
-                if let sessionKey = response.value?.session_key {
-                    latest.sessionKey = sessionKey
-                }
-                if let data = response.value?.data {
-                    latest.data = data
-                }
-                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
-                }
+                applyLatestResponse(response.value)
             case let .failure(error):
                 self.logger.error("Error getting latest version")
                 self.logger.debug("Response: \(response.value.debugDescription), Error: \(error)")
-                latest.message = "Error getting Latest"
-                latest.error = "response_error"
                 latest.statusCode = response.response?.statusCode ?? 0
+                if let data = response.data,
+                   let decoded = try? JSONDecoder().decode(AppVersionDec.self, from: data) {
+                    applyLatestResponse(decoded)
+                    let decodedError = decoded.error ?? ""
+                    let decodedKind = decoded.kind ?? ""
+                    if decodedError.isEmpty && decodedKind.isEmpty {
+                        if latest.message == nil || latest.message?.isEmpty == true {
+                            latest.message = "Error getting Latest"
+                        }
+                        if latest.error == nil || latest.error?.isEmpty == true {
+                            latest.error = "response_error"
+                        }
+                        if latest.kind == nil || latest.kind?.isEmpty == true {
+                            latest.kind = "failed"
+                        }
+                    }
+                } else {
+                    latest.message = "Error getting Latest"
+                    latest.error = "response_error"
+                    latest.kind = "failed"
+                }
             }
             semaphore.signal()
         }
@@ -522,6 +569,22 @@ import UIKit
         logger.info("Current bundle set to: \((bundle ).isEmpty ? BundleInfo.ID_BUILTIN : bundle)")
     }
 
+    static func shouldResetForForeignBundle(bundlePath: String?, isBuiltin: Bool, hasStoredBundleInfo: Bool) -> Bool {
+        guard let bundlePath, !bundlePath.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
+            return false
+        }
+        return !isBuiltin && !hasStoredBundleInfo
+    }
+
+    private func hasStoredBundleInfo(id: String) -> Bool {
+        guard !id.isEmpty,
+              id != BundleInfo.ID_BUILTIN,
+              id != BundleInfo.VERSION_UNKNOWN else {
+            return false
+        }
+        return UserDefaults.standard.object(forKey: "\(id)\(self.INFO_SUFFIX)") != nil
+    }
+
     // Per-download temp file paths to prevent collisions when multiple downloads run concurrently
     private func tempDataPath(for id: String) -> URL {
         return FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("package_\(id).tmp")
@@ -578,10 +641,36 @@ import UIKit
         for entry in manifest {
             guard let fileName = entry.file_name,
                   let downloadUrl = entry.download_url else {
+                let error = NSError(
+                    domain: "ManifestEntryError",
+                    code: 1,
+                    userInfo: [
+                        NSLocalizedDescriptionKey: "Manifest entry is missing file_name or download_url"
+                    ]
+                )
+                errorLock.lock()
+                if downloadError == nil {
+                    downloadError = error
+                }
+                errorLock.unlock()
+                hasError.value = true
+                logger.error("Manifest entry is missing file_name or download_url")
                 continue
             }
             guard let entryFileHash = entry.file_hash, !entryFileHash.isEmpty else {
                 logger.error("Missing file_hash for manifest entry: \(entry.file_name ?? "unknown")")
+                let error = NSError(
+                    domain: "ManifestEntryError",
+                    code: 2,
+                    userInfo: [
+                        NSLocalizedDescriptionKey: "Manifest entry is missing file_hash for \(entry.file_name ?? "unknown")"
+                    ]
+                )
+                errorLock.lock()
+                if downloadError == nil {
+                    downloadError = error
+                }
+                errorLock.unlock()
                 hasError.value = true
                 continue
             }
@@ -670,11 +759,16 @@ import UIKit
         // Execute all operations concurrently and wait for completion
         manifestDownloadQueue.addOperations(operations, waitUntilFinished: true)
 
-        if hasError.value, let error = downloadError {
+        if hasError.value {
+            let resolvedError = downloadError ?? NSError(
+                domain: "ManifestDownloadError",
+                code: 1,
+                userInfo: [NSLocalizedDescriptionKey: "Manifest download failed due to invalid or missing entries"]
+            )
             // Update bundle status to ERROR if download failed
             let errorBundle = bundleInfo.setStatus(status: BundleStatus.ERROR.localizedString)
             self.saveBundleInfo(id: id, bundle: errorBundle)
-            throw error
+            throw resolvedError
         }
 
         // Update bundle status to PENDING after successful download
@@ -1411,6 +1505,52 @@ import UIKit
         return libraryDir.appendingPathComponent(self.bundleDirectory).appendingPathComponent(id)
     }
 
+    struct ResetState {
+        let currentBundlePath: String
+        let fallbackBundleId: String
+        let nextBundleId: String?
+    }
+
+    func captureResetState() -> ResetState {
+        ResetState(
+            currentBundlePath: UserDefaults.standard.string(forKey: self.CAP_SERVER_PATH) ?? self.DEFAULT_FOLDER,
+            fallbackBundleId: UserDefaults.standard.string(forKey: self.FALLBACK_VERSION) ?? BundleInfo.ID_BUILTIN,
+            nextBundleId: UserDefaults.standard.string(forKey: self.NEXT_VERSION)
+        )
+    }
+
+    func restoreResetState(_ state: ResetState) {
+        let currentBundlePath = state.currentBundlePath.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+            ? self.DEFAULT_FOLDER
+            : state.currentBundlePath
+        let fallbackBundleId = state.fallbackBundleId.isEmpty ? BundleInfo.ID_BUILTIN : state.fallbackBundleId
+
+        self.setCurrentBundle(bundle: currentBundlePath)
+        UserDefaults.standard.set(fallbackBundleId, forKey: self.FALLBACK_VERSION)
+        if let nextBundleId = state.nextBundleId, !nextBundleId.isEmpty {
+            UserDefaults.standard.set(nextBundleId, forKey: self.NEXT_VERSION)
+        } else {
+            UserDefaults.standard.removeObject(forKey: self.NEXT_VERSION)
+        }
+        UserDefaults.standard.synchronize()
+    }
+
+    func prepareResetStateForTransition() {
+        self.setCurrentBundle(bundle: "")
+        self.setFallbackBundle(fallback: Optional<BundleInfo>.none)
+        _ = self.setNextBundle(next: Optional<String>.none)
+    }
+
+    func finalizeResetTransition(previousBundleName: String, isInternal: Bool) {
+        if !isInternal {
+            self.sendStats(action: "reset", versionName: self.getCurrentBundle().getVersionName(), oldVersionName: previousBundleName)
+        }
+    }
+
+    func canSet(bundle: BundleInfo) -> Bool {
+        bundle.isBuiltin() || self.bundleExists(id: bundle.getId())
+    }
+
     public func set(bundle: BundleInfo) -> Bool {
         return self.set(id: bundle.getId())
     }
@@ -1448,11 +1588,36 @@ import UIKit
         return false
     }
 
+    func stagePendingReload(bundle: BundleInfo) -> Bool {
+        guard !bundle.isBuiltin(), 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
+        }
+        self.sendStats(action: "set", versionName: bundle.getVersionName(), oldVersionName: previousBundleName)
+    }
+
     public func autoReset() {
         let currentBundle: BundleInfo = self.getCurrentBundle()
         if !currentBundle.isBuiltin() && !self.bundleExists(id: currentBundle.getId()) {
             logger.info("Folder at bundle path does not exist. Triggering reset.")
             self.reset()
+            return
+        }
+        let bundlePath = UserDefaults.standard.string(forKey: self.CAP_SERVER_PATH)
+        if Self.shouldResetForForeignBundle(
+            bundlePath: bundlePath,
+            isBuiltin: currentBundle.isBuiltin(),
+            hasStoredBundleInfo: self.hasStoredBundleInfo(id: currentBundle.getId())
+        ) {
+            logger.info("Current bundle id is not one of the bundle ids stored by this plugin. Triggering reset.")
+            self.reset()
         }
     }
 
@@ -1463,12 +1628,8 @@ import UIKit
     public func reset(isInternal: Bool) {
         logger.info("reset: \(isInternal)")
         let currentBundleName = self.getCurrentBundle().getVersionName()
-        self.setCurrentBundle(bundle: "")
-        self.setFallbackBundle(fallback: Optional<BundleInfo>.none)
-        _ = self.setNextBundle(next: Optional<String>.none)
-        if !isInternal {
-            self.sendStats(action: "reset", versionName: self.getCurrentBundle().getVersionName(), oldVersionName: currentBundleName)
-        }
+        self.prepareResetStateForTransition()
+        self.finalizeResetTransition(previousBundleName: currentBundleName, isInternal: isInternal)
     }
 
     public func setSuccess(bundle: BundleInfo, autoDeletePrevious: Bool) {
@@ -1851,7 +2012,7 @@ import UIKit
         }
         let result: BundleInfo
         if BundleInfo.ID_BUILTIN == trueId {
-            result = BundleInfo(id: trueId, version: "", status: BundleStatus.SUCCESS, checksum: "")
+            result = BundleInfo(id: trueId, version: self.versionBuild, status: BundleStatus.SUCCESS, checksum: "")
         } else if BundleInfo.VERSION_UNKNOWN == trueId {
             result = BundleInfo(id: trueId, version: "", status: BundleStatus.ERROR, checksum: "")
         } else {
@@ -1954,6 +2115,8 @@ import UIKit
         UserDefaults.standard.set(nextId, forKey: self.NEXT_VERSION)
         UserDefaults.standard.synchronize()
         self.setBundleStatus(id: nextId, status: BundleStatus.PENDING)
+        self.sendStats(action: "set_next", versionName: newBundle.getVersionName(), oldVersionName: self.getCurrentBundle().getVersionName())
+        self.notifyListeners("setNext", ["bundle": newBundle.toJSON()])
         return true
     }
 }

package/ios/Sources/CapacitorUpdaterPlugin/DelayUpdateUtils.swift

@@ -97,25 +97,17 @@ public class DelayUpdateUtils {
 
             case "date":
                 if let value = value, !value.isEmpty {
-                    do {
-                        let dateFormatter = ISO8601DateFormatter()
-                        dateFormatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
-
-                        if let date = dateFormatter.date(from: value) {
-                            if Date() > date {
-                                // swiftlint:disable:next line_length
-                                logger.info("Date delay (value: \(value)) condition removed due to expired date at index \(index)")
-                            } else {
-                                delayConditionListToKeep.append(condition)
-                                logger.info("Date delay (value: \(value)) kept at index \(index)")
-                            }
-                        } else {
+                    if let date = parseDateCondition(value) {
+                        if Date() > date {
                             // swiftlint:disable:next line_length
-                            logger.error("Date delay (value: \(value)) condition removed due to parsing issue at index \(index)")
+                            logger.info("Date delay (value: \(value)) condition removed due to expired date at index \(index)")
+                        } else {
+                            delayConditionListToKeep.append(condition)
+                            logger.info("Date delay (value: \(value)) kept at index \(index)")
                         }
-                    } catch {
+                    } else {
                         // swiftlint:disable:next line_length
-                        logger.error("Date delay (value: \(value)) condition removed due to parsing issue at index \(index): \(error)")
+                        logger.error("Date delay (value: \(value)) condition removed due to parsing issue at index \(index)")
                     }
                 } else {
                     // swiftlint:disable:next line_length
@@ -216,6 +208,35 @@ public class DelayUpdateUtils {
 
     // MARK: - Helper methods
 
+    private func parseDateCondition(_ value: String) -> Date? {
+        let withFractionalSeconds = ISO8601DateFormatter()
+        withFractionalSeconds.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+        if let date = withFractionalSeconds.date(from: value) {
+            return date
+        }
+
+        let withoutFractionalSeconds = ISO8601DateFormatter()
+        withoutFractionalSeconds.formatOptions = [.withInternetDateTime]
+        if let date = withoutFractionalSeconds.date(from: value) {
+            return date
+        }
+
+        // Legacy fallback for strings without timezone.
+        for format in ["yyyy-MM-dd'T'HH:mm:ss.SSS", "yyyy-MM-dd'T'HH:mm:ss"] {
+            let formatter = DateFormatter()
+            formatter.locale = Locale(identifier: "en_US_POSIX")
+            formatter.calendar = Calendar(identifier: .gregorian)
+            formatter.timeZone = .current
+            formatter.isLenient = false
+            formatter.dateFormat = format
+            if let date = formatter.date(from: value) {
+                return date
+            }
+        }
+
+        return nil
+    }
+
     private func toJson(object: Any) -> String {
         guard let data = try? JSONSerialization.data(withJSONObject: object, options: []) else {
             return ""

package/ios/Sources/CapacitorUpdaterPlugin/InternalUtils.swift

@@ -186,6 +186,7 @@ struct AppVersionDec: Decodable {
     let url: String?
     let message: String?
     let error: String?
+    let kind: String?
     let session_key: String?
     let major: Bool?
     let breaking: Bool?
@@ -203,6 +204,7 @@ public class AppVersion: NSObject {
     var url: String = ""
     var message: String?
     var error: String?
+    var kind: String?
     var sessionKey: String?
     var major: Bool?
     var breaking: Bool?

package/ios/Sources/CapacitorUpdaterPlugin/ShakeMenu.swift

@@ -308,19 +308,36 @@ extension UIWindow {
                         }
 
                         let latest = updater.getLatest(url: updateUrl, channel: name)
+                        let latestKind = latest.kind
+
+                        let detail = [latest.message, latest.error, latestKind]
+                            .compactMap { value in
+                                guard let value, !value.isEmpty else { return nil }
+                                return value
+                            }
+                            .first ?? "server did not provide a message"
 
                         // Handle update errors first (before "no new version" check)
-                        if let error = latest.error, !error.isEmpty && error != "no_new_version_available" {
+                        if latestKind == "failed" || (latest.error?.isEmpty == false && latestKind != "up_to_date" && latestKind != "blocked") {
+                            DispatchQueue.main.async {
+                                progressAlert.dismiss(animated: true) {
+                                    self.showError(message: "Channel set to \(name). Update check failed: \(detail)", plugin: plugin)
+                                }
+                            }
+                            return
+                        }
+
+                        if latestKind == "blocked" {
                             DispatchQueue.main.async {
                                 progressAlert.dismiss(animated: true) {
-                                    self.showError(message: "Channel set to \(name). Update check failed: \(error)", plugin: plugin)
+                                    self.showError(message: "Channel set to \(name). Update check blocked: \(detail)", plugin: plugin)
                                 }
                             }
                             return
                         }
 
                         // Check if there's an actual update available
-                        if latest.error == "no_new_version_available" || latest.url.isEmpty {
+                        if latestKind == "up_to_date" || latest.url.isEmpty {
                             DispatchQueue.main.async {
                                 progressAlert.dismiss(animated: true) {
                                     self.showSuccess(message: "Channel set to \(name). Already on latest version.", plugin: plugin)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "7.43.3",
+  "version": "7.45.10",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",
@@ -41,23 +41,26 @@
     "native"
   ],
   "scripts": {
-    "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
+    "verify": "bun run verify:ios && bun run verify:android && bun run verify:web",
     "verify:ios": "xcodebuild -scheme CapgoCapacitorUpdater -destination generic/platform=iOS",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
-    "verify:web": "npm run build",
-    "test": "npm run test:ios && npm run test:android",
+    "verify:web": "bun run build",
+    "test": "bun run test:ios && bun run test:android",
     "test:ios": "./scripts/test-ios.sh",
     "test:android": "cd android && ./gradlew test && cd ..",
-    "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
-    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
+    "test:maestro": "./scripts/maestro/run-android-live-update.sh",
+    "test:maestro:android": "./scripts/test-maestro-android.sh",
+    "test:maestro:ios": "./scripts/test-maestro-ios.sh",
+    "lint": "bun run eslint && bun run prettier -- --check && bun run swiftlint -- lint",
+    "fmt": "bun run eslint -- --fix && bun run prettier -- --write && bun run swiftlint -- --fix --format",
     "eslint": "eslint . --ext .ts",
     "prettier": "prettier-pretty-check \"**/*.{css,html,ts,js,java}\" --plugin=prettier-plugin-java",
     "swiftlint": "node-swiftlint",
     "docgen": "node scripts/generate-docs.js",
-    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
+    "build": "bun run clean && bun run docgen && tsc && rollup -c rollup.config.mjs",
     "clean": "rimraf ./dist",
     "watch": "tsc --watch",
-    "prepublishOnly": "npm run build",
+    "prepublishOnly": "bun run build",
     "check:wiring": "node scripts/check-capacitor-plugin-wiring.mjs"
   },
   "devDependencies": {