@capgo/capacitor-updater 6.25.5 → 6.25.7

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

@@ -71,7 +71,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.25.5";
+    private final String pluginVersion = "6.25.7";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;

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

@@ -446,11 +446,11 @@ public class CapgoUpdater {
                 this.flattenAssets(downloaded, idName);
                 downloaded.delete();
             }
-            this.notifyDownload(id, 100);
             // Remove old bundle info and set new one
             this.saveBundleInfo(id, null);
             BundleInfo next = new BundleInfo(id, version, BundleStatus.PENDING, new Date(System.currentTimeMillis()), checksum);
             this.saveBundleInfo(id, next);
+            this.notifyDownload(id, 100);
 
             final Map<String, Object> ret = new HashMap<>();
             ret.put("bundle", next.toJSONMap());

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.25.5"
+    private let pluginVersion: String = "6.25.7"
     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"
@@ -377,14 +377,14 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         UserDefaults.standard.synchronize()
     }
 
-    @objc func notifyDownload(id: String, percent: Int, ignoreMultipleOfTen: Bool = false) {
-        let bundle = self.implementation.getBundleInfo(id: id)
-        self.notifyListeners("download", data: ["percent": percent, "bundle": bundle.toJSON()])
+    @objc func notifyDownload(id: String, percent: Int, ignoreMultipleOfTen: Bool = false, bundle: BundleInfo? = nil) {
+        let bundleInfo = bundle ?? self.implementation.getBundleInfo(id: id)
+        self.notifyListeners("download", data: ["percent": percent, "bundle": bundleInfo.toJSON()])
         if percent == 100 {
-            self.notifyListeners("downloadComplete", data: ["bundle": bundle.toJSON()])
-            self.implementation.sendStats(action: "download_complete", versionName: bundle.getVersionName())
+            self.notifyListeners("downloadComplete", data: ["bundle": bundleInfo.toJSON()])
+            self.implementation.sendStats(action: "download_complete", versionName: bundleInfo.getVersionName())
         } else if percent.isMultiple(of: 10) || ignoreMultipleOfTen {
-            self.implementation.sendStats(action: "download_\(percent)", versionName: bundle.getVersionName())
+            self.implementation.sendStats(action: "download_\(percent)", versionName: bundleInfo.getVersionName())
         }
     }
 
@@ -525,7 +525,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 self.logger.error("Failed to download from: \(String(describing: url)) \(error.localizedDescription)")
                 self.notifyListeners("downloadFailed", data: ["version": version])
                 self.implementation.sendStats(action: "download_fail")
-                call.reject("Failed to download from: \(url!)", error.localizedDescription)
+                call.reject("Failed to download from: \(url!) - \(error.localizedDescription)")
             }
         }
     }

package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -62,9 +62,9 @@ import UIKit
         return Session(configuration: configuration)
     }()
 
-    public var notifyDownloadRaw: (String, Int, Bool) -> Void = { _, _, _  in }
-    public func notifyDownload(id: String, percent: Int, ignoreMultipleOfTen: Bool = false) {
-        notifyDownloadRaw(id, percent, ignoreMultipleOfTen)
+    public var notifyDownloadRaw: (String, Int, Bool, BundleInfo?) -> Void = { _, _, _, _  in }
+    public func notifyDownload(id: String, percent: Int, ignoreMultipleOfTen: Bool = false, bundle: BundleInfo? = nil) {
+        notifyDownloadRaw(id, percent, ignoreMultipleOfTen, bundle)
     }
     public var notifyDownload: (String, Int) -> Void = { _, _  in }
 
@@ -576,6 +576,7 @@ import UIKit
         // Send stats for manifest download complete
         self.sendStats(action: "download_manifest_complete", versionName: version)
 
+        self.notifyDownload(id: id, percent: 100, bundle: updatedBundle)
         logger.info("downloadManifest done \(id)")
         return updatedBundle
     }
@@ -828,7 +829,7 @@ import UIKit
         // Send stats for zip download complete
         self.sendStats(action: "download_zip_complete", versionName: version)
 
-        self.notifyDownload(id: id, percent: 100)
+        self.notifyDownload(id: id, percent: 100, bundle: info)
         logger.info("Downloading: 100% (complete)")
         return info
     }

package/package.json

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