diff --git a/Source/SocketIO/Manager/SocketManager.swift b/Source/SocketIO/Manager/SocketManager.swift index cf88240..126aec1 100644 --- a/Source/SocketIO/Manager/SocketManager.swift +++ b/Source/SocketIO/Manager/SocketManager.swift @@ -392,7 +392,7 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa private func _parseEngineMessage(_ msg: String) { guard let packet = parseSocketMessage(msg) else { return } - guard packet.type != .binaryAck && packet.type != .binaryEvent else { + guard !packet.type.isBinary else { waitingPackets.append(packet) return diff --git a/Source/SocketIO/Parse/SocketPacket.swift b/Source/SocketIO/Parse/SocketPacket.swift index 4b316fc..e715d04 100644 --- a/Source/SocketIO/Parse/SocketPacket.swift +++ b/Source/SocketIO/Parse/SocketPacket.swift @@ -116,7 +116,7 @@ public struct SocketPacket : CustomStringConvertible { private func createPacketString() -> String { let typeString = String(type.rawValue) // Binary count? - let binaryCountString = typeString + (type == .binaryEvent || type == .binaryAck ? "\(String(binary.count))-" : "") + let binaryCountString = typeString + (type.isBinary ? "\(String(binary.count))-" : "") // Namespace? let nspString = binaryCountString + (nsp != "/" ? "\(nsp)," : "") // Ack number? @@ -181,6 +181,13 @@ public extension SocketPacket { /// Binary Ack: 6 case binaryAck + + // MARK: Properties + + /// Whether or not this type is binary + public var isBinary: Bool { + return self == .binaryAck || self == .binaryEvent + } } } diff --git a/Source/SocketIO/Parse/SocketParsable.swift b/Source/SocketIO/Parse/SocketParsable.swift index aa5e399..1c8b963 100644 --- a/Source/SocketIO/Parse/SocketParsable.swift +++ b/Source/SocketIO/Parse/SocketParsable.swift @@ -88,7 +88,7 @@ public extension SocketParsable where Self: SocketManagerSpec & SocketDataBuffer var namespace = "/" var placeholders = -1 - if type == .binaryEvent || type == .binaryAck { + if type.isBinary { if let holders = Int(reader.readUntilOccurence(of: "-")) { placeholders = holders } else {