work on parsing stuff

Author: nuclearace

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

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..<parsedArr.count {
                     if let str = parsedArr[i] as? String {
-                        let mut = RegexMutable(str)
-                        
-                        if let num = mut["~~(\\d)"].groups() {
+                        if let num = str["~~(\\d)"].groups() {
                             returnArr[i] = self.datas[num[1].toInt()!]
                         } else {
                             returnArr[i] = str

SwiftIO/SocketIOClient.swift

@@ -25,7 +25,7 @@
 import Foundation
 
 public class SocketIOClient: NSObject {
-    let socketURL:NSMutableString!
+    let socketURL:String!
     let ackQueue = dispatch_queue_create("ackQueue".cStringUsingEncoding(NSUTF8StringEncoding),
         DISPATCH_QUEUE_SERIAL)
     let handleQueue = dispatch_queue_create("handleQueue".cStringUsingEncoding(NSUTF8StringEncoding),
@@ -50,7 +50,7 @@ public class SocketIOClient: NSObject {
 
     internal var currentAck = -1
     internal var waitingData = [SocketEvent]()
-
+    
     public var closed:Bool {
         return self._closed
     }
@@ -74,17 +74,15 @@ public class SocketIOClient: NSObject {
         return self._sid
     }
 
-    public init(socketURL:String, opts:[String: AnyObject]? = nil) {
-        var mutURL = RegexMutable(socketURL)
-        
-        if mutURL["https://"].matches().count != 0 {
+    public init(var socketURL:String, opts:[String: AnyObject]? = nil) {
+        if socketURL["https://"].matches().count != 0 {
             self._secure = true
         }
 
-        mutURL = mutURL["http://"] ~= ""
-        mutURL = mutURL["https://"] ~= ""
+        socketURL = socketURL["http://"] ~= ""
+        socketURL = socketURL["https://"] ~= ""
 
-        self.socketURL = mutURL
+        self.socketURL = socketURL
 
         // Set options
         if opts != nil {
@@ -396,6 +394,7 @@ public class SocketIOClient: NSObject {
 
         if self.reconnectTimer == nil {
             self._reconnecting = true
+            
             dispatch_async(dispatch_get_main_queue()) {[weak self] in
                 if self == nil {
                     return