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

Merge branch 'master' into timeouts

Browse Source
This commit is contained in:
Erik 2015-03-14 19:12:09 -04:00
commit d75457f397
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
SwiftIO/SocketEngine.swift
View File

@ -235,7 +235,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
let postData = postStr.dataUsingEncoding(NSUTF8StringEncoding, let postData = postStr.dataUsingEncoding(NSUTF8StringEncoding,
allowLossyConversion: false)! allowLossyConversion: false)!
// println("posting: \(postStr)")
req.setValue(String(postData.length), forHTTPHeaderField: "Content-Length") req.setValue(String(postData.length), forHTTPHeaderField: "Content-Length")
req.HTTPBody = postData req.HTTPBody = postData
@ -406,7 +406,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
} }
private func parseEngineMessage(var message:String) { private func parseEngineMessage(var message:String) {
// println(message!) // println("Engine got message: \(message)")
var strMessage = RegexMutable(message) var strMessage = RegexMutable(message)
@ -429,7 +429,10 @@ public class SocketEngine: NSObject, WebSocketDelegate {
if let data = NSData(base64EncodedString: message, if let data = NSData(base64EncodedString: message,
options: NSDataBase64DecodingOptions.IgnoreUnknownCharacters) { options: NSDataBase64DecodingOptions.IgnoreUnknownCharacters) {
// println("sending \(data)") // println("sending \(data)")
self.client.parseBinaryData(data) dispatch_async(self.client.handleQueue) {[weak self] in
self?.client.parseBinaryData(data)
return
}
} }
return return
@ -448,9 +451,11 @@ public class SocketEngine: NSObject, WebSocketDelegate {
// Remove message type // Remove message type
message.removeAtIndex(message.startIndex) message.removeAtIndex(message.startIndex)
// println("sending \(messageString)")
self.client.parseSocketMessage(message) dispatch_async(self.client.handleQueue) {[weak self] in
self?.client.parseSocketMessage(message)
return
}
} }
private func probeWebSocket() { private func probeWebSocket() {
@ -512,8 +517,10 @@ public class SocketEngine: NSObject, WebSocketDelegate {
} }
} }
if !self.waitingForPost {
self.flushWaitingForPost() self.flushWaitingForPost()
} }
}
private func sendWebSocketMessage(str:String, withType type:PacketType, datas:[NSData]? = nil) { private func sendWebSocketMessage(str:String, withType type:PacketType, datas:[NSData]? = nil) {
// println("Sending ws: \(str) as type: \(type.rawValue)") // println("Sending ws: \(str) as type: \(type.rawValue)")