@capgo/capacitor-updater 5.7.1 → 5.7.3

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.1";
+  private final String PLUGIN_VERSION = "5.7.3";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -822,6 +822,9 @@ public class CapacitorUpdaterPlugin extends Plugin {
     if (this.periodCheckDelay == 0 || !this._isAutoUpdateEnabled()) {
       return;
     }
+    // The delay should be equal to this.periodCheckDelay.
+    // In appMovedToForeground we schedule a backgroundDownload and it happens BEFORE this scheduleAtFixedRate
+    // As such we get a race condition
     final Timer timer = new Timer();
     timer.scheduleAtFixedRate(
       new TimerTask() {
@@ -854,7 +857,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
           }
         }
       },
-      0,
+      this.periodCheckDelay,
       this.periodCheckDelay
     );
   }

package/ios/Plugin/CapacitorUpdater.swift

@@ -227,6 +227,7 @@ extension CustomError: LocalizedError {
     private let INFO_SUFFIX: String = "_info"
     private let FALLBACK_VERSION: String = "pastVersion"
     private let NEXT_VERSION: String = "nextVersion"
+    private var unzipPercent = 0
 
     public let TAG: String = "✨  Capacitor-updater:"
     public let CAP_SERVER_PATH: String = "serverBasePath"
@@ -385,7 +386,7 @@ extension CustomError: LocalizedError {
                 throw NSError(domain: "Invalid session key data", code: 1, userInfo: nil)
             }
 
-            guard let sessionKeyDataDecrypted = try? rsaPrivateKey.decrypt(data: sessionKeyDataEncrypted) else {
+            guard let sessionKeyDataDecrypted = rsaPrivateKey.decrypt(data: sessionKeyDataEncrypted) else {
                 throw NSError(domain: "Failed to decrypt session key data", code: 2, userInfo: nil)
             }
 
@@ -395,7 +396,7 @@ extension CustomError: LocalizedError {
                 throw NSError(domain: "Failed to read encrypted data", code: 3, userInfo: nil)
             }
 
-            guard let decryptedData = try? aesPrivateKey.decrypt(data: encryptedData) else {
+            guard let decryptedData = aesPrivateKey.decrypt(data: encryptedData) else {
                 throw NSError(domain: "Failed to decrypt data", code: 4, userInfo: nil)
             }
 
@@ -407,19 +408,73 @@ extension CustomError: LocalizedError {
         }
     }
 
+    private func unzipProgressHandler(entry: String, zipInfo: unz_file_info, entryNumber: Int, total: Int, destUnZip: URL, id: String, unzipError: inout NSError?) {
+        if entry.contains("\\") {
+            print("\(self.TAG) unzip: Windows path is not supported, please use unix path as required by zip RFC: \(entry)")
+            self.sendStats(action: "windows_path_fail")
+        }
+
+        let fileURL = destUnZip.appendingPathComponent(entry)
+        let canonicalPath = fileURL.path
+        let canonicalDir = destUnZip.path
+
+        if !canonicalPath.hasPrefix(canonicalDir) {
+            self.sendStats(action: "canonical_path_fail")
+            unzipError = NSError(domain: "CanonicalPathError", code: 0, userInfo: nil)
+        }
+
+        let isDirectory = entry.hasSuffix("/")
+        if !isDirectory {
+            let folderURL = fileURL.deletingLastPathComponent()
+            if !FileManager.default.fileExists(atPath: folderURL.path) {
+                do {
+                    try FileManager.default.createDirectory(at: folderURL, withIntermediateDirectories: true, attributes: nil)
+                } catch {
+                    self.sendStats(action: "directory_path_fail")
+                    unzipError = error as NSError
+                }
+            }
+        }
+
+        let newPercent = Int(Double(entryNumber) / Double(total) * 100)
+        if newPercent != self.unzipPercent {
+            self.unzipPercent = newPercent
+            self.notifyDownload(id, self.calcTotalPercent(percent: self.unzipPercent, min: 75, max: 90))
+        }
+    }
+
     private func saveDownloaded(sourceZip: URL, id: String, base: URL) throws {
         try prepareFolder(source: base)
         let destHot: URL = base.appendingPathComponent(id)
         let destUnZip: URL = documentsDir.appendingPathComponent(randomString(length: 10))
-        if !SSZipArchive.unzipFile(atPath: sourceZip.path, toDestination: destUnZip.path) {
+
+        self.unzipPercent = 0
+        self.notifyDownload(id, 75)
+
+        var unzipError: NSError?
+        let success = SSZipArchive.unzipFile(atPath: sourceZip.path,
+                                             toDestination: destUnZip.path,
+                                             preserveAttributes: true,
+                                             overwrite: true,
+                                             nestedZipLevel: 1,
+                                             password: nil,
+                                             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)
+                                             },
+                                             completionHandler: nil)
+
+        if !success || unzipError != nil {
             self.sendStats(action: "unzip_fail")
-            throw CustomError.cannotUnzip
+            throw unzipError ?? CustomError.cannotUnzip
         }
+
         if try unflatFolder(source: destUnZip, dest: destHot) {
             try deleteFolder(source: destUnZip)
         }
     }
-
     private func createInfoObject() -> InfoObject {
         return InfoObject(
             platform: "ios",
@@ -703,7 +758,7 @@ extension CustomError: LocalizedError {
             return setChannel
         }
         let semaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
-        var parameters: InfoObject = self.createInfoObject()
+        let parameters: InfoObject = self.createInfoObject()
 
         let request = AF.request(self.channelUrl, method: .delete, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
 

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.1"
+    private let PLUGIN_VERSION: String = "5.7.3"
     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"

package/package.json

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