Skip to content

Commit fadeb7d

Browse files
Merge pull request #418 from darrachequesne/patch-2
Restoring require('ws') as separate expression for browserify.
2 parents 5301695 + 9bd8481 commit fadeb7d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lib/server.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function Server(opts){
3636

3737
opts = opts || {};
3838

39-
this.wsEngine = opts.wsEngine || process.env.EIO_WS_ENGINE || 'ws';
39+
this.wsEngine = opts.wsEngine || process.env.EIO_WS_ENGINE;
4040
this.pingTimeout = opts.pingTimeout || 60000;
4141
this.pingInterval = opts.pingInterval || 25000;
4242
this.upgradeTimeout = opts.upgradeTimeout || 10000;
@@ -70,7 +70,8 @@ function Server(opts){
7070

7171
// initialize websocket server
7272
if (~this.transports.indexOf('websocket')) {
73-
var WebSocketServer = require(this.wsEngine).Server;
73+
// keep require('ws') as separate expression for packers (browserify, etc)
74+
var WebSocketServer = (this.wsEngine ? require(this.wsEngine) : require('ws')).Server;
7475
this.ws = new WebSocketServer({
7576
noServer: true,
7677
clientTracking: false,

0 commit comments

Comments
 (0)