@wooksjs/event-ws 0.7.1 → 0.7.3

package/dist/index.cjs

@@ -167,6 +167,17 @@ function useWsServer() {
 	};
 }
 
+//#endregion
+//#region packages/event-ws/src/event-ws.ts
+/** Creates a WS connection event context and runs `fn` inside it. */
+function createWsConnectionContext(options, seeds, fn) {
+	return (0, __wooksjs_event_core.createEventContext)(options, wsConnectionKind, seeds, fn);
+}
+/** Creates a WS message event context and runs `fn` inside it. */
+function createWsMessageContext(options, seeds, fn) {
+	return (0, __wooksjs_event_core.createEventContext)(options, wsMessageKind, seeds, fn);
+}
+
 //#endregion
 //#region packages/event-ws/src/adapters/ws-adapter-default.ts
 /** Creates the default WsServerAdapter wrapping the `ws` package (peer dependency). */
@@ -426,30 +437,28 @@ var WooksWs = class extends wooks.WooksAdapterBase {
 		return this.server;
 	}
 	doUpgrade(req, socket, head, parentCtx) {
+		const ctxOptions = parentCtx ? {
+			...this.eventContextOptions,
+			parent: parentCtx
+		} : this.eventContextOptions;
 		this.wsServer.handleUpgrade(req, socket, head, (ws$1) => {
 			const id = crypto.randomUUID();
-			const ctxOptions = {
-				...this.eventContextOptions,
-				...parentCtx ? { parent: parentCtx } : {}
-			};
-			const connectionCtx = new __wooksjs_event_core.EventContext(ctxOptions);
-			const connection = new WsConnection(id, ws$1, connectionCtx, this.serializer);
-			connectionCtx.seed(wsConnectionKind, {
+			createWsConnectionContext(ctxOptions, {
 				id,
 				ws: ws$1
-			});
-			try {
-				if (this.onConnectHandler) {
-					const result = (0, __wooksjs_event_core.run)(connectionCtx, this.onConnectHandler);
-					if (result !== null && result !== void 0 && typeof result.then === "function") {
-						result.then(() => this.acceptConnection(connection)).catch((error) => this.rejectConnection(connection, error));
-						return;
+			}, () => {
+				const connectionCtx = (0, __wooksjs_event_core.current)();
+				const connection = new WsConnection(id, ws$1, connectionCtx, this.serializer);
+				try {
+					if (this.onConnectHandler) {
+						const result = this.onConnectHandler();
+						if (result !== null && result !== void 0 && typeof result.then === "function") return result.then(() => this.acceptConnection(connection)).catch((error) => this.rejectConnection(connection, error));
 					}
+					this.acceptConnection(connection);
+				} catch (error) {
+					this.rejectConnection(connection, error);
 				}
-				this.acceptConnection(connection);
-			} catch (error) {
-				this.rejectConnection(connection, error);
-			}
+			});
 		});
 	}
 	acceptConnection(connection) {
@@ -491,18 +500,17 @@ var WooksWs = class extends wooks.WooksAdapterBase {
 			return;
 		}
 		const { event, path, data, id: messageId } = msg;
-		const msgCtx = new __wooksjs_event_core.EventContext({
+		createWsMessageContext({
 			...this.eventContextOptions,
 			parent: connection.ctx
-		});
-		msgCtx.seed(wsMessageKind, {
+		}, {
 			data,
 			rawMessage: raw,
 			messageId,
 			messagePath: path,
 			messageEvent: event
-		});
-		(0, __wooksjs_event_core.run)(msgCtx, () => {
+		}, () => {
+			const msgCtx = (0, __wooksjs_event_core.current)();
 			const handlers = this.wooks.lookupHandlers(event, path, msgCtx);
 			if (!handlers) {
 				if (messageId !== void 0) connection.replyError(messageId, 404, "Not found");
@@ -512,6 +520,7 @@ var WooksWs = class extends wooks.WooksAdapterBase {
 			if (result !== null && result !== void 0 && typeof result.then === "function") result.catch((error) => {
 				this.handleHandlerError(error, connection, messageId);
 			});
+			return result;
 		});
 	}
 	processHandlers(handlers, connection, messageId) {
@@ -702,6 +711,8 @@ exports.WsConnection = WsConnection;
 exports.WsError = WsError;
 exports.WsRoomManager = WsRoomManager;
 exports.createWsApp = createWsApp;
+exports.createWsConnectionContext = createWsConnectionContext;
+exports.createWsMessageContext = createWsMessageContext;
 exports.currentConnection = currentConnection;
 exports.prepareTestWsConnectionContext = prepareTestWsConnectionContext;
 exports.prepareTestWsMessageContext = prepareTestWsMessageContext;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _wooksjs_event_core from '@wooksjs/event-core';
-import { EventContext, EventContextOptions } from '@wooksjs/event-core';
+import { EventContext, EventContextOptions, EventKindSeeds } from '@wooksjs/event-core';
 export { EventContext, useLogger, useRouteParams } from '@wooksjs/event-core';
 import { TConsoleBase } from '@prostojs/logger';
 import http, { IncomingMessage, Server } from 'http';
@@ -186,6 +186,25 @@ declare function useWsServer(): {
     roomConnections(room: string): Set<WsConnection>;
 };
 
+/** Event kind for WebSocket connections (long-lived, one per client). */
+declare const wsConnectionKind: _wooksjs_event_core.EventKind<{
+    id: _wooksjs_event_core.SlotMarker<string>;
+    ws: _wooksjs_event_core.SlotMarker<WsSocket>;
+}>;
+/** Event kind for WebSocket messages (short-lived, one per incoming message). */
+declare const wsMessageKind: _wooksjs_event_core.EventKind<{
+    data: _wooksjs_event_core.SlotMarker<unknown>;
+    rawMessage: _wooksjs_event_core.SlotMarker<string | Buffer<ArrayBufferLike>>;
+    messageId: _wooksjs_event_core.SlotMarker<string | number | undefined>;
+    messagePath: _wooksjs_event_core.SlotMarker<string>;
+    messageEvent: _wooksjs_event_core.SlotMarker<string>;
+}>;
+
+/** Creates a WS connection event context and runs `fn` inside it. */
+declare function createWsConnectionContext<R>(options: EventContextOptions, seeds: EventKindSeeds<typeof wsConnectionKind>, fn: () => R): R;
+/** Creates a WS message event context and runs `fn` inside it. */
+declare function createWsMessageContext<R>(options: EventContextOptions, seeds: EventKindSeeds<typeof wsMessageKind>, fn: () => R): R;
+
 /** WebSocket adapter for Wooks. Implements WooksUpgradeHandler for HTTP integration. */
 declare class WooksWs extends WooksAdapterBase implements WooksUpgradeHandler {
     protected logger: TConsoleBase;
@@ -258,20 +277,6 @@ declare class WooksWs extends WooksAdapterBase implements WooksUpgradeHandler {
  */
 declare function createWsApp(wooksOrOpts?: Wooks | WooksAdapterBase | TWooksWsOptions, opts?: TWooksWsOptions): WooksWs;
 
-/** Event kind for WebSocket connections (long-lived, one per client). */
-declare const wsConnectionKind: _wooksjs_event_core.EventKind<{
-    id: _wooksjs_event_core.SlotMarker<string>;
-    ws: _wooksjs_event_core.SlotMarker<WsSocket>;
-}>;
-/** Event kind for WebSocket messages (short-lived, one per incoming message). */
-declare const wsMessageKind: _wooksjs_event_core.EventKind<{
-    data: _wooksjs_event_core.SlotMarker<unknown>;
-    rawMessage: _wooksjs_event_core.SlotMarker<string | Buffer<ArrayBufferLike>>;
-    messageId: _wooksjs_event_core.SlotMarker<string | number | undefined>;
-    messagePath: _wooksjs_event_core.SlotMarker<string>;
-    messageEvent: _wooksjs_event_core.SlotMarker<string>;
-}>;
-
 /** WebSocket error with a numeric code following HTTP conventions (401, 403, 404, 500, etc.). */
 declare class WsError extends Error {
     readonly code: number;
@@ -331,5 +336,5 @@ declare function prepareTestWsConnectionContext(options?: TTestWsConnectionConte
  */
 declare function prepareTestWsMessageContext(options: TTestWsMessageContext): <T>(cb: (...a: any[]) => T) => T;
 
-export { WooksWs, WsConnection, WsError, WsRoomManager, createWsApp, currentConnection, prepareTestWsConnectionContext, prepareTestWsMessageContext, useWsConnection, useWsMessage, useWsRooms, useWsServer, wsConnectionKind, wsMessageKind };
+export { WooksWs, WsConnection, WsError, WsRoomManager, createWsApp, createWsConnectionContext, createWsMessageContext, currentConnection, prepareTestWsConnectionContext, prepareTestWsMessageContext, useWsConnection, useWsMessage, useWsRooms, useWsServer, wsConnectionKind, wsMessageKind };
 export type { TTestWsConnectionContext, TTestWsMessageContext, TWooksWsOptions, WsBroadcastOptions, WsBroadcastTransport, WsClientMessage, WsPushMessage, WsReplyMessage, WsServerAdapter, WsServerInstance, WsSocket };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { EventContext, current, defineEventKind, defineWook, key, routeParamsKey, run, slot, useLogger, useRouteParams, useRouteParams as useRouteParams$1 } from "@wooksjs/event-core";
+import { EventContext, createEventContext, current, defineEventKind, defineWook, key, routeParamsKey, run, slot, useLogger, useRouteParams, useRouteParams as useRouteParams$1 } from "@wooksjs/event-core";
 import http from "http";
 import { WooksAdapterBase } from "wooks";
 import { WebSocketServer } from "ws";
@@ -144,6 +144,17 @@ function useWsServer() {
 	};
 }
 
+//#endregion
+//#region packages/event-ws/src/event-ws.ts
+/** Creates a WS connection event context and runs `fn` inside it. */
+function createWsConnectionContext(options, seeds, fn) {
+	return createEventContext(options, wsConnectionKind, seeds, fn);
+}
+/** Creates a WS message event context and runs `fn` inside it. */
+function createWsMessageContext(options, seeds, fn) {
+	return createEventContext(options, wsMessageKind, seeds, fn);
+}
+
 //#endregion
 //#region packages/event-ws/src/adapters/ws-adapter-default.ts
 /** Creates the default WsServerAdapter wrapping the `ws` package (peer dependency). */
@@ -403,30 +414,28 @@ var WooksWs = class extends WooksAdapterBase {
 		return this.server;
 	}
 	doUpgrade(req, socket, head, parentCtx) {
+		const ctxOptions = parentCtx ? {
+			...this.eventContextOptions,
+			parent: parentCtx
+		} : this.eventContextOptions;
 		this.wsServer.handleUpgrade(req, socket, head, (ws) => {
 			const id = crypto.randomUUID();
-			const ctxOptions = {
-				...this.eventContextOptions,
-				...parentCtx ? { parent: parentCtx } : {}
-			};
-			const connectionCtx = new EventContext(ctxOptions);
-			const connection = new WsConnection(id, ws, connectionCtx, this.serializer);
-			connectionCtx.seed(wsConnectionKind, {
+			createWsConnectionContext(ctxOptions, {
 				id,
 				ws
-			});
-			try {
-				if (this.onConnectHandler) {
-					const result = run(connectionCtx, this.onConnectHandler);
-					if (result !== null && result !== void 0 && typeof result.then === "function") {
-						result.then(() => this.acceptConnection(connection)).catch((error) => this.rejectConnection(connection, error));
-						return;
+			}, () => {
+				const connectionCtx = current();
+				const connection = new WsConnection(id, ws, connectionCtx, this.serializer);
+				try {
+					if (this.onConnectHandler) {
+						const result = this.onConnectHandler();
+						if (result !== null && result !== void 0 && typeof result.then === "function") return result.then(() => this.acceptConnection(connection)).catch((error) => this.rejectConnection(connection, error));
 					}
+					this.acceptConnection(connection);
+				} catch (error) {
+					this.rejectConnection(connection, error);
 				}
-				this.acceptConnection(connection);
-			} catch (error) {
-				this.rejectConnection(connection, error);
-			}
+			});
 		});
 	}
 	acceptConnection(connection) {
@@ -468,18 +477,17 @@ var WooksWs = class extends WooksAdapterBase {
 			return;
 		}
 		const { event, path, data, id: messageId } = msg;
-		const msgCtx = new EventContext({
+		createWsMessageContext({
 			...this.eventContextOptions,
 			parent: connection.ctx
-		});
-		msgCtx.seed(wsMessageKind, {
+		}, {
 			data,
 			rawMessage: raw,
 			messageId,
 			messagePath: path,
 			messageEvent: event
-		});
-		run(msgCtx, () => {
+		}, () => {
+			const msgCtx = current();
 			const handlers = this.wooks.lookupHandlers(event, path, msgCtx);
 			if (!handlers) {
 				if (messageId !== void 0) connection.replyError(messageId, 404, "Not found");
@@ -489,6 +497,7 @@ var WooksWs = class extends WooksAdapterBase {
 			if (result !== null && result !== void 0 && typeof result.then === "function") result.catch((error) => {
 				this.handleHandlerError(error, connection, messageId);
 			});
+			return result;
 		});
 	}
 	processHandlers(handlers, connection, messageId) {
@@ -674,4 +683,4 @@ function prepareTestWsMessageContext(options) {
 }
 
 //#endregion
-export { WooksWs, WsConnection, WsError, WsRoomManager, createWsApp, currentConnection, prepareTestWsConnectionContext, prepareTestWsMessageContext, useLogger, useRouteParams, useWsConnection, useWsMessage, useWsRooms, useWsServer, wsConnectionKind, wsMessageKind };
+export { WooksWs, WsConnection, WsError, WsRoomManager, createWsApp, createWsConnectionContext, createWsMessageContext, currentConnection, prepareTestWsConnectionContext, prepareTestWsMessageContext, useLogger, useRouteParams, useWsConnection, useWsMessage, useWsRooms, useWsServer, wsConnectionKind, wsMessageKind };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/event-ws",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "WebSocket adapter for Wooks with path-based message routing, rooms, and broadcasting",
   "keywords": [
     "api",
@@ -47,15 +47,15 @@
     "@types/ws": "^8.18.1",
     "typescript": "^5.9.3",
     "vitest": "^3.2.4",
-    "@wooksjs/event-core": "^0.7.1",
-    "wooks": "^0.7.1"
+    "@wooksjs/event-core": "^0.7.3",
+    "wooks": "^0.7.3"
   },
   "peerDependencies": {
     "@prostojs/logger": "^0.4.3",
     "@prostojs/router": "^0.3.2",
     "ws": "^8.0.0",
-    "@wooksjs/event-core": "^0.7.1",
-    "wooks": "^0.7.1"
+    "@wooksjs/event-core": "^0.7.3",
+    "wooks": "^0.7.3"
   },
   "scripts": {
     "build": "rolldown -c ../../rolldown.config.mjs",

package/skills/wooksjs-event-ws/SKILL.md

@@ -31,6 +31,9 @@ import {
   useWsRooms,
   useWsServer,
   currentConnection,
+  // context factories
+  createWsConnectionContext,
+  createWsMessageContext,
   // kinds & types
   wsConnectionKind,
   wsMessageKind,

package/skills/wooksjs-event-ws/core.md

@@ -4,10 +4,10 @@
 
 ## Concepts
 
-`@wooksjs/event-ws` follows the Wooks adapter pattern. It creates two nested context layers:
+`@wooksjs/event-ws` follows the Wooks adapter pattern. It creates two nested context layers via dedicated context factories:
 
-1. **Connection context** (`ws:connection` kind) — long-lived, one per connected client. Seeded with `id` and `ws` socket.
-2. **Message context** (`ws:message` kind) — short-lived, one per incoming message. Its `parent` is the connection context.
+1. **Connection context** (`ws:connection` kind) — long-lived, one per connected client. Created via `createWsConnectionContext(options, seeds, fn)`, seeded with `id` and `ws` socket.
+2. **Message context** (`ws:message` kind) — short-lived, one per incoming message. Created via `createWsMessageContext(options, seeds, fn)` with `parent` set to the connection context.
 
 Messages follow a JSON wire protocol with `event` + `path` for routing and an optional `id` for request-response correlation.