@capgo/capacitor-updater 7.15.3 → 7.17.0

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

@@ -33,9 +33,11 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.UUID;
@@ -58,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.15.3";
+    private final String PLUGIN_VERSION = "7.17.0";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -443,6 +445,14 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     logger.error("Failed to delete: " + bundle.getId() + " " + e.getMessage());
                 }
             }
+            final List<BundleInfo> storedBundles = this.implementation.list(true);
+            final Set<String> allowedIds = new HashSet<>();
+            for (final BundleInfo info : storedBundles) {
+                if (info != null && info.getId() != null && !info.getId().isEmpty()) {
+                    allowedIds.add(info.getId());
+                }
+            }
+            this.implementation.cleanupDownloadDirectories(allowedIds);
         }
         this.editor.putString("LatestNativeBuildVersion", this.currentBuildVersion);
         this.editor.apply();
@@ -1188,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(
@@ -1197,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(
@@ -1207,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()));
@@ -1235,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;
                         }
 
@@ -1253,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/android/src/main/java/ee/forgr/capacitor_updater/CapgoUpdater.java

@@ -32,6 +32,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
@@ -466,6 +467,41 @@ public class CapgoUpdater {
         }
     }
 
+    public void cleanupDownloadDirectories(final Set<String> allowedIds) {
+        if (this.documentsDir == null) {
+            logger.warn("Documents directory is null, skipping download cleanup");
+            return;
+        }
+
+        final File bundleRoot = new File(this.documentsDir, bundleDirectory);
+        if (!bundleRoot.exists() || !bundleRoot.isDirectory()) {
+            return;
+        }
+
+        final File[] entries = bundleRoot.listFiles();
+        if (entries != null) {
+            for (final File entry : entries) {
+                if (!entry.isDirectory()) {
+                    continue;
+                }
+
+                final String id = entry.getName();
+
+                if (allowedIds != null && allowedIds.contains(id)) {
+                    continue;
+                }
+
+                try {
+                    this.deleteDirectory(entry);
+                    this.removeBundleInfo(id);
+                    logger.info("Deleted orphan bundle directory: " + id);
+                } catch (IOException e) {
+                    logger.error("Failed to delete orphan bundle directory: " + id + " " + e.getMessage());
+                }
+            }
+        }
+    }
+
     private void safeDelete(final File target) {
         if (target == null || !target.exists()) {
             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.15.3"
+    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"
@@ -248,6 +248,13 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                     logger.error("Delete failed, id \(version.getId()) doesn't exist")
                 }
             }
+
+            let storedBundles = implementation.list(raw: true)
+            let allowedIds = Set(storedBundles.compactMap { info -> String? in
+                let id = info.getId()
+                return id.isEmpty ? nil : id
+            })
+            implementation.cleanupDownloadDirectories(allowedIds: allowedIds)
         }
         UserDefaults.standard.set(self.currentBuildVersion, forKey: "LatestNativeBuildVersion")
         UserDefaults.standard.synchronize()
@@ -875,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)
@@ -903,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/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -886,6 +886,42 @@ import UIKit
         return self.delete(id: id, removeInfo: true)
     }
 
+    public func cleanupDownloadDirectories(allowedIds: Set<String>) {
+        let bundleRoot = libraryDir.appendingPathComponent(bundleDirectory)
+        let fileManager = FileManager.default
+
+        guard fileManager.fileExists(atPath: bundleRoot.path) else {
+            return
+        }
+
+        do {
+            let contents = try fileManager.contentsOfDirectory(at: bundleRoot, includingPropertiesForKeys: [.isDirectoryKey], options: [.skipsHiddenFiles])
+
+            for url in contents {
+                let resourceValues = try url.resourceValues(forKeys: [.isDirectoryKey])
+                if resourceValues.isDirectory != true {
+                    continue
+                }
+
+                let id = url.lastPathComponent
+
+                if allowedIds.contains(id) {
+                    continue
+                }
+
+                do {
+                    try fileManager.removeItem(at: url)
+                    self.removeBundleInfo(id: id)
+                    logger.info("Deleted orphan bundle directory: \(id)")
+                } catch {
+                    logger.error("Failed to delete orphan bundle directory: \(id) \(error.localizedDescription)")
+                }
+            }
+        } catch {
+            logger.error("Failed to enumerate bundle directory for cleanup: \(error.localizedDescription)")
+        }
+    }
+
     public func getBundleDirectory(id: String) -> URL {
         return libraryDir.appendingPathComponent(self.bundleDirectory).appendingPathComponent(id)
     }

package/package.json

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