This commit is contained in:
Erik 2014-11-24 09:46:43 -05:00
parent 8a75d35523
commit 0393e4d7da

View File

@ -63,7 +63,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
private var handlers = [EventHandler]() private var handlers = [EventHandler]()
var io:SRWebSocket? var io:SRWebSocket?
var pingTimer:NSTimer! var pingTimer:NSTimer!
lazy var recieveBuffer = [[String:String]]() lazy var recieveBuffer = [String]()
var secure = false var secure = false
init(socketURL:String, secure:Bool = false) { init(socketURL:String, secure:Bool = false) {
@ -202,12 +202,8 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
let binaryGroup = mutMessage["(\\d*)-\\[\"(.*)\",(\\{.*\\})\\]"].groups() let binaryGroup = mutMessage["(\\d*)-\\[\"(.*)\",(\\{.*\\})\\]"].groups()
if (binaryGroup != nil && binaryGroup[1] == "451") { if (binaryGroup != nil && binaryGroup[1] == "451") {
let event = binaryGroup[2] let event = binaryGroup[2]
let dataObject:AnyObject = binaryGroup[3] as AnyObject
var bufferFrame = [
"event": event,
]
self.recieveBuffer.append(bufferFrame) self.recieveBuffer.append(event)
return return
} }
/** /**
@ -219,12 +215,8 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
Begin check for binary data Begin check for binary data
**/ **/
if let binaryData = message as? NSData { if let binaryData = message as? NSData {
// if let binaryAsString = NSString(data: binaryData, encoding: NSUTF8StringEncoding) {
// println(binaryAsString)
// }
let lastBufferedFrame = self.recieveBuffer.removeLast() let lastBufferedFrame = self.recieveBuffer.removeLast()
self.handleEvent(event: lastBufferedFrame["event"]!, self.handleEvent(event: lastBufferedFrame, data: binaryData)
data: binaryData)
} }
/** /**
End check for binary data End check for binary data