Removed socket parameters from emitMessage

Author: Josema

dist/nodejs.js

@@ -885,7 +885,7 @@ dop.core.emitDisconnect = function(node) {
 
 //////////  src/core/api_transports/emitMessage.js
 
-dop.core.emitMessage = function(node, socket, message_string, message_raw) {
+dop.core.emitMessage = function(node, message_string, message_raw) {
 
     // If server
     if (node.listener)

src/core/api_transports/emitMessage.js

@@ -1,5 +1,5 @@
 
-dop.core.emitMessage = function(node, socket, message_string, message_raw) {
+dop.core.emitMessage = function(node, message_string, message_raw) {
 
     // If server
     if (node.listener)

src/env/browser/websocket.js

@@ -3,7 +3,6 @@ function websocket(dop, node, options) {
 
     var url = 'ws://localhost:4444/'+dop.name,
         args = arguments;
-
     if (typeof options.url == 'string')
         url = options.url.replace('http','ws');
     else if (typeof window!='undefined' && /http/.test(window.location.href)) {
@@ -12,26 +11,25 @@ function websocket(dop, node, options) {
         url = protocol+'://'+domain_prefix[2].toLocaleLowerCase()+'/'+dop.name;
     }
 
+
     // Variables
     var api = options.transport.getApi(),
         socket = new api(url),
         send_queue = [];
 
-
-    // We use this function as alias to store messages when connection is not CONNECT
+    // Helpers
     function send(message) {
         (socket.readyState===socket.constructor.OPEN && node.readyState===dop.CONS.CONNECT) ?
             socket.send(message)
         :
             send_queue.push(message); 
     }
-
-    // This function emit all the queue messages
     function sendQueue(message) {
         while (send_queue.length>0)
             socket.send(send_queue.shift());
     }
 
+    // Socket events
     function onopen() {
         // Reconnect
         if (node.readyState === dop.CONS.RECONNECT)
@@ -47,7 +45,6 @@ function websocket(dop, node, options) {
         // Reconnecting
         if (node.readyState===dop.CONS.RECONNECT && message.data===node.tokenServer) {
             node.readyState = dop.CONS.CONNECT;
-            // node.socket = socket;
             dop.core.emitReconnectClient(node, oldSocket);
             // sendQueue();
         }
@@ -58,35 +55,38 @@ function websocket(dop, node, options) {
         dop.core.emitClose(node, socket);
     }
 
-    // Adding listeners
-    addListeners(socket, onopen, onmessage, onclose);
-    node.readyState = dop.CONS.CLOSE;
-    node.reconnect = function() {
-        oldSocket = socket;
-        socket = new api(url);
-        addListeners(socket, onopen, onmessage, onclose);
-        removeListeners(oldSocket, onopen, onmessage, onclose);
-        node.readyState = dop.CONS.RECONNECT;
-    };
-    node.on(dop.CONS.CONNECT, function() {
+    // dop events
+    function onconnect() {
         if (node.readyState === dop.CONS.RECONNECT) {
             node.socket = oldSocket;
             dop.core.emitDisconnect(node);
             node.socket = socket;
         }
         node.readyState = dop.CONS.CONNECT;
         dop.core.emitConnect(node);
-    });
-    node.on(dop.CONS.SEND, function(message) {
-        send(message);
-    });
-    node.on(dop.CONS.DISCONNECT, function() {
+    }
+    function ondisconnect() {
         node.readyState = dop.CONS.CLOSE;
         socket.close();
-    });
+    }
+
 
+    // Setting up
+    node.readyState = dop.CONS.CLOSE;
+    node.reconnect = function() {
+        oldSocket = socket;
+        socket = new api(url);
+        addListeners(socket, onopen, onmessage, onclose);
+        removeListeners(oldSocket, onopen, onmessage, onclose);
+        node.readyState = dop.CONS.RECONNECT;
+    };
+    node.on(dop.CONS.CONNECT, onconnect);
+    node.on(dop.CONS.SEND, send);
+    node.on(dop.CONS.DISCONNECT, ondisconnect);
+    addListeners(socket, onopen, onmessage, onclose);
+    
     return socket;
-};
+}
 
 function addListeners(socket, onopen, onmessage, onclose) {
     socket.addEventListener('open', onopen);