@capgo/capacitor-updater 7.0.22 → 7.0.26

package/CapgoCapacitorUpdater.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '14.0'
   s.dependency 'Capacitor'
   s.dependency 'SSZipArchive', '2.4.3'
-  s.dependency 'Alamofire'
-  s.dependency 'Version'
+  s.dependency 'Alamofire', '5.10.2'
+  s.dependency 'Version', '0.8.0'
   s.swift_version = '5.1'
 end

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.22";
+    private final String PLUGIN_VERSION = "7.0.26";
     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;
@@ -162,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();
@@ -215,9 +229,11 @@ 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());
         }
     }
@@ -392,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();
@@ -459,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/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.22"
+    private let PLUGIN_VERSION: String = "7.0.26"
     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.22",
+  "version": "7.0.26",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",