test: build examples in the CI (#3856)

Updated docker compose to be in line with current practices.

Reference: https://docs.docker.com/compose/

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: 'bug'
+labels: 'to triage'
 assignees: ''
 
 ---

.github/workflows/ci.yml

@@ -24,3 +24,31 @@ jobs:
       - run: npm test
         env:
           CI: true
+
+  build-examples:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    strategy:
+      fail-fast: false
+      matrix:
+        example:
+          - custom-parsers
+          - typescript
+          - webpack-build
+          - webpack-build-server
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        
+      - name: Use Node.js 20
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          
+      - name: Build ${{ matrix.example }}
+        run: |
+          cd examples/${{ matrix.example }}
+          npm install
+          npm run build

CHANGELOG.md

@@ -1,3 +1,59 @@
+## [4.4.1](https://github.com/socketio/socket.io/compare/4.4.0...4.4.1) (2022-01-06)
+
+
+### Bug Fixes
+
+* **types:** make `RemoteSocket.data` type safe ([#4234](https://github.com/socketio/socket.io/issues/4234)) ([770ee59](https://github.com/socketio/socket.io/commit/770ee5949fb47c2556876c622f06c862573657d6))
+* **types:** pass `SocketData` type to custom namespaces ([#4233](https://github.com/socketio/socket.io/issues/4233)) ([f2b8de7](https://github.com/socketio/socket.io/commit/f2b8de71919e1b4d3e57f15a459972c1d1064787))
+
+
+
+# [4.4.0](https://github.com/socketio/socket.io/compare/4.3.2...4.4.0) (2021-11-18)
+
+
+### Bug Fixes
+
+* only set 'connected' to true after middleware execution ([02b0f73](https://github.com/socketio/socket.io/commit/02b0f73e2c64b09c72c5fbf7dc5f059557bdbe50))
+
+
+### Features
+
+* add an implementation based on uWebSockets.js ([c0d8c5a](https://github.com/socketio/socket.io/commit/c0d8c5ab234d0d2bef0d0dec472973cc9662f647))
+* add timeout feature ([f0ed42f](https://github.com/socketio/socket.io/commit/f0ed42f18cabef20ad976aeec37077b6bf3837a5))
+* add type information to `socket.data` ([#4159](https://github.com/socketio/socket.io/issues/4159)) ([fe8730c](https://github.com/socketio/socket.io/commit/fe8730ca0f15bc92d5de81cf934c89c76d6af329))
+
+
+
+## [4.3.2](https://github.com/socketio/socket.io/compare/4.3.1...4.3.2) (2021-11-08)
+
+
+### Bug Fixes
+
+* fix race condition in dynamic namespaces ([#4137](https://github.com/socketio/socket.io/issues/4137)) ([9d86397](https://github.com/socketio/socket.io/commit/9d86397243bcbb5775a29d96e5ef03e17148a8e7))
+
+
+## [4.3.1](https://github.com/socketio/socket.io/compare/4.3.0...4.3.1) (2021-10-16)
+
+
+### Bug Fixes
+
+* fix server attachment ([#4127](https://github.com/socketio/socket.io/issues/4127)) ([0ef2a4d](https://github.com/socketio/socket.io/commit/0ef2a4d02c9350aff163df9cb61aece89c4dac0f))
+
+
+# [4.3.0](https://github.com/socketio/socket.io/compare/4.2.0...4.3.0) (2021-10-14)
+
+
+### Bug Fixes
+
+* **typings:** add name field to cookie option ([#4099](https://github.com/socketio/socket.io/issues/4099)) ([033c5d3](https://github.com/socketio/socket.io/commit/033c5d399a2b985afad32c1e4b0c16d764e248cd))
+* send volatile packets with binary attachments ([dc81fcf](https://github.com/socketio/socket.io/commit/dc81fcf461cfdbb5b34b1a5a96b84373754047d5))
+
+
+### Features
+
+* serve ESM bundle ([60edecb](https://github.com/socketio/socket.io/commit/60edecb3bd33801803cdcba0aefbafa381a2abb3))
+
+
 # [4.2.0](https://github.com/socketio/socket.io/compare/4.1.3...4.2.0) (2021-08-30)
 
 

Readme.md

@@ -2,8 +2,6 @@
 [![Run on Repl.it](https://repl.it/badge/github/socketio/socket.io)](https://replit.com/@socketio/socketio-minimal-example)
 [![Backers on Open Collective](https://opencollective.com/socketio/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/socketio/sponsors/badge.svg)](#sponsors)
 [![Build Status](https://github.com/socketio/socket.io/workflows/CI/badge.svg)](https://github.com/socketio/socket.io/actions)
-[![Dependency Status](https://david-dm.org/socketio/socket.io.svg)](https://david-dm.org/socketio/socket.io)
-[![devDependency Status](https://david-dm.org/socketio/socket.io/dev-status.svg)](https://david-dm.org/socketio/socket.io#info=devDependencies)
 [![NPM version](https://badge.fury.io/js/socket.io.svg)](https://www.npmjs.com/package/socket.io)
 ![Downloads](https://img.shields.io/npm/dm/socket.io.svg?style=flat)
 [![](https://slackin-socketio.now.sh/badge.svg)](https://slackin-socketio.now.sh)
@@ -22,7 +20,7 @@ Some implementations in other languages are also available:
 - [Swift](https://github.com/socketio/socket.io-client-swift)
 - [Dart](https://github.com/rikulo/socket.io-client-dart)
 - [Python](https://github.com/miguelgrinberg/python-socketio)
-- [.Net](https://github.com/Quobject/SocketIoClientDotNet)
+- [.NET](https://github.com/doghappy/socket.io-client-csharp)
 
 Its main features are:
 
@@ -115,6 +113,14 @@ io.on('connection', client => { ... });
 io.listen(3000);
 ```
 
+### Module syntax 
+
+```js
+import { Server } from "socket.io";
+const io = new Server(server);
+io.listen(3000);
+```
+
 ### In conjunction with Express
 
 Starting with **3.0**, express applications have become request handler

examples/basic-crud-application/server/lib/util.ts

@@ -7,8 +7,8 @@ export enum Errors {
 
 const errorValues: string[] = Object.values(Errors);
 
-export function sanitizeErrorMessage(message: string) {
-  if (errorValues.includes(message)) {
+export function sanitizeErrorMessage(message: any) {
+  if (typeof message === "string" && errorValues.includes(message)) {
     return message;
   } else {
     return "an unknown error has occurred";

examples/chat/README.md

@@ -6,7 +6,7 @@ A simple chat demo for Socket.IO
 ## How to use
 
 ```
-$ npm ci
+$ npm i
 $ npm start
 ```
 

examples/chat/public/main.js

@@ -264,14 +264,14 @@ $(function() {
     log('you have been disconnected');
   });
 
-  socket.on('reconnect', () => {
+  socket.io.on('reconnect', () => {
     log('you have been reconnected');
     if (username) {
       socket.emit('add user', username);
     }
   });
 
-  socket.on('reconnect_error', () => {
+  socket.io.on('reconnect_error', () => {
     log('attempt to reconnect has failed');
   });
 

examples/cluster-nginx/docker-compose.yml

@@ -1,56 +1,43 @@
+services:
+  nginx:
+    image: nginx:alpine
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+    ports:
+    - "3000:80"
 
-nginx:
-  build: ./nginx
-  links:
-    - server-john
-    - server-paul
-    - server-george
-    - server-ringo
-  ports:
-   - "3000:80"
-
-server-john:
-  build: ./server
-  links:
-    - redis
-  expose:
+  server-john:
+    build: ./server
+    expose:
     - "3000"
-  environment:
-    - NAME=John
+    environment:
+      - NAME=John
 
-server-paul:
-  build: ./server
-  links:
-    - redis
-  expose:
-    - "3000"
-  environment:
-    - NAME=Paul
+  server-paul:
+    build: ./server
+    expose:
+      - "3000"
+    environment:
+      - NAME=Paul
 
-server-george:
-  build: ./server
-  links:
-    - redis
-  expose:
-    - "3000"
-  environment:
-    - NAME=George
+  server-george:
+    build: ./server
+    expose:
+      - "3000"
+    environment:
+      - NAME=George
 
-server-ringo:
-  build: ./server
-  links:
-    - redis
-  expose:
-    - "3000"
-  environment:
-    - NAME=Ringo
+  server-ringo:
+    build: ./server
+    expose:
+      - "3000"
+    environment:
+      - NAME=Ringo
 
-client:
-  build: ./client
-  links:
-    - nginx
+  client:
+    build: ./client
 
-redis:
-  image: redis:alpine
-  expose:
-    - "6379"
+  redis:
+    image: redis:alpine
+    expose:
+      - "6379"

examples/cluster-nginx/nginx/Dockerfile

@@ -1,3 +0,0 @@
-
-FROM nginx:alpine
-COPY nginx.conf /etc/nginx/nginx.conf

examples/cluster-nginx/server/index.js

@@ -1,15 +1,18 @@
-// Setup basic express server
-var express = require('express');
-var app = express();
-var server = require('http').createServer(app);
-var io = require('socket.io')(server);
-var redis = require('socket.io-redis');
-var port = process.env.PORT || 3000;
-var serverName = process.env.NAME || 'Unknown';
+const express = require('express');
+const app = express();
+const server = require('http').createServer(app);
+const io = require('socket.io')(server);
+const { createAdapter } = require('@socket.io/redis-adapter');
+const { createClient } = require('redis');
+const port = process.env.PORT || 3000;
+const serverName = process.env.NAME || 'Unknown';
 
-io.adapter(redis({ host: 'redis', port: 6379 }));
+const pubClient = createClient({ host: 'redis', port: 6379 });
+const subClient = pubClient.duplicate();
 
-server.listen(port, function () {
+io.adapter(createAdapter(pubClient, subClient));
+
+server.listen(port, () => {
   console.log('Server listening at port %d', port);
   console.log('Hello, I\'m %s, how can I help?', serverName);
 });
@@ -19,15 +22,15 @@ app.use(express.static(__dirname + '/public'));
 
 // Chatroom
 
-var numUsers = 0;
+let numUsers = 0;
 
-io.on('connection', function (socket) {
+io.on('connection', socket => {
   socket.emit('my-name-is', serverName);
 
-  var addedUser = false;
+  let addedUser = false;
 
   // when the client emits 'new message', this listens and executes
-  socket.on('new message', function (data) {
+  socket.on('new message', data => {
     // we tell the client to execute 'new message'
     socket.broadcast.emit('new message', {
       username: socket.username,
@@ -36,7 +39,7 @@ io.on('connection', function (socket) {
   });
 
   // when the client emits 'add user', this listens and executes
-  socket.on('add user', function (username) {
+  socket.on('add user', username => {
     if (addedUser) return;
 
     // we store the username in the socket session for this client
@@ -54,21 +57,21 @@ io.on('connection', function (socket) {
   });
 
   // when the client emits 'typing', we broadcast it to others
-  socket.on('typing', function () {
+  socket.on('typing', () => {
     socket.broadcast.emit('typing', {
       username: socket.username
     });
   });
 
   // when the client emits 'stop typing', we broadcast it to others
-  socket.on('stop typing', function () {
+  socket.on('stop typing', () => {
     socket.broadcast.emit('stop typing', {
       username: socket.username
     });
   });
 
   // when the user disconnects.. perform this
-  socket.on('disconnect', function () {
+  socket.on('disconnect', () => {
     if (addedUser) {
       --numUsers;
 

examples/cluster-nginx/server/package.json

@@ -7,9 +7,10 @@
   "private": true,
   "license": "MIT",
   "dependencies": {
+    "@socket.io/redis-adapter": "^7.0.1",
     "express": "4.13.4",
-    "socket.io": "^4.0.0",
-    "socket.io-redis": "^6.0.1"
+    "redis": "^3.1.2",
+    "socket.io": "^4.0.0"
   },
   "scripts": {
     "start": "node index.js"

lib/broadcast-operator.ts

@@ -9,7 +9,7 @@ import type {
   TypedEventBroadcaster,
 } from "./typed-events";
 
-export class BroadcastOperator<EmitEvents extends EventsMap>
+export class BroadcastOperator<EmitEvents extends EventsMap, SocketData>
   implements TypedEventBroadcaster<EmitEvents>
 {
   constructor(
@@ -26,7 +26,7 @@ export class BroadcastOperator<EmitEvents extends EventsMap>
    * @return a new BroadcastOperator instance
    * @public
    */
-  public to(room: Room | Room[]): BroadcastOperator<EmitEvents> {
+  public to(room: Room | Room[]): BroadcastOperator<EmitEvents, SocketData> {
     const rooms = new Set(this.rooms);
     if (Array.isArray(room)) {
       room.forEach((r) => rooms.add(r));
@@ -48,7 +48,7 @@ export class BroadcastOperator<EmitEvents extends EventsMap>
    * @return a new BroadcastOperator instance
    * @public
    */
-  public in(room: Room | Room[]): BroadcastOperator<EmitEvents> {
+  public in(room: Room | Room[]): BroadcastOperator<EmitEvents, SocketData> {
     return this.to(room);
   }
 
@@ -59,7 +59,9 @@ export class BroadcastOperator<EmitEvents extends EventsMap>
    * @return a new BroadcastOperator instance
    * @public
    */
-  public except(room: Room | Room[]): BroadcastOperator<EmitEvents> {
+  public except(
+    room: Room | Room[]
+  ): BroadcastOperator<EmitEvents, SocketData> {
     const exceptRooms = new Set(this.exceptRooms);
     if (Array.isArray(room)) {
       room.forEach((r) => exceptRooms.add(r));
@@ -81,7 +83,9 @@ export class BroadcastOperator<EmitEvents extends EventsMap>
    * @return a new BroadcastOperator instance
    * @public
    */
-  public compress(compress: boolean): BroadcastOperator<EmitEvents> {
+  public compress(
+    compress: boolean
+  ): BroadcastOperator<EmitEvents, SocketData> {
     const flags = Object.assign({}, this.flags, { compress });
     return new BroadcastOperator(
       this.adapter,
@@ -99,7 +103,7 @@ export class BroadcastOperator<EmitEvents extends EventsMap>
    * @return a new BroadcastOperator instance
    * @public
    */
-  public get volatile(): BroadcastOperator<EmitEvents> {
+  public get volatile(): BroadcastOperator<EmitEvents, SocketData> {
     const flags = Object.assign({}, this.flags, { volatile: true });
     return new BroadcastOperator(
       this.adapter,
@@ -115,7 +119,7 @@ export class BroadcastOperator<EmitEvents extends EventsMap>
    * @return a new BroadcastOperator instance
    * @public
    */
-  public get local(): BroadcastOperator<EmitEvents> {
+  public get local(): BroadcastOperator<EmitEvents, SocketData> {
     const flags = Object.assign({}, this.flags, { local: true });
     return new BroadcastOperator(
       this.adapter,
@@ -177,7 +181,9 @@ export class BroadcastOperator<EmitEvents extends EventsMap>
    *
    * @public
    */
-  public fetchSockets(): Promise<RemoteSocket<EmitEvents>[]> {
+  public fetchSockets<SocketData = any>(): Promise<
+    RemoteSocket<EmitEvents, SocketData>[]
+  > {
     return this.adapter
       .fetchSockets({
         rooms: this.rooms,
@@ -187,9 +193,12 @@ 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, SocketData>;
           } else {
-            return new RemoteSocket(this.adapter, socket as SocketDetails);
+            return new RemoteSocket(
+              this.adapter,
+              socket as SocketDetails<SocketData>
+            );
           }
         });
       });
@@ -247,27 +256,27 @@ export class BroadcastOperator<EmitEvents extends EventsMap>
 /**
  * Format of the data when the Socket instance exists on another Socket.IO server
  */
-interface SocketDetails {
+interface SocketDetails<SocketData> {
   id: SocketId;
   handshake: Handshake;
   rooms: Room[];
-  data: any;
+  data: SocketData;
 }
 
 /**
  * Expose of subset of the attributes and methods of the Socket class
  */
-export class RemoteSocket<EmitEvents extends EventsMap>
+export class RemoteSocket<EmitEvents extends EventsMap, SocketData>
   implements TypedEventBroadcaster<EmitEvents>
 {
   public readonly id: SocketId;
   public readonly handshake: Handshake;
   public readonly rooms: Set<Room>;
-  public readonly data: any;
+  public readonly data: SocketData;
 
-  private readonly operator: BroadcastOperator<EmitEvents>;
+  private readonly operator: BroadcastOperator<EmitEvents, SocketData>;
 
-  constructor(adapter: Adapter, details: SocketDetails) {
+  constructor(adapter: Adapter, details: SocketDetails<SocketData>) {
     this.id = details.id;
     this.handshake = details.handshake;
     this.rooms = new Set(details.rooms);

lib/client.ts

@@ -7,6 +7,7 @@ import type { Namespace } from "./namespace";
 import type { EventsMap } from "./typed-events";
 import type { Socket } from "./socket";
 import type { SocketId } from "socket.io-adapter";
+import type { Socket as RawSocket } from "engine.io";
 
 const debug = debugModule("socket.io:client");
 
@@ -20,21 +21,27 @@ interface WriteOptions {
 export class Client<
   ListenEvents extends EventsMap,
   EmitEvents extends EventsMap,
-  ServerSideEvents extends EventsMap
+  ServerSideEvents extends EventsMap,
+  SocketData = any
 > {
-  public readonly conn;
+  public readonly conn: RawSocket;
 
   private readonly id: string;
-  private readonly server: Server<ListenEvents, EmitEvents, ServerSideEvents>;
+  private readonly server: Server<
+    ListenEvents,
+    EmitEvents,
+    ServerSideEvents,
+    SocketData
+  >;
   private readonly encoder: Encoder;
   private readonly decoder: Decoder;
   private sockets: Map<
     SocketId,
-    Socket<ListenEvents, EmitEvents, ServerSideEvents>
+    Socket<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
   > = new Map();
   private nsps: Map<
     string,
-    Socket<ListenEvents, EmitEvents, ServerSideEvents>
+    Socket<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
   > = new Map();
   private connectTimeout?: NodeJS.Timeout;
 
@@ -46,7 +53,7 @@ export class Client<
    * @package
    */
   constructor(
-    server: Server<ListenEvents, EmitEvents, ServerSideEvents>,
+    server: Server<ListenEvents, EmitEvents, ServerSideEvents, SocketData>,
     conn: any
   ) {
     this.server = server;
@@ -111,11 +118,10 @@ export class Client<
       auth,
       (
         dynamicNspName:
-          | Namespace<ListenEvents, EmitEvents, ServerSideEvents>
+          | Namespace<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
           | false
       ) => {
         if (dynamicNspName) {
-          debug("dynamic namespace %s was created", dynamicNspName);
           this.doConnect(name, auth);
         } else {
           debug("creation of namespace %s was denied", name);
@@ -171,7 +177,9 @@ export class Client<
    *
    * @private
    */
-  _remove(socket: Socket<ListenEvents, EmitEvents, ServerSideEvents>): void {
+  _remove(
+    socket: Socket<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
+  ): void {
     if (this.sockets.has(socket.id)) {
       const nsp = this.sockets.get(socket.id)!.nsp.name;
       this.sockets.delete(socket.id);
@@ -209,13 +217,11 @@ export class Client<
     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);
-    }
+    this.writeToEngine(encodedPackets, opts);
   }
 
   private writeToEngine(
-    encodedPacket: String | Buffer,
+    encodedPackets: Array<String | Buffer>,
     opts: WriteOptions
   ): void {
     if (opts.volatile && !this.conn.transport.writable) {
@@ -224,7 +230,12 @@ export class Client<
       );
       return;
     }
-    this.conn.write(encodedPacket, opts);
+    const packets = Array.isArray(encodedPackets)
+      ? encodedPackets
+      : [encodedPackets];
+    for (const encodedPacket of packets) {
+      this.conn.write(encodedPacket, opts);
+    }
   }
 
   /**

lib/index.ts

@@ -4,7 +4,13 @@ import { createDeflate, createGzip, createBrotliCompress } from "zlib";
 import accepts = require("accepts");
 import { pipeline } from "stream";
 import path = require("path");
-import engine = require("engine.io");
+import {
+  attach,
+  Server as Engine,
+  ServerOptions as EngineOptions,
+  AttachOptions,
+  uServer,
+} from "engine.io";
 import { Client } from "./client";
 import { EventEmitter } from "events";
 import { ExtendedError, Namespace, ServerReservedEventsMap } from "./namespace";
@@ -14,8 +20,6 @@ import * as parser from "socket.io-parser";
 import type { Encoder } from "socket.io-parser";
 import debugModule from "debug";
 import { Socket } from "./socket";
-import type { CookieSerializeOptions } from "cookie";
-import type { CorsOptions } from "cors";
 import type { BroadcastOperator, RemoteSocket } from "./broadcast-operator";
 import {
   EventsMap,
@@ -24,13 +28,13 @@ import {
   StrictEventEmitter,
   EventNames,
 } from "./typed-events";
+import { patchAdapter, restoreAdapter, serveFile } from "./uws.js";
 
 const debug = debugModule("socket.io:server");
 
 const clientVersion = require("../package.json").version;
 const dotMapRegex = /\.map/;
 
-type Transport = "polling" | "websocket";
 type ParentNspNameMatchFn = (
   name: string,
   auth: { [key: string]: any },
@@ -39,107 +43,7 @@ type ParentNspNameMatchFn = (
 
 type AdapterConstructor = typeof Adapter | ((nsp: Namespace) => Adapter);
 
-interface EngineOptions {
-  /**
-   * how many ms without a pong packet to consider the connection closed
-   * @default 20000
-   */
-  pingTimeout: number;
-  /**
-   * how many ms before sending a new ping packet
-   * @default 25000
-   */
-  pingInterval: number;
-  /**
-   * how many ms before an uncompleted transport upgrade is cancelled
-   * @default 10000
-   */
-  upgradeTimeout: number;
-  /**
-   * how many bytes or characters a message can be, before closing the session (to avoid DoS).
-   * @default 1e5 (100 KB)
-   */
-  maxHttpBufferSize: number;
-  /**
-   * A function that receives a given handshake or upgrade request as its first parameter,
-   * and can decide whether to continue or not. The second argument is a function that needs
-   * to be called with the decided information: fn(err, success), where success is a boolean
-   * value where false means that the request is rejected, and err is an error code.
-   */
-  allowRequest: (
-    req: http.IncomingMessage,
-    fn: (err: string | null | undefined, success: boolean) => void
-  ) => void;
-  /**
-   * the low-level transports that are enabled
-   * @default ["polling", "websocket"]
-   */
-  transports: Transport[];
-  /**
-   * whether to allow transport upgrades
-   * @default true
-   */
-  allowUpgrades: boolean;
-  /**
-   * parameters of the WebSocket permessage-deflate extension (see ws module api docs). Set to false to disable.
-   * @default false
-   */
-  perMessageDeflate: boolean | object;
-  /**
-   * parameters of the http compression for the polling transports (see zlib api docs). Set to false to disable.
-   * @default true
-   */
-  httpCompression: boolean | object;
-  /**
-   * what WebSocket server implementation to use. Specified module must
-   * conform to the ws interface (see ws module api docs).
-   * An alternative c++ addon is also available by installing eiows module.
-   *
-   * @default `require("ws").Server`
-   */
-  wsEngine: Function;
-  /**
-   * an optional packet which will be concatenated to the handshake packet emitted by Engine.IO.
-   */
-  initialPacket: any;
-  /**
-   * configuration of the cookie that contains the client sid to send as part of handshake response headers. This cookie
-   * might be used for sticky-session. Defaults to not sending any cookie.
-   * @default false
-   */
-  cookie: CookieSerializeOptions | boolean;
-  /**
-   * the options that will be forwarded to the cors module
-   */
-  cors: CorsOptions;
-  /**
-   * whether to enable compatibility with Socket.IO v2 clients
-   * @default false
-   */
-  allowEIO3: boolean;
-}
-
-interface AttachOptions {
-  /**
-   * name of the path to capture
-   * @default "/engine.io"
-   */
-  path: string;
-  /**
-   * destroy unhandled upgrade requests
-   * @default true
-   */
-  destroyUpgrade: boolean;
-  /**
-   * milliseconds after which unhandled requests are ended
-   * @default 1000
-   */
-  destroyUpgradeTimeout: number;
-}
-
-interface EngineAttachOptions extends EngineOptions, AttachOptions {}
-
-interface ServerOptions extends EngineAttachOptions {
+interface ServerOptions extends EngineOptions, AttachOptions {
   /**
    * name of the path to capture
    * @default "/socket.io"
@@ -170,16 +74,23 @@ interface ServerOptions extends EngineAttachOptions {
 export class Server<
   ListenEvents extends EventsMap = DefaultEventsMap,
   EmitEvents extends EventsMap = ListenEvents,
-  ServerSideEvents extends EventsMap = DefaultEventsMap
+  ServerSideEvents extends EventsMap = DefaultEventsMap,
+  SocketData = any
 > extends StrictEventEmitter<
   ServerSideEvents,
   EmitEvents,
-  ServerReservedEventsMap<ListenEvents, EmitEvents, ServerSideEvents>
+  ServerReservedEventsMap<
+    ListenEvents,
+    EmitEvents,
+    ServerSideEvents,
+    SocketData
+  >
 > {
   public readonly sockets: Namespace<
     ListenEvents,
     EmitEvents,
-    ServerSideEvents
+    ServerSideEvents,
+    SocketData
   >;
   /**
    * A reference to the underlying Engine.IO server.
@@ -201,16 +112,18 @@ export class Server<
   /**
    * @private
    */
-  _nsps: Map<string, Namespace<ListenEvents, EmitEvents, ServerSideEvents>> =
-    new Map();
+  _nsps: Map<
+    string,
+    Namespace<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
+  > = new Map();
   private parentNsps: Map<
     ParentNspNameMatchFn,
-    ParentNamespace<ListenEvents, EmitEvents, ServerSideEvents>
+    ParentNamespace<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
   > = new Map();
   private _adapter?: AdapterConstructor;
   private _serveClient: boolean;
   private opts: Partial<EngineOptions>;
-  private eio;
+  private eio: Engine;
   private _path: string;
   private clientPathRegex: RegExp;
 
@@ -254,7 +167,7 @@ export class Server<
     this.adapter(opts.adapter || Adapter);
     this.sockets = this.of("/");
     this.opts = opts;
-    if (srv) this.attach(srv as http.Server);
+    if (srv || typeof srv == "number") this.attach(srv as http.Server | number);
   }
 
   /**
@@ -286,7 +199,9 @@ export class Server<
     name: string,
     auth: { [key: string]: any },
     fn: (
-      nsp: Namespace<ListenEvents, EmitEvents, ServerSideEvents> | false
+      nsp:
+        | Namespace<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
+        | false
     ) => void
   ): void {
     if (this.parentNsps.size === 0) return fn(false);
@@ -300,15 +215,18 @@ export class Server<
       }
       nextFn.value(name, auth, (err, allow) => {
         if (err || !allow) {
-          run();
-        } else {
-          const namespace = this.parentNsps
-            .get(nextFn.value)!
-            .createChild(name);
-          // @ts-ignore
-          this.sockets.emitReserved("new_namespace", namespace);
-          fn(namespace);
+          return run();
         }
+        if (this._nsps.has(name)) {
+          // the namespace was created in the meantime
+          debug("dynamic namespace %s already exists", name);
+          return fn(this._nsps.get(name) as Namespace);
+        }
+        const namespace = this.parentNsps.get(nextFn.value)!.createChild(name);
+        debug("dynamic namespace %s was created", name);
+        // @ts-ignore
+        this.sockets.emitReserved("new_namespace", namespace);
+        fn(namespace);
       });
     };
 
@@ -334,7 +252,7 @@ export class Server<
     this.clientPathRegex = new RegExp(
       "^" +
         escapedPath +
-        "/socket\\.io(\\.min|\\.msgpack\\.min)?\\.js(\\.map)?(?:\\?|$)"
+        "/socket\\.io(\\.msgpack|\\.esm)?(\\.min)?\\.js(\\.map)?(?:\\?|$)"
     );
     return this;
   }
@@ -432,6 +350,69 @@ export class Server<
     return this;
   }
 
+  public attachApp(app /*: TemplatedApp */, opts: Partial<ServerOptions> = {}) {
+    // merge the options passed to the Socket.IO server
+    Object.assign(opts, this.opts);
+    // set engine.io path to `/socket.io`
+    opts.path = opts.path || this._path;
+
+    // initialize engine
+    debug("creating uWebSockets.js-based engine with opts %j", opts);
+    const engine = new uServer(opts);
+
+    engine.attach(app, opts);
+
+    // bind to engine events
+    this.bind(engine);
+
+    if (this._serveClient) {
+      // attach static file serving
+      app.get(`${this._path}/*`, (res, req) => {
+        if (!this.clientPathRegex.test(req.getUrl())) {
+          req.setYield(true);
+          return;
+        }
+
+        const filename = req
+          .getUrl()
+          .replace(this._path, "")
+          .replace(/\?.*$/, "")
+          .replace(/^\//, "");
+        const isMap = dotMapRegex.test(filename);
+        const type = isMap ? "map" : "source";
+
+        // Per the standard, ETags must be quoted:
+        // https://tools.ietf.org/html/rfc7232#section-2.3
+        const expectedEtag = '"' + clientVersion + '"';
+        const weakEtag = "W/" + expectedEtag;
+
+        const etag = req.getHeader("if-none-match");
+        if (etag) {
+          if (expectedEtag === etag || weakEtag === etag) {
+            debug("serve client %s 304", type);
+            res.writeStatus("304 Not Modified");
+            res.end();
+            return;
+          }
+        }
+
+        debug("serve client %s", type);
+
+        res.writeHeader("cache-control", "public, max-age=0");
+        res.writeHeader(
+          "content-type",
+          "application/" + (isMap ? "json" : "javascript")
+        );
+        res.writeHeader("etag", expectedEtag);
+
+        const filepath = path.join(__dirname, "../client-dist/", filename);
+        serveFile(res, filepath);
+      });
+    }
+
+    patchAdapter(app);
+  }
+
   /**
    * Initialize engine
    *
@@ -441,11 +422,11 @@ export class Server<
    */
   private initEngine(
     srv: http.Server,
-    opts: Partial<EngineAttachOptions>
+    opts: EngineOptions & AttachOptions
   ): void {
     // initialize engine
     debug("creating engine.io instance with opts %j", opts);
-    this.eio = engine.attach(srv, opts);
+    this.eio = attach(srv, opts);
 
     // attach static file serving
     if (this._serveClient) this.attachServe(srv);
@@ -599,8 +580,10 @@ export class Server<
    */
   public of(
     name: string | RegExp | ParentNspNameMatchFn,
-    fn?: (socket: Socket<ListenEvents, EmitEvents, ServerSideEvents>) => void
-  ): Namespace<ListenEvents, EmitEvents, ServerSideEvents> {
+    fn?: (
+      socket: Socket<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
+    ) => void
+  ): Namespace<ListenEvents, EmitEvents, ServerSideEvents, SocketData> {
     if (typeof name === "function" || name instanceof RegExp) {
       const parentNsp = new ParentNamespace(this);
       debug("initializing parent namespace %s", parentNsp.name);
@@ -648,6 +631,9 @@ export class Server<
 
     this.engine.close();
 
+    // restore the Adapter prototype
+    restoreAdapter();
+
     if (this.httpServer) {
       this.httpServer.close(fn);
     } else {
@@ -663,7 +649,7 @@ export class Server<
    */
   public use(
     fn: (
-      socket: Socket<ListenEvents, EmitEvents, ServerSideEvents>,
+      socket: Socket<ListenEvents, EmitEvents, ServerSideEvents, SocketData>,
       next: (err?: ExtendedError) => void
     ) => void
   ): this {
@@ -678,7 +664,7 @@ export class Server<
    * @return self
    * @public
    */
-  public to(room: Room | Room[]): BroadcastOperator<EmitEvents> {
+  public to(room: Room | Room[]): BroadcastOperator<EmitEvents, SocketData> {
     return this.sockets.to(room);
   }
 
@@ -689,7 +675,7 @@ export class Server<
    * @return self
    * @public
    */
-  public in(room: Room | Room[]): BroadcastOperator<EmitEvents> {
+  public in(room: Room | Room[]): BroadcastOperator<EmitEvents, SocketData> {
     return this.sockets.in(room);
   }
 
@@ -700,7 +686,9 @@ export class Server<
    * @return self
    * @public
    */
-  public except(name: Room | Room[]): BroadcastOperator<EmitEvents> {
+  public except(
+    name: Room | Room[]
+  ): BroadcastOperator<EmitEvents, SocketData> {
     return this.sockets.except(name);
   }
 
@@ -756,7 +744,9 @@ export class Server<
    * @return self
    * @public
    */
-  public compress(compress: boolean): BroadcastOperator<EmitEvents> {
+  public compress(
+    compress: boolean
+  ): BroadcastOperator<EmitEvents, SocketData> {
     return this.sockets.compress(compress);
   }
 
@@ -768,7 +758,7 @@ export class Server<
    * @return self
    * @public
    */
-  public get volatile(): BroadcastOperator<EmitEvents> {
+  public get volatile(): BroadcastOperator<EmitEvents, SocketData> {
     return this.sockets.volatile;
   }
 
@@ -778,7 +768,7 @@ export class Server<
    * @return self
    * @public
    */
-  public get local(): BroadcastOperator<EmitEvents> {
+  public get local(): BroadcastOperator<EmitEvents, SocketData> {
     return this.sockets.local;
   }
 
@@ -787,7 +777,7 @@ export class Server<
    *
    * @public
    */
-  public fetchSockets(): Promise<RemoteSocket<EmitEvents>[]> {
+  public fetchSockets(): Promise<RemoteSocket<EmitEvents, SocketData>[]> {
     return this.sockets.fetchSockets();
   }
 
@@ -844,3 +834,4 @@ module.exports.Namespace = Namespace;
 module.exports.Socket = Socket;
 
 export { Socket, ServerOptions, Namespace, BroadcastOperator, RemoteSocket };
+export { Event } from "./socket";

lib/namespace.ts

@@ -21,56 +21,72 @@ export interface ExtendedError extends Error {
 export interface NamespaceReservedEventsMap<
   ListenEvents extends EventsMap,
   EmitEvents extends EventsMap,
-  ServerSideEvents extends EventsMap
+  ServerSideEvents extends EventsMap,
+  SocketData
 > {
-  connect: (socket: Socket<ListenEvents, EmitEvents, ServerSideEvents>) => void;
+  connect: (
+    socket: Socket<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
+  ) => void;
   connection: (
-    socket: Socket<ListenEvents, EmitEvents, ServerSideEvents>
+    socket: Socket<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
   ) => void;
 }
 
 export interface ServerReservedEventsMap<
   ListenEvents,
   EmitEvents,
-  ServerSideEvents
+  ServerSideEvents,
+  SocketData
 > extends NamespaceReservedEventsMap<
     ListenEvents,
     EmitEvents,
-    ServerSideEvents
+    ServerSideEvents,
+    SocketData
   > {
   new_namespace: (
-    namespace: Namespace<ListenEvents, EmitEvents, ServerSideEvents>
+    namespace: Namespace<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
   ) => void;
 }
 
 export const RESERVED_EVENTS: ReadonlySet<string | Symbol> = new Set<
-  keyof ServerReservedEventsMap<never, never, never>
+  keyof ServerReservedEventsMap<never, never, never, never>
 >(<const>["connect", "connection", "new_namespace"]);
 
 export class Namespace<
   ListenEvents extends EventsMap = DefaultEventsMap,
   EmitEvents extends EventsMap = ListenEvents,
-  ServerSideEvents extends EventsMap = DefaultEventsMap
+  ServerSideEvents extends EventsMap = DefaultEventsMap,
+  SocketData = any
 > extends StrictEventEmitter<
   ServerSideEvents,
   EmitEvents,
-  NamespaceReservedEventsMap<ListenEvents, EmitEvents, ServerSideEvents>
+  NamespaceReservedEventsMap<
+    ListenEvents,
+    EmitEvents,
+    ServerSideEvents,
+    SocketData
+  >
 > {
   public readonly name: string;
   public readonly sockets: Map<
     SocketId,
-    Socket<ListenEvents, EmitEvents, ServerSideEvents>
+    Socket<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
   > = new Map();
 
   public adapter: Adapter;
 
   /** @private */
-  readonly server: Server<ListenEvents, EmitEvents, ServerSideEvents>;
+  readonly server: Server<
+    ListenEvents,
+    EmitEvents,
+    ServerSideEvents,
+    SocketData
+  >;
 
   /** @private */
   _fns: Array<
     (
-      socket: Socket<ListenEvents, EmitEvents, ServerSideEvents>,
+      socket: Socket<ListenEvents, EmitEvents, ServerSideEvents, SocketData>,
       next: (err?: ExtendedError) => void
     ) => void
   > = [];
@@ -85,7 +101,7 @@ export class Namespace<
    * @param name
    */
   constructor(
-    server: Server<ListenEvents, EmitEvents, ServerSideEvents>,
+    server: Server<ListenEvents, EmitEvents, ServerSideEvents, SocketData>,
     name: string
   ) {
     super();
@@ -114,7 +130,7 @@ export class Namespace<
    */
   public use(
     fn: (
-      socket: Socket<ListenEvents, EmitEvents, ServerSideEvents>,
+      socket: Socket<ListenEvents, EmitEvents, ServerSideEvents, SocketData>,
       next: (err?: ExtendedError) => void
     ) => void
   ): this {
@@ -130,7 +146,7 @@ export class Namespace<
    * @private
    */
   private run(
-    socket: Socket<ListenEvents, EmitEvents, ServerSideEvents>,
+    socket: Socket<ListenEvents, EmitEvents, ServerSideEvents, SocketData>,
     fn: (err: ExtendedError | null) => void
   ) {
     const fns = this._fns.slice(0);
@@ -159,7 +175,7 @@ export class Namespace<
    * @return self
    * @public
    */
-  public to(room: Room | Room[]): BroadcastOperator<EmitEvents> {
+  public to(room: Room | Room[]): BroadcastOperator<EmitEvents, SocketData> {
     return new BroadcastOperator(this.adapter).to(room);
   }
 
@@ -170,7 +186,7 @@ export class Namespace<
    * @return self
    * @public
    */
-  public in(room: Room | Room[]): BroadcastOperator<EmitEvents> {
+  public in(room: Room | Room[]): BroadcastOperator<EmitEvents, SocketData> {
     return new BroadcastOperator(this.adapter).in(room);
   }
 
@@ -181,7 +197,9 @@ export class Namespace<
    * @return self
    * @public
    */
-  public except(room: Room | Room[]): BroadcastOperator<EmitEvents> {
+  public except(
+    room: Room | Room[]
+  ): BroadcastOperator<EmitEvents, SocketData> {
     return new BroadcastOperator(this.adapter).except(room);
   }
 
@@ -195,7 +213,7 @@ export class Namespace<
     client: Client<ListenEvents, EmitEvents, ServerSideEvents>,
     query,
     fn?: () => void
-  ): Socket<ListenEvents, EmitEvents, ServerSideEvents> {
+  ): Socket<ListenEvents, EmitEvents, ServerSideEvents, SocketData> {
     debug("adding socket to nsp %s", this.name);
     const socket = new Socket(this, client, query);
     this.run(socket, (err) => {
@@ -238,7 +256,9 @@ export class Namespace<
    *
    * @private
    */
-  _remove(socket: Socket<ListenEvents, EmitEvents, ServerSideEvents>): void {
+  _remove(
+    socket: Socket<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
+  ): void {
     if (this.sockets.has(socket.id)) {
       this.sockets.delete(socket.id);
     } else {
@@ -256,7 +276,10 @@ export class Namespace<
     ev: Ev,
     ...args: EventParams<EmitEvents, Ev>
   ): boolean {
-    return new BroadcastOperator<EmitEvents>(this.adapter).emit(ev, ...args);
+    return new BroadcastOperator<EmitEvents, SocketData>(this.adapter).emit(
+      ev,
+      ...args
+    );
   }
 
   /**
@@ -328,7 +351,9 @@ export class Namespace<
    * @return self
    * @public
    */
-  public compress(compress: boolean): BroadcastOperator<EmitEvents> {
+  public compress(
+    compress: boolean
+  ): BroadcastOperator<EmitEvents, SocketData> {
     return new BroadcastOperator(this.adapter).compress(compress);
   }
 
@@ -340,7 +365,7 @@ export class Namespace<
    * @return self
    * @public
    */
-  public get volatile(): BroadcastOperator<EmitEvents> {
+  public get volatile(): BroadcastOperator<EmitEvents, SocketData> {
     return new BroadcastOperator(this.adapter).volatile;
   }
 
@@ -350,7 +375,7 @@ export class Namespace<
    * @return self
    * @public
    */
-  public get local(): BroadcastOperator<EmitEvents> {
+  public get local(): BroadcastOperator<EmitEvents, SocketData> {
     return new BroadcastOperator(this.adapter).local;
   }
 
@@ -359,7 +384,7 @@ export class Namespace<
    *
    * @public
    */
-  public fetchSockets(): Promise<RemoteSocket<EmitEvents>[]> {
+  public fetchSockets(): Promise<RemoteSocket<EmitEvents, SocketData>[]> {
     return new BroadcastOperator(this.adapter).fetchSockets();
   }
 

lib/parent-namespace.ts

@@ -1,5 +1,5 @@
 import { Namespace } from "./namespace";
-import type { Server } from "./index";
+import type { Server, RemoteSocket } from "./index";
 import type {
   EventParams,
   EventNames,
@@ -11,13 +11,17 @@ import type { BroadcastOptions } from "socket.io-adapter";
 export class ParentNamespace<
   ListenEvents extends EventsMap = DefaultEventsMap,
   EmitEvents extends EventsMap = ListenEvents,
-  ServerSideEvents extends EventsMap = DefaultEventsMap
-> extends Namespace<ListenEvents, EmitEvents, ServerSideEvents> {
+  ServerSideEvents extends EventsMap = DefaultEventsMap,
+  SocketData = any
+> extends Namespace<ListenEvents, EmitEvents, ServerSideEvents, SocketData> {
   private static count: number = 0;
-  private children: Set<Namespace<ListenEvents, EmitEvents, ServerSideEvents>> =
-    new Set();
+  private children: Set<
+    Namespace<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
+  > = new Set();
 
-  constructor(server: Server<ListenEvents, EmitEvents, ServerSideEvents>) {
+  constructor(
+    server: Server<ListenEvents, EmitEvents, ServerSideEvents, SocketData>
+  ) {
     super(server, "/_" + ParentNamespace.count++);
   }
 
@@ -47,7 +51,7 @@ export class ParentNamespace<
 
   createChild(
     name: string
-  ): Namespace<ListenEvents, EmitEvents, ServerSideEvents> {
+  ): Namespace<ListenEvents, EmitEvents, ServerSideEvents, SocketData> {
     const namespace = new Namespace(this.server, name);
     namespace._fns = this._fns.slice(0);
     this.listeners("connect").forEach((listener) =>
@@ -60,4 +64,13 @@ export class ParentNamespace<
     this.server._nsps.set(name, namespace);
     return namespace;
   }
+
+  fetchSockets(): Promise<RemoteSocket<EmitEvents, SocketData>[]> {
+    // note: we could make the fetchSockets() method work for dynamic namespaces created with a regex (by sending the
+    // regex to the other Socket.IO servers, and returning the sockets of each matching namespace for example), but
+    // the behavior for namespaces created with a function is less clear
+    // note²: we cannot loop over each children namespace, because with multiple Socket.IO servers, a given namespace
+    // may exist on one node but not exist on another (since it is created upon client connection)
+    throw new Error("fetchSockets() is not supported on parent namespaces");
+  }
 }

lib/socket.ts

@@ -1,5 +1,4 @@
 import { Packet, PacketType } from "socket.io-parser";
-import url = require("url");
 import debugModule from "debug";
 import type { Server } from "./index";
 import {
@@ -46,7 +45,7 @@ export interface EventEmitterReservedEventsMap {
 
 export const RESERVED_EVENTS: ReadonlySet<string | Symbol> = new Set<
   | ClientReservedEvents
-  | keyof NamespaceReservedEventsMap<never, never, never>
+  | keyof NamespaceReservedEventsMap<never, never, never, never>
   | keyof SocketReservedEventsMap
   | keyof EventEmitterReservedEventsMap
 >(<const>[
@@ -108,10 +107,16 @@ export interface Handshake {
   auth: { [key: string]: any };
 }
 
+/**
+ * `[eventName, ...args]`
+ */
+export type Event = [string, ...any[]];
+
 export class Socket<
   ListenEvents extends EventsMap = DefaultEventsMap,
   EmitEvents extends EventsMap = ListenEvents,
-  ServerSideEvents extends EventsMap = DefaultEventsMap
+  ServerSideEvents extends EventsMap = DefaultEventsMap,
+  SocketData = any
 > extends StrictEventEmitter<
   ListenEvents,
   EmitEvents,
@@ -122,17 +127,20 @@ export class Socket<
   /**
    * Additional information that can be attached to the Socket instance and which will be used in the fetchSockets method
    */
-  public data: any = {};
+  public data: Partial<SocketData> = {};
 
-  public connected: boolean;
-  public disconnected: boolean;
+  public connected: boolean = false;
 
-  private readonly server: Server<ListenEvents, EmitEvents, ServerSideEvents>;
+  private readonly server: Server<
+    ListenEvents,
+    EmitEvents,
+    ServerSideEvents,
+    SocketData
+  >;
   private readonly adapter: Adapter;
   private acks: Map<number, () => void> = new Map();
-  private fns: Array<(event: Array<any>, next: (err?: Error) => void) => void> =
-    [];
-  private flags: BroadcastFlags = {};
+  private fns: Array<(event: Event, next: (err?: Error) => void) => void> = [];
+  private flags: BroadcastFlags & { timeout?: number } = {};
   private _anyListeners?: Array<(...args: any[]) => void>;
 
   /**
@@ -157,8 +165,6 @@ export class Socket<
     } else {
       this.id = base64id.generateId(); // don't reuse the Engine.IO id because it's sensitive information
     }
-    this.connected = true;
-    this.disconnected = false;
     this.handshake = this.buildHandshake(auth);
   }
 
@@ -177,7 +183,8 @@ export class Socket<
       secure: !!this.request.connection.encrypted,
       issued: +new Date(),
       url: this.request.url!,
-      query: url.parse(this.request.url!, true).query,
+      // @ts-ignore
+      query: this.request._query,
       auth,
     };
   }
@@ -203,9 +210,11 @@ export class Socket<
 
     // access last argument to see if it's an ACK callback
     if (typeof data[data.length - 1] === "function") {
-      debug("emitting packet with ack id %d", this.nsp._ids);
-      this.acks.set(this.nsp._ids, data.pop());
-      packet.id = this.nsp._ids++;
+      const id = this.nsp._ids++;
+      debug("emitting packet with ack id %d", id);
+
+      this.registerAckCallback(id, data.pop());
+      packet.id = id;
     }
 
     const flags = Object.assign({}, this.flags);
@@ -216,6 +225,28 @@ export class Socket<
     return true;
   }
 
+  /**
+   * @private
+   */
+  private registerAckCallback(id: number, ack: (...args: any[]) => void): void {
+    const timeout = this.flags.timeout;
+    if (timeout === undefined) {
+      this.acks.set(id, ack);
+      return;
+    }
+
+    const timer = setTimeout(() => {
+      debug("event with ack id %d has timed out after %d ms", id, timeout);
+      this.acks.delete(id);
+      ack.call(this, new Error("operation has timed out"));
+    }, timeout);
+
+    this.acks.set(id, (...args) => {
+      clearTimeout(timer);
+      ack.apply(this, [null, ...args]);
+    });
+  }
+
   /**
    * Targets a room when broadcasting.
    *
@@ -223,7 +254,7 @@ export class Socket<
    * @return self
    * @public
    */
-  public to(room: Room | Room[]): BroadcastOperator<EmitEvents> {
+  public to(room: Room | Room[]): BroadcastOperator<EmitEvents, SocketData> {
     return this.newBroadcastOperator().to(room);
   }
 
@@ -234,7 +265,7 @@ export class Socket<
    * @return self
    * @public
    */
-  public in(room: Room | Room[]): BroadcastOperator<EmitEvents> {
+  public in(room: Room | Room[]): BroadcastOperator<EmitEvents, SocketData> {
     return this.newBroadcastOperator().in(room);
   }
 
@@ -245,7 +276,9 @@ export class Socket<
    * @return self
    * @public
    */
-  public except(room: Room | Room[]): BroadcastOperator<EmitEvents> {
+  public except(
+    room: Room | Room[]
+  ): BroadcastOperator<EmitEvents, SocketData> {
     return this.newBroadcastOperator().except(room);
   }
 
@@ -335,6 +368,7 @@ export class Socket<
    */
   _onconnect(): void {
     debug("socket connected - writing packet");
+    this.connected = true;
     this.join(this.id);
     if (this.conn.protocol === 3) {
       this.packet({ type: PacketType.CONNECT });
@@ -482,7 +516,6 @@ export class Socket<
     this.nsp._remove(this);
     this.client._remove(this);
     this.connected = false;
-    this.disconnected = true;
     this.emitReserved("disconnect", reason);
     return;
   }
@@ -549,7 +582,7 @@ export class Socket<
    * @return {Socket} self
    * @public
    */
-  public get broadcast(): BroadcastOperator<EmitEvents> {
+  public get broadcast(): BroadcastOperator<EmitEvents, SocketData> {
     return this.newBroadcastOperator();
   }
 
@@ -559,17 +592,37 @@ export class Socket<
    * @return {Socket} self
    * @public
    */
-  public get local(): BroadcastOperator<EmitEvents> {
+  public get local(): BroadcastOperator<EmitEvents, SocketData> {
     return this.newBroadcastOperator().local;
   }
 
+  /**
+   * Sets a modifier for a subsequent event emission that the callback will be called with an error when the
+   * given number of milliseconds have elapsed without an acknowledgement from the client:
+   *
+   * ```
+   * socket.timeout(5000).emit("my-event", (err) => {
+   *   if (err) {
+   *     // the client did not acknowledge the event in the given delay
+   *   }
+   * });
+   * ```
+   *
+   * @returns self
+   * @public
+   */
+  public timeout(timeout: number): this {
+    this.flags.timeout = timeout;
+    return this;
+  }
+
   /**
    * Dispatch incoming event to socket listeners.
    *
    * @param {Array} event - event that will get emitted
    * @private
    */
-  private dispatch(event: [eventName: string, ...args: any[]]): void {
+  private dispatch(event: Event): void {
     debug("dispatching an event %j", event);
     this.run(event, (err) => {
       process.nextTick(() => {
@@ -592,9 +645,7 @@ export class Socket<
    * @return {Socket} self
    * @public
    */
-  public use(
-    fn: (event: Array<any>, next: (err?: Error) => void) => void
-  ): this {
+  public use(fn: (event: Event, next: (err?: Error) => void) => void): this {
     this.fns.push(fn);
     return this;
   }
@@ -606,10 +657,7 @@ export class Socket<
    * @param {Function} fn - last fn call in the middleware
    * @private
    */
-  private run(
-    event: [eventName: string, ...args: any[]],
-    fn: (err: Error | null) => void
-  ): void {
+  private run(event: Event, fn: (err: Error | null) => void): void {
     const fns = this.fns.slice(0);
     if (!fns.length) return fn(null);
 
@@ -629,6 +677,13 @@ export class Socket<
     run(0);
   }
 
+  /**
+   * Whether the socket is currently disconnected
+   */
+  public get disconnected() {
+    return !this.connected;
+  }
+
   /**
    * A reference to the request that originated the underlying Engine.IO Socket.
    *
@@ -714,7 +769,7 @@ export class Socket<
     return this._anyListeners || [];
   }
 
-  private newBroadcastOperator(): BroadcastOperator<EmitEvents> {
+  private newBroadcastOperator(): BroadcastOperator<EmitEvents, SocketData> {
     const flags = Object.assign({}, this.flags);
     this.flags = {};
     return new BroadcastOperator(

lib/uws.ts

@@ -0,0 +1,162 @@
+import { Adapter, Room } from "socket.io-adapter";
+import type { WebSocket } from "uWebSockets.js";
+import type { Socket } from "./socket.js";
+import { createReadStream, statSync } from "fs";
+import debugModule from "debug";
+
+const debug = debugModule("socket.io:adapter-uws");
+
+const SEPARATOR = "\x1f"; // see https://en.wikipedia.org/wiki/Delimiter#ASCII_delimited_text
+
+const { addAll, del, broadcast } = Adapter.prototype;
+
+export function patchAdapter(app /* : TemplatedApp */) {
+  Adapter.prototype.addAll = function (id, rooms) {
+    const isNew = !this.sids.has(id);
+    addAll.call(this, id, rooms);
+    const socket: Socket = this.nsp.sockets.get(id);
+    if (!socket) {
+      return;
+    }
+    if (socket.conn.transport.name === "websocket") {
+      subscribe(this.nsp.name, socket, isNew, rooms);
+      return;
+    }
+    if (isNew) {
+      socket.conn.on("upgrade", () => {
+        const rooms = this.sids.get(id);
+        subscribe(this.nsp.name, socket, isNew, rooms);
+      });
+    }
+  };
+
+  Adapter.prototype.del = function (id, room) {
+    del.call(this, id, room);
+    const socket: Socket = this.nsp.sockets.get(id);
+    if (socket && socket.conn.transport.name === "websocket") {
+      // @ts-ignore
+      const sessionId = socket.conn.id;
+      // @ts-ignore
+      const websocket: WebSocket = socket.conn.transport.socket;
+      const topic = `${this.nsp.name}${SEPARATOR}${room}`;
+      debug("unsubscribe connection %s from topic %s", sessionId, topic);
+      websocket.unsubscribe(topic);
+    }
+  };
+
+  Adapter.prototype.broadcast = function (packet, opts) {
+    const useFastPublish = opts.rooms.size <= 1 && opts.except!.size === 0;
+    if (!useFastPublish) {
+      broadcast.call(this, packet, opts);
+      return;
+    }
+
+    const flags = opts.flags || {};
+    const basePacketOpts = {
+      preEncoded: true,
+      volatile: flags.volatile,
+      compress: flags.compress,
+    };
+
+    packet.nsp = this.nsp.name;
+    const encodedPackets = this.encoder.encode(packet);
+
+    const topic =
+      opts.rooms.size === 0
+        ? this.nsp.name
+        : `${this.nsp.name}${SEPARATOR}${opts.rooms.keys().next().value}`;
+    debug("fast publish to %s", topic);
+
+    // fast publish for clients connected with WebSocket
+    encodedPackets.forEach((encodedPacket) => {
+      const isBinary = typeof encodedPacket !== "string";
+      // "4" being the message type in the Engine.IO protocol, see https://github.com/socketio/engine.io-protocol
+      app.publish(
+        topic,
+        isBinary ? encodedPacket : "4" + encodedPacket,
+        isBinary
+      );
+    });
+
+    this.apply(opts, (socket) => {
+      if (socket.conn.transport.name !== "websocket") {
+        // classic publish for clients connected with HTTP long-polling
+        socket.client.writeToEngine(encodedPackets, basePacketOpts);
+      }
+    });
+  };
+}
+
+function subscribe(
+  namespaceName: string,
+  socket: Socket,
+  isNew: boolean,
+  rooms: Set<Room>
+) {
+  // @ts-ignore
+  const sessionId = socket.conn.id;
+  // @ts-ignore
+  const websocket: WebSocket = socket.conn.transport.socket;
+  if (isNew) {
+    debug("subscribe connection %s to topic %s", sessionId, namespaceName);
+    websocket.subscribe(namespaceName);
+  }
+  rooms.forEach((room) => {
+    const topic = `${namespaceName}${SEPARATOR}${room}`; // '#' can be used as wildcard
+    debug("subscribe connection %s to topic %s", sessionId, topic);
+    websocket.subscribe(topic);
+  });
+}
+
+export function restoreAdapter() {
+  Adapter.prototype.addAll = addAll;
+  Adapter.prototype.del = del;
+  Adapter.prototype.broadcast = broadcast;
+}
+
+const toArrayBuffer = (buffer: Buffer) => {
+  const { buffer: arrayBuffer, byteOffset, byteLength } = buffer;
+  return arrayBuffer.slice(byteOffset, byteOffset + byteLength);
+};
+
+// imported from https://github.com/kolodziejczak-sz/uwebsocket-serve
+export function serveFile(res /* : HttpResponse */, filepath: string) {
+  const { size } = statSync(filepath);
+  const readStream = createReadStream(filepath);
+  const destroyReadStream = () => !readStream.destroyed && readStream.destroy();
+
+  const onError = (error: Error) => {
+    destroyReadStream();
+    throw error;
+  };
+
+  const onDataChunk = (chunk: Buffer) => {
+    const arrayBufferChunk = toArrayBuffer(chunk);
+
+    const lastOffset = res.getWriteOffset();
+    const [ok, done] = res.tryEnd(arrayBufferChunk, size);
+
+    if (!done && !ok) {
+      readStream.pause();
+
+      res.onWritable((offset) => {
+        const [ok, done] = res.tryEnd(
+          arrayBufferChunk.slice(offset - lastOffset),
+          size
+        );
+
+        if (!done && ok) {
+          readStream.resume();
+        }
+
+        return ok;
+      });
+    }
+  };
+
+  res.onAborted(destroyReadStream);
+  readStream
+    .on("data", onDataChunk)
+    .on("error", onError)
+    .on("end", destroyReadStream);
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "socket.io",
-  "version": "4.2.0",
+  "version": "4.4.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -362,6 +362,12 @@
         "fastq": "^1.6.0"
       }
     },
+    "@socket.io/component-emitter": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz",
+      "integrity": "sha512-2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q==",
+      "dev": true
+    },
     "@tsconfig/node10": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
@@ -436,9 +442,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "16.7.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.6.tgz",
-      "integrity": "sha512-VESVNFoa/ahYA62xnLBjo5ur6gPsgEE5cNRy8SrdnkZ2nwJSW0kJ4ufbFr2zuU9ALtHM8juY53VcRoTA7htXSg=="
+      "version": "17.0.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.12.tgz",
+      "integrity": "sha512-4YpbAsnJXWYK/fpTVFlMIcUIho2AYCi4wg5aNPrG1ng7fn/1/RZfCIpRCiBX+12RVa34RluilnvCqD+g3KiSiA=="
     },
     "@types/normalize-package-data": {
       "version": "2.4.0",
@@ -501,9 +507,9 @@
       }
     },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true
     },
     "ansi-styles": {
@@ -678,31 +684,6 @@
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
         "wrap-ansi": "^6.2.0"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
       }
     },
     "color-convert": {
@@ -882,37 +863,52 @@
       "dev": true
     },
     "engine.io": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-5.2.0.tgz",
-      "integrity": "sha512-d1DexkQx87IFr1FLuV+0f5kAm1Hk1uOVijLOb+D1sDO2QMb7YjE02VHtZtxo7xIXMgcWLb+vl3HRT0rI9tr4jQ==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz",
+      "integrity": "sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==",
       "requires": {
+        "@types/cookie": "^0.4.1",
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
         "accepts": "~1.3.4",
         "base64id": "2.0.0",
         "cookie": "~0.4.1",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
-        "engine.io-parser": "~4.0.0",
-        "ws": "~7.4.2"
+        "engine.io-parser": "~5.0.0",
+        "ws": "~8.2.3"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "8.2.3",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
+          "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="
+        }
       }
     },
     "engine.io-client": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-5.2.0.tgz",
-      "integrity": "sha512-BcIBXGBkT7wKecwnfrSV79G2X5lSUSgeAGgoo60plXf8UsQEvCQww/KMwXSMhVjb98fFYNq20CC5eo8IOAPqsg==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.1.1.tgz",
+      "integrity": "sha512-V05mmDo4gjimYW+FGujoGmmmxRaDsrVr7AXA3ZIfa04MWM1jOfZfUwou0oNqhNwy/votUDvGDt4JA4QF4e0b4g==",
       "dev": true,
       "requires": {
-        "base64-arraybuffer": "0.1.4",
-        "component-emitter": "~1.3.0",
+        "@socket.io/component-emitter": "~3.0.0",
         "debug": "~4.3.1",
-        "engine.io-parser": "~4.0.1",
+        "engine.io-parser": "~5.0.0",
         "has-cors": "1.1.0",
         "parseqs": "0.0.6",
         "parseuri": "0.0.6",
-        "ws": "~7.4.2",
+        "ws": "~8.2.3",
         "xmlhttprequest-ssl": "~2.0.0",
         "yeast": "0.1.2"
       },
       "dependencies": {
+        "ws": {
+          "version": "8.2.3",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
+          "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
+          "dev": true
+        },
         "xmlhttprequest-ssl": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz",
@@ -922,9 +918,19 @@
       }
     },
     "engine.io-parser": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.1.tgz",
-      "integrity": "sha512-v5aZK1hlckcJDGmHz3W8xvI3NUHYc9t8QtTbqdR5OaH3S9iJZilPubauOm+vLWOMMWzpE3hiq92l9lTAHamRCg=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.1.tgz",
+      "integrity": "sha512-j4p3WwJrG2k92VISM0op7wiq60vO92MlF3CRGxhKHy9ywG1/Dkc72g0dXeDQ+//hrcDn8gqQzoEkdO9FN0d9AA==",
+      "requires": {
+        "base64-arraybuffer": "~1.0.1"
+      },
+      "dependencies": {
+        "base64-arraybuffer": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz",
+          "integrity": "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA=="
+        }
+      }
     },
     "error-ex": {
       "version": "1.3.2",
@@ -1583,9 +1589,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
     "lodash._baseassign": {
@@ -1868,6 +1874,23 @@
         "kind-of": "^6.0.3"
       }
     },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        }
+      }
+    },
     "mocha": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
@@ -1917,21 +1940,6 @@
           "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
           "dev": true
         },
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -2155,9 +2163,9 @@
       "dev": true
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
     "path-type": {
@@ -2400,23 +2408,34 @@
       "dev": true
     },
     "socket.io-adapter": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.2.tgz",
-      "integrity": "sha512-PBZpxUPYjmoogY0aoaTmo1643JelsaS1CiAwNjRVdrI0X9Seuc19Y2Wife8k88avW6haG8cznvwbubAZwH4Mtg=="
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
+      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ=="
     },
     "socket.io-client": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.2.0.tgz",
-      "integrity": "sha512-3GJ2KMh7inJUNAOjgf8NaKJZJa9uRyfryh2LrVJyKyxmzoXlfW9DeDNqylJn0ovOFt4e/kRLNWzMt/YqqEWYSA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.4.1.tgz",
+      "integrity": "sha512-N5C/L5fLNha5Ojd7Yeb/puKcPWWcoB/A09fEjjNsg91EDVr5twk/OEyO6VT9dlLSUNY85NpW6KBhVMvaLKQ3vQ==",
       "dev": true,
       "requires": {
-        "@types/component-emitter": "^1.2.10",
+        "@socket.io/component-emitter": "~3.0.0",
         "backo2": "~1.0.2",
-        "component-emitter": "~1.3.0",
         "debug": "~4.3.2",
-        "engine.io-client": "~5.2.0",
+        "engine.io-client": "~6.1.1",
         "parseuri": "0.0.6",
-        "socket.io-parser": "~4.0.4"
+        "socket.io-parser": "~4.1.1"
+      },
+      "dependencies": {
+        "socket.io-parser": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.1.1.tgz",
+          "integrity": "sha512-USQVLSkDWE5nbcY760ExdKaJxCE65kcsG/8k5FDGZVVxpD1pA7hABYXYkCUvxUuYYh/+uQw0N/fvBzfT8o07KA==",
+          "dev": true,
+          "requires": {
+            "@socket.io/component-emitter": "~3.0.0",
+            "debug": "~4.3.1"
+          }
+        }
       }
     },
     "socket.io-client-v2": {
@@ -2448,9 +2467,9 @@
           }
         },
         "engine.io-client": {
-          "version": "3.5.1",
-          "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.1.tgz",
-          "integrity": "sha512-oVu9kBkGbcggulyVF0kz6BV3ganqUeqXvD79WOFKa+11oK692w1NyFkuEj4xrkFRpZhn92QOqTk4RQq5LiBXbQ==",
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.2.tgz",
+          "integrity": "sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==",
           "dev": true,
           "requires": {
             "component-emitter": "~1.3.0",
@@ -2462,7 +2481,7 @@
             "parseqs": "0.0.6",
             "parseuri": "0.0.6",
             "ws": "~7.4.2",
-            "xmlhttprequest-ssl": "~1.5.4",
+            "xmlhttprequest-ssl": "~1.6.2",
             "yeast": "0.1.2"
           }
         },
@@ -2792,6 +2811,11 @@
       "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==",
       "dev": true
     },
+    "uWebSockets.js": {
+      "version": "github:uNetworking/uWebSockets.js#4558ee00f9f1f686fffe1accbfc2e85b1af9c50f",
+      "from": "github:uNetworking/uWebSockets.js#v20.0.0",
+      "dev": true
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -2868,29 +2892,6 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
         }
       }
     },
@@ -2913,20 +2914,21 @@
       }
     },
     "ws": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz",
-      "integrity": "sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="
+      "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
+      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
+      "dev": true
     },
     "xmlhttprequest-ssl": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
-      "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz",
+      "integrity": "sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==",
       "dev": true
     },
     "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
       "dev": true
     },
     "yallist": {
@@ -2952,31 +2954,6 @@
         "which-module": "^2.0.0",
         "y18n": "^4.0.0",
         "yargs-parser": "^18.1.2"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
       }
     },
     "yargs-parser": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "socket.io",
-  "version": "4.2.0",
+  "version": "4.4.1",
   "description": "node.js realtime framework server",
   "keywords": [
     "realtime",
@@ -27,7 +27,8 @@
   "main": "./dist/index.js",
   "exports": {
     "import": "./wrapper.mjs",
-    "require": "./dist/index.js"
+    "require": "./dist/index.js",
+    "types": "./dist/index.d.ts"
   },
   "types": "./dist/index.d.ts",
   "license": "MIT",
@@ -45,14 +46,11 @@
     "prepack": "npm run compile"
   },
   "dependencies": {
-    "@types/cookie": "^0.4.1",
-    "@types/cors": "^2.8.12",
-    "@types/node": ">=10.0.0",
     "accepts": "~1.3.4",
     "base64id": "~2.0.0",
     "debug": "~4.3.2",
-    "engine.io": "~5.2.0",
-    "socket.io-adapter": "~2.3.2",
+    "engine.io": "~6.1.2",
+    "socket.io-adapter": "~2.3.3",
     "socket.io-parser": "~4.0.4"
   },
   "devDependencies": {
@@ -62,13 +60,14 @@
     "nyc": "^15.1.0",
     "prettier": "^2.3.2",
     "rimraf": "^3.0.2",
-    "socket.io-client": "4.2.0",
+    "socket.io-client": "4.4.1",
     "socket.io-client-v2": "npm:socket.io-client@^2.4.0",
     "superagent": "^6.1.0",
     "supertest": "^6.1.6",
     "ts-node": "^10.2.1",
     "tsd": "^0.17.0",
-    "typescript": "^4.4.2"
+    "typescript": "^4.4.2",
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.0.0"
   },
   "contributors": [
     {

test/fixtures/server-close.ts

@@ -3,7 +3,7 @@ const ioc = require("socket.io-client");
 const io = require("../..")(server);
 
 const srv = server.listen(() => {
-  const socket = ioc("ws://localhost:" + server.address().port);
+  const socket = ioc.connect("ws://localhost:" + server.address().port);
   socket.on("connect", () => {
     io.close();
     socket.close();

test/socket-timeout.ts

@@ -0,0 +1,57 @@
+import { Server } from "..";
+import { createClient, success } from "./support/util";
+import expect from "expect.js";
+
+describe("timeout", () => {
+  it("should timeout if the client does not acknowledge the event", (done) => {
+    const io = new Server(0);
+    const client = createClient(io, "/");
+
+    io.on("connection", (socket) => {
+      socket.timeout(50).emit("unknown", (err) => {
+        expect(err).to.be.an(Error);
+        success(done, io, client);
+      });
+    });
+  });
+
+  it("should timeout if the client does not acknowledge the event in time", (done) => {
+    const io = new Server(0);
+    const client = createClient(io, "/");
+
+    client.on("echo", (arg, cb) => {
+      cb(arg);
+    });
+
+    let count = 0;
+
+    io.on("connection", (socket) => {
+      socket.timeout(0).emit("echo", 42, (err) => {
+        expect(err).to.be.an(Error);
+        count++;
+      });
+    });
+
+    setTimeout(() => {
+      expect(count).to.eql(1);
+      success(done, io, client);
+    }, 200);
+  });
+
+  it("should not timeout if the client does acknowledge the event", (done) => {
+    const io = new Server(0);
+    const client = createClient(io, "/");
+
+    client.on("echo", (arg, cb) => {
+      cb(arg);
+    });
+
+    io.on("connection", (socket) => {
+      socket.timeout(50).emit("echo", 42, (err, value) => {
+        expect(err).to.be(null);
+        expect(value).to.be(42);
+        success(done, io, client);
+      });
+    });
+  });
+});

test/socket.io.ts

@@ -14,6 +14,9 @@ import { io as ioc, Socket as ClientSocket } from "socket.io-client";
 
 import "./support/util";
 import "./utility-methods";
+import "./uws";
+
+type callback = (err: Error | null, success: boolean) => void;
 
 // Creates a socket.io client for the given server
 function client(srv, nsp?: string | object, opts?: object): ClientSocket {
@@ -39,6 +42,11 @@ const waitFor = (emitter, event) => {
   });
 };
 
+const getPort = (io: Server): number => {
+  // @ts-ignore
+  return io.httpServer.address().port;
+};
+
 describe("socket.io", () => {
   it("should be the same version as client", () => {
     const version = require("../package").version;
@@ -120,6 +128,13 @@ describe("socket.io", () => {
         testSourceMap("socket.io.msgpack.min.js.map")
       );
 
+      it("should serve the ESM bundle", testSource("socket.io.esm.min.js"));
+
+      it(
+        "should serve the source map for the ESM bundle",
+        testSourceMap("socket.io.esm.min.js.map")
+      );
+
       it("should handle 304", (done) => {
         const srv = createServer();
         new Server(srv);
@@ -189,29 +204,17 @@ describe("socket.io", () => {
 
     describe("port", () => {
       it("should be bound", (done) => {
-        const sockets = new Server(54010);
-        request("http://localhost:54010")
-          .get("/socket.io/socket.io.js")
-          .expect(200, done);
-      });
+        const io = new Server(0);
 
-      it("should be bound as a string", (done) => {
-        const sockets = new Server(54020);
-        request("http://localhost:54020")
+        request(`http://localhost:${getPort(io)}`)
           .get("/socket.io/socket.io.js")
           .expect(200, done);
       });
 
       it("with listen", (done) => {
-        const sockets = new Server().listen(54011);
-        request("http://localhost:54011")
-          .get("/socket.io/socket.io.js")
-          .expect(200, done);
-      });
+        const io = new Server().listen(0);
 
-      it("as a string", (done) => {
-        const sockets = new Server().listen(54012);
-        request("http://localhost:54012")
+        request(`http://localhost:${getPort(io)}`)
           .get("/socket.io/socket.io.js")
           .expect(200, done);
       });
@@ -222,7 +225,7 @@ describe("socket.io", () => {
     const request = require("superagent");
 
     it("should send the Access-Control-Allow-xxx headers on OPTIONS request", (done) => {
-      const sockets = new Server(54013, {
+      const io = new Server(0, {
         cors: {
           origin: "http://localhost:54023",
           methods: ["GET", "POST"],
@@ -231,7 +234,7 @@ describe("socket.io", () => {
         },
       });
       request
-        .options("http://localhost:54013/socket.io/default/")
+        .options(`http://localhost:${getPort(io)}/socket.io/default/`)
         .query({ transport: "polling", EIO: 4 })
         .set("Origin", "http://localhost:54023")
         .end((err, res) => {
@@ -250,7 +253,7 @@ describe("socket.io", () => {
     });
 
     it("should send the Access-Control-Allow-xxx headers on GET request", (done) => {
-      const sockets = new Server(54014, {
+      const io = new Server(0, {
         cors: {
           origin: "http://localhost:54024",
           methods: ["GET", "POST"],
@@ -259,7 +262,7 @@ describe("socket.io", () => {
         },
       });
       request
-        .get("http://localhost:54014/socket.io/default/")
+        .get(`http://localhost:${getPort(io)}/socket.io/default/`)
         .query({ transport: "polling", EIO: 4 })
         .set("Origin", "http://localhost:54024")
         .end((err, res) => {
@@ -274,12 +277,12 @@ describe("socket.io", () => {
     });
 
     it("should allow request if custom function in opts.allowRequest returns true", (done) => {
-      const sockets = new Server(createServer().listen(54022), {
+      const io = new Server(0, {
         allowRequest: (req, callback) => callback(null, true),
       });
 
       request
-        .get("http://localhost:54022/socket.io/default/")
+        .get(`http://localhost:${getPort(io)}/socket.io/default/`)
         .query({ transport: "polling", EIO: 4 })
         .end((err, res) => {
           expect(res.status).to.be(200);
@@ -288,11 +291,11 @@ describe("socket.io", () => {
     });
 
     it("should disallow request if custom function in opts.allowRequest returns false", (done) => {
-      const sockets = new Server(createServer().listen(54023), {
+      const io = new Server(0, {
         allowRequest: (req, callback) => callback(null, false),
       });
       request
-        .get("http://localhost:54023/socket.io/default/")
+        .get(`http://localhost:${getPort(io)}/socket.io/default/`)
         .set("origin", "http://foo.example")
         .query({ transport: "polling", EIO: 4 })
         .end((err, res) => {
@@ -304,22 +307,22 @@ describe("socket.io", () => {
 
   describe("close", () => {
     it("should be able to close sio sending a srv", (done) => {
-      const PORT = 54018;
-      const srv = createServer().listen(PORT);
-      const sio = new Server(srv);
+      const httpServer = createServer().listen(0);
+      const io = new Server(httpServer);
+      const port = getPort(io);
       const net = require("net");
       const server = net.createServer();
 
-      const clientSocket = client(srv, { reconnection: false });
+      const clientSocket = client(httpServer, { reconnection: false });
 
       clientSocket.on("disconnect", () => {
-        expect(sio.sockets.sockets.size).to.equal(0);
-        server.listen(PORT);
+        expect(io.sockets.sockets.size).to.equal(0);
+        server.listen(port);
       });
 
       clientSocket.on("connect", () => {
-        expect(sio.sockets.sockets.size).to.equal(1);
-        sio.close();
+        expect(io.sockets.sockets.size).to.equal(1);
+        io.close();
       });
 
       server.once("listening", () => {
@@ -331,30 +334,31 @@ describe("socket.io", () => {
       });
     });
 
-    it("should be able to close sio sending a port", () => {
-      const PORT = 54019;
-      const sio = new Server(PORT);
+    it("should be able to close sio sending a srv", (done) => {
+      const io = new Server(0);
+      const port = getPort(io);
       const net = require("net");
       const server = net.createServer();
 
-      const clientSocket = ioc("ws://0.0.0.0:" + PORT, {
+      const clientSocket = ioc("ws://0.0.0.0:" + port, {
         reconnection: false,
       });
 
       clientSocket.on("disconnect", () => {
-        expect(Object.keys(sio._nsps["/"].sockets).length).to.equal(0);
-        server.listen(PORT);
+        expect(io.sockets.sockets.size).to.equal(0);
+        server.listen(port);
       });
 
       clientSocket.on("connect", () => {
-        expect(Object.keys(sio._nsps["/"].sockets).length).to.equal(1);
-        sio.close();
+        expect(io.sockets.sockets.size).to.equal(1);
+        io.close();
       });
 
       server.once("listening", () => {
         // PORT should be free
         server.close((error) => {
           expect(error).to.be(undefined);
+          done();
         });
       });
     });
@@ -806,6 +810,7 @@ describe("socket.io", () => {
       srv.listen(() => {
         const socket = client(srv);
 
+        // @ts-ignore
         socket.io.engine.write = () => {}; // prevent the client from sending a CONNECT packet
 
         socket.on("disconnect", () => {
@@ -816,29 +821,6 @@ describe("socket.io", () => {
       });
     });
 
-    it("should close a client without namespace (2)", (done) => {
-      const srv = createServer();
-      const sio = new Server(srv, {
-        connectTimeout: 100,
-      });
-
-      sio.use((_, next) => {
-        next(new Error("nope"));
-      });
-
-      srv.listen(() => {
-        const socket = client(srv);
-
-        const success = () => {
-          socket.close();
-          sio.close();
-          done();
-        };
-
-        socket.on("disconnect", success);
-      });
-    });
-
     it("should exclude a specific socket when emitting", (done) => {
       const srv = createServer();
       const io = new Server(srv);
@@ -996,6 +978,46 @@ describe("socket.io", () => {
           const socket = client(srv, "/dynamic-101");
         });
       });
+
+      it("should handle race conditions with dynamic namespaces (#4136)", (done) => {
+        const srv = createServer();
+        const sio = new Server(srv);
+        const counters = {
+          connected: 0,
+          created: 0,
+          events: 0,
+        };
+        const buffer: callback[] = [];
+        sio.on("new_namespace", (namespace) => {
+          counters.created++;
+        });
+        srv.listen(() => {
+          const handler = () => {
+            if (++counters.events === 2) {
+              expect(counters.created).to.equal(1);
+              done();
+            }
+          };
+
+          sio
+            .of((name, query, next) => {
+              buffer.push(next);
+              if (buffer.length === 2) {
+                buffer.forEach((next) => next(null, true));
+              }
+            })
+            .on("connection", (socket) => {
+              if (++counters.connected === 2) {
+                sio.of("/dynamic-101").emit("message");
+              }
+            });
+
+          let one = client(srv, "/dynamic-101");
+          let two = client(srv, "/dynamic-101");
+          one.on("message", handler);
+          two.on("message", handler);
+        });
+      });
     });
   });
 
@@ -1028,7 +1050,7 @@ describe("socket.io", () => {
           reconnectionDelay: 100,
         });
         clientSocket.on("connect", () => {
-          srv.close();
+          sio.close();
         });
 
         clientSocket.io.on("reconnect_failed", () => {
@@ -1382,6 +1404,58 @@ describe("socket.io", () => {
       }, 200);
     });
 
+    it("should emit only one consecutive volatile event with binary (ws)", (done) => {
+      const srv = createServer();
+      const sio = new Server(srv, { transports: ["websocket"] });
+
+      let counter = 0;
+      srv.listen(() => {
+        sio.on("connection", (s) => {
+          // Wait to make sure there are no packets being sent for opening the connection
+          setTimeout(() => {
+            s.volatile.emit("ev", Buffer.from([1, 2, 3]));
+            s.volatile.emit("ev", Buffer.from([4, 5, 6]));
+          }, 20);
+        });
+
+        const socket = client(srv, { transports: ["websocket"] });
+        socket.on("ev", () => {
+          counter++;
+        });
+      });
+
+      setTimeout(() => {
+        expect(counter).to.be(1);
+        done();
+      }, 200);
+    });
+
+    it("should broadcast only one consecutive volatile event with binary (ws)", (done) => {
+      const srv = createServer();
+      const sio = new Server(srv, { transports: ["websocket"] });
+
+      let counter = 0;
+      srv.listen(() => {
+        sio.on("connection", (s) => {
+          // Wait to make sure there are no packets being sent for opening the connection
+          setTimeout(() => {
+            sio.volatile.emit("ev", Buffer.from([1, 2, 3]));
+            sio.volatile.emit("ev", Buffer.from([4, 5, 6]));
+          }, 20);
+        });
+
+        const socket = client(srv, { transports: ["websocket"] });
+        socket.on("ev", () => {
+          counter++;
+        });
+      });
+
+      setTimeout(() => {
+        expect(counter).to.be(1);
+        done();
+      }, 200);
+    });
+
     it("should emit regular events after trying a failed volatile event (polling)", (done) => {
       const srv = createServer();
       const sio = new Server(srv, { transports: ["polling"] });
@@ -1756,7 +1830,7 @@ describe("socket.io", () => {
           reconnectionDelay: 100,
         });
         clientSocket.once("connect", () => {
-          srv.close(() => {
+          sio.close(() => {
             clientSocket.io.on("reconnect", () => {
               clientSocket.emit("ev", "payload");
             });
@@ -1806,6 +1880,7 @@ describe("socket.io", () => {
             console.log(
               "\u001b[96mNote: warning expected and normal in test.\u001b[39m"
             );
+            // @ts-ignore
             socket.io.engine.write("5woooot");
             setTimeout(() => {
               done();
@@ -1825,6 +1900,7 @@ describe("socket.io", () => {
             console.log(
               "\u001b[96mNote: warning expected and normal in test.\u001b[39m"
             );
+            // @ts-ignore
             socket.io.engine.write('44["handle me please"]');
             setTimeout(() => {
               done();
@@ -1845,6 +1921,7 @@ describe("socket.io", () => {
             done();
           });
           s.conn.on("upgrade", () => {
+            // @ts-ignore
             socket.io.engine.write("5woooot");
           });
         });
@@ -1862,6 +1939,7 @@ describe("socket.io", () => {
             done();
           });
           s.conn.on("upgrade", () => {
+            // @ts-ignore
             socket.io.engine.write("5");
           });
         });
@@ -2441,28 +2519,6 @@ describe("socket.io", () => {
         });
       });
     });
-
-    it("should pre encode a broadcast packet", (done) => {
-      const srv = createServer();
-      const sio = new Server(srv);
-
-      srv.listen(() => {
-        const clientSocket = client(srv, { multiplex: false });
-
-        sio.on("connection", (socket) => {
-          socket.conn.on("packetCreate", (packet) => {
-            expect(packet.data).to.eql('2["hello","world"]');
-            expect(packet.options.wsPreEncoded).to.eql('42["hello","world"]');
-
-            clientSocket.close();
-            sio.close();
-            done();
-          });
-
-          sio.emit("hello", "world");
-        });
-      });
-    });
   });
 
   describe("middleware", () => {
@@ -2651,6 +2707,25 @@ describe("socket.io", () => {
         if (++count === 2) done();
       });
     });
+
+    it("should only set `connected` to true after the middleware execution", (done) => {
+      const httpServer = createServer();
+      const io = new Server(httpServer);
+
+      const clientSocket = client(httpServer, "/");
+
+      io.use((socket, next) => {
+        expect(socket.connected).to.be(false);
+        expect(socket.disconnected).to.be(true);
+        next();
+      });
+
+      io.on("connection", (socket) => {
+        expect(socket.connected).to.be(true);
+        expect(socket.disconnected).to.be(false);
+        success(io, clientSocket, done);
+      });
+    });
   });
 
   describe("socket middleware", () => {
@@ -2790,4 +2865,6 @@ describe("socket.io", () => {
       });
     });
   });
+
+  require("./socket-timeout");
 });

test/support/util.ts

@@ -1,3 +1,11 @@
+import type { Server } from "../..";
+import {
+  io as ioc,
+  ManagerOptions,
+  Socket as ClientSocket,
+  SocketOptions,
+} from "socket.io-client";
+
 const expect = require("expect.js");
 const i = expect.stringify;
 
@@ -20,3 +28,19 @@ expect.Assertion.prototype.contain = function (...args) {
   }
   return contain.apply(this, args);
 };
+
+export function createClient(
+  io: Server,
+  nsp: string,
+  opts?: ManagerOptions & SocketOptions
+): ClientSocket {
+  // @ts-ignore
+  const port = io.httpServer.address().port;
+  return ioc(`http://localhost:${port}${nsp}`, opts);
+}
+
+export function success(done: Function, io: Server, client: ClientSocket) {
+  io.close();
+  client.disconnect();
+  done();
+}

test/uws.ts

@@ -0,0 +1,197 @@
+import { App, us_socket_local_port } from "uWebSockets.js";
+import { Server } from "..";
+import { io as ioc, Socket as ClientSocket } from "socket.io-client";
+import request from "supertest";
+import expect from "expect.js";
+
+const createPartialDone = (done: (err?: Error) => void, count: number) => {
+  let i = 0;
+  return () => {
+    if (++i === count) {
+      done();
+    } else if (i > count) {
+      done(new Error(`partialDone() called too many times: ${i} > ${count}`));
+    }
+  };
+};
+
+const shouldNotHappen = (done) => () => done(new Error("should not happen"));
+
+describe("socket.io with uWebSocket.js-based engine", () => {
+  let io: Server,
+    port: number,
+    client: ClientSocket,
+    clientWSOnly: ClientSocket,
+    clientPollingOnly: ClientSocket,
+    clientCustomNamespace: ClientSocket;
+
+  beforeEach((done) => {
+    const app = App();
+    io = new Server();
+    io.attachApp(app);
+
+    io.of("/custom");
+
+    app.listen(0, (listenSocket) => {
+      port = us_socket_local_port(listenSocket);
+
+      client = ioc(`http://localhost:${port}`);
+      clientWSOnly = ioc(`http://localhost:${port}`, {
+        transports: ["websocket"],
+      });
+      clientPollingOnly = ioc(`http://localhost:${port}`, {
+        transports: ["polling"],
+      });
+      clientCustomNamespace = ioc(`http://localhost:${port}/custom`);
+    });
+
+    const partialDone = createPartialDone(done, 4);
+    client.on("connect", partialDone);
+    clientWSOnly.on("connect", partialDone);
+    clientPollingOnly.on("connect", partialDone);
+    clientCustomNamespace.on("connect", partialDone);
+  });
+
+  afterEach(() => {
+    io.close();
+    client.disconnect();
+    clientWSOnly.disconnect();
+    clientPollingOnly.disconnect();
+    clientCustomNamespace.disconnect();
+  });
+
+  it("should broadcast", (done) => {
+    const partialDone = createPartialDone(done, 3);
+
+    client.on("hello", partialDone);
+    clientWSOnly.on("hello", partialDone);
+    clientPollingOnly.on("hello", partialDone);
+    clientCustomNamespace.on("hello", shouldNotHappen(done));
+
+    io.emit("hello");
+  });
+
+  it("should broadcast in a namespace", (done) => {
+    client.on("hello", shouldNotHappen(done));
+    clientWSOnly.on("hello", shouldNotHappen(done));
+    clientPollingOnly.on("hello", shouldNotHappen(done));
+    clientCustomNamespace.on("hello", done);
+
+    io.of("/custom").emit("hello");
+  });
+
+  it("should broadcast in a dynamic namespace", (done) => {
+    const dynamicNamespace = io.of(/\/dynamic-\d+/);
+    const dynamicClient = clientWSOnly.io.socket("/dynamic-101");
+
+    dynamicClient.on("connect", () => {
+      dynamicNamespace.emit("hello");
+    });
+
+    dynamicClient.on("hello", () => {
+      dynamicClient.disconnect();
+      done();
+    });
+  });
+
+  it("should broadcast binary content", (done) => {
+    const partialDone = createPartialDone(done, 3);
+
+    client.on("hello", partialDone);
+    clientWSOnly.on("hello", partialDone);
+    clientPollingOnly.on("hello", partialDone);
+    clientCustomNamespace.on("hello", shouldNotHappen(done));
+
+    io.emit("hello", Buffer.from([1, 2, 3]));
+  });
+
+  it("should broadcast volatile packet with binary content", (done) => {
+    const partialDone = createPartialDone(done, 3);
+
+    client.on("hello", partialDone);
+    clientWSOnly.on("hello", partialDone);
+    clientPollingOnly.on("hello", partialDone);
+    clientCustomNamespace.on("hello", shouldNotHappen(done));
+
+    // wait to make sure there are no packets being sent for opening the connection
+    setTimeout(() => {
+      io.volatile.emit("hello", Buffer.from([1, 2, 3]));
+    }, 20);
+  });
+
+  it("should broadcast in a room", (done) => {
+    const partialDone = createPartialDone(done, 2);
+
+    client.on("hello", shouldNotHappen(done));
+    clientWSOnly.on("hello", partialDone);
+    clientPollingOnly.on("hello", partialDone);
+    clientCustomNamespace.on("hello", shouldNotHappen(done));
+
+    io.of("/").sockets.get(clientWSOnly.id)!.join("room1");
+    io.of("/").sockets.get(clientPollingOnly.id)!.join("room1");
+
+    io.to("room1").emit("hello");
+  });
+
+  it("should broadcast in multiple rooms", (done) => {
+    const partialDone = createPartialDone(done, 2);
+
+    client.on("hello", shouldNotHappen(done));
+    clientWSOnly.on("hello", partialDone);
+    clientPollingOnly.on("hello", partialDone);
+    clientCustomNamespace.on("hello", shouldNotHappen(done));
+
+    io.of("/").sockets.get(clientWSOnly.id)!.join("room1");
+    io.of("/").sockets.get(clientPollingOnly.id)!.join("room2");
+
+    io.to(["room1", "room2"]).emit("hello");
+  });
+
+  it("should broadcast in all but a given room", (done) => {
+    const partialDone = createPartialDone(done, 2);
+
+    client.on("hello", partialDone);
+    clientWSOnly.on("hello", partialDone);
+    clientPollingOnly.on("hello", shouldNotHappen(done));
+    clientCustomNamespace.on("hello", shouldNotHappen(done));
+
+    io.of("/").sockets.get(clientWSOnly.id)!.join("room1");
+    io.of("/").sockets.get(clientPollingOnly.id)!.join("room2");
+
+    io.except("room2").emit("hello");
+  });
+
+  it("should work even after leaving room", (done) => {
+    const partialDone = createPartialDone(done, 2);
+
+    client.on("hello", partialDone);
+    clientWSOnly.on("hello", shouldNotHappen(done));
+    clientPollingOnly.on("hello", partialDone);
+    clientCustomNamespace.on("hello", shouldNotHappen(done));
+
+    io.of("/").sockets.get(client.id)!.join("room1");
+    io.of("/").sockets.get(clientPollingOnly.id)!.join("room1");
+
+    io.of("/").sockets.get(clientWSOnly.id)!.join("room1");
+    io.of("/").sockets.get(clientWSOnly.id)!.leave("room1");
+
+    io.to("room1").emit("hello");
+  });
+
+  it("should serve static files", (done) => {
+    const clientVersion = require("socket.io-client/package.json").version;
+
+    request(`http://localhost:${port}`)
+      .get("/socket.io/socket.io.js")
+      .buffer(true)
+      .end((err, res) => {
+        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(undefined);
+        expect(res.text).to.match(/engine\.io/);
+        expect(res.status).to.be(200);
+        done();
+      });
+  });
+});