@capgo/capacitor-updater 4.2.2 → 4.2.4

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -22,7 +22,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     private var resetWhenUpdate = true
     private var autoDeleteFailed = false
     private var autoDeletePrevious = false
-    
+
     override public func load() {
         print("\(self.implementation.TAG) init for device \(self.implementation.deviceID)")
         do {
@@ -40,11 +40,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         implementation.appId = Bundle.main.bundleIdentifier ?? ""
         implementation.notifyDownload = notifyDownload
         let config = (self.bridge?.viewController as? CAPBridgeViewController)?.instanceDescriptor().legacyConfig
-        if (config?["appId"] != nil) {
+        if config?["appId"] != nil {
             implementation.appId = config?["appId"] as! String
         }
         implementation.statsUrl = getConfig().getString("statsUrl") ?? CapacitorUpdaterPlugin.updateUrlDefault
-        if (resetWhenUpdate) {
+        if resetWhenUpdate {
             self.cleanupObsoleteVersions()
         }
         let nc = NotificationCenter.default
@@ -61,7 +61,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         } catch {
             print("\(self.implementation.TAG) Cannot get version native \(currentVersionNative)")
         }
-        if (LatestVersionNative != "0.0.0" && currentVersionNative.major > LatestVersionNative.major) {
+        if LatestVersionNative != "0.0.0" && currentVersionNative.major > LatestVersionNative.major {
             _ = self._reset(toLastSuccessful: false)
             let res = implementation.list()
             res.forEach { version in
@@ -76,7 +76,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     @objc func notifyDownload(id: String, percent: Int) {
         let bundle = self.implementation.getBundleInfo(id: id)
         self.notifyListeners("download", data: ["percent": percent, "bundle": bundle.toJSON()])
-        if (percent == 100) {
+        if percent == 100 {
             self.notifyListeners("downloadComplete", data: ["bundle": bundle.toJSON()])
         }
     }
@@ -88,7 +88,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     @objc func getPluginVersion(_ call: CAPPluginCall) {
         call.resolve(["version": implementation.pluginVersion])
     }
-    
+
     @objc func download(_ call: CAPPluginCall) {
         guard let urlString = call.getString("url") else {
             print("\(self.implementation.TAG) Download called without url")
@@ -124,9 +124,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         }
         return false
     }
-    
+
     @objc func reload(_ call: CAPPluginCall) {
-        if (self._reload()) {
+        if self._reload() {
             call.resolve()
         } else {
             print("\(self.implementation.TAG) Reload failed")
@@ -141,14 +141,14 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             return
         }
         print("\(self.implementation.TAG) Setting next active id \(id)")
-        if (!self.implementation.setNextBundle(next: id)) {
+        if !self.implementation.setNextBundle(next: id) {
             print("\(self.implementation.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())
         }
     }
-    
+
     @objc func set(_ call: CAPPluginCall) {
         guard let id = call.getString("id") else {
             print("\(self.implementation.TAG) Set called without id")
@@ -157,7 +157,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         }
         let res = implementation.set(id: id)
         print("\(self.implementation.TAG) Set active bundle: \(id)")
-        if (!res) {
+        if !res {
             print("\(self.implementation.TAG) Bundle successfully set to: \(id) ")
             call.reject("Update failed, id \(id) doesn't exist")
         } else {
@@ -172,7 +172,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             return
         }
         let res = implementation.delete(id: id)
-        if (res) {
+        if res {
             call.resolve()
         } else {
             print("\(self.implementation.TAG) Delete failed, id \(id) doesn't exist")
@@ -201,7 +201,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
 
         if let vc = bridge.viewController as? CAPBridgeViewController {
             let fallback: BundleInfo = self.implementation.getFallbackBundle()
-            if (toLastSuccessful && !fallback.isBuiltin()) {
+            if toLastSuccessful && !fallback.isBuiltin() {
                 print("\(self.implementation.TAG) Resetting to: \(fallback.toString())")
                 return self.implementation.set(bundle: fallback) && self._reload()
             }
@@ -219,13 +219,13 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
 
     @objc func reset(_ call: CAPPluginCall) {
         let toLastSuccessful = call.getBool("toLastSuccessful") ?? false
-        if (self._reset(toLastSuccessful: toLastSuccessful)) {
+        if self._reset(toLastSuccessful: toLastSuccessful) {
             return call.resolve()
         }
         print("\(self.implementation.TAG) Reset failed")
         call.reject("\(self.implementation.TAG) Reset failed")
     }
-    
+
     @objc func current(_ call: CAPPluginCall) {
         let bundle: BundleInfo = self.implementation.getCurrentBundle()
         call.resolve([
@@ -240,7 +240,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         print("\(self.implementation.TAG) Current bundle loaded successfully. ['notifyAppReady()' was called] \(version.toString())")
         call.resolve()
     }
-    
+
     @objc func setDelay(_ call: CAPPluginCall) {
         guard let kind = call.getString("kind") else {
             print("\(self.implementation.TAG) setDelay called without kind")
@@ -255,7 +255,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         call.resolve()
     }
 
-    private func _cancelDelay(source: String) -> Void {
+    private func _cancelDelay(source: String) {
         print("\(self.implementation.TAG) delay Canceled from \(source)")
         UserDefaults.standard.removeObject(forKey: DELAY_UPDATE)
         UserDefaults.standard.removeObject(forKey: DELAY_UPDATE_VAL)
@@ -267,31 +267,31 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         call.resolve()
     }
 
-    private func _checkCancelDelay(killed: Bool) -> Void {
+    private func _checkCancelDelay(killed: Bool) {
         let delayUpdate = UserDefaults.standard.string(forKey: DELAY_UPDATE)
-        if (delayUpdate != nil) {
-            if (delayUpdate == "background" && !killed) {
+        if delayUpdate != nil {
+            if delayUpdate == "background" && !killed {
                 self._cancelDelay(source: "background check")
-            } else if (delayUpdate == "kill" && killed) {
+            } else if delayUpdate == "kill" && killed {
                 self._cancelDelay(source: "kill check")
             }
             guard let delayVal = UserDefaults.standard.string(forKey: DELAY_UPDATE_VAL) else {
                 self._cancelDelay(source: "delayVal absent")
                 return
             }
-            if (delayUpdate == "date") {
+            if delayUpdate == "date" {
                 let dateFormatter = ISO8601DateFormatter()
                 guard let ExpireDate = dateFormatter.date(from: delayVal) else {
                     self._cancelDelay(source: "date parsing issue")
                     return
                 }
-                if (ExpireDate < Date())  {
+                if ExpireDate < Date() {
                     self._cancelDelay(source: "date expired")
                 }
-            } else if (delayUpdate == "nativeVersion") {
+            } else if delayUpdate == "nativeVersion" {
                 do {
                     let versionLimit = try Version(delayVal)
-                    if (self.currentVersionNative >= versionLimit) {
+                    if self.currentVersionNative >= versionLimit {
                         self._cancelDelay(source: "nativeVersion above limit")
                     }
                 } catch {
@@ -325,14 +325,14 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     func checkRevert() {
         // Automatically roll back to fallback version if notifyAppReady has not been called yet
         let current: BundleInfo = self.implementation.getCurrentBundle()
-        if(current.isBuiltin()) {
+        if current.isBuiltin() {
             print("\(self.implementation.TAG) Built-in bundle is active. Nothing to do.")
             return
         }
 
         print("\(self.implementation.TAG) Current bundle is: \(current.toString())")
 
-        if(BundleStatus.SUCCESS.localizedString != current.getStatus()) {
+        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?")
             self.notifyListeners("updateFailed", data: [
@@ -341,10 +341,10 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             self.implementation.sendStats(action: "update_fail", versionName: current.getVersionName())
             self.implementation.setError(bundle: current)
             _ = self._reset(toLastSuccessful: true)
-            if (self.autoDeleteFailed && !current.isBuiltin()) {
+            if self.autoDeleteFailed && !current.isBuiltin() {
                 print("\(self.implementation.TAG) Deleting failing bundle: \(current.toString())")
                 let res = self.implementation.delete(id: current.getId(), removeInfo: false)
-                if (!res) {
+                if !res {
                     print("\(self.implementation.TAG) Delete version deleted: \(current.toString())")
                 } else {
                     print("\(self.implementation.TAG) Failed to delete failed bundle: \(current.toString())")
@@ -361,16 +361,16 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
 
     @objc func appMovedToForeground() {
-        if (self._isAutoUpdateEnabled()) {
+        if self._isAutoUpdateEnabled() {
             DispatchQueue.global(qos: .background).async {
                 print("\(self.implementation.TAG) Check for update via \(self.updateUrl)")
                 let url = URL(string: self.updateUrl)!
                 let res = self.implementation.getLatest(url: url)
                 let current = self.implementation.getCurrentBundle()
- 
-                if ((res.message) != nil) {
+
+                if (res.message) != nil {
                     print("\(self.implementation.TAG) message \(res.message ?? "")")
-                    if (res.major == true) {
+                    if res.major == true {
                         self.notifyListeners("majorAvailable", data: ["version": res.version])
                     }
                     self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
@@ -382,18 +382,18 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                     return
                 }
                 let latestVersionName = res.version
-                if (latestVersionName != "" && current.getVersionName() != latestVersionName) {
+                if latestVersionName != "" && current.getVersionName() != latestVersionName {
                     let latest = self.implementation.getBundleInfoByVersionName(version: latestVersionName)
-                    if (latest != nil) {
-                        if(latest!.isErrorStatus()) {
+                    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()])
                             return
                         }
-                        if(latest!.isDownloaded()){
+                        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()])
-                            let _ = self.implementation.setNextBundle(next: latest!.getId())
+                            _ = self.implementation.setNextBundle(next: latest!.getId())
                             return
                         }
                     }
@@ -402,7 +402,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                         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)
                         self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
-                        let _ = self.implementation.setNextBundle(next: next.getId())
+                        _ = self.implementation.setNextBundle(next: next.getId())
                     } catch {
                         print("\(self.implementation.TAG) Error downloading file", error.localizedDescription)
                         self.notifyListeners("downloadFailed", data: ["version": latestVersionName])
@@ -422,7 +422,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         print("\(self.implementation.TAG) Check for pending update")
         let delayUpdate = UserDefaults.standard.string(forKey: DELAY_UPDATE)
         self._checkCancelDelay(killed: false)
-        if (delayUpdate != nil) {
+        if delayUpdate != nil {
             print("\(self.implementation.TAG) Update delayed to next backgrounding")
             return
         }
@@ -430,11 +430,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         let current: BundleInfo = self.implementation.getCurrentBundle()
         let next: BundleInfo? = self.implementation.getNextBundle()
 
-        if (next != nil && !next!.isErrorStatus() && next!.getVersionName() != current.getVersionName()) {
+        if next != nil && !next!.isErrorStatus() && next!.getVersionName() != current.getVersionName() {
             print("\(self.implementation.TAG) Next bundle is: \(next!.toString())")
-            if (self.implementation.set(bundle: next!) && self._reload()) {
+            if self.implementation.set(bundle: next!) && self._reload() {
                 print("\(self.implementation.TAG) Updated to bundle: \(next!.toString())")
-                let _ = self.implementation.setNextBundle(next: Optional<String>.none)
+                _ = self.implementation.setNextBundle(next: Optional<String>.none)
             } else {
                 print("\(self.implementation.TAG) Update to bundle: \(next!.toString()) Failed!")
             }

package/ios/Plugin/ObjectPreferences.swift

@@ -38,4 +38,4 @@ extension UserDefaults: ObjectSavable {
             throw ObjectSavableError.unableToDecode
         }
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "4.2.2",
+  "version": "4.2.4",
   "license": "LGPL-3.0-only",
   "description": "OTA update for capacitor apps",
   "main": "dist/plugin.cjs.js",
@@ -40,7 +40,7 @@
     "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",
+    "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --autocorrect --format",
     "eslint": "eslint . --ext ts",
     "prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
     "swiftlint": "node-swiftlint",