From 0393e4d7da2395c377b6c5d824dc6c7e11bcae0a Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 24 Nov 2014 09:46:43 -0500 Subject: [PATCH] Tweaks --- SwiftIO/SocketIOClient.swift | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/SwiftIO/SocketIOClient.swift b/SwiftIO/SocketIOClient.swift index b2dc65f..1ed0908 100644 --- a/SwiftIO/SocketIOClient.swift +++ b/SwiftIO/SocketIOClient.swift @@ -63,7 +63,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { private var handlers = [EventHandler]() var io:SRWebSocket? var pingTimer:NSTimer! - lazy var recieveBuffer = [[String:String]]() + lazy var recieveBuffer = [String]() var secure = false init(socketURL:String, secure:Bool = false) { @@ -202,12 +202,8 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { let binaryGroup = mutMessage["(\\d*)-\\[\"(.*)\",(\\{.*\\})\\]"].groups() if (binaryGroup != nil && binaryGroup[1] == "451") { let event = binaryGroup[2] - let dataObject:AnyObject = binaryGroup[3] as AnyObject - var bufferFrame = [ - "event": event, - ] - self.recieveBuffer.append(bufferFrame) + self.recieveBuffer.append(event) return } /** @@ -219,12 +215,8 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { Begin check for binary data **/ if let binaryData = message as? NSData { - // if let binaryAsString = NSString(data: binaryData, encoding: NSUTF8StringEncoding) { - // println(binaryAsString) - // } let lastBufferedFrame = self.recieveBuffer.removeLast() - self.handleEvent(event: lastBufferedFrame["event"]!, - data: binaryData) + self.handleEvent(event: lastBufferedFrame, data: binaryData) } /** End check for binary data