From 308983c6c7f53ef952cc88428519312c1f82f8cf Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Sat, 14 Feb 2015 18:12:57 -0500
Subject: [PATCH] fix binary ack

---
 SwiftIO/SocketEvent.swift    |  6 +++---
 SwiftIO/SocketIOClient.swift | 14 +++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/SwiftIO/SocketEvent.swift b/SwiftIO/SocketEvent.swift
index b694de2..3f90746 100644
--- a/SwiftIO/SocketEvent.swift
+++ b/SwiftIO/SocketEvent.swift
@@ -97,18 +97,18 @@ class SocketEvent {
                     return self.completeMessage(msg, args: args)
                     
                 } else {
-                    msg = "43\(nsp)["
+                    msg = "43/\(nsp),\(ack)["
                     
                     return self.completeMessage(msg, args: args)
                 }
             } else {
                 if nsp == "/" {
-                    msg = "46\(binary)-\(ack)[\"\(event)\""
+                    msg = "46\(binary)-\(ack)["
                     
                     return self.completeMessage(msg, args: args)
                     
                 } else {
-                    msg = "46\(binary)-\(nsp),\(ack)[\"\(event)\""
+                    msg = "46\(binary)-/\(nsp),\(ack)["
                     
                     return self.completeMessage(msg, args: args)
                 }
diff --git a/SwiftIO/SocketIOClient.swift b/SwiftIO/SocketIOClient.swift
index 2fdf57b..a8e044c 100644
--- a/SwiftIO/SocketIOClient.swift
+++ b/SwiftIO/SocketIOClient.swift
@@ -182,17 +182,21 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
             
             if !hasBinary {
                 if self?.nsp == nil {
-                    str = SocketEvent.createAck(ack, withEvent: event, withArgs: items, withAckType: 3, withNsp: "/")
+                    str = SocketEvent.createAck(ack, withEvent: event, withArgs: items,
+                        withAckType: 3, withNsp: "/")
                 } else {
-                    str = SocketEvent.createAck(ack, withEvent: event, withArgs: items, withAckType: 3, withNsp: self!.nsp!)
+                    str = SocketEvent.createAck(ack, withEvent: event, withArgs: items,
+                        withAckType: 3, withNsp: self!.nsp!)
                 }
                 
                 self?.io?.send(str)
             } else {
                 if self?.nsp == nil {
-                    str = SocketEvent.createAck(ack, withEvent: event, withArgs: items, withAckType: 6, withNsp: "/")
+                    str = SocketEvent.createAck(ack, withEvent: event, withArgs: items,
+                        withAckType: 6, withNsp: "/", withBinary: emitDatas.count)
                 } else {
-                    str = SocketEvent.createAck(ack, withEvent: event, withArgs: items, withAckType: 6, withNsp: self!.nsp!)
+                    str = SocketEvent.createAck(ack, withEvent: event, withArgs: items,
+                        withAckType: 6, withNsp: self!.nsp!, withBinary: emitDatas.count)
                 }
                 
                 self?.io?.send(str)
@@ -603,7 +607,7 @@ class SocketIOClient: NSObject, SRWebSocketDelegate {
                     ~= "\"~~$2\""
                 
                 let mes:SocketEvent
-                if ackNum != "" {
+                if ackNum == "" {
                     mes = SocketEvent(event: event, args: placeholdersRemoved,
                         placeholders: numberOfPlaceholders.toInt()!)
                 } else {