@capgo/capacitor-updater 4.41.0 → 4.43.5

package/ios/Sources/CapacitorUpdaterPlugin/ShakeMenu.swift

@@ -0,0 +1,441 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+import UIKit
+import Capacitor
+
+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 {
+            return topViewController(nav.visibleViewController)
+        }
+        if let tab = base as? UITabBarController, let selected = tab.selectedViewController {
+            return topViewController(selected)
+        }
+        if let presented = base?.presentedViewController {
+            return topViewController(presented)
+        }
+        return base
+    }
+}
+
+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),
+                  let plugin = bridge.plugin(withName: "CapacitorUpdaterPlugin") as? CapacitorUpdaterPlugin else {
+                return
+            }
+
+            // Check if shake menu is enabled
+            if !plugin.shakeMenuEnabled {
+                return
+            }
+
+            // Check if channel selector mode is enabled
+            if plugin.shakeChannelSelectorEnabled {
+                showChannelSelector(plugin: plugin, bridge: bridge)
+            } else {
+                showDefaultMenu(plugin: plugin, bridge: bridge)
+            }
+        }
+    }
+
+    private func showDefaultMenu(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 appName = Bundle.main.infoDictionary?["CFBundleDisplayName"] as? String ?? "App"
+        let title = "Preview \(appName) Menu"
+        let message = "What would you like to do?"
+        let okButtonTitle = "Go Home"
+        let reloadButtonTitle = "Reload app"
+        let cancelButtonTitle = "Close menu"
+
+        let updater = plugin.implementation
+
+        func resetBuiltin() {
+            updater.reset()
+            bridge.setServerBasePath("")
+            DispatchQueue.main.async {
+                if let viewController = (self.rootViewController as? CAPBridgeViewController) {
+                    viewController.loadView()
+                    viewController.viewDidLoad()
+                }
+                _ = updater.delete(id: updater.getCurrentBundleId())
+                plugin.logger.info("Reset to builtin version")
+            }
+        }
+
+        let bundleId = updater.getCurrentBundleId()
+        if let viewController = (self.rootViewController as? CAPBridgeViewController) {
+            plugin.logger.info("getServerBasePath: \(viewController.getServerBasePath())")
+        }
+        plugin.logger.info("bundleId: \(bundleId)")
+
+        let alertShake = UIAlertController(title: title, message: message, preferredStyle: .alert)
+
+        alertShake.addAction(UIAlertAction(title: okButtonTitle, style: .default) { _ in
+            guard let next = updater.getNextBundle() else {
+                resetBuiltin()
+                return
+            }
+            if !next.isBuiltin() {
+                plugin.logger.info("Resetting to: \(next.toString())")
+                _ = updater.set(bundle: next)
+                let destHot = updater.getBundleDirectory(id: next.getId())
+                plugin.logger.info("Reloading \(next.toString())")
+                bridge.setServerBasePath(destHot.path)
+            } else {
+                resetBuiltin()
+            }
+            plugin.logger.info("Reload app done")
+        })
+
+        alertShake.addAction(UIAlertAction(title: cancelButtonTitle, style: .default))
+
+        alertShake.addAction(UIAlertAction(title: reloadButtonTitle, style: .default) { _ in
+            DispatchQueue.main.async {
+                bridge.webView?.reload()
+            }
+        })
+
+        DispatchQueue.main.async {
+            if let topVC = UIApplication.topViewController() {
+                topVC.present(alertShake, animated: true)
+            }
+        }
+    }
+
+    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)
+
+                        // Handle update errors first (before "no new version" check)
+                        if let error = latest.error, !error.isEmpty && error != "no_new_version_available" {
+                            DispatchQueue.main.async {
+                                progressAlert.dismiss(animated: true) {
+                                    self.showError(message: "Channel set to \(name). Update check failed: \(error)", plugin: plugin)
+                                }
+                            }
+                            return
+                        }
+
+                        // Check if there's an actual update available
+                        if latest.error == "no_new_version_available" || 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/ios/{Plugin → Sources/CapacitorUpdaterPlugin}/UserDefaultsExtension.swift

@@ -15,6 +15,7 @@ enum ObjectSavableError: String, LocalizedError {
     case unableToEncode = "Unable to encode object into data"
     case noValue = "No data object found for the given key"
     case unableToDecode = "Unable to decode object into given type"
+    case checksum = "Checksum failed"
 
     var errorDescription: String? {
         rawValue
@@ -33,9 +34,7 @@ extension UserDefaults: ObjectSavable {
     }
 
     func getObj<Object>(forKey: String, castTo type: Object.Type) throws -> Object where Object: Decodable {
-        // print("forKey", forKey)
         guard let data: Data = data(forKey: forKey) else { throw ObjectSavableError.noValue }
-        // print("data", data)
         let decoder: JSONDecoder = JSONDecoder()
         do {
             let object: Object = try decoder.decode(type, from: data)

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "4.41.0",
-  "packageManager": "pnpm@8.2.0",
+  "version": "4.43.5",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",
@@ -10,12 +9,14 @@
   "unpkg": "dist/plugin.js",
   "files": [
     "android/src/main/",
+    "android/proguard-rules.pro",
     "android/build.gradle",
     "dist/",
-    "ios/Plugin/",
-    "CapgoCapacitorUpdater.podspec"
+    "ios/Sources/",
+    "CapgoCapacitorUpdater.podspec",
+    "Package.swift"
   ],
-  "author": "Martin Donadieu",
+  "author": "Martin Donadieu <martin@capgo.app>",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Cap-go/capacitor-updater.git"
@@ -23,58 +24,65 @@
   "bugs": {
     "url": "https://github.com/Cap-go/capacitor-updater/issues"
   },
+  "homepage": "https://capgo.app/docs/plugins/updater/",
   "keywords": [
     "capacitor",
-    "plugin",
-    "OTA",
-    "manual update",
+    "live updates",
     "live update",
+    "updates",
     "auto update",
+    "manual update",
+    "capgo",
+    "plugin",
+    "OTA",
     "ionic",
     "appflow alternative",
-    "capgo",
+    "microsoft alternative",
     "native"
   ],
   "scripts": {
-    "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -scheme Plugin && cd ..",
-    "verify:android": "cd android && ./gradlew clean build test && cd ..",
-    "verify:web": "npm run build",
-    "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
-    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --autocorrect --format",
-    "eslint": "eslint . --ext ts",
-    "prettier": "prettier --config .prettierrc.js \"**/*.{css,html,ts,js,java}\"",
+    "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 assemble test && cd ..",
+    "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": "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": "docgen --api CapacitorUpdaterPlugin --output-readme README.md --output-json dist/docs.json",
-    "docgen:api": "docgen --api CapacitorUpdaterPlugin --output-readme api.md --output-json dist/docs.json && awk '{sub(/###/,\"##\")}1' api.md > temp.txt && mv temp.txt api.md",
-    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
+    "docgen": "node scripts/generate-docs.js",
+    "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": "^4.7.3",
-    "@capacitor/cli": "^4.7.3",
-    "@capacitor/core": "^4.7.3",
-    "@capacitor/docgen": "^0.2.1",
-    "@capacitor/ios": "^4.7.3",
-    "@ionic/eslint-config": "^0.3.0",
-    "@ionic/prettier-config": "^2.0.0",
-    "@ionic/swiftlint-config": "^1.1.2",
-    "@types/node": "^18.15.11",
-    "@typescript-eslint/eslint-plugin": "^5.58.0",
-    "@typescript-eslint/parser": "^5.58.0",
-    "eslint": "^8.38.0",
-    "eslint-plugin-import": "^2.27.5",
-    "prettier": "^2.8.7",
-    "prettier-plugin-java": "^2.1.0",
-    "rimraf": "^4.4.1",
-    "rollup": "^3.20.2",
-    "swiftlint": "^1.0.1",
-    "typescript": "^4.9.5"
+    "@capacitor/android": "^4.8.2",
+    "@capacitor/cli": "^4.8.2",
+    "@capacitor/core": "^4.8.2",
+    "@capacitor/docgen": "^0.3.0",
+    "@capacitor/ios": "^4.8.2",
+    "@ionic/eslint-config": "^0.4.0",
+    "@ionic/prettier-config": "^4.0.0",
+    "@ionic/swiftlint-config": "^2.0.0",
+    "@types/node": "^24.3.0",
+    "eslint": "^8.57.0",
+    "eslint-plugin-import": "^2.32.0",
+    "husky": "^9.1.7",
+    "prettier": "^3.6.2",
+    "prettier-plugin-java": "^2.7.4",
+    "rimraf": "^6.0.1",
+    "rollup": "^4.50.0",
+    "swiftlint": "^2.0.0",
+    "typescript": "^5.9.2",
+    "prettier-pretty-check": "^0.2.0"
   },
   "peerDependencies": {
-    "@capacitor/core": "^4.0.0 || ^5.0.0"
+    "@capacitor/core": "^4.0.0"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",