@capgo/capacitor-webview-crash 8.0.2 → 8.1.0

package/ios/Sources/WebViewCrashPlugin/WebViewCrashPlugin.swift

@@ -9,20 +9,31 @@ public class WebViewCrashPlugin: CAPPlugin, CAPBridgedPlugin {
     public let pluginMethods: [CAPPluginMethod] = [
         CAPPluginMethod(name: "getPendingCrashInfo", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "clearPendingCrashInfo", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "simulateCrashRecovery", returnType: CAPPluginReturnPromise)
+        CAPPluginMethod(name: "simulateCrashRecovery", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "restartWebView", returnType: CAPPluginReturnPromise)
     ]
 
-    private var didDispatchPendingEvent = false
+    private var dispatchedPendingEvents = Set<String>()
+    private var restartOptions = WebViewCrashRestartOptions()
+    private var restartTimer: Timer?
 
     override public func load() {
+        restartOptions = WebViewCrashRestartOptions(config: getConfig())
+        WebViewCrashRuntime.update(options: restartOptions)
         WebViewCrashSwizzler.installIfNeeded()
+        schedulePeriodicRestart()
+    }
+
+    deinit {
+        restartTimer?.invalidate()
     }
 
     @objc override public func addListener(_ call: CAPPluginCall) {
         super.addListener(call)
 
-        if call.getString("eventName") == WebViewCrashBridge.eventName {
-            dispatchPendingCrashIfNeeded()
+        if let eventName = call.getString("eventName"),
+            eventName == WebViewCrashBridge.crashEventName || eventName == WebViewCrashBridge.restartEventName {
+            dispatchPendingCrashIfNeeded(eventName: eventName)
         }
     }
 
@@ -32,7 +43,7 @@ public class WebViewCrashPlugin: CAPPlugin, CAPBridgedPlugin {
 
     @objc func clearPendingCrashInfo(_ call: CAPPluginCall) {
         WebViewCrashStore.clear()
-        didDispatchPendingEvent = false
+        dispatchedPendingEvents.removeAll()
         call.resolve()
     }
 
@@ -45,18 +56,97 @@ public class WebViewCrashPlugin: CAPPlugin, CAPBridgedPlugin {
         )
 
         WebViewCrashStore.write(crashInfo)
-        didDispatchPendingEvent = false
-        dispatchPendingCrashIfNeeded()
+        dispatchedPendingEvents.removeAll()
+        dispatchPendingCrashIfNeeded(eventName: WebViewCrashBridge.crashEventName)
+        dispatchPendingCrashIfNeeded(eventName: WebViewCrashBridge.restartEventName)
 
         call.resolve(WebViewCrashBridge.pendingResult(crashInfo))
     }
 
-    private func dispatchPendingCrashIfNeeded() {
-        guard !didDispatchPendingEvent, let crashInfo = WebViewCrashStore.read() else {
+    @objc func restartWebView(_ call: CAPPluginCall) {
+        guard bridge?.viewController is CAPBridgeViewController else {
+            call.reject("Unable to restart WebView because the bridge view controller is unavailable.")
+            return
+        }
+
+        let restartInfo = WebViewCrashStore.buildCrashInfo(
+            platform: "ios",
+            reason: WebViewCrashBridge.manualRestartReason,
+            url: bridge?.webView?.url?.absoluteString,
+            appState: UIApplication.shared.applicationState.capgoWebViewCrashValue
+        )
+
+        WebViewCrashStore.write(restartInfo)
+        dispatchedPendingEvents.removeAll()
+        call.resolve(WebViewCrashBridge.pendingResult(restartInfo))
+
+        DispatchQueue.main.async { [weak self] in
+            _ = self?.recreateBridgeWebView()
+        }
+    }
+
+    private func dispatchPendingCrashIfNeeded(eventName: String) {
+        guard !dispatchedPendingEvents.contains(eventName),
+            let crashInfo = WebViewCrashStore.read(),
+            WebViewCrashStore.shouldDispatch(eventName: eventName, crashInfo: crashInfo) else {
             return
         }
 
-        didDispatchPendingEvent = true
-        notifyListeners(WebViewCrashBridge.eventName, data: crashInfo)
+        dispatchedPendingEvents.insert(eventName)
+        notifyListeners(eventName, data: crashInfo)
+    }
+
+    private func schedulePeriodicRestart() {
+        restartTimer?.invalidate()
+
+        guard let restartDelaySeconds = restartOptions.nextRestartDelaySeconds, restartDelaySeconds > 0 else {
+            return
+        }
+
+        DispatchQueue.main.async { [weak self] in
+            guard let self else {
+                return
+            }
+
+            restartTimer = Timer.scheduledTimer(withTimeInterval: restartDelaySeconds, repeats: false) { [weak self] _ in
+                self?.restartWebView(reason: WebViewCrashBridge.periodicRestartReason)
+            }
+        }
+    }
+
+    private func restartWebView(reason: String) {
+        DispatchQueue.main.async { [weak self] in
+            guard let self, let webView = bridge?.webView else {
+                return
+            }
+
+            let restartInfo = WebViewCrashStore.buildCrashInfo(
+                platform: "ios",
+                reason: reason,
+                url: webView.url?.absoluteString,
+                appState: UIApplication.shared.applicationState.capgoWebViewCrashValue
+            )
+
+            WebViewCrashStore.write(restartInfo)
+            dispatchedPendingEvents.removeAll()
+            if !recreateBridgeWebView() {
+                webView.reload()
+                schedulePeriodicRestart()
+            }
+        }
+    }
+
+    private func recreateBridgeWebView() -> Bool {
+        guard let viewController = bridge?.viewController as? CAPBridgeViewController else {
+            return false
+        }
+
+        restartTimer?.invalidate()
+        viewController.webView?.stopLoading()
+        viewController.webView?.navigationDelegate = nil
+        viewController.webView?.uiDelegate = nil
+        viewController.loadView()
+        viewController.loadWebView()
+        return true
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capgo/capacitor-webview-crash",
-  "version": "8.0.2",
-  "description": "Capacitor plugin for detecting WebView crash recovery and informing the next JS runtime.",
+  "version": "8.1.0",
+  "description": "Capacitor plugin for detecting WebView crash recovery and restarting long-running WebViews natively.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
@@ -29,6 +29,8 @@
     "capacitor",
     "plugin",
     "webview-crash",
+    "webview-restart",
+    "oom-recovery",
     "crash-recovery",
     "ios",
     "android",
@@ -36,7 +38,7 @@
   ],
   "scripts": {
     "verify": "bun run verify:ios && bun run verify:android && bun run verify:web",
-    "verify:ios": "xcodebuild -scheme CapgoCapacitorWebViewCrash -destination generic/platform=iOS",
+    "verify:ios": "xcodebuild -scheme CapgoCapacitorWebviewCrash -destination generic/platform=iOS",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "bun run build && bun test",
     "test": "bun test",