Skip to content

Commit 165ec25

Browse files
committed
Add isBinary property to SocketPacket.PacketType
1 parent 35c93ee commit 165ec25

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

Source/SocketIO/Manager/SocketManager.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa
392392

393393
private func _parseEngineMessage(_ msg: String) {
394394
guard let packet = parseSocketMessage(msg) else { return }
395-
guard packet.type != .binaryAck && packet.type != .binaryEvent else {
395+
guard !packet.type.isBinary else {
396396
waitingPackets.append(packet)
397397

398398
return

Source/SocketIO/Parse/SocketPacket.swift

+8-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public struct SocketPacket : CustomStringConvertible {
116116
private func createPacketString() -> String {
117117
let typeString = String(type.rawValue)
118118
// Binary count?
119-
let binaryCountString = typeString + (type == .binaryEvent || type == .binaryAck ? "\(String(binary.count))-" : "")
119+
let binaryCountString = typeString + (type.isBinary ? "\(String(binary.count))-" : "")
120120
// Namespace?
121121
let nspString = binaryCountString + (nsp != "/" ? "\(nsp)," : "")
122122
// Ack number?
@@ -181,6 +181,13 @@ public extension SocketPacket {
181181

182182
/// Binary Ack: 6
183183
case binaryAck
184+
185+
// MARK: Properties
186+
187+
/// Whether or not this type is binary
188+
public var isBinary: Bool {
189+
return self == .binaryAck || self == .binaryEvent
190+
}
184191
}
185192
}
186193

Source/SocketIO/Parse/SocketParsable.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public extension SocketParsable where Self: SocketManagerSpec & SocketDataBuffer
8888
var namespace = "/"
8989
var placeholders = -1
9090

91-
if type == .binaryEvent || type == .binaryAck {
91+
if type.isBinary {
9292
if let holders = Int(reader.readUntilOccurence(of: "-")) {
9393
placeholders = holders
9494
} else {

0 commit comments

Comments
 (0)