diff --git a/lib/server.js b/lib/server.js index 55c256a91..3f478d6cc 100644 --- a/lib/server.js +++ b/lib/server.js @@ -36,7 +36,7 @@ function Server(opts){ opts = opts || {}; - this.wsEngine = opts.wsEngine || process.env.EIO_WS_ENGINE || 'ws'; + this.wsEngine = opts.wsEngine || process.env.EIO_WS_ENGINE; this.pingTimeout = opts.pingTimeout || 60000; this.pingInterval = opts.pingInterval || 25000; this.upgradeTimeout = opts.upgradeTimeout || 10000; @@ -70,7 +70,8 @@ function Server(opts){ // initialize websocket server if (~this.transports.indexOf('websocket')) { - var WebSocketServer = require(this.wsEngine).Server; + // keep require('ws') as separate expression for packers (browserify, etc) + var WebSocketServer = (this.wsEngine ? require(this.wsEngine) : require('ws')).Server; this.ws = new WebSocketServer({ noServer: true, clientTracking: false,