@capgo/capacitor-updater 6.27.11 → 6.30.0

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

@@ -708,6 +708,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
                         }
                     }
                     this.implementation.cleanupDownloadDirectories(allowedIds);
+                    this.implementation.cleanupDeltaCache();
                 }
                 this.editor.putString("LatestNativeBuildVersion", this.currentBuildVersion);
                 this.editor.apply();

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

@@ -498,6 +498,23 @@ public class CapgoUpdater {
         }
     }
 
+    public void cleanupDeltaCache() {
+        if (this.activity == null) {
+            logger.warn("Activity is null, skipping delta cache cleanup");
+            return;
+        }
+        final File cacheFolder = new File(this.activity.getCacheDir(), "capgo_downloads");
+        if (!cacheFolder.exists()) {
+            return;
+        }
+        try {
+            this.deleteDirectory(cacheFolder);
+            logger.info("Cleaned up delta cache folder");
+        } catch (IOException e) {
+            logger.error("Failed to cleanup delta cache: " + e.getMessage());
+        }
+    }
+
     public void cleanupDownloadDirectories(final Set<String> allowedIds) {
         if (this.documentsDir == null) {
             logger.warn("Documents directory is null, skipping download cleanup");

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

@@ -181,18 +181,43 @@ public class CryptoCipherV2 {
         }
     }
 
+    private static byte[] hexStringToByteArray(String s) {
+        int len = s.length();
+        byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4) + Character.digit(s.charAt(i + 1), 16));
+        }
+        return data;
+    }
+
     public static String decryptChecksum(String checksum, String publicKey) throws IOException {
         if (publicKey.isEmpty()) {
             logger.error("No encryption set (public key) ignored");
             return checksum;
         }
         try {
-            byte[] checksumBytes = Base64.decode(checksum, Base64.DEFAULT);
-            PublicKey pKey = CryptoCipherV2.stringToPublicKey(publicKey);
-            byte[] decryptedChecksum = CryptoCipherV2.decryptRSA(checksumBytes, pKey);
-            // return Base64.encodeToString(decryptedChecksum, Base64.DEFAULT);
-            String result = Base64.encodeToString(decryptedChecksum, Base64.DEFAULT);
-            return result.replaceAll("\\s", ""); // Remove all whitespace, including newlines
+            // TODO: remove this in a month or two
+            // Determine if input is hex or base64 encoded
+            // Hex strings only contain 0-9 and a-f, while base64 contains other characters
+            byte[] checksumBytes;
+            if (checksum.matches("^[0-9a-fA-F]+$")) {
+                // Hex encoded (new format from CLI for plugin versions >= 5.30.0, 6.30.0, 7.30.0)
+                checksumBytes = hexStringToByteArray(checksum);
+            } else {
+                // TODO: remove backwards compatibility
+                // Base64 encoded (old format for backwards compatibility)
+                checksumBytes = Base64.decode(checksum, Base64.DEFAULT);
+            }
+            PublicKey pKey = CryptoCipher.stringToPublicKey(publicKey);
+            byte[] decryptedChecksum = CryptoCipher.decryptRSA(checksumBytes, pKey);
+            // Return as hex string to match calcChecksum output format
+            StringBuilder hexString = new StringBuilder();
+            for (byte b : decryptedChecksum) {
+                String hex = Integer.toHexString(0xff & b);
+                if (hex.length() == 1) hexString.append('0');
+                hexString.append(hex);
+            }
+            return hexString.toString();
         } catch (GeneralSecurityException e) {
             logger.error("decryptChecksum fail: " + e.getMessage());
             throw new IOException("Decryption failed: " + e.getMessage());

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -372,6 +372,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 return id.isEmpty ? nil : id
             })
             implementation.cleanupDownloadDirectories(allowedIds: allowedIds)
+            implementation.cleanupDeltaCache()
         }
         UserDefaults.standard.set(self.currentBuildVersion, forKey: "LatestNativeBuildVersion")
         UserDefaults.standard.synchronize()

package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -998,6 +998,19 @@ import UIKit
         return self.delete(id: id, removeInfo: true)
     }
 
+    public func cleanupDeltaCache() {
+        let fileManager = FileManager.default
+        guard fileManager.fileExists(atPath: cacheFolder.path) else {
+            return
+        }
+        do {
+            try fileManager.removeItem(at: cacheFolder)
+            logger.info("Cleaned up delta cache folder")
+        } catch {
+            logger.error("Failed to cleanup delta cache: \(error.localizedDescription)")
+        }
+    }
+
     public func cleanupDownloadDirectories(allowedIds: Set<String>) {
         let bundleRoot = libraryDir.appendingPathComponent(bundleDirectory)
         let fileManager = FileManager.default

package/ios/Sources/CapacitorUpdaterPlugin/CryptoCipherV2.swift

@@ -16,15 +16,47 @@ public struct CryptoCipherV2 {
         self.logger = logger
     }
 
+    private static func hexStringToData(_ hex: String) -> Data? {
+        var data = Data()
+        var hexIterator = hex.makeIterator()
+        while let c1 = hexIterator.next(), let c2 = hexIterator.next() {
+            guard let byte = UInt8(String([c1, c2]), radix: 16) else {
+                return nil
+            }
+            data.append(byte)
+        }
+        return data
+    }
+
+    private static func isHexString(_ str: String) -> Bool {
+        let hexCharacterSet = CharacterSet(charactersIn: "0123456789abcdefABCDEF")
+        return str.unicodeScalars.allSatisfy { hexCharacterSet.contains($0) }
+    }
+
     public static func decryptChecksum(checksum: String, publicKey: String) throws -> String {
         if publicKey.isEmpty {
             logger.info("No encryption set (public key) ignored")
             return checksum
         }
         do {
-            guard let checksumBytes = Data(base64Encoded: checksum) else {
-                logger.error("Cannot decode checksum as base64: \(checksum)")
-                throw CustomError.cannotDecode
+            // Determine if input is hex or base64 encoded
+            // Hex strings only contain 0-9 and a-f, while base64 contains other characters
+            let checksumBytes: Data
+            if isHexString(checksum) {
+                // Hex encoded (new format from CLI for plugin versions >= 5.30.0, 6.30.0, 7.30.0)
+                guard let hexData = hexStringToData(checksum) else {
+                    logger.error("Cannot decode checksum as hex: \(checksum)")
+                    throw CustomError.cannotDecode
+                }
+                checksumBytes = hexData
+            } else {
+                // TODO: remove backwards compatibility
+                // Base64 encoded (old format for backwards compatibility)
+                guard let base64Data = Data(base64Encoded: checksum) else {
+                    logger.error("Cannot decode checksum as base64: \(checksum)")
+                    throw CustomError.cannotDecode
+                }
+                checksumBytes = base64Data
             }
 
             if checksumBytes.isEmpty {
@@ -42,7 +74,8 @@ public struct CryptoCipherV2 {
                 throw NSError(domain: "Failed to decrypt session key data", code: 2, userInfo: nil)
             }
 
-            return decryptedChecksum.base64EncodedString()
+            // Return as hex string to match calcChecksum output format
+            return decryptedChecksum.map { String(format: "%02x", $0) }.joined()
         } catch {
             logger.error("decryptChecksum fail: \(error.localizedDescription)")
             throw CustomError.cannotDecode

package/package.json

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