add WKWebViewJavascriptBridge and opz code

Author: Lision

WKWebViewJavascriptBridge/WKWebViewJavascriptBridge.swift

@@ -7,3 +7,48 @@
 //
 
 import Foundation
+import WebKit
+
+@available(iOS 9.0, *)
+public class WKWebViewJavascriptBridge: NSObject {
+    private weak var webView: WKWebView!
+    private var base: WKWebViewJavascriptBridgeBase!
+    
+    public init(webView: WKWebView) {
+        self.webView = webView
+        super.init()
+    }
+    
+    public func reset() {
+        base.reset()
+    }
+    
+    public func register(handlerName: String, handler: @escaping WKWebViewJavascriptBridgeBase.Handler) {
+        base.messageHandlers[handlerName] = handler
+    }
+    
+    public func remove(handlerName: String) -> WKWebViewJavascriptBridgeBase.Handler? {
+        return base.messageHandlers.removeValue(forKey: handlerName)
+    }
+    
+    public func call(handlerName: String, data: Any? = nil, callback: WKWebViewJavascriptBridgeBase.Callback? = nil) {
+        base.send(handlerName: handlerName, data: data, callback: callback)
+    }
+    
+    func flushMessageQueue() {
+        webView.evaluateJavaScript("WebViewJavascriptBridge._fetchQueue();") { (result, error) in
+            if error != nil {
+                print("WKWebViewJavascriptBridge: WARNING: Error when trying to fetch data from WKWebView: \(String(describing: error))")
+            }
+            
+            guard let resultStr = result as? String else { return }
+            self.base.flush(messageQueueString: resultStr)
+        }
+    }
+}
+
+extension WKWebViewJavascriptBridge: WKScriptMessageHandler {
+    public func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) {
+        self.flushMessageQueue()
+    }
+}

WKWebViewJavascriptBridge/WKWebViewJavascriptBridgeBase.swift

@@ -14,29 +14,26 @@ protocol WKWebViewJavascriptBridgeBaseDelegate: AnyObject {
 }
 
 @available(iOS 9.0, *)
-class WKWebViewJavascriptBridgeBase: NSObject {
-    typealias Callback = (_ responseData: Any?) -> Void
-    typealias Handler = (_ parameters: [String: Any]?, _ callback: Callback?) -> Void
-    typealias Message = [String: Any]
+public class WKWebViewJavascriptBridgeBase: NSObject {
+    public typealias Callback = (_ responseData: Any?) -> Void
+    public typealias Handler = (_ parameters: [String: Any]?, _ callback: Callback?) -> Void
+    public typealias Message = [String: Any]
 
     weak var delegate: WKWebViewJavascriptBridgeBaseDelegate?
     var startupMessageQueue = [Message]()
     var responseCallbacks = [String: Callback]()
     var messageHandlers = [String: Handler]()
     var uniqueId = 0
 
-    override init() {
-        super.init()
-    }
-    
     func reset() {
         self.startupMessageQueue = [Message]()
         self.responseCallbacks = [String: Callback]()
         self.uniqueId = 0
     }
 
-    func send(data: Any?, callback: Callback?, handlerName: String?) {
+    func send(handlerName: String, data: Any?, callback: Callback?) {
         var message = [String: Any]()
+        message["handlerName"] = handlerName
 
         if data != nil {
             message["data"] = data
@@ -49,10 +46,6 @@ class WKWebViewJavascriptBridgeBase: NSObject {
             message["callbackID"] = callbackID
         }
 
-        if handlerName != nil {
-            message["handlerName"] = handlerName
-        }
-        
         self.queue(message: message)
     }
 
@@ -99,15 +92,15 @@ class WKWebViewJavascriptBridgeBase: NSObject {
     }
 
     // MARK: - Private
-    fileprivate func queue(message: Message) {
+    private func queue(message: Message) {
         if self.startupMessageQueue.isEmpty {
             self.dispatch(message: message)
         } else {
             self.startupMessageQueue.append(message)
         }
     }
 
-    fileprivate func dispatch(message: Message) {
+    private func dispatch(message: Message) {
         guard var messageJSON = self.serialize(message: message, pretty: false) else {
             return
         }
@@ -121,7 +114,7 @@ class WKWebViewJavascriptBridgeBase: NSObject {
 //        messageJSON = messageJSON.replacingOccurrences(of: "\u2028", with: "\\u2028")
 //        messageJSON = messageJSON.replacingOccurrences(of: "\u2029", with: "\\u2029")
 
-        let javascriptCommand = "WebViewJavascriptBridge._handleMessageFromObjC('\(messageJSON)');"
+        let javascriptCommand = "WebViewJavascriptBridge._handleMessageFromiOS('\(messageJSON)');"
         if Thread.current.isMainThread {
             self.delegate?.evaluateJavascript(javascript: javascriptCommand)
         } else {
@@ -132,7 +125,7 @@ class WKWebViewJavascriptBridgeBase: NSObject {
     }
 
     // MARK: - JSON
-    fileprivate func serialize(message: Message, pretty: Bool) -> String? {
+    private func serialize(message: Message, pretty: Bool) -> String? {
         var result: String?
         do {
             let data = try JSONSerialization.data(withJSONObject: message, options: pretty ? .prettyPrinted : JSONSerialization.WritingOptions(rawValue: 0))
@@ -143,7 +136,7 @@ class WKWebViewJavascriptBridgeBase: NSObject {
         return result
     }
 
-    fileprivate func deserialize(messageJSON: String) -> [Message]? {
+    private func deserialize(messageJSON: String) -> [Message]? {
         var result = [Message]()
         guard let data = messageJSON.data(using: .utf8) else {
             return nil
@@ -157,7 +150,7 @@ class WKWebViewJavascriptBridgeBase: NSObject {
     }
 
     // MARK: - Log
-    fileprivate func log<T>(_ message: T, file: String = #file, function: String = #function, line: Int = #line) {
+    private func log<T>(_ message: T, file: String = #file, function: String = #function, line: Int = #line) {
         #if DEBUG
             let fileName = (file as NSString).lastPathComponent
             print("\(fileName):\(line) \(function) | \(message)")