From 46a129072fa86f08b0c6c3bb5c424566128b1353 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 20 May 2017 08:37:54 -0400 Subject: [PATCH] code style --- Source/SocketEngine.swift | 22 ++++++++++++---------- Source/SocketIOClient.swift | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Source/SocketEngine.swift b/Source/SocketEngine.swift index c3114d1..0507549 100644 --- a/Source/SocketEngine.swift +++ b/Source/SocketEngine.swift @@ -643,17 +643,19 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll return } - if websocket { - connected = false - websocket = false - - if let reason = error?.localizedDescription { - didError(reason: reason) - } else { - client?.engineDidClose(reason: "Socket Disconnected") - } - } else { + guard websocket else { flushProbeWait() + + return + } + + connected = false + websocket = false + + if let reason = error?.localizedDescription { + didError(reason: reason) + } else { + client?.engineDidClose(reason: "Socket Disconnected") } } } diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index 8cb0bde..a0c92aa 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -237,7 +237,7 @@ open class SocketIOClient : NSObject, SocketIOClientSpec, SocketEngineClient, So /// - parameter items: The items to send with this event. May be left out. open func emit(_ event: String, _ items: SocketData...) { do { - emit(event, with: try items.map({ try $0.socketRepresentation() })) + try emit(event, with: items.map({ try $0.socketRepresentation() })) } catch let err { DefaultSocketLogger.Logger.error("Error creating socketRepresentation for emit: \(event), \(items)", type: logType)