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

merge timeouts fixes for 1.2

Browse Source
This commit is contained in:
Erik 2015-03-16 09:06:45 -04:00
parent 7765e57a11
commit c6d0331d50
4 changed files with 217 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
SwiftIO/SocketEngine.swift
View File

@ -78,19 +78,19 @@ public class SocketEngine: NSObject, WebSocketDelegate {
return self._websocket return self._websocket
} }
var ws:WebSocket? var ws:WebSocket?
init(client:SocketIOClient, forcePolling:Bool = false) { init(client:SocketIOClient, forcePolling:Bool = false) {
self.client = client self.client = client
self.forcePolling = forcePolling self.forcePolling = forcePolling
self.session = NSURLSession(configuration: NSURLSessionConfiguration.ephemeralSessionConfiguration(), self.session = NSURLSession(configuration: NSURLSessionConfiguration.ephemeralSessionConfiguration(),
delegate: nil, delegateQueue: self.workQueue) delegate: nil, delegateQueue: self.workQueue)
} }
func close() { func close() {
self.pingTimer?.invalidate() self.pingTimer?.invalidate()
self.send(PacketType.CLOSE.rawValue) self.send(PacketType.CLOSE.rawValue)
} }
private func createBinaryDataForSend(data:NSData) -> (NSData?, String?) { private func createBinaryDataForSend(data:NSData) -> (NSData?, String?) {
if self.websocket { if self.websocket {
var byteArray = [UInt8](count: 1, repeatedValue: 0x0) var byteArray = [UInt8](count: 1, repeatedValue: 0x0)
@ -102,16 +102,16 @@ public class SocketEngine: NSObject, WebSocketDelegate {
var str = "b4" var str = "b4"
str += data.base64EncodedStringWithOptions( str += data.base64EncodedStringWithOptions(
NSDataBase64EncodingOptions.Encoding64CharacterLineLength) NSDataBase64EncodingOptions.Encoding64CharacterLineLength)
return (nil, str) return (nil, str)
} }
} }
private func createURLs(params:[String: AnyObject]? = nil) -> (String, String) { private func createURLs(params:[String: AnyObject]? = nil) -> (String, String) {
var url = "\(self.client.socketURL)/socket.io/?transport=" var url = "\(self.client.socketURL)/socket.io/?transport="
var urlPolling:String var urlPolling:String
var urlWebSocket:String var urlWebSocket:String
if self.client.secure { if self.client.secure {
urlPolling = "https://" + url + "polling" urlPolling = "https://" + url + "polling"
urlWebSocket = "wss://" + url + "websocket" urlWebSocket = "wss://" + url + "websocket"
@ -119,14 +119,14 @@ public class SocketEngine: NSObject, WebSocketDelegate {
urlPolling = "http://" + url + "polling" urlPolling = "http://" + url + "polling"
urlWebSocket = "ws://" + url + "websocket" urlWebSocket = "ws://" + url + "websocket"
} }
if params != nil { if params != nil {
for (key, value) in params! { for (key, value) in params! {
let keyEsc = key.stringByAddingPercentEncodingWithAllowedCharacters( let keyEsc = key.stringByAddingPercentEncodingWithAllowedCharacters(
NSCharacterSet.URLHostAllowedCharacterSet())! NSCharacterSet.URLHostAllowedCharacterSet())!
urlPolling += "&\(keyEsc)=" urlPolling += "&\(keyEsc)="
urlWebSocket += "&\(keyEsc)=" urlWebSocket += "&\(keyEsc)="
if value is String { if value is String {
let valueEsc = (value as! String).stringByAddingPercentEncodingWithAllowedCharacters( let valueEsc = (value as! String).stringByAddingPercentEncodingWithAllowedCharacters(
NSCharacterSet.URLHostAllowedCharacterSet())! NSCharacterSet.URLHostAllowedCharacterSet())!
@ -138,10 +138,10 @@ public class SocketEngine: NSObject, WebSocketDelegate {
} }
} }
} }
return (urlPolling, urlWebSocket) return (urlPolling, urlWebSocket)
} }
private func doFastUpgrade() { private func doFastUpgrade() {
self.sendWebSocketMessage("", withType: PacketType.UPGRADE) self.sendWebSocketMessage("", withType: PacketType.UPGRADE)
self._websocket = true self._websocket = true
@ -149,23 +149,23 @@ public class SocketEngine: NSObject, WebSocketDelegate {
self.fastUpgrade = false self.fastUpgrade = false
self.flushProbeWait() self.flushProbeWait()
} }
private func doPoll() { private func doPoll() {
if self.websocket || self.waitingForPoll || !self.connected { if self.websocket || self.waitingForPoll || !self.connected {
return return
} }
self.waitingForPoll = true self.waitingForPoll = true
self.doRequest(self.parsePollingMessage) self.doRequest(self.parsePollingMessage)
} }
private func doRequest(callback:(String) -> Void) { private func doRequest(callback:(String) -> Void) {
if !self.polling { if !self.polling {
return return
} }
let req = NSURLRequest(URL: NSURL(string: self.urlPolling! + "&sid=\(self.sid)")!) let req = NSURLRequest(URL: NSURL(string: self.urlPolling! + "&sid=\(self.sid)")!)
self.session.dataTaskWithRequest(req) {[weak self] data, res, err in self.session.dataTaskWithRequest(req) {[weak self] data, res, err in
if self == nil { if self == nil {
return return
@ -173,18 +173,18 @@ public class SocketEngine: NSObject, WebSocketDelegate {
if self!.polling { if self!.polling {
self?.handlePollingFailed(err) self?.handlePollingFailed(err)
} }
return return
} }
// println(data) // println(data)
if let str = NSString(data: data, encoding: NSUTF8StringEncoding) { if let str = NSString(data: data, encoding: NSUTF8StringEncoding) {
dispatch_async(self!.parseQueue) {callback(str)} dispatch_async(self!.parseQueue) {callback(str as String)}
} }
self?.waitingForPoll = false self?.waitingForPoll = false
if self!.fastUpgrade { if self!.fastUpgrade {
self?.doFastUpgrade() self?.doFastUpgrade()
return return
@ -193,22 +193,22 @@ public class SocketEngine: NSObject, WebSocketDelegate {
} }
}.resume() }.resume()
} }
private func flushProbeWait() { private func flushProbeWait() {
// println("flushing probe wait") // println("flushing probe wait")
dispatch_async(self.emitQueue) {[weak self] in dispatch_async(self.emitQueue) {[weak self] in
if self == nil { if self == nil {
return return
} }
for waiter in self!.probeWait { for waiter in self!.probeWait {
waiter() waiter()
} }
self?.probeWait.removeAll(keepCapacity: false) self?.probeWait.removeAll(keepCapacity: false)
} }
} }
private func flushWaitingForPost() { private func flushWaitingForPost() {
if self.postWait.count == 0 || !self.connected { if self.postWait.count == 0 || !self.connected {
return return
@ -216,29 +216,29 @@ public class SocketEngine: NSObject, WebSocketDelegate {
self.flushWaitingForPostToWebSocket() self.flushWaitingForPostToWebSocket()
return return
} }
var postStr = "" var postStr = ""
for packet in self.postWait { for packet in self.postWait {
let len = count(packet) let len = count(packet)
postStr += "\(len):\(packet)" postStr += "\(len):\(packet)"
} }
self.postWait.removeAll(keepCapacity: false) self.postWait.removeAll(keepCapacity: false)
let req = NSMutableURLRequest(URL: NSURL(string: self.urlPolling! + "&sid=\(self.sid)")!) let req = NSMutableURLRequest(URL: NSURL(string: self.urlPolling! + "&sid=\(self.sid)")!)
req.HTTPMethod = "POST" req.HTTPMethod = "POST"
req.setValue("text/plain; charset=UTF-8", forHTTPHeaderField: "Content-Type") req.setValue("text/plain; charset=UTF-8", forHTTPHeaderField: "Content-Type")
let postData = postStr.dataUsingEncoding(NSUTF8StringEncoding, let postData = postStr.dataUsingEncoding(NSUTF8StringEncoding,
allowLossyConversion: false)! allowLossyConversion: false)!
// NSLog("posting: \(postStr)") // NSLog("posting: \(postStr)")
req.HTTPBody = postData req.HTTPBody = postData
req.setValue(String(postData.length), forHTTPHeaderField: "Content-Length") req.setValue(String(postData.length), forHTTPHeaderField: "Content-Length")
self.waitingForPost = true self.waitingForPost = true
self.session.dataTaskWithRequest(req) {[weak self] data, res, err in self.session.dataTaskWithRequest(req) {[weak self] data, res, err in
if self == nil { if self == nil {
@ -247,7 +247,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
self?.handlePollingFailed(err) self?.handlePollingFailed(err)
return return
} }
self?.waitingForPost = false self?.waitingForPost = false
dispatch_async(self!.emitQueue) { dispatch_async(self!.emitQueue) {
self?.flushWaitingForPost() self?.flushWaitingForPost()
@ -255,21 +255,21 @@ public class SocketEngine: NSObject, WebSocketDelegate {
return return
}}.resume() }}.resume()
} }
// We had packets waiting for send when we upgraded // We had packets waiting for send when we upgraded
// Send them raw // Send them raw
private func flushWaitingForPostToWebSocket() { private func flushWaitingForPostToWebSocket() {
for msg in self.postWait { for msg in self.postWait {
self.ws?.writeString(msg) self.ws?.writeString(msg)
} }
self.postWait.removeAll(keepCapacity: true) self.postWait.removeAll(keepCapacity: true)
} }
// A poll failed, tell the client about it // A poll failed, tell the client about it
private func handlePollingFailed(reason:NSError?) { private func handlePollingFailed(reason:NSError?) {
assert(self.polling, "Polling failed when we're not polling") assert(self.polling, "Polling failed when we're not polling")
if !self.client.reconnecting { if !self.client.reconnecting {
self._connected = false self._connected = false
self.ws?.disconnect() self.ws?.disconnect()
@ -279,17 +279,17 @@ public class SocketEngine: NSObject, WebSocketDelegate {
self.client.pollingDidFail(reason) self.client.pollingDidFail(reason)
} }
} }
func open(opts:[String: AnyObject]? = nil) { func open(opts:[String: AnyObject]? = nil) {
if self.connected { if self.connected {
assert(false, "We're in a bad state, this shouldn't happen.") assert(false, "We're in a bad state, this shouldn't happen.")
} }
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")!)
self.session.dataTaskWithRequest(reqPolling) {[weak self] data, res, err in self.session.dataTaskWithRequest(reqPolling) {[weak self] data, res, err in
var err2:NSError? var err2:NSError?
if self == nil { if self == nil {
@ -298,30 +298,30 @@ public class SocketEngine: NSObject, WebSocketDelegate {
self?.handlePollingFailed(err) self?.handlePollingFailed(err)
return return
} }
if let dataString = NSString(data: data, encoding: NSUTF8StringEncoding) as? String { if let dataString = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
let parsed:[String]? = dataString["(\\d*):(\\d)(\\{.*\\})?"].groups() let parsed:[String]? = dataString["(\\d*):(\\d)(\\{.*\\})?"].groups()
if parsed == nil || parsed?.count != 4 { if parsed == nil || parsed?.count != 4 {
return return
} }
let length = parsed![1] let length = parsed![1]
let type = parsed![2] let type = parsed![2]
let jsonData = parsed![3].dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) let jsonData = parsed![3].dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
if type != "0" { if type != "0" {
NSLog("Error handshaking") NSLog("Error handshaking")
return return
} }
if let json = NSJSONSerialization.JSONObjectWithData(jsonData!, if let json = NSJSONSerialization.JSONObjectWithData(jsonData!,
options: NSJSONReadingOptions.AllowFragments, error: &err2) as? NSDictionary { options: NSJSONReadingOptions.AllowFragments, error: &err2) as? NSDictionary {
if let sid = json["sid"] as? String { if let sid = json["sid"] as? String {
// println(json) // println(json)
self?.sid = sid self?.sid = sid
self?._connected = true self?._connected = true
if !self!.forcePolling { if !self!.forcePolling {
self?.ws = WebSocket(url: NSURL(string: urlWebSocket + "&sid=\(self!.sid)")!) self?.ws = WebSocket(url: NSURL(string: urlWebSocket + "&sid=\(self!.sid)")!)
self?.ws?.queue = self?.handleQueue self?.ws?.queue = self?.handleQueue
@ -332,43 +332,43 @@ public class SocketEngine: NSObject, WebSocketDelegate {
NSLog("Error handshaking") NSLog("Error handshaking")
return return
} }
if let pingInterval = json["pingInterval"] as? Int { if let pingInterval = json["pingInterval"] as? Int {
self?.pingInterval = pingInterval / 1000 self?.pingInterval = pingInterval / 1000
} }
} }
self?.doPoll() self?.doPoll()
self?.startPingTimer() self?.startPingTimer()
}}.resume() }}.resume()
} }
// Translatation of engine.io-parser#decodePayload // Translatation of engine.io-parser#decodePayload
private func parsePollingMessage(str:String) { private func parsePollingMessage(str:String) {
if str.length == 1 { if str.length == 1 {
return return
} }
// println(str) // println(str)
let strArray = Array(str) let strArray = Array(str)
var length = "" var length = ""
var n = 0 var n = 0
var msg = "" var msg = ""
func testLength(length:String, inout n:Int) -> Bool { func testLength(length:String, inout n:Int) -> Bool {
if let num = length.toInt() { if let num = length.toInt() {
n = num n = num
} else { } else {
return true return true
} }
return false return false
} }
for var i = 0, l = str.length; i < l; i = i &+ 1 { for var i = 0, l = str.length; i < l; i = i &+ 1 {
let chr = String(strArray[i]) let chr = String(strArray[i])
if chr != ":" { if chr != ":" {
length += chr length += chr
} else { } else {
@ -376,16 +376,16 @@ public class SocketEngine: NSObject, WebSocketDelegate {
println("failure in parsePollingMessage") println("failure in parsePollingMessage")
return return
} }
msg = String(strArray[i&+1...i&+n]) msg = String(strArray[i&+1...i&+n])
if let lengthInt = length.toInt() { if let lengthInt = length.toInt() {
if lengthInt != msg.length { if lengthInt != msg.length {
println("parsing error") println("parsing error")
return return
} }
} }
if msg.length != 0 { if msg.length != 0 {
// Be sure to capture the value of the msg // Be sure to capture the value of the msg
dispatch_async(self.handleQueue) {[weak self, msg] in dispatch_async(self.handleQueue) {[weak self, msg] in
@ -393,36 +393,36 @@ public class SocketEngine: NSObject, WebSocketDelegate {
return return
} }
} }
i += n i += n
length = "" length = ""
} }
} }
} }
private func parseEngineData(data:NSData) { private func parseEngineData(data:NSData) {
self.client.parseBinaryData(data.subdataWithRange(NSMakeRange(1, data.length - 1))) self.client.parseBinaryData(data.subdataWithRange(NSMakeRange(1, data.length - 1)))
} }
private func parseEngineMessage(var message:String) { private func parseEngineMessage(var message:String) {
// NSLog("Engine got message: \(message)") // NSLog("Engine got message: \(message)")
// We should upgrade // We should upgrade
if message == "3probe" { if message == "3probe" {
self.upgradeTransport() self.upgradeTransport()
return return
} }
let type = message["^(\\d)"].groups()?[1] let type = message["^(\\d)"].groups()?[1]
if type != PacketType.MESSAGE.rawValue { if type != PacketType.MESSAGE.rawValue {
// TODO Handle other packets // TODO Handle other packets
if message.hasPrefix("b4") { if message.hasPrefix("b4") {
// binary in base64 string // binary in base64 string
message.removeRange(Range<String.Index>(start: message.startIndex, message.removeRange(Range<String.Index>(start: message.startIndex,
end: advance(message.startIndex, 2))) end: advance(message.startIndex, 2)))
if let data = NSData(base64EncodedString: message, if let data = NSData(base64EncodedString: message,
options: NSDataBase64DecodingOptions.IgnoreUnknownCharacters) { options: NSDataBase64DecodingOptions.IgnoreUnknownCharacters) {
// println("sending \(data)") // println("sending \(data)")
@ -431,13 +431,13 @@ public class SocketEngine: NSObject, WebSocketDelegate {
return return
} }
} }
return return
} else if type == PacketType.NOOP.rawValue { } else if type == PacketType.NOOP.rawValue {
self.doPoll() self.doPoll()
return return
} }
if message == PacketType.CLOSE.rawValue { if message == PacketType.CLOSE.rawValue {
// do nothing // do nothing
return return
@ -445,29 +445,29 @@ public class SocketEngine: NSObject, WebSocketDelegate {
// println("Got something idk what to do with") // println("Got something idk what to do with")
// println(messageString) // println(messageString)
} }
// Remove message type // Remove message type
message.removeAtIndex(message.startIndex) message.removeAtIndex(message.startIndex)
dispatch_async(self.client.handleQueue) {[weak self] in dispatch_async(self.client.handleQueue) {[weak self] in
self?.client.parseSocketMessage(message) self?.client.parseSocketMessage(message)
return return
} }
} }
private func probeWebSocket() { private func probeWebSocket() {
if self.websocketConnected { if self.websocketConnected {
self.sendWebSocketMessage("probe", withType: PacketType.PING) self.sendWebSocketMessage("probe", withType: PacketType.PING)
} }
} }
public func send(msg:String, datas:[NSData]? = nil) { public func send(msg:String, datas:[NSData]? = nil) {
let _send = {[weak self] (msg:String, datas:[NSData]?) -> () -> Void in let _send = {[weak self] (msg:String, datas:[NSData]?) -> () -> Void in
return { return {
if self == nil || !self!.connected { if self == nil || !self!.connected {
return return
} }
if self!.websocket { if self!.websocket {
// println("sending ws: \(msg):\(datas)") // println("sending ws: \(msg):\(datas)")
self?.sendWebSocketMessage(msg, withType: PacketType.MESSAGE, datas: datas) self?.sendWebSocketMessage(msg, withType: PacketType.MESSAGE, datas: datas)
@ -477,12 +477,12 @@ public class SocketEngine: NSObject, WebSocketDelegate {
} }
} }
} }
dispatch_async(self.emitQueue) {[weak self] in dispatch_async(self.emitQueue) {[weak self] in
if self == nil { if self == nil {
return return
} }
if self!.probing { if self!.probing {
self?.probeWait.append(_send(msg, datas)) self?.probeWait.append(_send(msg, datas))
} else { } else {
@ -490,7 +490,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
} }
} }
} }
func sendPing() { func sendPing() {
if self.websocket { if self.websocket {
self.sendWebSocketMessage("", withType: PacketType.PING) self.sendWebSocketMessage("", withType: PacketType.PING)
@ -498,31 +498,31 @@ public class SocketEngine: NSObject, WebSocketDelegate {
self.sendPollMessage("", withType: PacketType.PING) self.sendPollMessage("", withType: PacketType.PING)
} }
} }
private func sendPollMessage(msg:String, withType type:PacketType, private func sendPollMessage(msg:String, withType type:PacketType,
datas:[NSData]? = nil) { 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)"
self.postWait.append(strMsg) self.postWait.append(strMsg)
if datas != nil { if datas != nil {
for data in datas! { for data in datas! {
let (nilData, b64Data) = self.createBinaryDataForSend(data) let (nilData, b64Data) = self.createBinaryDataForSend(data)
self.postWait.append(b64Data!) self.postWait.append(b64Data!)
} }
} }
if !self.waitingForPost { 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)")
self.ws?.writeString("\(type.rawValue)\(str)") self.ws?.writeString("\(type.rawValue)\(str)")
if datas != nil { if datas != nil {
for data in datas! { for data in datas! {
let (data, nilString) = self.createBinaryDataForSend(data) let (data, nilString) = self.createBinaryDataForSend(data)
@ -532,20 +532,20 @@ public class SocketEngine: NSObject, WebSocketDelegate {
} }
} }
} }
// Starts the ping timer // Starts the ping timer
private func startPingTimer() { private func startPingTimer() {
if self.pingInterval == nil { if self.pingInterval == nil {
return return
} }
self.pingTimer?.invalidate() self.pingTimer?.invalidate()
dispatch_async(dispatch_get_main_queue()) { dispatch_async(dispatch_get_main_queue()) {
self.pingTimer = NSTimer.scheduledTimerWithTimeInterval(NSTimeInterval(self.pingInterval!), target: self, self.pingTimer = NSTimer.scheduledTimerWithTimeInterval(NSTimeInterval(self.pingInterval!), target: self,
selector: Selector("sendPing"), userInfo: nil, repeats: true) selector: Selector("sendPing"), userInfo: nil, repeats: true)
} }
} }
private func upgradeTransport() { private func upgradeTransport() {
if self.websocketConnected { if self.websocketConnected {
// Do a fast upgrade // Do a fast upgrade
@ -554,17 +554,17 @@ public class SocketEngine: NSObject, WebSocketDelegate {
self.sendPollMessage("", withType: PacketType.NOOP) self.sendPollMessage("", withType: PacketType.NOOP)
} }
} }
public func websocketDidConnect(socket:WebSocket) { public func websocketDidConnect(socket:WebSocket) {
self.websocketConnected = true self.websocketConnected = true
self.probing = true self.probing = true
self.probeWebSocket() self.probeWebSocket()
} }
public func websocketDidDisconnect(socket:WebSocket, error:NSError?) { public func websocketDidDisconnect(socket:WebSocket, error:NSError?) {
self.websocketConnected = false self.websocketConnected = false
self.probing = false self.probing = false
if self.websocket { if self.websocket {
self.pingTimer?.invalidate() self.pingTimer?.invalidate()
self._connected = false self._connected = false
@ -575,11 +575,11 @@ public class SocketEngine: NSObject, WebSocketDelegate {
self.flushProbeWait() self.flushProbeWait()
} }
} }
public func websocketDidReceiveMessage(socket:WebSocket, text:String) { public func websocketDidReceiveMessage(socket:WebSocket, text:String) {
self.parseEngineMessage(text) self.parseEngineMessage(text)
} }
public func websocketDidReceiveData(socket:WebSocket, data:NSData) { public func websocketDidReceiveData(socket:WebSocket, data:NSData) {
self.parseEngineData(data) self.parseEngineData(data)
} }

64
SwiftIO/SocketEvent.swift
View File

@ -32,7 +32,7 @@ class SocketEvent {
lazy var datas = [NSData]() lazy var datas = [NSData]()
var event:String! var event:String!
var placeholders:Int! var placeholders:Int!
init(event:String, args:AnyObject?, placeholders:Int = 0, ackNum:Int? = nil, justAck:Bool = false) { init(event:String, args:AnyObject?, placeholders:Int = 0, ackNum:Int? = nil, justAck:Bool = false) {
self.event = event self.event = event
self.args = args self.args = args
@ -40,7 +40,7 @@ class SocketEvent {
self.ack = ackNum self.ack = ackNum
self.justAck = justAck self.justAck = justAck
} }
func addData(data:NSData) -> Bool { func addData(data:NSData) -> Bool {
func checkDoEvent() -> Bool { func checkDoEvent() -> Bool {
if self.placeholders == self.currentPlace { if self.placeholders == self.currentPlace {
@ -49,14 +49,14 @@ class SocketEvent {
return false return false
} }
} }
if checkDoEvent() { if checkDoEvent() {
return true return true
} }
self.datas.append(data) self.datas.append(data)
self.currentPlace++ self.currentPlace++
if checkDoEvent() { if checkDoEvent() {
self.currentPlace = 0 self.currentPlace = 0
return true return true
@ -64,13 +64,13 @@ class SocketEvent {
return false return false
} }
} }
class func createMessageForEvent(event:String, withArgs args:[AnyObject], class func createMessageForEvent(event:String, withArgs args:[AnyObject],
hasBinary:Bool, withDatas datas:Int = 0, toNamespace nsp:String?, wantsAck ack:Int? = nil) -> String { hasBinary:Bool, withDatas datas:Int = 0, toNamespace nsp:String?, wantsAck ack:Int? = nil) -> String {
var message:String var message:String
var jsonSendError:NSError? var jsonSendError:NSError?
if !hasBinary { if !hasBinary {
if nsp == nil { if nsp == nil {
if ack == nil { if ack == nil {
@ -100,14 +100,14 @@ class SocketEvent {
} }
} }
} }
return self.completeMessage(message, args: args) return self.completeMessage(message, args: args)
} }
class func createAck(ack:Int, withArgs args:[AnyObject], withAckType ackType:Int, class func createAck(ack:Int, withArgs args:[AnyObject], withAckType ackType:Int,
withNsp nsp:String, withBinary binary:Int = 0) -> String { withNsp nsp:String, withBinary binary:Int = 0) -> String {
var msg:String var msg:String
if ackType == 3 { if ackType == 3 {
if nsp == "/" { if nsp == "/" {
msg = "3\(ack)[" msg = "3\(ack)["
@ -121,52 +121,52 @@ class SocketEvent {
msg = "6\(binary)-/\(nsp),\(ack)[" msg = "6\(binary)-/\(nsp),\(ack)["
} }
} }
return self.completeMessage(msg, args: args, ack: true) return self.completeMessage(msg, args: args, ack: true)
} }
private class func completeMessage(var message:String, args:[AnyObject], ack:Bool = false) -> String { private class func completeMessage(var message:String, args:[AnyObject], ack:Bool = false) -> String {
var err:NSError? var err:NSError?
if args.count == 0 { if args.count == 0 {
return message + "]" return message + "]"
} else if !ack { } else if !ack {
message += "," message += ","
} }
for arg in args { for arg in args {
if arg is NSDictionary || arg is [AnyObject] { if arg is NSDictionary || arg is [AnyObject] {
let jsonSend = NSJSONSerialization.dataWithJSONObject(arg, let jsonSend = NSJSONSerialization.dataWithJSONObject(arg,
options: NSJSONWritingOptions(0), error: &err) options: NSJSONWritingOptions(0), error: &err)
let jsonString = NSString(data: jsonSend!, encoding: NSUTF8StringEncoding) let jsonString = NSString(data: jsonSend!, encoding: NSUTF8StringEncoding)
message += jsonString! as String message += jsonString! as String
message += "," message += ","
continue continue
} }
if arg is String { if arg is String {
message += "\"\(arg)\"" message += "\"\(arg)\""
message += "," message += ","
continue continue
} }
message += "\(arg)" message += "\(arg)"
message += "," message += ","
} }
if message != "" { if message != "" {
message.removeAtIndex(message.endIndex.predecessor()) message.removeAtIndex(message.endIndex.predecessor())
} }
return message + "]" return message + "]"
} }
private func fillInArray(arr:NSArray) -> NSArray { private func fillInArray(arr:NSArray) -> NSArray {
var newArr = [AnyObject](count: arr.count, repeatedValue: 0) var newArr = [AnyObject](count: arr.count, repeatedValue: 0)
// println(arr) // println(arr)
for i in 0..<arr.count { for i in 0..<arr.count {
if let nest = arr[i] as? NSArray { if let nest = arr[i] as? NSArray {
newArr[i] = self.fillInArray(nest) newArr[i] = self.fillInArray(nest)
@ -182,21 +182,21 @@ class SocketEvent {
newArr[i] = arr[i] newArr[i] = arr[i]
} }
} }
return newArr return newArr
} }
private func fillInDict(dict:NSDictionary) -> NSDictionary { private func fillInDict(dict:NSDictionary) -> NSDictionary {
var newDict = [String: AnyObject]() var newDict = [String: AnyObject]()
for (key, value) in dict { for (key, value) in dict {
newDict[key as! String] = value newDict[key as! String] = value
// If the value is a string we need to check // If the value is a string we need to check
// if it is a placeholder for data // if it is a placeholder for data
if let str = value as? String { if let str = value as? String {
if let num = str["~~(\\d)"].groups() { if let num = str["~~(\\d)"].groups() {
newDict[key as String] = self.datas[num[1].toInt()!] newDict[key as! String] = self.datas[num[1].toInt()!]
} else { } else {
newDict[key as! String] = str newDict[key as! String] = str
} }
@ -206,10 +206,10 @@ class SocketEvent {
newDict[key as! String] = self.fillInArray(arr) newDict[key as! String] = self.fillInArray(arr)
} }
} }
return newDict return newDict
} }
func fillInPlaceholders(_ args:AnyObject = true) -> AnyObject { func fillInPlaceholders(_ args:AnyObject = true) -> AnyObject {
if let dict = args as? NSDictionary { if let dict = args as? NSDictionary {
return self.fillInDict(dict) return self.fillInDict(dict)
@ -225,7 +225,7 @@ class SocketEvent {
let argsAsArray = "[\(self.args)]" let argsAsArray = "[\(self.args)]"
if let parsedArr = SocketParser.parseData(argsAsArray) as? NSArray { if let parsedArr = SocketParser.parseData(argsAsArray) as? NSArray {
var returnArr = [AnyObject](count: parsedArr.count, repeatedValue: 0) var returnArr = [AnyObject](count: parsedArr.count, repeatedValue: 0)
for i in 0..<parsedArr.count { for i in 0..<parsedArr.count {
if let str = parsedArr[i] as? String { if let str = parsedArr[i] as? String {
if let num = str["~~(\\d)"].groups() { if let num = str["~~(\\d)"].groups() {
@ -244,7 +244,7 @@ class SocketEvent {
return returnArr return returnArr
} }
} }
return false return false
} }
} }

124
SwiftIO/SocketParser.swift
View File

@ -28,20 +28,20 @@ class SocketParser {
var replacementArr = [AnyObject](count: arr.count, repeatedValue: 1) var replacementArr = [AnyObject](count: arr.count, repeatedValue: 1)
var hasBinary = false var hasBinary = false
var arrayDatas = [NSData]() var arrayDatas = [NSData]()
for g in 0..<arr.count { for g in 0..<arr.count {
if arr[g] is NSData { if arr[g] is NSData {
hasBinary = true hasBinary = true
currentPlaceholder++ currentPlaceholder++
let sendData = arr[g] as! NSData let sendData = arr[g] as! NSData
arrayDatas.append(sendData) arrayDatas.append(sendData)
replacementArr[g] = ["_placeholder": true, replacementArr[g] = ["_placeholder": true,
"num": currentPlaceholder] "num": currentPlaceholder]
} else if let dict = arr[g] as? NSDictionary { } else if let dict = arr[g] as? NSDictionary {
let (nestDict, hadBinary, dictArrs) = self.parseNSDictionary(dict, let (nestDict, hadBinary, dictArrs) = self.parseNSDictionary(dict,
currentPlaceholder: currentPlaceholder) currentPlaceholder: currentPlaceholder)
if hadBinary { if hadBinary {
hasBinary = true hasBinary = true
currentPlaceholder += dictArrs.count currentPlaceholder += dictArrs.count
@ -54,7 +54,7 @@ class SocketParser {
// Recursive // Recursive
let (nested, hadBinary, nestDatas) = self.parseArray(nestArr, let (nested, hadBinary, nestDatas) = self.parseArray(nestArr,
currentPlaceholder: currentPlaceholder) currentPlaceholder: currentPlaceholder)
if hadBinary { if hadBinary {
hasBinary = true hasBinary = true
currentPlaceholder += nestDatas.count currentPlaceholder += nestDatas.count
@ -67,35 +67,35 @@ class SocketParser {
replacementArr[g] = arr[g] replacementArr[g] = arr[g]
} }
} }
return (replacementArr, hasBinary, arrayDatas) return (replacementArr, hasBinary, arrayDatas)
} }
// Parses data for events // Parses data for events
class func parseData(data:String?) -> AnyObject? { class func parseData(data:String?) -> AnyObject? {
if data == nil { if data == nil {
return nil return nil
} }
var err:NSError? var err:NSError?
let stringData = data!.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) let stringData = data!.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
let parsed:AnyObject? = NSJSONSerialization.JSONObjectWithData(stringData!, let parsed:AnyObject? = NSJSONSerialization.JSONObjectWithData(stringData!,
options: NSJSONReadingOptions.AllowFragments, error: &err) options: NSJSONReadingOptions.AllowFragments, error: &err)
if err != nil { if err != nil {
// println(err) // println(err)
return nil return nil
} }
return parsed return parsed
} }
class func parseEmitArgs(args:[AnyObject]) -> ([AnyObject], Bool, [NSData]) { class func parseEmitArgs(args:[AnyObject]) -> ([AnyObject], Bool, [NSData]) {
var items = [AnyObject](count: args.count, repeatedValue: 1) var items = [AnyObject](count: args.count, repeatedValue: 1)
var currentPlaceholder = -1 var currentPlaceholder = -1
var hasBinary = false var hasBinary = false
var emitDatas = [NSData]() var emitDatas = [NSData]()
for i in 0..<args.count { for i in 0..<args.count {
if let dict = args[i] as? NSDictionary { if let dict = args[i] as? NSDictionary {
// Check for binary data // Check for binary data
@ -113,15 +113,15 @@ class SocketParser {
// arg is array, check for binary // arg is array, check for binary
let (replace, hadData, newDatas) = self.parseArray(arr, let (replace, hadData, newDatas) = self.parseArray(arr,
currentPlaceholder: currentPlaceholder) currentPlaceholder: currentPlaceholder)
if hadData { if hadData {
hasBinary = true hasBinary = true
currentPlaceholder += newDatas.count currentPlaceholder += newDatas.count
for data in newDatas { for data in newDatas {
emitDatas.append(data) emitDatas.append(data)
} }
items[i] = replace items[i] = replace
} else { } else {
items[i] = arr items[i] = arr
@ -129,7 +129,7 @@ class SocketParser {
} else if let binaryData = args[i] as? NSData { } else if let binaryData = args[i] as? NSData {
// args is just binary // args is just binary
hasBinary = true hasBinary = true
currentPlaceholder++ currentPlaceholder++
items[i] = ["_placeholder": true, "num": currentPlaceholder] items[i] = ["_placeholder": true, "num": currentPlaceholder]
emitDatas.append(binaryData) emitDatas.append(binaryData)
@ -137,16 +137,16 @@ class SocketParser {
items[i] = args[i] items[i] = args[i]
} }
} }
return (items, hasBinary, emitDatas) return (items, hasBinary, emitDatas)
} }
// Parses a NSDictionary, looking for NSData objects // Parses a NSDictionary, looking for NSData objects
class func parseNSDictionary(dict:NSDictionary, var currentPlaceholder:Int) -> (NSDictionary, Bool, [NSData]) { class func parseNSDictionary(dict:NSDictionary, var currentPlaceholder:Int) -> (NSDictionary, Bool, [NSData]) {
var returnDict = NSMutableDictionary() var returnDict = NSMutableDictionary()
var hasBinary = false var hasBinary = false
var returnDatas = [NSData]() var returnDatas = [NSData]()
for (key, value) in dict { for (key, value) in dict {
if let binaryData = value as? NSData { if let binaryData = value as? NSData {
currentPlaceholder++ currentPlaceholder++
@ -155,7 +155,7 @@ class SocketParser {
returnDict[key as! String] = ["_placeholder": true, "num": currentPlaceholder] returnDict[key as! String] = ["_placeholder": true, "num": currentPlaceholder]
} else if let arr = value as? NSArray { } else if let arr = value as? NSArray {
let (replace, hadBinary, arrDatas) = self.parseArray(arr, currentPlaceholder: currentPlaceholder) let (replace, hadBinary, arrDatas) = self.parseArray(arr, currentPlaceholder: currentPlaceholder)
if hadBinary { if hadBinary {
hasBinary = true hasBinary = true
returnDict[key as! String] = replace returnDict[key as! String] = replace
@ -167,7 +167,7 @@ class SocketParser {
} else if let dict = value as? NSDictionary { } else if let dict = value as? NSDictionary {
// Recursive // Recursive
let (nestDict, hadBinary, nestDatas) = self.parseNSDictionary(dict, currentPlaceholder: currentPlaceholder) let (nestDict, hadBinary, nestDatas) = self.parseNSDictionary(dict, currentPlaceholder: currentPlaceholder)
if hadBinary { if hadBinary {
hasBinary = true hasBinary = true
returnDict[key as! String] = nestDict returnDict[key as! String] = nestDict
@ -180,18 +180,18 @@ class SocketParser {
returnDict[key as! String] = value returnDict[key as! String] = value
} }
} }
return (returnDict, hasBinary, returnDatas) return (returnDict, hasBinary, returnDatas)
} }
// Parses messages recieved // Parses messages recieved
class func parseSocketMessage(stringMessage:String, socket:SocketIOClient) { class func parseSocketMessage(stringMessage:String, socket:SocketIOClient) {
if stringMessage == "" { if stringMessage == "" {
return return
} }
// NSLog(stringMessage) // NSLog(stringMessage)
// Check for successful namepsace connect // Check for successful namepsace connect
if socket.nsp != nil { if socket.nsp != nil {
if stringMessage == "0/\(socket.nsp!)" { if stringMessage == "0/\(socket.nsp!)" {
@ -199,7 +199,7 @@ class SocketParser {
return return
} }
} }
if stringMessage == "0" { if stringMessage == "0" {
if socket.nsp != nil { if socket.nsp != nil {
// Join namespace // Join namespace
@ -210,14 +210,14 @@ class SocketParser {
return return
} }
} }
if stringMessage.hasPrefix("5") { if stringMessage.hasPrefix("5") {
// Check for message with binary placeholders // Check for message with binary placeholders
self.parseBinaryMessage(stringMessage, socket: socket) self.parseBinaryMessage(stringMessage, socket: socket)
return return
} }
/** /**
Begin check for message Begin check for message
**/ **/
@ -226,16 +226,16 @@ class SocketParser {
NSLog("Error in groups") NSLog("Error in groups")
return return
} }
// let messageGroups = SwiftRegex(target: stringMessage as NSString, // let messageGroups = SwiftRegex(target: stringMessage as NSString,
// pattern: "(\\d*)\\/?(\\w*)?,?(\\d*)?\\[\"(.*?)\",?(.*?)?\\]$", // pattern: "(\\d*)\\/?(\\w*)?,?(\\d*)?\\[\"(.*?)\",?(.*?)?\\]$",
// options: NSRegularExpressionOptions.DotMatchesLineSeparators).groups() // options: NSRegularExpressionOptions.DotMatchesLineSeparators).groups()
if messageGroups![1].hasPrefix("2") { if messageGroups![1].hasPrefix("2") {
var mesNum = messageGroups![1] var mesNum = messageGroups![1]
var ackNum:String var ackNum:String
var namespace:String? var namespace:String?
if messageGroups![3] != "" { if messageGroups![3] != "" {
ackNum = messageGroups![3] ackNum = messageGroups![3]
} else { } else {
@ -244,16 +244,16 @@ class SocketParser {
mesNum.replaceRange(range, with: "") mesNum.replaceRange(range, with: "")
ackNum = mesNum ackNum = mesNum
} }
namespace = messageGroups![2] namespace = messageGroups![2]
if namespace == "" && socket.nsp != nil { if namespace == "" && socket.nsp != nil {
return return
} }
let event = messageGroups![4] let event = messageGroups![4]
let data = "[\(messageGroups![5])]" let data = "[\(messageGroups![5])]"
if let parsed:AnyObject = self.parseData(data) { if let parsed:AnyObject = self.parseData(data) {
if ackNum == "" { if ackNum == "" {
socket.handleEvent(event, data: parsed) socket.handleEvent(event, data: parsed)
@ -262,53 +262,53 @@ 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 messageGroups![1].hasPrefix("3") { } else if messageGroups![1].hasPrefix("3") {
let arr = Array(messageGroups![1]) let arr = Array(messageGroups![1])
var ackNum:String var ackNum:String
let nsp = messageGroups![2] let nsp = messageGroups![2]
if nsp == "" && socket.nsp != nil { if nsp == "" && socket.nsp != nil {
return return
} }
if nsp == "" { if nsp == "" {
ackNum = String(arr[1...arr.count-1]) ackNum = String(arr[1...arr.count-1])
} else { } else {
ackNum = messageGroups![3] ackNum = messageGroups![3]
} }
let ackData:AnyObject? = self.parseData(messageGroups![4]) let ackData:AnyObject? = self.parseData(messageGroups![4])
socket.handleAck(ackNum.toInt()!, data: ackData) socket.handleAck(ackNum.toInt()!, data: ackData)
return return
} }
/** /**
End Check for message End Check for message
**/ **/
} }
// Handles binary data // Handles binary data
class func parseBinaryData(data:NSData, socket:SocketIOClient) { class func parseBinaryData(data:NSData, socket:SocketIOClient) {
// NSLog(data.base64EncodedStringWithOptions(NSDataBase64EncodingOptions.allZeros)) // NSLog(data.base64EncodedStringWithOptions(NSDataBase64EncodingOptions.allZeros))
let shouldExecute = socket.waitingData[0].addData(data) let shouldExecute = socket.waitingData[0].addData(data)
if shouldExecute { if shouldExecute {
let socketEvent = socket.waitingData.removeAtIndex(0) let socketEvent = socket.waitingData.removeAtIndex(0)
var event = socketEvent.event var event = socketEvent.event
var parsedArgs:AnyObject? = self.parseData(socketEvent.args as? String) var parsedArgs:AnyObject? = self.parseData(socketEvent.args as? String)
if let args:AnyObject = parsedArgs { if let args:AnyObject = parsedArgs {
let filledInArgs:AnyObject = socketEvent.fillInPlaceholders(args) let filledInArgs:AnyObject = socketEvent.fillInPlaceholders(args)
if socketEvent.justAck! { if socketEvent.justAck! {
// Should handle ack // Should handle ack
socket.handleAck(socketEvent.ack!, data: filledInArgs) socket.handleAck(socketEvent.ack!, data: filledInArgs)
return return
} }
// Should do event // Should do event
if socketEvent.ack != nil { if socketEvent.ack != nil {
socket.handleEvent(event, data: filledInArgs, isInternalMessage: false, socket.handleEvent(event, data: filledInArgs, isInternalMessage: false,
@ -318,13 +318,13 @@ class SocketParser {
} }
} else { } else {
let filledInArgs:AnyObject = socketEvent.fillInPlaceholders() let filledInArgs:AnyObject = socketEvent.fillInPlaceholders()
// Should handle ack // Should handle ack
if socketEvent.justAck! { if socketEvent.justAck! {
socket.handleAck(socketEvent.ack!, data: filledInArgs) socket.handleAck(socketEvent.ack!, data: filledInArgs)
return return
} }
// Should handle ack // Should handle ack
if socketEvent.ack != nil { if socketEvent.ack != nil {
socket.handleEvent(event, data: filledInArgs, isInternalMessage: false, socket.handleEvent(event, data: filledInArgs, isInternalMessage: false,
@ -335,11 +335,11 @@ class SocketParser {
} }
} }
} }
// Tries to parse a message that contains binary // Tries to parse a message that contains binary
class func parseBinaryMessage(message:String, socket:SocketIOClient) { class func parseBinaryMessage(message:String, socket:SocketIOClient) {
// NSLog(message) // NSLog(message)
/** /**
Begin check for binary placeholders Begin check for binary placeholders
**/ **/
@ -347,11 +347,11 @@ class SocketParser {
// let binaryGroup = SwiftRegex(target: message, // let binaryGroup = SwiftRegex(target: message,
// pattern: "^(\\d*)-\\/?(\\w*)?,?(\\d*)?\\[(\".*?\")?,?(.*)?\\]$", // pattern: "^(\\d*)-\\/?(\\w*)?,?(\\d*)?\\[(\".*?\")?,?(.*)?\\]$",
// options: NSRegularExpressionOptions.DotMatchesLineSeparators).groups() // options: NSRegularExpressionOptions.DotMatchesLineSeparators).groups()
if binaryGroup == nil { if binaryGroup == nil {
return return
} }
if binaryGroup![1].hasPrefix("5") { if binaryGroup![1].hasPrefix("5") {
// println(binaryGroup) // println(binaryGroup)
var ackNum:String var ackNum:String
@ -359,9 +359,9 @@ class SocketParser {
var mutMessageObject:String var mutMessageObject:String
var namespace:String? var namespace:String?
var numberOfPlaceholders:String var numberOfPlaceholders:String
let messageType = binaryGroup![1] let messageType = binaryGroup![1]
namespace = binaryGroup![2] namespace = binaryGroup![2]
if binaryGroup![3] != "" { if binaryGroup![3] != "" {
ackNum = binaryGroup![3] as String ackNum = binaryGroup![3] as String
@ -370,18 +370,18 @@ class SocketParser {
} else { } else {
ackNum = "" ackNum = ""
} }
numberOfPlaceholders = (messageType["5"] ~= "") as String numberOfPlaceholders = (messageType["5"] ~= "") as String
event = (binaryGroup![4]["\""] ~= "") as String event = (binaryGroup![4]["\""] ~= "") as String
mutMessageObject = binaryGroup![5] mutMessageObject = binaryGroup![5]
if namespace == "" && socket.nsp != nil { if namespace == "" && socket.nsp != nil {
return return
} }
let placeholdersRemoved = mutMessageObject["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] let placeholdersRemoved = mutMessageObject["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"]
~= "\"~~$2\"" ~= "\"~~$2\""
var mes:SocketEvent var mes:SocketEvent
if ackNum == "" { if ackNum == "" {
mes = SocketEvent(event: event, args: placeholdersRemoved, mes = SocketEvent(event: event, args: placeholdersRemoved,
@ -391,14 +391,14 @@ class SocketParser {
mes = SocketEvent(event: event, args: placeholdersRemoved, mes = SocketEvent(event: event, args: placeholdersRemoved,
placeholders: numberOfPlaceholders.toInt()!, ackNum: ackNum.toInt()) placeholders: numberOfPlaceholders.toInt()!, ackNum: ackNum.toInt())
} }
socket.waitingData.append(mes) socket.waitingData.append(mes)
} else if binaryGroup![1].hasPrefix("6") { } else if binaryGroup![1].hasPrefix("6") {
let messageType = binaryGroup![1] let messageType = binaryGroup![1]
let numberOfPlaceholders = (messageType["6"] ~= "") as String let numberOfPlaceholders = (messageType["6"] ~= "") as String
var ackNum:String var ackNum:String
var nsp:String var nsp:String
if binaryGroup![3] == "" { if binaryGroup![3] == "" {
ackNum = binaryGroup![2] ackNum = binaryGroup![2]
nsp = "" nsp = ""
@ -406,17 +406,17 @@ class SocketParser {
ackNum = binaryGroup![3] ackNum = binaryGroup![3]
nsp = binaryGroup![2] nsp = binaryGroup![2]
} }
if nsp == "" && socket.nsp != nil { if nsp == "" && socket.nsp != nil {
return return
} }
var mutMessageObject = binaryGroup![5] var mutMessageObject = binaryGroup![5]
let placeholdersRemoved = mutMessageObject["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] let placeholdersRemoved = mutMessageObject["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"]
~= "\"~~$2\"" ~= "\"~~$2\""
let event = SocketEvent(event: "", args: placeholdersRemoved, let event = SocketEvent(event: "", args: placeholdersRemoved,
placeholders: numberOfPlaceholders.toInt()!, ackNum: ackNum.toInt(), justAck: true) placeholders: numberOfPlaceholders.toInt()!, ackNum: ackNum.toInt(), justAck: true)
socket.waitingData.append(event) socket.waitingData.append(event)
} }
/** /**

60
SwiftIO/SwiftRegex.swift
View File

@ -18,7 +18,7 @@ var swiftRegexCache = [String: NSRegularExpression]()
public class SwiftRegex: NSObject, BooleanType { public class SwiftRegex: NSObject, BooleanType {
var target:String var target:String
var regex: NSRegularExpression var regex: NSRegularExpression
init(target:String, pattern:String, options:NSRegularExpressionOptions = nil) { init(target:String, pattern:String, options:NSRegularExpressionOptions = nil) {
self.target = target self.target = target
if let regex = swiftRegexCache[pattern] { if let regex = swiftRegexCache[pattern] {
@ -36,16 +36,16 @@ public class SwiftRegex: NSObject, BooleanType {
} }
super.init() super.init()
} }
class func failure(message: String) { class func failure(message: String) {
println("SwiftRegex: "+message) println("SwiftRegex: "+message)
//assert(false,"SwiftRegex: failed") //assert(false,"SwiftRegex: failed")
} }
final var targetRange: NSRange { final var targetRange: NSRange {
return NSRange(location: 0,length: countElements(target)) return NSRange(location: 0,length: count(target))
} }
final func substring(range: NSRange) -> String? { final func substring(range: NSRange) -> String? {
if ( range.location != NSNotFound ) { if ( range.location != NSNotFound ) {
return (target as NSString).substringWithRange(range) return (target as NSString).substringWithRange(range)
@ -53,23 +53,23 @@ public class SwiftRegex: NSObject, BooleanType {
return nil return nil
} }
} }
public func doesMatch(options: NSMatchingOptions = nil) -> Bool { public func doesMatch(options: NSMatchingOptions = nil) -> Bool {
return range(options: options).location != NSNotFound return range(options: options).location != NSNotFound
} }
public func range(options: NSMatchingOptions = nil) -> NSRange { public func range(options: NSMatchingOptions = nil) -> NSRange {
return regex.rangeOfFirstMatchInString(target as String, options: nil, range: targetRange) return regex.rangeOfFirstMatchInString(target as String, options: nil, range: targetRange)
} }
public func match(options: NSMatchingOptions = nil) -> String? { public func match(options: NSMatchingOptions = nil) -> String? {
return substring(range(options: options)) return substring(range(options: options))
} }
public func groups(options: NSMatchingOptions = nil) -> [String]? { public func groups(options: NSMatchingOptions = nil) -> [String]? {
return groupsForMatch(regex.firstMatchInString(target as String, options: options, range: targetRange)) return groupsForMatch(regex.firstMatchInString(target as String, options: options, range: targetRange))
} }
func groupsForMatch(match: NSTextCheckingResult!) -> [String]? { func groupsForMatch(match: NSTextCheckingResult!) -> [String]? {
if match != nil { if match != nil {
var groups = [String]() var groups = [String]()
@ -85,51 +85,51 @@ public class SwiftRegex: NSObject, BooleanType {
return nil return nil
} }
} }
public subscript(groupno: Int) -> String? { public subscript(groupno: Int) -> String? {
get { get {
return groups()?[groupno] return groups()?[groupno]
} }
set(newValue) { set(newValue) {
if newValue == nil { if newValue == nil {
return return
} }
for match in matchResults()!.reverse() { for match in matchResults()!.reverse() {
let replacement = regex.replacementStringForResult(match, let replacement = regex.replacementStringForResult(match,
inString: target as String, offset: 0, template: newValue!) inString: target as String, offset: 0, template: newValue!)
let mut = NSMutableString(string: target) let mut = NSMutableString(string: target)
mut.replaceCharactersInRange(match.rangeAtIndex(groupno), withString: replacement) mut.replaceCharactersInRange(match.rangeAtIndex(groupno), withString: replacement)
target = mut target = mut as String
} }
} }
} }
func matchResults(options: NSMatchingOptions = nil) -> [NSTextCheckingResult]? { func matchResults(options: NSMatchingOptions = nil) -> [NSTextCheckingResult]? {
let matches = regex.matchesInString(target as String, options: options, range: targetRange) let matches = regex.matchesInString(target as String, options: options, range: targetRange)
as? [NSTextCheckingResult] as? [NSTextCheckingResult]
if matches != nil { if matches != nil {
return matches! return matches!
} else { } else {
return nil return nil
} }
} }
public func ranges(options: NSMatchingOptions = nil) -> [NSRange] { public func ranges(options: NSMatchingOptions = nil) -> [NSRange] {
return matchResults(options: options)!.map { $0.range } return matchResults(options: options)!.map { $0.range }
} }
public func matches(options: NSMatchingOptions = nil) -> [String] { public func matches(options: NSMatchingOptions = nil) -> [String] {
return matchResults(options: options)!.map( { self.substring($0.range)!}) return matchResults(options: options)!.map( { self.substring($0.range)!})
} }
public func allGroups(options: NSMatchingOptions = nil) -> [[String]?] { public func allGroups(options: NSMatchingOptions = nil) -> [[String]?] {
return matchResults(options: options)!.map {self.groupsForMatch($0)} return matchResults(options: options)!.map {self.groupsForMatch($0)}
} }
public func dictionary(options: NSMatchingOptions = nil) -> Dictionary<String,String> { public func dictionary(options: NSMatchingOptions = nil) -> Dictionary<String,String> {
var out = Dictionary<String,String>() var out = Dictionary<String,String>()
for match in matchResults(options: options)! { for match in matchResults(options: options)! {
@ -137,26 +137,26 @@ public class SwiftRegex: NSObject, BooleanType {
} }
return out return out
} }
func substituteMatches(substitution: (NSTextCheckingResult, UnsafeMutablePointer<ObjCBool>) -> String, func substituteMatches(substitution: (NSTextCheckingResult, UnsafeMutablePointer<ObjCBool>) -> String,
options:NSMatchingOptions = nil) -> String { options:NSMatchingOptions = nil) -> String {
let out = NSMutableString() let out = NSMutableString()
var pos = 0 var pos = 0
regex.enumerateMatchesInString(target as String, options: options, range: targetRange ) { regex.enumerateMatchesInString(target as String, options: options, range: targetRange ) {
(match: NSTextCheckingResult!, flags: NSMatchingFlags, stop: UnsafeMutablePointer<ObjCBool>) in (match: NSTextCheckingResult!, flags: NSMatchingFlags, stop: UnsafeMutablePointer<ObjCBool>) in
let matchRange = match.range let matchRange = match.range
out.appendString( self.substring(NSRange(location:pos, length:matchRange.location-pos))!) out.appendString( self.substring(NSRange(location:pos, length:matchRange.location-pos))!)
out.appendString( substitution(match, stop) ) out.appendString( substitution(match, stop) )
pos = matchRange.location + matchRange.length pos = matchRange.location + matchRange.length
} }
out.appendString(substring( NSRange(location:pos, length:targetRange.length-pos))!) out.appendString(substring( NSRange(location:pos, length:targetRange.length-pos))!)
return out return out as String
} }
public var boolValue: Bool { public var boolValue: Bool {
return doesMatch() return doesMatch()
} }
@ -184,11 +184,11 @@ public func ~= (left: SwiftRegex, right: String) -> String {
public func ~= (left: SwiftRegex, right: [String]) -> String { public func ~= (left: SwiftRegex, right: [String]) -> String {
var matchNumber = 0 var matchNumber = 0
return left.substituteMatches({match, stop -> String in return left.substituteMatches({match, stop -> String in
if ++matchNumber == right.count { if ++matchNumber == right.count {
stop.memory = true stop.memory = true
} }
return left.regex.replacementStringForResult( match, return left.regex.replacementStringForResult( match,
inString: left.target as String, offset: 0, template: right[matchNumber-1] ) inString: left.target as String, offset: 0, template: right[matchNumber-1] )
}, options: nil) }, options: nil)