Do not pass protocols or options to browser WebSocket constructor

Fixes #309
sockjs · May 20, 2016 · 94a1bec · 94a1bec
1 parent 234b3c1
commit 94a1bec
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/lib/transport/browser/websocket.js b/lib/transport/browser/websocket.js
@@ -1 +1,8 @@
-module.exports = global.WebSocket || global.MozWebSocket;
+'use strict';
+
+var Driver = global.WebSocket || global.MozWebSocket;
+if (Driver) {
+	module.exports = function WebSocketBrowserDriver(url) {
+		return new Driver(url);
+	};
+}
diff --git a/lib/transport/websocket.js b/lib/transport/websocket.js
@@ -29,7 +29,7 @@ function WebSocketTransport(transUrl, ignore, options) {
   }
   this.url = url;
 
-  this.ws = new WebsocketDriver(this.url, undefined, options);
+  this.ws = new WebsocketDriver(this.url, [], options);
   this.ws.onmessage = function(e) {
     debug('message event', e.data);
     self.emit('message', e.data);

diff --git a/tests/node.js b/tests/node.js
@@ -1,6 +1,6 @@
 'use strict';
 
-require('./support/sockjs_server');
+var server = require('./support/sockjs_server');
 
 require('./lib/main');
 require('./lib/main-node');
@@ -9,3 +9,7 @@ require('./lib/receivers');
 require('./lib/senders');
 require('./lib/end-to-end');
 require('./lib/transports');
+
+after(function() {
+	server.close();
+});
diff --git a/tests/support/sockjs_server.js b/tests/support/sockjs_server.js
@@ -74,3 +74,5 @@ sockjs.install({
 
 console.log(' [*] Listening on', port);
 server.listen(port);
+
+module.exports = server;