@capgo/capacitor-inappbrowser 8.10.3 → 8.10.5-beta.pr624.490.1

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -47,6 +47,35 @@ private enum BlobDownloadSupport {
     static let chunkBytes = 64 * 1024
 }
 
+/// Script message handlers registered on every in-app browser WKWebView.
+/// Popup configs from `createWebViewWith` copy parent handlers, so we must
+/// remove these names before re-adding or WKWebView raises NSInvalidArgumentException.
+enum ScriptMessageHandlerSupport {
+    static let allNames = [
+        "messageHandler",
+        "preShowScriptError",
+        "preShowScriptSuccess",
+        "close",
+        "hide",
+        "show",
+        "blobDownload",
+        "blobDownloadStart",
+        "blobDownloadChunk",
+        "blobDownloadFinish",
+        "blobDownloadAbort",
+        "takeScreenshot",
+        "consoleMessageHandler",
+        "magicPrint",
+        "capgoProxyBridge"
+    ]
+
+    static func removeAll(from userContentController: WKUserContentController) {
+        for name in allNames {
+            userContentController.removeScriptMessageHandler(forName: name)
+        }
+    }
+}
+
 private struct BlobDownloadSession {
     let destinationURL: URL
     let sourceURL: String?
@@ -2008,16 +2037,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         }
         let userContentController = webConfiguration.userContentController
         userContentController.removeAllUserScripts()
-        userContentController.removeScriptMessageHandler(forName: "messageHandler")
-        userContentController.removeScriptMessageHandler(forName: "preShowScriptError")
-        userContentController.removeScriptMessageHandler(forName: "preShowScriptSuccess")
-        userContentController.removeScriptMessageHandler(forName: "close")
-        userContentController.removeScriptMessageHandler(forName: "hide")
-        userContentController.removeScriptMessageHandler(forName: "show")
-        userContentController.removeScriptMessageHandler(forName: "takeScreenshot")
-        userContentController.removeScriptMessageHandler(forName: "consoleMessageHandler")
-        userContentController.removeScriptMessageHandler(forName: "magicPrint")
-        userContentController.removeScriptMessageHandler(forName: "capgoProxyBridge")
+        ScriptMessageHandlerSupport.removeAll(from: userContentController)
 
         if proxyRequests || proxySchemeHandler != nil, let handler = proxySchemeHandler {
             WKWebView.enableCustomSchemeHandling(for: ["https", "http"])
@@ -2264,7 +2284,9 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.enabledSafeTopMargin = parent.enabledSafeTopMargin
         self.blockedHosts = parent.blockedHosts
         self.authorizedAppLinks = parent.authorizedAppLinks
-        self.activeNativeNavigationForWebview = parent.activeNativeNavigationForWebview
+        // createWebViewWith configs copy parent script handlers; start clean so
+        // initWebview can register blobDownload/etc without NSInvalidArgumentException.
+        configuration.userContentController = WKUserContentController()
         self.initialWebConfiguration = configuration
         self.persistWebViewData = parent.persistWebViewData
         self.disableOverscroll = parent.disableOverscroll
@@ -2548,20 +2570,7 @@ public extension WKWebViewController {
         webView.loadHTMLString("", baseURL: nil)
 
         webView.configuration.userContentController.removeAllUserScripts()
-        webView.configuration.userContentController.removeScriptMessageHandler(forName: "messageHandler")
-        webView.configuration.userContentController.removeScriptMessageHandler(forName: "close")
-        webView.configuration.userContentController.removeScriptMessageHandler(forName: "hide")
-        webView.configuration.userContentController.removeScriptMessageHandler(forName: "show")
-        if allowScreenshotsFromWebPage {
-            webView.configuration.userContentController.removeScriptMessageHandler(forName: "takeScreenshot")
-        }
-        if captureConsoleLogs {
-            webView.configuration.userContentController.removeScriptMessageHandler(forName: "consoleMessageHandler")
-        }
-        webView.configuration.userContentController.removeScriptMessageHandler(forName: "preShowScriptSuccess")
-        webView.configuration.userContentController.removeScriptMessageHandler(forName: "preShowScriptError")
-        webView.configuration.userContentController.removeScriptMessageHandler(forName: "magicPrint")
-        webView.configuration.userContentController.removeScriptMessageHandler(forName: "capgoProxyBridge")
+        ScriptMessageHandlerSupport.removeAll(from: webView.configuration.userContentController)
 
         webView.removeFromSuperview()
         // Also clean progress bar view if present
@@ -2830,8 +2839,9 @@ fileprivate extension WKWebViewController {
     private func tryOpenCustomScheme(_ url: URL) -> Bool {
         let app = UIApplication.shared
         let shouldEmitCustomSchemeEvent = CustomSchemeInterceptSupport.shouldEmitInterceptEvent(for: url)
+        let canOpen = app.canOpenURL(url)
 
-        if app.canOpenURL(url) {
+        if CustomSchemeOpenSupport.shouldAttemptOpen(scheme: url.scheme, canOpenURL: canOpen) {
             app.open(url, options: [:], completionHandler: nil)
             if shouldEmitCustomSchemeEvent {
                 emit("customSchemeIntercepted", data: ["url": url.absoluteString, "opened": true])
@@ -2847,10 +2857,22 @@ fileprivate extension WKWebViewController {
         return true
     }
 
-    private func tryOpenUniversalLink(_ url: URL, completion: @escaping (Bool) -> Void) {
-        // Only for http(s):// and authorized hosts
-        UIApplication.shared.open(url, options: [.universalLinksOnly: true]) { opened in
-            completion(opened) // true => app opened, false => no associated app
+    /// Prefer Universal Links into the native app; if that fails, hand off to the system
+    /// (App Store, Safari, etc.) before falling back to in-webview loading.
+    private func openAuthorizedAppLink(_ url: URL, completion: @escaping (Bool) -> Void) {
+        UIApplication.shared.open(url, options: [.universalLinksOnly: true]) { universalLinkOpened in
+            if universalLinkOpened {
+                completion(true)
+                return
+            }
+
+            UIApplication.shared.open(url, options: [:]) { systemOpenSucceeded in
+                let outcome = AuthorizedAppLinkOpenSupport.resolve(
+                    universalLinkOpened: false,
+                    systemOpenSucceeded: systemOpenSucceeded
+                )
+                completion(outcome == .openedExternally)
+            }
         }
     }
 
@@ -2954,12 +2976,12 @@ fileprivate extension WKWebViewController {
             return
         }
 
-        // Authorized Universal Link hosts: prefer app via universalLinksOnly
+        // Authorized App Link hosts: Universal Link first, then system open.
         print("[InAppBrowser] Authorized App Links: \(self.authorizedAppLinks)")
         if isUrlAuthorized(url, authorizedLinks: self.authorizedAppLinks) {
-            print("[InAppBrowser] Authorized Universal Link detected \(scheme + host), try to open URLs in external apps")
-            tryOpenUniversalLink(url) { opened in
-                print("[InAppBrowser] Handle as Universal Link: \(opened)")
+            print("[InAppBrowser] Authorized App Link detected \(scheme + host), try to open URLs in external apps")
+            openAuthorizedAppLink(url) { opened in
+                print("[InAppBrowser] Authorized App Link opened externally: \(opened)")
                 completion(opened) // opened => cancel navigation; not opened => allow WebView
             }
             return
@@ -3255,8 +3277,8 @@ extension WKWebViewController: WKUIDelegate {
             isAuthorizedAppLink: isAuthorized
         ) {
         case .openExternalApp:
-            // Prefer the native app / Universal Link. If none handles it, keep browsing in-place.
-            tryOpenUniversalLink(url) { [weak webView] opened in
+            // Prefer native app / Universal Link, then system open (App Store / Safari).
+            openAuthorizedAppLink(url) { [weak webView] opened in
                 if !opened {
                     DispatchQueue.main.async {
                         webView?.load(navigationAction.request)
@@ -3552,7 +3574,10 @@ extension WKWebViewController: WKNavigationDelegate {
             return
         }
 
-        if url.absoluteString.contains("apps.apple.com") {
+        let appStoreHosts = ["apps.apple.com", "itunes.apple.com"]
+        if !self.preventDeeplink,
+           let appStoreHost = self.normalizeHost(url.host),
+           appStoreHosts.contains(appStoreHost) {
             UIApplication.shared.open(url, options: [:], completionHandler: nil)
             decisionHandler(.cancel)
             return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-inappbrowser",
-  "version": "8.10.3",
+  "version": "8.10.5-beta.pr624.490.1",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",