Implemented sockjs and tests for it

Author: Josema

package.json

@@ -60,6 +60,7 @@
     "test-chrome": "browserify test/*.js | tape-run --render=\"faucet\" --browser chrome",
     "test-safari": "browserify test/*.js | tape-run --render=\"faucet\" --browser safari",
     "test-firefox": "browserify test/*.js | tape-run --render=\"faucet\" --browser firefox",
-    "test-websockets": "tap test/transports/**.js --test-arg=websockets"
+    "test-websockets": "tap test/transports/**.js --test-arg=websockets",
+    "test-sockjs": "tap test/transports/**.js --test-arg=sockjs"
   }
 }

test/transports/connect.js

@@ -40,7 +40,11 @@ test('CONNECT TEST', function(t) {
         var timeoutCheckEnd = Math.round( (new Date().getTime()-timeoutCheck)/1000 );
         t.equal(timeoutCheckEnd, timeoutDisconnect, '❌ disconnect');
         t.end();
-        try {server.listener.close()} catch(e) {}
+        try {
+            server.listener.close();
+        } catch(e) {
+            process.exit();
+        }
     });
 
 
@@ -70,5 +74,8 @@ test('CONNECT TEST', function(t) {
 // Sending messages before is connected
 nodeClient.send('Before');
 // Disconnecting
-setTimeout(nodeClient.disconnect.bind(nodeClient), 1000)
+setTimeout(function(){
+    // console.log( 'disconnecting...' );
+    nodeClient.disconnect();
+}, 1000);
 

test/transports/events.js

@@ -22,80 +22,41 @@ test('Events', function(t) {
         sock = socket;
         t.equal(order++, 1, 'server/open');
     });
-
-    server.listener.on('connection', function(socket){
-        sock.on('message', onmessageserver);
-        sock.on('close', oncloseserver);
-        t.equal(order++, 2, 'server/connection');
-        t.equal(sock, socket, 'server/connection sock');
-    });
-
     client.on('open', function(socket){
         sock2 = socket;
-        t.equal(order++, 3, 'client/open');
+        t.equal(order++, 2, 'client/open');
     });
 
-    client.socket.on('open', function(){
-        sock2.on('message', onmessageclient);
-        sock2.on('close', oncloseclient);
-        t.equal(order++, 4, 'clientsocket/open');
-        t.equal(sock2, this, 'clientsocket/open sock');
-    });
-
-
-
-    server.on('message', function(node, message) {
-        msg = message;
-        t.equal(order++, 7, 'server/message');
-        t.equal(sock, node.socket, 'server/message sock');
-    });
-    function onmessageserver(message) {
-        if (message != ""){
-            t.equal(order++, 8, 'serverlistener/message');
-            t.equal(msg, message, 'serverlistener/message msg');
-            (Math.round(Math.random()*100)%2) ? sock.close() : sock2.close();
-        }
-    };
 
     client.on('message', function(message){
-        msg2 = message;
-        t.equal(order++, 5, 'client/message');
+        t.equal(order++, 3, 'client/message');
         t.equal(sock2, client.socket, 'client/message sock');
     });
-    function onmessageclient(message){
-        t.equal(order++, 6, 'clientsocket/message');
-        t.equal(msg2, message, 'clientsocket/message msg');
-    };
-
+    server.on('message', function(node, message) {
+        t.equal(order++, 4, 'server/message');
+        t.equal(sock, node.socket, 'server/message sock');
+    });
 
 
 
     client.on('close', function(){
-        t.equal(order++, 9, 'client/close');
+        t.equal(order++, 5, 'client/close');
     });
-    function oncloseclient(){
-        t.equal(order++, 10, 'clientsocket/close');
-    };
-
-
-
     server.on('close', function(socket){
-        t.equal(order++, 11, 'server/close');
+        t.equal(order++, 6, 'server/close');
         t.equal(sock, socket, 'server/close sock');
-    });
-    function oncloseserver(){
-        t.equal(order++, 12, 'serverlistener/close');
         t.end();
-        
         try {
-            setTimeout(function(){
-                client.socket.close();
-                server.listener.close();
-                t.end();
-            },1000);
-        } catch(e) {}
-    };
+            server.listener.close();
+        } catch(e) {
+            process.exit();
+        }
+    });
+
 
 });
 
 
+setTimeout(function(){
+    client.socket.close();
+},1000);

test/transports/queue.js

@@ -25,7 +25,7 @@ function send() {
     if (nodeServer)
         nodeServer.send(String(msg));
     if (msg++ < 15)
-        setTimeout(send, 200);
+        setTimeout(send, 300);
 }
 send();
 
@@ -52,8 +52,9 @@ test('CONNECT TEST', function(t) {
         if (message[0] !== '[') {
             t.equal(message, String(incC++), '✅ message `'+message+'`');
             if (incS===16 && incC===16) {
-                server.listener.close();
                 t.end();
+                try {server.listener.close();
+                } catch(e) {process.exit();}
             }
         }
     });

test/transports/reconnect.js

@@ -42,8 +42,9 @@ test('RECONNECT TEST', function(t) {
     });
     nodeClient.on('reconnect', function(oldSocket) {
         t.equal(oldSocket, socketClient, '✅ reconnect');
-        server.listener.close();
         t.end();
+        try {server.listener.close();
+        } catch(e) {process.exit();}
     });
 });
 

test/transports/reconnectfail.js

@@ -2,7 +2,8 @@ var test = require('tape');
 var dop = require('../../dist/nodejs');
 var dopServer = dop.create();
 var dopClient = dop.create();
-var transportName = process.argv[2] || 'local';
+
+var transportName = process.argv[2] || 'sockjs';
 var transportListen = require('dop-transports').listen[transportName];
 var transportConnect = require('dop-transports').connect[transportName];
 
@@ -31,9 +32,9 @@ test('RECONNECT TEST', function(t) {
         else {
             connected2 = true;
             t.notEqual(node.socket, socketServer, '❌ connect 2');
-            // nodeClient.disconnect();
-            server.listener.close();
             t.end();
+            try {server.listener.close();
+            } catch(e) {process.exit();}
         }
     });
     server.on('disconnect', function(node){