@capgo/capacitor-updater 5.7.18 → 5.7.20

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

@@ -55,7 +55,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "5.7.18";
+  private final String PLUGIN_VERSION = "5.7.20";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -366,7 +366,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
   @PluginMethod
   public void setUpdateUrl(final PluginCall call) {
     if (!this.getConfig().getBoolean("allowModifyUrl", false)) {
-      Log.e(CapacitorUpdater.TAG, "setUpdateUrl not allowed");
+      Log.e(
+        CapacitorUpdater.TAG,
+        "setUpdateUrl not allowed set allowModifyUrl in your config to true to allow it"
+      );
       call.reject("setUpdateUrl not allowed");
       return;
     }
@@ -383,7 +386,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
   @PluginMethod
   public void setStatsUrl(final PluginCall call) {
     if (!this.getConfig().getBoolean("allowModifyUrl", false)) {
-      Log.e(CapacitorUpdater.TAG, "setStatsUrl not allowed");
+      Log.e(
+        CapacitorUpdater.TAG,
+        "setStatsUrl not allowed set allowModifyUrl in your config to true to allow it"
+      );
       call.reject("setStatsUrl not allowed");
       return;
     }
@@ -400,7 +406,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
   @PluginMethod
   public void setChannelUrl(final PluginCall call) {
     if (!this.getConfig().getBoolean("allowModifyUrl", false)) {
-      Log.e(CapacitorUpdater.TAG, "setChannelUrl not allowed");
+      Log.e(
+        CapacitorUpdater.TAG,
+        "setChannelUrl not allowed set allowModifyUrl in your config to true to allow it"
+      );
       call.reject("setChannelUrl not allowed");
       return;
     }

package/ios/Plugin/CapacitorUpdater.swift

@@ -436,14 +436,14 @@ extension CustomError: LocalizedError {
             }
         }
 
-        let newPercent = Int(Double(entryNumber) / Double(total) * 100)
+        let newPercent = self.calcTotalPercent(percent: Int(Double(entryNumber) / Double(total) * 100), min: 75, max: 81)
         if newPercent != self.unzipPercent {
             self.unzipPercent = newPercent
-            self.notifyDownload(id, self.calcTotalPercent(percent: self.unzipPercent, min: 75, max: 90))
+            self.notifyDownload(id, newPercent)
         }
     }
 
-    private func saveDownloaded(sourceZip: URL, id: String, base: URL) throws {
+    private func saveDownloaded(sourceZip: URL, id: String, base: URL, notify: Bool) throws {
         try prepareFolder(source: base)
         let destHot: URL = base.appendingPathComponent(id)
         let destUnZip: URL = documentsDir.appendingPathComponent(randomString(length: 10))
@@ -451,7 +451,9 @@ extension CustomError: LocalizedError {
         self.unzipPercent = 0
         self.notifyDownload(id, 75)
 
+        let semaphore = DispatchSemaphore(value: 0)
         var unzipError: NSError?
+
         let success = SSZipArchive.unzipFile(atPath: sourceZip.path,
                                              toDestination: destUnZip.path,
                                              preserveAttributes: true,
@@ -461,10 +463,19 @@ extension CustomError: LocalizedError {
                                              error: &unzipError,
                                              delegate: nil,
                                              progressHandler: { [weak self] (entry, zipInfo, entryNumber, total) in
-                                                guard let self = self else { return }
-                                                self.unzipProgressHandler(entry: entry, zipInfo: zipInfo, entryNumber: entryNumber, total: total, destUnZip: destUnZip, id: id, unzipError: &unzipError)
+                                                DispatchQueue.global(qos: .background).async {
+                                                    guard let self = self else { return }
+                                                    if !notify {
+                                                        return
+                                                    }
+                                                    self.unzipProgressHandler(entry: entry, zipInfo: zipInfo, entryNumber: entryNumber, total: total, destUnZip: destUnZip, id: id, unzipError: &unzipError)
+                                                }
                                              },
-                                             completionHandler: nil)
+                                             completionHandler: { _, _, _  in
+                                                semaphore.signal()
+                                             })
+
+        semaphore.wait()
 
         if !success || unzipError != nil {
             self.sendStats(action: "unzip_fail")
@@ -475,6 +486,7 @@ extension CustomError: LocalizedError {
             try deleteFolder(source: destUnZip)
         }
     }
+
     private func createInfoObject() -> InfoObject {
         return InfoObject(
             platform: "ios",
@@ -571,11 +583,10 @@ extension CustomError: LocalizedError {
                     do {
                         try self.decryptFile(filePath: fileURL, sessionKey: sessionKey, version: version)
                         checksum = self.getChecksum(filePath: fileURL)
-                        try self.saveDownloaded(sourceZip: fileURL, id: id, base: self.documentsDir.appendingPathComponent(self.bundleDirectoryHot))
-                        self.notifyDownload(id, 85)
-                        try self.saveDownloaded(sourceZip: fileURL, id: id, base: self.libraryDir.appendingPathComponent(self.bundleDirectory))
-                        self.notifyDownload(id, 100)
+                        try self.saveDownloaded(sourceZip: fileURL, id: id, base: self.documentsDir.appendingPathComponent(self.bundleDirectoryHot), notify: true)
+                        try self.saveDownloaded(sourceZip: fileURL, id: id, base: self.libraryDir.appendingPathComponent(self.bundleDirectory), notify: false)
                         try self.deleteFolder(source: fileURL)
+                        self.notifyDownload(id, 100)
                     } catch {
                         print("\(self.TAG) download unzip error", error)
                         mainError = error as NSError

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -15,7 +15,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "5.7.18"
+    private let PLUGIN_VERSION: String = "5.7.20"
     static let updateUrlDefault = "https://api.capgo.app/updates"
     static let statsUrlDefault = "https://api.capgo.app/stats"
     static let channelUrlDefault = "https://api.capgo.app/channel_self"
@@ -143,9 +143,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
 
     @objc func setUpdateUrl(_ call: CAPPluginCall) {
-        if !call.getBool("allowModifyUrl", false) {
+        if !getConfig().getBoolean("allowModifyUrl", false) {
             print("\(self.implementation.TAG) setUpdateUrl called without allowModifyUrl")
-            call.reject("setUpdateUrl called without allowModifyUrl")
+            call.reject("setUpdateUrl called without allowModifyUrl set allowModifyUrl in your config to true to allow it")
             return
         }
         guard let url = call.getString("url") else {
@@ -158,9 +158,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
 
     @objc func setStatsUrl(_ call: CAPPluginCall) {
-        if !call.getBool("allowModifyUrl", false) {
+        if !getConfig().getBoolean("allowModifyUrl", false) {
             print("\(self.implementation.TAG) setStatsUrl called without allowModifyUrl")
-            call.reject("setStatsUrl called without allowModifyUrl")
+            call.reject("setStatsUrl called without allowModifyUrl set allowModifyUrl in your config to true to allow it")
             return
         }
         guard let url = call.getString("url") else {
@@ -173,9 +173,9 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
 
     @objc func setChannelUrl(_ call: CAPPluginCall) {
-        if !call.getBool("allowModifyUrl", false) {
+        if !getConfig().getBoolean("allowModifyUrl", false) {
             print("\(self.implementation.TAG) setChannelUrl called without allowModifyUrl")
-            call.reject("setChannelUrl called without allowModifyUrl")
+            call.reject("setChannelUrl called without allowModifyUrl set allowModifyUrl in your config to true to allow it")
             return
         }
         guard let url = call.getString("url") else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "5.7.18",
+  "version": "5.7.20",
   "packageManager": "pnpm@8.15.4",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",