@moostjs/event-http 0.6.49 → 0.6.51

package/dist/index.cjs

@@ -376,13 +376,27 @@ function createRef(getter, setter) {
 	return (0, moost.Resolve)(() => (0, _wooksjs_http_body.useBody)().rawBody(), "body");
 }
 
+//#endregion
+//#region packages/event-http/src/decorators/http-only.ts
+/**
+* Wraps the callback of an HTTP-only interceptor so it runs for HTTP events only (an in-process
+* `MoostHttp.invoke()` included). Any other event of a mixed controller — a CLI command, a
+* workflow step, a WebSocket message — skips it, also when it runs as a child of an HTTP request:
+* the parent's request and response are not its own.
+*/ function forHttpEvents(fn) {
+	return () => {
+		const ctx = (0, _wooksjs_event_core.current)();
+		if (ctx.has(_wooksjs_event_core.eventTypeKey) && ctx.get(_wooksjs_event_core.eventTypeKey) === _wooksjs_event_http.httpKind.name) fn(ctx);
+	};
+}
+
 //#endregion
 //#region packages/event-http/src/decorators/set.decorator.ts
 const setHeaderInterceptor = (name, value, opts) => {
-	const cb = () => {
-		const response = (0, _wooksjs_event_http.useResponse)();
+	const cb = forHttpEvents((ctx) => {
+		const response = (0, _wooksjs_event_http.useResponse)(ctx);
 		if ((!response.getHeader(name) || opts?.force) && (!opts?.status || opts.status === response.status)) response.setHeader(name, value);
-	};
+	});
 	const def = { priority: moost.TInterceptorPriority.AFTER_ALL };
 	if (opts?.when !== "error") def.after = cb;
 	if (opts?.when === "always" || opts?.when === "error") def.error = cb;
@@ -428,10 +442,10 @@ const setHeaderInterceptor = (name, value, opts) => {
 	return (0, moost.Intercept)(setHeaderInterceptor(...args));
 }
 const setCookieInterceptor = (name, value, attrs) => ({
-	after() {
-		const response = (0, _wooksjs_event_http.useResponse)();
+	after: forHttpEvents((ctx) => {
+		const response = (0, _wooksjs_event_http.useResponse)(ctx);
 		if (!response.getCookie(name)) response.setCookie(name, value, attrs);
-	},
+	}),
 	priority: moost.TInterceptorPriority.AFTER_ALL
 });
 /**
@@ -458,10 +472,10 @@ const setCookieInterceptor = (name, value, attrs) => ({
 	return (0, moost.Intercept)(setCookieInterceptor(...args));
 }
 const setStatusInterceptor = (code, opts) => ({
-	after() {
-		const response = (0, _wooksjs_event_http.useResponse)();
+	after: forHttpEvents((ctx) => {
+		const response = (0, _wooksjs_event_http.useResponse)(ctx);
 		if (!response.status || opts?.force) response.status = code;
-	},
+	}),
 	priority: moost.TInterceptorPriority.AFTER_ALL
 });
 /**
@@ -490,28 +504,31 @@ const setStatusInterceptor = (code, opts) => ({
 //#region packages/event-http/src/decorators/limits.decorator.ts
 /**
 * Creates an interceptor that sets the maximum allowed inflated body size in bytes.
+* Non-HTTP events are left alone.
 *
 * @param n - Maximum body size in bytes after decompression.
 * @returns Interceptor def to enforce the limit.
-*/ const globalBodySizeLimit = (n) => (0, moost.defineBeforeInterceptor)(() => {
-	(0, _wooksjs_event_http.useRequest)().setMaxInflated(n);
-}, moost.TInterceptorPriority.BEFORE_ALL);
+*/ const globalBodySizeLimit = (n) => (0, moost.defineBeforeInterceptor)(forHttpEvents((ctx) => {
+	(0, _wooksjs_event_http.useRequest)(ctx).setMaxInflated(n);
+}), moost.TInterceptorPriority.BEFORE_ALL);
 /**
 * Creates an interceptor that sets the maximum allowed compressed body size in bytes.
+* Non-HTTP events are left alone.
 *
 * @param n - Maximum body size in bytes before decompression.
 * @returns Interceptor def to enforce the limit.
-*/ const globalCompressedBodySizeLimit = (n) => (0, moost.defineBeforeInterceptor)(() => {
-	(0, _wooksjs_event_http.useRequest)().setMaxCompressed(n);
-}, moost.TInterceptorPriority.BEFORE_ALL);
+*/ const globalCompressedBodySizeLimit = (n) => (0, moost.defineBeforeInterceptor)(forHttpEvents((ctx) => {
+	(0, _wooksjs_event_http.useRequest)(ctx).setMaxCompressed(n);
+}), moost.TInterceptorPriority.BEFORE_ALL);
 /**
 * Creates an interceptor that sets the timeout for reading the request body.
+* Non-HTTP events are left alone.
 *
 * @param n - Timeout in milliseconds.
 * @returns Interceptor def to enforce the timeout.
-*/ const globalBodyReadTimeoutMs = (n) => (0, moost.defineBeforeInterceptor)(() => {
-	(0, _wooksjs_event_http.useRequest)().setReadTimeoutMs(n);
-}, moost.TInterceptorPriority.BEFORE_ALL);
+*/ const globalBodyReadTimeoutMs = (n) => (0, moost.defineBeforeInterceptor)(forHttpEvents((ctx) => {
+	(0, _wooksjs_event_http.useRequest)(ctx).setReadTimeoutMs(n);
+}), moost.TInterceptorPriority.BEFORE_ALL);
 /**
 * Decorator to limit the maximum inflated body size for the request. Default: 10 MB
 *
@@ -530,12 +547,14 @@ const setStatusInterceptor = (code, opts) => ({
 
 //#endregion
 //#region packages/event-http/src/decorators/compress.decorator.ts
+/** Compression settings of the response before the first `@Compress` of the event ran. */ const compressionBase = (0, _wooksjs_event_core.key)("moost.http.compressionBase");
 /**
 * Overrides response compression for a handler or a whole controller.
 *
 * Calls `useResponse().setCompression(value)` before guards, argument resolution and the
 * handler run, so the override also applies to error responses (401, 400, …).
-* A method-level `@Compress` wins over a class-level one.
+* A method-level `@Compress` replaces a class-level one: it starts from the app settings
+* rather than layering over the class value. Non-HTTP events of a controller are left alone.
 *
 * - `true` (default) — compress with the app settings (`new MoostHttp({ compression })`),
 *   or the defaults when the app has compression off.
@@ -564,9 +583,12 @@ const setStatusInterceptor = (code, opts) => ({
 * ```
 *
 * @param value compression override, defaults to `true`
-*/ const Compress = (value = true) => (0, moost.Intercept)((0, moost.defineBeforeInterceptor)(() => {
-	(0, _wooksjs_event_http.useResponse)().setCompression(value);
-}, moost.TInterceptorPriority.BEFORE_ALL));
+*/ const Compress = (value = true) => (0, moost.Intercept)((0, moost.defineBeforeInterceptor)(forHttpEvents((ctx) => {
+	const response = (0, _wooksjs_event_http.useResponse)(ctx);
+	if (ctx.hasOwn(compressionBase)) response.setCompression(ctx.getOwn(compressionBase));
+	else ctx.setOwn(compressionBase, response.compression);
+	response.setCompression(value);
+}), moost.TInterceptorPriority.BEFORE_ALL));
 
 //#endregion
 //#region packages/event-http/src/event-http.ts
@@ -620,7 +642,13 @@ const LOGGER_TITLE = "moost-http";
 	getHttpApp() {
 		return this.httpApp;
 	}
-	getServerCb(onNoMatch) {
+	/**
+	* Returns a Node.js request listener for a custom server, or a middleware for a host app.
+	*
+	* With `onNoMatch` (middleware mode) a request no route matches is handed to `onNoMatch`
+	* before any Moost event starts — it belongs to the host app, so it gets no event context,
+	* DI scope, interceptors or tracing.
+	*/ getServerCb(onNoMatch) {
 		return this.httpApp.getServerCb(onNoMatch);
 	}
 	/**
@@ -794,7 +822,7 @@ const LOGGER_TITLE = "moost-http";
 			image: "https://moost.org/moost-full-logo.svg",
 			link: "https://moost.org/",
 			poweredBy: "moostjs",
-			version: "0.6.49"
+			version: "0.6.51"
 		});
 		if (httpApp && httpApp instanceof _wooksjs_event_http.WooksHttp) this.httpApp = httpApp;
 		else if (httpApp) this.httpApp = (0, _wooksjs_event_http.createHttpApp)({

package/dist/index.d.ts

@@ -328,6 +328,7 @@ declare function SetStatus(...args: Parameters<typeof setStatusInterceptor>): Cl
 
 /**
  * Creates an interceptor that sets the maximum allowed inflated body size in bytes.
+ * Non-HTTP events are left alone.
  *
  * @param n - Maximum body size in bytes after decompression.
  * @returns Interceptor def to enforce the limit.
@@ -335,6 +336,7 @@ declare function SetStatus(...args: Parameters<typeof setStatusInterceptor>): Cl
 declare const globalBodySizeLimit: (n: number) => moost.TInterceptorDef;
 /**
  * Creates an interceptor that sets the maximum allowed compressed body size in bytes.
+ * Non-HTTP events are left alone.
  *
  * @param n - Maximum body size in bytes before decompression.
  * @returns Interceptor def to enforce the limit.
@@ -342,6 +344,7 @@ declare const globalBodySizeLimit: (n: number) => moost.TInterceptorDef;
 declare const globalCompressedBodySizeLimit: (n: number) => moost.TInterceptorDef;
 /**
  * Creates an interceptor that sets the timeout for reading the request body.
+ * Non-HTTP events are left alone.
  *
  * @param n - Timeout in milliseconds.
  * @returns Interceptor def to enforce the timeout.
@@ -371,7 +374,8 @@ declare const BodyReadTimeoutMs: (n: number) => ClassDecorator & MethodDecorator
  *
  * Calls `useResponse().setCompression(value)` before guards, argument resolution and the
  * handler run, so the override also applies to error responses (401, 400, …).
- * A method-level `@Compress` wins over a class-level one.
+ * A method-level `@Compress` replaces a class-level one: it starts from the app settings
+ * rather than layering over the class value. Non-HTTP events of a controller are left alone.
  *
  * - `true` (default) — compress with the app settings (`new MoostHttp({ compression })`),
  *   or the defaults when the app has compression off.
@@ -464,6 +468,13 @@ declare class MoostHttp implements TMoostAdapter<THttpHandlerMeta> {
     protected httpApp: WooksHttp;
     constructor(httpApp?: WooksHttp | TWooksHttpOptions);
     getHttpApp(): WooksHttp;
+    /**
+     * Returns a Node.js request listener for a custom server, or a middleware for a host app.
+     *
+     * With `onNoMatch` (middleware mode) a request no route matches is handed to `onNoMatch`
+     * before any Moost event starts — it belongs to the host app, so it gets no event context,
+     * DI scope, interceptors or tracing.
+     */
     getServerCb(onNoMatch?: (req: IncomingMessage, res: ServerResponse) => void): (req: IncomingMessage, res: ServerResponse) => void;
     /**
      * Programmatic route invocation using the Web Standard fetch API.

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { current } from "@wooksjs/event-core";
+import { current, eventTypeKey, key } from "@wooksjs/event-core";
 import { HttpError, HttpError as HttpError$1, WooksHttp, WooksHttpResponse, createHttpApp, httpKind, httpKind as httpKind$1, isCompressibleType, prerenderJson, useAuthorization, useCookies, useHeaders, useHttpContext, useRequest, useResponse, useUrlParams } from "@wooksjs/event-http";
 import { Before, Intercept, Interceptor, MOOST_ADAPTER_BRAND, Overtake, Resolve, TInterceptorPriority, current as current$1, defineBeforeInterceptor, defineMoostEventHandler, forkEventContext, getMoostMate, globalKey, run } from "moost";
 import { seedBody, useBody } from "@wooksjs/http-body";
@@ -375,13 +375,27 @@ function createRef(getter, setter) {
 	return Resolve(() => useBody().rawBody(), "body");
 }
 
+//#endregion
+//#region packages/event-http/src/decorators/http-only.ts
+/**
+* Wraps the callback of an HTTP-only interceptor so it runs for HTTP events only (an in-process
+* `MoostHttp.invoke()` included). Any other event of a mixed controller — a CLI command, a
+* workflow step, a WebSocket message — skips it, also when it runs as a child of an HTTP request:
+* the parent's request and response are not its own.
+*/ function forHttpEvents(fn) {
+	return () => {
+		const ctx = current();
+		if (ctx.has(eventTypeKey) && ctx.get(eventTypeKey) === httpKind$1.name) fn(ctx);
+	};
+}
+
 //#endregion
 //#region packages/event-http/src/decorators/set.decorator.ts
 const setHeaderInterceptor = (name, value, opts) => {
-	const cb = () => {
-		const response = useResponse();
+	const cb = forHttpEvents((ctx) => {
+		const response = useResponse(ctx);
 		if ((!response.getHeader(name) || opts?.force) && (!opts?.status || opts.status === response.status)) response.setHeader(name, value);
-	};
+	});
 	const def = { priority: TInterceptorPriority.AFTER_ALL };
 	if (opts?.when !== "error") def.after = cb;
 	if (opts?.when === "always" || opts?.when === "error") def.error = cb;
@@ -427,10 +441,10 @@ const setHeaderInterceptor = (name, value, opts) => {
 	return Intercept(setHeaderInterceptor(...args));
 }
 const setCookieInterceptor = (name, value, attrs) => ({
-	after() {
-		const response = useResponse();
+	after: forHttpEvents((ctx) => {
+		const response = useResponse(ctx);
 		if (!response.getCookie(name)) response.setCookie(name, value, attrs);
-	},
+	}),
 	priority: TInterceptorPriority.AFTER_ALL
 });
 /**
@@ -457,10 +471,10 @@ const setCookieInterceptor = (name, value, attrs) => ({
 	return Intercept(setCookieInterceptor(...args));
 }
 const setStatusInterceptor = (code, opts) => ({
-	after() {
-		const response = useResponse();
+	after: forHttpEvents((ctx) => {
+		const response = useResponse(ctx);
 		if (!response.status || opts?.force) response.status = code;
-	},
+	}),
 	priority: TInterceptorPriority.AFTER_ALL
 });
 /**
@@ -489,28 +503,31 @@ const setStatusInterceptor = (code, opts) => ({
 //#region packages/event-http/src/decorators/limits.decorator.ts
 /**
 * Creates an interceptor that sets the maximum allowed inflated body size in bytes.
+* Non-HTTP events are left alone.
 *
 * @param n - Maximum body size in bytes after decompression.
 * @returns Interceptor def to enforce the limit.
-*/ const globalBodySizeLimit = (n) => defineBeforeInterceptor(() => {
-	useRequest().setMaxInflated(n);
-}, TInterceptorPriority.BEFORE_ALL);
+*/ const globalBodySizeLimit = (n) => defineBeforeInterceptor(forHttpEvents((ctx) => {
+	useRequest(ctx).setMaxInflated(n);
+}), TInterceptorPriority.BEFORE_ALL);
 /**
 * Creates an interceptor that sets the maximum allowed compressed body size in bytes.
+* Non-HTTP events are left alone.
 *
 * @param n - Maximum body size in bytes before decompression.
 * @returns Interceptor def to enforce the limit.
-*/ const globalCompressedBodySizeLimit = (n) => defineBeforeInterceptor(() => {
-	useRequest().setMaxCompressed(n);
-}, TInterceptorPriority.BEFORE_ALL);
+*/ const globalCompressedBodySizeLimit = (n) => defineBeforeInterceptor(forHttpEvents((ctx) => {
+	useRequest(ctx).setMaxCompressed(n);
+}), TInterceptorPriority.BEFORE_ALL);
 /**
 * Creates an interceptor that sets the timeout for reading the request body.
+* Non-HTTP events are left alone.
 *
 * @param n - Timeout in milliseconds.
 * @returns Interceptor def to enforce the timeout.
-*/ const globalBodyReadTimeoutMs = (n) => defineBeforeInterceptor(() => {
-	useRequest().setReadTimeoutMs(n);
-}, TInterceptorPriority.BEFORE_ALL);
+*/ const globalBodyReadTimeoutMs = (n) => defineBeforeInterceptor(forHttpEvents((ctx) => {
+	useRequest(ctx).setReadTimeoutMs(n);
+}), TInterceptorPriority.BEFORE_ALL);
 /**
 * Decorator to limit the maximum inflated body size for the request. Default: 10 MB
 *
@@ -529,12 +546,14 @@ const setStatusInterceptor = (code, opts) => ({
 
 //#endregion
 //#region packages/event-http/src/decorators/compress.decorator.ts
+/** Compression settings of the response before the first `@Compress` of the event ran. */ const compressionBase = key("moost.http.compressionBase");
 /**
 * Overrides response compression for a handler or a whole controller.
 *
 * Calls `useResponse().setCompression(value)` before guards, argument resolution and the
 * handler run, so the override also applies to error responses (401, 400, …).
-* A method-level `@Compress` wins over a class-level one.
+* A method-level `@Compress` replaces a class-level one: it starts from the app settings
+* rather than layering over the class value. Non-HTTP events of a controller are left alone.
 *
 * - `true` (default) — compress with the app settings (`new MoostHttp({ compression })`),
 *   or the defaults when the app has compression off.
@@ -563,9 +582,12 @@ const setStatusInterceptor = (code, opts) => ({
 * ```
 *
 * @param value compression override, defaults to `true`
-*/ const Compress = (value = true) => Intercept(defineBeforeInterceptor(() => {
-	useResponse().setCompression(value);
-}, TInterceptorPriority.BEFORE_ALL));
+*/ const Compress = (value = true) => Intercept(defineBeforeInterceptor(forHttpEvents((ctx) => {
+	const response = useResponse(ctx);
+	if (ctx.hasOwn(compressionBase)) response.setCompression(ctx.getOwn(compressionBase));
+	else ctx.setOwn(compressionBase, response.compression);
+	response.setCompression(value);
+}), TInterceptorPriority.BEFORE_ALL));
 
 //#endregion
 //#region packages/event-http/src/event-http.ts
@@ -619,7 +641,13 @@ const LOGGER_TITLE = "moost-http";
 	getHttpApp() {
 		return this.httpApp;
 	}
-	getServerCb(onNoMatch) {
+	/**
+	* Returns a Node.js request listener for a custom server, or a middleware for a host app.
+	*
+	* With `onNoMatch` (middleware mode) a request no route matches is handed to `onNoMatch`
+	* before any Moost event starts — it belongs to the host app, so it gets no event context,
+	* DI scope, interceptors or tracing.
+	*/ getServerCb(onNoMatch) {
 		return this.httpApp.getServerCb(onNoMatch);
 	}
 	/**
@@ -793,7 +821,7 @@ const LOGGER_TITLE = "moost-http";
 			image: "https://moost.org/moost-full-logo.svg",
 			link: "https://moost.org/",
 			poweredBy: "moostjs",
-			version: "0.6.49"
+			version: "0.6.51"
 		});
 		if (httpApp && httpApp instanceof WooksHttp) this.httpApp = httpApp;
 		else if (httpApp) this.httpApp = createHttpApp({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/event-http",
-  "version": "0.6.49",
+  "version": "0.6.51",
   "description": "@moostjs/event-http",
   "keywords": [
     "composables",
@@ -38,16 +38,17 @@
     }
   },
   "dependencies": {
-    "@wooksjs/event-http": "^0.7.28",
-    "@wooksjs/http-body": "^0.7.28"
+    "@wooksjs/event-http": "^0.7.29",
+    "@wooksjs/http-body": "^0.7.29"
   },
   "devDependencies": {
-    "vitest": "3.2.7"
+    "vitest": "3.2.7",
+    "@moostjs/event-wf": "^0.6.51"
   },
   "peerDependencies": {
     "@prostojs/infact": "^0.6.1",
-    "@wooksjs/event-core": "^0.7.28",
-    "moost": "^0.6.49"
+    "@wooksjs/event-core": "^0.7.29",
+    "moost": "^0.6.51"
   },
   "scripts": {
     "pub": "pnpm publish --access public",