chore(release): 4.1.3

Diff: https://github.com/socketio/socket.io/compare/4.1.2...4.1.3

.github/workflows/ci.yml

@@ -12,12 +12,12 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x, 15.x]
+        node-version: [12, 14, 16]
 
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm ci

CHANGELOG.md

@@ -1,3 +1,30 @@
+## [4.1.3](https://github.com/socketio/socket.io/compare/4.1.2...4.1.3) (2021-07-10)
+
+
+### Bug Fixes
+
+* fix io.except() method ([94e27cd](https://github.com/socketio/socket.io/commit/94e27cd072c8a4eeb9636f6ffbb7a21d382f36b0))
+* remove x-sourcemap header ([a4dffc6](https://github.com/socketio/socket.io/commit/a4dffc6527f412d51a786ae5bf2e9080fe1ca63c))
+
+
+## [4.1.2](https://github.com/socketio/socket.io/compare/4.1.1...4.1.2) (2021-05-17)
+
+
+### Bug Fixes
+
+* **typings:** ensure compatibility with TypeScript 3.x ([0cb6ac9](https://github.com/socketio/socket.io/commit/0cb6ac95b49a27483b6f1b6402fa54b35f82e36f))
+* ensure compatibility with previous versions of the adapter ([a2cf248](https://github.com/socketio/socket.io/commit/a2cf2486c366cb62293101c10520c57f6984a3fc))
+
+
+## [4.1.1](https://github.com/socketio/socket.io/compare/4.1.0...4.1.1) (2021-05-11)
+
+
+### Bug Fixes
+
+* **typings:** properly type server-side events ([b84ed1e](https://github.com/socketio/socket.io/commit/b84ed1e41c9053792caf58974c5de9395bfd509f))
+* **typings:** properly type the adapter attribute ([891b187](https://github.com/socketio/socket.io/commit/891b1870e92d1ec38910f03bb839817e2d6be65a))
+
+
 # [4.1.0](https://github.com/socketio/socket.io/compare/4.0.2...4.1.0) (2021-05-11)
 
 

client-dist/socket.io.js

@@ -1,5 +1,5 @@
 /*!
- * Socket.IO v4.1.0
+ * Socket.IO v4.1.3
  * (c) 2014-2021 Guillermo Rauch
  * Released under the MIT License.
  */
@@ -247,7 +247,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
@@ -781,7 +781,7 @@ exports.on = on;
 
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
@@ -807,7 +807,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
@@ -896,13 +896,18 @@ var Socket = /*#__PURE__*/function (_typed_events_1$Stric) {
      */
 
   }, {
-    key: "connect",
-
+    key: "active",
+    get: function get() {
+      return !!this.subs;
+    }
     /**
      * "Opens" the socket.
      *
      * @public
      */
+
+  }, {
+    key: "connect",
     value: function connect() {
       if (this.connected) return this;
       this.subEvents();
@@ -1335,8 +1340,11 @@ var Socket = /*#__PURE__*/function (_typed_events_1$Stric) {
      */
 
   }, {
-    key: "onAny",
-
+    key: "volatile",
+    get: function get() {
+      this.flags["volatile"] = true;
+      return this;
+    }
     /**
      * Adds a listener that will be fired when any event is emitted. The event name is passed as the first argument to the
      * callback.
@@ -1344,6 +1352,9 @@ var Socket = /*#__PURE__*/function (_typed_events_1$Stric) {
      * @param listener
      * @public
      */
+
+  }, {
+    key: "onAny",
     value: function onAny(listener) {
       this._anyListeners = this._anyListeners || [];
 
@@ -1409,17 +1420,6 @@ var Socket = /*#__PURE__*/function (_typed_events_1$Stric) {
     value: function listenersAny() {
       return this._anyListeners || [];
     }
-  }, {
-    key: "active",
-    get: function get() {
-      return !!this.subs;
-    }
-  }, {
-    key: "volatile",
-    get: function get() {
-      this.flags["volatile"] = true;
-      return this;
-    }
   }]);
 
   return Socket;
@@ -1461,7 +1461,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
@@ -1499,14 +1499,14 @@ var StrictEventEmitter = /*#__PURE__*/function (_Emitter) {
 
   _createClass(StrictEventEmitter, [{
     key: "on",
-
+    value:
     /**
      * Adds the `listener` function as an event listener for `ev`.
      *
      * @param ev Name of the event
      * @param listener Callback function
      */
-    value: function on(ev, listener) {
+    function on(ev, listener) {
       _get(_getPrototypeOf(StrictEventEmitter.prototype), "on", this).call(this, ev, listener);
 
       return this;
@@ -2150,7 +2150,7 @@ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread n
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
@@ -2494,7 +2494,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
@@ -2883,6 +2883,7 @@ var Socket = /*#__PURE__*/function (_Emitter) {
           case "ping":
             this.resetPingTimeout();
             this.sendPacket("pong");
+            this.emit("ping");
             this.emit("pong");
             break;
 
@@ -3223,7 +3224,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
@@ -3464,7 +3465,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
@@ -3519,13 +3520,18 @@ var JSONPPolling = /*#__PURE__*/function (_Polling) {
 
 
   _createClass(JSONPPolling, [{
-    key: "doClose",
-
+    key: "supportsBinary",
+    get: function get() {
+      return false;
+    }
     /**
      * Closes the socket.
      *
      * @api private
      */
+
+  }, {
+    key: "doClose",
     value: function doClose() {
       if (this.script) {
         // prevent spurious errors from being emitted when the window is unloaded
@@ -3673,11 +3679,6 @@ var JSONPPolling = /*#__PURE__*/function (_Polling) {
         this.iframe.onload = complete;
       }
     }
-  }, {
-    key: "supportsBinary",
-    get: function get() {
-      return false;
-    }
   }]);
 
   return JSONPPolling;
@@ -3714,7 +3715,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
@@ -4135,7 +4136,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
@@ -4161,14 +4162,23 @@ var Polling = /*#__PURE__*/function (_Transport) {
   }
 
   _createClass(Polling, [{
-    key: "doOpen",
-
+    key: "name",
+    get:
+    /**
+     * Transport name.
+     */
+    function get() {
+      return "polling";
+    }
     /**
      * Opens the socket (triggers polling). We write a PING message to determine
      * when the transport is open.
      *
      * @api private
      */
+
+  }, {
+    key: "doOpen",
     value: function doOpen() {
       this.poll();
     }
@@ -4361,15 +4371,6 @@ var Polling = /*#__PURE__*/function (_Transport) {
       var ipv6 = this.opts.hostname.indexOf(":") !== -1;
       return schema + "://" + (ipv6 ? "[" + this.opts.hostname + "]" : this.opts.hostname) + port + this.opts.path + query;
     }
-  }, {
-    key: "name",
-
-    /**
-     * Transport name.
-     */
-    get: function get() {
-      return "polling";
-    }
   }]);
 
   return Polling;
@@ -4388,10 +4389,25 @@ module.exports = Polling;
 
 var globalThis = __webpack_require__(/*! ../globalThis */ "./node_modules/engine.io-client/lib/globalThis.browser.js");
 
+var nextTick = function () {
+  var isPromiseAvailable = typeof Promise === "function" && typeof Promise.resolve === "function";
+
+  if (isPromiseAvailable) {
+    return function (cb) {
+      return Promise.resolve().then(cb);
+    };
+  } else {
+    return function (cb) {
+      return setTimeout(cb, 0);
+    };
+  }
+}();
+
 module.exports = {
   WebSocket: globalThis.WebSocket || globalThis.MozWebSocket,
   usingBrowserWebSocket: true,
-  defaultBinaryType: "arraybuffer"
+  defaultBinaryType: "arraybuffer",
+  nextTick: nextTick
 };
 
 /***/ }),
@@ -4421,7 +4437,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
@@ -4439,7 +4455,8 @@ var _require = __webpack_require__(/*! ../util */ "./node_modules/engine.io-clie
 var _require2 = __webpack_require__(/*! ./websocket-constructor */ "./node_modules/engine.io-client/lib/transports/websocket-constructor.browser.js"),
     WebSocket = _require2.WebSocket,
     usingBrowserWebSocket = _require2.usingBrowserWebSocket,
-    defaultBinaryType = _require2.defaultBinaryType;
+    defaultBinaryType = _require2.defaultBinaryType,
+    nextTick = _require2.nextTick;
 
 var debug = __webpack_require__(/*! debug */ "./node_modules/debug/src/browser.js")("engine.io-client:websocket"); // detect ReactNative environment
 
@@ -4474,13 +4491,18 @@ var WS = /*#__PURE__*/function (_Transport) {
 
 
   _createClass(WS, [{
-    key: "doOpen",
-
+    key: "name",
+    get: function get() {
+      return "websocket";
+    }
     /**
      * Opens socket.
      *
      * @api private
      */
+
+  }, {
+    key: "doOpen",
     value: function doOpen() {
       if (!this.check()) {
         // let probe timeout
@@ -4587,11 +4609,11 @@ var WS = /*#__PURE__*/function (_Transport) {
           if (lastPacket) {
             // fake drain
             // defer to next tick to allow Socket to clear writeBuffer
-            setTimeout(function () {
+            nextTick(function () {
               _this3.writable = true;
 
               _this3.emit("drain");
-            }, 0);
+            });
           }
         });
       };
@@ -4673,11 +4695,6 @@ var WS = /*#__PURE__*/function (_Transport) {
     value: function check() {
       return !!WebSocket && !("__initialize" in WebSocket && this.name === WS.prototype.name);
     }
-  }, {
-    key: "name",
-    get: function get() {
-      return "websocket";
-    }
   }]);
 
   return WS;
@@ -5527,7 +5544,7 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
@@ -5580,14 +5597,14 @@ var Encoder = /*#__PURE__*/function () {
 
   _createClass(Encoder, [{
     key: "encode",
-
+    value:
     /**
      * Encode a packet as a single string if non-binary, or as a
      * buffer sequence, depending on packet type.
      *
      * @param {Object} obj - packet object
      */
-    value: function encode(obj) {
+    function encode(obj) {
       debug("encoding packet %j", obj);
 
       if (obj.type === PacketType.EVENT || obj.type === PacketType.ACK) {
@@ -5800,11 +5817,11 @@ var Decoder = /*#__PURE__*/function (_Emitter) {
     }
   }, {
     key: "destroy",
-
+    value:
     /**
      * Deallocates a parser's resources
      */
-    value: function destroy() {
+    function destroy() {
       if (this.reconstructor) {
         this.reconstructor.finishedReconstruction();
       }

examples/webpack-build-server/index.js

@@ -0,0 +1,20 @@
+const { Server } = require("socket.io");
+
+const clientFile = require("./node_modules/socket.io/client-dist/socket.io.min?raw");
+const clientMap = require("./node_modules/socket.io/client-dist/socket.io.min.js.map?raw");
+
+Server.sendFile = (filename, req, res) => {
+  res.end(filename.endsWith(".map") ? clientMap : clientFile);
+};
+
+const io = new Server();
+
+io.on("connection", socket => {
+  console.log(`connect ${socket.id}`);
+
+  socket.on("disconnect", (reason) => {
+    console.log(`disconnect ${socket.id} due to ${reason}`);
+  });
+});
+
+io.listen(3000);

examples/webpack-build-server/lib/index.js

@@ -1,15 +0,0 @@
-
-const server = require('http').createServer();
-const io = require('socket.io')(server, {
-  serveClient: false
-});
-const port = process.env.PORT || 3000;
-
-io.on('connect', onConnect);
-server.listen(port, () => console.log('server listening on port ' + port));
-
-function onConnect(socket){
-  console.log('connect ' + socket.id);
-
-  socket.on('disconnect', () => console.log('disconnect ' + socket.id));
-}

examples/webpack-build-server/package.json

@@ -4,13 +4,15 @@
   "description": "A sample Webpack build (for the server)",
   "scripts": {
     "start": "node dist/server.js",
-    "build": "webpack --config ./support/webpack.config.js"
+    "build": "webpack"
   },
   "author": "Damien Arrachequesne",
   "license": "MIT",
   "devDependencies": {
+    "bufferutil": "^4.0.3",
     "socket.io": "^4.0.0",
-    "webpack": "~4.43.0",
-    "webpack-cli": "~3.3.11"
+    "utf-8-validate": "^5.0.5",
+    "webpack": "^5.39.0",
+    "webpack-cli": "^4.7.2"
   }
 }

examples/webpack-build-server/support/webpack.config.js

@@ -1,10 +0,0 @@
-
-module.exports = {
-  entry: './lib/index.js',
-  target: 'node',
-  output: {
-    path: require('path').join(__dirname, '../dist'),
-    filename: 'server.js'
-  },
-  mode: 'production'
-};

examples/webpack-build-server/webpack.config.js

@@ -0,0 +1,19 @@
+const path = require("path");
+
+module.exports = {
+  entry: "./index.js",
+  target: "node",
+  mode: "production",
+  output: {
+    path: path.resolve(__dirname, "dist"),
+    filename: "index.js",
+  },
+  module: {
+    rules: [
+      {
+        resourceQuery: /raw/,
+        type: "asset/source",
+      },
+    ],
+  },
+};

lib/broadcast-operator.ts

@@ -10,7 +10,8 @@ import type {
 } from "./typed-events";
 
 export class BroadcastOperator<EmitEvents extends EventsMap>
-  implements TypedEventBroadcaster<EmitEvents> {
+  implements TypedEventBroadcaster<EmitEvents>
+{
   constructor(
     private readonly adapter: Adapter,
     private readonly rooms: Set<Room> = new Set<Room>(),
@@ -186,7 +187,7 @@ export class BroadcastOperator<EmitEvents extends EventsMap>
         return sockets.map((socket) => {
           if (socket instanceof Socket) {
             // FIXME the TypeScript compiler complains about missing private properties
-            return (socket as unknown) as RemoteSocket<EmitEvents>;
+            return socket as unknown as RemoteSocket<EmitEvents>;
           } else {
             return new RemoteSocket(this.adapter, socket as SocketDetails);
           }
@@ -257,7 +258,8 @@ interface SocketDetails {
  * Expose of subset of the attributes and methods of the Socket class
  */
 export class RemoteSocket<EmitEvents extends EventsMap>
-  implements TypedEventBroadcaster<EmitEvents> {
+  implements TypedEventBroadcaster<EmitEvents>
+{
   public readonly id: SocketId;
   public readonly handshake: Handshake;
   public readonly rooms: Set<Room>;

lib/client.ts

@@ -13,6 +13,7 @@ const debug = debugModule("socket.io:client");
 interface WriteOptions {
   compress?: boolean;
   volatile?: boolean;
+  preEncoded?: boolean;
   wsPreEncoded?: string;
 }
 
@@ -200,12 +201,14 @@ export class Client<
    * @param {Object} opts
    * @private
    */
-  _packet(packet: Packet, opts: WriteOptions = {}): void {
+  _packet(packet: Packet | any[], opts: WriteOptions = {}): void {
     if (this.conn.readyState !== "open") {
       debug("ignoring packet write %j", packet);
       return;
     }
-    const encodedPackets = this.encoder.encode(packet);
+    const encodedPackets = opts.preEncoded
+      ? (packet as any[]) // previous versions of the adapter incorrectly used socket.packet() instead of writeToEngine()
+      : this.encoder.encode(packet as Packet);
     for (const encodedPacket of encodedPackets) {
       this.writeToEngine(encodedPacket, opts);
     }

lib/index.ts

@@ -37,6 +37,8 @@ type ParentNspNameMatchFn = (
   fn: (err: Error | null, success: boolean) => void
 ) => void;
 
+type AdapterConstructor = typeof Adapter | ((nsp: Namespace) => Adapter);
+
 interface EngineOptions {
   /**
    * how many ms without a pong packet to consider the connection closed
@@ -152,7 +154,7 @@ interface ServerOptions extends EngineAttachOptions {
    * the adapter to use
    * @default the in-memory adapter (https://github.com/socketio/socket.io-adapter)
    */
-  adapter: any;
+  adapter: AdapterConstructor;
   /**
    * the parser to use
    * @default the default parser (https://github.com/socketio/socket.io-parser)
@@ -168,7 +170,7 @@ interface ServerOptions extends EngineAttachOptions {
 export class Server<
   ListenEvents extends EventsMap = DefaultEventsMap,
   EmitEvents extends EventsMap = ListenEvents,
-  ServerSideEvents extends EventsMap = {}
+  ServerSideEvents extends EventsMap = DefaultEventsMap
 > extends StrictEventEmitter<
   ServerSideEvents,
   EmitEvents,
@@ -199,15 +201,13 @@ export class Server<
   /**
    * @private
    */
-  _nsps: Map<
-    string,
-    Namespace<ListenEvents, EmitEvents, ServerSideEvents>
-  > = new Map();
+  _nsps: Map<string, Namespace<ListenEvents, EmitEvents, ServerSideEvents>> =
+    new Map();
   private parentNsps: Map<
     ParentNspNameMatchFn,
     ParentNamespace<ListenEvents, EmitEvents, ServerSideEvents>
   > = new Map();
-  private _adapter?: typeof Adapter;
+  private _adapter?: AdapterConstructor;
   private _serveClient: boolean;
   private opts: Partial<EngineOptions>;
   private eio;
@@ -360,10 +360,11 @@ export class Server<
    * @return self when setting or value when getting
    * @public
    */
-  public adapter(): typeof Adapter | undefined;
-  public adapter(v: typeof Adapter): this;
-  public adapter(v?: typeof Adapter): typeof Adapter | undefined | this;
-  public adapter(v?: typeof Adapter): typeof Adapter | undefined | this {
+  public adapter(): AdapterConstructor | undefined;
+  public adapter(v: AdapterConstructor): this;
+  public adapter(
+    v?: AdapterConstructor
+  ): AdapterConstructor | undefined | this {
     if (!arguments.length) return this._adapter;
     this._adapter = v;
     for (const nsp of this._nsps.values()) {
@@ -514,9 +515,6 @@ export class Server<
     );
     res.setHeader("ETag", expectedEtag);
 
-    if (!isMap) {
-      res.setHeader("X-SourceMap", filename.substring(1) + ".map");
-    }
     Server.sendFile(filename, req, res);
   }
 
@@ -702,11 +700,8 @@ export class Server<
    * @return self
    * @public
    */
-  public except(
-    name: Room | Room[]
-  ): Server<ListenEvents, EmitEvents, ServerSideEvents> {
-    this.sockets.except(name);
-    return this;
+  public except(name: Room | Room[]): BroadcastOperator<EmitEvents> {
+    return this.sockets.except(name);
   }
 
   /**

lib/namespace.ts

@@ -50,7 +50,7 @@ export const RESERVED_EVENTS: ReadonlySet<string | Symbol> = new Set<
 export class Namespace<
   ListenEvents extends EventsMap = DefaultEventsMap,
   EmitEvents extends EventsMap = ListenEvents,
-  ServerSideEvents extends EventsMap = {}
+  ServerSideEvents extends EventsMap = DefaultEventsMap
 > extends StrictEventEmitter<
   ServerSideEvents,
   EmitEvents,
@@ -102,6 +102,7 @@ export class Namespace<
    * @private
    */
   _initAdapter(): void {
+    // @ts-ignore
     this.adapter = new (this.server.adapter()!)(this);
   }
 
@@ -306,9 +307,8 @@ export class Namespace<
    *
    * @private
    */
-  _onServerSideEmit(args: any[]) {
-    const event = args.shift();
-    this.emitUntyped(event, args);
+  _onServerSideEmit(args: [string, ...any[]]) {
+    super.emitUntyped.apply(this, args);
   }
 
   /**

lib/parent-namespace.ts

@@ -11,12 +11,11 @@ import type { BroadcastOptions } from "socket.io-adapter";
 export class ParentNamespace<
   ListenEvents extends EventsMap = DefaultEventsMap,
   EmitEvents extends EventsMap = ListenEvents,
-  ServerSideEvents extends EventsMap = {}
+  ServerSideEvents extends EventsMap = DefaultEventsMap
 > extends Namespace<ListenEvents, EmitEvents, ServerSideEvents> {
   private static count: number = 0;
-  private children: Set<
-    Namespace<ListenEvents, EmitEvents, ServerSideEvents>
-  > = new Set();
+  private children: Set<Namespace<ListenEvents, EmitEvents, ServerSideEvents>> =
+    new Set();
 
   constructor(server: Server<ListenEvents, EmitEvents, ServerSideEvents>) {
     super(server, "/_" + ParentNamespace.count++);

lib/socket.ts

@@ -111,7 +111,7 @@ export interface Handshake {
 export class Socket<
   ListenEvents extends EventsMap = DefaultEventsMap,
   EmitEvents extends EventsMap = ListenEvents,
-  ServerSideEvents extends EventsMap = {}
+  ServerSideEvents extends EventsMap = DefaultEventsMap
 > extends StrictEventEmitter<
   ListenEvents,
   EmitEvents,
@@ -130,9 +130,8 @@ export class Socket<
   private readonly server: Server<ListenEvents, EmitEvents, ServerSideEvents>;
   private readonly adapter: Adapter;
   private acks: Map<number, () => void> = new Map();
-  private fns: Array<
-    (event: Array<any>, next: (err?: Error) => void) => void
-  > = [];
+  private fns: Array<(event: Array<any>, next: (err?: Error) => void) => void> =
+    [];
   private flags: BroadcastFlags = {};
   private _anyListeners?: Array<(...args: any[]) => void>;
 

lib/typed-events.ts

@@ -91,7 +91,8 @@ export abstract class StrictEventEmitter<
     ReservedEvents extends EventsMap = {}
   >
   extends EventEmitter
-  implements TypedEventBroadcaster<EmitEvents> {
+  implements TypedEventBroadcaster<EmitEvents>
+{
   /**
    * Adds the `listener` function as an event listener for `ev`.
    *

package.json

@@ -1,6 +1,6 @@
 {
   "name": "socket.io",
-  "version": "4.1.0",
+  "version": "4.1.3",
   "description": "node.js realtime framework server",
   "keywords": [
     "realtime",
@@ -46,32 +46,29 @@
   },
   "dependencies": {
     "@types/cookie": "^0.4.0",
-    "@types/cors": "^2.8.8",
+    "@types/cors": "^2.8.10",
     "@types/node": ">=10.0.0",
     "accepts": "~1.3.4",
     "base64id": "~2.0.0",
     "debug": "~4.3.1",
-    "engine.io": "~5.1.0",
-    "socket.io-adapter": "~2.3.0",
-    "socket.io-parser": "~4.0.3"
+    "engine.io": "~5.1.1",
+    "socket.io-adapter": "~2.3.1",
+    "socket.io-parser": "~4.0.4"
   },
   "devDependencies": {
-    "@types/mocha": "^8.0.4",
-    "babel-eslint": "^10.1.0",
-    "eslint": "^7.14.0",
-    "eslint-config-prettier": "^6.11.0",
+    "@types/mocha": "^8.2.2",
     "expect.js": "0.3.1",
     "mocha": "^3.5.3",
     "nyc": "^15.1.0",
-    "prettier": "^2.2.0",
+    "prettier": "^2.3.2",
     "rimraf": "^3.0.2",
-    "socket.io-client": "4.1.0",
+    "socket.io-client": "4.1.3",
     "socket.io-client-v2": "npm:socket.io-client@^2.4.0",
     "superagent": "^6.1.0",
-    "supertest": "^6.0.1",
-    "ts-node": "^9.0.0",
-    "tsd": "^0.14.0",
-    "typescript": "^4.1.2"
+    "supertest": "^6.1.3",
+    "ts-node": "^10.0.0",
+    "tsd": "^0.17.0",
+    "typescript": "^4.3.5"
   },
   "contributors": [
     {

test/socket.io.test-d.ts

@@ -1,8 +1,9 @@
 "use strict";
-import { Server, Socket } from "..";
+import { Namespace, Server, Socket } from "..";
 import type { DefaultEventsMap } from "../lib/typed-events";
 import { createServer } from "http";
 import { expectError, expectType } from "tsd";
+import { Adapter } from "socket.io-adapter";
 
 // This file is run by tsd, not mocha.
 
@@ -117,7 +118,9 @@ describe("server", () => {
 
       it("does not accept arguments of wrong types", (done) => {
         const srv = createServer();
-        const sio = new Server<BidirectionalEvents>(srv);
+        const sio = new Server<BidirectionalEvents, BidirectionalEvents, {}>(
+          srv
+        );
         expectError(sio.on("random", (a, b, c) => {}));
         srv.listen(() => {
           expectError(sio.on("wrong name", (s) => {}));
@@ -273,4 +276,25 @@ describe("server", () => {
       });
     });
   });
+
+  describe("adapter", () => {
+    it("accepts arguments of the correct types", () => {
+      const io = new Server({
+        adapter: (nsp) => new Adapter(nsp),
+      });
+      io.adapter(Adapter);
+
+      class MyCustomAdapter extends Adapter {
+        constructor(nsp, readonly opts) {
+          super(nsp);
+        }
+      }
+      io.adapter((nsp) => new MyCustomAdapter(nsp, { test: "123" }));
+    });
+
+    it("does not accept arguments of wrong types", () => {
+      const io = new Server();
+      expectError(io.adapter((nsp) => "nope"));
+    });
+  });
 });

test/socket.io.ts

@@ -59,7 +59,7 @@ describe("socket.io", () => {
             if (err) return done(err);
             expect(res.headers["content-type"]).to.be("application/javascript");
             expect(res.headers.etag).to.be('"' + clientVersion + '"');
-            expect(res.headers["x-sourcemap"]).to.be(filename + ".map");
+            expect(res.headers["x-sourcemap"]).to.be(undefined);
             expect(res.text).to.match(/engine\.io/);
             expect(res.status).to.be(200);
             done();
@@ -836,6 +836,27 @@ describe("socket.io", () => {
     });
 
     it("should exclude a specific socket when emitting", (done) => {
+      const srv = createServer();
+      const io = new Server(srv);
+
+      srv.listen(() => {
+        const socket1 = client(srv, "/");
+        const socket2 = client(srv, "/");
+
+        socket2.on("a", () => {
+          done(new Error("should not happen"));
+        });
+        socket1.on("a", () => {
+          done();
+        });
+
+        socket2.on("connect", () => {
+          io.except(socket2.id).emit("a");
+        });
+      });
+    });
+
+    it("should exclude a specific socket when emitting (in a namespace)", (done) => {
       const srv = createServer();
       const sio = new Server(srv);