cordova-plugin-mserviceinterface-2.0 1.0.100 → 1.0.102

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-mserviceinterface-2.0",
-  "version": "1.0.100",
+  "version": "1.0.102",
   "description": "This plugin establishes the connection to the native interface and performs the requested task.",
   "main": "index.js",
   "scripts": {

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-    xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mserviceinterface-2.0" version="1.0.100">
+    xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-mserviceinterface-2.0" version="1.0.102">
     <name>mserviceinterface-2.0</name>
     <description>This plugin establishes the connection to the native interface and performs the requested task.</description>
     <author>selfservit@gmail.com</author>

package/templates/ios/SceneDelegate.swift

@@ -8,12 +8,13 @@
 
 import UIKit
 import Cordova
+import WebKit
 
 class SceneDelegate: CDVSceneDelegate {
 
     private var pendingDeepLinkURL: String?
     private var deepLinkRetryCount: Int = 0
-    private let maxDeepLinkRetryCount: Int = 30
+    private let maxDeepLinkRetryCount: Int = 80
 
     /*
      * Cold-start handling:
@@ -30,9 +31,22 @@ class SceneDelegate: CDVSceneDelegate {
             options: connectionOptions
         )
 
-        if let userActivity = connectionOptions.userActivities.first,
-           userActivity.activityType == NSUserActivityTypeBrowsingWeb,
-           let url = userActivity.webpageURL {
+        if let userActivity =
+            connectionOptions.userActivities.first(
+                where: {
+                    $0.activityType ==
+                        NSUserActivityTypeBrowsingWeb &&
+                    $0.webpageURL != nil
+                }
+            ),
+        let url = userActivity.webpageURL {
+
+            print(
+                "[MService Deep Link] " +
+                "Cold-start Universal Link: " +
+                url.absoluteString
+            )
+
             self.handleDeepLink(url)
             return
         }
@@ -94,62 +108,148 @@ class SceneDelegate: CDVSceneDelegate {
     }
 
     private func sendPendingDeepLinkToJavaScript() {
-        guard
-            let urlString = self.pendingDeepLinkURL,
-            !urlString.isEmpty
-        else {
-            return
-        }
+    guard
+        let urlString = self.pendingDeepLinkURL,
+        !urlString.isEmpty
+    else {
+        return
+    }
 
-        let quotedURL = self.getJavaScriptString(
-            urlString
-        )
+    let quotedURL = self.getJavaScriptString(
+        urlString
+    )
 
-        let javaScript = """
+    /*
+     * The JavaScript returns a status to native code.
+     *
+     * PROCESSED:
+     * window.handleOpenURL exists and has received the URL.
+     *
+     * WAITING_FOR_HANDLER:
+     * Cordova page exists, but application libraries are not ready.
+     *
+     * ERROR:
+     * JavaScript execution failed and must be retried.
+     */
+    let javaScript = """
+        (function () {
             try {
-                window.mServicePendingUniversalLink = \(quotedURL);
+                window.mServicePendingUniversalLink =
+                    \(quotedURL);
 
                 window.localStorage.setItem(
                     "mServicePendingUniversalLink",
                     \(quotedURL)
                 );
 
-                if (window.handleOpenURL) {
-                    window.handleOpenURL(\(quotedURL));
-
-                    window.mServicePendingUniversalLink = "";
+                if (
+                    typeof window.handleOpenURL !==
+                    "function"
+                ) {
+                    return "WAITING_FOR_HANDLER";
+                }
 
-                    window.localStorage.removeItem(
-                        "mServicePendingUniversalLink"
+                var handleResult =
+                    window.handleOpenURL(
+                        \(quotedURL)
                     );
+
+                /*
+                 * A handler may explicitly return false when
+                 * the application is not ready.
+                 */
+                if (handleResult === false) {
+                    return "HANDLER_NOT_READY";
                 }
+
+                window.mServicePendingUniversalLink = "";
+
+                window.localStorage.removeItem(
+                    "mServicePendingUniversalLink"
+                );
+
+                return "PROCESSED";
             } catch (exception) {
                 console.log(
+                    "[MService Deep Link] " +
                     "Universal Link JavaScript error: " +
                     exception
                 );
-            }
-        """
 
-        DispatchQueue.main.async { [weak self] in
-            guard let self = self else {
-                return
+                return "ERROR";
             }
+        }());
+    """
 
-            if let viewController =
-                self.getCordovaViewController() {
+    DispatchQueue.main.async { [weak self] in
+        guard let self = self else {
+            return
+        }
 
-                viewController.commandDelegate.evalJs(
-                    javaScript
-                )
+        guard let viewController =
+            self.getCordovaViewController()
+        else {
+            self.retrySendingDeepLink()
+            return
+        }
 
-                self.pendingDeepLinkURL = nil
-                self.deepLinkRetryCount = 0
-            } else {
-                self.retrySendingDeepLink()
-            }
+        /*
+         * Do not use commandDelegate.evalJs here.
+         *
+         * evaluateJavaScript provides a completion handler,
+         * allowing native code to confirm whether the app-side
+         * handler was actually available.
+         */
+        guard let webView =
+    viewController.webViewEngine.engineWebView as? WKWebView
+else {
+    print(
+        "[MService Deep Link] " +
+        "WKWebView is not ready"
+    )
+
+    self.retrySendingDeepLink()
+    return
+}
+
+webView.evaluateJavaScript(
+    javaScript
+) { [weak self] result, error in
+
+    DispatchQueue.main.async {
+        guard let self = self else {
+            return
         }
+
+        if let error = error {
+            print(
+                "[MService Deep Link] " +
+                "JavaScript execution failed: " +
+                error.localizedDescription
+            )
+
+            self.retrySendingDeepLink()
+            return
+        }
+
+        let status =
+            result as? String ?? ""
+
+        print(
+            "[MService Deep Link] " +
+            "JavaScript status: \(status)"
+        )
+
+        if status == "PROCESSED" {
+            self.pendingDeepLinkURL = nil
+            self.deepLinkRetryCount = 0
+        } else {
+            self.retrySendingDeepLink()
+        }
+    }
+}
     }
+}
 
     private func retrySendingDeepLink() {
         if self.deepLinkRetryCount <

package/www/mServiceAppLink.js

@@ -105,4 +105,11 @@
         },
         false
     );
+    window.addEventListener(
+        "pageshow",
+        function () {
+            processPendingURL();
+        },
+        false
+    );
 }());