@capgo/capacitor-updater 7.8.4 → 7.8.5

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

@@ -59,7 +59,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.8.4";
+    private final String PLUGIN_VERSION = "7.8.5";
     private static final String DELAY_CONDITION_PREFERENCES = "";
 
     private SharedPreferences.Editor editor;

package/ios/Plugin/CapacitorUpdaterPlugin.swift

@@ -7,6 +7,42 @@
 import Foundation
 import Capacitor
 import Version
+import WebKit
+
+// Helper class to detect when WebView loading completes
+class WebViewLoadDelegate: NSObject, WKNavigationDelegate {
+    private let completion: (Bool) -> Void
+    private var hasCompleted = false
+    
+    init(completion: @escaping (Bool) -> Void) {
+        self.completion = completion
+        super.init()
+    }
+    
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        if !hasCompleted {
+            hasCompleted = true
+            webView.navigationDelegate = nil // Clean up
+            completion(true)
+        }
+    }
+    
+    func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
+        if !hasCompleted {
+            hasCompleted = true
+            webView.navigationDelegate = nil // Clean up
+            completion(false)
+        }
+    }
+    
+    func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
+        if !hasCompleted {
+            hasCompleted = true
+            webView.navigationDelegate = nil // Clean up
+            completion(false)
+        }
+    }
+}
 
 /**
  * Please read the Capacitor iOS Plugin Development Guide
@@ -50,7 +86,7 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "isShakeMenuEnabled", returnType: CAPPluginReturnPromise)
     ]
     public var implementation = CapgoUpdater()
-    private let PLUGIN_VERSION: String = "7.8.4"
+    private let PLUGIN_VERSION: String = "7.8.5"
     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"
@@ -409,27 +445,62 @@ public class CapacitorUpdaterPlugin: CAPPlugin, CAPBridgedPlugin {
                 logger.error("Cannot get capBridge")
                 return false
             }
+            
+            // Use semaphore to wait for WebView load completion
+            let loadSemaphore = DispatchSemaphore(value: 0)
+            var loadSuccess = false
+            
+            // Set up navigation delegate to detect when loading completes
+            let navigationDelegate = WebViewLoadDelegate { [weak self] success in
+                loadSuccess = success
+                if success {
+                    self?.checkAppReady()
+                    self?.notifyListeners("appReloaded", data: [:])
+                }
+                loadSemaphore.signal()
+            }
+            
             if keepUrlPathAfterReload {
                 DispatchQueue.main.async {
                     guard let url = vc.webView?.url else {
                         self.logger.error("vc.webView?.url is null?")
+                        loadSuccess = false
+                        loadSemaphore.signal()
                         return
                     }
                     capBridge.setServerBasePath(dest.path)
                     var urlComponents = URLComponents(url: capBridge.config.serverURL, resolvingAgainstBaseURL: false)!
                     urlComponents.path = url.path
                     if let finalUrl = urlComponents.url {
+                        vc.webView?.navigationDelegate = navigationDelegate
                         _ = vc.webView?.load(URLRequest(url: finalUrl))
+                    } else {
+                        loadSuccess = false
+                        loadSemaphore.signal()
                     }
                 }
             } else {
                 vc.setServerBasePath(path: dest.path)
-
+                // For setServerBasePath, we need to wait for the next page load
+                vc.webView?.navigationDelegate = navigationDelegate
+                // Trigger a reload to ensure the new path is loaded
+                DispatchQueue.main.async {
+                    vc.webView?.reload()
+                }
             }
-
-            self.checkAppReady()
-            self.notifyListeners("appReloaded", data: [:])
-            return true
+            
+            // Wait for load completion with timeout
+            let result = loadSemaphore.wait(timeout: .now() + 10) // 10 second timeout
+            
+            if result == .timedOut {
+                logger.error("Reload timed out after 10 seconds")
+                DispatchQueue.main.async {
+                    vc.webView?.navigationDelegate = nil // Clean up
+                }
+                return false
+            }
+            
+            return loadSuccess
         }
         return false
     }

package/package.json

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