@capgo/capacitor-updater 7.9.1 → 7.9.2

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

@@ -44,8 +44,7 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
+// Removed OkHttpClient and Protocol imports - using shared client in DownloadService instead
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -59,7 +58,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.9.1";
+    private final String PLUGIN_VERSION = "7.9.2";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;
@@ -153,12 +152,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
             this.implementation.CAP_SERVER_PATH = WebView.CAP_SERVER_PATH;
             this.implementation.PLUGIN_VERSION = this.PLUGIN_VERSION;
             this.implementation.versionCode = Integer.toString(pInfo.versionCode);
-            this.implementation.client = new OkHttpClient.Builder()
-                .protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1))
-                .connectTimeout(this.implementation.timeout, TimeUnit.MILLISECONDS)
-                .readTimeout(this.implementation.timeout, TimeUnit.MILLISECONDS)
-                .writeTimeout(this.implementation.timeout, TimeUnit.MILLISECONDS)
-                .build();
+            // Removed unused OkHttpClient creation - using shared client in DownloadService instead
             // Handle directUpdate configuration - support string values and backward compatibility
             String directUpdateConfig = this.getConfig().getString("directUpdate", null);
             if (directUpdateConfig != null) {
@@ -209,12 +203,16 @@ public class CapacitorUpdaterPlugin extends Plugin {
         this.implementation.appId = config.getString("appId", this.implementation.appId);
         this.implementation.appId = this.getConfig().getString("appId", this.implementation.appId);
         if (this.implementation.appId == null || this.implementation.appId.isEmpty()) {
-            // crash the app
+            // crash the app on purpose it should not happen
             throw new RuntimeException(
                 "appId is missing in capacitor.config.json or plugin config, and cannot be retrieved from the native app, please add it globally or in the plugin config"
             );
         }
         logger.info("appId: " + implementation.appId);
+
+        // Update User-Agent for shared OkHttpClient
+        DownloadService.updateUserAgent(this.implementation.appId, this.PLUGIN_VERSION);
+
         this.implementation.publicKey = this.getConfig().getString("publicKey", "");
         this.implementation.statsUrl = this.getConfig().getString("statsUrl", statsUrlDefault);
         this.implementation.channelUrl = this.getConfig().getString("channelUrl", channelUrlDefault);
@@ -263,9 +261,10 @@ public class CapacitorUpdaterPlugin extends Plugin {
             logger.info("semaphoreReady count " + semaphoreReady.getPhase());
         } catch (InterruptedException e) {
             logger.info("semaphoreWait InterruptedException");
-            e.printStackTrace();
+            Thread.currentThread().interrupt(); // Restore interrupted status
         } catch (TimeoutException e) {
-            throw new RuntimeException(e);
+            logger.error("Semaphore timeout: " + e.getMessage());
+            // Don't throw runtime exception, just log and continue
         }
     }
 
@@ -782,22 +781,37 @@ public class CapacitorUpdaterPlugin extends Plugin {
                     Semaphore mainThreadSemaphore = new Semaphore(0);
                     this.bridge.executeOnMainThread(() -> {
                             try {
-                                url.set(new URL(this.bridge.getWebView().getUrl()));
+                                if (this.bridge != null && this.bridge.getWebView() != null) {
+                                    String currentUrl = this.bridge.getWebView().getUrl();
+                                    if (currentUrl != null) {
+                                        url.set(new URL(currentUrl));
+                                    }
+                                }
                             } catch (Exception e) {
                                 logger.error("Error executing on main thread " + e.getMessage());
                             }
                             mainThreadSemaphore.release();
                         });
-                    mainThreadSemaphore.acquire();
+
+                    // Add timeout to prevent indefinite blocking
+                    if (!mainThreadSemaphore.tryAcquire(10, TimeUnit.SECONDS)) {
+                        logger.error("Timeout waiting for main thread operation");
+                    }
                 } else {
                     try {
-                        url.set(new URL(this.bridge.getWebView().getUrl()));
+                        if (this.bridge != null && this.bridge.getWebView() != null) {
+                            String currentUrl = this.bridge.getWebView().getUrl();
+                            if (currentUrl != null) {
+                                url.set(new URL(currentUrl));
+                            }
+                        }
                     } catch (Exception e) {
                         logger.error("Error executing on main thread " + e.getMessage());
                     }
                 }
             } catch (InterruptedException e) {
                 logger.error("Error waiting for main thread or getting the current URL from webview " + e.getMessage());
+                Thread.currentThread().interrupt(); // Restore interrupted status
             }
         }
 
@@ -839,7 +853,12 @@ public class CapacitorUpdaterPlugin extends Plugin {
         this.notifyListeners("appReloaded", new JSObject());
 
         // Wait for the reload to complete (until notifyAppReady is called)
-        this.semaphoreWait(this.appReadyTimeout);
+        try {
+            this.semaphoreWait(this.appReadyTimeout);
+        } catch (Exception e) {
+            logger.error("Error waiting for app ready: " + e.getMessage());
+            return false;
+        }
 
         return true;
     }

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

@@ -32,6 +32,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import okhttp3.*;
@@ -57,7 +58,7 @@ public class CapgoUpdater {
     public SharedPreferences.Editor editor;
     public SharedPreferences prefs;
 
-    public OkHttpClient client;
+    private OkHttpClient client;
 
     public File documentsDir;
     public Boolean directUpdate = false;
@@ -79,6 +80,8 @@ public class CapgoUpdater {
 
     public CapgoUpdater(Logger logger) {
         this.logger = logger;
+        // Simple OkHttpClient - actual configuration happens in plugin
+        this.client = new OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).build();
     }
 
     private final FilenameFilter filter = (f, name) -> {
@@ -248,11 +251,16 @@ public class CapgoUpdater {
                                     id,
                                     new BundleInfo(id, version, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "")
                                 );
+                                // Cleanup download tracking
+                                DownloadWorkerManager.cancelBundleDownload(activity, id, version);
                                 Map<String, Object> ret = new HashMap<>();
                                 ret.put("version", getCurrentBundle().getVersionName());
                                 ret.put("error", "finish_download_fail");
                                 sendStats("finish_download_fail", version);
                                 notifyListeners("downloadFailed", ret);
+                            } else {
+                                // Successful download - cleanup tracking
+                                DownloadWorkerManager.cancelBundleDownload(activity, id, version);
                             }
                             break;
                         case FAILED:
@@ -264,6 +272,8 @@ public class CapgoUpdater {
                                 id,
                                 new BundleInfo(id, failedVersion, BundleStatus.ERROR, new Date(System.currentTimeMillis()), "")
                             );
+                            // Cleanup download tracking for failed downloads
+                            DownloadWorkerManager.cancelBundleDownload(activity, id, failedVersion);
                             Map<String, Object> ret = new HashMap<>();
                             ret.put("version", getCurrentBundle().getVersionName());
                             if ("low_mem_fail".equals(error)) {
@@ -381,6 +391,7 @@ public class CapgoUpdater {
                 downloaded.delete();
             }
             this.notifyDownload(id, 100);
+            // Remove old bundle info and set new one
             this.saveBundleInfo(id, null);
             BundleInfo next = new BundleInfo(id, version, BundleStatus.PENDING, new Date(System.currentTimeMillis()), checksum);
             this.saveBundleInfo(id, next);
@@ -440,7 +451,7 @@ public class CapgoUpdater {
         final String id = this.randomString();
 
         // Check if version is already downloading, but allow retry if previous download failed
-        if (this.activity != null && DownloadWorkerManager.isVersionDownloading(version)) {
+        if (this.activity != null && DownloadWorkerManager.isVersionDownloading(this.activity, version)) {
             // Check if there's an existing bundle with error status that we can retry
             BundleInfo existingBundle = this.getBundleInfoByName(version);
             if (existingBundle != null && existingBundle.isErrorStatus()) {
@@ -453,7 +464,7 @@ public class CapgoUpdater {
             }
         }
 
-        this.saveBundleInfo(id, new BundleInfo(id, version, BundleStatus.DOWNLOADING, new Date(System.currentTimeMillis()), ""));
+        saveBundleInfo(id, new BundleInfo(id, version, BundleStatus.DOWNLOADING, new Date(System.currentTimeMillis()), ""));
         this.notifyDownload(id, 0);
         this.notifyDownload(id, 5);
 
@@ -469,7 +480,7 @@ public class CapgoUpdater {
         }
 
         final String id = this.randomString();
-        this.saveBundleInfo(id, new BundleInfo(id, version, BundleStatus.DOWNLOADING, new Date(System.currentTimeMillis()), ""));
+        saveBundleInfo(id, new BundleInfo(id, version, BundleStatus.DOWNLOADING, new Date(System.currentTimeMillis()), ""));
         this.notifyDownload(id, 0);
         this.notifyDownload(id, 5);
         final String dest = this.randomString();

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

@@ -16,6 +16,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.channels.FileChannel;
 import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,6 +34,11 @@ import okhttp3.Protocol;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.BufferedSource;
+import okio.Okio;
+import okio.Source;
 import org.brotli.dec.BrotliInputStream;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -60,29 +66,44 @@ public class DownloadService extends Worker {
     public static final String PLUGIN_VERSION = "plugin_version";
     private static final String UPDATE_FILE = "update.dat";
 
-    private final OkHttpClient client;
+    // Shared OkHttpClient to prevent resource leaks
+    private static OkHttpClient sharedClient;
+    private static String currentAppId = "unknown";
+    private static String currentPluginVersion = "unknown";
 
-    public DownloadService(@NonNull Context context, @NonNull WorkerParameters params) {
-        super(context, params);
-        // Get appId and plugin version from input data
-        String appId = getInputData().getString(APP_ID);
-        String pluginVersion = getInputData().getString(PLUGIN_VERSION);
-
-        // Build user agent with appId and plugin version
-        String userAgent =
-            "CapacitorUpdater/" + (pluginVersion != null ? pluginVersion : "unknown") + " (" + (appId != null ? appId : "unknown") + ")";
-
-        // Create OkHttpClient with custom user agent
-        this.client = new OkHttpClient.Builder()
+    // Initialize shared client with User-Agent interceptor
+    static {
+        sharedClient = new OkHttpClient.Builder()
             .protocols(Arrays.asList(Protocol.HTTP_2, Protocol.HTTP_1_1))
             .addInterceptor(chain -> {
                 Request originalRequest = chain.request();
+                String userAgent =
+                    "CapacitorUpdater/" +
+                    (currentPluginVersion != null ? currentPluginVersion : "unknown") +
+                    " (" +
+                    (currentAppId != null ? currentAppId : "unknown") +
+                    ")";
                 Request requestWithUserAgent = originalRequest.newBuilder().header("User-Agent", userAgent).build();
                 return chain.proceed(requestWithUserAgent);
             })
             .build();
     }
 
+    // Method to update User-Agent values
+    public static void updateUserAgent(String appId, String pluginVersion) {
+        currentAppId = appId != null ? appId : "unknown";
+        currentPluginVersion = pluginVersion != null ? pluginVersion : "unknown";
+        logger.debug("Updated User-Agent: CapacitorUpdater/" + currentPluginVersion + " (" + currentAppId + ")");
+    }
+
+    public DownloadService(@NonNull Context context, @NonNull WorkerParameters params) {
+        super(context, params);
+        // Use shared client - no need to create new instances
+
+        // Clean up old temporary files on service initialization
+        cleanupOldTempFiles(getApplicationContext().getCacheDir());
+    }
+
     private void setProgress(int percent) {
         Data progress = new Data.Builder().putInt(PERCENT, percent).build();
         setProgressAsync(progress);
@@ -272,93 +293,156 @@ public class DownloadService extends Worker {
         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
-        File tempFile = new File(documentsDir, "temp" + ".tmp"); // Temp file, where the downloaded data is stored
+        File infoFile = new File(documentsDir, UPDATE_FILE);
+        File tempFile = new File(documentsDir, "temp" + ".tmp");
+
+        // Check available disk space before starting
+        long availableSpace = target.getParentFile().getUsableSpace();
+        long estimatedSize = 50 * 1024 * 1024; // 50MB default estimate
+        if (availableSpace < estimatedSize * 2) {
+            throw new RuntimeException("insufficient_disk_space");
+        }
+
+        HttpURLConnection httpConn = null;
+        InputStream inputStream = null;
+        FileOutputStream outputStream = null;
+        BufferedReader reader = null;
+        BufferedWriter writer = null;
+
         try {
             URL u = new URL(url);
-            HttpURLConnection httpConn = null;
-            try {
-                httpConn = (HttpURLConnection) u.openConnection();
+            httpConn = (HttpURLConnection) u.openConnection();
 
-                // Reading progress file (if exist)
-                long downloadedBytes = 0;
+            // Set reasonable timeouts
+            httpConn.setConnectTimeout(30000); // 30 seconds
+            httpConn.setReadTimeout(60000); // 60 seconds
 
-                if (infoFile.exists() && tempFile.exists()) {
-                    try (BufferedReader reader = new BufferedReader(new FileReader(infoFile))) {
-                        String updateVersion = reader.readLine();
-                        if (updateVersion != null && !updateVersion.equals(version)) {
-                            clearDownloadData(documentsDir);
-                        } else {
-                            downloadedBytes = tempFile.length();
-                        }
+            // Reading progress file (if exist)
+            long downloadedBytes = 0;
+
+            if (infoFile.exists() && tempFile.exists()) {
+                try {
+                    reader = new BufferedReader(new FileReader(infoFile));
+                    String updateVersion = reader.readLine();
+                    if (updateVersion != null && !updateVersion.equals(version)) {
+                        clearDownloadData(documentsDir);
+                    } else {
+                        downloadedBytes = tempFile.length();
+                    }
+                } finally {
+                    if (reader != null) {
+                        try {
+                            reader.close();
+                        } catch (Exception ignored) {}
                     }
-                } else {
-                    clearDownloadData(documentsDir);
                 }
+            } else {
+                clearDownloadData(documentsDir);
+            }
+
+            if (downloadedBytes > 0) {
+                httpConn.setRequestProperty("Range", "bytes=" + downloadedBytes + "-");
+            }
 
-                if (downloadedBytes > 0) {
-                    httpConn.setRequestProperty("Range", "bytes=" + downloadedBytes + "-");
+            int responseCode = httpConn.getResponseCode();
+
+            if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_PARTIAL) {
+                long contentLength = httpConn.getContentLength() + downloadedBytes;
+
+                // Check if we have enough space for the actual file
+                if (contentLength > 0 && availableSpace < contentLength * 2) {
+                    throw new RuntimeException("insufficient_disk_space");
                 }
 
-                int responseCode = httpConn.getResponseCode();
+                try {
+                    inputStream = httpConn.getInputStream();
+                    outputStream = new FileOutputStream(tempFile, downloadedBytes > 0);
+
+                    if (downloadedBytes == 0) {
+                        writer = new BufferedWriter(new FileWriter(infoFile));
+                        writer.write(String.valueOf(version));
+                        writer.close();
+                        writer = null;
+                    }
 
-                if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_PARTIAL) {
-                    long contentLength = httpConn.getContentLength() + downloadedBytes;
+                    byte[] buffer = new byte[8192]; // Larger buffer for better performance
+                    int lastNotifiedPercent = 0;
+                    int bytesRead;
 
-                    try (
-                        InputStream inputStream = httpConn.getInputStream();
-                        FileOutputStream outputStream = new FileOutputStream(tempFile, downloadedBytes > 0)
-                    ) {
-                        if (downloadedBytes == 0) {
-                            try (BufferedWriter writer = new BufferedWriter(new FileWriter(infoFile))) {
-                                writer.write(String.valueOf(version));
-                            }
-                        }
-                        // Updating the info file
-                        try (BufferedWriter writer = new BufferedWriter(new FileWriter(infoFile))) {
-                            writer.write(String.valueOf(version));
+                    while ((bytesRead = inputStream.read(buffer)) != -1) {
+                        outputStream.write(buffer, 0, bytesRead);
+                        downloadedBytes += bytesRead;
+
+                        // Flush every 1MB to ensure progress is saved
+                        if (downloadedBytes % (1024 * 1024) == 0) {
+                            outputStream.flush();
                         }
 
-                        int bytesRead = -1;
-                        byte[] buffer = new byte[4096];
-                        int lastNotifiedPercent = 0;
-                        while ((bytesRead = inputStream.read(buffer)) != -1) {
-                            outputStream.write(buffer, 0, bytesRead);
-                            downloadedBytes += bytesRead;
-                            // Saving progress (flushing every 100 Ko)
-                            if (downloadedBytes % 102400 == 0) {
-                                outputStream.flush();
-                            }
-                            // Computing percentage
-                            int percent = calcTotalPercent(downloadedBytes, contentLength);
-                            while (lastNotifiedPercent + 10 <= percent) {
-                                lastNotifiedPercent += 10;
-                                // Artificial delay using CPU-bound calculation to take ~5 seconds
-                                double result = 0;
-                                setProgress(lastNotifiedPercent);
-                            }
+                        // Computing percentage
+                        int percent = calcTotalPercent(downloadedBytes, contentLength);
+                        if (percent >= lastNotifiedPercent + 10) {
+                            lastNotifiedPercent = (percent / 10) * 10;
+                            setProgress(lastNotifiedPercent);
                         }
+                    }
 
-                        outputStream.close();
-                        inputStream.close();
+                    // Final flush
+                    outputStream.flush();
+                    outputStream.close();
+                    outputStream = null;
 
-                        // Rename the temp file with the final name (dest)
-                        tempFile.renameTo(new File(documentsDir, dest));
-                        infoFile.delete();
+                    inputStream.close();
+                    inputStream = null;
+
+                    // Rename the temp file with the final name (dest)
+                    if (!tempFile.renameTo(new File(documentsDir, dest))) {
+                        throw new RuntimeException("Failed to rename temp file to final destination");
                     }
-                } else {
                     infoFile.delete();
+                } catch (OutOfMemoryError e) {
+                    logger.error("Out of memory during download: " + e.getMessage());
+                    // Try to free some memory
+                    System.gc();
+                    throw new RuntimeException("low_mem_fail");
+                } finally {
+                    // Ensure all resources are closed
+                    if (outputStream != null) {
+                        try {
+                            outputStream.close();
+                        } catch (Exception ignored) {}
+                    }
+                    if (inputStream != null) {
+                        try {
+                            inputStream.close();
+                        } catch (Exception ignored) {}
+                    }
+                    if (writer != null) {
+                        try {
+                            writer.close();
+                        } catch (Exception ignored) {}
+                    }
                 }
-            } finally {
-                if (httpConn != null) {
-                    httpConn.disconnect();
-                }
+            } else {
+                infoFile.delete();
+                throw new RuntimeException("HTTP error: " + responseCode);
             }
         } catch (OutOfMemoryError e) {
+            logger.error("Critical memory error: " + e.getMessage());
+            System.gc(); // Suggest garbage collection
             throw new RuntimeException("low_mem_fail");
+        } catch (SecurityException e) {
+            logger.error("Security error during download: " + e.getMessage());
+            throw new RuntimeException("security_error: " + e.getMessage());
         } catch (Exception e) {
-            throw new RuntimeException(e.getLocalizedMessage());
+            logger.error("Download error: " + e.getMessage());
+            throw new RuntimeException(e.getMessage());
+        } finally {
+            // Ensure connection is closed
+            if (httpConn != null) {
+                try {
+                    httpConn.disconnect();
+                } catch (Exception ignored) {}
+            }
         }
     }
 
@@ -412,26 +496,20 @@ 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 = client.newCall(request).execute()) {
+        try (Response response = sharedClient.newCall(request).execute()) {
             if (!response.isSuccessful()) {
                 throw new IOException("Unexpected response code: " + response.code());
             }
 
-            // Download compressed file
-            try (ResponseBody responseBody = response.body(); FileOutputStream compressedFos = new FileOutputStream(compressedFile)) {
-                if (responseBody == null) {
-                    throw new IOException("Response body is null");
-                }
-
-                byte[] buffer = new byte[8192];
-                int bytesRead;
-                try (InputStream inputStream = responseBody.byteStream()) {
-                    while ((bytesRead = inputStream.read(buffer)) != -1) {
-                        compressedFos.write(buffer, 0, bytesRead);
-                    }
-                }
+            // 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);
+
             if (!publicKey.isEmpty() && sessionKey != null && !sessionKey.isEmpty()) {
                 logger.debug("Decrypting file " + targetFile.getName());
                 CryptoCipherV2.decryptFile(compressedFile, publicKey, sessionKey);
@@ -439,13 +517,22 @@ public class DownloadService extends Worker {
 
             // Only decompress if file has .br extension
             if (isBrotli) {
-                // Use new decompression method
-                byte[] compressedData = Files.readAllBytes(compressedFile.toPath());
-                byte[] decompressedData = decompressBrotli(compressedData, targetFile.getName());
-                Files.write(finalTargetFile.toPath(), decompressedData);
+                // 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 = decompressBrotli(compressedData, targetFile.getName());
+
+                    // 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
-                Files.copy(compressedFile.toPath(), finalTargetFile.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
+                // Just copy the file without decompression using atomic operation
+                try (FileInputStream fis = new FileInputStream(compressedFile)) {
+                    writeFileAtomic(finalTargetFile, fis, null);
+                }
             }
 
             // Delete the compressed file
@@ -454,8 +541,10 @@ public class DownloadService extends Worker {
 
             // Verify checksum
             if (calculatedHash.equals(expectedHash)) {
-                // Only cache if checksum is correct
-                copyFile(finalTargetFile, cacheFile);
+                // Only cache if checksum is correct - use atomic copy
+                try (FileInputStream fis = new FileInputStream(finalTargetFile)) {
+                    writeFileAtomic(cacheFile, fis, expectedHash);
+                }
             } else {
                 finalTargetFile.delete();
                 throw new IOException(
@@ -561,4 +650,75 @@ public class DownloadService extends Worker {
             throw e;
         }
     }
+
+    /**
+     * Atomically write data to a file using OkIO
+     */
+    private void writeFileAtomic(File targetFile, InputStream inputStream, String expectedChecksum) throws IOException {
+        File tempFile = new File(targetFile.getParent(), targetFile.getName() + ".tmp");
+
+        try {
+            // Write to temp file first using OkIO
+            try (BufferedSink sink = Okio.buffer(Okio.sink(tempFile)); BufferedSource source = Okio.buffer(Okio.source(inputStream))) {
+                sink.writeAll(source);
+            }
+
+            // Verify checksum if provided
+            if (expectedChecksum != null && !expectedChecksum.isEmpty()) {
+                String actualChecksum = calculateFileChecksum(tempFile);
+                if (!expectedChecksum.equalsIgnoreCase(actualChecksum)) {
+                    tempFile.delete();
+                    throw new IOException("Checksum verification failed");
+                }
+            }
+
+            // Atomic rename (on same filesystem)
+            Files.move(tempFile.toPath(), targetFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        } catch (Exception e) {
+            // Clean up temp file on error
+            if (tempFile.exists()) {
+                tempFile.delete();
+            }
+            throw new IOException("Failed to write file atomically: " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Calculate MD5 checksum of a file
+     */
+    private String calculateFileChecksum(File file) throws IOException {
+        try (FileInputStream fis = new FileInputStream(file)) {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            byte[] buffer = new byte[8192];
+            int bytesRead;
+            while ((bytesRead = fis.read(buffer)) != -1) {
+                md.update(buffer, 0, bytesRead);
+            }
+            byte[] digest = md.digest();
+            StringBuilder sb = new StringBuilder();
+            for (byte b : digest) {
+                sb.append(String.format("%02x", b));
+            }
+            return sb.toString();
+        } catch (Exception e) {
+            throw new IOException("Failed to calculate checksum: " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Clean up old temporary files
+     */
+    private void cleanupOldTempFiles(File directory) {
+        if (directory == null || !directory.exists()) return;
+
+        File[] tempFiles = directory.listFiles((dir, name) -> name.endsWith(".tmp"));
+        if (tempFiles != null) {
+            long oneHourAgo = System.currentTimeMillis() - 3600000;
+            for (File tempFile : tempFiles) {
+                if (tempFile.lastModified() < oneHourAgo) {
+                    tempFile.delete();
+                }
+            }
+        }
+    }
 }

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

@@ -5,12 +5,11 @@ import androidx.work.BackoffPolicy;
 import androidx.work.Configuration;
 import androidx.work.Constraints;
 import androidx.work.Data;
+import androidx.work.ExistingWorkPolicy;
 import androidx.work.NetworkType;
 import androidx.work.OneTimeWorkRequest;
 import androidx.work.WorkManager;
 import androidx.work.WorkRequest;
-import java.util.HashSet;
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 public class DownloadWorkerManager {
@@ -22,8 +21,6 @@ public class DownloadWorkerManager {
     }
 
     private static volatile boolean isInitialized = false;
-    private static final Set<String> activeVersions = new HashSet<>();
-    private static final Object activeVersionsLock = new Object();
 
     private static synchronized void initializeIfNeeded(Context context) {
         if (!isInitialized) {
@@ -37,9 +34,17 @@ public class DownloadWorkerManager {
         }
     }
 
-    public static boolean isVersionDownloading(String version) {
-        synchronized (activeVersionsLock) {
-            return activeVersions.contains(version);
+    public static boolean isVersionDownloading(Context context, String version) {
+        initializeIfNeeded(context.getApplicationContext());
+        try {
+            return WorkManager.getInstance(context)
+                .getWorkInfosByTag(version)
+                .get()
+                .stream()
+                .anyMatch(workInfo -> !workInfo.getState().isFinished());
+        } catch (Exception e) {
+            logger.error("Error checking download status: " + e.getMessage());
+            return false;
         }
     }
 
@@ -60,14 +65,8 @@ public class DownloadWorkerManager {
     ) {
         initializeIfNeeded(context.getApplicationContext());
 
-        // If version is already downloading, don't start another one
-        synchronized (activeVersionsLock) {
-            if (activeVersions.contains(version)) {
-                logger.info("Version " + version + " is already downloading");
-                return;
-            }
-            activeVersions.add(version);
-        }
+        // Use unique work name for this bundle to prevent duplicates
+        String uniqueWorkName = "bundle_" + id + "_" + version;
 
         // Create input data
         Data inputData = new Data.Builder()
@@ -100,7 +99,7 @@ public class DownloadWorkerManager {
             .setConstraints(constraints)
             .setInputData(inputData)
             .addTag(id)
-            .addTag(version) // Add version tag for tracking
+            .addTag(version)
             .addTag("capacitor_updater_download");
 
         // More aggressive retry policy for emulators
@@ -112,23 +111,29 @@ public class DownloadWorkerManager {
 
         OneTimeWorkRequest workRequest = workRequestBuilder.build();
 
-        // Enqueue work
-        WorkManager.getInstance(context).enqueue(workRequest);
+        // Use beginUniqueWork to prevent duplicate downloads
+        WorkManager.getInstance(context)
+            .beginUniqueWork(
+                uniqueWorkName,
+                ExistingWorkPolicy.KEEP, // Don't start if already running
+                workRequest
+            )
+            .enqueue();
     }
 
     public static void cancelVersionDownload(Context context, String version) {
         initializeIfNeeded(context.getApplicationContext());
         WorkManager.getInstance(context).cancelAllWorkByTag(version);
-        synchronized (activeVersionsLock) {
-            activeVersions.remove(version);
-        }
+    }
+
+    public static void cancelBundleDownload(Context context, String id, String version) {
+        String uniqueWorkName = "bundle_" + id + "_" + version;
+        initializeIfNeeded(context.getApplicationContext());
+        WorkManager.getInstance(context).cancelUniqueWork(uniqueWorkName);
     }
 
     public static void cancelAllDownloads(Context context) {
         initializeIfNeeded(context.getApplicationContext());
         WorkManager.getInstance(context).cancelAllWorkByTag("capacitor_updater_download");
-        synchronized (activeVersionsLock) {
-            activeVersions.clear();
-        }
     }
 }

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -86,7 +86,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isShakeMenuEnabled", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let PLUGIN_VERSION: String = "7.9.1"
+    private let PLUGIN_VERSION: String = "7.9.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"
@@ -117,8 +117,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     override public func load() {
         let disableJSLogging = getConfig().getBoolean("disableJSLogging", false)
         // Set webView for logging to JavaScript console
-        if ((self.bridge?.webView) != nil) && !disableJSLogging {
-            logger.setWebView(webView: (self.bridge?.webView)!)
+        if let webView = self.bridge?.webView, !disableJSLogging {
+            logger.setWebView(webView: webView)
             logger.info("WebView set successfully for logging")
         } else {
             logger.error("Failed to get webView for logging")
@@ -135,7 +135,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         logger.info("init for device \(self.implementation.deviceID)")
         guard let versionName = getConfig().getString("version", Bundle.main.versionName) else {
             logger.error("Cannot get version name")
-            // crash the app
+            // crash the app on purpose
             fatalError("Cannot get version name")
         }
         do {
@@ -195,6 +195,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         implementation.appId = config?["appId"] as? String ?? implementation.appId
         implementation.appId = getConfig().getString("appId", implementation.appId)!
         if implementation.appId == "" {
+            // crash the app on purpose it should not happen
             fatalError("appId is missing in capacitor.config.json or plugin config, and cannot be retrieved from the native app, please add it globally or in the plugin config")
         }
         logger.info("appId \(implementation.appId)")
@@ -252,8 +253,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     private func semaphoreWait(waitTime: Int) {
-        // print("\(CapgoUpdater.TAG) semaphoreWait \(waitTime)")
-        _ = semaphoreReady.wait(timeout: .now() + .milliseconds(waitTime))
+        // print("\\(CapgoUpdater.TAG) semaphoreWait \\(waitTime)")
+        let result = semaphoreReady.wait(timeout: .now() + .milliseconds(waitTime))
+        if result == .timedOut {
+            logger.error("Semaphore wait timed out after \(waitTime)ms")
+        }
     }
 
     private func semaphoreUp() {
@@ -1087,6 +1091,15 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
     @objc func appKilled() {
         logger.info("onActivityDestroyed: all activity destroyed")
         self.delayUpdateUtils.checkCancelDelay(source: .killed)
+        
+        // Clean up resources
+        periodicUpdateTimer?.invalidate()
+        periodicUpdateTimer = nil
+        backgroundWork?.cancel()
+        backgroundWork = nil
+        
+        // Signal any waiting semaphores to prevent deadlocks
+        semaphoreReady.signal()
     }
 
     private func installNext() {
@@ -1164,8 +1177,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         // Clean up any existing timer
         periodicUpdateTimer?.invalidate()
         
-        periodicUpdateTimer = Timer.scheduledTimer(withTimeInterval: TimeInterval(periodCheckDelay), repeats: true) { [weak self] _ in
-            guard let self = self else { return }
+        periodicUpdateTimer = Timer.scheduledTimer(withTimeInterval: TimeInterval(periodCheckDelay), repeats: true) { [weak self] timer in
+            guard let self = self else { 
+                timer.invalidate()
+                return 
+            }
             DispatchQueue.global(qos: .background).async {
                 let res = self.implementation.getLatest(url: url, channel: nil)
                 let current = self.implementation.getCurrentBundle()

package/ios/Plugin/CapgoUpdater.swift

@@ -43,7 +43,9 @@ import UIKit
     public var publicKey: String = ""
 
     private var userAgent: String {
-        return "CapacitorUpdater/\(PLUGIN_VERSION) (\(appId))"
+        let safePluginVersion = PLUGIN_VERSION.isEmpty ? "unknown" : PLUGIN_VERSION
+        let safeAppId = appId.isEmpty ? "unknown" : appId
+        return "CapacitorUpdater/\(safePluginVersion) (\(safeAppId))"
     }
 
     private lazy var alamofireSession: Session = {

package/package.json

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