From c795f9fb259b67e41d1077abed18b402cae5f968 Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Wed, 17 Feb 2016 14:09:05 -0500
Subject: [PATCH] refactor socketpacket

---
 Source/SocketIOClient.swift       | 10 ++---
 Source/SocketIOClientOption.swift |  2 +-
 Source/SocketPacket.swift         | 64 +++++++++++++------------------
 3 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift
index 25a8719..c7f7f0a 100644
--- a/Source/SocketIOClient.swift
+++ b/Source/SocketIOClient.swift
@@ -252,9 +252,9 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable
             handleEvent("error", data: ["Tried emitting \(event) when not connected"], isInternalMessage: true)
             return
         }
-
-        dispatch_async(emitQueue) {
-            self._emit([event] + items)
+        
+        dispatch_async(emitQueue) {[emitData = [event] + items] in
+            self._emit(emitData)
         }
     }
 
@@ -278,10 +278,10 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable
             handleEvent("error", data: ["Tried emitting when not connected"], isInternalMessage: true)
             return
         }
-
+        
         let packet = SocketPacket.packetFromEmit(data, id: ack ?? -1, nsp: nsp, ack: false)
         let str = packet.packetString
-
+        
         DefaultSocketLogger.Logger.log("Emitting: %@", type: logType, args: str)
 
         engine?.send(str, withData: packet.binary)
diff --git a/Source/SocketIOClientOption.swift b/Source/SocketIOClientOption.swift
index 89a83bd..72a444f 100644
--- a/Source/SocketIOClientOption.swift
+++ b/Source/SocketIOClientOption.swift
@@ -161,7 +161,7 @@ extension Set where Element: ClientOption {
 }
 
 extension NSDictionary {
-    static func keyValueToSocketIOClientOption(key: String, value: AnyObject) -> SocketIOClientOption? {
+    private static func keyValueToSocketIOClientOption(key: String, value: AnyObject) -> SocketIOClientOption? {
         switch (key, value) {
         case let ("connectParams", params as [String: AnyObject]):
             return .ConnectParams(params)
diff --git a/Source/SocketPacket.swift b/Source/SocketPacket.swift
index 43e0f3d..a2a56aa 100644
--- a/Source/SocketPacket.swift
+++ b/Source/SocketPacket.swift
@@ -87,38 +87,28 @@ struct SocketPacket {
     }
     
     private func completeMessage(message: String, ack: Bool) -> String {
-        var restOfMessage = ""
+        let restOfMessage: String
         
         if data.count == 0 {
-            return message + "]"
+            return message + "[]"
         }
         
-        for arg in data {
-            if arg is NSDictionary || arg is [AnyObject] {
-                do {
-                    let jsonSend = try NSJSONSerialization.dataWithJSONObject(arg,
-                        options: NSJSONWritingOptions(rawValue: 0))
-                    let jsonString = String(data: jsonSend, encoding: NSUTF8StringEncoding)
-                    
-                    restOfMessage += jsonString! + ","
-                } catch {
-                    DefaultSocketLogger.Logger.error("Error creating JSON object in SocketPacket.completeMessage",
-                        type: SocketPacket.logType)
-                }
-            } else if let str = arg as? String {
-                restOfMessage += "\"" + (((str["\n"] <~ "\\\\n")["\r"] <~ "\\\\r")["\""] <~ "\\\\\"") + "\","
-            } else if arg is NSNull {
-                restOfMessage += "null,"
-            } else {
-                restOfMessage += "\(arg),"
+        do {
+            let jsonSend = try NSJSONSerialization.dataWithJSONObject(data,
+                options: NSJSONWritingOptions(rawValue: 0))
+            guard let jsonString = String(data: jsonSend, encoding: NSUTF8StringEncoding) else {
+                return "[]"
             }
+            
+            restOfMessage = jsonString
+        } catch {
+            DefaultSocketLogger.Logger.error("Error creating JSON object in SocketPacket.completeMessage",
+                type: SocketPacket.logType)
+            
+            restOfMessage = "[]"
         }
         
-        if restOfMessage != "" {
-            restOfMessage.removeAtIndex(restOfMessage.endIndex.predecessor())
-        }
-        
-        return message + restOfMessage + "]"
+        return message + restOfMessage
     }
     
     private func createAck() -> String {
@@ -126,15 +116,15 @@ struct SocketPacket {
         
         if type == .Ack {
             if nsp == "/" {
-                message = "3\(id)["
+                message = "3\(id)"
             } else {
-                message = "3\(nsp),\(id)["
+                message = "3\(nsp),\(id)"
             }
         } else {
             if nsp == "/" {
-                message = "6\(binary.count)-\(id)["
+                message = "6\(binary.count)-\(id)"
             } else {
-                message = "6\(binary.count)-\(nsp),\(id)["
+                message = "6\(binary.count)-\(nsp),\(id)"
             }
         }
         
@@ -148,29 +138,29 @@ struct SocketPacket {
         if type == .Event {
             if nsp == "/" {
                 if id == -1 {
-                    message = "2["
+                    message = "2"
                 } else {
-                    message = "2\(id)["
+                    message = "2\(id)"
                 }
             } else {
                 if id == -1 {
-                    message = "2\(nsp),["
+                    message = "2\(nsp),"
                 } else {
-                    message = "2\(nsp),\(id)["
+                    message = "2\(nsp),\(id)"
                 }
             }
         } else {
             if nsp == "/" {
                 if id == -1 {
-                    message = "5\(binary.count)-["
+                    message = "5\(binary.count)-"
                 } else {
-                    message = "5\(binary.count)-\(id)["
+                    message = "5\(binary.count)-\(id)"
                 }
             } else {
                 if id == -1 {
-                    message = "5\(binary.count)-\(nsp),["
+                    message = "5\(binary.count)-\(nsp),"
                 } else {
-                    message = "5\(binary.count)-\(nsp),\(id)["
+                    message = "5\(binary.count)-\(nsp),\(id)"
                 }
             }
         }