@capgo/capacitor-updater 6.14.23 → 6.14.25

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

@@ -315,6 +315,7 @@ public class CapacitorUpdater {
         Boolean isManifest
     ) {
         File downloaded = null;
+        File extractedDir = null;
         String checksum = "";
 
         try {
@@ -339,6 +340,9 @@ public class CapacitorUpdater {
             }
             // Remove the decryption for manifest downloads
         } catch (Exception e) {
+            if (!isManifest) {
+                safeDelete(downloaded);
+            }
             final Boolean res = this.delete(id);
             if (!res) {
                 Log.i(CapacitorUpdater.TAG, "Double error, cannot cleanup: " + version);
@@ -354,10 +358,10 @@ public class CapacitorUpdater {
 
         try {
             if (!isManifest) {
-                final File unzipped = this.unzip(id, downloaded, this.randomString());
+                extractedDir = this.unzip(id, downloaded, this.randomString());
                 this.notifyDownload(id, 91);
                 final String idName = bundleDirectory + "/" + id;
-                this.flattenAssets(unzipped, idName);
+                this.flattenAssets(extractedDir, idName);
             } else {
                 this.notifyDownload(id, 91);
                 final String idName = bundleDirectory + "/" + id;
@@ -381,6 +385,10 @@ public class CapacitorUpdater {
                 }
             }
         } catch (IOException e) {
+            if (!isManifest) {
+                safeDelete(extractedDir);
+                safeDelete(downloaded);
+            }
             e.printStackTrace();
             final JSObject ret = new JSObject();
             ret.put("version", CapacitorUpdater.this.getCurrentBundle().getVersionName());
@@ -388,6 +396,9 @@ public class CapacitorUpdater {
             CapacitorUpdater.this.sendStats("download_fail");
             return false;
         }
+        if (!isManifest) {
+            safeDelete(downloaded);
+        }
         return true;
     }
 
@@ -405,6 +416,21 @@ public class CapacitorUpdater {
         }
     }
 
+    private void safeDelete(final File target) {
+        if (target == null || !target.exists()) {
+            return;
+        }
+        try {
+            if (target.isDirectory()) {
+                this.deleteDirectory(target);
+            } else if (!target.delete()) {
+                Log.w(TAG, "Failed to delete file: " + target.getAbsolutePath());
+            }
+        } catch (IOException cleanupError) {
+            Log.w(TAG, "Cleanup failed for " + target.getAbsolutePath() + ": " + cleanupError.getMessage());
+        }
+    }
+
     private void setCurrentBundle(final File bundle) {
         this.editor.putString(WebView.CAP_SERVER_PATH, bundle.getPath());
         Log.i(TAG, "Current bundle set to: " + bundle);

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.23";
+    private final String PLUGIN_VERSION = "6.14.25";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -1002,6 +1002,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 +1023,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 +1045,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 +1080,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;
                         }

package/ios/Plugin/BundleStatus.swift

@@ -27,7 +27,7 @@ struct LocalizedString: ExpressibleByStringLiteral, Equatable {
     }
 }
 
-func ==(lhs: LocalizedString, rhs: LocalizedString) -> Bool {
+func == (lhs: LocalizedString, rhs: LocalizedString) -> Bool {
     return lhs.v == rhs.v
 }
 

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.23"
+    private let PLUGIN_VERSION: String = "6.14.25"
     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"
@@ -732,10 +732,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 +765,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" {

package/package.json

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