fix js to send messages to native and native callback js

Author: Lision

WKWebViewJavascriptBridge/WKWebViewJavascriptBridge.swift

@@ -43,7 +43,7 @@ public class WKWebViewJavascriptBridge: NSObject {
     }
 
     func flushMessageQueue() {
-        webView.evaluateJavaScript("WebViewJavascriptBridge._fetchQueue();") { (result, error) in
+        webView.evaluateJavaScript("WKWebViewJavascriptBridge._fetchQueue();") { (result, error) in
             if error != nil {
                 print("WKWebViewJavascriptBridge: WARNING: Error when trying to fetch data from WKWebView: \(String(describing: error))")
             }

WKWebViewJavascriptBridge/WKWebViewJavascriptBridgeBase.swift

@@ -113,7 +113,7 @@ public class WKWebViewJavascriptBridgeBase: NSObject {
 //        messageJSON = messageJSON.replacingOccurrences(of: "\u2028", with: "\\u2028")
 //        messageJSON = messageJSON.replacingOccurrences(of: "\u2029", with: "\\u2029")
 
-        let javascriptCommand = "WebViewJavascriptBridge._handleMessageFromiOS('\(messageJSON)');"
+        let javascriptCommand = "WKWebViewJavascriptBridge._handleMessageFromiOS('\(messageJSON)');"
         if Thread.current.isMainThread {
             self.delegate?.evaluateJavascript(javascript: javascriptCommand)
         } else {

WKWebViewJavascriptBridgeDemo/Demo.html

@@ -49,11 +49,11 @@ <h1>Demo</h1>
 		document.body.appendChild(document.createElement('br'))
 
 		var callbackButton = document.getElementById('buttons').appendChild(document.createElement('button'))
-		callbackButton.innerHTML = 'Fire testObjcCallback'
+		callbackButton.innerHTML = 'Fire testiOSCallback'
 		callbackButton.onclick = function(e) {
 			e.preventDefault()
-			log('JS calling handler "testObjcCallback"')
-			bridge.callHandler('testObjcCallback', {'foo': 'bar'}, function(response) {
+			log('JS calling handler "testiOSCallback"')
+			bridge.callHandler('testiOSCallback', {'foo': 'bar'}, function(response) {
 				log('JS got response', response)
 			})
 		}
@@ -105,12 +105,14 @@ <h1>Demo</h1>
 
       function _doSend(message, responseCallback) {
           if (responseCallback) {
-              var callbackId = 'cb_'+(uniqueId++)+'_'+new Date().getTime();
-              responseCallbacks[callbackId] = responseCallback;
-              message['callbackId'] = callbackId;
+              var callbackID = 'cb_'+(uniqueId++)+'_'+new Date().getTime();
+              responseCallbacks[callbackID] = responseCallback;
+              message['callbackID'] = callbackID;
           }
           sendMessageQueue.push(message);
-          messagingIframe.src = CUSTOM_PROTOCOL_SCHEME + '://' + QUEUE_HAS_MESSAGE;
+      
+<!--          messagingIframe.src = CUSTOM_PROTOCOL_SCHEME + '://' + QUEUE_HAS_MESSAGE;-->
+          window.webkit.messageHandlers.iOS_Native_FlushMessageQueue.postMessage(null)
       }
 
       function _fetchQueue() {
@@ -131,18 +133,18 @@ <h1>Demo</h1>
               var messageHandler;
               var responseCallback;
 
-              if (message.responseId) {
-                  responseCallback = responseCallbacks[message.responseId];
+              if (message.responseID) {
+                  responseCallback = responseCallbacks[message.responseID];
                   if (!responseCallback) {
                       return;
                   }
                   responseCallback(message.responseData);
-                  delete responseCallbacks[message.responseId];
+                  delete responseCallbacks[message.responseID];
               } else {
-                  if (message.callbackId) {
-                      var callbackResponseId = message.callbackId;
+                  if (message.callbackID) {
+                      var callbackResponseId = message.callbackID;
                       responseCallback = function(responseData) {
-                          _doSend({ handlerName:message.handlerName, responseId:callbackResponseId, responseData:responseData });
+                          _doSend({ handlerName:message.handlerName, responseID:callbackResponseId, responseData:responseData });
                       };
                   }
 

WKWebViewJavascriptBridgeDemo/ViewController.swift

@@ -18,8 +18,12 @@ class ViewController: UIViewController {
         super.viewDidLoad()
         webView.frame = view.bounds
         webView.navigationDelegate = self
-        bridge = WKWebViewJavascriptBridge(webView: webView)
         view.addSubview(webView)
+        bridge = WKWebViewJavascriptBridge(webView: webView)
+        bridge.register(handlerName: "testiOSCallback") { (paramters, callback) in
+            print("testiOSCallback called: \(String(describing: paramters))")
+            callback!("Response from testiOSCallback")
+        }
         loadDemoPage()
     }