.github/workflows/ci.yml

@@ -17,6 +17,7 @@ jobs:
     strategy:
       matrix:
         node-version:
+          - 14
           - 20
 
     steps:
@@ -31,5 +32,11 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
+      # the "override" keyword was added in typescript@4.5.0
+      # else, users can go down to typescript@3.8.x ("import type")
+      - name: Install TypeScript 4.5
+        run: npm i typescript@4.5
+        if: ${{ matrix.node-version == '14' }}
+
       - name: Run tests
         run: npm test

CHANGELOG.md

@@ -1,5 +1,6 @@
 # History
 
+- [2.5.4](#254-2024-02-22) (Feb 2024)
 - [2.5.3](#253-2024-02-21) (Feb 2024)
 - [2.5.2](#252-2023-01-12) (Jan 2023)
 - [2.5.1](#251-2023-01-06) (Jan 2023)
@@ -20,6 +21,16 @@
 
 # Release notes
 
+## [2.5.4](https://github.com/socketio/socket.io-adapter/compare/2.5.3...2.5.4) (2024-02-22)
+
+
+### Bug Fixes
+
+* ensure the order of the commands ([a13f35f](https://github.com/socketio/socket.io-adapter/commit/a13f35f0e6b85bbba07f99ee2440e914f1429d83))
+* **types:** ensure compatibility with TypeScript < 4.5 ([ca397f3](https://github.com/socketio/socket.io-adapter/commit/ca397f3afe06ed9390db52b70a506a9721e091d8))
+
+
+
 ## [2.5.3](https://github.com/socketio/socket.io-adapter/compare/2.5.2...2.5.3) (2024-02-21)
 
 Two abstract classes were imported from the [Redis adapter repository](https://github.com/socketio/socket.io-redis-adapter/blob/bd32763043a2eb79a21dffd8820f20e598348adf/lib/cluster-adapter.ts):

lib/cluster-adapter.ts

@@ -1,9 +1,9 @@
-import {
-  Adapter,
-  type BroadcastFlags,
-  type BroadcastOptions,
-  type Room,
-} from "./index";
+import { Adapter } from "./in-memory-adapter";
+import type {
+  BroadcastFlags,
+  BroadcastOptions,
+  Room,
+} from "./in-memory-adapter";
 import { debug as debugModule } from "debug";
 import { randomBytes } from "crypto";
 
@@ -503,55 +503,64 @@ export abstract class ClusterAdapter extends Adapter {
     super.broadcastWithAck(packet, opts, clientCountCallback, ack);
   }
 
-  override addSockets(opts: BroadcastOptions, rooms: Room[]) {
-    super.addSockets(opts, rooms);
-
+  override async addSockets(opts: BroadcastOptions, rooms: Room[]) {
     const onlyLocal = opts.flags?.local;
-    if (onlyLocal) {
-      return;
+
+    if (!onlyLocal) {
+      try {
+        await this.publishAndReturnOffset({
+          type: MessageType.SOCKETS_JOIN,
+          data: {
+            opts: encodeOptions(opts),
+            rooms,
+          },
+        });
+      } catch (e) {
+        debug("[%s] error while publishing message: %s", this.uid, e.message);
+      }
     }
 
-    this.publish({
-      type: MessageType.SOCKETS_JOIN,
-      data: {
-        opts: encodeOptions(opts),
-        rooms,
-      },
-    });
+    super.addSockets(opts, rooms);
   }
 
-  override delSockets(opts: BroadcastOptions, rooms: Room[]) {
-    super.delSockets(opts, rooms);
-
+  override async delSockets(opts: BroadcastOptions, rooms: Room[]) {
     const onlyLocal = opts.flags?.local;
-    if (onlyLocal) {
-      return;
+
+    if (!onlyLocal) {
+      try {
+        await this.publishAndReturnOffset({
+          type: MessageType.SOCKETS_LEAVE,
+          data: {
+            opts: encodeOptions(opts),
+            rooms,
+          },
+        });
+      } catch (e) {
+        debug("[%s] error while publishing message: %s", this.uid, e.message);
+      }
     }
 
-    this.publish({
-      type: MessageType.SOCKETS_LEAVE,
-      data: {
-        opts: encodeOptions(opts),
-        rooms,
-      },
-    });
+    super.delSockets(opts, rooms);
   }
 
-  override disconnectSockets(opts: BroadcastOptions, close: boolean) {
-    super.disconnectSockets(opts, close);
-
+  override async disconnectSockets(opts: BroadcastOptions, close: boolean) {
     const onlyLocal = opts.flags?.local;
-    if (onlyLocal) {
-      return;
+
+    if (!onlyLocal) {
+      try {
+        await this.publishAndReturnOffset({
+          type: MessageType.DISCONNECT_SOCKETS,
+          data: {
+            opts: encodeOptions(opts),
+            close,
+          },
+        });
+      } catch (e) {
+        debug("[%s] error while publishing message: %s", this.uid, e.message);
+      }
     }
 
-    this.publish({
-      type: MessageType.DISCONNECT_SOCKETS,
-      data: {
-        opts: encodeOptions(opts),
-        close,
-      },
-    });
+    super.disconnectSockets(opts, close);
   }
 
   async fetchSockets(opts: BroadcastOptions): Promise<any[]> {