Skip to content

Commit 5ed5644

Browse files
committed
Test passed for socket.io
1 parent 31b0709 commit 5ed5644

File tree

7 files changed

+18
-11
lines changed

7 files changed

+18
-11
lines changed

dist/browser.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,9 @@ function websocket(dop, node, options) {
177177
send_queue.push(message);
178178
}
179179
function sendQueue() {
180-
while (send_queue.length>0)
181-
socket.send(send_queue.shift());
180+
if (socket.readyState===socket.constructor.OPEN)
181+
while (send_queue.length>0)
182+
socket.send(send_queue.shift());
182183
}
183184

184185
// Socket events
@@ -216,7 +217,7 @@ function websocket(dop, node, options) {
216217
dop.core.emitDisconnect(node);
217218
dop.core.setSocketToNode(node, socket);
218219
}
219-
socket.send(message_response);
220+
send(message_response);
220221
readyState = CONNECT;
221222
dop.core.emitConnect(node);
222223
sendQueue();
@@ -227,7 +228,7 @@ function websocket(dop, node, options) {
227228
}
228229

229230
function reconnect() {
230-
if (readyState !== CONNECT) {
231+
if (readyState === CLOSE) {
231232
oldSocket = socket;
232233
socket = new api(url);
233234
readyState = CONNECTING;

dist/browser.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"test-safari": "browserify test/*.js | tape-run --render=\"faucet\" --browser safari",
6262
"test-firefox": "browserify test/*.js | tape-run --render=\"faucet\" --browser firefox",
6363
"test-websockets": "tap test/transports/**.js --test-arg=websockets",
64+
"test-socketio": "tap test/transports/**.js --test-arg=socketio",
6465
"test-sockjs": "tap test/transports/**.js --test-arg=sockjs"
6566
}
6667
}

test/collectors.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
var test = require('tape');
33
// require('tabe').createStream( test );
4-
var requireNew = require('require-new');
54
var dop = require('../dist/nodejs');
65

76

test/transports/queue.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var dop = require('../../dist/nodejs');
33
var dopServer = dop.create();
44
var dopClient = dop.create();
55

6-
var transportName = process.argv[2] || 'local';
6+
var transportName = process.argv[2] || 'socketio';
77
var transportListen = require('dop-transports').listen[transportName];
88
var transportConnect = require('dop-transports').connect[transportName];
99

@@ -53,7 +53,9 @@ test('CONNECT TEST', function(t) {
5353
t.equal(message, String(incC++), '✅ message `'+message+'`');
5454
if (incS===16 && incC===16) {
5555
t.end();
56-
try {server.listener.close();
56+
try {
57+
server.listener.close();
58+
nodeClient.socket.close();
5759
} catch(e) {process.exit();}
5860
}
5961
}

test/transports/reconnect.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ test('RECONNECT TEST', function(t) {
4343
nodeClient.on('reconnect', function(oldSocket) {
4444
t.equal(oldSocket, socketClient, '✅ reconnect');
4545
t.end();
46-
try {server.listener.close();
46+
try {
47+
server.listener.close();
48+
nodeClient.socket.close();
4749
} catch(e) {process.exit();}
4850
});
4951
});

test/transports/reconnectfail.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var dop = require('../../dist/nodejs');
33
var dopServer = dop.create();
44
var dopClient = dop.create();
55

6-
var transportName = process.argv[2] || 'sockjs';
6+
var transportName = process.argv[2] || 'local';
77
var transportListen = require('dop-transports').listen[transportName];
88
var transportConnect = require('dop-transports').connect[transportName];
99

@@ -33,7 +33,9 @@ test('RECONNECT TEST', function(t) {
3333
connected2 = true;
3434
t.notEqual(node.socket, socketServer, '❌ connect 2');
3535
t.end();
36-
try {server.listener.close();
36+
try {
37+
server.listener.close();
38+
nodeClient.socket.close();
3739
} catch(e) {process.exit();}
3840
}
3941
});

0 commit comments

Comments
 (0)