@capgo/capacitor-updater 7.3.3 → 7.5.1

package/ios/Plugin/CapgoUpdater.swift

@@ -955,19 +955,17 @@ import UIKit
         request.validate().responseDecodable(of: SetChannelDec.self) { response in
             switch response.result {
             case .success:
-                if let status = response.value?.status {
-                    setChannel.status = status
-                }
-                if let error = response.value?.error {
-                    setChannel.error = error
-                }
-                if let message = response.value?.message {
-                    setChannel.message = message
+                if let responseValue = response.value {
+                    if let error = responseValue.error {
+                        setChannel.error = error
+                    } else {
+                        setChannel.status = responseValue.status ?? ""
+                        setChannel.message = responseValue.message ?? ""
+                    }
                 }
             case let .failure(error):
-                self.logger.error("Error unset Channel \(response.value.debugDescription) \(error)")
-                setChannel.message = "Error unset Channel \(String(describing: response.value))"
-                setChannel.error = "response_error"
+                self.logger.error("Error unset Channel \(error)")
+                setChannel.error = "Request failed: \(error.localizedDescription)"
             }
             semaphore.signal()
         }
@@ -992,19 +990,17 @@ import UIKit
         request.validate().responseDecodable(of: SetChannelDec.self) { response in
             switch response.result {
             case .success:
-                if let status = response.value?.status {
-                    setChannel.status = status
-                }
-                if let error = response.value?.error {
-                    setChannel.error = error
-                }
-                if let message = response.value?.message {
-                    setChannel.message = message
+                if let responseValue = response.value {
+                    if let error = responseValue.error {
+                        setChannel.error = error
+                    } else {
+                        setChannel.status = responseValue.status ?? ""
+                        setChannel.message = responseValue.message ?? ""
+                    }
                 }
             case let .failure(error):
-                self.logger.error("Error set Channel \(response.value.debugDescription) \(error)")
-                setChannel.message = "Error set Channel \(String(describing: response.value))"
-                setChannel.error = "response_error"
+                self.logger.error("Error set Channel \(error)")
+                setChannel.error = "Request failed: \(error.localizedDescription)"
             }
             semaphore.signal()
         }
@@ -1030,20 +1026,15 @@ import UIKit
             }
             switch response.result {
             case .success:
-                if let status = response.value?.status {
-                    getChannel.status = status
-                }
-                if let error = response.value?.error {
-                    getChannel.error = error
-                }
-                if let message = response.value?.message {
-                    getChannel.message = message
-                }
-                if let channel = response.value?.channel {
-                    getChannel.channel = channel
-                }
-                if let allowSet = response.value?.allowSet {
-                    getChannel.allowSet = allowSet
+                if let responseValue = response.value {
+                    if let error = responseValue.error {
+                        getChannel.error = error
+                    } else {
+                        getChannel.status = responseValue.status ?? ""
+                        getChannel.message = responseValue.message ?? ""
+                        getChannel.channel = responseValue.channel ?? ""
+                        getChannel.allowSet = responseValue.allowSet ?? true
+                    }
                 }
             case let .failure(error):
                 if let data = response.data, let bodyString = String(data: data, encoding: .utf8) {
@@ -1054,15 +1045,81 @@ import UIKit
                     }
                 }
 
-                self.logger.error("Error get Channel \(response.value.debugDescription) \(error)")
-                getChannel.message = "Error get Channel \(String(describing: response.value)))"
-                getChannel.error = "response_error"
+                self.logger.error("Error get Channel \(error)")
+                getChannel.error = "Request failed: \(error.localizedDescription)"
             }
         }
         semaphore.wait()
         return getChannel
     }
 
+    func listChannels() -> ListChannels {
+        let listChannels: ListChannels = ListChannels()
+        if (self.channelUrl).isEmpty {
+            logger.error("Channel URL is not set")
+            listChannels.error = "Channel URL is not set"
+            return listChannels
+        }
+
+        let semaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
+
+        // Auto-detect values
+        let appId = self.appId
+        let platform = "ios"
+        let isEmulator = self.isEmulator()
+        let isProd = self.isProd()
+
+        // Create query parameters
+        var urlComponents = URLComponents(string: self.channelUrl)
+        urlComponents?.queryItems = [
+            URLQueryItem(name: "app_id", value: appId),
+            URLQueryItem(name: "platform", value: platform),
+            URLQueryItem(name: "is_emulator", value: String(isEmulator)),
+            URLQueryItem(name: "is_prod", value: String(isProd))
+        ]
+
+        guard let url = urlComponents?.url else {
+            logger.error("Invalid channel URL")
+            listChannels.error = "Invalid channel URL"
+            return listChannels
+        }
+
+        let request = AF.request(url, method: .get, requestModifier: { $0.timeoutInterval = self.timeout })
+
+        request.validate().responseDecodable(of: ListChannelsDec.self) { response in
+            defer {
+                semaphore.signal()
+            }
+            switch response.result {
+            case .success:
+                if let responseValue = response.value {
+                    // Check for server-side errors
+                    if let error = responseValue.error {
+                        listChannels.error = error
+                        return
+                    }
+
+                    // Backend returns direct array, so channels should be populated by our custom decoder
+                    if let channels = responseValue.channels {
+                        listChannels.channels = channels.map { channel in
+                            var channelDict: [String: Any] = [:]
+                            channelDict["id"] = channel.id ?? ""
+                            channelDict["name"] = channel.name ?? ""
+                            channelDict["public"] = channel.public ?? false
+                            channelDict["allow_self_set"] = channel.allow_self_set ?? false
+                            return channelDict
+                        }
+                    }
+                }
+            case let .failure(error):
+                self.logger.error("Error list channels \(error)")
+                listChannels.error = "Request failed: \(error.localizedDescription)"
+            }
+        }
+        semaphore.wait()
+        return listChannels
+    }
+
     private let operationQueue = OperationQueue()
 
     func sendStats(action: String, versionName: String? = nil, oldVersionName: String? = "") {

package/ios/Plugin/InternalUtils.swift

@@ -67,6 +67,51 @@ extension GetChannel {
         return dict
     }
 }
+struct ChannelInfo: Codable {
+    let id: String?
+    let name: String?
+    let `public`: Bool?
+    let allow_self_set: Bool?
+}
+struct ListChannelsDec: Decodable {
+    let channels: [ChannelInfo]?
+    let error: String?
+
+    init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+
+        if let channelsArray = try? container.decode([ChannelInfo].self) {
+            // Backend returns direct array
+            self.channels = channelsArray
+            self.error = nil
+        } else {
+            // Handle error response
+            let errorContainer = try decoder.container(keyedBy: CodingKeys.self)
+            self.channels = nil
+            self.error = try? errorContainer.decode(String.self, forKey: .error)
+        }
+    }
+
+    private enum CodingKeys: String, CodingKey {
+        case error
+    }
+}
+public class ListChannels: NSObject {
+    var channels: [[String: Any]] = []
+    var error: String = ""
+}
+extension ListChannels {
+    func toDict() -> [String: Any] {
+        var dict: [String: Any] = [String: Any]()
+        let otherSelf: Mirror = Mirror(reflecting: self)
+        for child: Mirror.Child in otherSelf.children {
+            if let key: String = child.label {
+                dict[key] = child.value
+            }
+        }
+        return dict
+    }
+}
 struct InfoObject: Codable {
     let platform: String?
     let device_id: String?

package/ios/Plugin/Logger.swift

@@ -134,7 +134,7 @@ public class Logger {
         withTag tag: String,
         config: InstanceConfiguration? = nil,
         options: Options? = nil
-        ) {
+    ) {
         self.tag = tag
         if let config = config {
             // The logger plugin's name is LoggerBridge, we want to look at the config

package/ios/Plugin/ShakeMenu.swift

@@ -0,0 +1,112 @@
+/*
+ * 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 {
+    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
+            }
+
+            showShakeMenu(plugin: plugin, bridge: bridge)
+        }
+    }
+
+    private func showShakeMenu(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 vc = (self.rootViewController as? CAPBridgeViewController) {
+                    vc.loadView()
+                    vc.viewDidLoad()
+                }
+                _ = updater.delete(id: updater.getCurrentBundleId())
+                plugin.logger.info("Reset to builtin version")
+            }
+        }
+
+        let bundleId = updater.getCurrentBundleId()
+        if let vc = (self.rootViewController as? CAPBridgeViewController) {
+            plugin.logger.info("getServerBasePath: \(vc.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)
+            }
+        }
+    }
+}

package/package.json

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