@capgo/capacitor-updater 4.36.0 → 4.40.0

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

@@ -331,7 +331,7 @@ public class CapacitorUpdater {
   ) {
     try {
       final File downloaded = new File(this.documentsDir, dest);
-      this.decryptFile(downloaded, sessionKey);
+      this.decryptFile(downloaded, sessionKey, version);
       final String checksum;
       checksum = this.getChecksum(downloaded);
       this.notifyDownload(id, 71);
@@ -478,8 +478,11 @@ public class CapacitorUpdater {
     return enc.toLowerCase();
   }
 
-  private void decryptFile(final File file, final String ivSessionKey)
-    throws IOException {
+  private void decryptFile(
+    final File file,
+    final String ivSessionKey,
+    final String version
+  ) throws IOException {
     // (str != null && !str.isEmpty())
     if (
       this.privateKey == null ||
@@ -514,6 +517,7 @@ public class CapacitorUpdater {
       fos.close();
     } catch (GeneralSecurityException e) {
       Log.i(TAG, "decryptFile fail");
+      this.sendStats("decrypt_fail", version);
       e.printStackTrace();
       throw new IOException("GeneralSecurityException");
     }

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 = "4.36.0";
+  private final String PLUGIN_VERSION = "4.40.0";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;

package/ios/Plugin/CapacitorUpdater.swift

@@ -339,7 +339,7 @@ extension CustomError: LocalizedError {
         }
     }
 
-    private func decryptFile(filePath: URL, sessionKey: String) throws {
+    private func decryptFile(filePath: URL, sessionKey: String, version: String) throws {
         if self.privateKey.isEmpty || sessionKey.isEmpty {
             print("\(self.TAG) Cannot found privateKey or sessionKey")
             return
@@ -347,13 +347,13 @@ extension CustomError: LocalizedError {
         do {
             guard let rsaPrivateKey: RSAPrivateKey = .load(rsaPrivateKey: self.privateKey) else {
                 print("cannot decode privateKey", self.privateKey)
-                return
+                throw CustomError.cannotDecode
             }
 
             let sessionKeyArray: [String] = sessionKey.components(separatedBy: ":")
             guard let ivData: Data = Data(base64Encoded: sessionKeyArray[0]) else {
                 print("cannot decode sessionKey", sessionKey)
-                return
+                throw CustomError.cannotDecode
             }
             let sessionKeyDataEncrypted: Data = Data(base64Encoded: sessionKeyArray[1])!
             let sessionKeyDataDecrypted: Data = rsaPrivateKey.decrypt(data: sessionKeyDataEncrypted)!
@@ -364,6 +364,7 @@ extension CustomError: LocalizedError {
             try decryptedData.write(to: filePath)
         } catch {
             print("\(self.TAG) Cannot decode: \(filePath.path)", error)
+            self.sendStats(action: "decrypt_fail", versionName: version)
             throw CustomError.cannotDecode
         }
     }
@@ -470,7 +471,7 @@ extension CustomError: LocalizedError {
                 case .success:
                     self.notifyDownload(id, 71)
                     do {
-                        try self.decryptFile(filePath: fileURL, sessionKey: sessionKey)
+                        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)
@@ -482,7 +483,7 @@ extension CustomError: LocalizedError {
                         mainError = error as NSError
                     }
                 case let .failure(error):
-                    print("\(self.TAG) download error", response.value!, error)
+                    print("\(self.TAG) download error", response.value ?? "", error)
                     mainError = error as NSError
                 }
             }
@@ -657,7 +658,7 @@ extension CustomError: LocalizedError {
                     setChannel.message = message
                 }
             case let .failure(error):
-                print("\(self.TAG) Error set Channel", response.value!, error)
+                print("\(self.TAG) Error set Channel", response.value ?? "", error)
                 setChannel.message = "Error set Channel \(String(describing: response.value))"
                 setChannel.error = "response_error"
             }
@@ -721,7 +722,7 @@ extension CustomError: LocalizedError {
                 case .success:
                     print("\(self.TAG) Stats send for \(action), version \(versionName)")
                 case let .failure(error):
-                    print("\(self.TAG) Error sending stats: ", response.value!, error)
+                    print("\(self.TAG) Error sending stats: ", response.value ?? "", error)
                 }
             }
         }
@@ -766,7 +767,7 @@ extension CustomError: LocalizedError {
 
     private func saveBundleInfo(id: String, bundle: BundleInfo?) {
         if bundle != nil && (bundle!.isBuiltin() || bundle!.isUnknown()) {
-            print("\(self.TAG) Not saving info for bundle [\(id)]", bundle!.toString())
+            print("\(self.TAG) Not saving info for bundle [\(id)]", bundle?.toString() ?? "")
             return
         }
         if bundle == nil {

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 = "4.36.0"
+    private let PLUGIN_VERSION: String = "4.40.0"
     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"
@@ -122,7 +122,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
         let sessionKey = call.getString("sessionKey", "")
         let checksum = call.getString("checksum", "")
         let url = URL(string: urlString)
-        print("\(self.implementation.TAG) Downloading \(url!)")
+        print("\(self.implementation.TAG) Downloading \(String(describing: url))")
         DispatchQueue.global(qos: .background).async {
             do {
                 let next = try self.implementation.download(url: url!, version: version, sessionKey: sessionKey)
@@ -138,7 +138,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                 self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
                 call.resolve(next.toJSON())
             } catch {
-                print("\(self.implementation.TAG) Failed to download from: \(url!) \(error.localizedDescription)")
+                print("\(self.implementation.TAG) Failed to download from: \(String(describing: url)) \(error.localizedDescription)")
                 self.notifyListeners("downloadFailed", data: ["version": version])
                 let current: BundleInfo = self.implementation.getCurrentBundle()
                 self.implementation.sendStats(action: "download_fail", versionName: current.getVersionName())

package/package.json

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