@capgo/capacitor-updater 4.0.0-alpha.18 → 4.0.0-alpha.20

package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java

@@ -46,7 +46,7 @@ public class CapacitorUpdater {
     private static final String bundleDirectory = "versions";
 
     public static final String TAG = "Capacitor-updater";
-    public static final String pluginVersion = "4.0.0-alpha.18";
+    public static final String pluginVersion = "4.0.0-alpha.20";
 
     public SharedPreferences.Editor editor;
     public SharedPreferences prefs;
@@ -307,7 +307,7 @@ public class CapacitorUpdater {
     public void reset(final boolean internal) {
         this.setCurrentBundle(new File("public"));
         this.setFallbackVersion(null);
-        this.setNextVersion(null);
+        this.setNext(null);
         if(!internal) {
             this.sendStats("reset", this.getCurrentBundle().getVersionName());
         }
@@ -511,7 +511,7 @@ public class CapacitorUpdater {
         }
     }
 
-    public boolean setNextVersion(final String next) {
+    public boolean setNext(final String next) {
         if (next == null) {
             this.editor.remove(NEXT_VERSION);
         } else {

package/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdaterPlugin.java

@@ -236,7 +236,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
 
         try {
             Log.i(CapacitorUpdater.TAG, "Setting next active id " + id);
-            if (!this.implementation.setNextVersion(id)) {
+            if (!this.implementation.setNext(id)) {
                 Log.e(CapacitorUpdater.TAG, "Set next id failed. Bundle " + id + " does not exist.");
                 call.reject("Set next id failed. Bundle " + id + " does not exist.");
             } else {
@@ -409,54 +409,61 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         }
     }
 
-    private boolean _cancelDelay() {
+    private boolean _cancelDelay(String source) {
         try {
             this.editor.remove(DELAY_UPDATE);
             this.editor.remove(DELAY_UPDATE_VAL);
             this.editor.commit();
-            Log.i(CapacitorUpdater.TAG, "delay Canceled");
+            Log.i(CapacitorUpdater.TAG, "delay canceled from " + source);
+            return true;
         }
         catch(final Exception e) {
             Log.e(CapacitorUpdater.TAG, "Failed to cancel update delay", e);
-            call.reject("Failed to cancel update delay", e);
+            return false;
         }
     }
 
     @PluginMethod
     public void cancelDelay(final PluginCall call) {
-        this._cancelDelay();
-        call.resolve();
+        if(this._cancelDelay("JS")) {
+            call.resolve();
+        } else {
+            call.reject("Failed to cancel delay");
+        }
     }
 
     private void _checkCancelDelay(Boolean killed) {
         final String delayUpdate = this.prefs.getString(DELAY_UPDATE, "");
         if ("".equals(delayUpdate)) {
             if ("background".equals(delayUpdate) && !killed) {
-                this._cancelDelay();
+                this._cancelDelay("background check");
             } else if ("kill".equals(delayUpdate) && killed) {
-                this._cancelDelay();
+                this._cancelDelay("kill check");
             }
             final String delayVal = this.prefs.getString(DELAY_UPDATE_VAL, "");
-            if (delayVal == null) {
-                this._cancelDelay();
+            if ("".equals(delayVal)) {
+                this._cancelDelay("delayVal absent");
             } else if ("date".equals(delayUpdate)) {
                 try {
                     final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
                     Date date = sdf.parse(delayVal);
-                    Date today = new Date();
-                    if (date.compareTo(today) > 0)  {
-                        this._cancelDelay();
+                    if (date.compareTo(new Date()) > 0)  {
+                        this._cancelDelay("date expired");
                     }
                 }
                 catch(final Exception e) {
-                    Log.e(CapacitorUpdater.TAG, "Failed to parse delay date", e);
-                    this._cancelDelay();
+                    this._cancelDelay("date parsing issue");
                 }
 
             } else if ("nativeVersion".equals(delayUpdate)) {
-                final Version versionLimit = new Version(delayVal);
-                if (this.currentVersionNative.isAtLeast(versionLimit)) {
-                    this._cancelDelay();
+                try {
+                    final Version versionLimit = new Version(delayVal);
+                    if (this.currentVersionNative.isAtLeast(versionLimit)) {
+                        this._cancelDelay("nativeVersion above limit");
+                    }
+                }
+                catch(final Exception e) {
+                    this._cancelDelay("nativeVersion parsing issue");
                 }
             }
         }
@@ -490,6 +497,8 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
         }
     }
 
+
+
     @Override // appMovedToForeground
     public void onActivityStarted(@NonNull final Activity activity) {
         if (CapacitorUpdaterPlugin.this._isAutoUpdateEnabled()) {
@@ -522,7 +531,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                                     }
                                     if(latest.isDownloaded()){
                                         Log.e(CapacitorUpdater.TAG, "Latest bundle already exists and download is NOT required. Update will occur next time app moves to background.");
-                                        CapacitorUpdaterPlugin.this.implementation.setNextVersion(latest.getId());
+                                        CapacitorUpdaterPlugin.this.implementation.setNext(latest.getId());
                                         return;
                                     }
                                 }
@@ -537,7 +546,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                                             final String url = (String) res.get("url");
                                             final BundleInfo next = CapacitorUpdaterPlugin.this.implementation.download(url, latestVersionName);
 
-                                            CapacitorUpdaterPlugin.this.implementation.setNextVersion(next.getId());
+                                            CapacitorUpdaterPlugin.this.implementation.setNext(next.getId());
                                         } catch (final Exception e) {
                                             Log.e(CapacitorUpdater.TAG, "error downloading file", e);
                                         }
@@ -561,13 +570,12 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
     public void onActivityStopped(@NonNull final Activity activity) {
         Log.i(CapacitorUpdater.TAG, "Checking for pending update");
         try {
-            final Boolean delayUpdate = this.prefs.getString(DELAY_UPDATE, false);
+            final String delayUpdate = this.prefs.getString(DELAY_UPDATE, "");
             this._checkCancelDelay(false);
-            if (delayUpdate) {
+            if ("".equals(delayUpdate)) {
                 Log.i(CapacitorUpdater.TAG, "Update delayed to next backgrounding");
                 return;
             }
-
             final BundleInfo fallback = this.implementation.getFallbackVersion();
             final BundleInfo current = this.implementation.getCurrentBundle();
             final BundleInfo next = this.implementation.getNextVersion();
@@ -582,7 +590,7 @@ public class CapacitorUpdaterPlugin extends Plugin implements Application.Activi
                 Log.d(CapacitorUpdater.TAG, "Next bundle is: " + next.getVersionName());
                 if (this.implementation.set(next) && this._reload()) {
                     Log.i(CapacitorUpdater.TAG, "Updated to bundle: " + next.getVersionName());
-                    this.implementation.setNextVersion(null);
+                    this.implementation.setNext(null);
                 } else {
                     Log.e(CapacitorUpdater.TAG, "Update to bundle: " + next.getVersionName() + " Failed!");
                 }

package/ios/Plugin/CapacitorUpdater.swift

@@ -148,7 +148,7 @@ extension CustomError: LocalizedError {
     
     public let TAG = "✨  Capacitor-updater:";
     public let CAP_SERVER_PATH = "serverBasePath"
-    public let pluginVersion = "4.0.0-alpha.18"
+    public let pluginVersion = "4.0.0-alpha.20"
     public var statsUrl = ""
     public var appId = ""
     public var deviceID = UIDevice.current.identifierForVendor?.uuidString ?? ""
@@ -259,8 +259,8 @@ extension CustomError: LocalizedError {
     
     private func setCurrentBundle(bundle: String) {
         UserDefaults.standard.set(bundle, forKey: self.CAP_SERVER_PATH)
-        print("\(self.TAG) Current bundle set to: \(bundle)")
         UserDefaults.standard.synchronize()
+        print("\(self.TAG) Current bundle set to: \(bundle == "" ? BundleInfo.ID_BUILTIN : bundle)")
     }
 
     public func download(url: URL, version: String) throws -> BundleInfo {
@@ -372,9 +372,12 @@ extension CustomError: LocalizedError {
 
     public func set(id: String) -> Bool {
         let newBundle: BundleInfo = self.getBundleInfo(id: id)
+        if(newBundle.isBuiltin()) {
+            self.reset()
+            return true
+        }
         if (bundleExists(id: id)) {
-            let url: URL = self.getBundleDirectory(id: id)
-            self.setCurrentBundle(bundle: String(url.path.suffix(10)))
+            self.setCurrentBundle(bundle: id)
             self.setBundleStatus(id: id, status: BundleStatus.PENDING)
             sendStats(action: "set", versionName: newBundle.getVersionName())
             return true
@@ -398,8 +401,7 @@ extension CustomError: LocalizedError {
     public func reset(isInternal: Bool) {
         self.setCurrentBundle(bundle: "")
         self.setFallbackVersion(fallback: Optional<BundleInfo>.none)
-        let _ = self.setNextVersion(next: Optional<String>.none)
-        UserDefaults.standard.synchronize()
+        let _ = self.setNext(next: Optional<String>.none)
         if(!isInternal) {
             sendStats(action: "reset", versionName: self.getCurrentBundle().getVersionName())
         }
@@ -441,7 +443,7 @@ extension CustomError: LocalizedError {
         }
         do {
             let result: BundleInfo = try UserDefaults.standard.getObj(forKey: "\(id)\(self.INFO_SUFFIX)", castTo: BundleInfo.self)
-            print("\(self.TAG) Returning info bundle [\(id)]", result.toString())
+//            print("\(self.TAG) Returning info bundle [\(id)]", result.toString())
             return result
         } catch {
             print("\(self.TAG) Failed to parse info for bundle [\(id)]", error.localizedDescription)
@@ -495,25 +497,22 @@ extension CustomError: LocalizedError {
         self.saveBundleInfo(id: id, bundle: info.setStatus(status: status.localizedString))
     }
 
-    private func getCurrentBundleVersion() -> String {
-        if(self.isUsingBuiltin()) {
-            return BundleInfo.ID_BUILTIN
-        } else {
-            let path: String = self.getCurrentBundleId()
-            return path.lastPathComponent
-        }
-    }
-
     public func getCurrentBundle() -> BundleInfo {
         return self.getBundleInfo(id: self.getCurrentBundleId());
     }
 
     public func getCurrentBundleId() -> String {
-        return UserDefaults.standard.string(forKey: self.CAP_SERVER_PATH) ?? self.DEFAULT_FOLDER
+        guard let bundleID = UserDefaults.standard.string(forKey: self.CAP_SERVER_PATH) else {
+            return BundleInfo.ID_BUILTIN
+        }
+        if (bundleID == "") {
+            return BundleInfo.ID_BUILTIN
+        }
+        return bundleID
     }
 
     public func isUsingBuiltin() -> Bool {
-        return self.getCurrentBundleId() == self.DEFAULT_FOLDER
+        return (UserDefaults.standard.string(forKey: self.CAP_SERVER_PATH) ?? "") == self.DEFAULT_FOLDER
     }
 
     public func getFallbackVersion() -> BundleInfo {
@@ -523,6 +522,7 @@ extension CustomError: LocalizedError {
 
     private func setFallbackVersion(fallback: BundleInfo?) {
         UserDefaults.standard.set(fallback == nil ? BundleInfo.ID_BUILTIN : fallback!.getId(), forKey: self.FALLBACK_VERSION)
+        UserDefaults.standard.synchronize()
     }
 
     public func getNextVersion() -> BundleInfo? {
@@ -534,19 +534,24 @@ extension CustomError: LocalizedError {
         }
     }
 
-    public func setNextVersion(next: String?) -> Bool {
+    public func setNext(next: String?) -> Bool {
         guard let nextId = next else {
             UserDefaults.standard.removeObject(forKey: self.NEXT_VERSION)
             UserDefaults.standard.synchronize()
-            return
+            return false
         }
-        let bundle: URL = self.getBundleDirectory(id: next)
+        let newBundle: BundleInfo = self.getBundleInfo(id: nextId)
+        if(newBundle.isBuiltin()) {
+            self.reset()
+            return true
+        }
+        let bundle: URL = self.getBundleDirectory(id: nextId)
         if (!bundle.exist) {
             return false
         }
         UserDefaults.standard.set(next, forKey: self.NEXT_VERSION)
-        self.setBundleStatus(id: next!, status: BundleStatus.PENDING)
         UserDefaults.standard.synchronize()
+        self.setBundleStatus(id: next!, status: BundleStatus.PENDING)
         return true
     }
 }

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -140,7 +140,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             return
         }
         print("\(self.implementation.TAG) Setting next active id \(id)")
-        if (!self.implementation.setNextVersion(next: id)) {
+        if (!self.implementation.setNext(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 {
@@ -250,19 +250,19 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         UserDefaults.standard.set(kind, forKey: DELAY_UPDATE)
         UserDefaults.standard.set(val, forKey: DELAY_UPDATE_VAL)
         UserDefaults.standard.synchronize()
-        print("\(self.implementation.TAG) Delay update saved.")
+        print("\(self.implementation.TAG) Delay update saved.", kind, val)
         call.resolve()
     }
 
-    private func _cancelDelay() -> Void {
-        print("\(self.implementation.TAG) delay Canceled")
+    private func _cancelDelay(source: String) -> Void {
+        print("\(self.implementation.TAG) delay Canceled from \(source)")
         UserDefaults.standard.removeObject(forKey: DELAY_UPDATE)
         UserDefaults.standard.removeObject(forKey: DELAY_UPDATE_VAL)
         UserDefaults.standard.synchronize()
     }
 
     @objc func cancelDelay(_ call: CAPPluginCall) {
-        self._cancelDelay()
+        self._cancelDelay(source: "JS")
         call.resolve()
     }
 
@@ -270,31 +270,33 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         let delayUpdate = UserDefaults.standard.string(forKey: DELAY_UPDATE)
         if (delayUpdate != nil) {
             if (delayUpdate == "background" && !killed) {
-                self._cancelDelay()
+                self._cancelDelay(source: "background check")
             } else if (delayUpdate == "kill" && killed) {
-                self._cancelDelay()
+                self._cancelDelay(source: "kill check")
             }
-            let delayVal = UserDefaults.standard.string(forKey: DELAY_UPDATE_VAL)
-            if (delayVal == nil) {
-                self._cancelDelay()
-            } else if (delayUpdate == "date") {
+            guard let delayVal = UserDefaults.standard.string(forKey: DELAY_UPDATE_VAL) else {
+                self._cancelDelay(source: "delayVal absent")
+                return
+            }
+            if (delayUpdate == "date") {
                 let dateFormatter = ISO8601DateFormatter()
-                let date = dateFormatter.date(from: delayVal!)!
-                let toDay = Date()
-                if (toDay < date)  {
-                    self._cancelDelay()
+                guard let ExpireDate = dateFormatter.date(from: delayVal) else {
+                    self._cancelDelay(source: "date parsing issue")
+                    return
+                }
+                if (ExpireDate < Date())  {
+                    self._cancelDelay(source: "date expired")
                 }
             } else if (delayUpdate == "nativeVersion") {
                 do {
-                    let versionLimit = try Version(delayVal!)
+                    let versionLimit = try Version(delayVal)
                     if (self.currentVersionNative >= versionLimit) {
-                        self._cancelDelay()
+                        self._cancelDelay(source: "nativeVersion above limit")
                     }
                 } catch {
-                    self._cancelDelay()
+                    self._cancelDelay(source: "nativeVersion parsing issue")
                 }
             }
-            UserDefaults.standard.synchronize()
         }
     }
 
@@ -370,7 +372,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                         }
                         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.")
-                            let _ = self.implementation.setNextVersion(next: latest!.getId())
+                            let _ = self.implementation.setNext(next: latest!.getId())
                             return
                         }
                     }
@@ -379,7 +381,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!)
 
-                        let _ = self.implementation.setNextVersion(next: next.getId())
+                        let _ = self.implementation.setNext(next: next.getId())
                     } catch {
                         print("\(self.implementation.TAG) Error downloading file", error.localizedDescription)
                     }
@@ -412,7 +414,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             print("\(self.implementation.TAG) Next bundle is: \(next!.toString())")
             if (self.implementation.set(bundle: next!) && self._reload()) {
                 print("\(self.implementation.TAG) Updated to bundle: \(next!)")
-                let _ = self.implementation.setNextVersion(next: Optional<String>.none)
+                let _ = self.implementation.setNext(next: Optional<String>.none)
             } else {
                 print("\(self.implementation.TAG) Updated to bundle: \(next!) Failed!")
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "4.0.0-alpha.18",
+  "version": "4.0.0-alpha.20",
   "license": "AGPL-3.0-only",
   "description": "OTA update for capacitor apps",
   "main": "dist/plugin.cjs.js",