Skip to content

Commit 94a1bec

Browse files
committed
Do not pass protocols or options to browser WebSocket constructor
Fixes #309
1 parent 234b3c1 commit 94a1bec

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

lib/transport/browser/websocket.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
module.exports = global.WebSocket || global.MozWebSocket;
1+
'use strict';
2+
3+
var Driver = global.WebSocket || global.MozWebSocket;
4+
if (Driver) {
5+
module.exports = function WebSocketBrowserDriver(url) {
6+
return new Driver(url);
7+
};
8+
}

lib/transport/websocket.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function WebSocketTransport(transUrl, ignore, options) {
2929
}
3030
this.url = url;
3131

32-
this.ws = new WebsocketDriver(this.url, undefined, options);
32+
this.ws = new WebsocketDriver(this.url, [], options);
3333
this.ws.onmessage = function(e) {
3434
debug('message event', e.data);
3535
self.emit('message', e.data);

tests/node.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
require('./support/sockjs_server');
3+
var server = require('./support/sockjs_server');
44

55
require('./lib/main');
66
require('./lib/main-node');
@@ -9,3 +9,7 @@ require('./lib/receivers');
99
require('./lib/senders');
1010
require('./lib/end-to-end');
1111
require('./lib/transports');
12+
13+
after(function() {
14+
server.close();
15+
});

tests/support/sockjs_server.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,5 @@ sockjs.install({
7474

7575
console.log(' [*] Listening on', port);
7676
server.listen(port);
77+
78+
module.exports = server;

0 commit comments

Comments
 (0)