@capgo/capacitor-updater 8.51.10 → 8.51.12

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

@@ -146,7 +146,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
     static final int APPLICATION_EXIT_REASON_USER_REQUESTED = 10;
     static final int APPLICATION_EXIT_REASON_DEPENDENCY_DIED = 12;
 
-    private final String pluginVersion = "8.51.10";
+    private final String pluginVersion = "8.51.12";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;

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

@@ -12,11 +12,9 @@ package ee.forgr.capacitor_updater;
  * references: http://stackoverflow.com/questions/12471999/rsa-encryption-decryption-in-android
  */
 import android.util.Base64;
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
@@ -174,8 +172,7 @@ public class CryptoCipher {
         File tempFile = File.createTempFile("capgo-aes-", ".tmp", file.getParentFile());
         try {
             byte[] inBuf = new byte[ioBufferBytes()];
-            // Reuse one output buffer. cipher.update(in) allocates a new byte[] per chunk
-            // and 64 workers * 5MB was why AES barely won on heap in local benches.
+            // Reuse one output buffer. cipher.update(in) allocates a new byte[] per chunk.
             byte[] outBuf = new byte[inBuf.length + 16];
             try (FileInputStream fis = new FileInputStream(file); FileOutputStream fos = new FileOutputStream(tempFile)) {
                 int n;
@@ -330,73 +327,20 @@ public class CryptoCipher {
         }
     }
 
-    private static final long TWO_GIB = 2L * 1024 * 1024 * 1024;
-    private static final long THREE_GIB = 3L * 1024 * 1024 * 1024;
-    private static final long FOUR_GIB = 4L * 1024 * 1024 * 1024;
-    private static final long EIGHT_GIB = 8L * 1024 * 1024 * 1024;
-    private static final int FLAGSHIP_IO_BUFFER_BYTES = 5 * 1024 * 1024;
-    private static volatile long cachedPhysicalRamBytes = -1;
-
-    // Checksum and copy share one ladder. 64-wide peak RAM = 64 * buffer.
-    // <2GB: 64KB. <3GB: 256KB. <4GB: 512KB. <8GB: 1MB. Else 5MB (flagship / unknown).
-    static int ioBufferBytes(long physicalRamBytes) {
-        if (physicalRamBytes <= 0) {
-            return FLAGSHIP_IO_BUFFER_BYTES;
-        }
-        if (physicalRamBytes < TWO_GIB) {
-            return 64 * 1024;
-        }
-        if (physicalRamBytes < THREE_GIB) {
-            return 256 * 1024;
-        }
-        if (physicalRamBytes < FOUR_GIB) {
-            return 512 * 1024;
-        }
-        if (physicalRamBytes < EIGHT_GIB) {
-            return 1024 * 1024;
-        }
-        return FLAGSHIP_IO_BUFFER_BYTES;
-    }
-
-    static int checksumBufferBytes(long physicalRamBytes) {
-        return ioBufferBytes(physicalRamBytes);
-    }
-
-    static int copyBufferBytes(long physicalRamBytes) {
-        return ioBufferBytes(physicalRamBytes);
-    }
+    // 256 KiB: one size for checksum, copy, and decode.
+    // 64 workers * 256 KiB = 16 MiB for one buffer; AES/Brotli hold two (~32 MiB).
+    static final int IO_BUFFER_BYTES = 256 * 1024;
 
     static int ioBufferBytes() {
-        return ioBufferBytes(physicalRamBytes());
+        return IO_BUFFER_BYTES;
     }
 
     static int checksumBufferBytes() {
-        return ioBufferBytes(physicalRamBytes());
+        return IO_BUFFER_BYTES;
     }
 
     static int copyBufferBytes() {
-        return ioBufferBytes(physicalRamBytes());
-    }
-
-    static long physicalRamBytes() {
-        long cached = cachedPhysicalRamBytes;
-        if (cached >= 0) {
-            return cached;
-        }
-        long parsed = 0;
-        try (BufferedReader reader = new BufferedReader(new FileReader("/proc/meminfo"))) {
-            String line = reader.readLine();
-            if (line != null && line.startsWith("MemTotal:")) {
-                String[] parts = line.split("\\s+");
-                if (parts.length >= 2) {
-                    parsed = Long.parseLong(parts[1]) * 1024L;
-                }
-            }
-        } catch (Exception ignored) {
-            parsed = 0;
-        }
-        cachedPhysicalRamBytes = parsed;
-        return parsed;
+        return IO_BUFFER_BYTES;
     }
 
     public static String calcChecksum(File file) {

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

@@ -76,8 +76,8 @@ public class DownloadService extends Worker {
     public static final String DEFAULT_CHANNEL = "default_channel";
     public static final String IS_PROD = "is_prod";
     public static final String IS_EMULATOR = "is_emulator";
-    // Match HTTP dispatcher so 64 workers actually fetch in parallel (HTTP/2 multiplexes).
-    private static final int MANIFEST_MAX_CONCURRENT_FILES = 64;
+    // HTTP + decode share one pool. Cap by CPU: 8 on 4 cores, 16 on 8 cores, 64 max.
+    private static final int MANIFEST_MAX_CONCURRENT_FILES = manifestMaxConcurrentFiles();
     private static final String UPDATE_FILE = "update.dat";
 
     // Shared OkHttpClient to prevent resource leaks
@@ -103,6 +103,15 @@ public class DownloadService extends Worker {
             .build();
     }
 
+    static int manifestMaxConcurrentFiles() {
+        return manifestMaxConcurrentFiles(Runtime.getRuntime().availableProcessors());
+    }
+
+    static int manifestMaxConcurrentFiles(int processors) {
+        int cores = Math.max(1, processors);
+        return Math.min(64, Math.max(8, cores * 2));
+    }
+
     static String buildUserAgent(String appId, String pluginVersion, String versionOs) {
         return (
             "CapacitorUpdater/" +
@@ -1038,14 +1047,14 @@ public class DownloadService extends Worker {
     }
 
     /**
-     * Atomically write a stream to a file using the RAM-ladder IO buffer.
+     * Atomically write a stream to a file using the 256 KiB IO buffer.
      */
     static void writeFileAtomic(File targetFile, InputStream inputStream, String expectedChecksum) throws IOException {
         File tempFile = File.createTempFile("capgo-", ".tmp", targetFile.getParentFile());
 
         try {
-            // Okio's default segment is 8KB. Copy with the RAM-ladder buffer so
-            // 8MB wrapper unwraps are not 1000 tiny writes.
+            // Okio's default segment is 8 KiB. Copy with 256 KiB so 8 MiB wrapper unwraps
+            // are not 1000 tiny writes.
             byte[] buffer = new byte[CryptoCipher.ioBufferBytes()];
             try (FileOutputStream fos = new FileOutputStream(tempFile)) {
                 int n;

package/ios/Sources/CapacitorUpdaterPlugin/CapacitorUpdaterPlugin.swift

@@ -96,7 +96,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     deinit {
         implementation.shutdown()
     }
-    private let pluginVersion: String = "8.51.10"
+    private let pluginVersion: String = "8.51.12"
     private let launchStartedAtMs = Int64(Date().timeIntervalSince1970 * 1000)
     static let updateUrlDefault = "https://plugin.capgo.app/updates"
     static let statsUrlDefault = "https://plugin.capgo.app/stats"

package/ios/Sources/CapacitorUpdaterPlugin/CapgoUpdater.swift

@@ -25,8 +25,12 @@ import UIKit
     private let PENDING_DELETE_IDS: String = "pendingDeleteIds"
     private var unzipPercent = 0
     private let TEMP_UNZIP_PREFIX: String = "capgo_unzip_"
-    /// Match URLSession per-host limit so 64 workers actually fetch in parallel.
-    private static let manifestMaxConcurrentFiles = 64
+    /// HTTP + decode share one pool. Cap by CPU: 8 on 4 cores, 16 on 8 cores, 64 max.
+    static let manifestMaxConcurrentFiles = clampedManifestConcurrency(processorCount: ProcessInfo.processInfo.processorCount)
+
+    static func clampedManifestConcurrency(processorCount: Int) -> Int {
+        min(64, max(8, max(1, processorCount) * 2))
+    }
     private static let emptySha256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
     private let deletePaceSeconds: TimeInterval = 0.075
     private let deleteLock = NSLock()

package/ios/Sources/CapacitorUpdaterPlugin/CryptoCipher.swift

@@ -141,39 +141,20 @@ public struct CryptoCipher {
         }
     }
 
-    private static let twoGiB: UInt64 = 2 * 1024 * 1024 * 1024
-    private static let threeGiB: UInt64 = 3 * 1024 * 1024 * 1024
-    private static let fourGiB: UInt64 = 4 * 1024 * 1024 * 1024
-    private static let eightGiB: UInt64 = 8 * 1024 * 1024 * 1024
-    private static let flagshipIoBufferBytes = 5 * 1024 * 1024
-
-    /// Checksum and copy share one ladder. 64-wide peak RAM = 64 * buffer.
-    /// <2GB: 64KB. <3GB: 256KB. <4GB: 512KB. <8GB: 1MB. Else 5MB (flagship / unknown).
-    static func ioBufferBytes(_ physicalRamBytes: UInt64 = ProcessInfo.processInfo.physicalMemory) -> Int {
-        if physicalRamBytes == 0 {
-            return flagshipIoBufferBytes
-        }
-        if physicalRamBytes < twoGiB {
-            return 64 * 1024
-        }
-        if physicalRamBytes < threeGiB {
-            return 256 * 1024
-        }
-        if physicalRamBytes < fourGiB {
-            return 512 * 1024
-        }
-        if physicalRamBytes < eightGiB {
-            return 1024 * 1024
-        }
-        return flagshipIoBufferBytes
+    /// 256 KiB: one size for checksum, copy, and decode.
+    /// 64 workers * 256 KiB = 16 MiB for one buffer; AES/Brotli hold two (~32 MiB).
+    static let ioBufferBytesValue = 256 * 1024
+
+    static func ioBufferBytes() -> Int {
+        return ioBufferBytesValue
     }
 
-    static func checksumBufferBytes(_ physicalRamBytes: UInt64 = ProcessInfo.processInfo.physicalMemory) -> Int {
-        return ioBufferBytes(physicalRamBytes)
+    static func checksumBufferBytes() -> Int {
+        return ioBufferBytesValue
     }
 
-    static func copyBufferBytes(_ physicalRamBytes: UInt64 = ProcessInfo.processInfo.physicalMemory) -> Int {
-        return ioBufferBytes(physicalRamBytes)
+    static func copyBufferBytes() -> Int {
+        return ioBufferBytesValue
     }
 
     public static func calcChecksum(filePath: URL) -> String {

package/package.json

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