@capgo/capacitor-updater 7.42.9 → 7.45.10

package/ios/Sources/CapacitorUpdaterPlugin/ShakeMenu.swift

@@ -37,11 +37,16 @@ extension UIWindow {
                 return
             }
 
-            showShakeMenu(plugin: plugin, bridge: bridge)
+            // Check if channel selector mode is enabled
+            if plugin.shakeChannelSelectorEnabled {
+                showChannelSelector(plugin: plugin, bridge: bridge)
+            } else {
+                showDefaultMenu(plugin: plugin, bridge: bridge)
+            }
         }
     }
 
-    private func showShakeMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
+    private func showDefaultMenu(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
         // Prevent multiple alerts from showing
         if let topVC = UIApplication.topViewController(),
            topVC.isKind(of: UIAlertController.self) {
@@ -110,4 +115,344 @@ extension UIWindow {
             }
         }
     }
+
+    private func showChannelSelector(plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
+        // Prevent multiple alerts from showing
+        if let topVC = UIApplication.topViewController(),
+           topVC.isKind(of: UIAlertController.self) {
+            plugin.logger.info("UIAlertController is already presented")
+            return
+        }
+
+        let updater = plugin.implementation
+
+        // Show loading indicator
+        let loadingAlert = UIAlertController(title: "Loading Channels...", message: nil, preferredStyle: .alert)
+        var didCancel = false
+        let loadingIndicator = UIActivityIndicatorView(style: .medium)
+        loadingIndicator.translatesAutoresizingMaskIntoConstraints = false
+        loadingIndicator.startAnimating()
+        loadingAlert.view.addSubview(loadingIndicator)
+
+        NSLayoutConstraint.activate([
+            loadingIndicator.centerXAnchor.constraint(equalTo: loadingAlert.view.centerXAnchor),
+            loadingIndicator.bottomAnchor.constraint(equalTo: loadingAlert.view.bottomAnchor, constant: -20)
+        ])
+
+        // Add cancel button to loading alert
+        loadingAlert.addAction(UIAlertAction(title: "Cancel", style: .cancel) { _ in
+            didCancel = true
+        })
+
+        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()
+
+                        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)
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private func presentChannelPicker(channels: [[String: Any]], plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
+        let alert = UIAlertController(title: "Select Channel", message: "Choose a channel to switch to", preferredStyle: .actionSheet)
+
+        // Get channel names
+        let channelNames = channels.compactMap { $0["name"] as? String }
+
+        // Show first 5 channels as actions
+        let channelsToShow = Array(channelNames.prefix(5))
+
+        for channelName in channelsToShow {
+            alert.addAction(UIAlertAction(title: channelName, style: .default) { [weak self] _ in
+                self?.selectChannel(name: channelName, plugin: plugin, bridge: bridge)
+            })
+        }
+
+        // If there are more channels, add a "More..." option
+        if channelNames.count > 5 {
+            alert.addAction(UIAlertAction(title: "More channels...", style: .default) { [weak self] _ in
+                self?.showSearchableChannelPicker(channels: channels, plugin: plugin, bridge: bridge)
+            })
+        }
+
+        alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+
+        // For iPad support
+        if let popoverController = alert.popoverPresentationController {
+            popoverController.sourceView = self
+            popoverController.sourceRect = CGRect(x: self.bounds.midX, y: self.bounds.midY, width: 0, height: 0)
+            popoverController.permittedArrowDirections = []
+        }
+
+        DispatchQueue.main.async {
+            if let topVC = UIApplication.topViewController() {
+                topVC.present(alert, animated: true)
+            }
+        }
+    }
+
+    private func showSearchableChannelPicker(channels: [[String: Any]], plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
+        let alert = UIAlertController(title: "Search Channels", message: "Enter channel name to search", preferredStyle: .alert)
+
+        alert.addTextField { textField in
+            textField.placeholder = "Channel name..."
+        }
+
+        let channelNames = channels.compactMap { $0["name"] as? String }
+
+        alert.addAction(UIAlertAction(title: "Search", style: .default) { [weak self, weak alert] _ in
+            guard let searchText = alert?.textFields?.first?.text?.lowercased(), !searchText.isEmpty else {
+                // If empty, show first 5
+                self?.presentChannelPicker(channels: channels, plugin: plugin, bridge: bridge)
+                return
+            }
+
+            // Filter channels
+            let filtered = channelNames.filter { $0.lowercased().contains(searchText) }
+
+            if filtered.isEmpty {
+                self?.showError(message: "No channels found matching '\(searchText)'", plugin: plugin)
+            } else if filtered.count == 1 {
+                // Directly select if only one match
+                self?.selectChannel(name: filtered[0], plugin: plugin, bridge: bridge)
+            } else {
+                // Show filtered results
+                let filteredChannels = channels.filter { channel in
+                    if let name = channel["name"] as? String {
+                        return name.lowercased().contains(searchText)
+                    }
+                    return false
+                }
+                self?.presentChannelPicker(channels: filteredChannels, plugin: plugin, bridge: bridge)
+            }
+        })
+
+        alert.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+
+        DispatchQueue.main.async {
+            if let topVC = UIApplication.topViewController() {
+                topVC.present(alert, animated: true)
+            }
+        }
+    }
+
+    private func selectChannel(name: String, plugin: CapacitorUpdaterPlugin, bridge: CAPBridgeProtocol) {
+        let updater = plugin.implementation
+
+        // Show progress indicator
+        let progressAlert = UIAlertController(title: "Switching to \(name)", message: "Setting channel...", preferredStyle: .alert)
+        let indicator = UIActivityIndicatorView(style: .medium)
+        indicator.translatesAutoresizingMaskIntoConstraints = false
+        indicator.startAnimating()
+        progressAlert.view.addSubview(indicator)
+
+        NSLayoutConstraint.activate([
+            indicator.centerXAnchor.constraint(equalTo: progressAlert.view.centerXAnchor),
+            indicator.bottomAnchor.constraint(equalTo: progressAlert.view.bottomAnchor, constant: -20)
+        ])
+
+        DispatchQueue.main.async {
+            if let topVC = UIApplication.topViewController() {
+                topVC.present(progressAlert, animated: true) {
+                    DispatchQueue.global(qos: .userInitiated).async {
+                        // Set the channel - respect plugin's allowSetDefaultChannel config
+                        let setResult = updater.setChannel(
+                            channel: name,
+                            defaultChannelKey: "CapacitorUpdater.defaultChannel",
+                            allowSetDefaultChannel: plugin.allowSetDefaultChannel
+                        )
+
+                        if !setResult.error.isEmpty {
+                            DispatchQueue.main.async {
+                                progressAlert.dismiss(animated: true) {
+                                    self.showError(message: "Failed to set channel: \(setResult.error)", plugin: plugin)
+                                }
+                            }
+                            return
+                        }
+
+                        // Update progress message
+                        DispatchQueue.main.async {
+                            progressAlert.message = "Checking for updates..."
+                        }
+
+                        // Check for updates with the new channel
+                        let pluginUpdateUrl = plugin.getUpdateUrl()
+                        let updateUrlStr = pluginUpdateUrl.isEmpty ? CapacitorUpdaterPlugin.updateUrlDefault : pluginUpdateUrl
+                        guard let updateUrl = URL(string: updateUrlStr) else {
+                            DispatchQueue.main.async {
+                                progressAlert.dismiss(animated: true) {
+                                    self.showError(
+                                        message: "Channel set to \(name). Invalid update URL, could not check for updates.",
+                                        plugin: plugin
+                                    )
+                                }
+                            }
+                            return
+                        }
+
+                        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 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 blocked: \(detail)", plugin: plugin)
+                                }
+                            }
+                            return
+                        }
+
+                        // Check if there's an actual update available
+                        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)
+                                }
+                            }
+                            return
+                        }
+
+                        // Update message
+                        DispatchQueue.main.async {
+                            progressAlert.message = "Downloading update \(latest.version)..."
+                        }
+
+                        // Download the update
+                        do {
+                            let bundle: BundleInfo
+                            if let manifest = latest.manifest, !manifest.isEmpty {
+                                bundle = try updater.downloadManifest(
+                                    manifest: manifest,
+                                    version: latest.version,
+                                    sessionKey: latest.sessionKey ?? ""
+                                )
+                            } else {
+                                // Safe unwrap URL
+                                guard let downloadUrl = URL(string: latest.url) else {
+                                    DispatchQueue.main.async {
+                                        progressAlert.dismiss(animated: true) {
+                                            self.showError(message: "Failed to download update: invalid update URL.", plugin: plugin)
+                                        }
+                                    }
+                                    return
+                                }
+                                bundle = try updater.download(
+                                    url: downloadUrl,
+                                    version: latest.version,
+                                    sessionKey: latest.sessionKey ?? ""
+                                )
+                            }
+
+                            // Set as next bundle
+                            _ = updater.setNextBundle(next: bundle.getId())
+
+                            DispatchQueue.main.async {
+                                progressAlert.dismiss(animated: true) {
+                                    self.showSuccessWithReload(
+                                        message: "Update downloaded! Reload to apply version \(latest.version)?",
+                                        plugin: plugin,
+                                        bridge: bridge,
+                                        onReload: { [weak plugin] in
+                                            _ = updater.set(bundle: bundle)
+                                            _ = plugin?._reload()
+                                        }
+                                    )
+                                }
+                            }
+                        } catch {
+                            DispatchQueue.main.async {
+                                progressAlert.dismiss(animated: true) {
+                                    self.showError(message: "Failed to download update: \(error.localizedDescription)", plugin: plugin)
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private func showError(message: String, plugin: CapacitorUpdaterPlugin) {
+        plugin.logger.error(message)
+        let alert = UIAlertController(title: "Error", message: message, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "OK", style: .default))
+
+        DispatchQueue.main.async {
+            if let topVC = UIApplication.topViewController() {
+                topVC.present(alert, animated: true)
+            }
+        }
+    }
+
+    private func showSuccess(message: String, plugin: CapacitorUpdaterPlugin) {
+        plugin.logger.info(message)
+        let alert = UIAlertController(title: "Success", message: message, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "OK", style: .default))
+
+        DispatchQueue.main.async {
+            if let topVC = UIApplication.topViewController() {
+                topVC.present(alert, animated: true)
+            }
+        }
+    }
+
+    private func showSuccessWithReload(
+        message: String,
+        plugin: CapacitorUpdaterPlugin,
+        bridge: CAPBridgeProtocol,
+        onReload: (() -> Void)? = nil
+    ) {
+        plugin.logger.info(message)
+        let alert = UIAlertController(title: "Update Ready", message: message, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "Later", style: .cancel))
+        alert.addAction(UIAlertAction(title: "Reload Now", style: .default) { _ in
+            if let onReload = onReload {
+                onReload()
+            } else {
+                DispatchQueue.main.async {
+                    bridge.webView?.reload()
+                }
+            }
+        })
+
+        DispatchQueue.main.async {
+            if let topVC = UIApplication.topViewController() {
+                topVC.present(alert, animated: true)
+            }
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "7.42.9",
+  "version": "7.45.10",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",
@@ -41,23 +41,27 @@
     "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": {
     "@capacitor/android": "^7.4.3",