@capgo/capacitor-updater 7.9.1 → 7.11.6

package/README.md

@@ -249,7 +249,7 @@ CapacitorUpdater can be configured with these options:
 | **`localApi`**               | <code>string</code>                             | Configure the CLI to use a local api for testing.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | <code>undefined</code>                             | 6.3.3   |
 | **`localApiFiles`**          | <code>string</code>                             | Configure the CLI to use a local file api for testing.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | <code>undefined</code>                             | 6.3.3   |
 | **`allowModifyUrl`**         | <code>boolean</code>                            | Allow the plugin to modify the updateUrl, statsUrl and channelUrl dynamically from the JavaScript side.                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | <code>false</code>                                 | 5.4.0   |
-| **`defaultChannel`**         | <code>string</code>                             | Set the default channel for the app in the config. Case sensitive. This will setting will override the default channel set in the cloud, but will still respect overrides made in the cloud.                                                                                                                                                                                                                                                                                                                                                                                      | <code>undefined</code>                             | 5.5.0   |
+| **`defaultChannel`**         | <code>string</code>                             | Set the default channel for the app in the config. Case sensitive. This will setting will override the default channel set in the cloud, but will still respect overrides made in the cloud. This requires the channel to allow devices to self dissociate/associate in the channel settings. https://capgo.app/docs/public-api/channels/#channel-configuration-options                                                                                                                                                                                                           | <code>undefined</code>                             | 5.5.0   |
 | **`appId`**                  | <code>string</code>                             | Configure the app id for the app in the config.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | <code>undefined</code>                             | 6.0.0   |
 | **`keepUrlPathAfterReload`** | <code>boolean</code>                            | Configure the plugin to keep the URL path after a reload. WARNING: When a reload is triggered, 'window.history' will be cleared.                                                                                                                                                                                                                                                                                                                                                                                                                                                  | <code>false</code>                                 | 6.8.0   |
 | **`disableJSLogging`**       | <code>boolean</code>                            | Disable the JavaScript logging of the plugin. if true, the plugin will not log to the JavaScript console. only the native log will be done                                                                                                                                                                                                                                                                                                                                                                                                                                        | <code>false</code>                                 | 7.3.0   |

package/android/build.gradle

@@ -59,8 +59,20 @@ dependencies {
     implementation 'io.github.g00fy2:versioncompare:1.5.0'
     implementation 'com.google.code.gson:gson:2.13.1'
     testImplementation "junit:junit:$junitVersion"
+    testImplementation 'org.mockito:mockito-core:5.14.2'
+    testImplementation 'org.robolectric:robolectric:4.13'
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
     implementation 'org.brotli:dec:0.1.2'
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 }
+
+tasks.withType(Test) {
+    testLogging {
+        events "passed", "skipped", "failed", "standardOut", "standardError"
+        exceptionFormat "full"
+        showStandardStreams = true
+        showCauses = true
+        showStackTraces = true
+    }
+}

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.11.6";
     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
         }
     }
 
@@ -291,7 +290,7 @@ public class CapacitorUpdaterPlugin extends Plugin {
         ret.put("status", msg);
 
         // No need to wait for semaphore anymore since _reload() has already waited
-        this.notifyListeners("appReady", ret);
+        this.notifyListeners("appReady", ret, true);
 
         // Auto hide splashscreen if enabled
         // We show it on background when conditions are met, so we should hide it on foreground regardless of update outcome
@@ -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();
@@ -629,10 +640,15 @@ public class CapgoUpdater {
         final BundleInfo fallback = this.getFallbackBundle();
         logger.debug("Fallback bundle is: " + fallback);
         logger.info("Version successfully loaded: " + bundle.getVersionName());
-        if (autoDeletePrevious && !fallback.isBuiltin()) {
+        // Only attempt to delete when the fallback is a different bundle than the
+        // currently loaded one. Otherwise we spam logs with "Cannot delete <id>"
+        // because delete() protects the current bundle from removal.
+        if (autoDeletePrevious && !fallback.isBuiltin() && fallback.getId() != null && !fallback.getId().equals(bundle.getId())) {
             final Boolean res = this.delete(fallback.getId());
             if (res) {
                 logger.info("Deleted previous bundle: " + fallback.getVersionName());
+            } else {
+                logger.debug("Skip deleting previous bundle (same as current or protected): " + fallback.getId());
             }
         }
         this.setFallbackBundle(bundle);