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

rename waitingData to waitingPackets

Browse Source
This commit is contained in:
Erik 2016-02-16 17:03:00 -05:00
parent 0bf27b8c49
commit 12f9207d8a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/SocketClientSpec.swift
View File

@ -24,7 +24,7 @@
protocol SocketClientSpec: class { protocol SocketClientSpec: class {
var nsp: String { get set } var nsp: String { get set }
var waitingData: [SocketPacket] { get set } var waitingPackets: [SocketPacket] { get set }
func didConnect() func didConnect()
func didDisconnect(reason: String) func didDisconnect(reason: String)

4
Source/SocketIOClient.swift
View File

@ -53,7 +53,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable
private(set) var handleQueue = dispatch_get_main_queue() private(set) var handleQueue = dispatch_get_main_queue()
private(set) var reconnectAttempts = -1 private(set) var reconnectAttempts = -1
var waitingData = [SocketPacket]() var waitingPackets = [SocketPacket]()
/** /**
Type safe way to create a new SocketIOClient. opts can be omitted Type safe way to create a new SocketIOClient. opts can be omitted
@ -302,7 +302,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable
} }
public func engineDidClose(reason: String) { public func engineDidClose(reason: String) {
waitingData.removeAll() waitingPackets.removeAll()
if status == .Closed || !reconnects { if status == .Closed || !reconnects {
didDisconnect(reason) didDisconnect(reason)

10
Source/SocketParsable.swift
View File

@ -50,9 +50,9 @@ extension SocketParsable {
case .Ack where isCorrectNamespace(pack.nsp): case .Ack where isCorrectNamespace(pack.nsp):
handleAck(pack.id, data: pack.data) handleAck(pack.id, data: pack.data)
case .BinaryEvent where isCorrectNamespace(pack.nsp): case .BinaryEvent where isCorrectNamespace(pack.nsp):
waitingData.append(pack) waitingPackets.append(pack)
case .BinaryAck where isCorrectNamespace(pack.nsp): case .BinaryAck where isCorrectNamespace(pack.nsp):
waitingData.append(pack) waitingPackets.append(pack)
case .Connect: case .Connect:
handleConnect(pack) handleConnect(pack)
case .Disconnect: case .Disconnect:
@ -160,17 +160,17 @@ extension SocketParsable {
} }
func parseBinaryData(data: NSData) { func parseBinaryData(data: NSData) {
guard !waitingData.isEmpty else { guard !waitingPackets.isEmpty else {
DefaultSocketLogger.Logger.error("Got data when not remaking packet", type: "SocketParser") DefaultSocketLogger.Logger.error("Got data when not remaking packet", type: "SocketParser")
return return
} }
// Should execute event? // Should execute event?
guard waitingData[waitingData.count - 1].addData(data) else { guard waitingPackets[waitingPackets.count - 1].addData(data) else {
return return
} }
let packet = waitingData.removeLast() let packet = waitingPackets.removeLast()
if packet.type != .BinaryAck { if packet.type != .BinaryAck {
handleEvent(packet.event, data: packet.args ?? [], handleEvent(packet.event, data: packet.args ?? [],