diff --git a/SwiftIO/SocketEngine.swift b/SwiftIO/SocketEngine.swift index 881127f..d2116f0 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) as? String { - // println(str) + + if let str = NSString(data: data, encoding: NSUTF8StringEncoding) { dispatch_async(self!.parseQueue) {callback(str)} } - + 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("application/html-text", forHTTPHeaderField: "Content-Type") - + req.setValue("text/plain; charset=UTF-8", forHTTPHeaderField: "Content-Type") + let postData = postStr.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)! - - - req.setValue(String(postData.length), forHTTPHeaderField: "Content-Length") + + // 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,31 +298,30 @@ public class SocketEngine: NSObject, WebSocketDelegate { self?.handlePollingFailed(err) return } - - if let dataString = NSString(data: data, encoding: NSUTF8StringEncoding) { - var mutString = RegexMutable(dataString) - let parsed:[String]? = mutString["(\\d*):(\\d)(\\{.*\\})?"].groups() - + + 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 @@ -333,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 { @@ -377,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 @@ -394,50 +393,51 @@ 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) { - // println(message!) - - var strMessage = RegexMutable(message) - + // NSLog("Engine got message: \(message)") + // We should upgrade - if strMessage == "3probe" { + if message == "3probe" { self.upgradeTransport() return } - - let type = strMessage["^(\\d)"].groups()?[1] - + + 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)") - self.client.parseBinaryData(data) + dispatch_async(self.client.handleQueue) {[weak self] in + self?.client.parseBinaryData(data) + return + } } - + return } else if type == PacketType.NOOP.rawValue { self.doPoll() return } - + if message == PacketType.CLOSE.rawValue { // do nothing return @@ -445,27 +445,29 @@ public class SocketEngine: NSObject, WebSocketDelegate { // println("Got something idk what to do with") // println(messageString) } - + // Remove message type 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() { 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) @@ -475,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 { @@ -488,7 +490,7 @@ public class SocketEngine: NSObject, WebSocketDelegate { } } } - + func sendPing() { if self.websocket { self.sendWebSocketMessage("", withType: PacketType.PING) @@ -496,29 +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!) } } - - self.flushWaitingForPost() + + 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) @@ -528,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 @@ -550,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 @@ -571,12 +575,12 @@ 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) } -} \ No newline at end of file +} diff --git a/SwiftIO/SocketEvent.swift b/SwiftIO/SocketEvent.swift index fd8ef32..d5de23b 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,60 +121,59 @@ 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 { - let mut = RegexMutable(str) - - if let num = mut["~~(\\d)"].groups() { - newDict[key as! String] = self.datas[num[1].toInt()!] + if let num = str["~~(\\d)"].groups() { + newDict[key as String] = self.datas[num[1].toInt()!] } else { newDict[key as! String] = str } @@ -209,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) @@ -228,12 +225,10 @@ 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..(start: mesNum.startIndex, end: advance(mesNum.startIndex, 1)) @@ -229,72 +245,30 @@ class SocketParser { ackNum = mesNum } - namespace = messageGroups[2] - messagePart = messageGroups[4] + namespace = messageGroups![2] if namespace == "" && socket.nsp != nil { return } - let messageInternals = RegexMutable(messagePart)["\\[\"(.*?)\",(.*?)?\\]$"].groups() - if messageInternals != nil && messageInternals.count > 2 { - let event = messageInternals[1] - var data:String? + let event = messageGroups![4] + let data = "[\(messageGroups![5])]" - if messageInternals[2] == "" { - data = nil - } else { - data = messageInternals[2] - } - - // It would be nice if socket.io only allowed one thing - // per message, but alas, it doesn't. - if let parsed:AnyObject = self.parseData(data) { - if ackNum == "" { - socket.handleEvent(event, data: parsed) - } else { - socket.currentAck = ackNum.toInt()! - socket.handleEvent(event, data: parsed, isInternalMessage: false, - wantsAck: ackNum.toInt(), withAckType: 3) - } - - return - } else if let strData = data { - // There are multiple items in the message - // Turn it into a String and run it through - // parseData to try and get an array. - let asArray = "[\(strData)]" - if let parsed:AnyObject = self.parseData(asArray) { - if ackNum == "" { - socket.handleEvent(event, data: parsed) - } else { - socket.currentAck = ackNum.toInt()! - socket.handleEvent(event, data: parsed, isInternalMessage: false, - wantsAck: ackNum.toInt(), withAckType: 3) - } - - return - } - } - } - - // Check for no item event - let noItemMessage = RegexMutable(messagePart)["\\[\"(.*?)\"]$"].groups() - if noItemMessage != nil && noItemMessage.count == 2 { - let event = noItemMessage[1] + if let parsed:AnyObject = self.parseData(data) { if ackNum == "" { - socket.handleEvent(event, data: nil) + socket.handleEvent(event, data: parsed) } else { socket.currentAck = ackNum.toInt()! - socket.handleEvent(event, data: nil, isInternalMessage: false, + socket.handleEvent(event, data: parsed, isInternalMessage: false, wantsAck: ackNum.toInt(), withAckType: 3) } + return } - } else if messageGroups[1].hasPrefix("3") { - let arr = Array(messageGroups[1]) + } else if messageGroups![1].hasPrefix("3") { + let arr = Array(messageGroups![1]) var ackNum:String - let nsp = messageGroups[2] + let nsp = messageGroups![2] if nsp == "" && socket.nsp != nil { return @@ -303,10 +277,10 @@ class SocketParser { if nsp == "" { ackNum = String(arr[1...arr.count-1]) } 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) return @@ -314,13 +288,11 @@ class SocketParser { /** End Check for message **/ - - // Check for message with binary placeholders - self.parseBinaryMessage(stringMessage, socket: socket) } // Handles binary data class func parseBinaryData(data:NSData, socket:SocketIOClient) { + // NSLog(data.base64EncodedStringWithOptions(NSDataBase64EncodingOptions.allZeros)) let shouldExecute = socket.waitingData[0].addData(data) if shouldExecute { @@ -366,39 +338,42 @@ class SocketParser { // Tries to parse a message that contains binary class func parseBinaryMessage(message:String, socket:SocketIOClient) { - // println(message) - var mutMessage = RegexMutable(message) + // NSLog(message) /** Begin check for binary placeholders **/ - let binaryGroup = mutMessage["^(\\d*)-\\/?(\\w*)?,?(\\d*)?\\[(\".*?\")?,?(.*)?\\]$"].groups() + let binaryGroup = message["^(\\d*)-\\/?(\\w*)?,?(\\d*)?\\[(\".*?\")?,?(.*)?\\]$"].groups() + // let binaryGroup = SwiftRegex(target: message, + // pattern: "^(\\d*)-\\/?(\\w*)?,?(\\d*)?\\[(\".*?\")?,?(.*)?\\]$", + // options: NSRegularExpressionOptions.DotMatchesLineSeparators).groups() if binaryGroup == nil { return } - if binaryGroup[1].hasPrefix("5") { + if binaryGroup![1].hasPrefix("5") { // println(binaryGroup) var ackNum:String var event:String - var mutMessageObject:NSMutableString + var mutMessageObject:String var namespace:String? var numberOfPlaceholders:String - let messageType = RegexMutable(binaryGroup[1]) - namespace = binaryGroup[2] - if binaryGroup[3] != "" { - ackNum = binaryGroup[3] as String - } else if socket.nsp == nil && binaryGroup[2] != "" { - ackNum = binaryGroup[2] + let messageType = binaryGroup![1] + + namespace = binaryGroup![2] + if binaryGroup![3] != "" { + ackNum = binaryGroup![3] as String + } else if socket.nsp == nil && binaryGroup![2] != "" { + ackNum = binaryGroup![2] } else { ackNum = "" } numberOfPlaceholders = (messageType["5"] ~= "") as String - event = (RegexMutable(binaryGroup[4])["\""] ~= "") as String - mutMessageObject = RegexMutable(binaryGroup[5]) + event = (binaryGroup![4]["\""] ~= "") as String + mutMessageObject = binaryGroup![5] if namespace == "" && socket.nsp != nil { return @@ -418,24 +393,24 @@ class SocketParser { } socket.waitingData.append(mes) - } else if binaryGroup[1].hasPrefix("6") { - let messageType = RegexMutable(binaryGroup[1]) + } 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] + if binaryGroup![3] == "" { + ackNum = binaryGroup![2] nsp = "" } else { - ackNum = binaryGroup[3] - nsp = binaryGroup[2] + ackNum = binaryGroup![3] + nsp = binaryGroup![2] } if nsp == "" && socket.nsp != nil { return } - var mutMessageObject = RegexMutable(binaryGroup[5]) + var mutMessageObject = binaryGroup![5] let placeholdersRemoved = mutMessageObject["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] ~= "\"~~$2\"" diff --git a/SwiftIO/SwiftRegex.swift b/SwiftIO/SwiftRegex.swift index 9e459f9..fddcbf9 100644 --- a/SwiftIO/SwiftRegex.swift +++ b/SwiftIO/SwiftRegex.swift @@ -16,11 +16,10 @@ import Foundation var swiftRegexCache = [String: NSRegularExpression]() public class SwiftRegex: NSObject, BooleanType { - - var target: NSString + var target:String var regex: NSRegularExpression - init(target:NSString, pattern:String, options:NSRegularExpressionOptions = nil) { + init(target:String, pattern:String, options:NSRegularExpressionOptions = nil) { self.target = target if let regex = swiftRegexCache[pattern] { self.regex = regex @@ -44,12 +43,12 @@ public class SwiftRegex: NSObject, BooleanType { } final var targetRange: NSRange { - return NSRange(location: 0,length: target.length) + return NSRange(location: 0,length: countElements(target)) } - final func substring(range: NSRange) -> NSString! { + final func substring(range: NSRange) -> String? { if ( range.location != NSNotFound ) { - return target.substringWithRange(range) + return (target as NSString).substringWithRange(range) } else { return nil } @@ -63,19 +62,19 @@ public class SwiftRegex: NSObject, BooleanType { return regex.rangeOfFirstMatchInString(target as String, options: nil, range: targetRange) } - public func match(options: NSMatchingOptions = nil) -> String! { - return substring(range(options: options)) as String + 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) ) + public func groups(options: NSMatchingOptions = nil) -> [String]? { + return groupsForMatch(regex.firstMatchInString(target as String, options: options, range: targetRange)) } - func groupsForMatch(match: NSTextCheckingResult!) -> [String]! { + func groupsForMatch(match: NSTextCheckingResult!) -> [String]? { if match != nil { var groups = [String]() for groupno in 0...regex.numberOfCaptureGroups { - if let group = substring(match.rangeAtIndex(groupno)) as String! { + if let group = substring(match.rangeAtIndex(groupno)) { groups += [group] } else { groups += ["_"] // avoids bridging problems @@ -87,19 +86,23 @@ public class SwiftRegex: NSObject, BooleanType { } } - public subscript(groupno: Int) -> String! { + public subscript(groupno: Int) -> String? { get { - return groups()[groupno] + return groups()?[groupno] } + set(newValue) { - if let mutableTarget = target as? NSMutableString { - for match in matchResults()!.reverse() { - let replacement = regex.replacementStringForResult( match, - inString: target as String, offset: 0, template: newValue ) - mutableTarget.replaceCharactersInRange(match.rangeAtIndex(groupno), withString: replacement) - } - } else { - SwiftRegex.failure("Group modify on non-mutable") + 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 } } } @@ -120,24 +123,23 @@ public class SwiftRegex: NSObject, BooleanType { } public func matches(options: NSMatchingOptions = nil) -> [String] { - return matchResults(options: options)!.map( { self.substring($0.range) as 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 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)! { - out[substring(match.rangeAtIndex(1)) as String] = - substring(match.rangeAtIndex(2)) as String + out[substring(match.rangeAtIndex(1))!] = substring(match.rangeAtIndex(2))! } return out } func substituteMatches(substitution: (NSTextCheckingResult, UnsafeMutablePointer) -> String, - options:NSMatchingOptions = nil) -> NSMutableString { + options:NSMatchingOptions = nil) -> String { let out = NSMutableString() var pos = 0 @@ -145,63 +147,21 @@ public class SwiftRegex: NSObject, BooleanType { (match: NSTextCheckingResult!, flags: NSMatchingFlags, stop: UnsafeMutablePointer) in let matchRange = match.range - out.appendString( self.substring( NSRange(location:pos, length:matchRange.location-pos) ) as String ) + 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) ) as String ) + out.appendString(substring( NSRange(location:pos, length:targetRange.length-pos))!) - if let mutableTarget = target as? NSMutableString { - mutableTarget.setString(out as String) - return mutableTarget - } else { - SwiftRegex.failure("Modify on non-mutable") - return out - } - } - /* removed Beta6 - public func __conversion() -> Bool { - return doesMatch() + return out } - public func __conversion() -> NSRange { - return range() - } - - public func __conversion() -> String { - return match() - } - - public func __conversion() -> [String] { - return matches() - } - - public func __conversion() -> [[String]] { - return allGroups() - } - - public func __conversion() -> [String:String] { - return dictionary() - } - */ public var boolValue: Bool { return doesMatch() } } -extension NSString { - public subscript(pattern: String, options: NSRegularExpressionOptions) -> SwiftRegex { - return SwiftRegex(target: self, pattern: pattern, options: options) - } -} - -extension NSString { - public subscript(pattern: String) -> SwiftRegex { - return SwiftRegex(target: self, pattern: pattern) - } -} - extension String { public subscript(pattern: String, options: NSRegularExpressionOptions) -> SwiftRegex { return SwiftRegex(target: self, pattern: pattern, options: options) @@ -214,18 +174,14 @@ extension String { } } -public func RegexMutable(string: NSString) -> NSMutableString { - return NSMutableString(string:string as String) -} - -public func ~= (left: SwiftRegex, right: String) -> NSMutableString { +public func ~= (left: SwiftRegex, right: String) -> String { return left.substituteMatches({match, stop in return left.regex.replacementStringForResult( match, inString: left.target as String, offset: 0, template: right ) - }, options: nil) + }, options: nil) } -public func ~= (left: SwiftRegex, right: [String]) -> NSMutableString { +public func ~= (left: SwiftRegex, right: [String]) -> String { var matchNumber = 0 return left.substituteMatches({match, stop -> String in @@ -235,95 +191,19 @@ public func ~= (left: SwiftRegex, right: [String]) -> NSMutableString { return left.regex.replacementStringForResult( match, inString: left.target as String, offset: 0, template: right[matchNumber-1] ) - }, options: nil) -} - -public func ~= (left: SwiftRegex, right: (String) -> String) -> NSMutableString { - // return right(left.substring(match.range)) - return left.substituteMatches( - {match, stop -> String in - right(left.substring(match.range) as String) }, options: nil) } -public func ~= (left: SwiftRegex, right: ([String]) -> String) -> NSMutableString { +public func ~= (left: SwiftRegex, right: (String) -> String) -> String { + // return right(left.substring(match.range)) + return left.substituteMatches( + {match, stop -> String in + right(left.substring(match.range)!) + }, options: nil) +} + +public func ~= (left: SwiftRegex, right: ([String]?) -> String) -> String { return left.substituteMatches({match, stop -> String in return right(left.groupsForMatch(match)) - }, options: nil) -} - -// my take on custom threading operators from -// http://ijoshsmith.com/2014/07/05/custom-threading-operator-in-swift/ - -private let _queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0) - -public func | (left: () -> Void, right: () -> Void) { - dispatch_async(_queue) { - left() - dispatch_async(dispatch_get_main_queue(), right) - } -} - -public func | (left: () -> R, right: (result:R) -> Void) { - dispatch_async(_queue) { - let result = left() - dispatch_async(dispatch_get_main_queue(), { - right(result:result) - }) - } -} - -// dispatch groups { block } & { block } | { completion } -public func & (left: () -> Void, right: () -> Void) -> [() -> Void] { - return [left, right]; -} - -public func & (left: [() -> Void], right: () -> Void) -> [() -> Void] { - var out = left - out.append( right ) - return out -} - -public func | (left: [() -> Void], right: () -> Void) { - let group = dispatch_group_create() - - for block in left { - dispatch_group_async(group, _queue, block) - } - - dispatch_group_notify(group, dispatch_get_main_queue(), right) -} - -// parallel blocks with returns -public func & (left: () -> R, right: () -> R) -> [() -> R] { - return [left, right] -} - -public func & (left: [() -> R], right: () -> R) -> [() -> R] { - var out = left - out.append( right ) - return out -} - -public func | (left: [() -> R], right: (results:[R!]) -> Void) { - let group = dispatch_group_create() - - var results = Array() - for t in 0..