cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add isBinary property to SocketPacket.PacketType

Browse Source
This commit is contained in:
Erik Little 2018-07-29 10:23:41 -04:00
parent 35c93ee6f5
commit 165ec25713
No known key found for this signature in database
GPG Key ID: B8E1F067FE8DCAAF
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/SocketIO/Manager/SocketManager.swift
View File

@ -392,7 +392,7 @@ open class SocketManager : NSObject, SocketManagerSpec, SocketParsable, SocketDa
private func _parseEngineMessage(_ msg: String) { private func _parseEngineMessage(_ msg: String) {
guard let packet = parseSocketMessage(msg) else { return } guard let packet = parseSocketMessage(msg) else { return }
guard packet.type != .binaryAck && packet.type != .binaryEvent else { guard !packet.type.isBinary else {
waitingPackets.append(packet) waitingPackets.append(packet)
return return

9
Source/SocketIO/Parse/SocketPacket.swift
View File

@ -116,7 +116,7 @@ public struct SocketPacket : CustomStringConvertible {
private func createPacketString() -> String { private func createPacketString() -> String {
let typeString = String(type.rawValue) let typeString = String(type.rawValue)
// Binary count? // Binary count?
let binaryCountString = typeString + (type == .binaryEvent || type == .binaryAck ? "\(String(binary.count))-" : "") let binaryCountString = typeString + (type.isBinary ? "\(String(binary.count))-" : "")
// Namespace? // Namespace?
let nspString = binaryCountString + (nsp != "/" ? "\(nsp)," : "") let nspString = binaryCountString + (nsp != "/" ? "\(nsp)," : "")
// Ack number? // Ack number?
@ -181,6 +181,13 @@ public extension SocketPacket {
/// Binary Ack: 6 /// Binary Ack: 6
case binaryAck case binaryAck
// MARK: Properties
/// Whether or not this type is binary
public var isBinary: Bool {
return self == .binaryAck || self == .binaryEvent
}
} }
} }

2
Source/SocketIO/Parse/SocketParsable.swift
View File

@ -88,7 +88,7 @@ public extension SocketParsable where Self: SocketManagerSpec & SocketDataBuffer
var namespace = "/" var namespace = "/"
var placeholders = -1 var placeholders = -1
if type == .binaryEvent || type == .binaryAck { if type.isBinary {
if let holders = Int(reader.readUntilOccurence(of: "-")) { if let holders = Int(reader.readUntilOccurence(of: "-")) {
placeholders = holders placeholders = holders
} else { } else {