@capgo/capacitor-updater 6.2.9 → 6.3.3

package/android/build.gradle

@@ -58,4 +58,5 @@ dependencies {
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
+    implementation 'org.brotli:dec:0.1.2'
 }

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

@@ -54,6 +54,7 @@ import java.util.zip.CRC32;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import javax.crypto.SecretKey;
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -283,6 +284,10 @@ public class CapacitorUpdater {
           String sessionKey = bundle.getString(DownloadService.SESSIONKEY);
           String checksum = bundle.getString(DownloadService.CHECKSUM);
           String error = bundle.getString(DownloadService.ERROR);
+          boolean isManifest = bundle.getBoolean(
+            DownloadService.IS_MANIFEST,
+            false
+          );
           Log.i(
             CapacitorUpdater.TAG,
             "res " +
@@ -318,7 +323,8 @@ public class CapacitorUpdater {
               version,
               sessionKey,
               checksum,
-              true
+              true,
+              isManifest
             );
         } else {
           Log.i(TAG, "Unknown action " + action);
@@ -353,35 +359,39 @@ public class CapacitorUpdater {
     String version,
     String sessionKey,
     String checksumRes,
-    Boolean setNext
+    Boolean setNext,
+    Boolean isManifest
   ) {
     File downloaded = null;
-    String checksum;
+    String checksum = "";
 
     try {
       this.notifyDownload(id, 71);
       downloaded = new File(this.documentsDir, dest);
 
-      String checksumDecrypted = Objects.requireNonNullElse(checksumRes, "");
-      if (!this.hasOldPrivateKeyPropertyInConfig && !sessionKey.isEmpty()) {
-        this.decryptFileV2(downloaded, sessionKey, version);
-        checksumDecrypted = this.decryptChecksum(checksumRes, version);
-        checksum = this.calcChecksumV2(downloaded);
-      } else {
-        this.decryptFile(downloaded, sessionKey, version);
-        checksum = this.calcChecksum(downloaded);
-      }
-      if (
-        (!checksumDecrypted.isEmpty() || !this.publicKey.isEmpty()) &&
-        !checksumDecrypted.equals(checksum)
-      ) {
-        Log.e(
-          CapacitorUpdater.TAG,
-          "Error checksum '" + checksumDecrypted + "' '" + checksum + "' '"
-        );
-        this.sendStats("checksum_fail");
-        throw new IOException("Checksum failed: " + id);
+      if (!isManifest) {
+        String checksumDecrypted = Objects.requireNonNullElse(checksumRes, "");
+        if (!this.hasOldPrivateKeyPropertyInConfig && !sessionKey.isEmpty()) {
+          this.decryptFileV2(downloaded, sessionKey, version);
+          checksumDecrypted = this.decryptChecksum(checksumRes, version);
+          checksum = this.calcChecksumV2(downloaded);
+        } else {
+          this.decryptFile(downloaded, sessionKey, version);
+          checksum = this.calcChecksum(downloaded);
+        }
+        if (
+          (!checksumDecrypted.isEmpty() || !this.publicKey.isEmpty()) &&
+          !checksumDecrypted.equals(checksum)
+        ) {
+          Log.e(
+            CapacitorUpdater.TAG,
+            "Error checksum '" + checksumDecrypted + "' '" + checksum + "' '"
+          );
+          this.sendStats("checksum_fail");
+          throw new IOException("Checksum failed: " + id);
+        }
       }
+      // Remove the decryption for manifest downloads
     } catch (IOException e) {
       final Boolean res = this.delete(id);
       if (!res) {
@@ -400,11 +410,17 @@ public class CapacitorUpdater {
     }
 
     try {
-      final File unzipped = this.unzip(id, downloaded, this.randomString());
-      downloaded.delete();
-      this.notifyDownload(id, 91);
-      final String idName = bundleDirectory + "/" + id;
-      this.flattenAssets(unzipped, idName);
+      if (!isManifest) {
+        final File unzipped = this.unzip(id, downloaded, this.randomString());
+        this.notifyDownload(id, 91);
+        final String idName = bundleDirectory + "/" + id;
+        this.flattenAssets(unzipped, idName);
+      } else {
+        this.notifyDownload(id, 91);
+        final String idName = bundleDirectory + "/" + id;
+        this.flattenAssets(downloaded, idName);
+        downloaded.delete();
+      }
       this.notifyDownload(id, 100);
       this.saveBundleInfo(id, null);
       BundleInfo next = new BundleInfo(
@@ -447,7 +463,8 @@ public class CapacitorUpdater {
     final String version,
     final String sessionKey,
     final String checksum,
-    final String dest
+    final String dest,
+    final JSONArray manifest
   ) {
     Intent intent = new Intent(this.activity, DownloadService.class);
     intent.putExtra(DownloadService.URL, url);
@@ -460,6 +477,9 @@ public class CapacitorUpdater {
     intent.putExtra(DownloadService.VERSION, version);
     intent.putExtra(DownloadService.SESSIONKEY, sessionKey);
     intent.putExtra(DownloadService.CHECKSUM, checksum);
+    if (manifest != null) {
+      intent.putExtra(DownloadService.MANIFEST, manifest.toString());
+    }
     this.activity.startService(intent);
   }
 
@@ -702,7 +722,8 @@ public class CapacitorUpdater {
     final String url,
     final String version,
     final String sessionKey,
-    final String checksum
+    final String checksum,
+    final JSONArray manifest
   ) {
     final String id = this.randomString();
     this.saveBundleInfo(
@@ -717,13 +738,15 @@ public class CapacitorUpdater {
       );
     this.notifyDownload(id, 0);
     this.notifyDownload(id, 5);
+
     this.downloadFileBackground(
         id,
         url,
         version,
         sessionKey,
         checksum,
-        this.randomString()
+        this.randomString(),
+        manifest
       );
   }
 
@@ -749,7 +772,15 @@ public class CapacitorUpdater {
     final String dest = this.randomString();
     this.downloadFile(id, url, dest);
     final Boolean finished =
-      this.finishDownload(id, dest, version, sessionKey, checksum, false);
+      this.finishDownload(
+          id,
+          dest,
+          version,
+          sessionKey,
+          checksum,
+          false,
+          false
+        );
     final BundleStatus status = finished
       ? BundleStatus.PENDING
       : BundleStatus.ERROR;

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

@@ -42,6 +42,7 @@ import java.util.UUID;
 import java.util.concurrent.Phaser;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import org.json.JSONArray;
 import org.json.JSONException;
 
 @CapacitorPlugin(name = "CapacitorUpdater")
@@ -53,7 +54,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "6.2.9";
+  private final String PLUGIN_VERSION = "6.3.3";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -79,6 +80,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
   //  private static final CountDownLatch semaphoreReady = new CountDownLatch(1);
   private static final Phaser semaphoreReady = new Phaser(1);
 
+  private int lastNotifiedStatPercent = 0;
+
   public Thread startNewThread(final Runnable function, Number waitTime) {
     Thread bgTask = new Thread(() -> {
       try {
@@ -351,6 +354,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
       final BundleInfo bundleInfo = this.implementation.getBundleInfo(id);
       ret.put("bundle", bundleInfo.toJSON());
       this.notifyListeners("download", ret);
+
       if (percent == 100) {
         final JSObject retDownloadComplete = new JSObject(
           ret,
@@ -361,11 +365,16 @@ public class CapacitorUpdaterPlugin extends Plugin {
             "download_complete",
             bundleInfo.getVersionName()
           );
-      } else if (percent % 10 == 0) {
-        this.implementation.sendStats(
-            "download_" + percent,
-            bundleInfo.getVersionName()
-          );
+        lastNotifiedStatPercent = 100;
+      } else {
+        int currentStatPercent = (percent / 10) * 10; // Round down to nearest 10
+        if (currentStatPercent > lastNotifiedStatPercent) {
+          this.implementation.sendStats(
+              "download_" + currentStatPercent,
+              bundleInfo.getVersionName()
+            );
+          lastNotifiedStatPercent = currentStatPercent;
+        }
       }
     } catch (final Exception e) {
       Log.e(CapacitorUpdater.TAG, "Could not notify listeners", e);
@@ -508,7 +517,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
               }
               call.resolve(res);
             }
-          }));
+          })
+      );
     } catch (final Exception e) {
       Log.e(CapacitorUpdater.TAG, "Failed to unsetChannel: ", e);
       call.reject("Failed to unsetChannel: ", e);
@@ -550,7 +560,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
               }
               call.resolve(res);
             }
-          }));
+          })
+      );
     } catch (final Exception e) {
       Log.e(CapacitorUpdater.TAG, "Failed to setChannel: " + channel, e);
       call.reject("Failed to setChannel: " + channel, e);
@@ -568,7 +579,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
             } else {
               call.resolve(res);
             }
-          }));
+          })
+      );
     } catch (final Exception e) {
       Log.e(CapacitorUpdater.TAG, "Failed to getChannel", e);
       call.reject("Failed to getChannel", e);
@@ -787,7 +799,8 @@ public class CapacitorUpdaterPlugin extends Plugin {
             }
             call.resolve(ret);
           }
-        ));
+        )
+    );
   }
 
   private boolean _reset(final Boolean toLastSuccessful) {
@@ -1298,12 +1311,27 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     final String checksum = res.has("checksum")
                       ? res.getString("checksum")
                       : "";
-                    CapacitorUpdaterPlugin.this.implementation.downloadBackground(
-                        url,
-                        latestVersionName,
-                        sessionKey,
-                        checksum
-                      );
+
+                    if (res.has("manifest")) {
+                      // Handle manifest-based download
+                      JSONArray manifest = res.getJSONArray("manifest");
+                      CapacitorUpdaterPlugin.this.implementation.downloadBackground(
+                          url,
+                          latestVersionName,
+                          sessionKey,
+                          checksum,
+                          manifest
+                        );
+                    } else {
+                      // Handle single file download (existing code)
+                      CapacitorUpdaterPlugin.this.implementation.downloadBackground(
+                          url,
+                          latestVersionName,
+                          sessionKey,
+                          checksum,
+                          null
+                        );
+                    }
                   } catch (final Exception e) {
                     Log.e(CapacitorUpdater.TAG, "error downloading file", e);
                     CapacitorUpdaterPlugin.this.endBackGroundTaskWithNotif(

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

@@ -7,12 +7,30 @@ package ee.forgr.capacitor_updater;
 
 import android.app.IntentService;
 import android.content.Intent;
+import android.util.Log;
+import com.android.volley.DefaultRetryPolicy;
+import com.android.volley.NetworkResponse;
+import com.android.volley.Request;
+import com.android.volley.Response;
+import com.android.volley.toolbox.HttpHeaderParser;
+import com.android.volley.toolbox.Volley;
 import java.io.*;
+import java.io.FileInputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.net.URLConnection;
 import java.nio.channels.FileChannel;
-import java.util.Objects;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import org.brotli.dec.BrotliInputStream;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 public class DownloadService extends IntentService {
 
@@ -27,6 +45,8 @@ public class DownloadService extends IntentService {
   public static final String CHECKSUM = "checksum";
   public static final String NOTIFICATION = "service receiver";
   public static final String PERCENTDOWNLOAD = "percent receiver";
+  public static final String IS_MANIFEST = "is_manifest";
+  public static final String MANIFEST = "manifest";
   private static final String UPDATE_FILE = "update.dat";
 
   public DownloadService() {
@@ -53,7 +73,159 @@ public class DownloadService extends IntentService {
     String version = intent.getStringExtra(VERSION);
     String sessionKey = intent.getStringExtra(SESSIONKEY);
     String checksum = intent.getStringExtra(CHECKSUM);
+    String manifestString = intent.getStringExtra(MANIFEST);
 
+    Log.d("DownloadService", "onHandleIntent" + manifestString);
+    if (manifestString != null) {
+      handleManifestDownload(
+        id,
+        documentsDir,
+        dest,
+        version,
+        sessionKey,
+        manifestString
+      );
+    } else {
+      handleSingleFileDownload(
+        url,
+        id,
+        documentsDir,
+        dest,
+        version,
+        sessionKey,
+        checksum
+      );
+    }
+  }
+
+  private void handleManifestDownload(
+    String id,
+    String documentsDir,
+    String dest,
+    String version,
+    String sessionKey,
+    String manifestString
+  ) {
+    try {
+      Log.d("DownloadService", "handleManifestDownload");
+      JSONArray manifest = new JSONArray(manifestString);
+      File destFolder = new File(documentsDir, dest);
+      File cacheFolder = new File(
+        getApplicationContext().getCacheDir(),
+        "capgo_downloads"
+      );
+      // Ensure directories are created
+      if (!destFolder.exists() && !destFolder.mkdirs()) {
+        throw new IOException(
+          "Failed to create destination directory: " +
+          destFolder.getAbsolutePath()
+        );
+      }
+      if (!cacheFolder.exists() && !cacheFolder.mkdirs()) {
+        throw new IOException(
+          "Failed to create cache directory: " + cacheFolder.getAbsolutePath()
+        );
+      }
+
+      int totalFiles = manifest.length();
+      final AtomicLong completedFiles = new AtomicLong(0);
+      final AtomicBoolean hasError = new AtomicBoolean(false);
+
+      // Use more threads for I/O-bound operations
+      int threadCount = Math.min(
+        Runtime.getRuntime().availableProcessors() * 2,
+        32
+      );
+      ExecutorService executor = Executors.newFixedThreadPool(threadCount);
+      CompletableFuture<Void>[] futures = new CompletableFuture[totalFiles];
+
+      for (int i = 0; i < totalFiles; i++) {
+        JSONObject entry = manifest.getJSONObject(i);
+        String fileName = entry.getString("file_name");
+        String fileHash = entry.getString("file_hash");
+        String downloadUrl = entry.getString("download_url");
+
+        File targetFile = new File(destFolder, fileName);
+        File cacheFile = new File(
+          cacheFolder,
+          fileHash + "_" + new File(fileName).getName()
+        );
+
+        // Ensure parent directories of the target file exist
+        if (
+          !targetFile.getParentFile().exists() &&
+          !targetFile.getParentFile().mkdirs()
+        ) {
+          throw new IOException(
+            "Failed to create parent directory for: " +
+            targetFile.getAbsolutePath()
+          );
+        }
+
+        futures[i] = CompletableFuture.runAsync(
+          () -> {
+            try {
+              if (cacheFile.exists()) {
+                if (verifyChecksum(cacheFile, fileHash)) {
+                  copyFile(cacheFile, targetFile);
+                  Log.d("DownloadService", "already cached " + fileName);
+                } else {
+                  cacheFile.delete();
+                  downloadAndVerify(
+                    downloadUrl,
+                    targetFile,
+                    cacheFile,
+                    fileHash,
+                    id
+                  );
+                }
+              } else {
+                downloadAndVerify(
+                  downloadUrl,
+                  targetFile,
+                  cacheFile,
+                  fileHash,
+                  id
+                );
+              }
+
+              long completed = completedFiles.incrementAndGet();
+              int percent = calcTotalPercent(completed, totalFiles);
+              notifyDownload(id, percent);
+            } catch (Exception e) {
+              Log.e("DownloadService", "Error processing file: " + fileName, e);
+              hasError.set(true);
+            }
+          },
+          executor
+        );
+      }
+
+      // Wait for all downloads to complete
+      CompletableFuture.allOf(futures).join();
+
+      executor.shutdown();
+
+      if (hasError.get()) {
+        throw new IOException("One or more files failed to download");
+      }
+
+      publishResults(dest, id, version, "", sessionKey, "", true);
+    } catch (Exception e) {
+      Log.e("DownloadService", "Error in handleManifestDownload", e);
+      publishResults("", id, version, "", sessionKey, e.getMessage(), true);
+    }
+  }
+
+  private void handleSingleFileDownload(
+    String url,
+    String id,
+    String documentsDir,
+    String dest,
+    String version,
+    String sessionKey,
+    String checksum
+  ) {
     File target = new File(documentsDir, dest);
     File infoFile = new File(documentsDir, UPDATE_FILE); // The file where the download progress (how much byte
     // downloaded) is stored
@@ -138,14 +310,22 @@ public class DownloadService extends IntentService {
         // Rename the temp file with the final name (dest)
         tempFile.renameTo(new File(documentsDir, dest));
         infoFile.delete();
-        publishResults(dest, id, version, checksum, sessionKey, "");
+        publishResults(dest, id, version, checksum, sessionKey, "", false);
       } else {
         infoFile.delete();
       }
       httpConn.disconnect();
     } catch (OutOfMemoryError e) {
       e.printStackTrace();
-      publishResults("", id, version, checksum, sessionKey, "low_mem_fail");
+      publishResults(
+        "",
+        id,
+        version,
+        checksum,
+        sessionKey,
+        "low_mem_fail",
+        false
+      );
     } catch (Exception e) {
       e.printStackTrace();
       publishResults(
@@ -154,7 +334,8 @@ public class DownloadService extends IntentService {
         version,
         checksum,
         sessionKey,
-        e.getLocalizedMessage()
+        e.getLocalizedMessage(),
+        false
       );
     }
   }
@@ -186,7 +367,8 @@ public class DownloadService extends IntentService {
     String version,
     String checksum,
     String sessionKey,
-    String error
+    String error,
+    boolean isManifest
   ) {
     Intent intent = new Intent(NOTIFICATION);
     intent.setPackage(getPackageName());
@@ -198,6 +380,143 @@ public class DownloadService extends IntentService {
     intent.putExtra(VERSION, version);
     intent.putExtra(SESSIONKEY, sessionKey);
     intent.putExtra(CHECKSUM, checksum);
+    intent.putExtra(IS_MANIFEST, isManifest);
     sendBroadcast(intent);
   }
+
+  // Helper methods
+
+  private void copyFile(File source, File dest) throws IOException {
+    try (
+      FileInputStream inStream = new FileInputStream(source);
+      FileOutputStream outStream = new FileOutputStream(dest);
+      FileChannel inChannel = inStream.getChannel();
+      FileChannel outChannel = outStream.getChannel()
+    ) {
+      inChannel.transferTo(0, inChannel.size(), outChannel);
+    }
+  }
+
+  private void downloadAndVerify(
+    String downloadUrl,
+    File targetFile,
+    File cacheFile,
+    String expectedHash,
+    String id
+  ) throws Exception {
+    Log.d("DownloadService", "downloadAndVerify " + downloadUrl);
+    URL url = new URL(downloadUrl);
+    HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+    connection.setRequestMethod("GET");
+
+    // Create a temporary file for the compressed data
+    File compressedFile = new File(
+      getApplicationContext().getCacheDir(),
+      "temp_" + targetFile.getName() + ".br"
+    );
+
+    try (
+      InputStream inputStream = connection.getInputStream();
+      FileOutputStream compressedFos = new FileOutputStream(compressedFile)
+    ) {
+      byte[] buffer = new byte[8192];
+      int bytesRead;
+      while ((bytesRead = inputStream.read(buffer)) != -1) {
+        compressedFos.write(buffer, 0, bytesRead);
+      }
+    }
+
+    // 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);
+      }
+    }
+
+    // Delete the compressed file
+    compressedFile.delete();
+
+    // Verify checksum
+    String actualHash = calculateFileHash(targetFile);
+    if (actualHash.equals(expectedHash)) {
+      // Copy the downloaded file to cache if checksum is correct
+      copyFile(targetFile, cacheFile);
+      Log.d("DownloadService", "copied to cache " + targetFile.getName());
+    } else {
+      targetFile.delete();
+      throw new IOException(
+        "Checksum verification failed for " +
+        targetFile.getName() +
+        " " +
+        expectedHash +
+        " " +
+        actualHash
+      );
+    }
+  }
+
+  // Custom request for handling input stream
+  private class InputStreamVolleyRequest extends Request<byte[]> {
+
+    private final Response.Listener<byte[]> mListener;
+
+    public InputStreamVolleyRequest(
+      int method,
+      String mUrl,
+      Response.Listener<byte[]> listener,
+      Response.ErrorListener errorListener
+    ) {
+      super(method, mUrl, errorListener);
+      mListener = listener;
+    }
+
+    @Override
+    protected void deliverResponse(byte[] response) {
+      mListener.onResponse(response);
+    }
+
+    @Override
+    protected Response<byte[]> parseNetworkResponse(NetworkResponse response) {
+      byte[] responseData = response.data;
+      return Response.success(
+        responseData,
+        HttpHeaderParser.parseCacheHeaders(response)
+      );
+    }
+  }
+
+  private boolean verifyChecksum(File file, String expectedHash) {
+    try {
+      String actualHash = calculateFileHash(file);
+      return actualHash.equals(expectedHash);
+    } catch (Exception e) {
+      e.printStackTrace();
+      return false;
+    }
+  }
+
+  private String calculateFileHash(File file) throws Exception {
+    MessageDigest digest = MessageDigest.getInstance("SHA-256");
+    FileInputStream fis = new FileInputStream(file);
+    byte[] byteArray = new byte[1024];
+    int bytesCount = 0;
+
+    while ((bytesCount = fis.read(byteArray)) != -1) {
+      digest.update(byteArray, 0, bytesCount);
+    }
+    fis.close();
+
+    byte[] bytes = digest.digest();
+    StringBuilder sb = new StringBuilder();
+    for (byte aByte : bytes) {
+      sb.append(Integer.toString((aByte & 0xff) + 0x100, 16).substring(1));
+    }
+    return sb.toString();
+  }
 }

package/ios/Plugin/CapacitorUpdater.swift

@@ -9,6 +9,7 @@ import SSZipArchive
 import Alamofire
 import zlib
 import CryptoKit
+import Compression
 
 extension Collection {
     subscript(safe index: Index) -> Element? {
@@ -88,6 +89,13 @@ struct InfoObject: Codable {
     var channel: String?
     var defaultChannel: String?
 }
+
+public struct ManifestEntry: Codable {
+    let file_name: String?
+    let file_hash: String?
+    let download_url: String?
+}
+
 struct AppVersionDec: Decodable {
     let version: String?
     let checksum: String?
@@ -97,7 +105,9 @@ struct AppVersionDec: Decodable {
     let session_key: String?
     let major: Bool?
     let data: [String: String]?
+    let manifest: [ManifestEntry]?
 }
+
 public class AppVersion: NSObject {
     var version: String = ""
     var checksum: String = ""
@@ -107,6 +117,7 @@ public class AppVersion: NSObject {
     var sessionKey: String?
     var major: Bool?
     var data: [String: String]?
+    var manifest: [ManifestEntry]?
 }
 
 extension AppVersion {
@@ -246,6 +257,9 @@ extension CustomError: LocalizedError {
     private let NEXT_VERSION: String = "nextVersion"
     private var unzipPercent = 0
 
+    // Add this line to declare cacheFolder
+    private let cacheFolder: URL = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!.appendingPathComponent("capgo_downloads")
+
     public let TAG: String = "✨  Capacitor-updater:"
     public let CAP_SERVER_PATH: String = "serverBasePath"
     public var versionBuild: String = ""
@@ -582,6 +596,9 @@ extension CustomError: LocalizedError {
                 if let data = response.value?.data {
                     latest.data = data
                 }
+                if let manifest = response.value?.manifest {
+                    latest.manifest = manifest
+                }
             case let .failure(error):
                 print("\(self.TAG) Error getting Latest", response.value ?? "", error )
                 latest.message = "Error getting Latest \(String(describing: response.value))"
@@ -685,6 +702,174 @@ extension CustomError: LocalizedError {
         }
     }
 
+    public func downloadManifest(manifest: [ManifestEntry], version: String, sessionKey: String) throws -> BundleInfo {
+        let id = self.randomString(length: 10)
+        print("\(self.TAG) downloadManifest start \(id)")
+        let destFolder = self.getBundleDirectory(id: id)
+
+        try FileManager.default.createDirectory(at: cacheFolder, withIntermediateDirectories: true, attributes: nil)
+        try FileManager.default.createDirectory(at: destFolder, withIntermediateDirectories: true, attributes: nil)
+
+        // Create and save BundleInfo before starting the download process
+        let bundleInfo = BundleInfo(id: id, version: version, status: BundleStatus.DOWNLOADING, downloaded: Date(), checksum: "")
+        self.saveBundleInfo(id: id, bundle: bundleInfo)
+
+        // Notify the start of the download process
+        self.notifyDownload(id: id, percent: 0, ignoreMultipleOfTen: true)
+
+        let dispatchGroup = DispatchGroup()
+        var downloadError: Error?
+
+        let totalFiles = manifest.count
+        var completedFiles = 0
+
+        for entry in manifest {
+            guard let fileName = entry.file_name,
+                  let fileHash = entry.file_hash,
+                  let downloadUrl = entry.download_url else {
+                continue
+            }
+
+            let fileNameWithoutPath = (fileName as NSString).lastPathComponent
+            let cacheFileName = "\(fileHash)_\(fileNameWithoutPath)"
+            let cacheFilePath = cacheFolder.appendingPathComponent(cacheFileName)
+            let destFilePath = destFolder.appendingPathComponent(fileName)
+
+            // Create necessary subdirectories in the destination folder
+            try FileManager.default.createDirectory(at: destFilePath.deletingLastPathComponent(), withIntermediateDirectories: true, attributes: nil)
+
+            dispatchGroup.enter()
+
+            if FileManager.default.fileExists(atPath: cacheFilePath.path) {
+                // File exists in cache, copy to destination
+                do {
+                    try FileManager.default.copyItem(at: cacheFilePath, to: destFilePath)
+                    print("\(self.TAG) downloadManifest \(fileName) copy from cache \(id)")
+                    completedFiles += 1
+                    self.notifyDownload(id: id, percent: self.calcTotalPercent(percent: Int((Double(completedFiles) / Double(totalFiles)) * 100), min: 10, max: 70))
+                    dispatchGroup.leave()
+                } catch {
+                    downloadError = error
+                    print("\(self.TAG) downloadManifest \(fileName) cache error \(id): \(error)")
+                    dispatchGroup.leave()
+                }
+            } else {
+                // File not in cache, download, decompress, and save to both cache and destination
+                AF.download(downloadUrl).responseData { response in
+                    defer { dispatchGroup.leave() }
+
+                    switch response.result {
+                    case .success(let data):
+                        do {
+                            // Decompress the Brotli data
+                            guard let decompressedData = self.decompressBrotli(data: data) else {
+                                throw NSError(domain: "BrotliDecompressionError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Failed to decompress Brotli data"])
+                            }
+                            // Save decompressed data to cache
+                            try decompressedData.write(to: cacheFilePath)
+                            // Save decompressed data to destination
+                            try decompressedData.write(to: destFilePath)
+
+                            completedFiles += 1
+                            self.notifyDownload(id: id, percent: self.calcTotalPercent(percent: Int((Double(completedFiles) / Double(totalFiles)) * 100), min: 10, max: 70))
+                            print("\(self.TAG) downloadManifest \(id) \(fileName) downloaded, decompressed, and cached")
+                        } catch {
+                            downloadError = error
+                            print("\(self.TAG) downloadManifest \(id) \(fileName) error: \(error)")
+                        }
+                    case .failure(let error):
+                        downloadError = error
+                        print("\(self.TAG) downloadManifest \(id) \(fileName) download error: \(error)")
+                    }
+                }
+            }
+        }
+
+        dispatchGroup.wait()
+
+        if let error = downloadError {
+            // Update bundle status to ERROR if download failed
+            let errorBundle = bundleInfo.setStatus(status: BundleStatus.ERROR.localizedString)
+            self.saveBundleInfo(id: id, bundle: errorBundle)
+            throw error
+        }
+
+        // Update bundle status to PENDING after successful download
+        let updatedBundle = bundleInfo.setStatus(status: BundleStatus.PENDING.localizedString)
+        self.saveBundleInfo(id: id, bundle: updatedBundle)
+
+        print("\(self.TAG) downloadManifest done \(id)")
+        return updatedBundle
+    }
+
+    private func decompressBrotli(data: Data) -> Data? {
+        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("\(self.TAG) Unable to initialize the decompression stream.")
+            return nil
+        }
+
+        defer {
+            compression_stream_destroy(streamPointer)
+            streamPointer.deallocate()
+        }
+
+        streamPointer.pointee.src_size = 0
+        streamPointer.pointee.dst_ptr = UnsafeMutablePointer<UInt8>(&outputBuffer)
+        streamPointer.pointee.dst_size = outputBufferSize
+
+        let input = data
+
+        while true {
+            if streamPointer.pointee.src_size == 0 {
+                streamPointer.pointee.src_size = input.count
+                input.withUnsafeBytes { rawBufferPointer in
+                    if let baseAddress = rawBufferPointer.baseAddress {
+                        streamPointer.pointee.src_ptr = baseAddress.assumingMemoryBound(to: UInt8.self)
+                    } else {
+                        print("\(self.TAG) Error: Unable to get base address of input data")
+                        status = COMPRESSION_STATUS_ERROR
+                        return
+                    }
+                }
+            }
+
+            if status == COMPRESSION_STATUS_ERROR {
+                break
+            }
+
+            status = compression_stream_process(streamPointer, 0)
+
+            let have = outputBufferSize - streamPointer.pointee.dst_size
+            if have > 0 {
+                decompressedData.append(outputBuffer, count: have)
+            }
+
+            if status == COMPRESSION_STATUS_END {
+                break
+            } else if status == COMPRESSION_STATUS_ERROR {
+                print("\(self.TAG) Error during Brotli decompression")
+                return nil
+            }
+
+            if streamPointer.pointee.dst_size == 0 {
+                streamPointer.pointee.dst_ptr = UnsafeMutablePointer<UInt8>(&outputBuffer)
+                streamPointer.pointee.dst_size = outputBufferSize
+            }
+
+            if input.count == 0 {
+                break
+            }
+        }
+
+        return status == COMPRESSION_STATUS_END ? decompressedData : nil
+    }
+
     public func download(url: URL, version: String, sessionKey: String) throws -> BundleInfo {
         let id: String = self.randomString(length: 10)
         let semaphore = DispatchSemaphore(value: 0)
@@ -1170,7 +1355,7 @@ extension CustomError: LocalizedError {
                 }
                 semaphore.signal()
             }
-            semaphore.wait()
+            semaphore.signal()
         }
         operationQueue.addOperation(operation)
 

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -14,8 +14,8 @@ import Version
  */
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
-    public let identifier = "CapacitorUpdaterPlugin" 
-    public let jsName = "CapacitorUpdater" 
+    public let identifier = "CapacitorUpdaterPlugin"
+    public let jsName = "CapacitorUpdater"
     public let pluginMethods: [CAPPluginMethod] = [
         CAPPluginMethod(name: "download", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "setUpdateUrl", returnType: CAPPluginReturnPromise),
@@ -40,10 +40,10 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "getPluginVersion", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "next", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "isAutoUpdateEnabled", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "getBuiltinVersion", returnType: CAPPluginReturnPromise),
-    ] 
+        CAPPluginMethod(name: "getBuiltinVersion", returnType: CAPPluginReturnPromise)
+    ]
     public var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "6.2.9"
+    private let PLUGIN_VERSION: String = "6.3.3"
     static let updateUrlDefault = "https://api.capgo.app/updates"
     static let statsUrlDefault = "https://api.capgo.app/stats"
     static let channelUrlDefault = "https://api.capgo.app/channel_self"
@@ -757,7 +757,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                                 print("\(self.implementation.TAG) Failed to delete failed bundle: \(nextImpl!.toString())")
                             }
                         }
-                        nextImpl = try self.implementation.download(url: downloadUrl, version: latestVersionName, sessionKey: sessionKey)
+                        if res.manifest != nil {
+                            nextImpl = try self.implementation.downloadManifest(manifest: res.manifest!, version: latestVersionName, sessionKey: sessionKey)
+                        } else {
+                            nextImpl = try self.implementation.download(url: downloadUrl, version: latestVersionName, sessionKey: sessionKey)
+                        }
                     }
                     guard let next = nextImpl else {
                         print("\(self.implementation.TAG) Error downloading file")
@@ -772,7 +776,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                     if !self.implementation.hasOldPrivateKeyPropertyInConfig {
                         res.checksum = try self.implementation.decryptChecksum(checksum: res.checksum, version: latestVersionName)
                     }
-                    if res.checksum != "" && next.getChecksum() != res.checksum {
+                    if res.checksum != "" && next.getChecksum() != res.checksum && res.manifest == nil {
                         print("\(self.implementation.TAG) Error checksum", next.getChecksum(), res.checksum)
                         self.implementation.sendStats(action: "checksum_fail", versionName: next.getVersionName())
                         let id = next.getId()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "6.2.9",
+  "version": "6.3.3",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",
   "main": "dist/plugin.cjs.js",
@@ -59,22 +59,22 @@
     "@capacitor/android": "^6.0.0",
     "@capacitor/cli": "^6.0.0",
     "@capacitor/core": "^6.0.0",
-    "@capacitor/docgen": "^0.2.2",
+    "@capacitor/docgen": "^0.3.0",
     "@capacitor/ios": "^6.0.0",
     "@ionic/eslint-config": "^0.4.0",
     "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^1.1.2",
-    "@types/node": "^20.12.12",
+    "@types/node": "^22.7.5",
     "@typescript-eslint/eslint-plugin": "^7.11.0",
     "@typescript-eslint/parser": "^7.11.0",
     "eslint": "^8.57.0",
-    "eslint-plugin-import": "^2.29.1",
-    "prettier": "^3.2.5",
-    "prettier-plugin-java": "^2.6.0",
-    "rimraf": "^5.0.7",
-    "rollup": "^4.18.0",
-    "swiftlint": "^1.0.2",
-    "typescript": "^5.4.5"
+    "eslint-plugin-import": "^2.31.0",
+    "prettier": "^3.3.3",
+    "prettier-plugin-java": "^2.6.4",
+    "rimraf": "^6.0.1",
+    "rollup": "^4.24.0",
+    "swiftlint": "^2.0.0",
+    "typescript": "^5.6.3"
   },
   "peerDependencies": {
     "@capacitor/core": "^6.0.0"