@capgo/capacitor-updater 8.47.8 → 8.47.10

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -79,7 +79,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "completeFlexibleUpdate", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let pluginVersion: String = "8.47.8"
+    private let pluginVersion: String = "8.47.9"
     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"
@@ -989,6 +989,29 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+    func reloadWithoutWaitingForAppReady() -> Bool {
+        guard let bridge = self.bridge else { return false }
+
+        let performReload: () -> Bool = {
+            guard self.applyCurrentBundleToBridge(bridge) else {
+                return false
+            }
+            self.checkAppReady()
+            self.notifyListeners("appReloaded", data: [:])
+            return true
+        }
+
+        if Thread.isMainThread {
+            return performReload()
+        } else {
+            var result = false
+            DispatchQueue.main.sync {
+                result = performReload()
+            }
+            return result
+        }
+    }
+
     @objc func reload(_ call: CAPPluginCall) {
         let current: BundleInfo = self.implementation.getCurrentBundle()
         let next: BundleInfo? = self.implementation.getNextBundle()
@@ -1206,7 +1229,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         }
 
         let previewFallbackBundle = self.implementation.getPreviewFallbackBundle()
-        self.endPreviewSession()
+        self.endPreviewSession(keepPreviewGuard: true)
         let restoredNextBundle = self.implementation.getNextBundle()
         self.deletePreviewBundleIfUnused(previewBundle, previewFallbackBundle: previewFallbackBundle, restoredNextBundle: restoredNextBundle)
         return true
@@ -1232,12 +1255,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     private func leavePreviewSessionWithoutReload(keepPreviewGuard: Bool = false) -> Bool {
         let previewBundle = self.implementation.getCurrentBundle()
-        guard let previewFallbackBundle = self.implementation.getPreviewFallbackBundle(), !previewFallbackBundle.isErrorStatus() else {
-            logger.error("No preview fallback bundle available")
-            return false
-        }
-        guard self.implementation.canSet(bundle: previewFallbackBundle) else {
-            logger.error("Preview fallback bundle is not installable")
+        guard let previewFallbackBundle = self.resolvePreviewFallbackBundle(reason: "preview deeplink launch") else {
             return false
         }
         guard self.implementation.stagePreviewFallbackReload(bundle: previewFallbackBundle) else {
@@ -1254,14 +1272,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     private func leavePreviewSessionForIncomingPreviewLink() -> Bool {
         self.showPreviewTransitionLoader(reason: "incoming-preview-deeplink")
         let previewBundle = self.implementation.getCurrentBundle()
-        guard let previewFallbackBundle = self.implementation.getPreviewFallbackBundle(), !previewFallbackBundle.isErrorStatus() else {
-            logger.error("No preview fallback bundle available")
-            self.clearIncomingPreviewTransition()
-            self.hidePreviewTransitionLoader(reason: "incoming-preview-deeplink-failed")
-            return false
-        }
-        guard self.implementation.canSet(bundle: previewFallbackBundle) else {
-            logger.error("Preview fallback bundle is not installable")
+        guard let previewFallbackBundle = self.resolvePreviewFallbackBundle(reason: "incoming preview deeplink") else {
             self.clearIncomingPreviewTransition()
             self.hidePreviewTransitionLoader(reason: "incoming-preview-deeplink-failed")
             return false
@@ -1275,7 +1286,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             return false
         }
 
-        let didReload = self._reload()
+        let didReload = self.reloadWithoutWaitingForAppReady()
         if didReload {
             self.endPreviewSession(keepPreviewGuard: true)
             let restoredNextBundle = self.implementation.getNextBundle()
@@ -1312,7 +1323,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         if let payloadUrl = self.storedPreviewPayloadUrl() {
             didReload = self.refreshPreviewSessionFromPayloadUrl(payloadUrl)
         } else {
-            didReload = self._reload()
+            didReload = self.reloadWithoutWaitingForAppReady()
         }
 
         if !didReload {
@@ -1325,21 +1336,16 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.previewSessionEnabled
     }
 
-    private func resetToPreviewFallbackBundle() -> Bool {
+    func resetToPreviewFallbackBundle() -> Bool {
         guard self.canPerformResetTransition() else { return false }
-        guard let fallback = self.implementation.getPreviewFallbackBundle(), !fallback.isErrorStatus() else {
-            logger.error("No preview fallback bundle available")
-            return false
-        }
-        guard self.implementation.canSet(bundle: fallback) else {
-            logger.error("Preview fallback bundle is not installable")
+        guard let fallback = self.resolvePreviewFallbackBundle(reason: "leave preview") else {
             return false
         }
 
         let previousState = self.implementation.captureResetState()
         let previousBundleName = self.implementation.getCurrentBundle().getVersionName()
         logger.info("Resetting to preview fallback bundle: \(fallback.toString())")
-        if self.implementation.stagePreviewFallbackReload(bundle: fallback) && self._reload() {
+        if self.implementation.stagePreviewFallbackReload(bundle: fallback) && self.reloadWithoutWaitingForAppReady() {
             self.implementation.finalizeResetTransition(previousBundleName: previousBundleName, isInternal: false)
             self.notifyBundleSet(fallback)
             return true
@@ -1349,11 +1355,36 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         return false
     }
 
+    private func resolvePreviewFallbackBundle(reason: String) -> BundleInfo? {
+        let fallback = self.implementation.getPreviewFallbackBundle()
+        if let fallback, !fallback.isErrorStatus(), self.implementation.canSet(bundle: fallback) {
+            return fallback
+        }
+
+        if let fallback {
+            if fallback.isErrorStatus() {
+                logger.warn("Preview fallback bundle is in error state for \(reason). Falling back to builtin bundle.")
+            } else {
+                logger.warn("Preview fallback bundle is not installable for \(reason). Falling back to builtin bundle.")
+            }
+        } else {
+            logger.warn("No preview fallback bundle available for \(reason). Falling back to builtin bundle.")
+        }
+
+        let builtin = self.implementation.getBundleInfo(id: BundleInfo.ID_BUILTIN)
+        if !builtin.isErrorStatus(), self.implementation.canSet(bundle: builtin) {
+            return builtin
+        }
+
+        logger.error("Builtin bundle is not available to leave preview for \(reason)")
+        return nil
+    }
+
     private func endPreviewSession(keepPreviewGuard: Bool = false) {
         let previousShakeMenuEnabled = UserDefaults.standard.object(forKey: self.previewPreviousShakeMenuDefaultsKey) as? Bool
-            ?? getConfig().getBoolean("shakeMenu", false)
+            ?? self.getBooleanConfig("shakeMenu", defaultValue: false)
         let previousShakeChannelSelectorEnabled = UserDefaults.standard.object(forKey: self.previewPreviousShakeChannelSelectorDefaultsKey) as? Bool
-            ?? getConfig().getBoolean("allowShakeChannelSelector", false)
+            ?? self.getBooleanConfig("allowShakeChannelSelector", defaultValue: false)
         self.restorePreviewPreviousNextBundle()
         self.restorePreviewPreviousAppId()
         self.restorePreviewPreviousDefaultChannel()
@@ -1374,15 +1405,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     private func clearPreviewSessionBecauseDisabled() {
         logger.info("Preview session disabled by config; restoring preview fallback")
-        let fallback = self.implementation.getPreviewFallbackBundle()
-        let bundleToRestore: BundleInfo
-        if let fallback, !fallback.isErrorStatus() {
-            bundleToRestore = fallback
-        } else {
-            bundleToRestore = self.implementation.getBundleInfo(id: BundleInfo.ID_BUILTIN)
-        }
-
-        if self.implementation.canSet(bundle: bundleToRestore) {
+        if let bundleToRestore = self.resolvePreviewFallbackBundle(reason: "preview disabled") {
             _ = self.implementation.stagePreviewFallbackReload(bundle: bundleToRestore)
         } else {
             logger.warn("Could not restore preview fallback while disabling preview")
@@ -1396,11 +1419,25 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.isLeavingPreviewForIncomingLink = false
         self.implementation.previewSession = false
         self.hidePreviewTransitionLoader(reason: "preview-session-disabled")
-        self.shakeMenuEnabled = getConfig().getBoolean("shakeMenu", false)
-        self.shakeChannelSelectorEnabled = getConfig().getBoolean("allowShakeChannelSelector", false)
+        self.shakeMenuEnabled = self.getBooleanConfig("shakeMenu", defaultValue: false)
+        self.shakeChannelSelectorEnabled = self.getBooleanConfig("allowShakeChannelSelector", defaultValue: false)
         self.clearPreviewSessionPreferences()
     }
 
+    private func getBooleanConfig(_ key: String, defaultValue: Bool) -> Bool {
+        guard self.bridge != nil else {
+            return defaultValue
+        }
+        return getConfig().getBoolean(key, defaultValue)
+    }
+
+    private func getStringConfig(_ key: String, defaultValue: String) -> String {
+        guard self.bridge != nil else {
+            return defaultValue
+        }
+        return getConfig().getString(key, defaultValue) ?? defaultValue
+    }
+
     private func clearPreviewSessionPreferences() {
         _ = self.implementation.setPreviewFallbackBundle(fallback: nil)
         UserDefaults.standard.removeObject(forKey: self.previewSessionDefaultsKey)
@@ -1426,7 +1463,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     private func restorePreviewPreviousDefaultChannel() {
-        let configDefaultChannel = self.getConfig().getString("defaultChannel", "")!
+        let configDefaultChannel = self.getStringConfig("defaultChannel", defaultValue: "")
         let hadPreviousDefaultChannel = UserDefaults.standard.object(forKey: self.previewPreviousDefaultChannelWasSetDefaultsKey) as? Bool ?? false
 
         guard hadPreviousDefaultChannel,
@@ -1579,7 +1616,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             let current = self.implementation.getCurrentBundle()
             if current.getVersionName() == version {
                 self.logger.info("Preview payload unchanged, reloading current bundle")
-                return self._reload()
+                return self.reloadWithoutWaitingForAppReady()
             }
 
             let next = try self.downloadBundle(
@@ -1597,7 +1634,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             }
 
             self.notifyBundleSet(next)
-            return self._reload()
+            return self.reloadWithoutWaitingForAppReady()
         } catch {
             self.logger.error("Could not refresh preview session: \(error.localizedDescription)")
             return false
@@ -1613,8 +1650,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         self.previewSessionAlertPending = false
         self.isLeavingPreviewForIncomingLink = false
         self.implementation.previewSession = false
-        self.shakeMenuEnabled = getConfig().getBoolean("shakeMenu", false)
-        self.shakeChannelSelectorEnabled = getConfig().getBoolean("allowShakeChannelSelector", false)
+        self.shakeMenuEnabled = self.getBooleanConfig("shakeMenu", defaultValue: false)
+        self.shakeChannelSelectorEnabled = self.getBooleanConfig("allowShakeChannelSelector", defaultValue: false)
         self.restorePreviewPreviousAppId()
         self.restorePreviewPreviousDefaultChannel()
         _ = self.implementation.setPreviewFallbackBundle(fallback: nil)
@@ -1885,7 +1922,13 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         let triggerAutoUpdate = call.getBool("triggerAutoUpdate") ?? false
         self.saveCallForAsyncHandling(call)
         DispatchQueue.global(qos: .utility).async {
-            let res = self.implementation.setChannel(channel: channel, defaultChannelKey: self.defaultChannelDefaultsKey, allowSetDefaultChannel: self.allowSetDefaultChannel)
+            let configDefaultChannel = self.getConfig().getString("defaultChannel", "")!
+            let res = self.implementation.setChannel(
+                channel: channel,
+                defaultChannelKey: self.defaultChannelDefaultsKey,
+                allowSetDefaultChannel: self.allowSetDefaultChannel,
+                configDefaultChannel: configDefaultChannel
+            )
             if res.error != "" {
                 // Fire channelPrivate event if channel doesn't allow self-assignment
                 if res.error.contains("cannot_update_via_private_channel") || res.error.contains("channel_self_set_not_allowed") {
@@ -1916,7 +1959,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     @objc func getChannel(_ call: CAPPluginCall) {
         self.saveCallForAsyncHandling(call)
         DispatchQueue.global(qos: .utility).async {
-            let res = self.implementation.getChannel()
+            let res = self.implementation.getChannel(defaultChannelKey: self.defaultChannelDefaultsKey)
             if res.error != "" {
                 self.rejectCall(call, message: res.error, code: "GETCHANNEL_FAILED", data: [
                     "message": res.error,

package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -2151,7 +2151,12 @@ import UIKit
         return setChannel
     }
 
-    func setChannel(channel: String, defaultChannelKey: String, allowSetDefaultChannel: Bool) -> SetChannel {
+    func setChannel(
+        channel: String,
+        defaultChannelKey: String,
+        allowSetDefaultChannel: Bool,
+        configDefaultChannel: String = ""
+    ) -> SetChannel {
         let setChannel: SetChannel = SetChannel()
 
         // Check if setting defaultChannel is allowed
@@ -2231,6 +2236,7 @@ import UIKit
         } else if responseValue.unset == true {
             UserDefaults.standard.removeObject(forKey: defaultChannelKey)
             UserDefaults.standard.synchronize()
+            self.defaultChannel = configDefaultChannel
             self.logger.info("Public channel requested, channel override removed")
 
             setChannel.status = responseValue.status ?? "ok"
@@ -2247,7 +2253,7 @@ import UIKit
         return setChannel
     }
 
-    func getChannel() -> GetChannel {
+    func getChannel(defaultChannelKey: String? = nil) -> GetChannel {
         let getChannel: GetChannel = GetChannel()
 
         // Check if rate limit was exceeded
@@ -2334,10 +2340,26 @@ import UIKit
             getChannel.message = responseValue.message ?? ""
             getChannel.channel = responseValue.channel ?? ""
             getChannel.allowSet = responseValue.allowSet ?? true
+            persistDefaultChannelFromResponse(channel: responseValue.channel, defaultChannelKey: defaultChannelKey)
         }
         return getChannel
     }
 
+    func persistDefaultChannelFromResponse(channel: String?, defaultChannelKey: String?) {
+        guard let channelName = channel?.trimmingCharacters(in: .whitespacesAndNewlines),
+              !channelName.isEmpty,
+              channelName != BundleInfo.ID_BUILTIN else {
+            return
+        }
+
+        self.defaultChannel = channelName
+        if let defaultChannelKey, !defaultChannelKey.isEmpty {
+            UserDefaults.standard.set(channelName, forKey: defaultChannelKey)
+            UserDefaults.standard.synchronize()
+        }
+        logger.info("defaultChannel synchronized from getChannel(): \(channelName)")
+    }
+
     func listChannels() -> ListChannels {
         let listChannels: ListChannels = ListChannels()
 

package/ios/Sources/CapacitorUpdaterPlugin/ShakeMenu.swift

@@ -7,6 +7,9 @@
 import UIKit
 import Capacitor
 
+private var lastShakeMenuShownAt: TimeInterval = 0
+private let shakeMenuCooldownSeconds: TimeInterval = 1.2
+
 extension UIApplication {
     // swiftlint:disable:next line_length
     public class func topViewController(_ base: UIViewController? = UIApplication.shared.windows.first?.rootViewController) -> UIViewController? {
@@ -43,25 +46,38 @@ extension UIWindow {
                 return
             }
 
+            let now = Date().timeIntervalSince1970
+            guard now - lastShakeMenuShownAt >= shakeMenuCooldownSeconds else {
+                plugin.logger.info("Shake menu ignored because cooldown is active")
+                return
+            }
+
             if canShowPreviewMenu {
-                showDefaultMenu(plugin: plugin, bridge: bridge)
+                if showDefaultMenu(plugin: plugin, bridge: bridge) {
+                    lastShakeMenuShownAt = now
+                }
             } else {
-                showChannelSelector(plugin: plugin, bridge: bridge)
+                if showChannelSelector(plugin: plugin, bridge: bridge) {
+                    lastShakeMenuShownAt = now
+                }
             }
         }
     }
 
-    private func showDefaultMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
+    @discardableResult
+    private func showDefaultMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) -> Bool {
         // Prevent multiple alerts from showing
-        if let topVC = UIApplication.topViewController(),
-           topVC.isKind(of: UIAlertController.self) {
+        guard let topVC = UIApplication.topViewController() else {
+            return false
+        }
+        if topVC.isKind(of: UIAlertController.self) {
             plugin.logger.info("UIAlertController is already presented")
-            return
+            return false
         }
 
         guard plugin.hasActivePreviewSession() else {
             plugin.logger.info("Shake preview menu ignored because no preview session is active")
-            return
+            return false
         }
 
         let appName = Bundle.main.infoDictionary?["CFBundleDisplayName"] as? String ?? "App"
@@ -96,7 +112,7 @@ extension UIWindow {
         if plugin.shakeChannelSelectorEnabled {
             alertShake.addAction(UIAlertAction(title: "Switch channel", style: .default) { _ in
                 let showSelector = {
-                    self.showChannelSelector(plugin: plugin, bridge: bridge)
+                    _ = self.showChannelSelector(plugin: plugin, bridge: bridge)
                 }
 
                 if let presenter = alertShake.presentingViewController {
@@ -110,10 +126,9 @@ extension UIWindow {
         alertShake.addAction(UIAlertAction(title: cancelButtonTitle, style: .default))
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
-                topVC.present(alertShake, animated: true)
-            }
+            topVC.present(alertShake, animated: true)
         }
+        return true
     }
 
     private func showConfiguredDefaultMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
@@ -179,12 +194,15 @@ extension UIWindow {
         }
     }
 
-    private func showChannelSelector(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
+    @discardableResult
+    private func showChannelSelector(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) -> Bool {
         // Prevent multiple alerts from showing
-        if let topVC = UIApplication.topViewController(),
-           topVC.isKind(of: UIAlertController.self) {
+        guard let topVC = UIApplication.topViewController() else {
+            return false
+        }
+        if topVC.isKind(of: UIAlertController.self) {
             plugin.logger.info("UIAlertController is already presented")
-            return
+            return false
         }
 
         let updater = plugin.implementation
@@ -208,28 +226,27 @@ extension UIWindow {
         })
 
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
-                topVC.present(loadingAlert, animated: true) {
-                    // Fetch channels in background
-                    DispatchQueue.global(qos: .userInitiated).async {
-                        let result = updater.listChannels()
+            topVC.present(loadingAlert, animated: true) {
+                // Fetch channels in background
+                DispatchQueue.global(qos: .userInitiated).async {
+                    let result = updater.listChannels()
 
-                        DispatchQueue.main.async {
-                            loadingAlert.dismiss(animated: true) {
-                                guard !didCancel else { return }
-                                if !result.error.isEmpty {
-                                    self.showError(message: "Failed to load channels: \(result.error)", plugin: plugin)
-                                } else if result.channels.isEmpty {
-                                    self.showError(message: "No channels available for self-assignment", plugin: plugin)
-                                } else {
-                                    self.presentChannelPicker(channels: result.channels, plugin: plugin, bridge: bridge)
-                                }
+                    DispatchQueue.main.async {
+                        loadingAlert.dismiss(animated: true) {
+                            guard !didCancel else { return }
+                            if !result.error.isEmpty {
+                                self.showError(message: "Failed to load channels: \(result.error)", plugin: plugin)
+                            } else if result.channels.isEmpty {
+                                self.showError(message: "No channels available for self-assignment", plugin: plugin)
+                            } else {
+                                self.presentChannelPicker(channels: result.channels, plugin: plugin, bridge: bridge)
                             }
                         }
                     }
                 }
             }
         }
+        return true
     }
 
     private func presentChannelPicker(channels: [[String: Any]], plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
@@ -338,7 +355,8 @@ extension UIWindow {
                         let setResult = updater.setChannel(
                             channel: name,
                             defaultChannelKey: "CapacitorUpdater.defaultChannel",
-                            allowSetDefaultChannel: plugin.allowSetDefaultChannel
+                            allowSetDefaultChannel: plugin.allowSetDefaultChannel,
+                            configDefaultChannel: plugin.getConfig().getString("defaultChannel", "") ?? ""
                         )
 
                         if !setResult.error.isEmpty {

package/package.json

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