@pluv/io 0.38.14 → 0.39.0

package/.turbo/turbo-build.log

@@ -1,9 +1,9 @@
 
-> @pluv/io@0.38.14 build /home/runner/work/pluv/pluv/packages/io
+> @pluv/io@0.39.0 build /home/runner/work/pluv/pluv/packages/io
 > pnpm run version && tsup src/index.ts --format esm,cjs --dts
 
 
-> @pluv/io@0.38.14 version /home/runner/work/pluv/pluv/packages/io
+> @pluv/io@0.39.0 version /home/runner/work/pluv/pluv/packages/io
 > genversion ./src/version.generated.ts --esm
 
 CLI Building entry: src/index.ts
@@ -12,11 +12,11 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-ESM dist/index.mjs 44.29 KB
-ESM ⚡️ Build success in 118ms
-CJS dist/index.js 46.46 KB
-CJS ⚡️ Build success in 132ms
+CJS dist/index.js 46.56 KB
+CJS ⚡️ Build success in 147ms
+ESM dist/index.mjs 44.38 KB
+ESM ⚡️ Build success in 148ms
 DTS Build start
-DTS ⚡️ Build success in 2518ms
-DTS dist/index.d.mts 30.95 KB
-DTS dist/index.d.ts  30.95 KB
+DTS ⚡️ Build success in 2394ms
+DTS dist/index.d.mts 30.93 KB
+DTS dist/index.d.ts  30.93 KB

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @pluv/io
 
+## 0.39.0
+
+### Patch Changes
+
+- fe6e239: Broadcast the quitting user when the server receives an abnormal message event from a session that was marked as having quit.
+- 737d508: Fix not always fully running clean-up effects on the `IORoom` after websocket sessions are closed.
+  - @pluv/crdt@0.39.0
+  - @pluv/types@0.39.0
+
 ## 0.38.14
 
 ### Patch Changes

package/dist/index.d.mts

@@ -7,10 +7,10 @@ declare abstract class AbstractPersistence {
     abstract deleteStorageState(room: string): Promise<void>;
     abstract deleteUser(room: string, connectionId: string): Promise<void>;
     abstract deleteUsers(room: string): Promise<void>;
-    abstract getSize(room: string): Promise<number>;
     abstract getStorageState(room: string): Promise<string | null>;
     abstract getUser(room: string, connectionId: string): Promise<JsonObject | null>;
     abstract getUsers(room: string): Promise<readonly (JsonObject | null)[]>;
+    abstract getUsersSize(room: string): Promise<number>;
     abstract setStorageState(room: string, state: string): Promise<void>;
 }
 
@@ -72,7 +72,6 @@ declare abstract class AbstractWebSocket<TWebSocket = any> {
      * method, because the implementing class might have to transform the
      * listener, and removing the same listener might be complicated as a
      * result.
-     * @author leedavidcs
      * @date August 28, 2022
      */
     abstract addEventListener<TType extends EventType>(type: TType, handler: AbstractListener<TType>): void;
@@ -330,7 +329,7 @@ type IORoomConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any
     roomContext: InferRoomContextType<TPlatform>;
     router: PluvRouter<TPlatform, TAuthorize, TContext, TEvents>;
 };
-type WebsocketRegisterConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>> = {
+type WebSocketRegisterConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>> = {
     token?: string | null;
 } & InferInitContextType<TPlatform>;
 declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = null, TContext extends Record<string, any> = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> implements IOLike<TAuthorize, TEvents> {
@@ -375,12 +374,12 @@ declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     onMessage(webSocket: WebSocketType<TPlatform>): (event: AbstractMessageEvent) => Promise<void>;
     register(webSocket: InferPlatformWebSocketSource<TPlatform>, ...options: keyof InferInitContextType<TPlatform> extends never ? [{
         token?: string;
-    }?] : [WebsocketRegisterConfig<TPlatform>]): Promise<void>;
+    }?] : [WebSocketRegisterConfig<TPlatform>]): Promise<void>;
     private _broadcast;
+    private _closeWebSockets;
     private _emitQuitters;
     private _emitRegistered;
     private _ensureDetached;
-    private _exitWebsocket;
     private _getAbstractWs;
     private _getAuthorizedUser;
     private _getInitialDoc;

package/dist/index.d.ts

@@ -7,10 +7,10 @@ declare abstract class AbstractPersistence {
     abstract deleteStorageState(room: string): Promise<void>;
     abstract deleteUser(room: string, connectionId: string): Promise<void>;
     abstract deleteUsers(room: string): Promise<void>;
-    abstract getSize(room: string): Promise<number>;
     abstract getStorageState(room: string): Promise<string | null>;
     abstract getUser(room: string, connectionId: string): Promise<JsonObject | null>;
     abstract getUsers(room: string): Promise<readonly (JsonObject | null)[]>;
+    abstract getUsersSize(room: string): Promise<number>;
     abstract setStorageState(room: string, state: string): Promise<void>;
 }
 
@@ -72,7 +72,6 @@ declare abstract class AbstractWebSocket<TWebSocket = any> {
      * method, because the implementing class might have to transform the
      * listener, and removing the same listener might be complicated as a
      * result.
-     * @author leedavidcs
      * @date August 28, 2022
      */
     abstract addEventListener<TType extends EventType>(type: TType, handler: AbstractListener<TType>): void;
@@ -330,7 +329,7 @@ type IORoomConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any
     roomContext: InferRoomContextType<TPlatform>;
     router: PluvRouter<TPlatform, TAuthorize, TContext, TEvents>;
 };
-type WebsocketRegisterConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>> = {
+type WebSocketRegisterConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>> = {
     token?: string | null;
 } & InferInitContextType<TPlatform>;
 declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>, TAuthorize extends PluvIOAuthorize<TPlatform, any, InferInitContextType<TPlatform>> | null = null, TContext extends Record<string, any> = {}, TEvents extends PluvRouterEventConfig<TPlatform, TAuthorize, TContext> = {}> implements IOLike<TAuthorize, TEvents> {
@@ -375,12 +374,12 @@ declare class IORoom<TPlatform extends AbstractPlatform<any> = AbstractPlatform<
     onMessage(webSocket: WebSocketType<TPlatform>): (event: AbstractMessageEvent) => Promise<void>;
     register(webSocket: InferPlatformWebSocketSource<TPlatform>, ...options: keyof InferInitContextType<TPlatform> extends never ? [{
         token?: string;
-    }?] : [WebsocketRegisterConfig<TPlatform>]): Promise<void>;
+    }?] : [WebSocketRegisterConfig<TPlatform>]): Promise<void>;
     private _broadcast;
+    private _closeWebSockets;
     private _emitQuitters;
     private _emitRegistered;
     private _ensureDetached;
-    private _exitWebsocket;
     private _getAbstractWs;
     private _getAuthorizedUser;
     private _getInitialDoc;

package/dist/index.js

@@ -220,7 +220,7 @@ var AbstractPlatform = class {
     this._initialized = false;
     const { roomContext, persistence, pubSub } = config;
     this._meta = config._meta;
-    roomContext && (this._roomContext = roomContext);
+    if (!!roomContext) this._roomContext = roomContext;
     this.persistence = persistence != null ? persistence : new Persistence();
     this.pubSub = pubSub != null ? pubSub : new PubSub();
   }
@@ -594,19 +594,53 @@ var IORoom = class {
       }, message));
     });
   }
+  _closeWebSockets(webSockets) {
+    return __async(this, null, function* () {
+      const closeWebSocket = (webSocket) => __async(this, null, function* () {
+        webSocket.state = __spreadProps(__spreadValues({}, webSocket.state), { quit: true });
+        const sessionId = webSocket.sessionId;
+        this._logDebug(`${import_kleur.default.blue(`Unregistering connection for room ${this.id}:`)} ${sessionId}`);
+        this._sessions.delete(sessionId);
+        yield this._platform.persistence.deleteUser(this.id, sessionId).catch(() => null);
+        yield this._broadcast({
+          message: { type: "$exit", data: { sessionId } },
+          senderId: sessionId
+        });
+        try {
+          const [session, doc] = yield Promise.all([webSocket.getSession(), this._doc]);
+          const encodedState = doc.getEncodedState();
+          yield Promise.resolve(
+            this._listeners.onUserDisconnected({
+              context: this._context,
+              encodedState,
+              room: this.id,
+              user: session.user
+            })
+          );
+        } catch (error) {
+          console.error(error);
+        }
+        this._logDebug(`${import_kleur.default.blue(`Unregistered connection for room ${this.id}:`)} ${webSocket.sessionId}`);
+      });
+      const promises = webSockets.map((webSocket) => __async(this, null, function* () {
+        yield closeWebSocket(webSocket).catch(() => null);
+      }));
+      yield Promise.all(promises).catch(() => null);
+      const size = this.getSize();
+      this._logDebug(`${import_kleur.default.blue(`Room ${this.id} size:`)} ${size}`);
+      if (!!size) return;
+      if (!this._uninitialize) return;
+      const uninitialize = (yield this._uninitialize).bind(this);
+      yield uninitialize();
+    });
+  }
   _emitQuitters() {
     return __async(this, null, function* () {
       const currentTime = (/* @__PURE__ */ new Date()).getTime();
       const quitters = Array.from(this._sessions.values()).filter(
         (pluvWs) => pluvWs.state.quit || currentTime - pluvWs.state.timers.ping > PING_TIMEOUT_MS
       );
-      quitters.forEach((pluvWs) => {
-        this._sessions.delete(pluvWs.sessionId);
-      });
-      const promises = quitters.map((quitter) => __async(this, null, function* () {
-        yield this._exitWebsocket(quitter);
-      }));
-      yield Promise.all(promises);
+      this._closeWebSockets(quitters);
     });
   }
   _emitRegistered(pluvWs) {
@@ -636,32 +670,6 @@ var IORoom = class {
     if (this._platform._config.registrationMode === "detached") return;
     throw new Error("Platform must use detached mode");
   }
-  _exitWebsocket(webSocket) {
-    return __async(this, null, function* () {
-      const session = yield webSocket.getSession();
-      yield this._broadcast({
-        message: {
-          type: "$exit",
-          data: { sessionId: session.id }
-        },
-        senderId: session.id
-      });
-      try {
-        const doc = yield this._doc;
-        const encodedState = doc.getEncodedState();
-        yield Promise.resolve(
-          this._listeners.onUserDisconnected({
-            context: this._context,
-            encodedState,
-            room: this.id,
-            user: session.user
-          })
-        );
-      } catch (err) {
-        console.error(err);
-      }
-    });
-  }
   _getAbstractWs(webSocket) {
     var _a, _b;
     if (webSocket instanceof AbstractWebSocket) return webSocket;
@@ -796,25 +804,12 @@ var IORoom = class {
     return { doc: this._doc, uninitialize: this._uninitialize };
   }
   _logDebug(...data) {
-    this._debug && console.log(...data);
+    if (this._debug) console.log(...data);
   }
   _onClose(webSocket) {
     return () => __async(this, null, function* () {
       if (!(yield this._initialized)) return;
-      webSocket.state = __spreadProps(__spreadValues({}, webSocket.state), { quit: true });
-      this._logDebug(`${import_kleur.default.blue(`Unregistering connection for room ${this.id}:`)} ${webSocket.sessionId}`);
-      this._sessions.delete(webSocket.sessionId);
-      this._platform.persistence.deleteUser(this.id, webSocket.sessionId).finally(() => __async(this, null, function* () {
-        yield this._exitWebsocket(webSocket);
-        const size = this.getSize();
-        this._logDebug(`${import_kleur.default.blue(`Unregistered connection for room ${this.id}:`)} ${webSocket.sessionId}`);
-        this._logDebug(`${import_kleur.default.blue(`Room ${this.id} size:`)} ${size}`);
-        if (size) return;
-        if (this._uninitialize) {
-          const uninitialize = (yield this._uninitialize).bind(this);
-          yield uninitialize();
-        }
-      }));
+      yield this._closeWebSockets([webSocket]);
     });
   }
   _onMessage(webSocket) {
@@ -836,6 +831,7 @@ var IORoom = class {
         sessions
       };
       if (pluvWs.state.quit) {
+        yield this._closeWebSockets([pluvWs]).catch(() => null);
         pluvWs.close(1011, "WebSocket broken.");
         return;
       }
@@ -1009,7 +1005,7 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "0.38.14";
+var version = "0.39.0";
 
 // src/PluvServer.ts
 var PluvServer = class {
@@ -1207,16 +1203,14 @@ var PluvServer = class {
     });
   }
   _getIOAuthorize(options) {
-    if (typeof this._authorize === "function") {
-      return this._authorize(options);
-    }
+    if (typeof this._authorize === "function") return this._authorize(options);
     return this._authorize;
   }
   _getListeners() {
     return this._listeners;
   }
   _logDebug(...data) {
-    this._debug && console.log(...data);
+    if (this._debug) console.log(...data);
   }
 };
 

package/dist/index.mjs

@@ -178,7 +178,7 @@ var AbstractPlatform = class {
     this._initialized = false;
     const { roomContext, persistence, pubSub } = config;
     this._meta = config._meta;
-    roomContext && (this._roomContext = roomContext);
+    if (!!roomContext) this._roomContext = roomContext;
     this.persistence = persistence != null ? persistence : new Persistence();
     this.pubSub = pubSub != null ? pubSub : new PubSub();
   }
@@ -552,19 +552,53 @@ var IORoom = class {
       }, message));
     });
   }
+  _closeWebSockets(webSockets) {
+    return __async(this, null, function* () {
+      const closeWebSocket = (webSocket) => __async(this, null, function* () {
+        webSocket.state = __spreadProps(__spreadValues({}, webSocket.state), { quit: true });
+        const sessionId = webSocket.sessionId;
+        this._logDebug(`${colors.blue(`Unregistering connection for room ${this.id}:`)} ${sessionId}`);
+        this._sessions.delete(sessionId);
+        yield this._platform.persistence.deleteUser(this.id, sessionId).catch(() => null);
+        yield this._broadcast({
+          message: { type: "$exit", data: { sessionId } },
+          senderId: sessionId
+        });
+        try {
+          const [session, doc] = yield Promise.all([webSocket.getSession(), this._doc]);
+          const encodedState = doc.getEncodedState();
+          yield Promise.resolve(
+            this._listeners.onUserDisconnected({
+              context: this._context,
+              encodedState,
+              room: this.id,
+              user: session.user
+            })
+          );
+        } catch (error) {
+          console.error(error);
+        }
+        this._logDebug(`${colors.blue(`Unregistered connection for room ${this.id}:`)} ${webSocket.sessionId}`);
+      });
+      const promises = webSockets.map((webSocket) => __async(this, null, function* () {
+        yield closeWebSocket(webSocket).catch(() => null);
+      }));
+      yield Promise.all(promises).catch(() => null);
+      const size = this.getSize();
+      this._logDebug(`${colors.blue(`Room ${this.id} size:`)} ${size}`);
+      if (!!size) return;
+      if (!this._uninitialize) return;
+      const uninitialize = (yield this._uninitialize).bind(this);
+      yield uninitialize();
+    });
+  }
   _emitQuitters() {
     return __async(this, null, function* () {
       const currentTime = (/* @__PURE__ */ new Date()).getTime();
       const quitters = Array.from(this._sessions.values()).filter(
         (pluvWs) => pluvWs.state.quit || currentTime - pluvWs.state.timers.ping > PING_TIMEOUT_MS
       );
-      quitters.forEach((pluvWs) => {
-        this._sessions.delete(pluvWs.sessionId);
-      });
-      const promises = quitters.map((quitter) => __async(this, null, function* () {
-        yield this._exitWebsocket(quitter);
-      }));
-      yield Promise.all(promises);
+      this._closeWebSockets(quitters);
     });
   }
   _emitRegistered(pluvWs) {
@@ -594,32 +628,6 @@ var IORoom = class {
     if (this._platform._config.registrationMode === "detached") return;
     throw new Error("Platform must use detached mode");
   }
-  _exitWebsocket(webSocket) {
-    return __async(this, null, function* () {
-      const session = yield webSocket.getSession();
-      yield this._broadcast({
-        message: {
-          type: "$exit",
-          data: { sessionId: session.id }
-        },
-        senderId: session.id
-      });
-      try {
-        const doc = yield this._doc;
-        const encodedState = doc.getEncodedState();
-        yield Promise.resolve(
-          this._listeners.onUserDisconnected({
-            context: this._context,
-            encodedState,
-            room: this.id,
-            user: session.user
-          })
-        );
-      } catch (err) {
-        console.error(err);
-      }
-    });
-  }
   _getAbstractWs(webSocket) {
     var _a, _b;
     if (webSocket instanceof AbstractWebSocket) return webSocket;
@@ -754,25 +762,12 @@ var IORoom = class {
     return { doc: this._doc, uninitialize: this._uninitialize };
   }
   _logDebug(...data) {
-    this._debug && console.log(...data);
+    if (this._debug) console.log(...data);
   }
   _onClose(webSocket) {
     return () => __async(this, null, function* () {
       if (!(yield this._initialized)) return;
-      webSocket.state = __spreadProps(__spreadValues({}, webSocket.state), { quit: true });
-      this._logDebug(`${colors.blue(`Unregistering connection for room ${this.id}:`)} ${webSocket.sessionId}`);
-      this._sessions.delete(webSocket.sessionId);
-      this._platform.persistence.deleteUser(this.id, webSocket.sessionId).finally(() => __async(this, null, function* () {
-        yield this._exitWebsocket(webSocket);
-        const size = this.getSize();
-        this._logDebug(`${colors.blue(`Unregistered connection for room ${this.id}:`)} ${webSocket.sessionId}`);
-        this._logDebug(`${colors.blue(`Room ${this.id} size:`)} ${size}`);
-        if (size) return;
-        if (this._uninitialize) {
-          const uninitialize = (yield this._uninitialize).bind(this);
-          yield uninitialize();
-        }
-      }));
+      yield this._closeWebSockets([webSocket]);
     });
   }
   _onMessage(webSocket) {
@@ -794,6 +789,7 @@ var IORoom = class {
         sessions
       };
       if (pluvWs.state.quit) {
+        yield this._closeWebSockets([pluvWs]).catch(() => null);
         pluvWs.close(1011, "WebSocket broken.");
         return;
       }
@@ -967,7 +963,7 @@ var IORoom = class {
 };
 
 // src/version.generated.ts
-var version = "0.38.14";
+var version = "0.39.0";
 
 // src/PluvServer.ts
 var PluvServer = class {
@@ -1165,16 +1161,14 @@ var PluvServer = class {
     });
   }
   _getIOAuthorize(options) {
-    if (typeof this._authorize === "function") {
-      return this._authorize(options);
-    }
+    if (typeof this._authorize === "function") return this._authorize(options);
     return this._authorize;
   }
   _getListeners() {
     return this._listeners;
   }
   _logDebug(...data) {
-    this._debug && console.log(...data);
+    if (this._debug) console.log(...data);
   }
 };
 

package/eslint.config.mjs

@@ -0,0 +1,4 @@
+import { config } from "eslint-config-pluv/base";
+
+/** @type {import("eslint").Linter.Config} */
+export default config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/io",
-  "version": "0.38.14",
+  "version": "0.39.0",
   "description": "@pluv/io server-side websocket manager",
   "author": "leedavidcs",
   "license": "MIT",
@@ -21,21 +21,21 @@
     "jose": "^5.10.0",
     "kleur": "^4.1.5",
     "wonka": "^6.3.5",
-    "@pluv/crdt": "^0.38.14",
-    "@pluv/types": "^0.38.14"
+    "@pluv/crdt": "^0.39.0",
+    "@pluv/types": "^0.39.0"
   },
   "devDependencies": {
-    "eslint": "^8.57.1",
+    "eslint": "^9.24.0",
     "genversion": "^3.2.0",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
-    "@pluv/tsconfig": "^0.38.14",
-    "eslint-config-pluv": "^0.38.14"
+    "@pluv/tsconfig": "^0.39.0",
+    "eslint-config-pluv": "^0.39.0"
   },
   "scripts": {
     "build": "pnpm run version && tsup src/index.ts --format esm,cjs --dts",
     "dev": "tsup src/index.ts --format esm,cjs --watch --dts",
-    "lint": "eslint src/**/*.ts* --fix",
+    "lint": "eslint src/**/*.ts* --fix --max-warnings 0",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
     "version": "genversion ./src/version.generated.ts --esm"
   }

package/src/AbstractPersistence.ts

@@ -9,13 +9,13 @@ export abstract class AbstractPersistence {
 
     public abstract deleteUsers(room: string): Promise<void>;
 
-    public abstract getSize(room: string): Promise<number>;
-
     public abstract getStorageState(room: string): Promise<string | null>;
 
     public abstract getUser(room: string, connectionId: string): Promise<JsonObject | null>;
 
     public abstract getUsers(room: string): Promise<readonly (JsonObject | null)[]>;
 
+    public abstract getUsersSize(room: string): Promise<number>;
+
     public abstract setStorageState(room: string, state: string): Promise<void>;
 }

package/src/AbstractPlatform.ts

@@ -51,7 +51,7 @@ export abstract class AbstractPlatform<
         const { roomContext, persistence, pubSub } = config;
 
         (this as any)._meta = (config as any)._meta;
-        roomContext && (this._roomContext = roomContext);
+        if (!!roomContext) this._roomContext = roomContext;
 
         this.persistence = persistence ?? new Persistence();
         this.pubSub = pubSub ?? new PubSub();

package/src/AbstractWebSocket.ts

@@ -94,7 +94,6 @@ export abstract class AbstractWebSocket<TWebSocket = any> {
      * method, because the implementing class might have to transform the
      * listener, and removing the same listener might be complicated as a
      * result.
-     * @author leedavidcs
      * @date August 28, 2022
      */
     public abstract addEventListener<TType extends EventType>(type: TType, handler: AbstractListener<TType>): void;

package/src/IORoom.ts

@@ -87,7 +87,7 @@ interface SendMessageSender {
     user: JsonObject | null;
 }
 
-export type WebsocketRegisterConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>> = {
+export type WebSocketRegisterConfig<TPlatform extends AbstractPlatform<any> = AbstractPlatform<any>> = {
     token?: string | null;
 } & InferInitContextType<TPlatform>;
 
@@ -237,7 +237,6 @@ export class IORoom<
         /**
          * @description Doing this instead of .size because some sessions
          * in the map can be considered as "omitted".
-         * @author leedavidcs
          * @date December 21, 2022
          */
         return Array.from(this._sessions.values()).reduce((count, pluvWs) => {
@@ -283,11 +282,10 @@ export class IORoom<
         webSocket: InferPlatformWebSocketSource<TPlatform>,
         ...options: keyof InferInitContextType<TPlatform> extends never
             ? [{ token?: string }?]
-            : [WebsocketRegisterConfig<TPlatform>]
+            : [WebSocketRegisterConfig<TPlatform>]
     ): Promise<void> {
-        const _options = (options[0] ?? {}) as WebsocketRegisterConfig<TPlatform>;
+        const _options = (options[0] ?? {}) as WebSocketRegisterConfig<TPlatform>;
         const token = _options.token ?? null;
-
         const sessionId = this._platform.getSessionId(webSocket);
         const sessionExists = typeof sessionId === "string" && this._sessions.has(sessionId);
 
@@ -361,21 +359,64 @@ export class IORoom<
         });
     }
 
+    private async _closeWebSockets(webSockets: readonly AbstractWebSocket[]): Promise<void> {
+        const closeWebSocket = async (webSocket: AbstractWebSocket): Promise<void> => {
+            webSocket.state = { ...webSocket.state, quit: true };
+
+            const sessionId = webSocket.sessionId;
+
+            this._logDebug(`${colors.blue(`Unregistering connection for room ${this.id}:`)} ${sessionId}`);
+            this._sessions.delete(sessionId);
+
+            await this._platform.persistence.deleteUser(this.id, sessionId).catch(() => null);
+            await this._broadcast({
+                message: { type: "$exit", data: { sessionId } },
+                senderId: sessionId,
+            });
+
+            try {
+                const [session, doc] = await Promise.all([webSocket.getSession(), this._doc]);
+                const encodedState = doc.getEncodedState();
+
+                await Promise.resolve(
+                    this._listeners.onUserDisconnected({
+                        context: this._context,
+                        encodedState,
+                        room: this.id,
+                        user: session.user,
+                    }),
+                );
+            } catch (error) {
+                console.error(error);
+            }
+
+            this._logDebug(`${colors.blue(`Unregistered connection for room ${this.id}:`)} ${webSocket.sessionId}`);
+        };
+
+        const promises = webSockets.map(async (webSocket) => {
+            await closeWebSocket(webSocket).catch(() => null);
+        });
+
+        await Promise.all(promises).catch(() => null);
+
+        const size = this.getSize();
+
+        this._logDebug(`${colors.blue(`Room ${this.id} size:`)} ${size}`);
+
+        if (!!size) return;
+        if (!this._uninitialize) return;
+
+        const uninitialize = (await this._uninitialize).bind(this);
+        await uninitialize();
+    }
+
     private async _emitQuitters(): Promise<void> {
         const currentTime = new Date().getTime();
         const quitters = Array.from(this._sessions.values()).filter(
             (pluvWs) => pluvWs.state.quit || currentTime - pluvWs.state.timers.ping > PING_TIMEOUT_MS,
         );
 
-        quitters.forEach((pluvWs) => {
-            this._sessions.delete(pluvWs.sessionId);
-        });
-
-        const promises = quitters.map(async (quitter) => {
-            await this._exitWebsocket(quitter);
-        });
-
-        await Promise.all(promises);
+        this._closeWebSockets(quitters);
     }
 
     private async _emitRegistered(pluvWs: AbstractWebSocket): Promise<void> {
@@ -409,34 +450,6 @@ export class IORoom<
         throw new Error("Platform must use detached mode");
     }
 
-    private async _exitWebsocket(webSocket: AbstractWebSocket<any>): Promise<void> {
-        const session = await webSocket.getSession();
-
-        await this._broadcast({
-            message: {
-                type: "$exit",
-                data: { sessionId: session.id },
-            },
-            senderId: session.id,
-        });
-
-        try {
-            const doc = await this._doc;
-            const encodedState = doc.getEncodedState();
-
-            await Promise.resolve(
-                this._listeners.onUserDisconnected({
-                    context: this._context,
-                    encodedState,
-                    room: this.id,
-                    user: session.user,
-                }),
-            );
-        } catch (err) {
-            console.error(err);
-        }
-    }
-
     private _getAbstractWs(webSocket: WebSocketType<TPlatform>): AbstractWebSocket | null {
         if ((webSocket as unknown as any) instanceof AbstractWebSocket) return webSocket;
 
@@ -455,7 +468,7 @@ export class IORoom<
 
     private async _getAuthorizedUser(
         token: Maybe<string>,
-        options: WebsocketRegisterConfig<TPlatform>,
+        options: WebSocketRegisterConfig<TPlatform>,
     ): Promise<InferIOAuthorizeUser<InferIOAuthorize<this>>> {
         const ioAuthorize = this._getIOAuthorize(options);
 
@@ -502,7 +515,7 @@ export class IORoom<
         return doc;
     }
 
-    private _getIOAuthorize(options: WebsocketRegisterConfig<TPlatform>): ResolvedPluvIOAuthorize<any, any> | null {
+    private _getIOAuthorize(options: WebSocketRegisterConfig<TPlatform>): ResolvedPluvIOAuthorize<any, any> | null {
         if (typeof this._authorize === "function") return this._authorize(options);
 
         return this._authorize as ResolvedPluvIOAuthorize<any, any> | null;
@@ -560,12 +573,10 @@ export class IORoom<
                     switch (options.type) {
                         case "self": {
                             await this._sendSelfMessage(message, sender);
-
                             return;
                         }
                         case "sync": {
                             await this._sendSyncMessage(message, sender);
-
                             return;
                         }
                         case "broadcast":
@@ -610,33 +621,13 @@ export class IORoom<
     }
 
     private _logDebug(...data: any[]): void {
-        this._debug && console.log(...data);
+        if (this._debug) console.log(...data);
     }
 
     private _onClose(webSocket: AbstractWebSocket): () => Promise<void> {
         return async (): Promise<void> => {
             if (!(await this._initialized)) return;
-
-            webSocket.state = { ...webSocket.state, quit: true };
-
-            this._logDebug(`${colors.blue(`Unregistering connection for room ${this.id}:`)} ${webSocket.sessionId}`);
-            this._sessions.delete(webSocket.sessionId);
-
-            this._platform.persistence.deleteUser(this.id, webSocket.sessionId).finally(async () => {
-                await this._exitWebsocket(webSocket);
-
-                const size = this.getSize();
-
-                this._logDebug(`${colors.blue(`Unregistered connection for room ${this.id}:`)} ${webSocket.sessionId}`);
-                this._logDebug(`${colors.blue(`Room ${this.id} size:`)} ${size}`);
-
-                if (size) return;
-
-                if (this._uninitialize) {
-                    const uninitialize = (await this._uninitialize).bind(this);
-                    await uninitialize();
-                }
-            });
+            await this._closeWebSockets([webSocket]);
         };
     }
 
@@ -663,6 +654,7 @@ export class IORoom<
             };
 
             if (pluvWs.state.quit) {
+                await this._closeWebSockets([pluvWs]).catch(() => null);
                 pluvWs.close(1011, "WebSocket broken.");
 
                 return;

package/src/PluvIO.ts

@@ -2,7 +2,7 @@ import type { AbstractCrdtDocFactory } from "@pluv/crdt";
 import { noop } from "@pluv/crdt";
 import type { IOAuthorize, InferIOAuthorizeUser } from "@pluv/types";
 import type { AbstractPlatform, InferInitContextType } from "./AbstractPlatform";
-import { WebsocketRegisterConfig } from "./IORoom";
+import type { WebSocketRegisterConfig } from "./IORoom";
 import { PluvProcedure } from "./PluvProcedure";
 import type { MergedRouter, PluvRouterEventConfig } from "./PluvRouter";
 import { PluvRouter } from "./PluvRouter";
@@ -133,7 +133,7 @@ export class PluvIO<
         } as PluvServerConfig<TPlatform, TAuthorize, TContext, TEvents>);
     }
 
-    private _getIOAuthorize(options: WebsocketRegisterConfig<TPlatform>): ResolvedPluvIOAuthorize<any, any> | null {
+    private _getIOAuthorize(options: WebSocketRegisterConfig<TPlatform>): ResolvedPluvIOAuthorize<any, any> | null {
         if (typeof this._authorize === "function") {
             return this._authorize(options);
         }

package/src/PluvServer.ts

@@ -3,7 +3,7 @@ import { noop } from "@pluv/crdt";
 import type { IOLike, Id, InferIOAuthorize, InferIOAuthorizeUser, JsonObject, Maybe } from "@pluv/types";
 import colors from "kleur";
 import type { AbstractPlatform, InferInitContextType, InferRoomContextType } from "./AbstractPlatform";
-import type { IORoomListeners, WebsocketRegisterConfig } from "./IORoom";
+import type { IORoomListeners, WebSocketRegisterConfig } from "./IORoom";
 import { IORoom } from "./IORoom";
 import { PluvProcedure } from "./PluvProcedure";
 import type { PluvRouterEventConfig } from "./PluvRouter";
@@ -347,10 +347,8 @@ export class PluvServer<
         return await authorize({ platform: this._platform, secret }).encode(params as JWTEncodeParams<any, TPlatform>);
     }
 
-    private _getIOAuthorize(options: WebsocketRegisterConfig<TPlatform>): ResolvedPluvIOAuthorize<any, any> | null {
-        if (typeof this._authorize === "function") {
-            return this._authorize(options);
-        }
+    private _getIOAuthorize(options: WebSocketRegisterConfig<TPlatform>): ResolvedPluvIOAuthorize<any, any> | null {
+        if (typeof this._authorize === "function") return this._authorize(options);
 
         return this._authorize as ResolvedPluvIOAuthorize<any, any> | null;
     }
@@ -360,6 +358,6 @@ export class PluvServer<
     }
 
     private _logDebug(...data: any[]): void {
-        this._debug && console.log(...data);
+        if (this._debug) console.log(...data);
     }
 }

package/src/types.ts

@@ -24,6 +24,7 @@ import type { AbstractWebSocket } from "./AbstractWebSocket";
 import type { PluvRouter, PluvRouterEventConfig } from "./PluvRouter";
 
 declare global {
+    // eslint-disable-next-line no-var
     var console: {
         error: (...data: any[]) => void;
         log: (...data: any[]) => void;

package/src/version.generated.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '0.38.14'
+export const version = '0.39.0'

package/src/version.ts

@@ -1,2 +1,3 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 export { version as __PLUV_VERSION } from "./version.generated";

package/.eslintrc.js

@@ -1,4 +0,0 @@
-module.exports = {
-    root: true,
-    extends: ["pluv"],
-};