Constants are stored in dop object

Author: Josema

dist/browser.js

@@ -29,26 +29,18 @@ var dop = {
     protocol: {},
     transports: {listen:{}, connect:{}},
 
-    CONS: {
-        CLOSE: '~CLOSE',
-        OPEN: '~OPEN',
-        CONNECTING: '~CONNECTING',
+    // Constants
+    cons: {
+        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'
-};
-
-
-
 
 
 
@@ -174,11 +166,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); 
@@ -191,20 +184,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();
@@ -213,43 +206,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;
@@ -278,6 +271,13 @@ else {
         root.dopTransportsConnectWebsocket = websocket;
 }
 
+// Cons
+var CLOSE = 0,
+    OPEN = 1,
+    CONNECTING = 2,
+    CONNECT = 3;
+
+
 })(this);
 
 
@@ -687,7 +687,7 @@ dop.getAction = function(mutations) {
 //////////  src/api/getNodeBySocket.js
 
 dop.getNodeBySocket = function(socket) {
-    return dop.data.node[ socket[CONS.socket_token] ];
+    return dop.data.node[ socket[dop.cons.TOKEN] ];
 };
 
 
@@ -696,7 +696,7 @@ dop.getNodeBySocket = function(socket) {
 //////////  src/api/getObject.js
 
 dop.getObjectDop = function(object) {
-    return object[CONS.dop];
+    return object[dop.cons.DOP];
 };
 
 dop.getObjectId = function(object) {
@@ -897,9 +897,9 @@ dop.core.setAction = function(destiny, prop, value, typeofValue, path) {
         var typeofDestiny = dop.util.typeof(destiny[prop]);
 
         // Array mutations
-        if (typeofValue=='object' && value.hasOwnProperty(CONS.dop)) {
+        if (typeofValue=='object' && value.hasOwnProperty(dop.cons.DOP)) {
 
-            var mutations = value[CONS.dop],
+            var mutations = value[dop.cons.DOP],
                 mutation,
                 index=0,
                 total=mutations.length;
@@ -969,7 +969,7 @@ dop.core.setAction = function(destiny, prop, value, typeofValue, path) {
     // }
 };
 // dop.core.setActionLoop = function() {
-//     if (prop === CONS.dop)
+//     if (prop === dop.cons.DOP)
 //         return true;
 // };
 
@@ -1166,10 +1166,10 @@ dop.core.emitMessage = function(node, message_string, message_raw) {
 
 
     // var messages, 
-    //     user = (socket[CONS.socket_token] === undefined) ?
+    //     user = (socket[dop.cons.TOKEN] === undefined) ?
     //         socket
     //     :
-    //         node.users[ socket[CONS.socket_token] ];
+    //         node.users[ socket[dop.cons.TOKEN] ];
 
 
 
@@ -1329,11 +1329,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() {
@@ -1809,8 +1809,8 @@ dop.core.configureObject = function(object, path, parent) {
             object[property] = dop.core.configureObject(value, path.concat(property), object);
     }
 
-    // Setting ~dop object
-    Object.defineProperty(object, CONS.dop, {value:path.slice(0)});
+    // Setting ~DOP object
+    Object.defineProperty(object, dop.cons.DOP, {value:path.slice(0)});
     object_dop = dop.getObjectDop(object);
     object_dop.m = []; // mutations
     object_dop.o = []; // observers
@@ -2012,10 +2012,10 @@ dop.core.injectMutationInAction = function(action, mutation, isUnaction) {
         if (isMutationArray)
             action = action[prop];
 
-        if (!isObject(action[CONS.dop]))
-            action[CONS.dop] = [];
+        if (!isObject(action[dop.cons.DOP]))
+            action[dop.cons.DOP] = [];
 
-        var mutations = action[CONS.dop];
+        var mutations = action[dop.cons.DOP];
 
         // swap
         if (mutation.swaps!==undefined) {
@@ -2437,7 +2437,7 @@ dop.core.remoteFunction = function $DOP_REMOTE_function(object, property) {
 
 dop.core.setSocketToNode = function(node, socket) {
     node.socket = socket;
-    socket[CONS.socket_token] = node.token;
+    socket[dop.cons.TOKEN] = node.token;
 };
 
 
@@ -2476,7 +2476,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
@@ -2613,7 +2613,7 @@ 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));
 };