@capgo/capacitor-updater 7.28.0 → 7.30.0

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

@@ -71,7 +71,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String[] BREAKING_EVENT_NAMES = { "breakingAvailable", "majorAvailable" };
     private static final String LAST_FAILED_BUNDLE_PREF_KEY = "CapacitorUpdater.lastFailedBundle";
 
-    private final String pluginVersion = "7.28.0";
+    private final String pluginVersion = "7.30.0";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;

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

@@ -1235,18 +1235,32 @@ public class CapgoUpdater {
             return;
         }
 
-        // Auto-detect values
-        String appId = this.appId;
-        String platform = "android";
-        boolean isEmulator = this.isEmulator();
-        boolean isProd = this.isProd();
+        JSONObject json;
+        try {
+            json = this.createInfoObject();
+        } catch (JSONException e) {
+            logger.error("Error creating info object: " + e.getMessage());
+            final Map<String, Object> retError = new HashMap<>();
+            retError.put("message", "Cannot get info: " + e);
+            retError.put("error", "json_error");
+            callback.callback(retError);
+            return;
+        }
 
-        // Build URL with query parameters
+        // Build URL with query parameters from JSON
         HttpUrl.Builder urlBuilder = HttpUrl.parse(channelUrl).newBuilder();
-        urlBuilder.addQueryParameter("app_id", appId);
-        urlBuilder.addQueryParameter("platform", platform);
-        urlBuilder.addQueryParameter("is_emulator", String.valueOf(isEmulator));
-        urlBuilder.addQueryParameter("is_prod", String.valueOf(isProd));
+        try {
+            Iterator<String> keys = json.keys();
+            while (keys.hasNext()) {
+                String key = keys.next();
+                Object value = json.get(key);
+                if (value != null) {
+                    urlBuilder.addQueryParameter(key, value.toString());
+                }
+            }
+        } catch (JSONException e) {
+            logger.error("Error adding query parameters: " + e.getMessage());
+        }
 
         Request request = new Request.Builder().url(urlBuilder.build()).get().build();
 

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

@@ -179,18 +179,42 @@ public class CryptoCipher {
         }
     }
 
+    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);
+            // 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 Base64.encodeToString(decryptedChecksum, Base64.DEFAULT);
-            String result = Base64.encodeToString(decryptedChecksum, Base64.DEFAULT);
-            return result.replaceAll("\\s", ""); // Remove all whitespace, including newlines
+            // 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

@@ -54,7 +54,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isShakeMenuEnabled", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let pluginVersion: String = "7.28.0"
+    private let pluginVersion: String = "7.30.0"
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"
     static let channelUrlDefault = "https://plugin.capgo.app/channel_self"

package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -1278,20 +1278,28 @@ import UIKit
 
         let semaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
 
-        // Auto-detect values
-        let appId = self.appId
-        let platform = "ios"
-        let isEmulator = self.isEmulator()
-        let isProd = self.isProd()
+        // Create info object and convert to query parameters
+        let infoObject = self.createInfoObject()
 
-        // Create query parameters
+        // Create query parameters from InfoObject
         var urlComponents = URLComponents(string: self.channelUrl)
-        urlComponents?.queryItems = [
-            URLQueryItem(name: "app_id", value: appId),
-            URLQueryItem(name: "platform", value: platform),
-            URLQueryItem(name: "is_emulator", value: String(isEmulator)),
-            URLQueryItem(name: "is_prod", value: String(isProd))
-        ]
+        var queryItems: [URLQueryItem] = []
+
+        // Convert InfoObject to dictionary using Mirror
+        let mirror = Mirror(reflecting: infoObject)
+        for child in mirror.children {
+            if let key = child.label, let value = child.value as? CustomStringConvertible {
+                queryItems.append(URLQueryItem(name: key, value: String(describing: value)))
+            } else if let key = child.label {
+                // Handle optional values
+                let mirror = Mirror(reflecting: child.value)
+                if let value = mirror.children.first?.value {
+                    queryItems.append(URLQueryItem(name: key, value: String(describing: value)))
+                }
+            }
+        }
+
+        urlComponents?.queryItems = queryItems
 
         guard let url = urlComponents?.url else {
             logger.error("Invalid channel URL")

package/ios/Sources/CapacitorUpdaterPlugin/CryptoCipher.swift

@@ -15,15 +15,47 @@ public struct CryptoCipher {
         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 {
@@ -41,7 +73,8 @@ public struct CryptoCipher {
                 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": "7.28.0",
+  "version": "7.30.0",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",