@capgo/capacitor-updater 7.16.0 → 7.17.0

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

@@ -60,7 +60,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 = "7.16.0";
+    private final String PLUGIN_VERSION = "7.17.0";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -1198,7 +1198,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private void endBackGroundTaskWithNotif(String msg, String latestVersionName, BundleInfo current, Boolean error) {
-        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, false);
+        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, false, "download_fail", "downloadFailed");
     }
 
     private void endBackGroundTaskWithNotif(
@@ -1207,6 +1207,18 @@ public class CapacitorUpdaterPlugin extends Plugin {
         BundleInfo current,
         Boolean error,
         Boolean isDirectUpdate
+    ) {
+        endBackGroundTaskWithNotif(msg, latestVersionName, current, error, isDirectUpdate, "download_fail", "downloadFailed");
+    }
+
+    private void endBackGroundTaskWithNotif(
+        String msg,
+        String latestVersionName,
+        BundleInfo current,
+        Boolean error,
+        Boolean isDirectUpdate,
+        String failureAction,
+        String failureEvent
     ) {
         if (error) {
             logger.info(
@@ -1217,10 +1229,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", mapToJSObject(current.toJSONMap()));
@@ -1245,13 +1257,26 @@ public class CapacitorUpdaterPlugin extends Plugin {
                         if (jsRes.has("error")) {
                             String error = jsRes.getString("error");
                             logger.error("getLatest failed with error: " + error);
-                            CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
-                                "Network error: " + error,
-                                current.getVersionName(),
-                                current,
-                                true,
-                                shouldDirectUpdate
-                            );
+                            String latestVersion = jsRes.has("version") ? jsRes.getString("version") : current.getVersionName();
+                            if ("response_error".equals(error)) {
+                                CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
+                                    "Network error: " + error,
+                                    latestVersion,
+                                    current,
+                                    true,
+                                    shouldDirectUpdate
+                                );
+                            } else {
+                                CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
+                                    error,
+                                    latestVersion,
+                                    current,
+                                    true,
+                                    shouldDirectUpdate,
+                                    "backend_refusal",
+                                    "backendRefused"
+                                );
+                            }
                             return;
                         }
 
@@ -1263,12 +1288,15 @@ public class CapacitorUpdaterPlugin extends Plugin {
                                     majorAvailable.put("version", jsRes.getString("version"));
                                     CapacitorUpdaterPlugin.this.notifyListeners("majorAvailable", majorAvailable);
                                 }
+                                String latestVersion = jsRes.has("version") ? jsRes.getString("version") : current.getVersionName();
                                 CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(
                                     jsRes.getString("message"),
-                                    current.getVersionName(),
+                                    latestVersion,
                                     current,
                                     true,
-                                    shouldDirectUpdate
+                                    shouldDirectUpdate,
+                                    "backend_refusal",
+                                    "backendRefused"
                                 );
                                 return;
                             }

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -50,7 +50,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isShakeMenuEnabled", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let PLUGIN_VERSION: String = "7.16.0"
+    private let PLUGIN_VERSION: String = "7.17.0"
     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"
@@ -882,10 +882,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)
@@ -910,18 +917,41 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
             let current = self.implementation.getCurrentBundle()
 
             // Handle network errors and other failures first
-            if res.error != nil {
-                self.logger.error("getLatest failed with error: \(res.error ?? "")")
-                self.endBackGroundTaskWithNotif(msg: "Network error: \(res.error ?? "")", latestVersionName: res.version, current: current, error: true)
+            if let backendError = res.error, !backendError.isEmpty {
+                self.logger.error("getLatest failed with error: \(backendError)")
+                if backendError == "response_error" {
+                    self.endBackGroundTaskWithNotif(
+                        msg: "Network error: \(backendError)",
+                        latestVersionName: res.version,
+                        current: current,
+                        error: true
+                    )
+                } else {
+                    self.endBackGroundTaskWithNotif(
+                        msg: backendError,
+                        latestVersionName: res.version,
+                        current: current,
+                        error: true,
+                        failureAction: "backend_refusal",
+                        failureEvent: "backendRefused"
+                    )
+                }
                 return
             }
 
-            if (res.message) != nil {
-                self.logger.info("API message: \(res.message ?? "")")
+            if let message = res.message, !message.isEmpty {
+                self.logger.info("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)
+                self.endBackGroundTaskWithNotif(
+                    msg: message,
+                    latestVersionName: res.version,
+                    current: current,
+                    error: true,
+                    failureAction: "backend_refusal",
+                    failureEvent: "backendRefused"
+                )
                 return
             }
             if res.version == "builtin" {

package/package.json

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