@capgo/capacitor-updater 7.0.18 → 7.0.25

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

@@ -235,6 +235,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()), "")
@@ -249,6 +250,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,

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

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

@@ -16,6 +16,7 @@ import java.io.FileInputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.channels.FileChannel;
+import java.nio.file.Files;
 import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -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());
         }
     }
@@ -163,25 +163,38 @@ public class DownloadService extends Worker {
                 String fileHash = entry.getString("file_hash");
                 String downloadUrl = entry.getString("download_url");
 
+                if (!publicKey.isEmpty() && sessionKey != null && !sessionKey.isEmpty()) {
+                    try {
+                        fileHash = CryptoCipherV2.decryptChecksum(fileHash, publicKey);
+                    } catch (Exception e) {
+                        Log.e(TAG, "Error decrypting checksum for " + fileName, e);
+                        hasError.set(true);
+                        continue;
+                    }
+                }
+
+                final String finalFileHash = fileHash;
                 File targetFile = new File(destFolder, fileName);
-                File cacheFile = new File(cacheFolder, fileHash + "_" + new File(fileName).getName());
+                File cacheFile = new File(cacheFolder, finalFileHash + "_" + new File(fileName).getName());
                 File builtinFile = new File(builtinFolder, fileName);
 
                 // Ensure parent directories of the target file exist
                 if (!Objects.requireNonNull(targetFile.getParentFile()).exists() && !targetFile.getParentFile().mkdirs()) {
-                    throw new IOException("Failed to create parent directory for: " + targetFile.getAbsolutePath());
+                    Log.e(TAG, "Failed to create parent directory for: " + targetFile.getAbsolutePath());
+                    hasError.set(true);
+                    continue;
                 }
 
                 Future<?> future = executor.submit(() -> {
                     try {
-                        if (builtinFile.exists() && verifyChecksum(builtinFile, fileHash)) {
+                        if (builtinFile.exists() && verifyChecksum(builtinFile, finalFileHash)) {
                             copyFile(builtinFile, targetFile);
                             Log.d(TAG, "using builtin file " + fileName);
-                        } else if (cacheFile.exists() && verifyChecksum(cacheFile, fileHash)) {
+                        } else if (cacheFile.exists() && verifyChecksum(cacheFile, finalFileHash)) {
                             copyFile(cacheFile, targetFile);
                             Log.d(TAG, "already cached " + fileName);
                         } else {
-                            downloadAndVerify(downloadUrl, targetFile, cacheFile, fileHash, sessionKey, publicKey);
+                            downloadAndVerify(downloadUrl, targetFile, cacheFile, finalFileHash, sessionKey, publicKey);
                         }
 
                         long completed = completedFiles.incrementAndGet();
@@ -216,10 +229,12 @@ public class DownloadService extends Worker {
             }
 
             if (hasError.get()) {
+                Log.e(TAG, "One or more files failed to download");
                 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 +332,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 +347,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 +408,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,10 +423,18 @@ 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) {
-            Log.e(TAG, "Error in downloadAndVerify", e);
             throw new IOException("Error in downloadAndVerify: " + e.getMessage());
         }
     }
@@ -453,4 +467,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

@@ -347,7 +347,7 @@ import UIKit
         return FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent("update.dat")
     }
     private var tempData = Data()
-    
+
     private func verifyChecksum(file: URL, expectedHash: String) -> Bool {
         let actualHash = CryptoCipherV2.calcChecksum(filePath: file)
         return actualHash == expectedHash
@@ -446,9 +446,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)"])
                                 }
                             }
 
@@ -470,7 +470,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
 
@@ -479,7 +479,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)"])
                                 }
                             }
 
@@ -491,10 +491,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).")
                     }
                 }
             }
@@ -518,14 +518,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
         }
 
@@ -547,7 +576,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
                     }
@@ -555,6 +584,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
             }
 
@@ -568,15 +600,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
             }
 
@@ -586,6 +622,7 @@ import UIKit
             }
 
             if input.count == 0 {
+                print("\(CapacitorUpdater.TAG) Error: Zero input size for \(fileName)")
                 break
             }
         }

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 = "7.0.18"
+    private let PLUGIN_VERSION: String = "7.0.25"
     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/package.json

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