merge master

LICENSE

@@ -0,0 +1,230 @@
+The MIT License (MIT)
+
+Copyright (c) 2014-2015 Erik Little
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+
+This library makes use of the following third party libraries:
+
+Starscream
+----------
+
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -3,12 +3,39 @@ Socket.IO-Client-Swift
 
 Socket.IO-client for Swift. Supports ws/wss/polling connections and binary. For socket.io 1.0+ and Swift 1.2.
 
-For Swift 1.1 use the master branch.
+For Swift 1.1 use the master.
 
 Installation
 ============
+
+Manually (iOS 7+)
+-----------------
 1. Copy the SwiftIO folder into your Xcode project!
 
+CocoaPods 0.36.0 or later (iOS 8+)
+------------------
+Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`:
+
+```ruby
+source 'https://github.com/CocoaPods/Specs.git'
+platform :ios, '8.0'
+use_frameworks!
+
+pod 'Socket.IO-Client-Swift', '~> 1.1'
+```
+
+Install pods:
+
+```
+$ pod install
+```
+
+Import in your swift file:
+
+```swift
+import Socket_IO_Client_Swift
+```
+
 API
 ===
 Constructor
@@ -71,6 +98,11 @@ socket.on("ackEvent") {data, ack in
         println("Got ackEvent")
     }
 
+    // data is an array
+    if let int = data?[1] as? Int {
+        println("Got int")
+    }
+
     socket.emitWithAck("ackTest", "test").onAck {data in
         println(data?[0])
     }
@@ -84,25 +116,6 @@ socket.on("jsonTest") {data, ack in
     }
 }
 
-// Event items are passed by an array
-socket.on("multipleItems") {data, ack in
-    if data == nil {
-        return
-    }
-
-    if let str = data![0] as? String {
-        println(str)
-    }
-
-    if let arr = data![1] as? [Int] {
-        println(arr)
-    }
-
-    if let obj = data![4] as? NSDictionary {
-        println(obj["test"])
-    }
-}
-
 // Connecting
 socket.connect()
 ```

Socket.IO-Client-Swift.podspec

@@ -0,0 +1,19 @@
+Pod::Spec.new do |s|
+  s.name         = "Socket.IO-Client-Swift"
+  s.version      = "1.1.3"
+  s.summary      = "Socket.IO-client for Swift"
+  s.description  = <<-DESC
+                   Socket.IO-client for Swift.
+                   Supports ws/wss/polling connections and binary.
+                   For socket.io 1.0+ and Swift 1.1.
+                   DESC
+  s.homepage     = "https://github.com/socketio/socket.io-client-swift"
+  s.license      = { :type => 'MIT' }
+  s.author       = { "Erik" => "nuclear.ace@gmail.com" }
+  s.ios.deployment_target = '8.0'
+  s.osx.deployment_target = '10.10'
+  s.source       = { :git => "https://github.com/socketio/socket.io-client-swift.git", :tag => 'v1.1.3' }
+  s.source_files  = "SwiftIO/**/*.swift"
+  s.requires_arc = true
+  # s.dependency 'Starscream', '~> 0.9' # currently this repo includes Starscream swift files
+end

SwiftIO/SocketEngine.swift

@@ -24,10 +24,6 @@
 
 import Foundation
 
-// This is used because in Swift 1.1, turning on -O causes a
-// memory access violation in SocketEngine#parseEngineMessage
-private var fixSwift:AnyObject?
-
 extension String {
     private var length:Int {
         return count(self)
@@ -55,18 +51,22 @@ class SocketEngine: NSObject, WebSocketDelegate {
         "parseQueue".cStringUsingEncoding(NSUTF8StringEncoding), DISPATCH_QUEUE_SERIAL)
     private let handleQueue = dispatch_queue_create(
         "handleQueue".cStringUsingEncoding(NSUTF8StringEncoding), DISPATCH_QUEUE_SERIAL)
+    private let session:NSURLSession!
+    private var _connected = false
+    private var fastUpgrade = false
     private var forcePolling = false
     private var pingTimer:NSTimer?
     private var postWait = [String]()
     private var _polling = true
     private var probing = false
     private var probeWait = PollWaitQueue()
-    private let session:NSURLSession!
     private var waitingForPoll = false
     private var waitingForPost = false
     private var _websocket = false
     private var websocketConnected = false
-    var connected = false
+    var connected:Bool {
+        return self._connected
+    }
     var pingInterval:Int?
     var polling:Bool {
         return self._polling
@@ -142,14 +142,29 @@ class SocketEngine: NSObject, WebSocketDelegate {
         return (urlPolling, urlWebSocket)
     }
 
+    private func doFastUpgrade() {
+        self.sendWebSocketMessage("", withType: PacketType.UPGRADE)
+        self._websocket = true
+        self._polling = false
+        self.fastUpgrade = false
+        self.flushProbeWait()
+    }
+
     private func doPoll() {
-        if self.urlPolling == nil || self.websocket || self.waitingForPoll || !self.connected {
+        if self.websocket || self.waitingForPoll || !self.connected {
             return
         }
 
-        let req = NSMutableURLRequest(URL: NSURL(string: self.urlPolling! + "&sid=\(self.sid)")!)
-        req.timeoutInterval = 0.0
         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 {
@@ -158,6 +173,7 @@ class SocketEngine: NSObject, WebSocketDelegate {
                 if self!.polling {
                     self?.handlePollingFailed(err)
                 }
+
                 return
             }
 
@@ -166,18 +182,17 @@ class SocketEngine: NSObject, WebSocketDelegate {
             if let str = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
                 // println(str)
 
-                dispatch_async(self!.parseQueue) {[weak self] in
+                dispatch_async(self!.parseQueue) {callback(str)}
-                    if self == nil {
-                        return
-                    }
-                    
-                    self?.parsePollingMessage(str)
-                    return
-                }
             }
 
             self?.waitingForPoll = false
-            self?.doPoll()
+
+            if self!.fastUpgrade {
+                self?.doFastUpgrade()
+                return
+            } else {
+                self?.doPoll()
+            }
             }.resume()
     }
 
@@ -255,10 +270,11 @@ class SocketEngine: NSObject, WebSocketDelegate {
     }
 
     // A poll failed, tell the client about it
-    // We check to see if we were closed by the server first
     private func handlePollingFailed(reason:NSError?) {
+        assert(self.polling, "Polling failed when we're not polling")
+
         if !self.client.reconnecting {
-            self.connected = false
+            self._connected = false
             self.ws?.disconnect()
             self.pingTimer?.invalidate()
             self.waitingForPoll = false
@@ -268,7 +284,7 @@ class SocketEngine: NSObject, WebSocketDelegate {
     }
 
     func open(opts:[String: AnyObject]? = nil) {
-        if self.waitingForPost || self.waitingForPoll || self.websocket || self.connected {
+        if self.connected {
             assert(false, "We're in a bad state, this shouldn't happen.")
         }
 
@@ -304,13 +320,12 @@ class SocketEngine: NSObject, WebSocketDelegate {
                     return
                 }
 
-                self?.connected = true
-                
                 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)")!)
@@ -363,7 +378,7 @@ class SocketEngine: NSObject, WebSocketDelegate {
                 length += chr
             } else {
                 if length == "" || testLength(length, &n) {
-                    self.handlePollingFailed(nil)
+                    println("failure in parsePollingMessage")
                     return
                 }
 
@@ -379,10 +394,8 @@ class SocketEngine: NSObject, WebSocketDelegate {
                 if msg.length != 0 {
                     // Be sure to capture the value of the msg
                     dispatch_async(self.handleQueue) {[weak self, msg] in
-                        fixSwift = msg
+                        self?.parseEngineMessage(msg)
-                        if fixSwift is String {
+                        return
-                            self?.parseEngineMessage(fixSwift as! String)
-                        }
                     }
                 }
 
@@ -462,7 +475,7 @@ class SocketEngine: NSObject, WebSocketDelegate {
                     self?.sendWebSocketMessage(msg, withType: PacketType.MESSAGE, datas: datas)
                 } else {
                     // println("sending poll: \(msg):\(datas)")
-                    self?.sendPollMessage(msg, withType: PacketType.MESSAGE, datas: datas)
+                    self?.sendPollMessage(msg, withType: PacketType.MESSAGE, datas: datas, doPoll: true)
                 }
             }
         }
@@ -484,34 +497,34 @@ class SocketEngine: NSObject, WebSocketDelegate {
         if self.websocket {
             self.sendWebSocketMessage("", withType: PacketType.PING)
         } else {
-            self.sendPollMessage("", withType: PacketType.PING)
+            self.sendPollMessage("", withType: PacketType.PING, doPoll: false)
         }
     }
 
-    private func sendPollMessage(msg:String, withType type:PacketType, datas:[NSData]? = nil) {
+    private func sendPollMessage(msg:String, withType type:PacketType,
-        // println("Sending: poll: \(msg) as type: \(type.rawValue)")
+        datas:[NSData]? = nil, doPoll poll:Bool) {
-        let strMsg = "\(type.rawValue)\(msg)"
+            // println("Sending poll: \(msg) as type: \(type.rawValue)")
+            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 waitingForPost {
+            if !self.waitingForPoll && self.waitingForPost && poll {
-            self.doPoll()
+                self.doPoll()
-            return
+            } else {
-        } else {
+                self.flushWaitingForPost()
-            self.flushWaitingForPost()
+            }
-        }
     }
 
     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)")
 
         if datas != nil {
@@ -539,12 +552,10 @@ class SocketEngine: NSObject, WebSocketDelegate {
 
     private func upgradeTransport() {
         if self.websocketConnected {
+            // Do a fast upgrade
+            self.fastUpgrade = true
             self.probing = false
-            self._websocket = true
+            self.sendPollMessage("", withType: PacketType.NOOP, doPoll: false)
-            self.waitingForPoll = false
-            self._polling = false
-            self.sendWebSocketMessage("", withType: PacketType.UPGRADE)
-            self.flushProbeWait()
         }
     }
 
@@ -560,7 +571,7 @@ class SocketEngine: NSObject, WebSocketDelegate {
 
         if self.websocket {
             self.pingTimer?.invalidate()
-            self.connected = false
+            self._connected = false
             self._websocket = false
             self._polling = true
             self.client.webSocketDidCloseWithCode(1, reason: "Socket Disconnect", wasClean: true)

SwiftIO/SocketIOClient.swift

@@ -141,6 +141,7 @@ public class SocketIOClient: NSObject {
         self.currentReconnectAttempt = 0
         self.reconnectTimer?.invalidate()
         self.reconnectTimer = nil
+        self.sid = self.engine?.sid
 
         self.handleEvent("connect", data: nil, isInternalMessage: false)
     }
@@ -643,90 +644,88 @@ public class SocketIOClient: NSObject {
     }
 
     // Tries to parse a message that contains binary
-    private func parseBinaryMessage(#message:AnyObject) {
+    private func parseBinaryMessage(#message:String) {
         // println(message)
-        if let stringMessage = message as? String {
+        var mutMessage = RegexMutable(message)
-            var mutMessage = RegexMutable(stringMessage)
 
-            /**
+        /**
-            Begin check for binary placeholders
+        Begin check for binary placeholders
-            **/
+        **/
-            let binaryGroup = mutMessage["^(\\d*)-\\/?(\\w*)?,?(\\d*)?\\[(\".*?\")?,?(.*)?\\]$"].groups()
+        let binaryGroup = mutMessage["^(\\d*)-\\/?(\\w*)?,?(\\d*)?\\[(\".*?\")?,?(.*)?\\]$"].groups()
 
-            if binaryGroup == nil {
+        if binaryGroup == nil {
+            return
+        }
+
+        if binaryGroup[1].hasPrefix("5") {
+            // println(binaryGroup)
+            var ackNum:String
+            var event:String
+            var mutMessageObject:NSMutableString
+            var namespace:String?
+            var numberOfPlaceholders:String
+            let messageType = RegexMutable(binaryGroup[1])
+
+            namespace = binaryGroup[2]
+            if binaryGroup[3] != "" {
+                ackNum = binaryGroup[3] as String
+            } else if self.nsp == nil && binaryGroup[2] != "" {
+                ackNum = binaryGroup[2]
+            } else {
+                ackNum = ""
+            }
+
+            numberOfPlaceholders = (messageType["5"] ~= "") as String
+            event = (RegexMutable(binaryGroup[4])["\""] ~= "") as String
+            mutMessageObject = RegexMutable(binaryGroup[5])
+
+            if namespace == "" && self.nsp != nil {
                 return
             }
 
-            if binaryGroup[1].hasPrefix("5") {
+            let placeholdersRemoved = mutMessageObject["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"]
-                // println(binaryGroup)
+                ~= "\"~~$2\""
-                var ackNum:String
-                var event:String
-                var mutMessageObject:NSMutableString
-                var namespace:String?
-                var numberOfPlaceholders:String
-                let messageType = RegexMutable(binaryGroup[1])
 
-                namespace = binaryGroup[2]
+            var mes:SocketEvent
-                if binaryGroup[3] != "" {
+            if ackNum == "" {
-                    ackNum = binaryGroup[3] as String
+                mes = SocketEvent(event: event, args: placeholdersRemoved,
-                } else if self.nsp == nil && binaryGroup[2] != "" {
+                    placeholders: numberOfPlaceholders.toInt()!)
-                    ackNum = binaryGroup[2]
+            } else {
-                } else {
+                self.currentAck = ackNum.toInt()!
-                    ackNum = ""
+                mes = SocketEvent(event: event, args: placeholdersRemoved,
-                }
+                    placeholders: numberOfPlaceholders.toInt()!, ackNum: ackNum.toInt())
-                
-                numberOfPlaceholders = (messageType["5"] ~= "") as String
-                event = (RegexMutable(binaryGroup[4])["\""] ~= "") as String
-                mutMessageObject = RegexMutable(binaryGroup[5])
-                
-                if namespace == "" && self.nsp != nil {
-                    return
-                }
-                
-                let placeholdersRemoved = mutMessageObject["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"]
-                    ~= "\"~~$2\""
-                
-                var mes:SocketEvent
-                if ackNum == "" {
-                    mes = SocketEvent(event: event, args: placeholdersRemoved,
-                        placeholders: numberOfPlaceholders.toInt()!)
-                } else {
-                    self.currentAck = ackNum.toInt()!
-                    mes = SocketEvent(event: event, args: placeholdersRemoved,
-                        placeholders: numberOfPlaceholders.toInt()!, ackNum: ackNum.toInt())
-                }
-                
-                self.waitingData.append(mes)
-            } else if binaryGroup[1].hasPrefix("6") {
-                let messageType = RegexMutable(binaryGroup[1])
-                let numberOfPlaceholders = (messageType["6"] ~= "") as String
-                var ackNum:String
-                var nsp:String
-                
-                if binaryGroup[3] == "" {
-                    ackNum = binaryGroup[2]
-                    nsp = ""
-                } else {
-                    ackNum = binaryGroup[3]
-                    nsp = binaryGroup[2]
-                }
-                
-                if nsp == "" && self.nsp != nil {
-                    return
-                }
-                var mutMessageObject = RegexMutable(binaryGroup[5])
-                let placeholdersRemoved = mutMessageObject["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"]
-                    ~= "\"~~$2\""
-                
-                let event = SocketEvent(event: "", args: placeholdersRemoved,
-                    placeholders: numberOfPlaceholders.toInt()!, ackNum: ackNum.toInt(), justAck: true)
-                
-                self.waitingData.append(event)
             }
-            /**
+
-            End check for binary placeholders
+            self.waitingData.append(mes)
-            **/
+        } else if binaryGroup[1].hasPrefix("6") {
+            let messageType = RegexMutable(binaryGroup[1])
+            let numberOfPlaceholders = (messageType["6"] ~= "") as String
+            var ackNum:String
+            var nsp:String
+
+            if binaryGroup[3] == "" {
+                ackNum = binaryGroup[2]
+                nsp = ""
+            } else {
+                ackNum = binaryGroup[3]
+                nsp = binaryGroup[2]
+            }
+
+            if nsp == "" && self.nsp != nil {
+                return
+            }
+            var mutMessageObject = RegexMutable(binaryGroup[5])
+            let placeholdersRemoved = mutMessageObject["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"]
+                ~= "\"~~$2\""
+
+            let event = SocketEvent(event: "", args: placeholdersRemoved,
+                placeholders: numberOfPlaceholders.toInt()!, ackNum: ackNum.toInt(), justAck: true)
+
+            self.waitingData.append(event)
         }
+        /**
+        End check for binary placeholders
+        **/
     }
 
     // Handles binary data