Test protocol_reconnect passed

Author: Josema

src/env/browser/websocket.js

@@ -12,18 +12,18 @@ 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 OPEN
+    // We use this function as alias to store messages when connection is not CONNECT
     function send(message) {
-        (socket.readyState === socket.constructor.OPEN && node.readyState === dop.CONS.CONNECT) ?
+        (socket.readyState===socket.constructor.OPEN && node.readyState===dop.CONS.CONNECT) ?
             socket.send(message)
         :
-            console.log( 'save', message ); 
+            send_queue.push(message); 
     }
 
     // This function emit all the queue messages
@@ -45,28 +45,30 @@ function websocket(dop, node, options) {
         dop.core.emitOpen(node, socket, options.transport);
     }
     function onmessage(message) {
-        // // Reconnecting
-        // if (message.data===node.tokenServer && node.readyState===dop.CONS.RECONNECT) {
-        //     node.readyState = dop.CONS.CONNECT;
-        //     dop.core.emitReconnectClient(node, oldSocket);
-        //     sendQueue();
-        // }
-        // else
+        // Reconnecting
+        if (message.data===node.tokenServer && node.readyState===dop.CONS.RECONNECT) {
+            node.readyState = dop.CONS.CONNECT;
+            dop.core.emitReconnectClient(node, oldSocket);
+            // sendQueue();
+        }
+        else
             dop.core.emitMessage(node, socket, message.data, message);
     }
     function onclose() {
         dop.core.emitClose(node, socket);
     }
 
+    // Adding listeners
+    addListeners(socket, onopen, onmessage, onclose);
 
     node.readyState = dop.CONS.CLOSE;
-    // node.reconnect = function() {
-    //     oldSocket = socket;
-    //     node.socket = socket = new api(url);
-    //     addListeners(socket, onopen, onmessage, onclose);
-    //     removeListeners(oldSocket, onopen, onmessage, onclose);
-    //     node.readyState = dop.CONS.RECONNECT;
-    // };
+    node.reconnect = function() {
+        oldSocket = socket;
+        node.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() {
         node.readyState = dop.CONS.CONNECT;
         dop.core.emitConnect(node);
@@ -79,7 +81,7 @@ function websocket(dop, node, options) {
         socket.close();
     });
 
-    addListeners(socket, onopen, onmessage, onclose);
+    
 
     return socket;
 };

src/protocol/onconnect.js

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

test/protocol_reconnect.js

@@ -2,7 +2,7 @@ var test = require('tape');
 var dop = require('../dist/nodejs');
 var dopServer = dop.create();
 var dopClient = dop.create();
-var uwstransportlisten = require('dop-transports').listen.ws;
+var uwstransportlisten = require('dop-transports').listen.uws;
 var localtransportlisten = require('dop-transports').listen.local;
 var localtransportconnect = require('dop-transports').connect.local;
 var socketiotransportlisten = require('dop-transports').listen.socketio;
@@ -12,15 +12,15 @@ var socketiotransportconnect = require('dop-transports').connect.socketio;
 // var client = dopClient.connect({transport:localtransportconnect, listener:server});
 // server = dop.listen({transport:socketiotransportlisten});
 // client = dopClient.connect({transport:socketiotransportconnect});
-var server = dopServer.listen({transport:uwstransportlisten, timeout:2});
+var server = dopServer.listen({timeout:2});
 var nodeClient = dopClient.connect();
 dopServer.env = 'SERVER'
 dopClient.env = 'CLIENT'
 var nodeServer, socketServer, socketClient;
 var tokenServer, tokenClient;
 var order = 0;
 
-test('CONNECT TEST', function(t) {
+test('RECONNECT TEST', function(t) {
 
     server.on('open', function(socket) {
         if (socketServer === undefined) {
@@ -33,9 +33,6 @@ test('CONNECT TEST', function(t) {
         tokenServer = node.token;
         t.equal(node.socket, socketServer, '❌ connect');
     });
-    server.on('message', function(node, message){
-        console.log( '❌ message `'+message+'`' );
-    });
     server.on('close', function(socket){
         t.equal(socket, socketServer, '❌ close');
     });
@@ -57,35 +54,20 @@ test('CONNECT TEST', function(t) {
         setTimeout(function(){
             console.log( 'reconnecting...' );
             nodeClient.reconnect();
+            t.equal(socket, socketClient, '✅ close');
         },500);
-        t.equal(socket, socketClient, '✅ close');
     });
     nodeClient.on('reconnect', function(oldSocket) {
         t.equal(oldSocket, socketClient, '✅ reconnect');
+        t.end();
     });
-    // nodeClient.on('message', function(message){
-    //     console.log( '✅ message `'+message+'`' );
-    // });
 });
 
 
-// Sending messages before is connected
-// nodeClient.send('Before');
+
 // Disconnecting
 setTimeout(function(){
     console.log( 'closing...' );
     nodeClient.socket.close();
 }, 1000)
 
-function sends() {
-    var msg=1;
-    var interval = setInterval(function(){
-        // nodeServer.send(msg);
-        nodeClient.send(msg);
-        msg+=1;
-        if (msg>25)
-            clearInterval(interval);
-    },100);
-}
-sends();
-nodeClient.send('0');