@capgo/capacitor-updater 7.11.13 → 7.13.0

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

@@ -58,7 +58,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.11.13";
+    private final String PLUGIN_VERSION = "7.13.0";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -73,6 +73,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private Boolean autoUpdate = false;
     private String updateUrl = "";
     private Version currentVersionNative;
+    private String currentBuildVersion;
     private Thread backgroundTask;
     private Boolean taskRunning = false;
     private Boolean keepUrlPathAfterReload = false;
@@ -169,6 +170,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                 }
             }
             this.currentVersionNative = new Version(this.getConfig().getString("version", pInfo.versionName));
+            this.currentBuildVersion = Integer.toString(pInfo.versionCode);
             this.delayUpdateUtils = new DelayUpdateUtils(
                 this.prefs,
                 this.editor,
@@ -389,8 +391,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private boolean checkIfRecentlyInstalledOrUpdated() {
-        String currentVersion = this.currentVersionNative.getOriginalString();
-        String lastKnownVersion = this.prefs.getString("LatestVersionNative", "");
+        String currentVersion = this.currentBuildVersion;
+        String lastKnownVersion = this.prefs.getString("LatestNativeBuildVersion", "");
 
         if (lastKnownVersion.isEmpty()) {
             // First time running, consider it as recently installed
@@ -428,32 +430,21 @@ public class CapacitorUpdaterPlugin extends Plugin {
     }
 
     private void cleanupObsoleteVersions() {
-        try {
-            final Version previous = new Version(this.prefs.getString("LatestVersionNative", ""));
-            try {
-                if (
-                    !"".equals(previous.getOriginalString()) &&
-                    !Objects.equals(this.currentVersionNative.getOriginalString(), previous.getOriginalString())
-                ) {
-                    logger.info("New native version detected: " + this.currentVersionNative);
-                    this.implementation.reset(true);
-                    final List<BundleInfo> installed = this.implementation.list(false);
-                    for (final BundleInfo bundle : installed) {
-                        try {
-                            logger.info("Deleting obsolete bundle: " + bundle.getId());
-                            this.implementation.delete(bundle.getId());
-                        } catch (final Exception e) {
-                            logger.error("Failed to delete: " + bundle.getId() + " " + e.getMessage());
-                        }
-                    }
+        final String previous = this.prefs.getString("LatestNativeBuildVersion", "");
+        if (!"".equals(previous) && !Objects.equals(this.currentBuildVersion, previous)) {
+            logger.info("New native build version detected: " + this.currentBuildVersion);
+            this.implementation.reset(true);
+            final List<BundleInfo> installed = this.implementation.list(false);
+            for (final BundleInfo bundle : installed) {
+                try {
+                    logger.info("Deleting obsolete bundle: " + bundle.getId());
+                    this.implementation.delete(bundle.getId());
+                } catch (final Exception e) {
+                    logger.error("Failed to delete: " + bundle.getId() + " " + e.getMessage());
                 }
-            } catch (final Exception e) {
-                logger.error("Could not determine the current version " + e.getMessage());
             }
-        } catch (final Exception e) {
-            logger.error("Error calculating previous native version " + e.getMessage());
         }
-        this.editor.putString("LatestVersionNative", this.currentVersionNative.toString());
+        this.editor.putString("LatestNativeBuildVersion", this.currentBuildVersion);
         this.editor.apply();
     }
 

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

@@ -32,6 +32,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -78,6 +80,8 @@ public class CapgoUpdater {
     public String deviceID = "";
     public int timeout = 20000;
 
+    private final Map<String, CompletableFuture<BundleInfo>> downloadFutures = new ConcurrentHashMap<>();
+
     public CapgoUpdater(Logger logger) {
         this.logger = logger;
         // Simple OkHttpClient - actual configuration happens in plugin
@@ -245,12 +249,11 @@ public class CapgoUpdater {
                             boolean isManifest = outputData.getBoolean(DownloadService.IS_MANIFEST, false);
 
                             boolean success = finishDownload(id, dest, version, sessionKey, checksum, true, isManifest);
+                            BundleInfo resultBundle;
                             if (!success) {
                                 logger.error("Finish download failed: " + version);
-                                saveBundleInfo(
-                                    id,
-                                    new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "")
-                                );
+                                resultBundle = new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "");
+                                saveBundleInfo(id, resultBundle);
                                 // Cleanup download tracking
                                 DownloadWorkerManager.cancelBundleDownload(activity, id, version);
                                 Map<String, Object> ret = new HashMap<>();
@@ -261,6 +264,13 @@ public class CapgoUpdater {
                             } else {
                                 // Successful download - cleanup tracking
                                 DownloadWorkerManager.cancelBundleDownload(activity, id, version);
+                                resultBundle = getBundleInfo(id);
+                            }
+
+                            // Complete the future if it exists
+                            CompletableFuture<BundleInfo> future = downloadFutures.remove(id);
+                            if (future != null) {
+                                future.complete(resultBundle);
                             }
                             break;
                         case FAILED:
@@ -268,10 +278,14 @@ public class CapgoUpdater {
                             String error = failedData.getString(DownloadService.ERROR);
                             logger.error("Download failed: " + error + " " + workInfo.getState());
                             String failedVersion = failedData.getString(DownloadService.VERSION);
-                            saveBundleInfo(
+                            BundleInfo failedBundle = new BundleInfo(
                                 id,
-                                new BundleInfo(id, failedVersion, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "")
+                                failedVersion,
+                                BundleStatus.ERROR,
+                                new Date(System.currentTimeMillis()),
+                                ""
                             );
+                            saveBundleInfo(id, failedBundle);
                             // Cleanup download tracking for failed downloads
                             DownloadWorkerManager.cancelBundleDownload(activity, id, failedVersion);
                             Map<String, Object> ret = new HashMap<>();
@@ -282,6 +296,12 @@ public class CapgoUpdater {
                             ret.put("error", error != null ? error : "download_fail");
                             sendStats("download_fail", failedVersion);
                             notifyListeners("downloadFailed", ret);
+
+                            // Complete the future with error status
+                            CompletableFuture<BundleInfo> failedFuture = downloadFutures.remove(id);
+                            if (failedFuture != null) {
+                                failedFuture.complete(failedBundle);
+                            }
                             break;
                     }
                 });
@@ -485,36 +505,30 @@ public class CapgoUpdater {
         this.notifyDownload(id, 5);
         final String dest = this.randomString();
 
-        // Use the new WorkManager-based download
+        // Create a CompletableFuture to track download completion
+        CompletableFuture<BundleInfo> downloadFuture = new CompletableFuture<>();
+        downloadFutures.put(id, downloadFuture);
+
+        // Start the download
         this.download(id, url, dest, version, sessionKey, checksum, null);
 
-        // Wait for completion
+        // Wait for completion without timeout
         try {
-            ListenableFuture<List<WorkInfo>> future = WorkManager.getInstance(activity).getWorkInfosByTag(id);
-
-            List<WorkInfo> workInfos = Futures.getChecked(future, IOException.class);
-
-            if (workInfos != null && !workInfos.isEmpty()) {
-                WorkInfo workInfo = workInfos.get(0);
-                while (!workInfo.getState().isFinished()) {
-                    Thread.sleep(100);
-                    workInfos = Futures.getChecked(WorkManager.getInstance(activity).getWorkInfosByTag(id), IOException.class);
-                    if (workInfos != null && !workInfos.isEmpty()) {
-                        workInfo = workInfos.get(0);
-                    }
-                }
-
-                if (workInfo.getState() != WorkInfo.State.SUCCEEDED) {
-                    Data outputData = workInfo.getOutputData();
-                    String error = outputData.getString(DownloadService.ERROR);
-                    throw new IOException(error != null ? error : "Download failed: " + workInfo.getState());
-                }
+            BundleInfo result = downloadFuture.get();
+            if (result.isErrorStatus()) {
+                throw new IOException("Download failed with status: " + result.getStatus());
             }
-            return getBundleInfo(id);
+            return result;
         } catch (Exception e) {
-            logger.error("Error waiting for download " + e.getMessage());
-            saveBundleInfo(id, new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), ""));
-            throw new IOException("Error waiting for download: " + e.getMessage());
+            // Clean up on failure
+            downloadFutures.remove(id);
+            logger.error("Error waiting for download: " + e.getMessage());
+            BundleInfo errorBundle = new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "");
+            saveBundleInfo(id, errorBundle);
+            if (e instanceof IOException) {
+                throw (IOException) e;
+            }
+            throw new IOException("Error waiting for download: " + e.getMessage(), e);
         }
     }
 

package/ios/Plugin/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.11.13"
+    private let PLUGIN_VERSION: String = "7.13.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"
@@ -59,6 +59,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     private var statsUrl = ""
     private var backgroundTaskID: UIBackgroundTaskIdentifier = UIBackgroundTaskIdentifier.invalid
     private var currentVersionNative: Version = "0.0.0"
+    private var currentBuildVersion: String = "0"
     private var autoUpdate = false
     private var appReadyTimeout = 10000
     private var appReadyCheck: DispatchWorkItem?
@@ -107,6 +108,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         } catch {
             logger.error("Cannot parse versionName \(versionName)")
         }
+        currentBuildVersion = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "0"
         logger.info("version native \(self.currentVersionNative.description)")
         implementation.versionBuild = getConfig().getString("version", Bundle.main.versionName)!
         autoDeleteFailed = getConfig().getBoolean("autoDeleteFailed", true)
@@ -235,13 +237,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     private func cleanupObsoleteVersions() {
-        var LatestVersionNative: Version = "0.0.0"
-        do {
-            LatestVersionNative = try Version(UserDefaults.standard.string(forKey: "LatestVersionNative") ?? "0.0.0")
-        } catch {
-            logger.error("Cannot get version native \(currentVersionNative)")
-        }
-        if LatestVersionNative != "0.0.0" && self.currentVersionNative.description != LatestVersionNative.description {
+        let previous = UserDefaults.standard.string(forKey: "LatestNativeBuildVersion") ?? "0"
+        if previous != "0" && self.currentBuildVersion != previous {
             _ = self._reset(toLastSuccessful: false)
             let res = implementation.list()
             res.forEach { version in
@@ -252,7 +249,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 }
             }
         }
-        UserDefaults.standard.set( self.currentVersionNative.description, forKey: "LatestVersionNative")
+        UserDefaults.standard.set(self.currentBuildVersion, forKey: "LatestNativeBuildVersion")
         UserDefaults.standard.synchronize()
     }
 
@@ -846,10 +843,10 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
 
     private func checkIfRecentlyInstalledOrUpdated() -> Bool {
         let userDefaults = UserDefaults.standard
-        let currentVersion = self.currentVersionNative.description
-        let lastKnownVersion = userDefaults.string(forKey: "LatestVersionNative") ?? "0.0.0"
+        let currentVersion = self.currentBuildVersion
+        let lastKnownVersion = userDefaults.string(forKey: "LatestNativeBuildVersion") ?? "0"
 
-        if lastKnownVersion == "0.0.0" {
+        if lastKnownVersion == "0" {
             // First time running, consider it as recently installed
             return true
         } else if lastKnownVersion != currentVersion {

package/package.json

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