@capgo/capacitor-updater 7.34.0 → 7.34.2

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

@@ -72,7 +72,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.34.0";
+    private final String pluginVersion = "7.34.2";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;

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

@@ -302,8 +302,11 @@ public class DownloadService extends Worker {
                 }
 
                 final String finalFileHash = fileHash;
+                // Remove .br extension for decompressed files
+                boolean isBrotli = fileName.endsWith(".br");
+                String finalFileName = isBrotli ? fileName.substring(0, fileName.length() - 3) : fileName;
                 File targetFile = new File(destFolder, fileName);
-                File cacheFile = new File(cacheFolder, finalFileHash + "_" + new File(fileName).getName());
+                File cacheFile = new File(cacheFolder, finalFileHash + "_" + new File(finalFileName).getName());
                 File builtinFile = new File(builtinFolder, fileName);
 
                 // Ensure parent directories of the target file exist
@@ -589,83 +592,90 @@ public class DownloadService extends Worker {
         // Create a temporary file for the compressed data
         File compressedFile = new File(getApplicationContext().getCacheDir(), "temp_" + targetFile.getName() + ".tmp");
 
-        try (Response response = sharedClient.newCall(request).execute()) {
-            if (!response.isSuccessful()) {
-                sendStatsAsync("download_manifest_file_fail", getInputData().getString(VERSION) + ":" + finalTargetFile.getName());
-                throw new IOException("Unexpected response code: " + response.code());
-            }
+        try {
+            try (Response response = sharedClient.newCall(request).execute()) {
+                if (!response.isSuccessful()) {
+                    sendStatsAsync("download_manifest_file_fail", getInputData().getString(VERSION) + ":" + finalTargetFile.getName());
+                    throw new IOException("Unexpected response code: " + response.code());
+                }
 
-            // Download compressed file atomically
-            ResponseBody responseBody = response.body();
-            if (responseBody == null) {
-                throw new IOException("Response body is null");
-            }
+                // Download compressed file atomically
+                ResponseBody responseBody = response.body();
+                if (responseBody == null) {
+                    throw new IOException("Response body is null");
+                }
 
-            // Use OkIO for atomic write
-            writeFileAtomic(compressedFile, responseBody.byteStream(), null);
+                // Use OkIO for atomic write
+                writeFileAtomic(compressedFile, responseBody.byteStream(), null);
 
-            if (!publicKey.isEmpty() && sessionKey != null && !sessionKey.isEmpty()) {
-                logger.debug("Decrypting file " + targetFile.getName());
-                CryptoCipher.decryptFile(compressedFile, publicKey, sessionKey);
-            }
+                if (!publicKey.isEmpty() && sessionKey != null && !sessionKey.isEmpty()) {
+                    logger.debug("Decrypting file " + targetFile.getName());
+                    CryptoCipher.decryptFile(compressedFile, publicKey, sessionKey);
+                }
 
-            // Only decompress if file has .br extension
-            if (isBrotli) {
-                // Use new decompression method with atomic write
-                try (FileInputStream fis = new FileInputStream(compressedFile)) {
-                    byte[] compressedData = new byte[(int) compressedFile.length()];
-                    fis.read(compressedData);
-                    byte[] decompressedData;
-                    try {
-                        decompressedData = decompressBrotli(compressedData, targetFile.getName());
-                    } catch (IOException e) {
-                        sendStatsAsync(
-                            "download_manifest_brotli_fail",
-                            getInputData().getString(VERSION) + ":" + finalTargetFile.getName()
-                        );
-                        throw e;
-                    }
+                // Only decompress if file has .br extension
+                if (isBrotli) {
+                    // Use new decompression method with atomic write
+                    try (FileInputStream fis = new FileInputStream(compressedFile)) {
+                        byte[] compressedData = new byte[(int) compressedFile.length()];
+                        fis.read(compressedData);
+                        byte[] decompressedData;
+                        try {
+                            decompressedData = decompressBrotli(compressedData, targetFile.getName());
+                        } catch (IOException e) {
+                            sendStatsAsync(
+                                "download_manifest_brotli_fail",
+                                getInputData().getString(VERSION) + ":" + finalTargetFile.getName()
+                            );
+                            throw e;
+                        }
 
-                    // Write decompressed data atomically
-                    try (java.io.ByteArrayInputStream bais = new java.io.ByteArrayInputStream(decompressedData)) {
-                        writeFileAtomic(finalTargetFile, bais, null);
+                        // Write decompressed data atomically
+                        try (java.io.ByteArrayInputStream bais = new java.io.ByteArrayInputStream(decompressedData)) {
+                            writeFileAtomic(finalTargetFile, bais, null);
+                        }
+                    }
+                } else {
+                    // Just copy the file without decompression using atomic operation
+                    try (FileInputStream fis = new FileInputStream(compressedFile)) {
+                        writeFileAtomic(finalTargetFile, fis, null);
                     }
                 }
-            } else {
-                // Just copy the file without decompression using atomic operation
-                try (FileInputStream fis = new FileInputStream(compressedFile)) {
-                    writeFileAtomic(finalTargetFile, fis, null);
-                }
-            }
 
-            // Delete the compressed file
-            compressedFile.delete();
-            String calculatedHash = CryptoCipher.calcChecksum(finalTargetFile);
-            CryptoCipher.logChecksumInfo("Calculated checksum", calculatedHash);
-            CryptoCipher.logChecksumInfo("Expected checksum", expectedHash);
-
-            // Verify checksum
-            if (calculatedHash.equals(expectedHash)) {
-                // Only cache if checksum is correct - use atomic copy
-                try (FileInputStream fis = new FileInputStream(finalTargetFile)) {
-                    writeFileAtomic(cacheFile, fis, expectedHash);
+                // Delete the compressed file
+                compressedFile.delete();
+                String calculatedHash = CryptoCipher.calcChecksum(finalTargetFile);
+                CryptoCipher.logChecksumInfo("Calculated checksum", calculatedHash);
+                CryptoCipher.logChecksumInfo("Expected checksum", expectedHash);
+
+                // Verify checksum
+                if (calculatedHash.equals(expectedHash)) {
+                    // Only cache if checksum is correct - use atomic copy
+                    try (FileInputStream fis = new FileInputStream(finalTargetFile)) {
+                        writeFileAtomic(cacheFile, fis, expectedHash);
+                    }
+                } else {
+                    finalTargetFile.delete();
+                    sendStatsAsync("download_manifest_checksum_fail", getInputData().getString(VERSION) + ":" + finalTargetFile.getName());
+                    throw new IOException(
+                        "Checksum verification failed for: " +
+                            downloadUrl +
+                            " " +
+                            targetFile.getName() +
+                            " expected: " +
+                            expectedHash +
+                            " calculated: " +
+                            calculatedHash
+                    );
                 }
-            } else {
-                finalTargetFile.delete();
-                sendStatsAsync("download_manifest_checksum_fail", getInputData().getString(VERSION) + ":" + finalTargetFile.getName());
-                throw new IOException(
-                    "Checksum verification failed for: " +
-                        downloadUrl +
-                        " " +
-                        targetFile.getName() +
-                        " expected: " +
-                        expectedHash +
-                        " calculated: " +
-                        calculatedHash
-                );
             }
         } catch (Exception e) {
             throw new IOException("Error in downloadAndVerify: " + e.getMessage());
+        } finally {
+            // Always cleanup the compressed temp file if it still exists
+            if (compressedFile.exists()) {
+                compressedFile.delete();
+            }
         }
     }
 

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.34.0"
+    private let pluginVersion: String = "7.34.2"
     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

@@ -445,10 +445,13 @@ import UIKit
                 }
             }
 
-            let fileNameWithoutPath = (fileName as NSString).lastPathComponent
+            // Check if file has .br extension for Brotli decompression
+            let isBrotli = fileName.hasSuffix(".br")
+            let finalFileName = isBrotli ? String(fileName.dropLast(3)) : fileName
+            let fileNameWithoutPath = (finalFileName as NSString).lastPathComponent
             let cacheFileName = "\(fileHash)_\(fileNameWithoutPath)"
             let cacheFilePath = cacheFolder.appendingPathComponent(cacheFileName)
-            let destFilePath = destFolder.appendingPathComponent(fileName)
+            let destFilePath = destFolder.appendingPathComponent(finalFileName)
             let builtinFilePath = builtinFolder.appendingPathComponent(fileName)
 
             // Create necessary subdirectories in the destination folder
@@ -502,11 +505,6 @@ import UIKit
                                 try FileManager.default.removeItem(at: tempFile)
                             }
 
-                            // Check if file has .br extension for Brotli decompression
-                            let isBrotli = fileName.hasSuffix(".br")
-                            let finalFileName = isBrotli ? String(fileName.dropLast(3)) : fileName
-                            let destFilePath = destFolder.appendingPathComponent(finalFileName)
-
                             if isBrotli {
                                 // Decompress the Brotli data
                                 guard let decompressedData = self.decompressBrotli(data: finalData, fileName: fileName) else {
@@ -523,6 +521,8 @@ import UIKit
                                 CryptoCipher.logChecksumInfo(label: "Calculated checksum", hexChecksum: calculatedChecksum)
                                 CryptoCipher.logChecksumInfo(label: "Expected checksum", hexChecksum: fileHash)
                                 if calculatedChecksum != fileHash {
+                                    // Delete the corrupt file before throwing error
+                                    try? FileManager.default.removeItem(at: destFilePath)
                                     self.sendStats(action: "download_manifest_checksum_fail", versionName: "\(version):\(finalFileName)")
                                     throw NSError(domain: "ChecksumError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Computed checksum is not equal to required checksum (\(calculatedChecksum) != \(fileHash)) for file \(fileName) at url \(downloadUrl)"])
                                 }

package/package.json

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