@capgo/capacitor-updater 6.14.11 → 6.14.12

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

@@ -10,7 +10,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
-import android.util.Base64;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LifecycleOwner;
@@ -22,27 +21,20 @@ import com.getcapacitor.plugin.WebView;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.io.BufferedInputStream;
-import java.io.DataInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.PrivateKey;
-import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
-import java.util.zip.CRC32;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-import javax.crypto.SecretKey;
 import okhttp3.*;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -245,6 +237,7 @@ public class CapacitorUpdater {
 
                             boolean success = finishDownload(id, dest, version, sessionKey, checksum, true, isManifest);
                             if (!success) {
+                                Log.e(TAG, "Finish download failed: " + version);
                                 saveBundleInfo(
                                     id,
                                     new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "")
@@ -259,6 +252,7 @@ public class CapacitorUpdater {
                         case FAILED:
                             Data failedData = workInfo.getOutputData();
                             String error = failedData.getString(DownloadService.ERROR);
+                            Log.e(TAG, "Download failed: " + error + " " + workInfo.getState());
                             String failedVersion = failedData.getString(DownloadService.VERSION);
                             saveBundleInfo(
                                 id,
@@ -344,7 +338,7 @@ public class CapacitorUpdater {
                 }
             }
             // Remove the decryption for manifest downloads
-        } catch (IOException e) {
+        } catch (Exception e) {
             final Boolean res = this.delete(id);
             if (!res) {
                 Log.i(CapacitorUpdater.TAG, "Double error, cannot cleanup: " + version);

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

@@ -57,7 +57,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 = "6.14.11";
+    private final String PLUGIN_VERSION = "6.14.12";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;

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

@@ -35,6 +35,7 @@ import okhttp3.ResponseBody;
 import org.brotli.dec.BrotliInputStream;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import java.nio.file.Files;
 
 public class DownloadService extends Worker {
 
@@ -109,7 +110,6 @@ public class DownloadService extends Worker {
                 return createSuccessResult(dest, version, sessionKey, checksum, false);
             }
         } catch (Exception e) {
-            Log.e(TAG, "Error in doWork", e);
             return createFailureResult(e.getMessage());
         }
     }
@@ -219,7 +219,7 @@ public class DownloadService extends Worker {
                 throw new IOException("One or more files failed to download");
             }
         } catch (Exception e) {
-            Log.e(TAG, "Error in handleManifestDownload", e);
+            throw new RuntimeException(e.getLocalizedMessage());
         }
     }
 
@@ -317,10 +317,8 @@ public class DownloadService extends Worker {
                 }
             }
         } catch (OutOfMemoryError e) {
-            e.printStackTrace();
             throw new RuntimeException("low_mem_fail");
         } catch (Exception e) {
-            e.printStackTrace();
             throw new RuntimeException(e.getLocalizedMessage());
         }
     }
@@ -334,7 +332,8 @@ public class DownloadService extends Worker {
             infoFile.createNewFile();
             tempFile.createNewFile();
         } catch (IOException e) {
-            e.printStackTrace();
+            Log.e(TAG, "Error in clearDownloadData", e);
+            // not a fatal error, so we don't throw an exception
         }
     }
 
@@ -394,18 +393,10 @@ public class DownloadService extends Worker {
                 decryptedExpectedHash = CryptoCipherV2.decryptChecksum(decryptedExpectedHash, publicKey);
             }
 
-            // Decompress the file
-            try (
-                FileInputStream fis = new FileInputStream(compressedFile);
-                BrotliInputStream brotliInputStream = new BrotliInputStream(fis);
-                FileOutputStream fos = new FileOutputStream(targetFile)
-            ) {
-                byte[] buffer = new byte[8192];
-                int len;
-                while ((len = brotliInputStream.read(buffer)) != -1) {
-                    fos.write(buffer, 0, len);
-                }
-            }
+            // Use new decompression method
+            byte[] compressedData = Files.readAllBytes(compressedFile.toPath());
+            byte[] decompressedData = decompressBrotli(compressedData, targetFile.getName());
+            Files.write(targetFile.toPath(), decompressedData);
 
             // Delete the compressed file
             compressedFile.delete();
@@ -417,8 +408,19 @@ public class DownloadService extends Worker {
                 copyFile(targetFile, cacheFile);
             } else {
                 targetFile.delete();
-                throw new IOException("Checksum verification failed for " + targetFile.getName());
+                throw new IOException(
+                    "Checksum verification failed for: " +
+                    downloadUrl +
+                    " " +
+                    targetFile.getName() +
+                    " expected: " +
+                    decryptedExpectedHash +
+                    " calculated: " +
+                    calculatedHash
+                );
             }
+        } catch (Exception e) {
+            throw new IOException("Error in downloadAndVerify: " + e.getMessage());
         }
     }
 
@@ -450,4 +452,63 @@ public class DownloadService extends Worker {
         }
         return sb.toString();
     }
+
+    private byte[] decompressBrotli(byte[] data, String fileName) throws IOException {
+        // Validate input
+        if (data == null) {
+            Log.e(TAG, "Error: Null data received for " + fileName);
+            throw new IOException("Null data received");
+        }
+
+        // Handle empty files
+        if (data.length == 0) {
+            return new byte[0];
+        }
+
+        // Handle the special EMPTY_BROTLI_STREAM case
+        if (data.length == 3 && data[0] == 0x1B && data[1] == 0x00 && data[2] == 0x06) {
+            return new byte[0];
+        }
+
+        // For small files, check if it's a minimal Brotli wrapper
+        if (data.length > 3) {
+            try {
+                // Handle our minimal wrapper pattern
+                if (data[0] == 0x1B && data[1] == 0x00 && data[2] == 0x06 && data[data.length - 1] == 0x03) {
+                    return Arrays.copyOfRange(data, 3, data.length - 1);
+                }
+
+                // Handle brotli.compress minimal wrapper (quality 0)
+                if (data[0] == 0x0b && data[1] == 0x02 && data[2] == (byte)0x80 && data[data.length - 1] == 0x03) {
+                    return Arrays.copyOfRange(data, 3, data.length - 1);
+                }
+            } catch (ArrayIndexOutOfBoundsException e) {
+                Log.e(TAG, "Error: Malformed data for " + fileName);
+                throw new IOException("Malformed data structure");
+            }
+        }
+
+        // For all other cases, try standard decompression
+        try (
+            ByteArrayInputStream bis = new ByteArrayInputStream(data);
+            BrotliInputStream brotliInputStream = new BrotliInputStream(bis);
+            ByteArrayOutputStream bos = new ByteArrayOutputStream()
+        ) {
+            byte[] buffer = new byte[8192];
+            int len;
+            while ((len = brotliInputStream.read(buffer)) != -1) {
+                bos.write(buffer, 0, len);
+            }
+            return bos.toByteArray();
+        } catch (IOException e) {
+            Log.e(TAG, "Error: Brotli process failed for " + fileName + ". Status: " + e.getMessage());
+            // Add hex dump for debugging
+            StringBuilder hexDump = new StringBuilder();
+            for (int i = 0; i < Math.min(32, data.length); i++) {
+                hexDump.append(String.format("%02x ", data[i]));
+            }
+            Log.e(TAG, "Error: Raw data (" + fileName + "): " + hexDump.toString());
+            throw e;
+        }
+    }
 }

package/ios/Plugin/CapacitorUpdater.swift

@@ -383,9 +383,9 @@ import UIKit
                             let statusCode = response.response?.statusCode ?? 200
                             if statusCode < 200 || statusCode >= 300 {
                                 if let stringData = String(data: data, encoding: .utf8) {
-                                    throw NSError(domain: "StatusCodeError", code: 2, userInfo: [NSLocalizedDescriptionKey: "Failed to fetch. Status code (\(statusCode)) invalid. Data: \(stringData)"])
+                                    throw NSError(domain: "StatusCodeError", code: 2, userInfo: [NSLocalizedDescriptionKey: "Failed to fetch. Status code (\(statusCode)) invalid. Data: \(stringData) for file \(fileName) at url \(downloadUrl)"])
                                 } else {
-                                    throw NSError(domain: "StatusCodeError", code: 2, userInfo: [NSLocalizedDescriptionKey: "Failed to fetch. Status code (\(statusCode)) invalid"])
+                                    throw NSError(domain: "StatusCodeError", code: 2, userInfo: [NSLocalizedDescriptionKey: "Failed to fetch. Status code (\(statusCode)) invalid for file \(fileName) at url \(downloadUrl)"])
                                 }
                             }
 
@@ -407,7 +407,7 @@ import UIKit
 
                             // Decompress the Brotli data
                             guard let decompressedData = self.decompressBrotli(data: finalData, fileName: fileName) else {
-                                throw NSError(domain: "BrotliDecompressionError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Failed to decompress Brotli data"])
+                                throw NSError(domain: "BrotliDecompressionError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Failed to decompress Brotli data for file \(fileName) at url \(downloadUrl)"])
                             }
                             finalData = decompressedData
 
@@ -416,7 +416,7 @@ import UIKit
                                 // assume that calcChecksum != null
                                 let calculatedChecksum = CryptoCipherV2.calcChecksum(filePath: destFilePath)
                                 if calculatedChecksum != fileHash {
-                                    throw NSError(domain: "ChecksumError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Computed checksum is not equal to required checksum (\(calculatedChecksum) != \(fileHash))"])
+                                    throw NSError(domain: "ChecksumError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Computed checksum is not equal to required checksum (\(calculatedChecksum) != \(fileHash)) for file \(fileName) at url \(downloadUrl)"])
                                 }
                             }
 
@@ -428,10 +428,10 @@ import UIKit
                             print("\(CapacitorUpdater.TAG) downloadManifest \(id) \(fileName) downloaded, decompressed\(!self.publicKey.isEmpty && !sessionKey.isEmpty ? ", decrypted" : ""), and cached")
                         } catch {
                             downloadError = error
-                            print("\(CapacitorUpdater.TAG) downloadManifest \(id) \(fileName) error: \(error)")
+                            NSLog("\(CapacitorUpdater.TAG) downloadManifest \(id) \(fileName) error: \(error.localizedDescription)")
                         }
                     case .failure(let error):
-                        print("\(CapacitorUpdater.TAG) downloadManifest \(id) \(fileName) download error: \(error). Debug response: \(response.debugDescription).")
+                        NSLog("\(CapacitorUpdater.TAG) downloadManifest \(id) \(fileName) download error: \(error.localizedDescription). Debug response: \(response.debugDescription).")
                     }
                 }
             }
@@ -455,14 +455,43 @@ import UIKit
     }
 
     private func decompressBrotli(data: Data, fileName: String) -> Data? {
+        // Handle empty files
+        if data.count == 0 {
+            return data
+        }
+
+        // Handle the special EMPTY_BROTLI_STREAM case
+        if data.count == 3 && data[0] == 0x1B && data[1] == 0x00 && data[2] == 0x06 {
+            return Data()
+        }
+
+        // For small files, check if it's a minimal Brotli wrapper
+        if data.count > 3 {
+            let maxBytes = min(32, data.count)
+            let hexDump = data.prefix(maxBytes).map { String(format: "%02x", $0) }.joined(separator: " ")
+            // Handle our minimal wrapper pattern
+            if data[0] == 0x1B && data[1] == 0x00 && data[2] == 0x06 && data.last == 0x03 {
+                let range = data.index(data.startIndex, offsetBy: 3)..<data.index(data.endIndex, offsetBy: -1)
+                return data[range]
+            }
+
+            // Handle brotli.compress minimal wrapper (quality 0)
+            if data[0] == 0x0b && data[1] == 0x02 && data[2] == 0x80 && data.last == 0x03 {
+                let range = data.index(data.startIndex, offsetBy: 3)..<data.index(data.endIndex, offsetBy: -1)
+                return data[range]
+            }
+        }
+
+        // For all other cases, try standard decompression
         let outputBufferSize = 65536
         var outputBuffer = [UInt8](repeating: 0, count: outputBufferSize)
         var decompressedData = Data()
 
         let streamPointer = UnsafeMutablePointer<compression_stream>.allocate(capacity: 1)
         var status = compression_stream_init(streamPointer, COMPRESSION_STREAM_DECODE, COMPRESSION_BROTLI)
+
         guard status != COMPRESSION_STATUS_ERROR else {
-            print("\(CapacitorUpdater.TAG) Unable to initialize the decompression stream. \(fileName)")
+            print("\(CapacitorUpdater.TAG) Error: Failed to initialize Brotli stream for \(fileName). Status: \(status)")
             return nil
         }
 
@@ -484,7 +513,7 @@ import UIKit
                     if let baseAddress = rawBufferPointer.baseAddress {
                         streamPointer.pointee.src_ptr = baseAddress.assumingMemoryBound(to: UInt8.self)
                     } else {
-                        print("\(CapacitorUpdater.TAG) Error: Unable to get base address of input data. \(fileName)")
+                        print("\(CapacitorUpdater.TAG) Error: Failed to get base address for \(fileName)")
                         status = COMPRESSION_STATUS_ERROR
                         return
                     }
@@ -492,6 +521,9 @@ import UIKit
             }
 
             if status == COMPRESSION_STATUS_ERROR {
+                let maxBytes = min(32, data.count)
+                let hexDump = data.prefix(maxBytes).map { String(format: "%02x", $0) }.joined(separator: " ")
+                print("\(CapacitorUpdater.TAG) Error: Brotli decompression failed for \(fileName). First \(maxBytes) bytes: \(hexDump)")
                 break
             }
 
@@ -505,15 +537,19 @@ import UIKit
             if status == COMPRESSION_STATUS_END {
                 break
             } else if status == COMPRESSION_STATUS_ERROR {
-                print("\(CapacitorUpdater.TAG) Error during Brotli decompression. \(fileName)")
-                // Try to decode as text if mostly ASCII
+                print("\(CapacitorUpdater.TAG) Error: Brotli process failed for \(fileName). Status: \(status)")
                 if let text = String(data: data, encoding: .utf8) {
                     let asciiCount = text.unicodeScalars.filter { $0.isASCII }.count
                     let totalCount = text.unicodeScalars.count
                     if totalCount > 0 && Double(asciiCount) / Double(totalCount) >= 0.8 {
-                        print("\(CapacitorUpdater.TAG) Compressed data as text: \(text)")
+                        print("\(CapacitorUpdater.TAG) Error: Input appears to be plain text: \(text)")
                     }
                 }
+
+                let maxBytes = min(32, data.count)
+                let hexDump = data.prefix(maxBytes).map { String(format: "%02x", $0) }.joined(separator: " ")
+                print("\(CapacitorUpdater.TAG) Error: Raw data (\(fileName)): \(hexDump)")
+
                 return nil
             }
 
@@ -523,6 +559,7 @@ import UIKit
             }
 
             if input.count == 0 {
+                print("\(CapacitorUpdater.TAG) Error: Zero input size for \(fileName)")
                 break
             }
         }
@@ -557,7 +594,7 @@ import UIKit
         }
         let session = Session(eventMonitors: [monitor])
 
-        var request = session.streamRequest(url, headers: requestHeaders).validate().onHTTPResponse(perform: { response  in
+        let request = session.streamRequest(url, headers: requestHeaders).validate().onHTTPResponse(perform: { response  in
             if let contentLength = response.headers.value(for: "Content-Length") {
                 targetSize = (Int(contentLength) ?? -1) + Int(totalReceivedBytes)
             }

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -45,7 +45,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "getNextBundle", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "6.14.11"
+    private let PLUGIN_VERSION: String = "6.14.12"
     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/Plugin/CryptoCipher.swift

@@ -17,56 +17,6 @@ private enum CryptoCipherConstants {
     static let aesOptions: CCOptions = CCOptions(kCCOptionPKCS7Padding)
     static let rsaAlgorithm: SecKeyAlgorithm = .rsaEncryptionOAEPSHA256
 }
-///
-/// The AES key. Contains both the initialization vector and secret key.
-///
-public struct AES128Key {
-    /// Initialization vector
-    private let iv: Data
-    private let aes128Key: Data
-    #if DEBUG
-    public var __debug_iv: Data { iv }
-    public var __debug_aes128Key: Data { aes128Key }
-    #endif
-    init(iv: Data, aes128Key: Data) {
-        self.iv = iv
-        self.aes128Key = aes128Key
-    }
-    ///
-    /// 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), CryptoCipherConstants.aesAlgorithm, CryptoCipherConstants.aesOptions, keyData, keyLength, ivData, encryptedData, encryptedDataLength, decryptedData, decryptedDataLength, &decryptedLength)
-
-            if Int32(status) == Int32(kCCSuccess) {
-                result.length = Int(decryptedLength)
-                return result as Data
-            } else {
-                return nil
-            }
-        } else {
-            return nil
-        }
-    }
-}
-
 ///
 /// The RSA keypair. Includes both private and public key.
 ///

package/ios/Plugin/CryptoCipherV2.swift

@@ -18,37 +18,48 @@ private enum CryptoCipherConstants {
     static let rsaAlgorithm: SecKeyAlgorithm = .rsaEncryptionOAEPSHA256
 }
 ///
-/// The RSA keypair. Includes both private and public key.
+/// The AES key. Contains both the initialization vector and secret key.
 ///
-public struct RSAKeyPairV2 {
-    private let privateKey: SecKey
-    private let publicKey: SecKey
-
+public struct AES128Key {
+    /// Initialization vector
+    private let iv: Data
+    private let aes128Key: Data
     #if DEBUG
-    public var __debug_privateKey: SecKey { self.privateKey }
-    public var __debug_publicKey: SecKey { self.publicKey }
+    public var __debug_iv: Data { iv }
+    public var __debug_aes128Key: Data { aes128Key }
     #endif
-
-    fileprivate init(privateKey: SecKey, publicKey: SecKey) {
-        self.privateKey = privateKey
-        self.publicKey = publicKey
+    init(iv: Data, aes128Key: Data) {
+        self.iv = iv
+        self.aes128Key = aes128Key
     }
-
-    public func extractPublicKey() -> RSAPublicKey {
-        RSAPublicKey(publicKey: publicKey)
-    }
-
     ///
-    /// Takes the data and uses the private key to decrypt it.
+    /// 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? {
-        var error: Unmanaged<CFError>?
-        if let decryptedData: CFData = SecKeyCreateDecryptedData(self.privateKey, CryptoCipherConstants.rsaAlgorithm, data as CFData, &error) {
-            if error != nil {
-                return nil
+        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), CryptoCipherConstants.aesAlgorithm, CryptoCipherConstants.aesOptions, keyData, keyLength, ivData, encryptedData, encryptedDataLength, decryptedData, decryptedDataLength, &decryptedLength)
+
+            if Int32(status) == Int32(kCCSuccess) {
+                result.length = Int(decryptedLength)
+                return result as Data
             } else {
-                return decryptedData as Data
+                return nil
             }
         } else {
             return nil

package/package.json

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