From baca9fc8da134f8ec8ef39caac72368f7bae4288 Mon Sep 17 00:00:00 2001 From: Erik Date: Thu, 31 Mar 2016 21:31:24 -0400 Subject: [PATCH] small refactors --- Source/SocketIOClient.swift | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index 12bd49d..183bcc3 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -164,10 +164,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable return {[weak self, ack = currentAck] timeout, callback in if let this = self { this.ackHandlers.addAck(ack, callback: callback) - - dispatch_async(this.emitQueue) { - this._emit(items, ack: ack) - } + this._emit(items, ack: ack) if timeout != 0 { let time = dispatch_time(DISPATCH_TIME_NOW, Int64(timeout * NSEC_PER_SEC)) @@ -223,9 +220,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable return } - dispatch_async(emitQueue) {[emitData = [event] + items] in - self._emit(emitData) - } + _emit([event] + items) } /** @@ -244,17 +239,19 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable } private func _emit(data: [AnyObject], ack: Int? = nil) { - guard status == .Connected else { - handleEvent("error", data: ["Tried emitting when not connected"], isInternalMessage: true) - return + dispatch_async(emitQueue) { + guard self.status == .Connected else { + self.handleEvent("error", data: ["Tried emitting when not connected"], isInternalMessage: true) + return + } + + let packet = SocketPacket.packetFromEmit(data, id: ack ?? -1, nsp: self.nsp, ack: false) + let str = packet.packetString + + DefaultSocketLogger.Logger.log("Emitting: %@", type: self.logType, args: str) + + self.engine?.send(str, withData: packet.binary) } - - let packet = SocketPacket.packetFromEmit(data, id: ack ?? -1, nsp: nsp, ack: false) - let str = packet.packetString - - DefaultSocketLogger.Logger.log("Emitting: %@", type: logType, args: str) - - engine?.send(str, withData: packet.binary) } // If the server wants to know that the client received data @@ -295,7 +292,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable // Called when the socket gets an ack for something it sent func handleAck(ack: Int, data: [AnyObject]) { - guard status == .Connected else {return} + guard status == .Connected else { return } DefaultSocketLogger.Logger.log("Handling ack: %@ with data: %@", type: logType, args: ack, data ?? "") @@ -427,9 +424,7 @@ public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable } if reconnectAttempts != -1 && currentReconnectAttempt + 1 > reconnectAttempts || !reconnects { - didDisconnect("Reconnect Failed") - - return + return didDisconnect("Reconnect Failed") } DefaultSocketLogger.Logger.log("Trying to reconnect", type: logType)