@fluojs/websockets 1.0.7 → 2.0.0

package/dist/cloudflare-workers/cloudflare-workers-service.js

@@ -14,9 +14,6 @@ const DEFAULT_MAX_WEBSOCKET_PAYLOAD_BYTES = 1_048_576;
 const DEFAULT_WEBSOCKET_SHUTDOWN_TIMEOUT_MS = 5_000;
 const LIFECYCLE_LOG_CONTEXT = 'WebSocketGatewayLifecycleService';
 const WEBSOCKET_OPEN_READY_STATE = 1;
-function hasCloudflareWorkerWebSocketBindingHost(adapter) {
-  return 'configureWebSocketBinding' in adapter && typeof adapter.configureWebSocketBinding === 'function';
-}
 function isWebSocketUpgradeRequest(request) {
   return request.headers.get('upgrade')?.toLowerCase() === 'websocket';
 }
@@ -72,15 +69,15 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
       return;
     }
     assertNoFetchStyleServerBackedGatewayOptIn(descriptors, 'cloudflare-workers');
-    resolveSupportedFetchStyleRealtimeCapability(this.adapter, {
+    const capability = resolveSupportedFetchStyleRealtimeCapability(this.adapter, {
       packageSubpath: 'cloudflare-workers',
       platformPackage: '@fluojs/platform-cloudflare-workers',
       runtimeName: 'Cloudflare Workers'
     });
-    if (!hasCloudflareWorkerWebSocketBindingHost(this.adapter)) {
-      throw new Error('Cloudflare Workers WebSocket gateway bootstrap requires the selected adapter to expose Cloudflare websocket binding configuration. Use @fluojs/platform-cloudflare-workers with @fluojs/websockets/cloudflare-workers.');
+    if (!capability.bindingInstallation) {
+      throw new Error('Cloudflare Workers WebSocket gateway bootstrap requires the selected adapter to expose websocket binding installation through its realtime capability. Use @fluojs/platform-cloudflare-workers with @fluojs/websockets/cloudflare-workers.');
     }
-    this.adapter.configureWebSocketBinding(this.createBinding(descriptors));
+    capability.bindingInstallation.install(this.createBinding(descriptors));
   }
   async onApplicationShutdown() {
     await this.shutdown();
@@ -114,6 +111,9 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
         status: 404
       });
     }
+    if (this.isShuttingDown) {
+      return createCloudflareWorkersWebSocketShutdownResponse();
+    }
     const rejection = await this.resolveUpgradeRejection(request, targetPath);
     if (rejection) {
       return new Response(rejection.body ?? null, {
@@ -123,9 +123,7 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
     }
     if (this.isShuttingDown) {
       this.releaseUpgradeReservation();
-      return new Response('WebSocket server is shutting down.', {
-        status: 503
-      });
+      return createCloudflareWorkersWebSocketShutdownResponse();
     }
     let response;
     let serverSocket;
@@ -140,7 +138,7 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
     }
     serverSocket.accept();
     void this.trackPendingUpgradeOperation(this.bindConnectionHandlers(serverSocket, request, matchedDescriptors)).catch(error => {
-      this.unregisterSocket(this.findSocketId(serverSocket));
+      this.unregisterTrackedSocketWithDeferredStateCleanup(this.findSocketId(serverSocket));
       this.logger.error('WebSocket gateway open lifecycle failed.', error, LIFECYCLE_LOG_CONTEXT);
       serverSocket.close(1011, 'Internal server error');
     });
@@ -186,11 +184,13 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
       bufferedDisconnect: undefined,
       bufferedMessages: [],
       bufferedMessagesStartIndex: 0,
+      cleanupScheduled: false,
       connectLifecycleSettled: false,
       connectLifecyclePromise: connectLifecycle.promise,
       descriptors,
       disconnectLifecycleSettled: false,
       disconnectLifecyclePromise: disconnectLifecycle.promise,
+      disconnectDispatchScheduled: false,
       enqueuedMessageCount: 0,
       handlerQueue: Promise.resolve(),
       handlersReady: false,
@@ -201,7 +201,8 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
       resolveConnectLifecycle: connectLifecycle.resolve,
       resolveDisconnectLifecycle: disconnectLifecycle.resolve,
       resolved: [],
-      socketId: crypto.randomUUID()
+      socketId: crypto.randomUUID(),
+      terminalFailureHandled: false
     };
   }
   settleConnectLifecycle(state) {
@@ -230,11 +231,11 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
       this.enqueueMessageDispatch(state, socket, request, event.data);
     });
     socket.addEventListener('error', event => {
-      this.unregisterSocket(state.socketId);
+      this.closeSocketAfterTerminalFailure(state, socket, 'Socket error');
       this.logger.error('WebSocket gateway socket emitted an error.', event, LIFECYCLE_LOG_CONTEXT);
     });
     socket.addEventListener('close', event => {
-      this.unregisterSocket(state.socketId);
+      this.unregisterSocketWithDeferredStateCleanup(state);
       const closeEvent = event;
       const disconnectEvent = {
         code: closeEvent.code,
@@ -299,13 +300,16 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
     this.logger.warn(`WebSocket connection ${state.socketId} dropped the oldest pending message due to buffer limit (${String(limit)}).`, LIFECYCLE_LOG_CONTEXT);
   }
   enqueueMessageDispatch(state, socket, request, message) {
+    if (state.terminalFailureHandled) {
+      return;
+    }
     const limit = isFinitePositiveInteger(this.moduleOptions.buffer?.maxPendingMessagesPerSocket) ? this.moduleOptions.buffer.maxPendingMessagesPerSocket : DEFAULT_MAX_PENDING_MESSAGES_PER_SOCKET;
     const policy = this.moduleOptions.buffer?.overflowPolicy ?? 'drop-oldest';
     if (this.getQueuedMessageCount(state) >= limit) {
       if (policy === 'close') {
         socket.close(1013, 'Ready-state message queue limit exceeded');
         this.clearQueuedMessages(state);
-        this.unregisterSocket(state.socketId);
+        this.unregisterSocketWithDeferredStateCleanup(state);
         this.logger.warn(`WebSocket connection ${state.socketId} exceeded ready-state message queue limit (${String(limit)}). Connection closed.`, LIFECYCLE_LOG_CONTEXT);
         return;
       }
@@ -340,7 +344,19 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
         continue;
       }
       const normalizedMessage = await this.normalizeMessage(nextMessage);
-      await dispatchGatewayMessage(state.resolved, socket, request, normalizedMessage, this.logger, LIFECYCLE_LOG_CONTEXT);
+      const outcome = await dispatchGatewayMessage(state.resolved, socket, request, normalizedMessage, state.socketId, this.moduleOptions.replies?.mode, message => {
+        try {
+          socket.send(message);
+          return true;
+        } catch {
+          this.closeSocketAfterTerminalFailure(state, socket, 'Send failed');
+          return false;
+        }
+      }, this.logger, LIFECYCLE_LOG_CONTEXT);
+      if (outcome === 'terminal') {
+        this.clearQueuedMessages(state);
+        return;
+      }
     }
     this.clearQueuedMessages(state);
   }
@@ -351,6 +367,10 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
     return message;
   }
   enqueueDisconnectDispatch(state, socket, disconnectEvent) {
+    if (state.disconnectDispatchScheduled) {
+      return;
+    }
+    state.disconnectDispatchScheduled = true;
     state.handlerQueue = state.handlerQueue.then(async () => {
       await dispatchGatewayDisconnect(state.resolved, socket, disconnectEvent.code, disconnectEvent.reason, state.socketId, this.logger, LIFECYCLE_LOG_CONTEXT);
     }).catch(error => {
@@ -407,12 +427,6 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
     return '';
   }
   async resolveUpgradeRejection(request, path) {
-    if (this.isShuttingDown) {
-      return {
-        body: 'WebSocket server is shutting down.',
-        status: 503
-      };
-    }
     if (!this.tryReserveUpgradeSlot()) {
       return {
         body: 'WebSocket connection limit exceeded.',
@@ -506,9 +520,6 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
   }
   async runShutdownLifecycle() {
     this.isShuttingDown = true;
-    if (hasCloudflareWorkerWebSocketBindingHost(this.adapter)) {
-      this.adapter.configureWebSocketBinding(undefined);
-    }
     const shutdownTimeoutMs = this.resolveShutdownTimeoutMs();
     await this.awaitPendingUpgradeOperations(shutdownTimeoutMs);
     await this.closeActiveSockets(shutdownTimeoutMs);
@@ -565,10 +576,7 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
   }
   async closeActiveSockets(timeoutMs) {
     const activeSockets = [...this.socketRegistry.entries()];
-    if (activeSockets.length === 0) {
-      return;
-    }
-    const activeStates = activeSockets.map(([socketId]) => this.socketStates.get(socketId)).filter(state => state !== undefined);
+    const activeStates = [...this.socketStates.values()];
     for (const [, socket] of activeSockets) {
       if (socket.readyState === WEBSOCKET_OPEN_READY_STATE) {
         socket.close(1001, 'Server shutting down');
@@ -576,6 +584,15 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
     }
     await this.awaitHandlerQueueDrain(activeStates, timeoutMs);
   }
+  scheduleSocketStateCleanup(state) {
+    if (state.cleanupScheduled) {
+      return;
+    }
+    state.cleanupScheduled = true;
+    void Promise.all([state.connectLifecyclePromise, state.disconnectLifecyclePromise]).finally(() => {
+      this.socketStates.delete(state.socketId);
+    });
+  }
   async awaitHandlerQueueDrain(states, timeoutMs) {
     if (states.length === 0) {
       return;
@@ -612,6 +629,10 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
     });
   }
   joinRoom(socketId, room) {
+    const socket = this.socketRegistry.get(socketId);
+    if (!socket || socket.readyState !== WEBSOCKET_OPEN_READY_STATE) {
+      return;
+    }
     let rooms = this.socketRooms.get(socketId);
     if (!rooms) {
       rooms = new Set();
@@ -654,7 +675,13 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
       try {
         socket.send(message);
       } catch (error) {
-        this.unregisterSocket(socketId);
+        const state = this.socketStates.get(socketId);
+        if (state) {
+          this.closeSocketAfterTerminalFailure(state, socket, 'Send failed');
+        } else {
+          socket.close(1011, 'Send failed');
+          this.unregisterSocket(socketId);
+        }
         this.logger.warn(`WebSocket connection ${socketId} failed to send a room broadcast and was removed. ${error instanceof Error ? error.message : 'Unknown error.'}`, LIFECYCLE_LOG_CONTEXT);
       }
     }
@@ -666,12 +693,46 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
     }
     return new Set(rooms);
   }
-  unregisterSocket(socketId) {
+  closeSocketAfterTerminalFailure(state, socket, reason) {
+    if (state.terminalFailureHandled) {
+      return;
+    }
+    state.terminalFailureHandled = true;
+    this.clearQueuedMessages(state);
+    this.unregisterSocketWithDeferredStateCleanup(state);
+    socket.close(1011, reason);
+    const disconnectEvent = {
+      code: 1011,
+      reason
+    };
+    if (!state.handlersReady) {
+      state.bufferedDisconnect ??= disconnectEvent;
+      return;
+    }
+    this.enqueueDisconnectDispatch(state, socket, disconnectEvent);
+  }
+  unregisterSocketWithDeferredStateCleanup(state) {
+    this.unregisterSocket(state.socketId, {
+      deleteState: false
+    });
+    this.scheduleSocketStateCleanup(state);
+  }
+  unregisterTrackedSocketWithDeferredStateCleanup(socketId) {
+    const state = this.socketStates.get(socketId);
+    if (!state) {
+      this.unregisterSocket(socketId);
+      return;
+    }
+    this.unregisterSocketWithDeferredStateCleanup(state);
+  }
+  unregisterSocket(socketId, options = {}) {
     if (!socketId) {
       return;
     }
     this.socketRegistry.delete(socketId);
-    this.socketStates.delete(socketId);
+    if (options.deleteState !== false) {
+      this.socketStates.delete(socketId);
+    }
     const rooms = this.socketRooms.get(socketId);
     if (rooms) {
       for (const room of rooms) {
@@ -688,4 +749,18 @@ class CloudflareWorkersWebSocketGatewayLifecycleService {
     _initClass();
   }
 }
-export { _CloudflareWorkersWeb as CloudflareWorkersWebSocketGatewayLifecycleService };
+export { _CloudflareWorkersWeb as CloudflareWorkersWebSocketGatewayLifecycleService };
+function createCloudflareWorkersWebSocketShutdownResponse() {
+  return new Response(JSON.stringify({
+    error: {
+      code: 'SERVICE_UNAVAILABLE',
+      message: 'Server is shutting down.',
+      status: 503
+    }
+  }), {
+    headers: {
+      'content-type': 'application/json'
+    },
+    status: 503
+  });
+}

package/dist/cloudflare-workers/cloudflare-workers-types.d.ts

@@ -1,4 +1,4 @@
-import type { WebSocketModuleOptions as SharedWebSocketModuleOptions, WebSocketUpgradeContext, WebSocketUpgradeGuard as SharedWebSocketUpgradeGuard, WebSocketUpgradeRejection } from '../types.js';
+import type { WebSocketModuleOptions as SharedWebSocketModuleOptions, WebSocketUpgradeGuard as SharedWebSocketUpgradeGuard, WebSocketUpgradeContext, WebSocketUpgradeRejection } from '../types.js';
 /**
  * Defines the cloudflare worker web socket message type.
  */
@@ -45,7 +45,7 @@ export interface CloudflareWorkerWebSocketBindingHost {
 /**
  * Defines the typed on message handler type.
  */
-export type TypedOnMessageHandler<TEvents extends Record<string, unknown>, K extends keyof TEvents> = (payload: TEvents[K], socket: CloudflareWorkerWebSocket, request: Request) => void | Promise<void>;
+export type TypedOnMessageHandler<TEvents extends Record<string, unknown>, K extends keyof TEvents> = import('../types.js').TypedOnMessageHandler<TEvents, K, CloudflareWorkerWebSocket, Request>;
 /**
  * Describes the web socket gateway context contract.
  */

package/dist/cloudflare-workers/cloudflare-workers-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cloudflare-workers-types.d.ts","sourceRoot":"","sources":["../../src/cloudflare-workers/cloudflare-workers-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,IAAI,4BAA4B,EACtD,uBAAuB,EACvB,qBAAqB,IAAI,2BAA2B,EACpD,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AAErB;;GAEG;AACH,MAAM,MAAM,gCAAgC,GAAG,WAAW,GAAG,eAAe,GAAG,IAAI,GAAG,MAAM,CAAC;AAE7F;;GAEG;AACH,MAAM,WAAW,yBACf,SAAQ,IAAI,CAAC,SAAS,EAAE,kBAAkB,GAAG,OAAO,GAAG,qBAAqB,GAAG,MAAM,CAAC;IACtF,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,MAAM,IAAI,IAAI,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,CAAC,EAAE,yBAAyB,CAAC;IAC7B,CAAC,EAAE,yBAAyB,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,sCAAsC;IACrD,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,yBAAyB,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,oCAAoC;IACnD,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,sCAAsC,CAAC;CACnE;AAED;;GAEG;AACH,MAAM,WAAW,gCAAgC;IAC/C,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,oCAAoC,GAAG,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACnG;AAED;;GAEG;AACH,MAAM,WAAW,oCAAoC;IACnD,yBAAyB,CAAC,OAAO,EAAE,gCAAgC,GAAG,SAAS,GAAG,IAAI,CAAC;CACxF;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,SAAS,MAAM,OAAO,IAAI,CACpG,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,MAAM,EAAE,yBAAyB,EACjC,OAAO,EAAE,OAAO,KACb,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE1B;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,yBAAyB,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;AAEzE,YAAY,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,CAAC;AAEnE;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"cloudflare-workers-types.d.ts","sourceRoot":"","sources":["../../src/cloudflare-workers/cloudflare-workers-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,IAAI,4BAA4B,EACtD,qBAAqB,IAAI,2BAA2B,EACpD,uBAAuB,EACvB,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AAErB;;GAEG;AACH,MAAM,MAAM,gCAAgC,GAAG,WAAW,GAAG,eAAe,GAAG,IAAI,GAAG,MAAM,CAAC;AAE7F;;GAEG;AACH,MAAM,WAAW,yBACf,SAAQ,IAAI,CAAC,SAAS,EAAE,kBAAkB,GAAG,OAAO,GAAG,qBAAqB,GAAG,MAAM,CAAC;IACtF,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,MAAM,IAAI,IAAI,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,CAAC,EAAE,yBAAyB,CAAC;IAC7B,CAAC,EAAE,yBAAyB,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,sCAAsC;IACrD,QAAQ,EAAE,QAAQ,CAAC;IACnB,YAAY,EAAE,yBAAyB,CAAC;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,oCAAoC;IACnD,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,sCAAsC,CAAC;CACnE;AAED;;GAEG;AACH,MAAM,WAAW,gCAAgC;IAC/C,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,oCAAoC,GAAG,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACnG;AAED;;GAEG;AACH,MAAM,WAAW,oCAAoC;IACnD,yBAAyB,CAAC,OAAO,EAAE,gCAAgC,GAAG,SAAS,GAAG,IAAI,CAAC;CACxF;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,SAAS,MAAM,OAAO,IAAI,OAAO,aAAa,EAAE,qBAAqB,CAC/I,OAAO,EACP,CAAC,EACD,yBAAyB,EACzB,OAAO,CACR,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,yBAAyB,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;AAEzE,YAAY,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,CAAC;AAEnE;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC"}

package/dist/cloudflare-workers.d.ts

@@ -1,4 +1,5 @@
+export * from './cloudflare-workers/cloudflare-workers.js';
 export * from './decorators.js';
 export * from './metadata.js';
-export * from './cloudflare-workers/cloudflare-workers.js';
+export type { WebSocketEventEnvelope, WebSocketReplyMode } from './types.js';
 //# sourceMappingURL=cloudflare-workers.d.ts.map

package/dist/cloudflare-workers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cloudflare-workers.d.ts","sourceRoot":"","sources":["../src/cloudflare-workers.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,4CAA4C,CAAC"}
+{"version":3,"file":"cloudflare-workers.d.ts","sourceRoot":"","sources":["../src/cloudflare-workers.ts"],"names":[],"mappings":"AAAA,cAAc,4CAA4C,CAAC;AAC3D,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,YAAY,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC"}

package/dist/cloudflare-workers.js

@@ -1,3 +1,4 @@
+export * from './cloudflare-workers/cloudflare-workers.js';
 export * from './decorators.js';
 export * from './metadata.js';
-export * from './cloudflare-workers/cloudflare-workers.js';
+export {};

package/dist/decorators.d.ts

@@ -33,8 +33,8 @@ export declare function WebSocketGateway(options?: WebSocketGatewayOptions): Cla
  *
  * class ChatGateway {
  *   @OnMessage('ping')
- *   handlePing(payload: unknown) {
- *     return payload;
+ *   handlePing(payload: unknown, socket: { send(data: string): void }) {
+ *     socket.send(JSON.stringify({ event: 'pong', data: payload }));
  *   }
  * }
  * ```

package/dist/decorators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAmC,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAG9G,KAAK,wBAAwB,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,qBAAqB,KAAK,IAAI,CAAC;AAC1F,KAAK,yBAAyB,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,2BAA2B,KAAK,IAAI,CAAC;AACjG,KAAK,kBAAkB,GAAG,wBAAwB,CAAC;AACnD,KAAK,mBAAmB,GAAG,yBAAyB,CAAC;AA8DrD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,GAAE,uBAA4B,GACpC,kBAAkB,CAMpB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,SAAS,CACvB,OAAO,SAAS,iBAAiB,GAAG,iBAAiB,EACrD,CAAC,SAAS,MAAM,OAAO,GAAG,MAAM,OAAO,EACvC,KAAK,CAAC,EAAE,CAAC,GAAG,MAAM,GAAG,mBAAmB,CAKzC;AAED;;;;GAIG;AACH,wBAAgB,SAAS,IAAI,mBAAmB,CAI/C;AAED;;;;GAIG;AACH,wBAAgB,YAAY,IAAI,mBAAmB,CAIlD"}
+{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAmC,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAG9G,KAAK,wBAAwB,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,qBAAqB,KAAK,IAAI,CAAC;AAC1F,KAAK,yBAAyB,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,2BAA2B,KAAK,IAAI,CAAC;AACjG,KAAK,kBAAkB,GAAG,wBAAwB,CAAC;AACnD,KAAK,mBAAmB,GAAG,yBAAyB,CAAC;AAgErD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,GAAE,uBAA4B,GACpC,kBAAkB,CAMpB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,SAAS,CACvB,OAAO,SAAS,iBAAiB,GAAG,iBAAiB,EACrD,CAAC,SAAS,MAAM,OAAO,GAAG,MAAM,OAAO,EACvC,KAAK,CAAC,EAAE,CAAC,GAAG,MAAM,GAAG,mBAAmB,CAKzC;AAED;;;;GAIG;AACH,wBAAgB,SAAS,IAAI,mBAAmB,CAI/C;AAED;;;;GAIG;AACH,wBAAgB,YAAY,IAAI,mBAAmB,CAIlD"}

package/dist/decorators.js

@@ -22,8 +22,8 @@ function defineStandardGatewayMetadata(metadata, options) {
 }
 function defineStandardHandlerMetadata(metadata, propertyKey, handlerMetadata) {
   const bag = getStandardMetadataBag(metadata);
-  const current = bag[webSocketHandlerMetadataSymbol];
-  const map = current ?? new Map();
+  const inherited = bag[webSocketHandlerMetadataSymbol];
+  const map = Object.hasOwn(bag, webSocketHandlerMetadataSymbol) ? inherited ?? new Map() : new Map(inherited);
   map.set(propertyKey, {
     event: handlerMetadata.event,
     type: handlerMetadata.type
@@ -79,8 +79,8 @@ export function WebSocketGateway(options = {}) {
  *
  * class ChatGateway {
  *   @OnMessage('ping')
- *   handlePing(payload: unknown) {
- *     return payload;
+ *   handlePing(payload: unknown, socket: { send(data: string): void }) {
+ *     socket.send(JSON.stringify({ event: 'pong', data: payload }));
  *   }
  * }
  * ```

package/dist/deno/deno-service.d.ts

@@ -61,11 +61,15 @@ export declare class DenoWebSocketGatewayLifecycleService implements OnApplicati
     private trackPendingUpgradeOperation;
     private awaitPendingUpgradeOperations;
     private closeActiveSockets;
+    private scheduleSocketStateCleanup;
     private awaitHandlerQueueDrain;
     joinRoom(socketId: string, room: string): void;
     leaveRoom(socketId: string, room: string): void;
     broadcastToRoom(room: string, event: string, data: unknown): void;
     getRooms(socketId: string): ReadonlySet<string>;
+    private closeSocketAfterTerminalFailure;
+    private unregisterSocketWithDeferredStateCleanup;
+    private unregisterTrackedSocketWithDeferredStateCleanup;
     private unregisterSocket;
 }
 //# sourceMappingURL=deno-service.d.ts.map

package/dist/deno/deno-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deno-service.d.ts","sourceRoot":"","sources":["../../src/deno/deno-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deno-service.d.ts","sourceRoot":"","sources":["../../src/deno/deno-service.ts"],"names":[],"mappings":"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"}

package/dist/deno/deno-service.js

@@ -146,7 +146,7 @@ class DenoWebSocketGatewayLifecycleService {
       throw error;
     }
     void this.trackPendingUpgradeOperation(this.bindConnectionHandlers(socket, request, descriptors)).catch(error => {
-      this.unregisterSocket(this.findSocketId(socket));
+      this.unregisterTrackedSocketWithDeferredStateCleanup(this.findSocketId(socket));
       this.logger.error('WebSocket gateway open lifecycle failed.', error, LIFECYCLE_LOG_CONTEXT);
       socket.close(1011, 'Internal server error');
     });
@@ -192,11 +192,13 @@ class DenoWebSocketGatewayLifecycleService {
       bufferedDisconnect: undefined,
       bufferedMessages: [],
       bufferedMessagesStartIndex: 0,
+      cleanupScheduled: false,
       connectLifecycleSettled: false,
       connectLifecyclePromise: connectLifecycle.promise,
       descriptors,
       disconnectLifecycleSettled: false,
       disconnectLifecyclePromise: disconnectLifecycle.promise,
+      disconnectDispatchScheduled: false,
       enqueuedMessageCount: 0,
       handlerQueue: Promise.resolve(),
       handlersReady: false,
@@ -207,7 +209,8 @@ class DenoWebSocketGatewayLifecycleService {
       resolveConnectLifecycle: connectLifecycle.resolve,
       resolveDisconnectLifecycle: disconnectLifecycle.resolve,
       resolved: [],
-      socketId: crypto.randomUUID()
+      socketId: crypto.randomUUID(),
+      terminalFailureHandled: false
     };
   }
   settleConnectLifecycle(state) {
@@ -236,11 +239,11 @@ class DenoWebSocketGatewayLifecycleService {
       this.enqueueMessageDispatch(state, socket, request, event.data);
     });
     socket.addEventListener('error', event => {
-      this.unregisterSocket(state.socketId);
+      this.closeSocketAfterTerminalFailure(state, socket, 'Socket error');
       this.logger.error('WebSocket gateway socket emitted an error.', event, LIFECYCLE_LOG_CONTEXT);
     });
     socket.addEventListener('close', event => {
-      this.unregisterSocket(state.socketId);
+      this.unregisterSocketWithDeferredStateCleanup(state);
       const disconnectEvent = {
         code: event.code,
         reason: event.reason
@@ -304,13 +307,16 @@ class DenoWebSocketGatewayLifecycleService {
     this.logger.warn(`WebSocket connection ${state.socketId} dropped the oldest pending message due to buffer limit (${String(limit)}).`, LIFECYCLE_LOG_CONTEXT);
   }
   enqueueMessageDispatch(state, socket, request, message) {
+    if (state.terminalFailureHandled) {
+      return;
+    }
     const limit = isFinitePositiveInteger(this.moduleOptions.buffer?.maxPendingMessagesPerSocket) ? this.moduleOptions.buffer.maxPendingMessagesPerSocket : DEFAULT_MAX_PENDING_MESSAGES_PER_SOCKET;
     const policy = this.moduleOptions.buffer?.overflowPolicy ?? 'drop-oldest';
     if (this.getQueuedMessageCount(state) >= limit) {
       if (policy === 'close') {
         socket.close(1013, 'Ready-state message queue limit exceeded');
         this.clearQueuedMessages(state);
-        this.unregisterSocket(state.socketId);
+        this.unregisterSocketWithDeferredStateCleanup(state);
         this.logger.warn(`WebSocket connection ${state.socketId} exceeded ready-state message queue limit (${String(limit)}). Connection closed.`, LIFECYCLE_LOG_CONTEXT);
         return;
       }
@@ -345,7 +351,19 @@ class DenoWebSocketGatewayLifecycleService {
         continue;
       }
       const normalizedMessage = await this.normalizeMessage(nextMessage);
-      await dispatchGatewayMessage(state.resolved, socket, request, normalizedMessage, this.logger, LIFECYCLE_LOG_CONTEXT);
+      const outcome = await dispatchGatewayMessage(state.resolved, socket, request, normalizedMessage, state.socketId, this.moduleOptions.replies?.mode, message => {
+        try {
+          socket.send(message);
+          return true;
+        } catch {
+          this.closeSocketAfterTerminalFailure(state, socket, 'Send failed');
+          return false;
+        }
+      }, this.logger, LIFECYCLE_LOG_CONTEXT);
+      if (outcome === 'terminal') {
+        this.clearQueuedMessages(state);
+        return;
+      }
     }
     this.clearQueuedMessages(state);
   }
@@ -356,6 +374,10 @@ class DenoWebSocketGatewayLifecycleService {
     return message;
   }
   enqueueDisconnectDispatch(state, socket, disconnectEvent) {
+    if (state.disconnectDispatchScheduled) {
+      return;
+    }
+    state.disconnectDispatchScheduled = true;
     state.handlerQueue = state.handlerQueue.then(async () => {
       await dispatchGatewayDisconnect(state.resolved, socket, disconnectEvent.code, disconnectEvent.reason, state.socketId, this.logger, LIFECYCLE_LOG_CONTEXT);
     }).catch(error => {
@@ -511,9 +533,6 @@ class DenoWebSocketGatewayLifecycleService {
   }
   async runShutdownLifecycle() {
     this.isShuttingDown = true;
-    if (hasDenoWebSocketBindingHost(this.adapter)) {
-      this.adapter.configureWebSocketBinding(undefined);
-    }
     const shutdownTimeoutMs = this.resolveShutdownTimeoutMs();
     await this.awaitPendingUpgradeOperations(shutdownTimeoutMs);
     await this.closeActiveSockets(shutdownTimeoutMs);
@@ -570,10 +589,7 @@ class DenoWebSocketGatewayLifecycleService {
   }
   async closeActiveSockets(timeoutMs) {
     const activeSockets = [...this.socketRegistry.entries()];
-    if (activeSockets.length === 0) {
-      return;
-    }
-    const activeStates = activeSockets.map(([socketId]) => this.socketStates.get(socketId)).filter(state => state !== undefined);
+    const activeStates = [...this.socketStates.values()];
     for (const [, socket] of activeSockets) {
       if (socket.readyState === WEBSOCKET_OPEN_READY_STATE) {
         socket.close(1001, 'Server shutting down');
@@ -581,6 +597,15 @@ class DenoWebSocketGatewayLifecycleService {
     }
     await this.awaitHandlerQueueDrain(activeStates, timeoutMs);
   }
+  scheduleSocketStateCleanup(state) {
+    if (state.cleanupScheduled) {
+      return;
+    }
+    state.cleanupScheduled = true;
+    void Promise.all([state.connectLifecyclePromise, state.disconnectLifecyclePromise]).finally(() => {
+      this.socketStates.delete(state.socketId);
+    });
+  }
   async awaitHandlerQueueDrain(states, timeoutMs) {
     if (states.length === 0) {
       return;
@@ -617,6 +642,10 @@ class DenoWebSocketGatewayLifecycleService {
     });
   }
   joinRoom(socketId, room) {
+    const socket = this.socketRegistry.get(socketId);
+    if (!socket || socket.readyState !== WEBSOCKET_OPEN_READY_STATE) {
+      return;
+    }
     let rooms = this.socketRooms.get(socketId);
     if (!rooms) {
       rooms = new Set();
@@ -659,7 +688,13 @@ class DenoWebSocketGatewayLifecycleService {
       try {
         socket.send(message);
       } catch (error) {
-        this.unregisterSocket(socketId);
+        const state = this.socketStates.get(socketId);
+        if (state) {
+          this.closeSocketAfterTerminalFailure(state, socket, 'Send failed');
+        } else {
+          socket.close(1011, 'Send failed');
+          this.unregisterSocket(socketId);
+        }
         this.logger.warn(`WebSocket connection ${socketId} failed to send a room broadcast and was removed. ${error instanceof Error ? error.message : 'Unknown error.'}`, LIFECYCLE_LOG_CONTEXT);
       }
     }
@@ -671,12 +706,46 @@ class DenoWebSocketGatewayLifecycleService {
     }
     return new Set(rooms);
   }
-  unregisterSocket(socketId) {
+  closeSocketAfterTerminalFailure(state, socket, reason) {
+    if (state.terminalFailureHandled) {
+      return;
+    }
+    state.terminalFailureHandled = true;
+    this.clearQueuedMessages(state);
+    this.unregisterSocketWithDeferredStateCleanup(state);
+    socket.close(1011, reason);
+    const disconnectEvent = {
+      code: 1011,
+      reason
+    };
+    if (!state.handlersReady) {
+      state.bufferedDisconnect ??= disconnectEvent;
+      return;
+    }
+    this.enqueueDisconnectDispatch(state, socket, disconnectEvent);
+  }
+  unregisterSocketWithDeferredStateCleanup(state) {
+    this.unregisterSocket(state.socketId, {
+      deleteState: false
+    });
+    this.scheduleSocketStateCleanup(state);
+  }
+  unregisterTrackedSocketWithDeferredStateCleanup(socketId) {
+    const state = this.socketStates.get(socketId);
+    if (!state) {
+      this.unregisterSocket(socketId);
+      return;
+    }
+    this.unregisterSocketWithDeferredStateCleanup(state);
+  }
+  unregisterSocket(socketId, options = {}) {
     if (!socketId) {
       return;
     }
     this.socketRegistry.delete(socketId);
-    this.socketStates.delete(socketId);
+    if (options.deleteState !== false) {
+      this.socketStates.delete(socketId);
+    }
     const rooms = this.socketRooms.get(socketId);
     if (rooms) {
       for (const room of rooms) {

package/dist/deno/deno-types.d.ts

@@ -1,4 +1,4 @@
-import type { WebSocketModuleOptions as SharedWebSocketModuleOptions, WebSocketUpgradeContext, WebSocketUpgradeGuard as SharedWebSocketUpgradeGuard, WebSocketUpgradeRejection } from '../types.js';
+import type { WebSocketModuleOptions as SharedWebSocketModuleOptions, WebSocketUpgradeGuard as SharedWebSocketUpgradeGuard, WebSocketUpgradeContext, WebSocketUpgradeRejection } from '../types.js';
 /**
  * Defines the Deno websocket inbound message contract.
  *
@@ -42,7 +42,7 @@ export interface DenoWebSocketBindingHost<TSocket extends DenoServerWebSocket =
 /**
  * Defines the typed on message handler type.
  */
-export type TypedOnMessageHandler<TEvents extends Record<string, unknown>, K extends keyof TEvents> = (payload: TEvents[K], socket: DenoServerWebSocket, request: Request) => void | Promise<void>;
+export type TypedOnMessageHandler<TEvents extends Record<string, unknown>, K extends keyof TEvents> = import('../types.js').TypedOnMessageHandler<TEvents, K, DenoServerWebSocket, Request>;
 /**
  * Describes the web socket gateway context contract.
  */

package/dist/deno/deno-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deno-types.d.ts","sourceRoot":"","sources":["../../src/deno/deno-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,IAAI,4BAA4B,EACtD,uBAAuB,EACvB,qBAAqB,IAAI,2BAA2B,EACpD,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAAG,WAAW,GAAG,eAAe,GAAG,IAAI,GAAG,MAAM,CAAC;AAEjF;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,SAAS,EAAE,kBAAkB,GAAG,OAAO,GAAG,qBAAqB,GAAG,MAAM,CAAC;IACzH,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB;IACnG,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB;IACjG,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;CAChE;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB;IAC7F,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,GAAG,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CAChG;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB;IACjG,yBAAyB,CAAC,OAAO,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;CACrF;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,SAAS,MAAM,OAAO,IAAI,CACpG,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,EAAE,OAAO,KACb,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE1B;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;AAEzE,YAAY,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,CAAC;AAEnE;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"deno-types.d.ts","sourceRoot":"","sources":["../../src/deno/deno-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,IAAI,4BAA4B,EACtD,qBAAqB,IAAI,2BAA2B,EACpD,uBAAuB,EACvB,yBAAyB,EAC1B,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAAG,WAAW,GAAG,eAAe,GAAG,IAAI,GAAG,MAAM,CAAC;AAEjF;;GAEG;AACH,MAAM,WAAW,mBAAoB,SAAQ,IAAI,CAAC,SAAS,EAAE,kBAAkB,GAAG,OAAO,GAAG,qBAAqB,GAAG,MAAM,CAAC;IACzH,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB;IACnG,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB;IACjG,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;CAChE;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB;IAC7F,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,wBAAwB,CAAC,OAAO,CAAC,GAAG,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CAChG;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB;IACjG,yBAAyB,CAAC,OAAO,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;CACrF;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,SAAS,MAAM,OAAO,IAAI,OAAO,aAAa,EAAE,qBAAqB,CAC/I,OAAO,EACP,CAAC,EACD,mBAAmB,EACnB,OAAO,CACR,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;AAEzE,YAAY,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,CAAC;AAEnE;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,4BAA4B,CAAC,OAAO,CAAC,CAAC"}

package/dist/deno.d.ts

@@ -1,4 +1,5 @@
 export * from './decorators.js';
-export * from './metadata.js';
 export * from './deno/deno.js';
+export * from './metadata.js';
+export type { WebSocketEventEnvelope, WebSocketReplyMode } from './types.js';
 //# sourceMappingURL=deno.d.ts.map

package/dist/deno.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deno.d.ts","sourceRoot":"","sources":["../src/deno.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"deno.d.ts","sourceRoot":"","sources":["../src/deno.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,YAAY,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC"}

package/dist/deno.js

@@ -1,3 +1,4 @@
 export * from './decorators.js';
+export * from './deno/deno.js';
 export * from './metadata.js';
-export * from './deno/deno.js';
+export {};