readyState of is now stored only inside the transport

Author: Josema

src/core/constructors/node.js

@@ -15,11 +15,11 @@ dop.core.node = function() {
 
 
 dop.core.node.prototype.send = function(message) {
-    this.emit(dop.CONS.SEND, message);
+    this.emit(dop.cons.SEND, message);
 };
 
 dop.core.node.prototype.disconnect = function() {
-    this.emit(dop.CONS.DISCONNECT);
+    this.emit(dop.cons.DISCONNECT);
 };
 
 dop.core.node.prototype.subscribe = function() {

src/dop.js

@@ -21,20 +21,18 @@ var dop = {
     protocol: {},
     transports: {listen:{}, connect:{}},
 
-    CONS: {
-        CLOSE: '~CLOSE',
-        OPEN: '~OPEN',
-        CONNECTING: '~CONNECTING',
+    // Const
+    cons: {
+        socket_token: '~TOKEN_DOP',
+        dop: '~DOP',
         CONNECT: '~CONNECT',
-        RECONNECT: '~RECONNECT',
-        SEND: '~SEND'
+        SEND: '~SEND',
+        DISCONNECT: '~DISCONNECT'
     }
 
 };
 
-
-// Special properties assigned to user objects
 var CONS = {
     socket_token: '~TOKEN_DOP',
-    dop: '~dop'
-};
+    dop: '~DOP'
+};

src/env/browser/websocket.js

@@ -14,11 +14,12 @@ function websocket(dop, node, options) {
     // Variables
     var api = options.transport.getApi(),
         socket = new api(url),
-        send_queue = [];
+        send_queue = [],
+        readyState;
 
     // Helpers
     function send(message) {
-        (socket.readyState===socket.constructor.OPEN && node.readyState===dop.CONS.CONNECT) ?
+        (socket.readyState===socket.constructor.OPEN && readyState===CONNECT) ?
             socket.send(message)
         :
             send_queue.push(message); 
@@ -31,20 +32,20 @@ function websocket(dop, node, options) {
     // Socket events
     function onopen() {
         // Reconnect
-        if (node.readyState === dop.CONS.CONNECTING)
+        if (readyState === CONNECTING)
             socket.send(node.tokenServer);
         // Connect
         else {
             socket.send(''); // Empty means we want to get connected
-            node.readyState = dop.CONS.OPEN;
+            readyState = OPEN;
         }
         dop.core.emitOpen(node, socket, options.transport);
     }
     function onmessage(message) {
         // console.log( 'C<<: `'+message.data+'`' );
         // Reconnecting
-        if (node.readyState===dop.CONS.CONNECTING && message.data===node.tokenServer) {
-            node.readyState = dop.CONS.CONNECT;
+        if (readyState===CONNECTING && message.data===node.tokenServer) {
+            readyState = CONNECT;
             dop.core.setSocketToNode(node, socket);
             dop.core.emitReconnect(node, oldSocket);
             sendQueue();
@@ -53,43 +54,43 @@ function websocket(dop, node, options) {
             dop.core.emitMessage(node, message.data, message);
     }
     function onclose() {
-        node.readyState = dop.CONS.CLOSE;
+        readyState = CLOSE;
         dop.core.emitClose(node, socket);
     }
 
     // dop events
     function onconnect(message_response) {
-        if (node.readyState === dop.CONS.CONNECTING) {
+        if (readyState === CONNECTING) {
             dop.core.emitDisconnect(node);
             dop.core.setSocketToNode(node, socket);
         }
         socket.send(message_response);
-        node.readyState = dop.CONS.CONNECT;
+        readyState = CONNECT;
         dop.core.emitConnect(node);
         sendQueue();
     }
     function ondisconnect() {
-        node.readyState = dop.CONS.CLOSE;
+        readyState = CLOSE;
         socket.close();
     }
 
     function reconnect() {
-        if (node.readyState !== dop.CONS.CONNECT) {
+        if (readyState !== CONNECT) {
             oldSocket = socket;
             socket = new api(url);
-            node.readyState = dop.CONS.CONNECTING;
+            readyState = CONNECTING;
             addListeners(socket, onopen, onmessage, onclose);
             removeListeners(oldSocket, onopen, onmessage, onclose);
         }
     }
 
     // Setting up
     dop.core.setSocketToNode(node, socket);
-    node.readyState = dop.CONS.CLOSE;
+    readyState = CLOSE;
     node.reconnect = reconnect;
-    node.on(dop.CONS.CONNECT, onconnect);
-    node.on(dop.CONS.SEND, send);
-    node.on(dop.CONS.DISCONNECT, ondisconnect);
+    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;
@@ -118,4 +119,11 @@ else {
         root.dopTransportsConnectWebsocket = websocket;
 }
 
+// Cons
+var CLOSE = 0,
+    OPEN = 1,
+    CONNECTING = 2,
+    CONNECT = 3;
+
+
 })(this);

src/protocol/_onconnect.js

@@ -5,7 +5,7 @@ dop.protocol._onconnect = function(node, request_id, request, response) {
 
     // Node is connected correctly
     if (response[0]===0)
-        node.emit(dop.CONS.CONNECT, request, response);
+        node.emit(dop.cons.CONNECT, request, response);
 
 
     // We must manage the rejection

src/protocol/onconnect.js

@@ -3,5 +3,5 @@ dop.protocol.onconnect = function(node, request_id, request) {
     var tokenServer=request[1],
         response = dop.core.createResponse(request_id, 0);
     node.tokenServer = tokenServer;
-    node.emit(dop.CONS.CONNECT, JSON.stringify(response));
+    node.emit(dop.cons.CONNECT, JSON.stringify(response));
 };