From 57f9d457d593429cd66c6f1e1909835ac1fce456 Mon Sep 17 00:00:00 2001 From: Damien Arrachequesne Date: Sun, 20 Jan 2019 22:59:42 +0100 Subject: [PATCH] [chore] Release 3.3.2 --- engine.io.js | 18 +++++++++++------- package.json | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/engine.io.js b/engine.io.js index 76f74851d..1c70c233f 100644 --- a/engine.io.js +++ b/engine.io.js @@ -4297,13 +4297,17 @@ return /******/ (function(modules) { // webpackBootstrap var inherit = __webpack_require__(19); var yeast = __webpack_require__(20); var debug = __webpack_require__(21)('engine.io-client:websocket'); + var BrowserWebSocket, NodeWebSocket; - if (typeof self === 'undefined') { + + if (typeof WebSocket !== 'undefined') { + BrowserWebSocket = WebSocket; + } else if (typeof self !== 'undefined') { + BrowserWebSocket = self.WebSocket || self.MozWebSocket; + } else { try { NodeWebSocket = __webpack_require__(27); } catch (e) {} - } else { - BrowserWebSocket = self.WebSocket || self.MozWebSocket; } /** @@ -4312,7 +4316,7 @@ return /******/ (function(modules) { // webpackBootstrap * interface exposed by `ws` for Node-like environment. */ - var WebSocket = BrowserWebSocket || NodeWebSocket; + var WebSocketImpl = BrowserWebSocket || NodeWebSocket; /** * Module exports. @@ -4336,7 +4340,7 @@ return /******/ (function(modules) { // webpackBootstrap this.usingBrowserWebSocket = BrowserWebSocket && !opts.forceNode; this.protocols = opts.protocols; if (!this.usingBrowserWebSocket) { - WebSocket = NodeWebSocket; + WebSocketImpl = NodeWebSocket; } Transport.call(this, opts); } @@ -4396,7 +4400,7 @@ return /******/ (function(modules) { // webpackBootstrap } try { - this.ws = this.usingBrowserWebSocket && !this.isReactNative ? protocols ? new WebSocket(uri, protocols) : new WebSocket(uri) : new WebSocket(uri, protocols, opts); + this.ws = this.usingBrowserWebSocket && !this.isReactNative ? protocols ? new WebSocketImpl(uri, protocols) : new WebSocketImpl(uri) : new WebSocketImpl(uri, protocols, opts); } catch (err) { return this.emit('error', err); } @@ -4568,7 +4572,7 @@ return /******/ (function(modules) { // webpackBootstrap */ WS.prototype.check = function () { - return !!WebSocket && !('__initialize' in WebSocket && this.name === WS.prototype.name); + return !!WebSocketImpl && !('__initialize' in WebSocketImpl && this.name === WS.prototype.name); }; /***/ }, diff --git a/package.json b/package.json index 004b1130d..9735f7022 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "engine.io-client", "description": "Client for the realtime Engine", "license": "MIT", - "version": "3.3.1", + "version": "3.3.2", "main": "lib/index.js", "homepage": "https://github.com/socketio/engine.io-client", "contributors": [