From c20c286864eba083b617c7825dc94e6f00777021 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Sun, 17 Sep 2017 11:23:06 -0400 Subject: [PATCH] small refactor --- .../Engine/SocketEngineWebsocket.swift | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Source/SocketIO/Engine/SocketEngineWebsocket.swift b/Source/SocketIO/Engine/SocketEngineWebsocket.swift index 640d49d..e3f2214 100644 --- a/Source/SocketIO/Engine/SocketEngineWebsocket.swift +++ b/Source/SocketIO/Engine/SocketEngineWebsocket.swift @@ -100,13 +100,6 @@ extension SocketEngineWebsocket { ws?.connect() #else - func onConnect(ws: WebSocket) { - self.ws = ws - - attachWebSocketHandlers() - handleWSConnect() - } - let url = urlWebSocketWithSid do { let socket = try TCPInternetSocket(scheme: url.scheme ?? "http", @@ -118,13 +111,13 @@ extension SocketEngineWebsocket { try WebSocket.background(to: urlWebSocketWithSid.absoluteString, using: stream) {[weak self] ws in guard let this = self else { return } - onConnect(ws: ws) + this.onConnect(ws: ws) } } else { try WebSocket.background(to: urlWebSocketWithSid.absoluteString, using: socket) {[weak self] ws in guard let this = self else { return } - onConnect(ws: ws) + this.onConnect(ws: ws) } } } catch { @@ -133,6 +126,15 @@ extension SocketEngineWebsocket { #endif } + #if os(Linux) + func onConnect(ws: WebSocket) { + self.ws = ws + + attachWebSocketHandlers() + handleWSConnect() + } + #endif + func probeWebSocket() { if ws?.isConnected ?? false { sendWebSocketMessage("probe", withType: .ping, withData: [])