merge master

Author: nuclearace

SwiftIO/SocketAckMap.swift

@@ -24,7 +24,7 @@
 
 import Foundation
 
-public typealias AckCallback = (NSArray?) -> Void
+public typealias AckCallback = @objc_block (NSArray?) -> Void
 public typealias OnAckCallback = (timeout:UInt64, callback:AckCallback) -> Void
 
 struct SocketAckMap {

SwiftIO/SocketPacket.swift

@@ -90,68 +90,68 @@ class SocketPacket {
     }
 
     func createMessageForEvent(event:String) -> String {
-            var message:String
-            var jsonSendError:NSError?
-
-            if self.binary.count == 0 {
-                self.type = SocketPacketType.EVENT
-
-                if self.nsp == "/" {
-                    if self.id == nil {
-                        message = "2[\"\(event)\""
-                    } else {
-                        message = "2\(self.id!)[\"\(event)\""
-                    }
+        var message:String
+        var jsonSendError:NSError?
+
+        if self.binary.count == 0 {
+            self.type = SocketPacketType.EVENT
+
+            if self.nsp == "/" {
+                if self.id == nil {
+                    message = "2[\"\(event)\""
+                } else {
+                    message = "2\(self.id!)[\"\(event)\""
+                }
+            } else {
+                if self.id == nil {
+                    message = "2/\(self.nsp),[\"\(event)\""
+                } else {
+                    message = "2/\(self.nsp),\(self.id!)[\"\(event)\""
+                }
+            }
+        } else {
+            self.type = SocketPacketType.BINARY_EVENT
+
+            if self.nsp == "/" {
+                if self.id == nil {
+                    message = "5\(self.binary.count)-[\"\(event)\""
                 } else {
-                    if self.id == nil {
-                        message = "2/\(self.nsp),[\"\(event)\""
-                    } else {
-                        message = "2/\(self.nsp),\(self.id!)[\"\(event)\""
-                    }
+                    message = "5\(self.binary.count)-\(self.id!)[\"\(event)\""
                 }
             } else {
-                self.type = SocketPacketType.BINARY_EVENT
-
-                if self.nsp == "/" {
-                    if self.id == nil {
-                        message = "5\(self.binary.count)-[\"\(event)\""
-                    } else {
-                        message = "5\(self.binary.count)-\(self.id!)[\"\(event)\""
-                    }
+                if self.id == nil {
+                    message = "5\(self.binary.count)-/\(self.nsp),[\"\(event)\""
                 } else {
-                    if self.id == nil {
-                        message = "5\(self.binary.count)-/\(self.nsp),[\"\(event)\""
-                    } else {
-                        message = "5\(self.binary.count)-/\(self.nsp),\(self.id!)[\"\(event)\""
-                    }
+                    message = "5\(self.binary.count)-/\(self.nsp),\(self.id!)[\"\(event)\""
                 }
             }
+        }
 
-            return self.completeMessage(message)
+        return self.completeMessage(message)
     }
 
     func createAck() -> String {
-            var msg:String
+        var msg:String
 
-            if self.binary.count == 0 {
-                self.type = SocketPacketType.ACK
-                
-                if nsp == "/" {
-                    msg = "3\(self.id!)["
-                } else {
-                    msg = "3/\(self.nsp),\(self.id!)["
-                }
+        if self.binary.count == 0 {
+            self.type = SocketPacketType.ACK
+
+            if nsp == "/" {
+                msg = "3\(self.id!)["
             } else {
-                self.type = SocketPacketType.BINARY_ACK
+                msg = "3/\(self.nsp),\(self.id!)["
+            }
+        } else {
+            self.type = SocketPacketType.BINARY_ACK
 
-                if nsp == "/" {
-                    msg = "6\(self.binary.count)-\(self.id!)["
-                } else {
-                    msg = "6\(self.binary.count)-/\(self.nsp),\(self.id!)["
-                }
+            if nsp == "/" {
+                msg = "6\(self.binary.count)-\(self.id!)["
+            } else {
+                msg = "6\(self.binary.count)-/\(self.nsp),\(self.id!)["
             }
+        }
 
-            return self.completeMessage(msg, ack: true)
+        return self.completeMessage(msg, ack: true)
     }
 
     func completeMessage(var message:String, ack:Bool = false) -> String {