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

Don't poll on sendPollMessage

Browse Source
This commit is contained in:
Erik 2015-03-13 09:51:53 -04:00
parent 1f05bde09b
commit 2cc68aead6
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
SwiftIO/SocketEngine.swift
View File

@ -286,7 +286,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
} }
let (urlPolling, urlWebSocket) = self.createURLs(params: opts) let (urlPolling, urlWebSocket) = self.createURLs(params: opts)
self.urlPolling = urlPolling self.urlPolling = urlPolling
self.urlWebSocket = urlWebSocket self.urlWebSocket = urlWebSocket
let reqPolling = NSURLRequest(URL: NSURL(string: urlPolling + "&b64=1")!) let reqPolling = NSURLRequest(URL: NSURL(string: urlPolling + "&b64=1")!)
@ -472,7 +471,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
self?.sendWebSocketMessage(msg, withType: PacketType.MESSAGE, datas: datas) self?.sendWebSocketMessage(msg, withType: PacketType.MESSAGE, datas: datas)
} else { } else {
// println("sending poll: \(msg):\(datas)") // println("sending poll: \(msg):\(datas)")
self?.sendPollMessage(msg, withType: PacketType.MESSAGE, datas: datas, doPoll: true) self?.sendPollMessage(msg, withType: PacketType.MESSAGE, datas: datas)
} }
} }
} }
@ -494,12 +493,12 @@ public class SocketEngine: NSObject, WebSocketDelegate {
if self.websocket { if self.websocket {
self.sendWebSocketMessage("", withType: PacketType.PING) self.sendWebSocketMessage("", withType: PacketType.PING)
} else { } else {
self.sendPollMessage("", withType: PacketType.PING, doPoll: false) self.sendPollMessage("", withType: PacketType.PING)
} }
} }
private func sendPollMessage(msg:String, withType type:PacketType, private func sendPollMessage(msg:String, withType type:PacketType,
datas:[NSData]? = nil, doPoll poll:Bool) { datas:[NSData]? = nil) {
// println("Sending poll: \(msg) as type: \(type.rawValue)") // println("Sending poll: \(msg) as type: \(type.rawValue)")
let strMsg = "\(type.rawValue)\(msg)" let strMsg = "\(type.rawValue)\(msg)"
@ -513,11 +512,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
} }
} }
if !self.waitingForPoll && self.waitingForPost && poll { self.flushWaitingForPost()
self.doPoll()
} else {
self.flushWaitingForPost()
}
} }
private func sendWebSocketMessage(str:String, withType type:PacketType, datas:[NSData]? = nil) { private func sendWebSocketMessage(str:String, withType type:PacketType, datas:[NSData]? = nil) {
@ -552,7 +547,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
// Do a fast upgrade // Do a fast upgrade
self.fastUpgrade = true self.fastUpgrade = true
self.probing = false self.probing = false
self.sendPollMessage("", withType: PacketType.NOOP, doPoll: false) self.sendPollMessage("", withType: PacketType.NOOP)
} }
} }

2
SwiftIO/SocketParser.swift
View File

@ -257,6 +257,7 @@ class SocketParser {
socket.handleEvent(event, data: parsed, isInternalMessage: false, socket.handleEvent(event, data: parsed, isInternalMessage: false,
wantsAck: ackNum.toInt(), withAckType: 3) wantsAck: ackNum.toInt(), withAckType: 3)
} }
return return
} else if let strData = data { } else if let strData = data {
// There are multiple items in the message // There are multiple items in the message
@ -271,6 +272,7 @@ class SocketParser {
socket.handleEvent(event, data: parsed, isInternalMessage: false, socket.handleEvent(event, data: parsed, isInternalMessage: false,
wantsAck: ackNum.toInt(), withAckType: 3) wantsAck: ackNum.toInt(), withAckType: 3)
} }
return return
} }
} }