From c6d0331d50df58109a7d3aef7d1eadf454f42fe9 Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 16 Mar 2015 09:06:45 -0400 Subject: [PATCH] merge timeouts fixes for 1.2 --- SwiftIO/SocketEngine.swift | 186 ++++++++++++++++++------------------- SwiftIO/SocketEvent.swift | 64 ++++++------- SwiftIO/SocketParser.swift | 124 ++++++++++++------------- SwiftIO/SwiftRegex.swift | 60 ++++++------ 4 files changed, 217 insertions(+), 217 deletions(-) diff --git a/SwiftIO/SocketEngine.swift b/SwiftIO/SocketEngine.swift index d2116f0..20a54e7 100644 --- a/SwiftIO/SocketEngine.swift +++ b/SwiftIO/SocketEngine.swift @@ -78,19 +78,19 @@ public class SocketEngine: NSObject, WebSocketDelegate { return self._websocket } var ws:WebSocket? - + init(client:SocketIOClient, forcePolling:Bool = false) { self.client = client self.forcePolling = forcePolling self.session = NSURLSession(configuration: NSURLSessionConfiguration.ephemeralSessionConfiguration(), delegate: nil, delegateQueue: self.workQueue) } - + func close() { self.pingTimer?.invalidate() self.send(PacketType.CLOSE.rawValue) } - + private func createBinaryDataForSend(data:NSData) -> (NSData?, String?) { if self.websocket { var byteArray = [UInt8](count: 1, repeatedValue: 0x0) @@ -102,16 +102,16 @@ public class SocketEngine: NSObject, WebSocketDelegate { var str = "b4" str += data.base64EncodedStringWithOptions( NSDataBase64EncodingOptions.Encoding64CharacterLineLength) - + return (nil, str) } } - + private func createURLs(params:[String: AnyObject]? = nil) -> (String, String) { var url = "\(self.client.socketURL)/socket.io/?transport=" var urlPolling:String var urlWebSocket:String - + if self.client.secure { urlPolling = "https://" + url + "polling" urlWebSocket = "wss://" + url + "websocket" @@ -119,14 +119,14 @@ public class SocketEngine: NSObject, WebSocketDelegate { urlPolling = "http://" + url + "polling" urlWebSocket = "ws://" + url + "websocket" } - + if params != nil { for (key, value) in params! { let keyEsc = key.stringByAddingPercentEncodingWithAllowedCharacters( NSCharacterSet.URLHostAllowedCharacterSet())! urlPolling += "&\(keyEsc)=" urlWebSocket += "&\(keyEsc)=" - + if value is String { let valueEsc = (value as! String).stringByAddingPercentEncodingWithAllowedCharacters( NSCharacterSet.URLHostAllowedCharacterSet())! @@ -138,10 +138,10 @@ public class SocketEngine: NSObject, WebSocketDelegate { } } } - + return (urlPolling, urlWebSocket) } - + private func doFastUpgrade() { self.sendWebSocketMessage("", withType: PacketType.UPGRADE) self._websocket = true @@ -149,23 +149,23 @@ public class SocketEngine: NSObject, WebSocketDelegate { self.fastUpgrade = false self.flushProbeWait() } - + private func doPoll() { if self.websocket || self.waitingForPoll || !self.connected { return } - + self.waitingForPoll = true self.doRequest(self.parsePollingMessage) } - + private func doRequest(callback:(String) -> Void) { if !self.polling { return } - + let req = NSURLRequest(URL: NSURL(string: self.urlPolling! + "&sid=\(self.sid)")!) - + self.session.dataTaskWithRequest(req) {[weak self] data, res, err in if self == nil { return @@ -173,18 +173,18 @@ public class SocketEngine: NSObject, WebSocketDelegate { if self!.polling { self?.handlePollingFailed(err) } - + return } - + // println(data) - + 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 - + if self!.fastUpgrade { self?.doFastUpgrade() return @@ -193,22 +193,22 @@ public class SocketEngine: NSObject, WebSocketDelegate { } }.resume() } - + private func flushProbeWait() { // println("flushing probe wait") dispatch_async(self.emitQueue) {[weak self] in if self == nil { return } - + for waiter in self!.probeWait { waiter() } - + self?.probeWait.removeAll(keepCapacity: false) } } - + private func flushWaitingForPost() { if self.postWait.count == 0 || !self.connected { return @@ -216,29 +216,29 @@ public class SocketEngine: NSObject, WebSocketDelegate { self.flushWaitingForPostToWebSocket() return } - + var postStr = "" - + for packet in self.postWait { let len = count(packet) - + postStr += "\(len):\(packet)" } - + self.postWait.removeAll(keepCapacity: false) - + let req = NSMutableURLRequest(URL: NSURL(string: self.urlPolling! + "&sid=\(self.sid)")!) - + req.HTTPMethod = "POST" req.setValue("text/plain; charset=UTF-8", forHTTPHeaderField: "Content-Type") - + let postData = postStr.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)! - + // NSLog("posting: \(postStr)") req.HTTPBody = postData req.setValue(String(postData.length), forHTTPHeaderField: "Content-Length") - + self.waitingForPost = true self.session.dataTaskWithRequest(req) {[weak self] data, res, err in if self == nil { @@ -247,7 +247,7 @@ public class SocketEngine: NSObject, WebSocketDelegate { self?.handlePollingFailed(err) return } - + self?.waitingForPost = false dispatch_async(self!.emitQueue) { self?.flushWaitingForPost() @@ -255,21 +255,21 @@ public class SocketEngine: NSObject, WebSocketDelegate { return }}.resume() } - + // We had packets waiting for send when we upgraded // Send them raw private func flushWaitingForPostToWebSocket() { for msg in self.postWait { self.ws?.writeString(msg) } - + self.postWait.removeAll(keepCapacity: true) } - + // A poll failed, tell the client about it private func handlePollingFailed(reason:NSError?) { assert(self.polling, "Polling failed when we're not polling") - + if !self.client.reconnecting { self._connected = false self.ws?.disconnect() @@ -279,17 +279,17 @@ public class SocketEngine: NSObject, WebSocketDelegate { self.client.pollingDidFail(reason) } } - + func open(opts:[String: AnyObject]? = nil) { if self.connected { assert(false, "We're in a bad state, this shouldn't happen.") } - + let (urlPolling, urlWebSocket) = self.createURLs(params: opts) self.urlPolling = urlPolling self.urlWebSocket = urlWebSocket let reqPolling = NSURLRequest(URL: NSURL(string: urlPolling + "&b64=1")!) - + self.session.dataTaskWithRequest(reqPolling) {[weak self] data, res, err in var err2:NSError? if self == nil { @@ -298,30 +298,30 @@ public class SocketEngine: NSObject, WebSocketDelegate { self?.handlePollingFailed(err) return } - + if let dataString = NSString(data: data, encoding: NSUTF8StringEncoding) as? String { let parsed:[String]? = dataString["(\\d*):(\\d)(\\{.*\\})?"].groups() - + if parsed == nil || parsed?.count != 4 { return } - + let length = parsed![1] let type = parsed![2] let jsonData = parsed![3].dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) - + if type != "0" { NSLog("Error handshaking") return } - + if let json = NSJSONSerialization.JSONObjectWithData(jsonData!, options: NSJSONReadingOptions.AllowFragments, error: &err2) as? NSDictionary { if let sid = json["sid"] as? String { // println(json) self?.sid = sid self?._connected = true - + if !self!.forcePolling { self?.ws = WebSocket(url: NSURL(string: urlWebSocket + "&sid=\(self!.sid)")!) self?.ws?.queue = self?.handleQueue @@ -332,43 +332,43 @@ public class SocketEngine: NSObject, WebSocketDelegate { NSLog("Error handshaking") return } - + if let pingInterval = json["pingInterval"] as? Int { self?.pingInterval = pingInterval / 1000 } } - + self?.doPoll() self?.startPingTimer() }}.resume() } - + // Translatation of engine.io-parser#decodePayload private func parsePollingMessage(str:String) { if str.length == 1 { return } - + // println(str) - + let strArray = Array(str) var length = "" var n = 0 var msg = "" - + func testLength(length:String, inout n:Int) -> Bool { if let num = length.toInt() { n = num } else { return true } - + return false } - + for var i = 0, l = str.length; i < l; i = i &+ 1 { let chr = String(strArray[i]) - + if chr != ":" { length += chr } else { @@ -376,16 +376,16 @@ public class SocketEngine: NSObject, WebSocketDelegate { println("failure in parsePollingMessage") return } - + msg = String(strArray[i&+1...i&+n]) - + if let lengthInt = length.toInt() { if lengthInt != msg.length { println("parsing error") return } } - + if msg.length != 0 { // Be sure to capture the value of the msg dispatch_async(self.handleQueue) {[weak self, msg] in @@ -393,36 +393,36 @@ public class SocketEngine: NSObject, WebSocketDelegate { return } } - + i += n length = "" } } } - + private func parseEngineData(data:NSData) { self.client.parseBinaryData(data.subdataWithRange(NSMakeRange(1, data.length - 1))) } - + private func parseEngineMessage(var message:String) { // NSLog("Engine got message: \(message)") - + // We should upgrade if message == "3probe" { self.upgradeTransport() return } - + let type = message["^(\\d)"].groups()?[1] - + if type != PacketType.MESSAGE.rawValue { // TODO Handle other packets if message.hasPrefix("b4") { // binary in base64 string - + message.removeRange(Range(start: message.startIndex, end: advance(message.startIndex, 2))) - + if let data = NSData(base64EncodedString: message, options: NSDataBase64DecodingOptions.IgnoreUnknownCharacters) { // println("sending \(data)") @@ -431,13 +431,13 @@ public class SocketEngine: NSObject, WebSocketDelegate { return } } - + return } else if type == PacketType.NOOP.rawValue { self.doPoll() return } - + if message == PacketType.CLOSE.rawValue { // do nothing return @@ -445,29 +445,29 @@ public class SocketEngine: NSObject, WebSocketDelegate { // println("Got something idk what to do with") // println(messageString) } - + // Remove message type message.removeAtIndex(message.startIndex) - + dispatch_async(self.client.handleQueue) {[weak self] in self?.client.parseSocketMessage(message) return } } - + private func probeWebSocket() { if self.websocketConnected { self.sendWebSocketMessage("probe", withType: PacketType.PING) } } - + public func send(msg:String, datas:[NSData]? = nil) { let _send = {[weak self] (msg:String, datas:[NSData]?) -> () -> Void in return { if self == nil || !self!.connected { return } - + if self!.websocket { // println("sending ws: \(msg):\(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 if self == nil { return } - + if self!.probing { self?.probeWait.append(_send(msg, datas)) } else { @@ -490,7 +490,7 @@ public class SocketEngine: NSObject, WebSocketDelegate { } } } - + func sendPing() { if self.websocket { self.sendWebSocketMessage("", withType: PacketType.PING) @@ -498,31 +498,31 @@ public class SocketEngine: NSObject, WebSocketDelegate { self.sendPollMessage("", withType: PacketType.PING) } } - + private func sendPollMessage(msg:String, withType type:PacketType, datas:[NSData]? = nil) { // println("Sending poll: \(msg) as type: \(type.rawValue)") let strMsg = "\(type.rawValue)\(msg)" - + self.postWait.append(strMsg) - + if datas != nil { for data in datas! { let (nilData, b64Data) = self.createBinaryDataForSend(data) - + self.postWait.append(b64Data!) } } - + if !self.waitingForPost { self.flushWaitingForPost() } } - + private func sendWebSocketMessage(str:String, withType type:PacketType, datas:[NSData]? = nil) { // println("Sending ws: \(str) as type: \(type.rawValue)") self.ws?.writeString("\(type.rawValue)\(str)") - + if datas != nil { for data in datas! { let (data, nilString) = self.createBinaryDataForSend(data) @@ -532,20 +532,20 @@ public class SocketEngine: NSObject, WebSocketDelegate { } } } - + // Starts the ping timer private func startPingTimer() { if self.pingInterval == nil { return } - + self.pingTimer?.invalidate() dispatch_async(dispatch_get_main_queue()) { self.pingTimer = NSTimer.scheduledTimerWithTimeInterval(NSTimeInterval(self.pingInterval!), target: self, selector: Selector("sendPing"), userInfo: nil, repeats: true) } } - + private func upgradeTransport() { if self.websocketConnected { // Do a fast upgrade @@ -554,17 +554,17 @@ public class SocketEngine: NSObject, WebSocketDelegate { self.sendPollMessage("", withType: PacketType.NOOP) } } - + public func websocketDidConnect(socket:WebSocket) { self.websocketConnected = true self.probing = true self.probeWebSocket() } - + public func websocketDidDisconnect(socket:WebSocket, error:NSError?) { self.websocketConnected = false self.probing = false - + if self.websocket { self.pingTimer?.invalidate() self._connected = false @@ -575,11 +575,11 @@ public class SocketEngine: NSObject, WebSocketDelegate { self.flushProbeWait() } } - + public func websocketDidReceiveMessage(socket:WebSocket, text:String) { self.parseEngineMessage(text) } - + public func websocketDidReceiveData(socket:WebSocket, data:NSData) { self.parseEngineData(data) } diff --git a/SwiftIO/SocketEvent.swift b/SwiftIO/SocketEvent.swift index d5de23b..48660c7 100644 --- a/SwiftIO/SocketEvent.swift +++ b/SwiftIO/SocketEvent.swift @@ -32,7 +32,7 @@ class SocketEvent { lazy var datas = [NSData]() var event:String! var placeholders:Int! - + init(event:String, args:AnyObject?, placeholders:Int = 0, ackNum:Int? = nil, justAck:Bool = false) { self.event = event self.args = args @@ -40,7 +40,7 @@ class SocketEvent { self.ack = ackNum self.justAck = justAck } - + func addData(data:NSData) -> Bool { func checkDoEvent() -> Bool { if self.placeholders == self.currentPlace { @@ -49,14 +49,14 @@ class SocketEvent { return false } } - + if checkDoEvent() { return true } - + self.datas.append(data) self.currentPlace++ - + if checkDoEvent() { self.currentPlace = 0 return true @@ -64,13 +64,13 @@ class SocketEvent { return false } } - + class func createMessageForEvent(event:String, withArgs args:[AnyObject], hasBinary:Bool, withDatas datas:Int = 0, toNamespace nsp:String?, wantsAck ack:Int? = nil) -> String { - + var message:String var jsonSendError:NSError? - + if !hasBinary { if nsp == nil { if ack == nil { @@ -100,14 +100,14 @@ class SocketEvent { } } } - + return self.completeMessage(message, args: args) } - + class func createAck(ack:Int, withArgs args:[AnyObject], withAckType ackType:Int, withNsp nsp:String, withBinary binary:Int = 0) -> String { var msg:String - + if ackType == 3 { if nsp == "/" { msg = "3\(ack)[" @@ -121,52 +121,52 @@ class SocketEvent { msg = "6\(binary)-/\(nsp),\(ack)[" } } - + return self.completeMessage(msg, args: args, ack: true) } - + private class func completeMessage(var message:String, args:[AnyObject], ack:Bool = false) -> String { var err:NSError? - + if args.count == 0 { return message + "]" } else if !ack { message += "," } - + for arg in args { - + if arg is NSDictionary || arg is [AnyObject] { let jsonSend = NSJSONSerialization.dataWithJSONObject(arg, options: NSJSONWritingOptions(0), error: &err) let jsonString = NSString(data: jsonSend!, encoding: NSUTF8StringEncoding) - + message += jsonString! as String message += "," continue } - + if arg is String { message += "\"\(arg)\"" message += "," continue } - + message += "\(arg)" message += "," } - + if message != "" { message.removeAtIndex(message.endIndex.predecessor()) } - + return message + "]" } - + private func fillInArray(arr:NSArray) -> NSArray { var newArr = [AnyObject](count: arr.count, repeatedValue: 0) // println(arr) - + for i in 0.. NSDictionary { var newDict = [String: AnyObject]() - + for (key, value) in dict { newDict[key as! String] = value - + // If the value is a string we need to check // if it is a placeholder for data if let str = value as? String { 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 { newDict[key as! String] = str } @@ -206,10 +206,10 @@ class SocketEvent { newDict[key as! String] = self.fillInArray(arr) } } - + return newDict } - + func fillInPlaceholders(_ args:AnyObject = true) -> AnyObject { if let dict = args as? NSDictionary { return self.fillInDict(dict) @@ -225,7 +225,7 @@ class SocketEvent { let argsAsArray = "[\(self.args)]" if let parsedArr = SocketParser.parseData(argsAsArray) as? NSArray { var returnArr = [AnyObject](count: parsedArr.count, repeatedValue: 0) - + for i in 0.. AnyObject? { if data == nil { return nil } - + var err:NSError? let stringData = data!.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) let parsed:AnyObject? = NSJSONSerialization.JSONObjectWithData(stringData!, options: NSJSONReadingOptions.AllowFragments, error: &err) - + if err != nil { // println(err) return nil } - + return parsed } - + class func parseEmitArgs(args:[AnyObject]) -> ([AnyObject], Bool, [NSData]) { var items = [AnyObject](count: args.count, repeatedValue: 1) var currentPlaceholder = -1 var hasBinary = false var emitDatas = [NSData]() - + for i in 0.. (NSDictionary, Bool, [NSData]) { var returnDict = NSMutableDictionary() var hasBinary = false var returnDatas = [NSData]() - + for (key, value) in dict { if let binaryData = value as? NSData { currentPlaceholder++ @@ -155,7 +155,7 @@ class SocketParser { returnDict[key as! String] = ["_placeholder": true, "num": currentPlaceholder] } else if let arr = value as? NSArray { let (replace, hadBinary, arrDatas) = self.parseArray(arr, currentPlaceholder: currentPlaceholder) - + if hadBinary { hasBinary = true returnDict[key as! String] = replace @@ -167,7 +167,7 @@ class SocketParser { } else if let dict = value as? NSDictionary { // Recursive let (nestDict, hadBinary, nestDatas) = self.parseNSDictionary(dict, currentPlaceholder: currentPlaceholder) - + if hadBinary { hasBinary = true returnDict[key as! String] = nestDict @@ -180,18 +180,18 @@ class SocketParser { returnDict[key as! String] = value } } - + return (returnDict, hasBinary, returnDatas) } - + // Parses messages recieved class func parseSocketMessage(stringMessage:String, socket:SocketIOClient) { if stringMessage == "" { return } - + // NSLog(stringMessage) - + // Check for successful namepsace connect if socket.nsp != nil { if stringMessage == "0/\(socket.nsp!)" { @@ -199,7 +199,7 @@ class SocketParser { return } } - + if stringMessage == "0" { if socket.nsp != nil { // Join namespace @@ -210,14 +210,14 @@ class SocketParser { return } } - + if stringMessage.hasPrefix("5") { // Check for message with binary placeholders self.parseBinaryMessage(stringMessage, socket: socket) return } - - + + /** Begin check for message **/ @@ -226,16 +226,16 @@ class SocketParser { NSLog("Error in groups") return } - + // let messageGroups = SwiftRegex(target: stringMessage as NSString, // pattern: "(\\d*)\\/?(\\w*)?,?(\\d*)?\\[\"(.*?)\",?(.*?)?\\]$", // options: NSRegularExpressionOptions.DotMatchesLineSeparators).groups() - + if messageGroups![1].hasPrefix("2") { var mesNum = messageGroups![1] var ackNum:String var namespace:String? - + if messageGroups![3] != "" { ackNum = messageGroups![3] } else { @@ -244,16 +244,16 @@ class SocketParser { mesNum.replaceRange(range, with: "") ackNum = mesNum } - + namespace = messageGroups![2] - + if namespace == "" && socket.nsp != nil { return } - + let event = messageGroups![4] let data = "[\(messageGroups![5])]" - + if let parsed:AnyObject = self.parseData(data) { if ackNum == "" { socket.handleEvent(event, data: parsed) @@ -262,53 +262,53 @@ class SocketParser { socket.handleEvent(event, data: parsed, isInternalMessage: false, wantsAck: ackNum.toInt(), withAckType: 3) } - + return } } else if messageGroups![1].hasPrefix("3") { let arr = Array(messageGroups![1]) var ackNum:String let nsp = messageGroups![2] - + if nsp == "" && socket.nsp != nil { return } - + if nsp == "" { ackNum = String(arr[1...arr.count-1]) } else { ackNum = messageGroups![3] } - + let ackData:AnyObject? = self.parseData(messageGroups![4]) socket.handleAck(ackNum.toInt()!, data: ackData) - + return } /** End Check for message **/ } - + // Handles binary data class func parseBinaryData(data:NSData, socket:SocketIOClient) { // NSLog(data.base64EncodedStringWithOptions(NSDataBase64EncodingOptions.allZeros)) let shouldExecute = socket.waitingData[0].addData(data) - + if shouldExecute { let socketEvent = socket.waitingData.removeAtIndex(0) var event = socketEvent.event var parsedArgs:AnyObject? = self.parseData(socketEvent.args as? String) - + if let args:AnyObject = parsedArgs { let filledInArgs:AnyObject = socketEvent.fillInPlaceholders(args) - + if socketEvent.justAck! { // Should handle ack socket.handleAck(socketEvent.ack!, data: filledInArgs) return } - + // Should do event if socketEvent.ack != nil { socket.handleEvent(event, data: filledInArgs, isInternalMessage: false, @@ -318,13 +318,13 @@ class SocketParser { } } else { let filledInArgs:AnyObject = socketEvent.fillInPlaceholders() - + // Should handle ack if socketEvent.justAck! { socket.handleAck(socketEvent.ack!, data: filledInArgs) return } - + // Should handle ack if socketEvent.ack != nil { socket.handleEvent(event, data: filledInArgs, isInternalMessage: false, @@ -335,11 +335,11 @@ class SocketParser { } } } - + // Tries to parse a message that contains binary class func parseBinaryMessage(message:String, socket:SocketIOClient) { // NSLog(message) - + /** Begin check for binary placeholders **/ @@ -347,11 +347,11 @@ class SocketParser { // let binaryGroup = SwiftRegex(target: message, // pattern: "^(\\d*)-\\/?(\\w*)?,?(\\d*)?\\[(\".*?\")?,?(.*)?\\]$", // options: NSRegularExpressionOptions.DotMatchesLineSeparators).groups() - + if binaryGroup == nil { return } - + if binaryGroup![1].hasPrefix("5") { // println(binaryGroup) var ackNum:String @@ -359,9 +359,9 @@ class SocketParser { var mutMessageObject:String var namespace:String? var numberOfPlaceholders:String - + let messageType = binaryGroup![1] - + namespace = binaryGroup![2] if binaryGroup![3] != "" { ackNum = binaryGroup![3] as String @@ -370,18 +370,18 @@ class SocketParser { } else { ackNum = "" } - + numberOfPlaceholders = (messageType["5"] ~= "") as String event = (binaryGroup![4]["\""] ~= "") as String mutMessageObject = binaryGroup![5] - + if namespace == "" && socket.nsp != nil { return } - + let placeholdersRemoved = mutMessageObject["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] ~= "\"~~$2\"" - + var mes:SocketEvent if ackNum == "" { mes = SocketEvent(event: event, args: placeholdersRemoved, @@ -391,14 +391,14 @@ class SocketParser { mes = SocketEvent(event: event, args: placeholdersRemoved, placeholders: numberOfPlaceholders.toInt()!, ackNum: ackNum.toInt()) } - + socket.waitingData.append(mes) } else if binaryGroup![1].hasPrefix("6") { let messageType = binaryGroup![1] let numberOfPlaceholders = (messageType["6"] ~= "") as String var ackNum:String var nsp:String - + if binaryGroup![3] == "" { ackNum = binaryGroup![2] nsp = "" @@ -406,17 +406,17 @@ class SocketParser { ackNum = binaryGroup![3] nsp = binaryGroup![2] } - + if nsp == "" && socket.nsp != nil { return } var mutMessageObject = binaryGroup![5] let placeholdersRemoved = mutMessageObject["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] ~= "\"~~$2\"" - + let event = SocketEvent(event: "", args: placeholdersRemoved, placeholders: numberOfPlaceholders.toInt()!, ackNum: ackNum.toInt(), justAck: true) - + socket.waitingData.append(event) } /** diff --git a/SwiftIO/SwiftRegex.swift b/SwiftIO/SwiftRegex.swift index fddcbf9..231a661 100644 --- a/SwiftIO/SwiftRegex.swift +++ b/SwiftIO/SwiftRegex.swift @@ -18,7 +18,7 @@ var swiftRegexCache = [String: NSRegularExpression]() public class SwiftRegex: NSObject, BooleanType { var target:String var regex: NSRegularExpression - + init(target:String, pattern:String, options:NSRegularExpressionOptions = nil) { self.target = target if let regex = swiftRegexCache[pattern] { @@ -36,16 +36,16 @@ public class SwiftRegex: NSObject, BooleanType { } super.init() } - + class func failure(message: String) { println("SwiftRegex: "+message) //assert(false,"SwiftRegex: failed") } - + final var targetRange: NSRange { - return NSRange(location: 0,length: countElements(target)) + return NSRange(location: 0,length: count(target)) } - + final func substring(range: NSRange) -> String? { if ( range.location != NSNotFound ) { return (target as NSString).substringWithRange(range) @@ -53,23 +53,23 @@ public class SwiftRegex: NSObject, BooleanType { return nil } } - + public func doesMatch(options: NSMatchingOptions = nil) -> Bool { return range(options: options).location != NSNotFound } - + public func range(options: NSMatchingOptions = nil) -> NSRange { return regex.rangeOfFirstMatchInString(target as String, options: nil, range: targetRange) } - + public func match(options: NSMatchingOptions = nil) -> String? { return substring(range(options: options)) } - + public func groups(options: NSMatchingOptions = nil) -> [String]? { return groupsForMatch(regex.firstMatchInString(target as String, options: options, range: targetRange)) } - + func groupsForMatch(match: NSTextCheckingResult!) -> [String]? { if match != nil { var groups = [String]() @@ -85,51 +85,51 @@ public class SwiftRegex: NSObject, BooleanType { return nil } } - + public subscript(groupno: Int) -> String? { get { return groups()?[groupno] } - + set(newValue) { if newValue == nil { return } - + for match in matchResults()!.reverse() { let replacement = regex.replacementStringForResult(match, inString: target as String, offset: 0, template: newValue!) let mut = NSMutableString(string: target) mut.replaceCharactersInRange(match.rangeAtIndex(groupno), withString: replacement) - - target = mut + + target = mut as String } } } - + func matchResults(options: NSMatchingOptions = nil) -> [NSTextCheckingResult]? { let matches = regex.matchesInString(target as String, options: options, range: targetRange) as? [NSTextCheckingResult] - + if matches != nil { return matches! } else { return nil } } - + public func ranges(options: NSMatchingOptions = nil) -> [NSRange] { return matchResults(options: options)!.map { $0.range } } - + public func matches(options: NSMatchingOptions = nil) -> [String] { return matchResults(options: options)!.map( { self.substring($0.range)!}) } - + public func allGroups(options: NSMatchingOptions = nil) -> [[String]?] { return matchResults(options: options)!.map {self.groupsForMatch($0)} } - + public func dictionary(options: NSMatchingOptions = nil) -> Dictionary { var out = Dictionary() for match in matchResults(options: options)! { @@ -137,26 +137,26 @@ public class SwiftRegex: NSObject, BooleanType { } return out } - + func substituteMatches(substitution: (NSTextCheckingResult, UnsafeMutablePointer) -> String, options:NSMatchingOptions = nil) -> String { let out = NSMutableString() var pos = 0 - + regex.enumerateMatchesInString(target as String, options: options, range: targetRange ) { (match: NSTextCheckingResult!, flags: NSMatchingFlags, stop: UnsafeMutablePointer) in - + let matchRange = match.range out.appendString( self.substring(NSRange(location:pos, length:matchRange.location-pos))!) out.appendString( substitution(match, stop) ) pos = matchRange.location + matchRange.length } - + out.appendString(substring( NSRange(location:pos, length:targetRange.length-pos))!) - - return out + + return out as String } - + public var boolValue: Bool { return doesMatch() } @@ -184,11 +184,11 @@ public func ~= (left: SwiftRegex, right: String) -> String { public func ~= (left: SwiftRegex, right: [String]) -> String { var matchNumber = 0 return left.substituteMatches({match, stop -> String in - + if ++matchNumber == right.count { stop.memory = true } - + return left.regex.replacementStringForResult( match, inString: left.target as String, offset: 0, template: right[matchNumber-1] ) }, options: nil)