From 5cfc97386ac0cc56541549991ff2caff6447a48f Mon Sep 17 00:00:00 2001 From: Erik Little Date: Wed, 25 Oct 2017 08:16:44 -0400 Subject: [PATCH] refactor SocketIOClient.handlePacket --- Source/SocketIO/Client/SocketIOClient.swift | 20 ++++++++----------- .../SocketIO/Client/SocketIOClientSpec.swift | 4 ++-- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Source/SocketIO/Client/SocketIOClient.swift b/Source/SocketIO/Client/SocketIOClient.swift index acc51f4..acc8ad0 100644 --- a/Source/SocketIO/Client/SocketIOClient.swift +++ b/Source/SocketIO/Client/SocketIOClient.swift @@ -345,25 +345,21 @@ open class SocketIOClient : NSObject, SocketIOClientSpec { /// Causes a client to handle a socket.io packet. The namespace for the packet must match the namespace of the /// socket. /// - /// - parameter pack: The packet to handle. - open func handlePacket(_ pack: SocketPacket) { - func handleConnect(_ packetNamespace: String) { - guard packetNamespace == nsp else { return } + /// - parameter packet: The packet to handle. + open func handlePacket(_ packet: SocketPacket) { + guard packet.nsp == nsp else { return } - didConnect(toNamespace: packetNamespace) - } - - switch pack.type { + switch packet.type { case .event, .binaryEvent: - handleEvent(pack.event, data: pack.args, isInternalMessage: false, withAck: pack.id) + handleEvent(packet.event, data: packet.args, isInternalMessage: false, withAck: packet.id) case .ack, .binaryAck: - handleAck(pack.id, data: pack.data) + handleAck(packet.id, data: packet.data) case .connect: - handleConnect(pack.nsp) + didConnect(toNamespace: nsp) case .disconnect: didDisconnect(reason: "Got Disconnect") case .error: - handleEvent("error", data: pack.data, isInternalMessage: true, withAck: pack.id) + handleEvent("error", data: packet.data, isInternalMessage: true, withAck: packet.id) } } diff --git a/Source/SocketIO/Client/SocketIOClientSpec.swift b/Source/SocketIO/Client/SocketIOClientSpec.swift index 05a0088..26e8e60 100644 --- a/Source/SocketIO/Client/SocketIOClientSpec.swift +++ b/Source/SocketIO/Client/SocketIOClientSpec.swift @@ -140,8 +140,8 @@ public protocol SocketIOClientSpec : class { /// Causes a client to handle a socket.io packet. The namespace for the packet must match the namespace of the /// socket. /// - /// - parameter pack: The packet to handle. - func handlePacket(_ pack: SocketPacket) + /// - parameter packet: The packet to handle. + func handlePacket(_ packet: SocketPacket) /// Call when you wish to leave a namespace and disconnect this socket. func leaveNamespace()