@capgo/capacitor-updater 8.0.0 → 8.0.1

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -13,60 +13,173 @@ import Version
  * here: https://capacitorjs.com/docs/plugins/ios
  */
 @objc(CapacitorUpdaterPlugin)
-public class CapacitorUpdaterPlugin: CAPPlugin {
-    private var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "8.0.0"
-    static let updateUrlDefault = "https://api.capgo.app/updates"
-    static let statsUrlDefault = "https://api.capgo.app/stats"
-    static let channelUrlDefault = "https://api.capgo.app/channel_self"
+public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
+    public let identifier = "CapacitorUpdaterPlugin"
+    public let jsName = "CapacitorUpdater"
+    public let pluginMethods: [CAPPluginMethod] = [
+        CAPPluginMethod(name: "download", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setUpdateUrl", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setStatsUrl", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setChannelUrl", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "set", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "list", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "delete", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "reset", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "current", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "reload", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "notifyAppReady", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setDelay", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setMultiDelay", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "cancelDelay", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getLatest", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setChannel", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "unsetChannel", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getChannel", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "setCustomId", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getDeviceId", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getPluginVersion", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "next", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "isAutoUpdateEnabled", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getBuiltinVersion", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "isAutoUpdateAvailable", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getNextBundle", returnType: CAPPluginReturnPromise)
+    ]
+    public var implementation = CapacitorUpdater()
+    private let PLUGIN_VERSION: String = "8.0.1"
+    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"
     let DELAY_CONDITION_PREFERENCES = ""
     private var updateUrl = ""
     private var statsUrl = ""
-    private var defaultPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpQIBAAKCAQEA4pW9olT0FBXXivRCzd3xcImlWZrqkwcF2xTkX/FwXmj9eh9H\nkBLrsQmfsC+PJisRXIOGq6a0z3bsGq6jBpp3/Jr9jiaW5VuPGaKeMaZZBRvi/N5f\nIMG3hZXSOcy0IYg+E1Q7RkYO1xq5GLHseqG+PXvJsNe4R8R/Bmd/ngq0xh/cvcrH\nHpXwO0Aj9tfprlb+rHaVV79EkVRWYPidOLnK1n0EFHFJ1d/MyDIp10TEGm2xHpf/\nBrlb1an8wXEuzoC0DgYaczgTjovwR+ewSGhSHJliQdM0Qa3o1iN87DldWtydImMs\nPjJ3DUwpsjAMRe5X8Et4+udFW2ciYnQo9H0CkwIDAQABAoIBAQCtjlMV/4qBxAU4\nu0ZcWA9yywwraX0aJ3v1xrfzQYV322Wk4Ea5dbSxA5UcqCE29DA1M824t1Wxv/6z\npWbcTP9xLuresnJMtmgTE7umfiubvTONy2sENT20hgDkIwcq1CfwOEm61zjQzPhQ\nkSB5AmEsyR/BZEsUNc+ygR6AWOUFB7tj4yMc32LOTWSbE/znnF2BkmlmnQykomG1\n2oVqM3lUFP7+m8ux1O7scO6IMts+Z/eFXjWfxpbebUSvSIR83GXPQZ34S/c0ehOg\nyHdmCSOel1r3VvInMe+30j54Jr+Ml/7Ee6axiwyE2e/bd85MsK9sVdp0OtelXaqA\nOZZqWvN5AoGBAP2Hn3lSq+a8GsDH726mHJw60xM0LPbVJTYbXsmQkg1tl3NKJTMM\nQqz41+5uys+phEgLHI9gVJ0r+HaGHXnJ4zewlFjsudstb/0nfctUvTqnhEhfNo9I\ny4kufVKPRF3sMEeo7CDVJs4GNBLycEyIBy6Mbv0VcO7VaZqggRwu4no9AoGBAOTK\n6NWYs1BWlkua2wmxexGOzehNGedInp0wGr2l4FDayWjkZLqvB+nNXUQ63NdHlSs4\nWB2Z1kQXZxVaI2tPYexGUKXEo2uFob63uflbuE029ovDXIIPFTPtGNdNXwhHT5a+\nPhmy3sMc+s2BSNM5qaNmfxQxhdd6gRU6oikE+c0PAoGAMn3cKNFqIt27hkFLUgIL\nGKIuf1iYy9/PNWNmEUaVj88PpopRtkTu0nwMpROzmH/uNFriKTvKHjMvnItBO4wV\nkHW+VadvrFL0Rrqituf9d7z8/1zXBNo+juePVe3qc7oiM2NVA4Tv4YAixtM5wkQl\nCgQ15nlqsGYYTg9BJ1e/CxECgYEAjEYPzO2reuUrjr0p8F59ev1YJ0YmTJRMk0ks\nC/yIdGo/tGzbiU3JB0LfHPcN8Xu07GPGOpfYM7U5gXDbaG6qNgfCaHAQVdr/mQPi\nJQ1kCQtay8QCkscWk9iZM1//lP7LwDtxraXqSCwbZSYP9VlUNZeg8EuQqNU2EUL6\nqzWexmcCgYEA0prUGNBacraTYEknB1CsbP36UPWsqFWOvevlz+uEC5JPxPuW5ZHh\nSQN7xl6+PHyjPBM7ttwPKyhgLOVTb3K7ex/PXnudojMUK5fh7vYfChVTSlx2p6r0\nDi58PdD+node08cJH+ie0Yphp7m+D4+R9XD0v0nEvnu4BtAW6DrJasw=\n-----END RSA PRIVATE KEY-----\n"
     private var backgroundTaskID: UIBackgroundTaskIdentifier = UIBackgroundTaskIdentifier.invalid
     private var currentVersionNative: Version = "0.0.0"
     private var autoUpdate = false
     private var appReadyTimeout = 10000
     private var appReadyCheck: DispatchWorkItem?
     private var resetWhenUpdate = true
+    private var directUpdate = false
     private var autoDeleteFailed = false
     private var autoDeletePrevious = false
+    private var keepUrlPathAfterReload = false
     private var backgroundWork: DispatchWorkItem?
     private var taskRunning = false
+    private var periodCheckDelay = 0
+    let semaphoreReady = DispatchSemaphore(value: 0)
 
     override public func load() {
-        print("\(self.implementation.TAG) init for device \(self.implementation.deviceID)")
+        #if targetEnvironment(simulator)
+        print("\(CapacitorUpdater.TAG) ::::: SIMULATOR :::::")
+        print("\(CapacitorUpdater.TAG) Application directory: \(NSHomeDirectory())")
+        #endif
+
+        self.semaphoreUp()
+        self.implementation.deviceID = (UserDefaults.standard.string(forKey: "appUUID") ?? UUID().uuidString).lowercased()
+        UserDefaults.standard.set( self.implementation.deviceID, forKey: "appUUID")
+        UserDefaults.standard.synchronize()
+        print("\(CapacitorUpdater.TAG) init for device \(self.implementation.deviceID)")
+        guard let versionName = getConfig().getString("version", Bundle.main.versionName) else {
+            print("\(CapacitorUpdater.TAG) Cannot get version name")
+            // crash the app
+            fatalError("Cannot get version name")
+        }
         do {
-            currentVersionNative = try Version(getConfig().getString("version", Bundle.main.versionName ?? "0.0.0")!)
+            currentVersionNative = try Version(versionName)
         } catch {
-            print("\(self.implementation.TAG) Cannot get version native \(currentVersionNative)")
+            print("\(CapacitorUpdater.TAG) Cannot parse versionName \(versionName)")
         }
-        print("\(self.implementation.TAG) version native \(self.currentVersionNative.description)")
-        implementation.versionName = getConfig().getString("version", Bundle.main.versionName)!
+        print("\(CapacitorUpdater.TAG) version native \(self.currentVersionNative.description)")
+        implementation.versionBuild = getConfig().getString("version", Bundle.main.versionName)!
         autoDeleteFailed = getConfig().getBoolean("autoDeleteFailed", true)
         autoDeletePrevious = getConfig().getBoolean("autoDeletePrevious", true)
+        keepUrlPathAfterReload = getConfig().getBoolean("keepUrlPathAfterReload", false)
+        directUpdate = getConfig().getBoolean("directUpdate", false)
         updateUrl = getConfig().getString("updateUrl", CapacitorUpdaterPlugin.updateUrlDefault)!
         autoUpdate = getConfig().getBoolean("autoUpdate", true)
         appReadyTimeout = getConfig().getInt("appReadyTimeout", 10000)
+        implementation.timeout = Double(getConfig().getInt("responseTimeout", 20))
         resetWhenUpdate = getConfig().getBoolean("resetWhenUpdate", true)
+        let periodCheckDelayValue = getConfig().getInt("periodCheckDelay", 0)
+        if periodCheckDelayValue >= 0 && periodCheckDelayValue > 600 {
+            periodCheckDelay = 600
+        } else {
+            periodCheckDelay = periodCheckDelayValue
+        }
 
-        implementation.privateKey = getConfig().getString("privateKey", self.defaultPrivateKey)!
-        implementation.notifyDownload = notifyDownload
+        implementation.publicKey = getConfig().getString("publicKey", "")!
+        implementation.notifyDownloadRaw = notifyDownload
         implementation.PLUGIN_VERSION = self.PLUGIN_VERSION
         let config = (self.bridge?.viewController as? CAPBridgeViewController)?.instanceDescriptor().legacyConfig
-        if config?["appId"] != nil {
-            implementation.appId = config?["appId"] as! String
+        implementation.appId = Bundle.main.infoDictionary?["CFBundleIdentifier"] as? String ?? ""
+        implementation.appId = config?["appId"] as? String ?? implementation.appId
+        implementation.appId = getConfig().getString("appId", implementation.appId)!
+        if implementation.appId == "" {
+            fatalError("appId is missing in capacitor.config.json or plugin config, and cannot be retrieved from the native app, please add it globally or in the plugin config")
         }
+        print("\(CapacitorUpdater.TAG) appId \(implementation.appId)")
         implementation.statsUrl = getConfig().getString("statsUrl", CapacitorUpdaterPlugin.statsUrlDefault)!
         implementation.channelUrl = getConfig().getString("channelUrl", CapacitorUpdaterPlugin.channelUrlDefault)!
+        implementation.defaultChannel = getConfig().getString("defaultChannel", "")!
+        self.implementation.autoReset()
+
         if resetWhenUpdate {
             self.cleanupObsoleteVersions()
         }
+
+        // Load the server
+        // This is very much swift specific, android does not do that
+        // In android we depend on the serverBasePath capacitor property
+        // In IOS we do not. Instead during the plugin initialization we try to call setServerBasePath
+        // The idea is to prevent having to store the bundle in 2 locations for hot reload and persisten storage
+        // According to martin it is not possible to use serverBasePath on ios in a way that allows us to store the bundle once
+
+        if !self.initialLoad() {
+            print("\(CapacitorUpdater.TAG) unable to force reload, the plugin might fallback to the builtin version")
+        }
+
         let nc = NotificationCenter.default
         nc.addObserver(self, selector: #selector(appMovedToBackground), name: UIApplication.didEnterBackgroundNotification, object: nil)
         nc.addObserver(self, selector: #selector(appMovedToForeground), name: UIApplication.willEnterForegroundNotification, object: nil)
         nc.addObserver(self, selector: #selector(appKilled), name: UIApplication.willTerminateNotification, object: nil)
         self.appMovedToForeground()
+        self.checkForUpdateAfterDelay()
+    }
+
+    private func initialLoad() -> Bool {
+        guard let bridge = self.bridge else { return false }
+
+        let id = self.implementation.getCurrentBundleId()
+        var dest: URL
+        if BundleInfo.ID_BUILTIN == id {
+            dest = Bundle.main.resourceURL!.appendingPathComponent("public")
+        } else {
+            dest = self.implementation.getBundleDirectory(id: id)
+        }
+
+        if !FileManager.default.fileExists(atPath: dest.path) {
+            print("\(CapacitorUpdater.TAG) Initial load fail - file at path \(dest.path) doesn't exist. Defaulting to buildin!! \(id)")
+            dest = Bundle.main.resourceURL!.appendingPathComponent("public")
+        }
+
+        print("\(CapacitorUpdater.TAG) Initial load \(id)")
+        // We don't use the viewcontroller here as it does not work during the initial load state
+        bridge.setServerBasePath(dest.path)
+        return true
+    }
+
+    private func semaphoreWait(waitTime: Int) {
+        print("\(CapacitorUpdater.TAG) semaphoreWait \(waitTime)")
+        _ = semaphoreReady.wait(timeout: .now() + .milliseconds(waitTime))
+    }
+
+    private func semaphoreUp() {
+        DispatchQueue.global().async {
+            self.semaphoreWait(waitTime: 0)
+        }
+    }
+
+    private func semaphoreDown() {
+        semaphoreReady.signal()
     }
 
     private func cleanupObsoleteVersions() {
@@ -74,16 +187,16 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         do {
             LatestVersionNative = try Version(UserDefaults.standard.string(forKey: "LatestVersionNative") ?? "0.0.0")
         } catch {
-            print("\(self.implementation.TAG) Cannot get version native \(currentVersionNative)")
+            print("\(CapacitorUpdater.TAG) Cannot get version native \(currentVersionNative)")
         }
         if LatestVersionNative != "0.0.0" && self.currentVersionNative.description != LatestVersionNative.description {
             _ = self._reset(toLastSuccessful: false)
             let res = implementation.list()
             res.forEach { version in
-                print("\(self.implementation.TAG) Deleting obsolete bundle: \(version)")
+                print("\(CapacitorUpdater.TAG) Deleting obsolete bundle: \(version.getId())")
                 let res = implementation.delete(id: version.getId())
                 if !res {
-                    print("\(self.implementation.TAG) Delete failed, id \(version.getId()) doesn't exist")
+                    print("\(CapacitorUpdater.TAG) Delete failed, id \(version.getId()) doesn't exist")
                 }
             }
         }
@@ -91,17 +204,66 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         UserDefaults.standard.synchronize()
     }
 
-    @objc func notifyDownload(id: String, percent: Int) {
+    @objc func notifyDownload(id: String, percent: Int, ignoreMultipleOfTen: Bool = false) {
         let bundle = self.implementation.getBundleInfo(id: id)
         self.notifyListeners("download", data: ["percent": percent, "bundle": bundle.toJSON()])
         if percent == 100 {
             self.notifyListeners("downloadComplete", data: ["bundle": bundle.toJSON()])
             self.implementation.sendStats(action: "download_complete", versionName: bundle.getVersionName())
-        } else if percent.isMultiple(of: 10) {
+        } else if percent.isMultiple(of: 10) || ignoreMultipleOfTen {
             self.implementation.sendStats(action: "download_\(percent)", versionName: bundle.getVersionName())
         }
     }
 
+    @objc func setUpdateUrl(_ call: CAPPluginCall) {
+        if !getConfig().getBoolean("allowModifyUrl", false) {
+            print("\(CapacitorUpdater.TAG) setUpdateUrl called without allowModifyUrl")
+            call.reject("setUpdateUrl called without allowModifyUrl set allowModifyUrl in your config to true to allow it")
+            return
+        }
+        guard let url = call.getString("url") else {
+            print("\(CapacitorUpdater.TAG) setUpdateUrl called without url")
+            call.reject("setUpdateUrl called without url")
+            return
+        }
+        self.updateUrl = url
+        call.resolve()
+    }
+
+    @objc func setStatsUrl(_ call: CAPPluginCall) {
+        if !getConfig().getBoolean("allowModifyUrl", false) {
+            print("\(CapacitorUpdater.TAG) setStatsUrl called without allowModifyUrl")
+            call.reject("setStatsUrl called without allowModifyUrl set allowModifyUrl in your config to true to allow it")
+            return
+        }
+        guard let url = call.getString("url") else {
+            print("\(CapacitorUpdater.TAG) setStatsUrl called without url")
+            call.reject("setStatsUrl called without url")
+            return
+        }
+        self.statsUrl = url
+        call.resolve()
+    }
+
+    @objc func setChannelUrl(_ call: CAPPluginCall) {
+        if !getConfig().getBoolean("allowModifyUrl", false) {
+            print("\(CapacitorUpdater.TAG) setChannelUrl called without allowModifyUrl")
+            call.reject("setChannelUrl called without allowModifyUrl set allowModifyUrl in your config to true to allow it")
+            return
+        }
+        guard let url = call.getString("url") else {
+            print("\(CapacitorUpdater.TAG) setChannelUrl called without url")
+            call.reject("setChannelUrl called without url")
+            return
+        }
+        self.implementation.channelUrl = url
+        call.resolve()
+    }
+
+    @objc func getBuiltinVersion(_ call: CAPPluginCall) {
+        call.resolve(["version": implementation.versionBuild])
+    }
+
     @objc func getDeviceId(_ call: CAPPluginCall) {
         call.resolve(["deviceId": implementation.deviceID])
     }
@@ -112,51 +274,82 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
 
     @objc func download(_ call: CAPPluginCall) {
         guard let urlString = call.getString("url") else {
-            print("\(self.implementation.TAG) Download called without url")
+            print("\(CapacitorUpdater.TAG) Download called without url")
             call.reject("Download called without url")
             return
         }
         guard let version = call.getString("version") else {
-            print("\(self.implementation.TAG) Download called without version")
+            print("\(CapacitorUpdater.TAG) Download called without version")
             call.reject("Download called without version")
             return
         }
+
         let sessionKey = call.getString("sessionKey", "")
-        let checksum = call.getString("checksum", "")
+        var checksum = call.getString("checksum", "")
         let url = URL(string: urlString)
-        print("\(self.implementation.TAG) Downloading \(String(describing: url))")
+        print("\(CapacitorUpdater.TAG) Downloading \(String(describing: url))")
         DispatchQueue.global(qos: .background).async {
             do {
                 let next = try self.implementation.download(url: url!, version: version, sessionKey: sessionKey)
-                if checksum != "" && next.getChecksum() != checksum {
-                    print("\(self.implementation.TAG) Error checksum", next.getChecksum(), checksum)
+                checksum = try self.implementation.decryptChecksum(checksum: checksum, version: version)
+                if (checksum != "" || self.implementation.publicKey != "") && next.getChecksum() != checksum {
+                    print("\(CapacitorUpdater.TAG) Error checksum", next.getChecksum(), checksum)
                     self.implementation.sendStats(action: "checksum_fail", versionName: next.getVersionName())
                     let id = next.getId()
                     let resDel = self.implementation.delete(id: id)
                     if !resDel {
-                        print("\(self.implementation.TAG) Delete failed, id \(id) doesn't exist")
+                        print("\(CapacitorUpdater.TAG) Delete failed, id \(id) doesn't exist")
                     }
                     throw ObjectSavableError.checksum
+                } else {
+                    print("\(CapacitorUpdater.TAG) Good checksum", next.getChecksum(), checksum)
                 }
                 self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
                 call.resolve(next.toJSON())
             } catch {
-                print("\(self.implementation.TAG) Failed to download from: \(String(describing: url)) \(error.localizedDescription)")
+                print("\(CapacitorUpdater.TAG) Failed to download from: \(String(describing: url)) \(error.localizedDescription)")
                 self.notifyListeners("downloadFailed", data: ["version": version])
-                let current: BundleInfo = self.implementation.getCurrentBundle()
-                self.implementation.sendStats(action: "download_fail", versionName: current.getVersionName())
+                self.implementation.sendStats(action: "download_fail")
                 call.reject("Failed to download from: \(url!)", error.localizedDescription)
             }
         }
     }
 
-    private func _reload() -> Bool {
+    public func _reload() -> Bool {
         guard let bridge = self.bridge else { return false }
+        self.semaphoreUp()
         let id = self.implementation.getCurrentBundleId()
-        let destHot = self.implementation.getPathHot(id: id)
-        print("\(self.implementation.TAG) Reloading \(id)")
+        let dest: URL
+        if BundleInfo.ID_BUILTIN == id {
+            dest = Bundle.main.resourceURL!.appendingPathComponent("public")
+        } else {
+            dest = self.implementation.getBundleDirectory(id: id)
+        }
+        print("\(CapacitorUpdater.TAG) Reloading \(id)")
         if let vc = bridge.viewController as? CAPBridgeViewController {
-            vc.setServerBasePath(path: destHot.path)
+            guard let capBridge = vc.bridge else {
+                print("\(CapacitorUpdater.TAG) Cannot get capBridge")
+                return false
+            }
+            if keepUrlPathAfterReload {
+                DispatchQueue.main.async {
+                    guard let url = vc.webView?.url else {
+                        print("\(CapacitorUpdater.TAG) vc.webView?.url is null?")
+                        return
+                    }
+                    capBridge.setServerBasePath(dest.path)
+                    var urlComponents = URLComponents(url: capBridge.config.serverURL, resolvingAgainstBaseURL: false)!
+                    urlComponents.path = url.path
+                    if let finalUrl = urlComponents.url {
+                        _ = vc.webView?.load(URLRequest(url: finalUrl))
+                        vc.webView?.backForwardList.perform(Selector(("_removeAllItems")))
+                    }
+                }
+            } else {
+                vc.setServerBasePath(path: dest.path)
+
+            }
+
             self.checkAppReady()
             self.notifyListeners("appReloaded", data: [:])
             return true
@@ -168,20 +361,20 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         if self._reload() {
             call.resolve()
         } else {
-            print("\(self.implementation.TAG) Reload failed")
+            print("\(CapacitorUpdater.TAG) Reload failed")
             call.reject("Reload failed")
         }
     }
 
     @objc func next(_ call: CAPPluginCall) {
         guard let id = call.getString("id") else {
-            print("\(self.implementation.TAG) Next called without id")
+            print("\(CapacitorUpdater.TAG) Next called without id")
             call.reject("Next called without id")
             return
         }
-        print("\(self.implementation.TAG) Setting next active id \(id)")
+        print("\(CapacitorUpdater.TAG) Setting next active id \(id)")
         if !self.implementation.setNextBundle(next: id) {
-            print("\(self.implementation.TAG) Set next version failed. id \(id) does not exist.")
+            print("\(CapacitorUpdater.TAG) Set next version failed. id \(id) does not exist.")
             call.reject("Set next version failed. id \(id) does not exist.")
         } else {
             call.resolve(self.implementation.getBundleInfo(id: id).toJSON())
@@ -190,14 +383,14 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
 
     @objc func set(_ call: CAPPluginCall) {
         guard let id = call.getString("id") else {
-            print("\(self.implementation.TAG) Set called without id")
+            print("\(CapacitorUpdater.TAG) Set called without id")
             call.reject("Set called without id")
             return
         }
         let res = implementation.set(id: id)
-        print("\(self.implementation.TAG) Set active bundle: \(id)")
+        print("\(CapacitorUpdater.TAG) Set active bundle: \(id)")
         if !res {
-            print("\(self.implementation.TAG) Bundle successfully set to: \(id) ")
+            print("\(CapacitorUpdater.TAG) Bundle successfully set to: \(id) ")
             call.reject("Update failed, id \(id) doesn't exist")
         } else {
             self.reload(call)
@@ -206,7 +399,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
 
     @objc func delete(_ call: CAPPluginCall) {
         guard let id = call.getString("id") else {
-            print("\(self.implementation.TAG) Delete called without version")
+            print("\(CapacitorUpdater.TAG) Delete called without version")
             call.reject("Delete called without id")
             return
         }
@@ -214,13 +407,14 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         if res {
             call.resolve()
         } else {
-            print("\(self.implementation.TAG) Delete failed, id \(id) doesn't exist")
-            call.reject("Delete failed, id \(id) doesn't exist")
+            print("\(CapacitorUpdater.TAG) Delete failed, id \(id) doesn't exist or it cannot be deleted (perhaps it is the 'next' bundle)")
+            call.reject("Delete failed, id \(id) does not exist or it cannot be deleted (perhaps it is the 'next' bundle)")
         }
     }
 
     @objc func list(_ call: CAPPluginCall) {
-        let res = implementation.list()
+        let raw = call.getBool("raw", false)
+        let res = implementation.list(raw: raw)
         var resArr: [[String: String]] = []
         for v in res {
             resArr.append(v.toJSON())
@@ -231,27 +425,51 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
 
     @objc func getLatest(_ call: CAPPluginCall) {
+        let channel = call.getString("channel")
         DispatchQueue.global(qos: .background).async {
-            let res = self.implementation.getLatest(url: URL(string: self.updateUrl)!)
+            let res = self.implementation.getLatest(url: URL(string: self.updateUrl)!, channel: channel)
             if res.error != nil {
                 call.reject( res.error!)
+            } else if res.message != nil {
+                call.reject( res.message!)
             } else {
                 call.resolve(res.toDict())
             }
         }
     }
 
+    @objc func unsetChannel(_ call: CAPPluginCall) {
+        let triggerAutoUpdate = call.getBool("triggerAutoUpdate", false)
+        DispatchQueue.global(qos: .background).async {
+            let res = self.implementation.unsetChannel()
+            if res.error != "" {
+                call.reject(res.error)
+            } else {
+                if self._isAutoUpdateEnabled() && triggerAutoUpdate {
+                    print("\(CapacitorUpdater.TAG) Calling autoupdater after channel change!")
+                    self.backgroundDownload()
+                }
+                call.resolve(res.toDict())
+            }
+        }
+    }
+
     @objc func setChannel(_ call: CAPPluginCall) {
         guard let channel = call.getString("channel") else {
-            print("\(self.implementation.TAG) setChannel called without channel")
+            print("\(CapacitorUpdater.TAG) setChannel called without channel")
             call.reject("setChannel called without channel")
             return
         }
+        let triggerAutoUpdate = call.getBool("triggerAutoUpdate") ?? false
         DispatchQueue.global(qos: .background).async {
             let res = self.implementation.setChannel(channel: channel)
             if res.error != "" {
                 call.reject(res.error)
             } else {
+                if self._isAutoUpdateEnabled() && triggerAutoUpdate {
+                    print("\(CapacitorUpdater.TAG) Calling autoupdater after channel change!")
+                    self.backgroundDownload()
+                }
                 call.resolve(res.toDict())
             }
         }
@@ -269,7 +487,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
     @objc func setCustomId(_ call: CAPPluginCall) {
         guard let customId = call.getString("customId") else {
-            print("\(self.implementation.TAG) setCustomId called without customId")
+            print("\(CapacitorUpdater.TAG) setCustomId called without customId")
             call.reject("setCustomId called without customId")
             return
         }
@@ -285,11 +503,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             // If developer wants to reset to the last successful bundle, and that bundle is not
             // the built-in bundle, set it as the bundle to use and reload.
             if toLastSuccessful && !fallback.isBuiltin() {
-                print("\(self.implementation.TAG) Resetting to: \(fallback.toString())")
+                print("\(CapacitorUpdater.TAG) Resetting to: \(fallback.toString())")
                 return self.implementation.set(bundle: fallback) && self._reload()
             }
 
-            print("\(self.implementation.TAG) Resetting to builtin version")
+            print("\(CapacitorUpdater.TAG) Resetting to builtin version")
 
             // Otherwise, reset back to the built-in bundle and reload.
             self.implementation.reset()
@@ -304,8 +522,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         if self._reset(toLastSuccessful: toLastSuccessful) {
             call.resolve()
         } else {
-            print("\(self.implementation.TAG) Reset failed")
-            call.reject("\(self.implementation.TAG) Reset failed")
+            print("\(CapacitorUpdater.TAG) Reset failed")
+            call.reject("\(CapacitorUpdater.TAG) Reset failed")
         }
     }
 
@@ -318,15 +536,16 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
 
     @objc func notifyAppReady(_ call: CAPPluginCall) {
-        let version = self.implementation.getCurrentBundle()
-        self.implementation.setSuccess(bundle: version, autoDeletePrevious: self.autoDeletePrevious)
-        print("\(self.implementation.TAG) Current bundle loaded successfully. ['notifyAppReady()' was called] \(version.toString())")
-        call.resolve()
+        self.semaphoreDown()
+        let bundle = self.implementation.getCurrentBundle()
+        self.implementation.setSuccess(bundle: bundle, autoDeletePrevious: self.autoDeletePrevious)
+        print("\(CapacitorUpdater.TAG) Current bundle loaded successfully. ['notifyAppReady()' was called] \(bundle.toString())")
+        call.resolve(["bundle": bundle.toJSON()])
     }
 
     @objc func setMultiDelay(_ call: CAPPluginCall) {
         guard let delayConditionList = call.getValue("delayConditions") else {
-            print("\(self.implementation.TAG) setMultiDelay called without delayCondition")
+            print("\(CapacitorUpdater.TAG) setMultiDelay called without delayCondition")
             call.reject("setMultiDelay called without delayCondition")
             return
         }
@@ -342,16 +561,16 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         if delayConditions != nil && "" != delayConditions {
             UserDefaults.standard.set(delayConditions, forKey: DELAY_CONDITION_PREFERENCES)
             UserDefaults.standard.synchronize()
-            print("\(self.implementation.TAG) Delay update saved.")
+            print("\(CapacitorUpdater.TAG) Delay update saved.")
             return true
         } else {
-            print("\(self.implementation.TAG) Failed to delay update, [Error calling '_setMultiDelay()']")
+            print("\(CapacitorUpdater.TAG) Failed to delay update, [Error calling '_setMultiDelay()']")
             return false
         }
     }
 
     private func _cancelDelay(source: String) {
-        print("\(self.implementation.TAG) delay Canceled from \(source)")
+        print("\(CapacitorUpdater.TAG) delay Canceled from \(source)")
         UserDefaults.standard.removeObject(forKey: DELAY_CONDITION_PREFERENCES)
         UserDefaults.standard.synchronize()
     }
@@ -377,14 +596,12 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                     if !killed {
                         self._cancelDelay(source: "background check")
                     }
-                    break
                 case "kill":
                     if killed {
                         self._cancelDelay(source: "kill check")
                         // instant install for kill action
                         self.installNext()
                     }
-                    break
                 case "date":
                     if value != nil && value != "" {
                         let dateFormatter = ISO8601DateFormatter()
@@ -399,7 +616,6 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                     } else {
                         self._cancelDelay(source: "delayVal absent")
                     }
-                    break
                 case "nativeVersion":
                     if value != nil && value != "" {
                         do {
@@ -413,11 +629,10 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                     } else {
                         self._cancelDelay(source: "delayVal absent")
                     }
-                    break
                 case .none:
-                    print("\(self.implementation.TAG) _checkCancelDelay switch case none error")
+                    print("\(CapacitorUpdater.TAG) _checkCancelDelay switch case none error")
                 case .some:
-                    print("\(self.implementation.TAG) _checkCancelDelay switch case some error")
+                    print("\(CapacitorUpdater.TAG) _checkCancelDelay switch case some error")
                 }
             }
         }
@@ -427,7 +642,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     private func _isAutoUpdateEnabled() -> Bool {
         let instanceDescriptor = (self.bridge?.viewController as? CAPBridgeViewController)?.instanceDescriptor()
         if instanceDescriptor?.serverURL != nil {
-            print("⚠️ \(self.implementation.TAG) AutoUpdate is automatic disabled when serverUrl is set.")
+            print("⚠️ \(CapacitorUpdater.TAG) AutoUpdate is automatic disabled when serverUrl is set.")
         }
         return self.autoUpdate && self.updateUrl != "" && instanceDescriptor?.serverURL == nil
     }
@@ -438,12 +653,20 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         ])
     }
 
+    @objc func isAutoUpdateAvailable(_ call: CAPPluginCall) {
+        let instanceDescriptor = (self.bridge?.viewController as? CAPBridgeViewController)?.instanceDescriptor()
+        let isAvailable = instanceDescriptor?.serverURL == nil
+        call.resolve([
+            "available": isAvailable
+        ])
+    }
+
     func checkAppReady() {
         self.appReadyCheck?.cancel()
         self.appReadyCheck = DispatchWorkItem(block: {
             self.DeferredNotifyAppReadyCheck()
         })
-        print("\(self.implementation.TAG) Wait for \(self.appReadyTimeout) ms, then check for notifyAppReady")
+        print("\(CapacitorUpdater.TAG) Wait for \(self.appReadyTimeout) ms, then check for notifyAppReady")
         DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(self.appReadyTimeout), execute: self.appReadyCheck!)
     }
 
@@ -451,15 +674,15 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         // Automatically roll back to fallback version if notifyAppReady has not been called yet
         let current: BundleInfo = self.implementation.getCurrentBundle()
         if current.isBuiltin() {
-            print("\(self.implementation.TAG) Built-in bundle is active. Nothing to do.")
+            print("\(CapacitorUpdater.TAG) Built-in bundle is active. We skip the check for notifyAppReady.")
             return
         }
 
-        print("\(self.implementation.TAG) Current bundle is: \(current.toString())")
+        print("\(CapacitorUpdater.TAG) Current bundle is: \(current.toString())")
 
         if BundleStatus.SUCCESS.localizedString != current.getStatus() {
-            print("\(self.implementation.TAG) notifyAppReady was not called, roll back current bundle: \(current.toString())")
-            print("\(self.implementation.TAG) Did you forget to call 'notifyAppReady()' in your Capacitor App code?")
+            print("\(CapacitorUpdater.TAG) notifyAppReady was not called, roll back current bundle: \(current.toString())")
+            print("\(CapacitorUpdater.TAG) Did you forget to call 'notifyAppReady()' in your Capacitor App code?")
             self.notifyListeners("updateFailed", data: [
                 "bundle": current.toJSON()
             ])
@@ -467,16 +690,16 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             self.implementation.setError(bundle: current)
             _ = self._reset(toLastSuccessful: true)
             if self.autoDeleteFailed && !current.isBuiltin() {
-                print("\(self.implementation.TAG) Deleting failing bundle: \(current.toString())")
+                print("\(CapacitorUpdater.TAG) Deleting failing bundle: \(current.toString())")
                 let res = self.implementation.delete(id: current.getId(), removeInfo: false)
                 if !res {
-                    print("\(self.implementation.TAG) Delete version deleted: \(current.toString())")
+                    print("\(CapacitorUpdater.TAG) Delete version deleted: \(current.toString())")
                 } else {
-                    print("\(self.implementation.TAG) Failed to delete failed bundle: \(current.toString())")
+                    print("\(CapacitorUpdater.TAG) Failed to delete failed bundle: \(current.toString())")
                 }
             }
         } else {
-            print("\(self.implementation.TAG) notifyAppReady was called. This is fine: \(current.toString())")
+            print("\(CapacitorUpdater.TAG) notifyAppReady was called. This is fine: \(current.toString())")
         }
     }
 
@@ -490,94 +713,137 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         self.backgroundTaskID = UIBackgroundTaskIdentifier.invalid
     }
 
+    func sendReadyToJs(current: BundleInfo, msg: String) {
+        print("\(CapacitorUpdater.TAG) sendReadyToJs")
+        DispatchQueue.global().async {
+            self.semaphoreWait(waitTime: self.appReadyTimeout)
+            self.notifyListeners("appReady", data: ["bundle": current.toJSON(), "status": msg])
+        }
+    }
+
+    func endBackGroundTaskWithNotif(msg: String, latestVersionName: String, current: BundleInfo, error: Bool = true) {
+        if error {
+            self.implementation.sendStats(action: "download_fail", versionName: current.getVersionName())
+            self.notifyListeners("downloadFailed", data: ["version": latestVersionName])
+        }
+        self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
+        self.sendReadyToJs(current: current, msg: msg)
+        print("\(CapacitorUpdater.TAG) endBackGroundTaskWithNotif \(msg) current: \(current.getVersionName()) latestVersionName: \(latestVersionName)")
+        self.endBackGroundTask()
+    }
+
     func backgroundDownload() {
+        let messageUpdate = self.directUpdate ? "Update will occur now." : "Update will occur next time app moves to background."
+        guard let url = URL(string: self.updateUrl) else {
+            print("\(CapacitorUpdater.TAG) Error no url or wrong format")
+            return
+        }
         DispatchQueue.global(qos: .background).async {
             self.backgroundTaskID = UIApplication.shared.beginBackgroundTask(withName: "Finish Download Tasks") {
                 // End the task if time expires.
                 self.endBackGroundTask()
             }
-            print("\(self.implementation.TAG) Check for update via \(self.updateUrl)")
-            let url = URL(string: self.updateUrl)!
-            let res = self.implementation.getLatest(url: url)
+            print("\(CapacitorUpdater.TAG) Check for update via \(self.updateUrl)")
+            let res = self.implementation.getLatest(url: url, channel: nil)
             let current = self.implementation.getCurrentBundle()
 
             if (res.message) != nil {
-                print("\(self.implementation.TAG) message \(res.message ?? "")")
+                print("\(CapacitorUpdater.TAG) API message: \(res.message ?? "")")
                 if res.major == true {
                     self.notifyListeners("majorAvailable", data: ["version": res.version])
                 }
-                self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
-                self.endBackGroundTask()
+                self.endBackGroundTaskWithNotif(msg: res.message ?? "", latestVersionName: res.version, current: current, error: true)
+                return
+            }
+            if res.version == "builtin" {
+                print("\(CapacitorUpdater.TAG) Latest version is builtin")
+                if self.directUpdate {
+                    print("\(CapacitorUpdater.TAG) Direct update to builtin version")
+                    _ = self._reset(toLastSuccessful: false)
+                    self.endBackGroundTaskWithNotif(msg: "Updated to builtin version", latestVersionName: res.version, current: self.implementation.getCurrentBundle(), error: false)
+                } else {
+                    print("\(CapacitorUpdater.TAG) Setting next bundle to builtin")
+                    _ = self.implementation.setNextBundle(next: BundleInfo.ID_BUILTIN)
+                    self.endBackGroundTaskWithNotif(msg: "Next update will be to builtin version", latestVersionName: res.version, current: current, error: false)
+                }
                 return
             }
             let sessionKey = res.sessionKey ?? ""
             guard let downloadUrl = URL(string: res.url) else {
-                print("\(self.implementation.TAG) Error no url or wrong format")
-                self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
-                self.endBackGroundTask()
+                print("\(CapacitorUpdater.TAG) Error no url or wrong format")
+                self.endBackGroundTaskWithNotif(msg: "Error no url or wrong format", latestVersionName: res.version, current: current)
                 return
             }
             let latestVersionName = res.version
             if latestVersionName != "" && current.getVersionName() != latestVersionName {
-                let latest = self.implementation.getBundleInfoByVersionName(version: latestVersionName)
-                if latest != nil {
-                    if latest!.isErrorStatus() {
-                        print("\(self.implementation.TAG) Latest version already exists, and is in error state. Aborting update.")
-                        self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
-                        self.endBackGroundTask()
-                        return
+                do {
+                    print("\(CapacitorUpdater.TAG) New bundle: \(latestVersionName) found. Current is: \(current.getVersionName()). \(messageUpdate)")
+                    var nextImpl = self.implementation.getBundleInfoByVersionName(version: latestVersionName)
+                    if nextImpl == nil || nextImpl?.isDeleted() == true {
+                        if nextImpl?.isDeleted() == true {
+                            print("\(CapacitorUpdater.TAG) Latest bundle already exists and will be deleted, download will overwrite it.")
+                            let res = self.implementation.delete(id: nextImpl!.getId(), removeInfo: true)
+                            if res {
+                                print("\(CapacitorUpdater.TAG) Failed bundle deleted: \(nextImpl!.toString())")
+                            } else {
+                                print("\(CapacitorUpdater.TAG) Failed to delete failed bundle: \(nextImpl!.toString())")
+                            }
+                        }
+                        if res.manifest != nil {
+                            nextImpl = try self.implementation.downloadManifest(manifest: res.manifest!, version: latestVersionName, sessionKey: sessionKey)
+                        } else {
+                            nextImpl = try self.implementation.download(url: downloadUrl, version: latestVersionName, sessionKey: sessionKey)
+                        }
                     }
-                    if latest!.isDownloaded() {
-                        print("\(self.implementation.TAG) Latest version already exists and download is NOT required. Update will occur next time app moves to background.")
-                        self.notifyListeners("updateAvailable", data: ["bundle": current.toJSON()])
-                        _ = self.implementation.setNextBundle(next: latest!.getId())
-                        self.endBackGroundTask()
+                    guard let next = nextImpl else {
+                        print("\(CapacitorUpdater.TAG) Error downloading file")
+                        self.endBackGroundTaskWithNotif(msg: "Error downloading file", latestVersionName: latestVersionName, current: current)
                         return
                     }
-                    if latest!.isDeleted() {
-                        print("\(self.implementation.TAG) Latest bundle already exists and will be deleted, download will overwrite it.")
-                        let res = self.implementation.delete(id: latest!.getId(), removeInfo: true)
-                        if !res {
-                            print("\(self.implementation.TAG) Delete version deleted: \(latest!.toString())")
-                        } else {
-                            print("\(self.implementation.TAG) Failed to delete failed bundle: \(latest!.toString())")
-                        }
+                    if next.isErrorStatus() {
+                        print("\(CapacitorUpdater.TAG) Latest bundle already exists and is in error state. Aborting update.")
+                        self.endBackGroundTaskWithNotif(msg: "Latest version is in error state. Aborting update.", latestVersionName: latestVersionName, current: current)
+                        return
                     }
-                }
-
-                do {
-                    print("\(self.implementation.TAG) New bundle: \(latestVersionName) found. Current is: \(current.getVersionName()). Update will occur next time app moves to background.")
-                    let next = try self.implementation.download(url: downloadUrl, version: latestVersionName, sessionKey: sessionKey)
-                    if res.checksum != "" && next.getChecksum() != res.checksum {
-                        print("\(self.implementation.TAG) Error checksum", next.getChecksum(), res.checksum)
+                    res.checksum = try self.implementation.decryptChecksum(checksum: res.checksum, version: latestVersionName)
+                    if res.checksum != "" && next.getChecksum() != res.checksum && res.manifest == nil {
+                        print("\(CapacitorUpdater.TAG) Error checksum", next.getChecksum(), res.checksum)
                         self.implementation.sendStats(action: "checksum_fail", versionName: next.getVersionName())
                         let id = next.getId()
                         let resDel = self.implementation.delete(id: id)
                         if !resDel {
-                            print("\(self.implementation.TAG) Delete failed, id \(id) doesn't exist")
+                            print("\(CapacitorUpdater.TAG) Delete failed, id \(id) doesn't exist")
                         }
-                        self.endBackGroundTask()
-                        throw ObjectSavableError.checksum
+                        self.endBackGroundTaskWithNotif(msg: "Error checksum", latestVersionName: latestVersionName, current: current)
+                        return
+                    }
+                    if self.directUpdate {
+                        _ = self.implementation.set(bundle: next)
+                        _ = self._reload()
+                        self.directUpdate = false
+                        self.endBackGroundTaskWithNotif(msg: "update installed", latestVersionName: latestVersionName, current: current, error: false)
+                    } else {
+                        self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
+                        _ = self.implementation.setNextBundle(next: next.getId())
+                        self.endBackGroundTaskWithNotif(msg: "update downloaded, will install next background", latestVersionName: latestVersionName, current: current, error: false)
                     }
-                    self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
-                    _ = self.implementation.setNextBundle(next: next.getId())
+                    return
                 } catch {
-                    print("\(self.implementation.TAG) Error downloading file", error.localizedDescription)
+                    print("\(CapacitorUpdater.TAG) Error downloading file", error.localizedDescription)
                     let current: BundleInfo = self.implementation.getCurrentBundle()
-                    self.implementation.sendStats(action: "download_fail", versionName: current.getVersionName())
-                    self.notifyListeners("downloadFailed", data: ["version": latestVersionName])
-                    self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
+                    self.endBackGroundTaskWithNotif(msg: "Error downloading file", latestVersionName: latestVersionName, current: current)
+                    return
                 }
             } else {
-                print("\(self.implementation.TAG) No need to update, \(current.getId()) is the latest bundle.")
-                self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
+                print("\(CapacitorUpdater.TAG) No need to update, \(current.getId()) is the latest bundle.")
+                self.endBackGroundTaskWithNotif(msg: "No need to update, \(current.getId()) is the latest bundle.", latestVersionName: latestVersionName, current: current, error: false)
+                return
             }
-            self.endBackGroundTask()
         }
     }
 
     @objc func appKilled() {
-        print("\(self.implementation.TAG) onActivityDestroyed: all activity destroyed")
+        print("\(CapacitorUpdater.TAG) onActivityDestroyed: all activity destroyed")
         self._checkCancelDelay(killed: true)
     }
 
@@ -589,19 +855,19 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             return DelayCondition(kind: kind, value: value)
         }
         if delayConditionList != nil && delayConditionList?.capacity != 0 {
-            print("\(self.implementation.TAG) Update delayed to next backgrounding")
+            print("\(CapacitorUpdater.TAG) Update delayed until delay conditions met")
             return
         }
         let current: BundleInfo = self.implementation.getCurrentBundle()
         let next: BundleInfo? = self.implementation.getNextBundle()
 
         if next != nil && !next!.isErrorStatus() && next!.getVersionName() != current.getVersionName() {
-            print("\(self.implementation.TAG) Next bundle is: \(next!.toString())")
+            print("\(CapacitorUpdater.TAG) Next bundle is: \(next!.toString())")
             if self.implementation.set(bundle: next!) && self._reload() {
-                print("\(self.implementation.TAG) Updated to bundle: \(next!.toString())")
+                print("\(CapacitorUpdater.TAG) Updated to bundle: \(next!.toString())")
                 _ = self.implementation.setNextBundle(next: Optional<String>.none)
             } else {
-                print("\(self.implementation.TAG) Update to bundle: \(next!.toString()) Failed!")
+                print("\(CapacitorUpdater.TAG) Update to bundle: \(next!.toString()) Failed!")
             }
         }
     }
@@ -614,7 +880,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
 
     @objc private func fromJsonArr(json: String) -> [NSObject] {
-        let jsonData = json.data(using: .utf8)!
+        guard let jsonData = json.data(using: .utf8) else {
+            return []
+        }
         let object = try? JSONSerialization.jsonObject(
             with: jsonData,
             options: .mutableContainers
@@ -627,20 +895,42 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         self.implementation.sendStats(action: "app_moved_to_foreground", versionName: current.getVersionName())
         if backgroundWork != nil && taskRunning {
             backgroundWork!.cancel()
-            print("\(self.implementation.TAG) Background Timer Task canceled, Activity resumed before timer completes")
+            print("\(CapacitorUpdater.TAG) Background Timer Task canceled, Activity resumed before timer completes")
         }
         if self._isAutoUpdateEnabled() {
             self.backgroundDownload()
         } else {
-            print("\(self.implementation.TAG) Auto update is disabled")
+            print("\(CapacitorUpdater.TAG) Auto update is disabled")
+            self.sendReadyToJs(current: current, msg: "disabled")
         }
         self.checkAppReady()
     }
 
+    @objc func checkForUpdateAfterDelay() {
+        if periodCheckDelay == 0 || !self._isAutoUpdateEnabled() {
+            return
+        }
+        guard let url = URL(string: self.updateUrl) else {
+            print("\(CapacitorUpdater.TAG) Error no url or wrong format")
+            return
+        }
+        let timer = Timer.scheduledTimer(withTimeInterval: TimeInterval(periodCheckDelay), repeats: true) { _ in
+            DispatchQueue.global(qos: .background).async {
+                let res = self.implementation.getLatest(url: url, channel: nil)
+                let current = self.implementation.getCurrentBundle()
+
+                if res.version != current.getVersionName() {
+                    print("\(CapacitorUpdater.TAG) New version found: \(res.version)")
+                    self.backgroundDownload()
+                }
+            }
+        }
+        RunLoop.current.add(timer, forMode: .default)
+    }
+
     @objc func appMovedToBackground() {
-        let current: BundleInfo = self.implementation.getCurrentBundle()
-        self.implementation.sendStats(action: "app_moved_to_background", versionName: current.getVersionName())
-        print("\(self.implementation.TAG) Check for pending update")
+        self.implementation.sendStats(action: "app_moved_to_background")
+        print("\(CapacitorUpdater.TAG) Check for pending update")
         let delayUpdatePreferences = UserDefaults.standard.string(forKey: DELAY_CONDITION_PREFERENCES) ?? "[]"
 
         let delayConditionList: [DelayCondition] = fromJsonArr(json: delayUpdatePreferences).map { obj -> DelayCondition in
@@ -672,4 +962,14 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         }
 
     }
+
+    @objc func getNextBundle(_ call: CAPPluginCall) {
+        let bundle = self.implementation.getNextBundle()
+        if bundle == nil || bundle?.isUnknown() == true {
+            call.resolve()
+            return
+        }
+
+        call.resolve(bundle!.toJSON())
+    }
 }