@capgo/capacitor-updater 7.15.2 → 7.16.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.2";
+    private final String PLUGIN_VERSION = "7.16.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();

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;
@@ -354,6 +355,7 @@ public class CapgoUpdater {
         Boolean isManifest
     ) {
         File downloaded = null;
+        File extractedDir = null;
         String checksum = "";
 
         try {
@@ -385,6 +387,9 @@ public class CapgoUpdater {
             }
             // Remove the decryption for manifest downloads
         } catch (Exception e) {
+            if (!isManifest) {
+                safeDelete(downloaded);
+            }
             final Boolean res = this.delete(id);
             if (!res) {
                 logger.info("Double error, cannot cleanup: " + version);
@@ -400,10 +405,10 @@ public class CapgoUpdater {
 
         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;
@@ -431,6 +436,10 @@ public class CapgoUpdater {
                 }
             }
         } catch (IOException e) {
+            if (!isManifest) {
+                safeDelete(extractedDir);
+                safeDelete(downloaded);
+            }
             e.printStackTrace();
             final Map<String, Object> ret = new HashMap<>();
             ret.put("version", version);
@@ -438,6 +447,9 @@ public class CapgoUpdater {
             CapgoUpdater.this.sendStats("download_fail");
             return false;
         }
+        if (!isManifest) {
+            safeDelete(downloaded);
+        }
         return true;
     }
 
@@ -455,6 +467,56 @@ 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;
+        }
+        try {
+            if (target.isDirectory()) {
+                this.deleteDirectory(target);
+            } else if (!target.delete()) {
+                logger.warn("Failed to delete file: " + target.getAbsolutePath());
+            }
+        } catch (IOException cleanupError) {
+            logger.warn("Cleanup failed for " + target.getAbsolutePath() + ": " + cleanupError.getMessage());
+        }
+    }
+
     private void setCurrentBundle(final File bundle) {
         this.editor.putString(this.CAP_SERVER_PATH, bundle.getPath());
         logger.info("Current bundle set to: " + bundle);

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.2"
+    private let PLUGIN_VERSION: String = "7.16.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()

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.2",
+  "version": "7.16.0",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",