@capgo/capacitor-updater 6.37.0 → 6.38.0

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

@@ -72,7 +72,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String[] BREAKING_EVENT_NAMES = { "breakingAvailable", "majorAvailable" };
     private static final String LAST_FAILED_BUNDLE_PREF_KEY = "CapacitorUpdater.lastFailedBundle";
 
-    private final String pluginVersion = "6.37.0";
+    private final String pluginVersion = "6.38.0";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -735,6 +735,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                             }
                         }
                         this.implementation.cleanupDownloadDirectories(allowedIds, Thread.currentThread());
+                        this.implementation.cleanupOrphanedTempFolders(Thread.currentThread());
 
                         // Check again before the expensive delta cache cleanup
                         if (Thread.currentThread().isInterrupted()) {

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

@@ -58,6 +58,7 @@ public class CapgoUpdater {
     private static final String FALLBACK_VERSION = "pastVersion";
     private static final String NEXT_VERSION = "nextVersion";
     private static final String bundleDirectory = "versions";
+    private static final String TEMP_UNZIP_PREFIX = "capgo_unzip_";
 
     public static final String TAG = "Capacitor-updater";
     public SharedPreferences.Editor editor;
@@ -452,7 +453,7 @@ public class CapgoUpdater {
 
         try {
             if (!isManifest) {
-                extractedDir = this.unzip(id, downloaded, this.randomString());
+                extractedDir = this.unzip(id, downloaded, TEMP_UNZIP_PREFIX + this.randomString());
                 this.notifyDownload(id, 91);
                 final String idName = bundleDirectory + "/" + id;
                 this.flattenAssets(extractedDir, idName);
@@ -589,6 +590,44 @@ public class CapgoUpdater {
         }
     }
 
+    public void cleanupOrphanedTempFolders(final Thread threadToCheck) {
+        if (this.documentsDir == null) {
+            logger.warn("Documents directory is null, skipping temp folder cleanup");
+            return;
+        }
+
+        final File[] entries = this.documentsDir.listFiles();
+        if (entries == null) {
+            return;
+        }
+
+        for (final File entry : entries) {
+            // Check if thread was interrupted (cancelled)
+            if (threadToCheck != null && threadToCheck.isInterrupted()) {
+                logger.warn("cleanupOrphanedTempFolders was cancelled");
+                return;
+            }
+
+            if (!entry.isDirectory()) {
+                continue;
+            }
+
+            final String folderName = entry.getName();
+
+            // Only delete folders with the temp unzip prefix
+            if (!folderName.startsWith(TEMP_UNZIP_PREFIX)) {
+                continue;
+            }
+
+            try {
+                this.deleteDirectory(entry, threadToCheck);
+                logger.info("Deleted orphaned temp unzip folder: " + folderName);
+            } catch (IOException e) {
+                logger.error("Failed to delete orphaned temp folder: " + folderName + " " + e.getMessage());
+            }
+        }
+    }
+
     private void safeDelete(final File target) {
         if (target == null || !target.exists()) {
             return;

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -54,7 +54,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isShakeMenuEnabled", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let pluginVersion: String = "6.37.0"
+    private let pluginVersion: String = "6.38.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"
@@ -403,6 +403,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                     return id.isEmpty ? nil : id
                 })
                 self.implementation.cleanupDownloadDirectories(allowedIds: allowedIds, threadToCheck: Thread.current)
+                self.implementation.cleanupOrphanedTempFolders(threadToCheck: Thread.current)
 
                 // Check again before the expensive delta cache cleanup
                 if Thread.current.isCancelled {

package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -26,6 +26,7 @@ import UIKit
     private let FALLBACK_VERSION: String = "pastVersion"
     private let NEXT_VERSION: String = "nextVersion"
     private var unzipPercent = 0
+    private let TEMP_UNZIP_PREFIX: String = "capgo_unzip_"
 
     // Add this line to declare cacheFolder
     private let cacheFolder: URL = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!.appendingPathComponent("capgo_downloads")
@@ -276,7 +277,7 @@ import UIKit
     private func saveDownloaded(sourceZip: URL, id: String, base: URL, notify: Bool) throws {
         try prepareFolder(source: base)
         let destPersist: URL = base.appendingPathComponent(id)
-        let destUnZip: URL = libraryDir.appendingPathComponent(randomString(length: 10))
+        let destUnZip: URL = libraryDir.appendingPathComponent(TEMP_UNZIP_PREFIX + randomString(length: 10))
 
         self.unzipPercent = 0
         self.notifyDownload(id: id, percent: 75)
@@ -1112,6 +1113,43 @@ import UIKit
         }
     }
 
+    public func cleanupOrphanedTempFolders(threadToCheck: Thread?) {
+        let fileManager = FileManager.default
+
+        do {
+            let contents = try fileManager.contentsOfDirectory(at: libraryDir, includingPropertiesForKeys: [.isDirectoryKey], options: [.skipsHiddenFiles])
+
+            for url in contents {
+                // Check if thread was cancelled
+                if let thread = threadToCheck, thread.isCancelled {
+                    logger.warn("cleanupOrphanedTempFolders was cancelled")
+                    return
+                }
+
+                let resourceValues = try url.resourceValues(forKeys: [.isDirectoryKey])
+                if resourceValues.isDirectory != true {
+                    continue
+                }
+
+                let folderName = url.lastPathComponent
+
+                // Only delete folders with the temp unzip prefix
+                if !folderName.hasPrefix(TEMP_UNZIP_PREFIX) {
+                    continue
+                }
+
+                do {
+                    try fileManager.removeItem(at: url)
+                    logger.info("Deleted orphaned temp unzip folder: \(folderName)")
+                } catch {
+                    logger.error("Failed to delete orphaned temp folder: \(folderName) \(error.localizedDescription)")
+                }
+            }
+        } catch {
+            logger.error("Failed to enumerate library directory for temp folder 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": "6.37.0",
+  "version": "6.38.0",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",