@capgo/capacitor-updater 5.2.10 → 5.2.13

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

@@ -376,6 +376,7 @@ public class CapacitorUpdater {
       if (setNext) {
         if (this.directUpdate) {
           CapacitorUpdater.this.directUpdateFinish(next);
+          this.directUpdate = false;
         } else {
           this.setNextBundle(next.getId());
         }

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

@@ -41,6 +41,8 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import org.json.JSONException;
 
 @CapacitorPlugin(name = "CapacitorUpdater")
@@ -56,7 +58,7 @@ public class CapacitorUpdaterPlugin
   private static final String channelUrlDefault =
     "https://api.capgo.app/channel_self";
 
-  private final String PLUGIN_VERSION = "5.2.10";
+  private final String PLUGIN_VERSION = "5.2.13";
   private static final String DELAY_CONDITION_PREFERENCES = "";
 
   private SharedPreferences.Editor editor;
@@ -78,6 +80,8 @@ public class CapacitorUpdaterPlugin
 
   private volatile Thread appReadyCheck;
 
+  private static final CountDownLatch semaphoreReady = new CountDownLatch(1);
+
   @Override
   public void load() {
     super.load();
@@ -180,7 +184,20 @@ public class CapacitorUpdaterPlugin
     ret.put("status", "update installed");
     CapacitorUpdaterPlugin.this.implementation.set(latest);
     CapacitorUpdaterPlugin.this._reload();
-    CapacitorUpdaterPlugin.this.notifyListeners("appReady", ret);
+    new Thread(() -> {
+      try {
+        // Log.i(CapacitorUpdater.TAG, "semaphoreReady directUpdateFinish");
+        CapacitorUpdaterPlugin.this.semaphoreReady.await(
+            CapacitorUpdaterPlugin.this.appReadyTimeout,
+            TimeUnit.SECONDS
+          );
+        // Log.i(CapacitorUpdater.TAG, "semaphoreReady directUpdateFinish done");
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
+      CapacitorUpdaterPlugin.this.notifyListeners("appReady", ret);
+    })
+      .start();
   }
 
   private void cleanupObsoleteVersions() {
@@ -440,6 +457,16 @@ public class CapacitorUpdaterPlugin
 
   private boolean _reload() {
     final String path = this.implementation.getCurrentBundlePath();
+    new Thread(() -> {
+      try {
+        // Log.i(CapacitorUpdater.TAG, "semaphoreReady _reload");
+        CapacitorUpdaterPlugin.this.semaphoreReady.await(0, TimeUnit.SECONDS);
+        // Log.i(CapacitorUpdater.TAG, "semaphoreReady _reload done");
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
+    })
+      .start();
     Log.i(CapacitorUpdater.TAG, "Reloading: " + path);
     if (this.implementation.isUsingBuiltin()) {
       this.bridge.setServerAssetPath(path);
@@ -657,6 +684,9 @@ public class CapacitorUpdaterPlugin
         "Current bundle loaded successfully. ['notifyAppReady()' was called] " +
         bundle
       );
+      // Log.i(CapacitorUpdater.TAG, "semaphoreReady countDown");
+      this.semaphoreReady.countDown();
+      // Log.i(CapacitorUpdater.TAG, "semaphoreReady countDown done");
       call.resolve();
     } catch (final Exception e) {
       Log.e(
@@ -867,7 +897,18 @@ public class CapacitorUpdaterPlugin
     ret.put("bundle", current.toJSON());
     this.notifyListeners("noNeedUpdate", ret);
     ret.put("message", msg);
-    this.notifyListeners("appReady", ret);
+    new Thread(() -> {
+      try {
+        CapacitorUpdaterPlugin.this.semaphoreReady.await(
+            CapacitorUpdaterPlugin.this.appReadyTimeout,
+            TimeUnit.SECONDS
+          );
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
+      CapacitorUpdaterPlugin.this.notifyListeners("appReady", ret);
+    })
+      .start();
     Log.i(CapacitorUpdater.TAG, "endBackGroundTaskWithNotif " + msg);
   }
 
@@ -1237,20 +1278,23 @@ public class CapacitorUpdaterPlugin
       this.backgroundDownload();
     } else {
       Log.i(CapacitorUpdater.TAG, "Auto update is disabled");
-      // run after 1.5 s to make sure the listeners are registered
-      new Handler()
-        .postDelayed(
-          new Runnable() {
-            @Override
-            public void run() {
-              final JSObject ret = new JSObject();
-              ret.put("bundle", current.toJSON());
-              ret.put("status", "disabled");
-              CapacitorUpdaterPlugin.this.notifyListeners("appReady", ret);
-            }
-          },
-          1500
-        );
+      new Thread(() -> {
+        try {
+          // Log.i(CapacitorUpdater.TAG, "semaphoreReady Auto update");
+          CapacitorUpdaterPlugin.this.semaphoreReady.await(
+              CapacitorUpdaterPlugin.this.appReadyTimeout,
+              TimeUnit.SECONDS
+            );
+          // Log.i(CapacitorUpdater.TAG, "semaphoreReady Auto update done");
+        } catch (InterruptedException e) {
+          e.printStackTrace();
+        }
+        final JSObject ret = new JSObject();
+        ret.put("bundle", current.toJSON());
+        ret.put("status", "disabled");
+        CapacitorUpdaterPlugin.this.notifyListeners("appReady", ret);
+      })
+        .start();
     }
     this.checkAppReady();
   }

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -15,7 +15,7 @@ import Version
 @objc(CapacitorUpdaterPlugin)
 public class CapacitorUpdaterPlugin: CAPPlugin {
     private var implementation = CapacitorUpdater()
-    private let PLUGIN_VERSION: String = "5.2.10"
+    private let PLUGIN_VERSION: String = "5.2.13"
     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"
@@ -34,8 +34,10 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     private var autoDeletePrevious = false
     private var backgroundWork: DispatchWorkItem?
     private var taskRunning = false
+    let semaphoreReady = DispatchSemaphore(value: 0)
 
     override public func load() {
+        _ = semaphoreReady.wait(timeout: .now())
         print("\(self.implementation.TAG) init for device \(self.implementation.deviceID)")
         do {
             currentVersionNative = try Version(getConfig().getString("version", Bundle.main.versionName ?? "0.0.0")!)
@@ -158,6 +160,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
 
     private func _reload() -> Bool {
         guard let bridge = self.bridge else { return false }
+        _ = self.semaphoreReady.wait(timeout: .now())
         let id = self.implementation.getCurrentBundleId()
         let destHot = self.implementation.getPathHot(id: id)
         print("\(self.implementation.TAG) Reloading \(id)")
@@ -326,6 +329,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
     }
 
     @objc func notifyAppReady(_ call: CAPPluginCall) {
+        self.semaphoreReady.signal()
         let version = self.implementation.getCurrentBundle()
         self.implementation.setSuccess(bundle: version, autoDeletePrevious: self.autoDeletePrevious)
         print("\(self.implementation.TAG) Current bundle loaded successfully. ['notifyAppReady()' was called] \(version.toString())")
@@ -504,7 +508,11 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             self.notifyListeners("downloadFailed", data: ["version": latestVersionName])
         }
         self.notifyListeners("noNeedUpdate", data: ["bundle": current.toJSON()])
-        self.notifyListeners("appReady", data: ["bundle": current.toJSON(), "message": msg])
+
+        DispatchQueue.global().async {
+            _ = self.semaphoreReady.wait(timeout: .now() + .milliseconds(self.appReadyTimeout))
+            self.notifyListeners("appReady", data: ["bundle": current.toJSON(), "message": msg])
+        }
         print("\(self.implementation.TAG) endBackGroundTaskWithNotif \(msg)")
         self.endBackGroundTask()
     }
@@ -576,6 +584,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
                     if self.directUpdate {
                         _ = self.implementation.set(bundle: next)
                         _ = self._reload()
+                        self.directUpdate = false
                         self.endBackGroundTaskWithNotif(msg: "update installed", latestVersionName: latestVersionName, current: current)
                     } else {
                         self.notifyListeners("updateAvailable", data: ["bundle": next.toJSON()])
@@ -654,8 +663,8 @@ public class CapacitorUpdaterPlugin: CAPPlugin {
             self.backgroundDownload()
         } else {
             print("\(self.implementation.TAG) Auto update is disabled")
-            // run after 1 second to make sure that the app is ready
-            DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
+            DispatchQueue.global().async {
+                _ = self.semaphoreReady.wait(timeout: .now() + .milliseconds(self.appReadyTimeout))
                 self.notifyListeners("appReady", data: ["bundle": current.toJSON(), "status": "disabled"])
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-updater",
-  "version": "5.2.10",
+  "version": "5.2.13",
   "packageManager": "pnpm@8.6.12",
   "license": "MPL-2.0",
   "description": "Live update for capacitor apps",