@capgo/capacitor-updater 6.14.24 → 6.14.26

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

@@ -57,7 +57,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String statsUrlDefault = "https://plugin.capgo.app/stats";
     private static final String channelUrlDefault = "https://plugin.capgo.app/channel_self";
 
-    private final String PLUGIN_VERSION = "6.14.24";
+    private final String PLUGIN_VERSION = "6.14.26";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -65,7 +65,6 @@ public class CapacitorUpdaterPlugin extends Plugin {
     protected CapacitorUpdater implementation;
 
     private Integer appReadyTimeout = 10000;
-    private Integer counterActivityCreate = 0;
     private Integer periodCheckDelay = 0;
     private Boolean autoDeleteFailed = true;
     private Boolean autoDeletePrevious = true;
@@ -108,7 +107,6 @@ public class CapacitorUpdaterPlugin extends Plugin {
     @Override
     public void load() {
         super.load();
-        this.counterActivityCreate++;
         this.prefs = this.getContext().getSharedPreferences(WebView.WEBVIEW_PREFS_NAME, Activity.MODE_PRIVATE);
         this.editor = this.prefs.edit();
 
@@ -199,6 +197,11 @@ public class CapacitorUpdaterPlugin extends Plugin {
         if (resetWhenUpdate) {
             this.cleanupObsoleteVersions();
         }
+
+        // Check for 'kill' delay condition on app launch
+        // This handles cases where the app was killed by the system (onDestroy is not reliable)
+        this._checkCancelDelay(true);
+
         this.checkForUpdateAfterDelay();
     }
 
@@ -1002,6 +1005,17 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private void endBackGroundTaskWithNotif(String msg, String latestVersionName, BundleInfo current, Boolean error) {
+        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, "download_fail", "downloadFailed");
+    }
+
+    private void endBackGroundTaskWithNotif(
+        String msg,
+        String latestVersionName,
+        BundleInfo current,
+        Boolean error,
+        String failureAction,
+        String failureEvent
+    ) {
         if (error) {
             Log.i(
                 CapacitorUpdater.TAG,
@@ -1012,10 +1026,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 "latestVersionName: " +
                 latestVersionName
             );
-            this.implementation.sendStats("download_fail", current.getVersionName());
+            this.implementation.sendStats(failureAction, current.getVersionName());
             final JSObject ret = new JSObject();
             ret.put("version", latestVersionName);
-            this.notifyListeners("downloadFailed", ret);
+            this.notifyListeners(failureEvent, ret);
         }
         final JSObject ret = new JSObject();
         ret.put("bundle", current.toJSON());
@@ -1034,6 +1048,34 @@ public class CapacitorUpdaterPlugin extends Plugin {
             CapacitorUpdaterPlugin.this.implementation.getLatest(CapacitorUpdaterPlugin.this.updateUrl, null, res -> {
                     final BundleInfo current = CapacitorUpdaterPlugin.this.implementation.getCurrentBundle();
                     try {
+                        if (res.has("error")) {
+                            final String error = res.optString("error", "");
+                            if (error != null && !error.isEmpty()) {
+                                Log.e(CapacitorUpdater.TAG, "getLatest failed with error: " + error);
+                                final String latestVersion = res.has("version")
+                                    ? res.optString("version", current.getVersionName())
+                                    : current.getVersionName();
+                                if ("response_error".equals(error)) {
+                                    CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
+                                            "Network error: " + error,
+                                            latestVersion,
+                                            current,
+                                            true
+                                        );
+                                } else {
+                                    CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
+                                            error,
+                                            latestVersion,
+                                            current,
+                                            true,
+                                            "backend_refusal",
+                                            "backendRefused"
+                                        );
+                                }
+                                return;
+                            }
+                        }
+
                         if (res.has("message")) {
                             Log.i(CapacitorUpdater.TAG, "API message: " + res.get("message"));
                             if (res.has("major") && res.getBoolean("major") && res.has("version")) {
@@ -1041,11 +1083,16 @@ public class CapacitorUpdaterPlugin extends Plugin {
                                 majorAvailable.put("version", res.getString("version"));
                                 CapacitorUpdaterPlugin.this.notifyListeners("majorAvailable", majorAvailable);
                             }
+                            final String latestVersion = res.has("version")
+                                ? res.optString("version", current.getVersionName())
+                                : current.getVersionName();
                             CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
                                     res.getString("message"),
-                                    current.getVersionName(),
+                                    latestVersion,
                                     current,
-                                    true
+                                    true,
+                                    "backend_refusal",
+                                    "backendRefused"
                                 );
                             return;
                         }
@@ -1367,11 +1414,6 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
     }
 
-    private void appKilled() {
-        Log.d(CapacitorUpdater.TAG, "onActivityDestroyed: all activity destroyed");
-        this._checkCancelDelay(true);
-    }
-
     @Override
     public void handleOnStart() {
         if (isPreviousMainActivity) {
@@ -1406,9 +1448,5 @@ public class CapacitorUpdaterPlugin extends Plugin {
     public void handleOnDestroy() {
         Log.i(CapacitorUpdater.TAG, "onActivityDestroyed " + getActivity().getClass().getName());
         this.implementation.activity = getActivity();
-        counterActivityCreate--;
-        if (counterActivityCreate == 0) {
-            this.appKilled();
-        }
     }
 }

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -45,7 +45,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "getNextBundle", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "6.14.24"
+    private let PLUGIN_VERSION: String = "6.14.26"
     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"
@@ -144,7 +144,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         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)
+
+        // Check for 'kill' delay condition on app launch
+        // This handles cases where the app was killed (willTerminateNotification is not reliable for system kills)
+        self._checkCancelDelay(killed: true)
+
         self.appMovedToForeground()
         self.checkForUpdateAfterDelay()
     }
@@ -732,10 +736,17 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
-    func endBackGroundTaskWithNotif(msg: String, latestVersionName: String, current: BundleInfo, error: Bool = true) {
+    func endBackGroundTaskWithNotif(
+        msg: String,
+        latestVersionName: String,
+        current: BundleInfo,
+        error: Bool = true,
+        failureAction: String = "download_fail",
+        failureEvent: String = "downloadFailed"
+    ) {
         if error {
-            self.implementation.sendStats(action: "download_fail", versionName: current.getVersionName())
-            self.notifyListeners("downloadFailed", data: ["version": latestVersionName])
+            self.implementation.sendStats(action: failureAction, versionName: current.getVersionName())
+            self.notifyListeners(failureEvent, data: ["version": latestVersionName])
         }
         self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
         self.sendReadyToJs(current: current, msg: msg)
@@ -758,12 +769,43 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             let res = self.implementation.getLatest(url: url, channel: nil)
             let current = self.implementation.getCurrentBundle()
 
-            if (res.message) != nil {
-                print("\(CapacitorUpdater.TAG) API message: \(res.message ?? "")")
+            if let backendError = res.error, !backendError.isEmpty {
+                print("\(CapacitorUpdater.TAG) getLatest failed with error: \(backendError)")
+                let latestVersionName = res.version.isEmpty ? current.getVersionName() : res.version
+                if backendError == "response_error" {
+                    self.endBackGroundTaskWithNotif(
+                        msg: "Network error: \(backendError)",
+                        latestVersionName: latestVersionName,
+                        current: current,
+                        error: true
+                    )
+                } else {
+                    self.endBackGroundTaskWithNotif(
+                        msg: backendError,
+                        latestVersionName: latestVersionName,
+                        current: current,
+                        error: true,
+                        failureAction: "backend_refusal",
+                        failureEvent: "backendRefused"
+                    )
+                }
+                return
+            }
+
+            if let message = res.message, !message.isEmpty {
+                print("\(CapacitorUpdater.TAG) API message: \(message)")
                 if res.major == true {
                     self.notifyListeners("majorAvailable", data: ["version": res.version])
                 }
-                self.endBackGroundTaskWithNotif(msg: res.message ?? "", latestVersionName: res.version, current: current, error: true)
+                let latestVersionName = res.version.isEmpty ? current.getVersionName() : res.version
+                self.endBackGroundTaskWithNotif(
+                    msg: message,
+                    latestVersionName: latestVersionName,
+                    current: current,
+                    error: true,
+                    failureAction: "backend_refusal",
+                    failureEvent: "backendRefused"
+                )
                 return
             }
             if res.version == "builtin" {
@@ -860,11 +902,6 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
-    @objc func appKilled() {
-        print("\(CapacitorUpdater.TAG) onActivityDestroyed: all activity destroyed")
-        self._checkCancelDelay(killed: true)
-    }
-
     private func installNext() {
         let delayUpdatePreferences = UserDefaults.standard.string(forKey: DELAY_CONDITION_PREFERENCES) ?? "[]"
         let delayConditionList: [DelayCondition]? = fromJsonArr(json: delayUpdatePreferences).map { obj -> DelayCondition in

package/package.json

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