@capgo/capacitor-updater 7.13.5 → 7.13.11

package/CapgoCapacitorUpdater.podspec

@@ -10,12 +10,12 @@ Pod::Spec.new do |s|
   s.homepage = package['repository']['url']
   s.author = package['author']
   s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
-  s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
+  s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target = '14.0'
   s.dependency 'Capacitor'
   s.dependency 'SSZipArchive', '2.4.3'
   s.dependency 'Alamofire', '5.10.2'
   s.dependency 'Version', '0.8.0'
-  s.dependency 'BigInt', '5.2.0'
+  s.dependency 'BigInt', '5.6.0'
   s.swift_version = '5.1'
 end

package/Package.swift

@@ -14,7 +14,7 @@ let package = Package(
         .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.10.2")),
         .package(url: "https://github.com/ZipArchive/ZipArchive.git", exact: "2.4.3"),
         .package(url: "https://github.com/mrackwitz/Version.git", exact: "0.8.0"),
-        .package(url: "https://github.com/attaswift/BigInt.git", from: "5.5.2")
+        .package(url: "https://github.com/attaswift/BigInt.git", from: "5.6.0")
     ],
     targets: [
         .target(
@@ -27,11 +27,11 @@ let package = Package(
                 .product(name: "Version", package: "Version"),
                 .product(name: "BigInt", package: "BigInt")
             ],
-            path: "ios/Plugin"),
+            path: "ios/Sources/CapacitorUpdaterPlugin"),
         .testTarget(
             name: "CapacitorUpdaterPluginTests",
             dependencies: ["CapacitorUpdaterPlugin"],
-            path: "ios/PluginTests")
+            path: "ios/Tests/CapacitorUpdaterPluginTests")
     ],
     swiftLanguageVersions: [.v5]
 )

package/android/build.gradle

@@ -49,7 +49,7 @@ repositories {
 
 
 dependencies {
-    def work_version = "2.10.1"
+    def work_version = "2.10.2"
     implementation "androidx.work:work-runtime:$work_version"
     implementation "com.google.android.gms:play-services-tasks:18.2.1"
     implementation "com.google.guava:guava:33.4.8-android"
@@ -57,7 +57,7 @@ dependencies {
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation 'io.github.g00fy2:versioncompare:1.5.0'
-    implementation 'com.google.code.gson:gson:2.13.1'
+    implementation 'com.google.code.gson:gson:2.13.2'
     testImplementation "junit:junit:$junitVersion"
     testImplementation 'org.mockito:mockito-core:5.14.2'
     testImplementation 'org.robolectric:robolectric:4.13'

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

@@ -58,7 +58,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     private static final String statsUrlDefault = "https://plugin.capgo.app/stats";
     private static final String channelUrlDefault = "https://plugin.capgo.app/channel_self";
 
-    private final String PLUGIN_VERSION = "7.13.5";
+    private final String PLUGIN_VERSION = "7.13.11";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -196,7 +196,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         }
 
         // Set logger for shared classes
-        CryptoCipherV2.setLogger(logger);
+        CryptoCipher.setLogger(logger);
         DownloadService.setLogger(logger);
         DownloadWorkerManager.setLogger(logger);
 

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

@@ -371,11 +371,11 @@ public class CapgoUpdater {
                 }
 
                 if (!sessionKey.isEmpty()) {
-                    CryptoCipherV2.decryptFile(downloaded, publicKey, sessionKey);
-                    checksumDecrypted = CryptoCipherV2.decryptChecksum(checksumRes, publicKey);
-                    checksum = CryptoCipherV2.calcChecksum(downloaded);
+                    CryptoCipher.decryptFile(downloaded, publicKey, sessionKey);
+                    checksumDecrypted = CryptoCipher.decryptChecksum(checksumRes, publicKey);
+                    checksum = CryptoCipher.calcChecksum(downloaded);
                 } else {
-                    checksum = CryptoCipherV2.calcChecksum(downloaded);
+                    checksum = CryptoCipher.calcChecksum(downloaded);
                 }
                 if ((!checksumDecrypted.isEmpty() || !this.publicKey.isEmpty()) && !checksumDecrypted.equals(checksum)) {
                     logger.error("Error checksum '" + checksumDecrypted + "' '" + checksum + "' '");

package/android/src/main/java/ee/forgr/capacitor_updater/{CryptoCipherV2.java → CryptoCipher.java}

@@ -35,7 +35,7 @@ import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-public class CryptoCipherV2 {
+public class CryptoCipher {
 
     private static Logger logger;
 
@@ -153,10 +153,10 @@ public class CryptoCipherV2 {
             String sessionKeyB64 = ivSessionKey.split(":")[1];
             byte[] iv = Base64.decode(ivB64.getBytes(), Base64.DEFAULT);
             byte[] sessionKey = Base64.decode(sessionKeyB64.getBytes(), Base64.DEFAULT);
-            PublicKey pKey = CryptoCipherV2.stringToPublicKey(publicKey);
-            byte[] decryptedSessionKey = CryptoCipherV2.decryptRSA(sessionKey, pKey);
+            PublicKey pKey = CryptoCipher.stringToPublicKey(publicKey);
+            byte[] decryptedSessionKey = CryptoCipher.decryptRSA(sessionKey, pKey);
 
-            SecretKey sKey = CryptoCipherV2.byteToSessionKey(decryptedSessionKey);
+            SecretKey sKey = CryptoCipher.byteToSessionKey(decryptedSessionKey);
             byte[] content = new byte[(int) file.length()];
 
             try (
@@ -166,7 +166,7 @@ public class CryptoCipherV2 {
             ) {
                 dis.readFully(content);
                 dis.close();
-                byte[] decrypted = CryptoCipherV2.decryptAES(content, sKey, iv);
+                byte[] decrypted = CryptoCipher.decryptAES(content, sKey, iv);
                 // write the decrypted string to the file
                 try (final FileOutputStream fos = new FileOutputStream(file.getAbsolutePath())) {
                     fos.write(decrypted);
@@ -186,8 +186,8 @@ public class CryptoCipherV2 {
         }
         try {
             byte[] checksumBytes = Base64.decode(checksum, Base64.DEFAULT);
-            PublicKey pKey = CryptoCipherV2.stringToPublicKey(publicKey);
-            byte[] decryptedChecksum = CryptoCipherV2.decryptRSA(checksumBytes, pKey);
+            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

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

@@ -210,7 +210,7 @@ public class DownloadService extends Worker {
 
                 if (!publicKey.isEmpty() && sessionKey != null && !sessionKey.isEmpty()) {
                     try {
-                        fileHash = CryptoCipherV2.decryptChecksum(fileHash, publicKey);
+                        fileHash = CryptoCipher.decryptChecksum(fileHash, publicKey);
                     } catch (Exception e) {
                         logger.error("Error decrypting checksum for " + fileName + "fileHash: " + fileHash);
                         hasError.set(true);
@@ -512,7 +512,7 @@ public class DownloadService extends Worker {
 
             if (!publicKey.isEmpty() && sessionKey != null && !sessionKey.isEmpty()) {
                 logger.debug("Decrypting file " + targetFile.getName());
-                CryptoCipherV2.decryptFile(compressedFile, publicKey, sessionKey);
+                CryptoCipher.decryptFile(compressedFile, publicKey, sessionKey);
             }
 
             // Only decompress if file has .br extension
@@ -537,7 +537,7 @@ public class DownloadService extends Worker {
 
             // Delete the compressed file
             compressedFile.delete();
-            String calculatedHash = CryptoCipherV2.calcChecksum(finalTargetFile);
+            String calculatedHash = CryptoCipher.calcChecksum(finalTargetFile);
 
             // Verify checksum
             if (calculatedHash.equals(expectedHash)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "7.13.5",
+  "version": "7.13.11",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",
@@ -41,12 +41,11 @@
   ],
   "scripts": {
     "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -scheme Plugin && cd ..",
-    "verify:iosSPM": "xcodebuild -workspace ios/Plugin.xcworkspace -scheme Plugin -destination generic/platform=iOS",
+    "verify:ios": "xcodebuild -scheme CapgoCapacitorUpdater -destination generic/platform=iOS",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "npm run build",
     "test": "npm run test:ios && npm run test:android",
-    "test:ios": "cd ios && xcodebuild test -workspace Plugin.xcworkspace -scheme PluginTests -destination 'platform=iOS Simulator,name=iPhone 16 Pro,OS=latest' && cd ..",
+    "test:ios": "./scripts/test-ios.sh",
     "test:android": "cd android && ./gradlew test && cd ..",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
     "fmt": "npm run eslint -- --fix && npm run prettier -- --write && npm run swiftlint -- --autocorrect --format",

package/ios/Plugin/AES.swift

@@ -1,69 +0,0 @@
-import BigInt
-import Foundation
-import CommonCrypto
-import CryptoKit
-
-///
-/// Constants
-///
-private enum AESConstants {
-    static let aesAlgorithm: CCAlgorithm = CCAlgorithm(kCCAlgorithmAES)
-    static let aesOptions: CCOptions = CCOptions(kCCOptionPKCS7Padding)
-}
-
-// We do all this stuff because ios is shit and open source libraries allow to do decryption with public key
-// So we have to do it manually, while in nodejs or Java it's ok and done at language level.
-
-///
-/// The AES key. Contains both the initialization vector and secret key.
-///
-public struct AES128Key {
-    /// Initialization vector
-    private let iv: Data
-    private let logger: Logger
-    private let aes128Key: Data
-    #if DEBUG
-    public var __debug_iv: Data { iv }
-    public var __debug_aes128Key: Data { aes128Key }
-    #endif
-    init(iv: Data, aes128Key: Data, logger: Logger) {
-        self.iv = iv
-        self.aes128Key = aes128Key
-        self.logger = logger
-    }
-    ///
-    /// Takes the data and uses the private key to decrypt it. Will call `CCCrypt` in CommonCrypto
-    /// and provide it `ivData` for the initialization vector. Will use cipher block chaining (CBC) as
-    /// the mode of operation.
-    ///
-    /// Returns the decrypted data.
-    ///
-    public func decrypt(data: Data) -> Data? {
-        let encryptedData: UnsafePointer<UInt8> = (data as NSData).bytes.bindMemory(to: UInt8.self, capacity: data.count)
-        let encryptedDataLength: Int = data.count
-
-        if let result: NSMutableData = NSMutableData(length: encryptedDataLength) {
-            let keyData: UnsafePointer<UInt8> = (self.aes128Key as NSData).bytes.bindMemory(to: UInt8.self, capacity: self.aes128Key.count)
-            let keyLength: size_t = size_t(self.aes128Key.count)
-            let ivData: UnsafePointer<UInt8> = (iv as NSData).bytes.bindMemory(to: UInt8.self, capacity: self.iv.count)
-
-            let decryptedData: UnsafeMutablePointer<UInt8> = UnsafeMutablePointer<UInt8>(result.mutableBytes.assumingMemoryBound(to: UInt8.self))
-            let decryptedDataLength: size_t = size_t(result.length)
-
-            var decryptedLength: size_t = 0
-
-            let status: CCCryptorStatus = CCCrypt(CCOperation(kCCDecrypt), AESConstants.aesAlgorithm, AESConstants.aesOptions, keyData, keyLength, ivData, encryptedData, encryptedDataLength, decryptedData, decryptedDataLength, &decryptedLength)
-
-            if Int32(status) == Int32(kCCSuccess) {
-                result.length = Int(decryptedLength)
-                return result as Data
-            } else {
-                logger.error("AES decryption failed with status: \(status)")
-                return nil
-            }
-        } else {
-            logger.error("Failed to allocate memory for AES decryption")
-            return nil
-        }
-    }
-}

package/ios/Plugin/BigInt.swift

@@ -1,55 +0,0 @@
-import BigInt
-
-// Extension to serialize BigInt to bytes array
-extension BigInt {
-    func serializeToBytes() -> [UInt8] {
-        let byteCount = (self.bitWidth + 7) / 8
-        var bytes = [UInt8](repeating: 0, count: byteCount)
-
-        var value = self
-        for i in 0..<byteCount {
-            bytes[byteCount - i - 1] = UInt8(truncatingIfNeeded: value & 0xFF)
-            value >>= 8
-        }
-
-        return bytes
-    }
-}
-
-// Add this custom power function to ensure safer handling of power operations
-
-// Manual exponentiation using the square-and-multiply algorithm
-// which is more efficient and avoids using the built-in functions that might handle BigInt differently
-extension BigInt {
-    func manualPower(_ exponent: BigInt, modulus: BigInt) -> BigInt {
-        // Quick checks
-        if modulus == 0 {
-            return 0
-        }
-
-        if exponent == 0 {
-            return 1
-        }
-
-        guard let base = self.magnitude as? BigUInt,
-              let exp = exponent.magnitude as? BigUInt,
-              let mod = modulus.magnitude as? BigUInt else {
-            return 0
-        }
-
-        // Square and multiply algorithm for modular exponentiation
-        var result = BigUInt(1)
-        var x = base % mod
-        var e = exp
-
-        while e > 0 {
-            if e & 1 == 1 {
-                result = (result * x) % mod
-            }
-            x = (x * x) % mod
-            e >>= 1
-        }
-
-        return BigInt(result)
-    }
-}

package/ios/Plugin/BundleInfo.swift

@@ -1,113 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-import Foundation
-
-@objc public class BundleInfo: NSObject, Decodable, Encodable {
-    public static let ID_BUILTIN: String = "builtin"
-    public static let VERSION_UNKNOWN: String = "unknown"
-    public static let DOWNLOADED_BUILTIN: String = "1970-01-01T00:00:00.000Z"
-
-    private let downloaded: String
-    private let id: String
-    private let version: String
-    private let checksum: String
-    private let status: BundleStatus
-
-    convenience init(id: String, version: String, status: BundleStatus, downloaded: Date, checksum: String) {
-        self.init(id: id, version: version, status: status, downloaded: downloaded.iso8601withFractionalSeconds, checksum: checksum)
-    }
-
-    init(id: String, version: String, status: BundleStatus, downloaded: String = BundleInfo.DOWNLOADED_BUILTIN, checksum: String) {
-        self.downloaded = downloaded.trim()
-        self.id = id
-        self.version = version
-        self.checksum = checksum
-        self.status = status
-    }
-
-    enum CodingKeys: String, CodingKey {
-        case downloaded, id, version, status, checksum
-    }
-
-    public func isBuiltin() -> Bool {
-        return BundleInfo.ID_BUILTIN == self.id
-    }
-
-    public func isUnknown() -> Bool {
-        return BundleInfo.VERSION_UNKNOWN == self.id
-    }
-
-    public func isErrorStatus() -> Bool {
-        return BundleStatus.ERROR == self.status
-    }
-
-    public func isDeleted() -> Bool {
-        return BundleStatus.DELETED == self.status
-    }
-
-    public func isDownloaded() -> Bool {
-        return !self.isBuiltin() && self.downloaded != "" && self.downloaded != BundleInfo.DOWNLOADED_BUILTIN && !self.isDeleted()
-    }
-
-    public func getDownloaded() -> String {
-        return self.isBuiltin() ? BundleInfo.DOWNLOADED_BUILTIN : self.downloaded
-    }
-
-    public func getChecksum() -> String {
-        return self.isBuiltin() ? "" : self.checksum
-    }
-
-    public func setChecksum(checksum: String) -> BundleInfo {
-        return BundleInfo(id: self.id, version: self.version, status: self.status, downloaded: self.downloaded, checksum: checksum)
-    }
-
-    public func setDownloaded(downloaded: Date) -> BundleInfo {
-        return BundleInfo(id: self.id, version: self.version, status: self.status, downloaded: downloaded, checksum: self.checksum)
-    }
-
-    public func getId() -> String {
-        return self.isBuiltin() ? BundleInfo.ID_BUILTIN : self.id
-    }
-
-    public func setId(id: String) -> BundleInfo {
-        return BundleInfo(id: id, version: self.version, status: self.status, downloaded: self.downloaded, checksum: self.checksum)
-    }
-
-    public func getVersionName() -> String {
-        return self.version.isEmpty ? BundleInfo.ID_BUILTIN : self.version
-    }
-
-    public func setVersionName(version: String) -> BundleInfo {
-        return BundleInfo(id: self.id, version: version, status: self.status, downloaded: self.downloaded, checksum: self.checksum)
-    }
-
-    public func getStatus() -> String {
-        return self.isBuiltin() ? BundleStatus.SUCCESS.localizedString : self.status.localizedString
-    }
-
-    public func setStatus(status: String) -> BundleInfo {
-        return BundleInfo(id: self.id, version: self.version, status: BundleStatus(localizedString: status)!, downloaded: self.downloaded, checksum: self.checksum)
-    }
-
-    public func toJSON() -> [String: String] {
-        return [
-            "id": self.getId(),
-            "version": self.getVersionName(),
-            "downloaded": self.getDownloaded(),
-            "checksum": self.getChecksum(),
-            "status": self.getStatus()
-        ]
-    }
-
-    public static func == (lhs: BundleInfo, rhs: BundleInfo) -> Bool {
-        return lhs.getVersionName() == rhs.getVersionName()
-    }
-
-    public func toString() -> String {
-        return "{ \"id\": \"\(self.getId())\", \"version\": \"\(self.getVersionName())\", \"downloaded\": \"\(self.getDownloaded())\", \"checksum\": \"\(self.getChecksum())\", \"status\": \"\(self.getStatus())\"}"
-    }
-}

package/ios/Plugin/BundleStatus.swift

@@ -1,48 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-import Foundation
-
-struct LocalizedString: ExpressibleByStringLiteral, Equatable {
-
-    let v: String
-
-    init(key: String) {
-        self.v = NSLocalizedString(key, comment: "")
-    }
-    init(localized: String) {
-        self.v = localized
-    }
-    init(stringLiteral value: String) {
-        self.init(key: value)
-    }
-    init(extendedGraphemeClusterLiteral value: String) {
-        self.init(key: value)
-    }
-    init(unicodeScalarLiteral value: String) {
-        self.init(key: value)
-    }
-}
-
-func ==(lhs: LocalizedString, rhs: LocalizedString) -> Bool {
-    return lhs.v == rhs.v
-}
-
-enum BundleStatus: LocalizedString, Decodable, Encodable {
-    case SUCCESS = "success"
-    case ERROR = "error"
-    case PENDING  = "pending"
-    case DELETED  = "deleted"
-    case DOWNLOADING  = "downloading"
-
-    var localizedString: String {
-        return self.rawValue.v
-    }
-
-    init?(localizedString: String) {
-        self.init(rawValue: LocalizedString(localized: localizedString))
-    }
-}