From bb6bd2b4ca60f12d25e17d860ab4573161aeb375 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 14 Mar 2015 19:09:54 -0400 Subject: [PATCH 1/2] fix race condition in polling --- SwiftIO/SocketEngine.swift | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/SwiftIO/SocketEngine.swift b/SwiftIO/SocketEngine.swift index 326cc2c..d9c7647 100644 --- a/SwiftIO/SocketEngine.swift +++ b/SwiftIO/SocketEngine.swift @@ -235,7 +235,7 @@ public class SocketEngine: NSObject, WebSocketDelegate { let postData = postStr.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)! - + // println("posting: \(postStr)") req.setValue(String(postData.length), forHTTPHeaderField: "Content-Length") req.HTTPBody = postData @@ -406,7 +406,7 @@ public class SocketEngine: NSObject, WebSocketDelegate { } private func parseEngineMessage(var message:String) { - // println(message!) + // println("Engine got message: \(message)") var strMessage = RegexMutable(message) @@ -429,7 +429,10 @@ public class SocketEngine: NSObject, WebSocketDelegate { 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 @@ -448,9 +451,11 @@ public class SocketEngine: NSObject, WebSocketDelegate { // 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() { @@ -512,7 +517,9 @@ public class SocketEngine: NSObject, WebSocketDelegate { } } - self.flushWaitingForPost() + if !self.waitingForPost { + self.flushWaitingForPost() + } } private func sendWebSocketMessage(str:String, withType type:PacketType, datas:[NSData]? = nil) { From c1037340355479c7862fd52fbdb8d270a503aead Mon Sep 17 00:00:00 2001 From: Erik Date: Sun, 15 Mar 2015 23:41:01 -0400 Subject: [PATCH 2/2] work on parsing stuff --- SwiftIO/SocketEngine.swift | 24 ++-- SwiftIO/SocketEvent.swift | 11 +- SwiftIO/SocketIOClient.swift | 17 ++- SwiftIO/SocketParser.swift | 144 ++++++++++------------- SwiftIO/SwiftRegex.swift | 214 ++++++++--------------------------- 5 files changed, 127 insertions(+), 283 deletions(-) diff --git a/SwiftIO/SocketEngine.swift b/SwiftIO/SocketEngine.swift index d9c7647..455a9ee 100644 --- a/SwiftIO/SocketEngine.swift +++ b/SwiftIO/SocketEngine.swift @@ -176,10 +176,10 @@ public class SocketEngine: NSObject, WebSocketDelegate { 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)} } @@ -221,7 +221,6 @@ public class SocketEngine: NSObject, WebSocketDelegate { for packet in self.postWait { let len = countElements(packet) - postStr += "\(len):\(packet)" } @@ -230,14 +229,14 @@ public class SocketEngine: NSObject, WebSocketDelegate { 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)! - // println("posting: \(postStr)") - 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 @@ -299,9 +298,8 @@ public class SocketEngine: NSObject, WebSocketDelegate { 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 @@ -406,17 +404,15 @@ public class SocketEngine: NSObject, WebSocketDelegate { } private func parseEngineMessage(var message:String) { - // println("Engine got message: \(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 diff --git a/SwiftIO/SocketEvent.swift b/SwiftIO/SocketEvent.swift index f7b6080..471e1b9 100644 --- a/SwiftIO/SocketEvent.swift +++ b/SwiftIO/SocketEvent.swift @@ -173,8 +173,7 @@ class SocketEvent { } else if let dict = arr[i] as? NSDictionary { newArr[i] = self.fillInDict(dict) } else if let str = arr[i] as? String { - let mut = RegexMutable(str) - if let num = mut["~~(\\d)"].groups() { + if let num = str["~~(\\d)"].groups() { newArr[i] = self.datas[num[1].toInt()!] } else { newArr[i] = arr[i] @@ -196,9 +195,7 @@ class SocketEvent { // 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() { + if let num = str["~~(\\d)"].groups() { newDict[key as String] = self.datas[num[1].toInt()!] } else { newDict[key as String] = str @@ -231,9 +228,7 @@ class SocketEvent { 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? - - 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 - } - } - } + let event = messageGroups![4] + let data = "[\(messageGroups![5])]" - // 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,41 @@ 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]) + 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] + 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 +392,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 16527ab..fb8d549 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)) + 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..