@capgo/capacitor-updater 5.0.1 → 5.0.5

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

@@ -488,8 +488,10 @@ public class CapacitorUpdater {
       this.privateKey == null ||
       this.privateKey.isEmpty() ||
       ivSessionKey == null ||
-      ivSessionKey.isEmpty()
+      ivSessionKey.isEmpty() ||
+      ivSessionKey.split(":").length != 2
     ) {
+      Log.i(TAG, "Cannot found privateKey or sessionKey");
       return;
     }
     try {
@@ -634,10 +636,15 @@ public class CapacitorUpdater {
   private boolean bundleExists(final String id) {
     final File bundle = this.getBundleDirectory(id);
     final BundleInfo bundleInfo = this.getBundleInfo(id);
-    if (bundle == null || !bundle.exists() || bundleInfo.isDeleted()) {
-      return false;
+    if (
+      bundle.isDirectory() &&
+      bundle.exists() &&
+      new File(bundle.getPath(), "/index.html").exists() &&
+      !bundleInfo.isDeleted()
+    ) {
+      return true;
     }
-    return new File(bundle.getPath(), "/index.html").exists();
+    return false;
   }
 
   public Boolean set(final BundleInfo bundle) {
@@ -1000,7 +1007,7 @@ public class CapacitorUpdater {
     if (id != null) {
       trueId = id;
     }
-    Log.d(TAG, "Getting info for bundle [" + trueId + "]");
+    // Log.d(TAG, "Getting info for bundle [" + trueId + "]");
     BundleInfo result;
     if (BundleInfo.ID_BUILTIN.equals(trueId)) {
       result = new BundleInfo(trueId, null, BundleStatus.SUCCESS, "", "");

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

@@ -55,7 +55,7 @@ public class CapacitorUpdaterPlugin
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "5.0.1";
+  private final String PLUGIN_VERSION = "5.0.5";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -228,7 +228,11 @@ public class CapacitorUpdaterPlugin
       ret.put("bundle", bundleInfo.toJSON());
       this.notifyListeners("download", ret);
       if (percent == 100) {
-        this.notifyListeners("downloadComplete", bundleInfo.toJSON());
+        final JSObject retDownloadComplete = new JSObject(
+          ret,
+          new String[] { "bundle" }
+        );
+        this.notifyListeners("downloadComplete", retDownloadComplete);
         this.implementation.sendStats(
             "download_complete",
             bundleInfo.getVersionName()

package/ios/Plugin/CapacitorUpdater.swift

@@ -348,7 +348,7 @@ extension CustomError: LocalizedError {
     }
 
     private func decryptFile(filePath: URL, sessionKey: String, version: String) throws {
-        if self.privateKey.isEmpty || sessionKey.isEmpty {
+        if self.privateKey.isEmpty || sessionKey.isEmpty  || sessionKey.components(separatedBy: ":").count != 2 {
             print("\(self.TAG) Cannot found privateKey or sessionKey")
             return
         }
@@ -473,7 +473,7 @@ extension CustomError: LocalizedError {
             let percent = self.calcTotalPercent(percent: Int(progress.fractionCompleted * 100), min: 10, max: 70)
             self.notifyDownload(id, percent)
         }
-        request.responseURL { (response) in
+        request.responseURL(queue: .global(qos: .background), completionHandler: { (response) in
             if let fileURL = response.fileURL {
                 switch response.result {
                 case .success:
@@ -496,7 +496,7 @@ extension CustomError: LocalizedError {
                 }
             }
             semaphore.signal()
-        }
+        })
         self.saveBundleInfo(id: id, bundle: BundleInfo(id: id, version: version, status: BundleStatus.DOWNLOADING, downloaded: Date(), checksum: checksum))
         self.notifyDownload(id, 0)
         semaphore.wait()
@@ -559,6 +559,10 @@ extension CustomError: LocalizedError {
         return self.delete(id: id, removeInfo: true)
     }
 
+    public func getPathHot(id: String) -> URL {
+        return documentsDir.appendingPathComponent(self.bundleDirectoryHot).appendingPathComponent(id)
+    }
+
     public func getBundleDirectory(id: String) -> URL {
         return libraryDir.appendingPathComponent(self.bundleDirectory).appendingPathComponent(id)
     }
@@ -569,12 +573,18 @@ extension CustomError: LocalizedError {
 
     private func bundleExists(id: String) -> Bool {
         let destHot: URL = self.getPathHot(id: id)
-        let destHotPersist: URL = self.getPathPersist(id: id)
+        let destHotPersist: URL = self.getBundleDirectory(id: id)
         let indexHot: URL = destHot.appendingPathComponent("index.html")
         let indexPersist: URL = destHotPersist.appendingPathComponent("index.html")
-        let url: URL = self.getBundleDirectory(id: id)
         let bundleIndo: BundleInfo = self.getBundleInfo(id: id)
-        if url.isDirectory && destHotPersist.isDirectory && indexHot.exist && indexPersist.exist && !bundleIndo.isDeleted() {
+        if
+            destHot.exist &&
+                destHot.isDirectory &&
+                destHotPersist.exist &&
+                destHotPersist.isDirectory &&
+                indexHot.exist &&
+                indexPersist.exist &&
+                !bundleIndo.isDeleted() {
             return true
         }
         return false
@@ -597,14 +607,6 @@ extension CustomError: LocalizedError {
         return false
     }
 
-    public func getPathHot(id: String) -> URL {
-        return documentsDir.appendingPathComponent(self.bundleDirectoryHot).appendingPathComponent(id)
-    }
-
-    public func getPathPersist(id: String) -> URL {
-        return libraryDir.appendingPathComponent(self.bundleDirectory).appendingPathComponent(id)
-    }
-
     public func reset() {
         self.reset(isInternal: false)
     }
@@ -741,7 +743,7 @@ extension CustomError: LocalizedError {
         if id != nil {
             trueId = id!
         }
-        print("\(self.TAG) Getting info for bundle [\(trueId)]")
+        // print("\(self.TAG) Getting info for bundle [\(trueId)]")
         let result: BundleInfo
         if BundleInfo.ID_BUILTIN == trueId {
             result = BundleInfo(id: trueId, version: "", status: BundleStatus.SUCCESS, checksum: "")

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -15,7 +15,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     private var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "5.0.1"
+    private let PLUGIN_VERSION: String = "5.0.5"
     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"
@@ -531,7 +531,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                     }
                     if latest!.isDownloaded() {
                         print("\(self.implementation.TAG) Latest version already exists and download is NOT required. Update will occur next time app moves to background.")
-                        self.notifyListeners("updateAvailable", data: ["bundle": current.toJSON()])
+                        self.notifyListeners("updateAvailable", data: ["bundle": latest!.toJSON()])
                         _ = self.implementation.setNextBundle(next: latest!.getId())
                         self.endBackGroundTask()
                         return

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "5.0.1",
-  "packageManager": "pnpm@8.5.1",
+  "version": "5.0.5",
+  "packageManager": "pnpm@8.6.7",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",