Support binary data in Emit with Ack (#117)

* Support binary data in Emit with Ack

* Support Action<T1, T2, T3, T4> in AckImpl

Author: hypernoob

Src/SocketIoClientDotNet.net45/Client/AckImpl.cs

@@ -4,54 +4,68 @@ namespace Quobject.SocketIoClientDotNet.Client
 {
     public class AckImpl : IAck
     {
-        private readonly Action fn;
+        private readonly Action fn0;
         private readonly Action<object> fn1;
         private readonly Action<object, object> fn2;
         private readonly Action<object, object, object> fn3;
+        private readonly Action<object, object, object, object> fn4;
 
         public AckImpl(Action fn)
         {
-            this.fn = fn;
+            fn0 = fn;
         }
 
         public AckImpl(Action<object> fn)
         {
-            this.fn1 = fn;
+            fn1 = fn;
         }
-        public AckImpl(Action<object,object> fn)
+
+        public AckImpl(Action<object, object> fn)
         {
-            this.fn2 = fn;
+            fn2 = fn;
         }
 
         public AckImpl(Action<object, object, object> fn)
         {
-            this.fn3 = fn;
+            fn3 = fn;
         }
 
+        public AckImpl(Action<object, object, object, object> fn)
+        {
+            fn4 = fn;
+        }
 
         public void Call(params object[] args)
         {
-            if (fn != null)
+            if (fn0 != null)
             {
-                fn();
+                fn0();
             }
             else if (fn1 != null)
             {
-                var arg = args.Length > 0 ? args[0] : null;
-                fn1(arg);
+                var arg0 = args.Length > 0 ? args[0] : null;
+                fn1(arg0);
             }
             else if (fn2 != null)
             {
-                var arg = args.Length > 0 ? args[0] : null;
+                var arg0 = args.Length > 0 ? args[0] : null;
                 var arg1 = args.Length > 1 ? args[1] : null;
-                fn2(arg, arg1);
+                fn2(arg0, arg1);
             }
             else if (fn3 != null)
             {
-                var arg = args.Length > 0 ? args[0] : null;
+                var arg0 = args.Length > 0 ? args[0] : null;
+                var arg1 = args.Length > 1 ? args[1] : null;
+                var arg2 = args.Length > 2 ? args[2] : null;
+                fn3(arg0, arg1, arg2);
+            }
+            else if (fn4 != null)
+            {
+                var arg0 = args.Length > 0 ? args[0] : null;
                 var arg1 = args.Length > 1 ? args[1] : null;
                 var arg2 = args.Length > 2 ? args[2] : null;
-                fn3(arg, arg1, arg2);
+                var arg3 = args.Length > 3 ? args[3] : null;
+                fn4(arg0, arg1, arg2, arg3);
             }
         }
     }

Src/SocketIoClientDotNet.net45/Client/Socket.cs

@@ -104,7 +104,7 @@ public override Emitter Emit(string eventString, params object[] args)
                 return this;
             }
 
-            var _args = new List<object> {eventString};
+            var _args = new List<object> { eventString };
             _args.AddRange(args);
 
             var jsonArgs = Parser.Packet.Args2JArray(_args);
@@ -138,40 +138,60 @@ public Emitter Emit(string eventString, IAck ack, params object[] args)
         {
             var log = LogManager.GetLogger(Global.CallerName());
 
-            var _args = new List<object> { eventString };
-            if (args != null)
+            if (Events.Contains(eventString))
             {
-                _args.AddRange(args);                
+                base.Emit(eventString, args);
+                return this;
             }
 
-            var jarray = new JArray(_args);
-            var packet = new Packet(Parser.Parser.EVENT, jarray);
+            var _args = new List<object> { eventString };
+            _args.AddRange(args);
+
+            var jsonArgs = Parser.Packet.Args2JArray(_args);
+
+            var parserType = HasBinaryData.HasBinary(jsonArgs) ? Parser.Parser.BINARY_EVENT : Parser.Parser.EVENT;
+            var packet = new Packet(parserType, jsonArgs);
 
             log.Info(string.Format("emitting packet with ack id {0}", Ids));
             Acks = Acks.Add(Ids, ack);
             packet.Id = Ids++;
 
-            Packet(packet);
+            if (Connected)
+            {
+                Packet(packet);
+            }
+            else
+            {
+                SendBuffer = SendBuffer.Enqueue(packet);
+            }
             return this;
         }
 
         public Emitter Emit(string eventString, Action ack, params object[] args)
         {
             return Emit(eventString, new AckImpl(ack), args);
         }
+
         public Emitter Emit(string eventString, Action<object> ack, params object[] args)
         {
             return Emit(eventString, new AckImpl(ack), args);
         }
+
         public Emitter Emit(string eventString, Action<object, object> ack, params object[] args)
         {
             return Emit(eventString, new AckImpl(ack), args);
         }
+
         public Emitter Emit(string eventString, Action<object, object, object> ack, params object[] args)
         {
             return Emit(eventString, new AckImpl(ack), args);
         }
 
+        public Emitter Emit(string eventString, Action<object, object, object, object> ack, params object[] args)
+        {
+            return Emit(eventString, new AckImpl(ack), args);
+        }
+
         public void Packet(Packet packet)
         {
             packet.Nsp = Nsp;