From 9df8e857dbad5078bb2880c4e1c9d029ede40bb8 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Tue, 4 Feb 2014 04:34:11 -0500
Subject: [PATCH] refactor(console) send -> emit

---
 lib/client/console.js | 12 ++++++------
 lib/server/console.js |  7 +------
 lib/server/socket.js  | 22 ++++++++++++++--------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/lib/client/console.js b/lib/client/console.js
index 04987c8e..58d67886 100644
--- a/lib/client/console.js
+++ b/lib/client/console.js
@@ -62,7 +62,7 @@ var CloudCmd, Util, DOM, CloudFunc, $;
                         
                         if (command && socket) {
                             Images.showLoad({ top:true });
-                            socket.send(command);
+                            socket.emit(CHANNEL, command);
                         }
                         
                         jqconsole.Prompt(true, handler);
@@ -175,13 +175,13 @@ var CloudCmd, Util, DOM, CloudFunc, $;
         }
         
         function onMessage(json) {
-            var msg = Util.parseJSON(json);
-            
-            log(msg.stdout);
-            error(msg.stderr);
+            if (json) {
+                Util.log(json);
+                log(json.stdout);
+                error(json.stderr);
+            }
             
             DOM.Images.hideLoad();
-            Util.log(msg);
         }
         
         init();
diff --git a/lib/server/console.js b/lib/server/console.js
index 674e35cb..5f42e801 100644
--- a/lib/server/console.js
+++ b/lib/server/console.js
@@ -56,12 +56,7 @@
         
         ret = socket.on('connection', function(clientSocket) {
             onConnection(clientSocket, function(json, all) {
-                var msg = Util.stringifyJSON(json);
-                
-                if (all)
-                    socket.send(msg, clientSocket, CHANNEL, all);
-                
-                socket.send(msg, clientSocket);
+                socket.emit(CHANNEL, json, clientSocket, all);
             });
         });
         
diff --git a/lib/server/socket.js b/lib/server/socket.js
index bf6f7a37..103190ca 100644
--- a/lib/server/socket.js
+++ b/lib/server/socket.js
@@ -27,16 +27,22 @@
         CloudFunc.removeListener(name, func, AllListeners, socket);
     }
     
-    function send(msg, clientSocket, channel, all) {
-        if (all && channel)
-            clientSocket.broadcast.emit(channel, msg);
-        else
-            clientSocket.send(msg);
+    function send(msg, socket) {
+        if (socket)
+            socket.send(msg);
     }
     
-    function emit(channel, message, clientSocket) {
-        if (clientSocket)
-            clientSocket.emit(channel, message);
+    function emit(channel, message, socket, all) {
+        var obj;
+        
+        if (socket) {
+            if (all)
+                obj = socket.broadcast;
+            else
+                obj = socket;
+            
+            obj.emit(channel, message);
+        }
     }
     
     /**