VaporEngineRTM improvements

Author: pvzig

SKRTMAPI.xcodeproj/project.pbxproj

@@ -44,7 +44,6 @@
 		26D1C4D81EE4655100C95954 /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = Carthage/Build/tvOS/Starscream.framework; sourceTree = "<group>"; };
 		26DC0EB11E95BED900991BDF /* VaporEngineRTM.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VaporEngineRTM.swift; sourceTree = "<group>"; };
 		26DC0EB21E95BED900991BDF /* SKRTMAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SKRTMAPI.swift; sourceTree = "<group>"; };
-		D2C085F12024BF9600FEC5AB /* WebSocketFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSocketFactory.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -156,7 +155,6 @@
 			children = (
 				2604C59B202BFD83009CDBAF /* StarscreamRTM.swift */,
 				26DC0EB11E95BED900991BDF /* VaporEngineRTM.swift */,
-				D2C085F12024BF9600FEC5AB /* WebSocketFactory.swift */,
 			);
 			path = Conformers;
 			sourceTree = "<group>";

Sources/SKRTMAPI/Conformers/VaporEngineRTM.swift

@@ -22,58 +22,92 @@
 // THE SOFTWARE.
 
 #if os(Linux)
-import Dispatch
 import Foundation
-import SKCore
+import Sockets
+import HTTP
+import TLS
 import URI
+import WebSockets
 
 public class VaporEngineRTM: RTMWebSocket {
-    public weak var delegate: RTMDelegate?
-    var webSocket: WebSocket?
-    let queue = DispatchQueue(label: "com.launchsoft.slackkit")
+    public var delegate: RTMDelegate?
 
-    public required init() {}
+    public required init(){}
+
+    private var websocket: WebSocket?
 
-    // MARK: - RTM
     public func connect(url: URL) {
-        queue.async {
-            do {
-                try WebSocketFactory.shared.connect(to: url.absoluteString) { (webSocket) in
-                    self.delegate?.didConnect()
-                    self.setupSocket(webSocket)
-                }
-            } catch let error {
-                print("WebSocket client could not connect: \(error)")
+
+        let headers: [HeaderKey: String] = [:]
+        let protocols: [String]? = nil
+        do {
+            let uri = try! URI(url.absoluteString)
+            if uri.scheme.isSecure {
+                let tcp = try TCPInternetSocket(
+                    scheme: "https",
+                    hostname: uri.hostname,
+                    port: uri.port ?? 443
+                )
+                let stream = try TLS.InternetSocket(tcp, TLS.Context(.client))
+                try WebSocket.background(
+                    to: uri,
+                    using: stream,
+                    protocols: protocols,
+                    headers: headers,
+                    onConnect: didConnect
+                )
+            } else {
+                let stream = try TCPInternetSocket(
+                    scheme: "http",
+                    hostname: uri.hostname,
+                    port: uri.port ?? 80
+                )
+                try WebSocket.background(
+                    to: uri,
+                    using: stream,
+                    protocols: protocols,
+                    headers: headers,
+                    onConnect: didConnect
+                )
             }
+        } catch {
+            print("Error connecting to \(url.absoluteString): \(error)")
         }
     }
 
-    public func disconnect() {
-        try? webSocket?.close()
-    }
+    func didConnect(websocket: WebSocket) throws -> Void {
+        self.websocket = websocket
 
-    public func sendMessage(_ message: String) throws {
-        guard webSocket != nil else {
-            throw SlackError.rtmConnectionError
+        self.delegate?.didConnect()
+
+        websocket.onText = { ws, text in
+            self.delegate?.receivedMessage(text)
         }
-        do {
-            try webSocket?.send(message)
-        } catch let error {
-            throw error
+
+        websocket.onClose = { ws in
+            self.delegate?.disconnected()
         }
-    }
 
-    // MARK: - WebSocket
-    private func setupSocket(_ webSocket: WebSocket) {
-        webSocket.onText = { _, message in
-            self.delegate?.receivedMessage(message)
+        websocket.onPing = { ws, data in
+            try ws.pong(data)
         }
-        webSocket.onClose = { _, _, _, _ in
-            self.delegate?.disconnected()
+
+        websocket.onPong = { ws, data in
+            try ws.ping(data)
+        }
+    }
+
+    public func disconnect() {
+        do {
+            try self.websocket?.close()
+        } catch {
+            print("Error disconnecting from \(self.websocket.debugDescription): \(error)")
         }
-        webSocket.onPing = { _, _ in try webSocket.pong() }
-        webSocket.onPong = { _, _ in try webSocket.ping() }
-        self.webSocket = webSocket
+    }
+
+    public func sendMessage(_ message: String) throws {
+        guard let websocket = websocket else { throw SlackError.rtmConnectionError }
+        try websocket.send(message)
     }
 }
 #endif