Reconnect is dont change to the correct scope of socket

Author: Josema

src/env/browser/websocket.js

@@ -23,15 +23,15 @@ function websocket(dop, node, options) {
         :
             send_queue.push(message); 
     }
-    function sendQueue(message) {
+    function sendQueue() {
         while (send_queue.length>0)
             socket.send(send_queue.shift());
     }
 
     // Socket events
     function onopen() {
         // Reconnect
-        if (node.readyState === dop.CONS.RECONNECT)
+        if (node.readyState === dop.CONS.CONNECTING)
             socket.send(node.tokenServer);
         // Connect
         else {
@@ -42,38 +42,45 @@ function websocket(dop, node, options) {
     }
     function onmessage(message) {
         // Reconnecting
-        if (node.readyState===dop.CONS.RECONNECT && message.data===node.tokenServer) {
+        if (node.readyState===dop.CONS.CONNECTING && message.data===node.tokenServer) {
             node.readyState = dop.CONS.CONNECT;
             dop.core.setSocketToNode(node, socket);
             dop.core.emitReconnect(node, oldSocket);
+            sendQueue();
         }
         else
             dop.core.emitMessage(node, message.data, message);
     }
     function onclose() {
+        node.readyState = dop.CONS.CLOSE;
         dop.core.emitClose(node, socket);
     }
 
     // dop events
-    function onconnect() {
-        if (node.readyState === dop.CONS.RECONNECT) {
+    function onconnect(message_response) {
+        if (node.readyState === dop.CONS.CONNECTING) {
             dop.core.emitDisconnect(node);
             dop.core.setSocketToNode(node, socket);
         }
+        else
+            socket.send(message_response);
         node.readyState = dop.CONS.CONNECT;
         dop.core.emitConnect(node);
+        sendQueue();
     }
     function ondisconnect() {
         node.readyState = dop.CONS.CLOSE;
         socket.close();
     }
 
     function reconnect() {
-        oldSocket = socket;
-        socket = new api(url);
-        node.readyState = dop.CONS.RECONNECT;
-        addListeners(socket, onopen, onmessage, onclose);
-        removeListeners(oldSocket, onopen, onmessage, onclose);
+        if (node.readyState !== dop.CONS.CONNECT) {
+            oldSocket = socket;
+            socket = new api(url);
+            node.readyState = dop.CONS.CONNECTING;
+            addListeners(socket, onopen, onmessage, onclose);
+            removeListeners(oldSocket, onopen, onmessage, onclose);
+        }
     }
 
     // Setting up

src/protocol/onconnect.js

@@ -3,6 +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);
-    node.send(JSON.stringify(response));
+    node.emit(dop.CONS.CONNECT, JSON.stringify(response));
 };

test/protocol/protocol_connect.js

@@ -1,5 +1,5 @@
 var test = require('tape');
-var dop = require('../dist/nodejs');
+var dop = require('../../dist/nodejs');
 var dopServer = dop.create();
 var dopClient = dop.create();
 var localtransportlisten = require('dop-transports').listen.local;

test/protocol/protocol_queue.js

@@ -0,0 +1,66 @@
+var test = require('tape');
+var dop = require('../../dist/nodejs');
+var dopServer = dop.create();
+var dopClient = dop.create();
+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;
+var socketiotransportconnect = require('dop-transports').connect.socketio;
+
+// var server = dop.listen({transport:localtransportlisten});
+// var client = dopClient.connect({transport:localtransportconnect, listener:server});
+// server = dop.listen({transport:socketiotransportlisten});
+// client = dopClient.connect({transport:socketiotransportconnect});
+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;
+
+
+
+
+var msg=0;
+function send() {
+    nodeClient.send(String(msg));
+    if (nodeServer)
+        nodeServer.send(String(msg));
+    if (msg++ < 25)
+        setTimeout(send, 100);
+}
+send();
+
+
+
+
+
+test('CONNECT TEST', function(t) {
+
+    server.on('connect', function(node){
+        nodeServer = node;
+    });
+    server.on('message', function(node, message){
+        // console.log( '❌ message `'+message+'`', node.token );
+    });
+
+    nodeClient.on('message', function(message){
+        console.log( '✅ message `'+message+'`' );
+    });
+});
+
+
+
+
+
+
+setTimeout(function(){
+    console.log( 'closing...' );
+    nodeClient.socket.close();
+    setTimeout(function(){
+        console.log( 'reconnecting...' );
+        nodeClient.reconnect();
+    },500);
+}, 1000)

test/protocol/protocol_reconnect.js

@@ -1,5 +1,5 @@
 var test = require('tape');
-var dop = require('../dist/nodejs');
+var dop = require('../../dist/nodejs');
 var dopServer = dop.create();
 var dopClient = dop.create();
 var uwstransportlisten = require('dop-transports').listen.uws;

test/protocol/protocol_reconnectfail.js

@@ -1,5 +1,5 @@
 var test = require('tape');
-var dop = require('../dist/nodejs');
+var dop = require('../../dist/nodejs');
 var dopServer = dop.create();
 var dopClient = dop.create();
 var uwstransportlisten = require('dop-transports').listen.uws;