@capgo/capacitor-updater 6.14.26 → 6.14.29

package/ios/Sources/CapacitorUpdaterPlugin/Logger.swift

@@ -0,0 +1,310 @@
+import Capacitor
+import Foundation
+import os.log
+import WebKit
+
+public class Logger {
+    public enum LogLevel: Int {
+        case silent = 0
+        case error
+        case warn
+        case info
+        case debug
+
+        public static subscript(_ str: String) -> LogLevel? {
+            var index = 0
+
+            while let item = LogLevel(rawValue: index) {
+                if str == "\(item)" {
+                    return item
+                }
+
+                index += 1
+            }
+
+            return nil
+        }
+
+        public func asOSLogType() -> OSLogType {
+            switch self {
+            case .debug:
+                return OSLogType.debug
+            case .info:
+                return OSLogType.info
+            case .warn:
+                return OSLogType.default
+            case .error:
+                return OSLogType.error
+            case .silent:
+                return OSLogType.info // Compiler wants this, it will never be used
+            }
+        }
+        public func asString() -> String {
+            switch self {
+            case .debug:
+                return "debug"
+            case .info:
+                return "info"
+            case .warn:
+                return "warn"
+            case .error:
+                return "error"
+            case .silent:
+                return "info"
+            }
+        }
+    }
+
+    public struct Options {
+        public var level: LogLevel
+        public var labels: [String: String]
+        public var useSyslog: Bool
+
+        public init(level: LogLevel = LogLevel.info, labels: [String: String] = [:], useSyslog: Bool = false) {
+            self.level = level
+            self.labels = labels
+            self.useSyslog = useSyslog
+        }
+    }
+
+    private var _labels: [LogLevel: String] = [
+        LogLevel.silent: "",
+        LogLevel.error: "🔴",
+        LogLevel.warn: "🟠",
+        LogLevel.info: "🟢",
+        LogLevel.debug: "🔎"
+    ]
+
+    public var labels: [String: String] {
+        get {
+            var result: [String: String] = [:]
+
+            for (level, label) in _labels {
+                result[String(describing: level)] = label
+            }
+
+            return result
+        }
+
+        set {
+            for (level, label) in newValue {
+                if let logLevel = LogLevel[level] {
+                    _labels[logLevel] = label
+                }
+            }
+        }
+    }
+
+    public var level = LogLevel.info
+
+    public var levelName: String {
+        get {
+            String(describing: level)
+        }
+        set {
+            if let newLevel = LogLevel[newValue] {
+                level = newLevel
+            }
+        }
+    }
+
+    private var _tag = ""
+
+    public var tag: String {
+        get {
+            _tag
+        }
+        set {
+            if !newValue.isEmpty {
+                _tag = newValue
+            }
+        }
+    }
+
+    private let kDefaultTimerLabel = "default"
+    private var timers: [String: Date] = [:]
+    public var useSyslog = false
+    public var webView: WKWebView?
+
+    public func setWebView(webView: WKWebView) {
+        self.webView = webView
+    }
+
+    public init(
+        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
+            // named "Logger", so we can't use plugin.getConfigValue().
+            if let configLevel = getConfigValue("level", from: config) as? String,
+               let logLevel = LogLevel[configLevel] {
+                level = logLevel
+            }
+
+            if let configLabels = getConfigValue("labels", from: config) as? [String: String] {
+                labels = configLabels
+            }
+
+            if let configSyslog = getConfigValue("useSyslog", from: config) as? Bool {
+                useSyslog = configSyslog
+            }
+        }
+
+        if let options = options {
+            self.level = options.level
+            self.labels = options.labels
+            self.useSyslog = options.useSyslog
+        }
+    }
+
+    private func getConfigValue(_ configKey: String, from config: InstanceConfiguration) -> Any? {
+        if let config = config.pluginConfigurations as? JSObject {
+            return config[keyPath: KeyPath(stringLiteral: "Logger.\(configKey)")]
+        }
+
+        return nil
+    }
+
+    public func error(_ message: String) {
+        log(atLevel: LogLevel.error, message: message)
+    }
+
+    public func warn(_ message: String) {
+        log(atLevel: LogLevel.warn, message: message)
+    }
+
+    public func info(_ message: String) {
+        log(atLevel: LogLevel.info, message: message)
+    }
+
+    public func log(_ message: String) {
+        log(atLevel: LogLevel.info, message: message)
+    }
+
+    public func debug(_ message: String) {
+        log(atLevel: LogLevel.debug, message: message)
+    }
+
+    public func dir(_ value: Any?) {
+        // Check the log level here to avoid conversion to string
+        if canLog(atLevel: LogLevel.info) {
+            log(atLevel: LogLevel.info, message: String(describing: value))
+        }
+    }
+
+    public func log(atLevel level: LogLevel, message: String) {
+        // This will never fail, but we have to keep swift happy
+        if let label = _labels[level] {
+            log(atLevel: level, label: label, tag: tag, message: message)
+            if let webView = self.webView {
+                DispatchQueue.main.async {
+                    let combined = "\(label) \(self.tag) : \(message)"
+                    let jsArg = self.toJSStringLiteral(combined)
+                    webView.evaluateJavaScript("console.\(level.asString())(\(jsArg))", completionHandler: nil)
+                }
+            }
+        }
+    }
+
+    private func toJSStringLiteral(_ value: String) -> String {
+        // Prefer JSON encoding to produce a valid JS string literal
+        if let data = try? JSONEncoder().encode(value),
+           let encoded = String(data: data, encoding: .utf8) {
+            return encoded
+        }
+
+        // Fallback manual escaping (unlikely to be used)
+        var s = value
+        s = s.replacingOccurrences(of: "\\", with: "\\\\")
+        s = s.replacingOccurrences(of: "\"", with: "\\\"")
+        s = s.replacingOccurrences(of: "'", with: "\\'")
+        s = s.replacingOccurrences(of: "\n", with: "\\n")
+        s = s.replacingOccurrences(of: "\r", with: "\\r")
+        s = s.replacingOccurrences(of: "\u{2028}", with: "\\u2028")
+        s = s.replacingOccurrences(of: "\u{2029}", with: "\\u2029")
+        return "\"\(s)\""
+    }
+
+    public func log(atLevel level: LogLevel, label: String?, tag: String, message: String) {
+        // This will never fail, but we have to keep swift happy
+        if let label = label ?? _labels[level] {
+            print(atLevel: level, label: label, tag: tag, message: message)
+            // eval
+        }
+    }
+
+    private func canLog(atLevel level: LogLevel) -> Bool {
+        self.level.rawValue >= level.rawValue
+    }
+
+    private func print(atLevel level: LogLevel, label: String, tag: String, message: String) {
+        guard canLog(atLevel: level) else {
+            return
+        }
+
+        var msg = message
+
+        if !label.isEmpty {
+            // If the label is ASCII, put it after the tag, otherwise before.
+            if label[label.startIndex].isASCII {
+                msg = "[\(tag)] \(label): \(message)"
+            } else {
+                msg = "\(label) [\(tag)]: \(message)"
+            }
+        } else {
+            msg = "[\(tag)]: \(message)"
+        }
+
+        if useSyslog {
+            os_log("%{public}@", type: level.asOSLogType(), msg)
+        } else {
+            Swift.print(msg)
+        }
+    }
+
+    public func time(_ label: String?) {
+        timers[label ?? ""] = Date()
+    }
+
+    public func timeLog(_ label: String?) {
+        if let timer = timers[label ?? ""] {
+            info(formatTimeInterval(timer.timeIntervalSinceNow))
+        } else {
+            warn("timer \(label ?? kDefaultTimerLabel) does not exist")
+        }
+    }
+
+    public func timeEnd(_ label: String?) {
+        timeLog(label)
+        timers.removeValue(forKey: label ?? kDefaultTimerLabel)
+    }
+
+    private func formatTimeInterval(_ interval: TimeInterval) -> String {
+        let int = Int(interval)
+        let millis = Int(((1 + interval.remainder(dividingBy: 1)) * 1000).rounded())
+        let seconds = int % 60
+        let minutes = (int / 60) % 60
+        let hours = (int / 3600)
+
+        if seconds < 1 {
+            return "\(millis)ms"
+        }
+
+        if minutes < 1 {
+            return "\(seconds).\(String(format: "%0.3d", millis))s"
+        }
+
+        if hours < 1 {
+            return "\(minutes):\(String(format: "%0.2d", seconds)).\(String(format: "%0.3d", millis)) (min:sec.ms)"
+        }
+
+        return "\(hours):\(String(format: "%0.2d", minutes)):\(String(format: "%0.2d", seconds)) (hr:min:sec)"
+    }
+
+    public func trace() {
+        info(String(format: "%@", Thread.callStackSymbols))
+    }
+}

package/ios/{Plugin → Sources/CapacitorUpdaterPlugin}/RSA.swift

@@ -1,4 +1,5 @@
 import BigInt
+import Foundation
 import CommonCrypto
 import CryptoKit
 

package/ios/Sources/CapacitorUpdaterPlugin/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/ios/{Plugin → Sources/CapacitorUpdaterPlugin}/UserDefaultsExtension.swift

@@ -34,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,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "6.14.26",
+  "version": "6.14.29",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",
@@ -12,7 +12,7 @@
     "android/proguard-rules.pro",
     "android/build.gradle",
     "dist/",
-    "ios/Plugin/",
+    "ios/Sources/",
     "CapgoCapacitorUpdater.podspec",
     "Package.swift"
   ],
@@ -41,39 +41,43 @@
   ],
   "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: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",
+    "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 -- --autocorrect --format",
+    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --fix --format",
     "eslint": "eslint . --ext .ts",
     "prettier": "prettier \"**/*.{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",
+    "docgen:api": "node scripts/generate-docs.js",
     "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
     "clean": "rimraf ./dist",
     "watch": "tsc --watch",
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "^6.2.0",
-    "@capacitor/cli": "^6.2.0",
-    "@capacitor/core": "^6.2.0",
+    "@capacitor/android": "^6.1.2",
+    "@capacitor/cli": "^6.1.2",
+    "@capacitor/core": "^6.1.2",
     "@capacitor/docgen": "^0.3.0",
-    "@capacitor/ios": "^6.2.0",
+    "@capacitor/ios": "^6.1.2",
     "@ionic/eslint-config": "^0.4.0",
     "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^2.0.0",
-    "@types/node": "^22.10.5",
-    "eslint": "^8.57.1",
-    "eslint-plugin-import": "^2.31.0",
-    "prettier": "^3.4.2",
-    "prettier-plugin-java": "^2.6.6",
+    "@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.30.1",
+    "rollup": "^4.50.0",
     "swiftlint": "^2.0.0",
-    "typescript": "^5.7.2"
+    "typescript": "^5.9.2"
   },
   "peerDependencies": {
     "@capacitor/core": "^6.0.0"