@moostjs/event-http 0.6.41 → 0.6.43

package/dist/index.cjs

@@ -540,6 +540,17 @@ function _define_property(obj, key, value) {
 	else obj[key] = value;
 	return obj;
 }
+/** Marks the child context of {@link MoostHttp.invoke}. */ const invocationKey = (0, moost.globalKey)("moost-http.invocation");
+const holdScopeUntilResponseCloses = { init: ({ unscope }) => {
+	const ctx = (0, moost.current)();
+	if (ctx.hasOwn(invocationKey)) {
+		unscope();
+		return;
+	}
+	const res = (0, _wooksjs_event_http.useResponse)(ctx).getRawRes(true);
+	if (res.closed) unscope();
+	else res.once("close", unscope);
+} };
 const LOGGER_TITLE = "moost-http";
 /**
 * ## Moost HTTP Adapter
@@ -600,18 +611,75 @@ const LOGGER_TITLE = "moost-http";
 	*/ withHttpContext(req, res, fn) {
 		return this.httpApp.withHttpContext(req, res, fn);
 	}
+	/**
+	* Runs the route matching `method` + `path` inside the CURRENT HTTP event — its whole moost
+	* pipeline (DI scope, guards and other interceptors, argument resolution, pipes, handler) —
+	* and resolves to the handler's return value, or rejects with its error. Nothing is written
+	* to the HTTP response.
+	*
+	* The route runs in a copy-on-write child of the current event: it reads the caller's
+	* request, headers and authorization through, but sees its own body (`opts.body`), its own
+	* route params, its own controller context and its own `FOR_EVENT` DI scope (released when
+	* the handler settles). Status, headers and cookies it sets go to a detached response and
+	* are discarded.
+	*
+	* Use it to delegate work to another controller's route without a network round-trip or
+	* re-sending credentials. Rejects with `HttpError(404)` when no route matches.
+	*
+	* @example
+	* ```ts
+	* const http = await useControllerContext().instantiate(MoostHttp)
+	* const summary = await http.invoke('POST', '/issues/actions/close', { body: { ids } })
+	* ```
+	*/ invoke(method, path, opts) {
+		const parent = (0, moost.current)();
+		const caller = parent.has(_wooksjs_event_http.httpKind.keys.response) ? parent.get(_wooksjs_event_http.httpKind.keys.response) : void 0;
+		if (!caller) throw new Error("MoostHttp.invoke() must be called inside an HTTP event");
+		const child = (0, moost.forkEventContext)({
+			parent,
+			isolate: opts?.isolate
+		});
+		child.setOwn(invocationKey, true);
+		const ResponseCtor = caller.constructor;
+		child.setOwn(_wooksjs_event_http.httpKind.keys.response, new ResponseCtor(caller.getRawRes(true), parent.get(_wooksjs_event_http.httpKind.keys.req), parent.logger, void 0, true));
+		(0, _wooksjs_http_body.seedBody)(child, opts?.body, {
+			raw: opts?.rawBody,
+			contentType: opts?.contentType
+		});
+		opts?.prepare?.(child);
+		return (0, moost.run)(child, async () => {
+			const handlers = this.httpApp.getWooks().lookupHandlers(method, path, child);
+			if (!handlers?.length) throw new _wooksjs_event_http.HttpError(404, `No route for ${method} ${path}`);
+			let failure;
+			for (const handler of handlers) {
+				let result;
+				try {
+					result = await handler();
+				} catch (error) {
+					failure = error;
+					continue;
+				}
+				if (result instanceof Error) throw result;
+				return result;
+			}
+			throw failure;
+		});
+	}
 	listen(port, hostname, backlog, listeningListener) {
 		return this.httpApp.listen(port, hostname, backlog, listeningListener);
 	}
 	async onNotFound() {
-		return (0, moost.defineMoostEventHandler)({
+		this.notFoundHandler ?? (this.notFoundHandler = (0, moost.defineMoostEventHandler)({
 			loggerTitle: LOGGER_TITLE,
 			getIterceptorHandler: () => this.moost?.getGlobalInterceptorHandler(),
 			getControllerInstance: () => this.moost,
 			callControllerMethod: () => new _wooksjs_event_http.HttpError(404, "Resource Not Found"),
+			manualUnscope: true,
+			hooks: holdScopeUntilResponseCloses,
 			targetPath: "",
 			handlerType: "__SYSTEM__"
-		})();
+		}));
+		return this.notFoundHandler();
 	}
 	onInit(moost$1) {
 		this.moost = moost$1;
@@ -642,6 +710,7 @@ const LOGGER_TITLE = "moost-http";
 			const httpPath = handler.path;
 			const path = typeof httpPath === "string" ? httpPath : typeof opts.method === "string" ? opts.method : "";
 			const targetPath = `${`${opts.prefix || ""}/${path}`.replaceAll(/\/\/+/g, "/")}${path.endsWith("//") ? "/" : ""}`;
+			const isUpgrade = handler.method === "UPGRADE";
 			fn = (0, moost.defineMoostEventHandler)({
 				loggerTitle: LOGGER_TITLE,
 				getIterceptorHandler: opts.getIterceptorHandler,
@@ -649,19 +718,13 @@ const LOGGER_TITLE = "moost-http";
 				controllerMethod: opts.method,
 				controllerName: opts.controllerName,
 				resolveArgs: opts.resolveArgs,
-				manualUnscope: true,
-				hooks: { init: ({ unscope }) => {
-					if (handler.method === "UPGRADE") {
-						(0, _wooksjs_event_http.useRequest)().raw.on("end", unscope);
-						return;
-					}
-					(0, _wooksjs_event_http.useResponse)().getRawRes(true).once("close", unscope);
-				} },
+				manualUnscope: !isUpgrade,
+				hooks: isUpgrade ? void 0 : holdScopeUntilResponseCloses,
 				targetPath,
 				controllerPrefix: opts.prefix,
 				handlerType: handler.type
 			});
-			const routerBinding = handler.method === "UPGRADE" ? this.httpApp.upgrade(targetPath, fn) : this.httpApp.on(handler.method, targetPath, fn);
+			const routerBinding = isUpgrade ? this.httpApp.upgrade(targetPath, fn) : this.httpApp.on(handler.method, targetPath, fn);
 			const { getPath: pathBuilder } = routerBinding;
 			const id = ((0, moost.getMoostMate)().read(opts.fakeInstance, opts.method) || {}).id || opts.method;
 			if (id) {
@@ -686,11 +749,12 @@ const LOGGER_TITLE = "moost-http";
 		_define_property(this, "httpApp", void 0);
 		_define_property(this, "pathBuilders", {});
 		_define_property(this, "moost", void 0);
+		_define_property(this, "notFoundHandler", void 0);
 		_wooksjs_event_http.WooksHttpResponse.registerFramework({
 			image: "https://moost.org/moost-full-logo.svg",
 			link: "https://moost.org/",
 			poweredBy: "moostjs",
-			version: "0.6.41"
+			version: "0.6.43"
 		});
 		if (httpApp && httpApp instanceof _wooksjs_event_http.WooksHttp) this.httpApp = httpApp;
 		else if (httpApp) this.httpApp = (0, _wooksjs_event_http.createHttpApp)({
@@ -700,6 +764,7 @@ const LOGGER_TITLE = "moost-http";
 		else this.httpApp = (0, _wooksjs_event_http.createHttpApp)({ onNotFound: this.onNotFound.bind(this) });
 	}
 };
+/** Names this adapter for DI independently of class identity (see `MOOST_ADAPTER_BRAND`). */ _define_property(MoostHttp, moost.MOOST_ADAPTER_BRAND, "@moostjs/event-http/MoostHttp");
 
 //#endregion
 //#region packages/event-http/src/local-fetch.ts

package/dist/index.d.ts

@@ -1,9 +1,10 @@
 import * as moost from 'moost';
-import { TInterceptorPriority, TOvertakeFn, TInterceptorDef, TClassConstructor, TMoostAdapter, Moost, TConsoleBase, TMoostAdapterOptions } from 'moost';
+import { TInterceptorPriority, TOvertakeFn, TInterceptorDef, TClassConstructor, TMoostAdapter, MOOST_ADAPTER_BRAND, TIsolatedSlot, EventContext, Moost, TConsoleBase, TMoostAdapterOptions } from 'moost';
 import * as _wooksjs_event_http from '@wooksjs/event-http';
 import { TCookieAttributes as TCookieAttributes$1, TCookieAttributesInput, WooksHttp, TWooksHttpOptions } from '@wooksjs/event-http';
 export { HttpError, TCacheControl, TCookieAttributesInput, TSetCookieData, httpKind, useHttpContext } from '@wooksjs/event-http';
 import { IncomingMessage, ServerResponse } from 'http';
+import { Buffer } from 'buffer';
 import { ListenOptions } from 'net';
 
 /** Bearer token transport configuration for auth guards. */
@@ -371,6 +372,29 @@ interface THttpHandlerMeta {
     method: string;
     path: string;
 }
+/** Options for {@link MoostHttp.invoke}. */
+interface TMoostHttpInvokeOptions {
+    /**
+     * The parsed request body the invoked route sees (`@Body()`, `useBody().parseBody()`).
+     * Without `body` / `rawBody` the route sees an empty body — never the calling request's.
+     */
+    body?: unknown;
+    /** The raw body bytes (`@RawBody()`, `rawBody()`). Default: derived from `body` (JSON for objects). */
+    rawBody?: Buffer | string;
+    /** The content type `useBody().is()` checks. Default: derived from `body` (`application/json` for objects). */
+    contentType?: string;
+    /**
+     * Slots (or `defineWook` composables) of the calling event that the invoked route must not
+     * read through — per-event state the calling handler computed and the route must compute
+     * for itself.
+     */
+    isolate?: Iterable<TIsolatedSlot>;
+    /**
+     * Called with the route's child context before the route runs — seed extra slots, or keep a
+     * reference to read what the route left in it once `invoke()` settled.
+     */
+    prepare?: (ctx: EventContext) => void;
+}
 /**
  * ## Moost HTTP Adapter
  *
@@ -397,6 +421,8 @@ interface THttpHandlerMeta {
  * ```
  */
 declare class MoostHttp implements TMoostAdapter<THttpHandlerMeta> {
+    /** Names this adapter for DI independently of class identity (see `MOOST_ADAPTER_BRAND`). */
+    static readonly [MOOST_ADAPTER_BRAND] = "@moostjs/event-http/MoostHttp";
     readonly name = "http";
     protected httpApp: WooksHttp;
     constructor(httpApp?: WooksHttp | TWooksHttpOptions);
@@ -430,6 +456,28 @@ declare class MoostHttp implements TMoostAdapter<THttpHandlerMeta> {
         result: Awaited<T>;
         response: _wooksjs_event_http.HttpResponse;
     }>;
+    /**
+     * Runs the route matching `method` + `path` inside the CURRENT HTTP event — its whole moost
+     * pipeline (DI scope, guards and other interceptors, argument resolution, pipes, handler) —
+     * and resolves to the handler's return value, or rejects with its error. Nothing is written
+     * to the HTTP response.
+     *
+     * The route runs in a copy-on-write child of the current event: it reads the caller's
+     * request, headers and authorization through, but sees its own body (`opts.body`), its own
+     * route params, its own controller context and its own `FOR_EVENT` DI scope (released when
+     * the handler settles). Status, headers and cookies it sets go to a detached response and
+     * are discarded.
+     *
+     * Use it to delegate work to another controller's route without a network round-trip or
+     * re-sending credentials. Rejects with `HttpError(404)` when no route matches.
+     *
+     * @example
+     * ```ts
+     * const http = await useControllerContext().instantiate(MoostHttp)
+     * const summary = await http.invoke('POST', '/issues/actions/close', { body: { ids } })
+     * ```
+     */
+    invoke<R = unknown>(method: string, path: string, opts?: TMoostHttpInvokeOptions): Promise<R>;
     listen(port?: number, hostname?: string, backlog?: number, listeningListener?: () => void): Promise<void>;
     listen(port?: number, hostname?: string, listeningListener?: () => void): Promise<void>;
     listen(port?: number, backlog?: number, listeningListener?: () => void): Promise<void>;
@@ -448,6 +496,7 @@ declare class MoostHttp implements TMoostAdapter<THttpHandlerMeta> {
     }>;
     onNotFound(): Promise<unknown>;
     protected moost?: Moost;
+    private notFoundHandler?;
     onInit(moost: Moost): void;
     /**
      * Called by `Moost.dispose()` before any `@MoostDispose` hook runs: stops the
@@ -478,4 +527,4 @@ declare class MoostHttp implements TMoostAdapter<THttpHandlerMeta> {
 declare function enableLocalFetch(http: MoostHttp): () => void;
 
 export { All, AuthGuard, Authenticate, Authorization, Body, BodyReadTimeoutMs, BodySizeLimit, CompressedBodySizeLimit, Cookie, CookieAttrsRef, CookieRef, Delete, Get, Header, HeaderRef, HttpMethod, Ip, IpList, Method, MoostHttp, Patch, Post, Put, Query, RawBody, Req, ReqId, Res, SetCookie, SetHeader, SetStatus, StatusRef, Upgrade, Url, defineAuthGuard, enableLocalFetch, extractTransports, globalBodyReadTimeoutMs, globalBodySizeLimit, globalCompressedBodySizeLimit };
-export type { TAuthGuardClass, TAuthGuardDef, TAuthGuardHandler, TAuthTransportApiKey, TAuthTransportBasic, TAuthTransportBearer, TAuthTransportCookie, TAuthTransportDeclaration, TAuthTransportValues, TCookieAttributes, TCookieRef, THeaderRef, THttpHandlerMeta, TStatusRef };
+export type { TAuthGuardClass, TAuthGuardDef, TAuthGuardHandler, TAuthTransportApiKey, TAuthTransportBasic, TAuthTransportBearer, TAuthTransportCookie, TAuthTransportDeclaration, TAuthTransportValues, TCookieAttributes, TCookieRef, THeaderRef, THttpHandlerMeta, TMoostHttpInvokeOptions, TStatusRef };

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { current } from "@wooksjs/event-core";
-import { HttpError, HttpError as HttpError$1, WooksHttp, WooksHttpResponse, createHttpApp, httpKind, useAuthorization, useCookies, useHeaders, useHttpContext, useRequest, useResponse, useUrlParams } from "@wooksjs/event-http";
-import { Before, Intercept, Interceptor, Overtake, Resolve, TInterceptorPriority, defineBeforeInterceptor, defineMoostEventHandler, getMoostMate } from "moost";
-import { useBody } from "@wooksjs/http-body";
+import { HttpError, HttpError as HttpError$1, WooksHttp, WooksHttpResponse, createHttpApp, httpKind, httpKind as httpKind$1, 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";
 import { createProvideRegistry } from "@prostojs/infact";
 import { Server } from "http";
 import { Server as Server$1 } from "https";
@@ -539,6 +539,17 @@ function _define_property(obj, key, value) {
 	else obj[key] = value;
 	return obj;
 }
+/** Marks the child context of {@link MoostHttp.invoke}. */ const invocationKey = globalKey("moost-http.invocation");
+const holdScopeUntilResponseCloses = { init: ({ unscope }) => {
+	const ctx = current$1();
+	if (ctx.hasOwn(invocationKey)) {
+		unscope();
+		return;
+	}
+	const res = useResponse(ctx).getRawRes(true);
+	if (res.closed) unscope();
+	else res.once("close", unscope);
+} };
 const LOGGER_TITLE = "moost-http";
 /**
 * ## Moost HTTP Adapter
@@ -599,18 +610,75 @@ const LOGGER_TITLE = "moost-http";
 	*/ withHttpContext(req, res, fn) {
 		return this.httpApp.withHttpContext(req, res, fn);
 	}
+	/**
+	* Runs the route matching `method` + `path` inside the CURRENT HTTP event — its whole moost
+	* pipeline (DI scope, guards and other interceptors, argument resolution, pipes, handler) —
+	* and resolves to the handler's return value, or rejects with its error. Nothing is written
+	* to the HTTP response.
+	*
+	* The route runs in a copy-on-write child of the current event: it reads the caller's
+	* request, headers and authorization through, but sees its own body (`opts.body`), its own
+	* route params, its own controller context and its own `FOR_EVENT` DI scope (released when
+	* the handler settles). Status, headers and cookies it sets go to a detached response and
+	* are discarded.
+	*
+	* Use it to delegate work to another controller's route without a network round-trip or
+	* re-sending credentials. Rejects with `HttpError(404)` when no route matches.
+	*
+	* @example
+	* ```ts
+	* const http = await useControllerContext().instantiate(MoostHttp)
+	* const summary = await http.invoke('POST', '/issues/actions/close', { body: { ids } })
+	* ```
+	*/ invoke(method, path, opts) {
+		const parent = current$1();
+		const caller = parent.has(httpKind$1.keys.response) ? parent.get(httpKind$1.keys.response) : void 0;
+		if (!caller) throw new Error("MoostHttp.invoke() must be called inside an HTTP event");
+		const child = forkEventContext({
+			parent,
+			isolate: opts?.isolate
+		});
+		child.setOwn(invocationKey, true);
+		const ResponseCtor = caller.constructor;
+		child.setOwn(httpKind$1.keys.response, new ResponseCtor(caller.getRawRes(true), parent.get(httpKind$1.keys.req), parent.logger, void 0, true));
+		seedBody(child, opts?.body, {
+			raw: opts?.rawBody,
+			contentType: opts?.contentType
+		});
+		opts?.prepare?.(child);
+		return run(child, async () => {
+			const handlers = this.httpApp.getWooks().lookupHandlers(method, path, child);
+			if (!handlers?.length) throw new HttpError$1(404, `No route for ${method} ${path}`);
+			let failure;
+			for (const handler of handlers) {
+				let result;
+				try {
+					result = await handler();
+				} catch (error) {
+					failure = error;
+					continue;
+				}
+				if (result instanceof Error) throw result;
+				return result;
+			}
+			throw failure;
+		});
+	}
 	listen(port, hostname, backlog, listeningListener) {
 		return this.httpApp.listen(port, hostname, backlog, listeningListener);
 	}
 	async onNotFound() {
-		return defineMoostEventHandler({
+		this.notFoundHandler ?? (this.notFoundHandler = defineMoostEventHandler({
 			loggerTitle: LOGGER_TITLE,
 			getIterceptorHandler: () => this.moost?.getGlobalInterceptorHandler(),
 			getControllerInstance: () => this.moost,
 			callControllerMethod: () => new HttpError$1(404, "Resource Not Found"),
+			manualUnscope: true,
+			hooks: holdScopeUntilResponseCloses,
 			targetPath: "",
 			handlerType: "__SYSTEM__"
-		})();
+		}));
+		return this.notFoundHandler();
 	}
 	onInit(moost) {
 		this.moost = moost;
@@ -641,6 +709,7 @@ const LOGGER_TITLE = "moost-http";
 			const httpPath = handler.path;
 			const path = typeof httpPath === "string" ? httpPath : typeof opts.method === "string" ? opts.method : "";
 			const targetPath = `${`${opts.prefix || ""}/${path}`.replaceAll(/\/\/+/g, "/")}${path.endsWith("//") ? "/" : ""}`;
+			const isUpgrade = handler.method === "UPGRADE";
 			fn = defineMoostEventHandler({
 				loggerTitle: LOGGER_TITLE,
 				getIterceptorHandler: opts.getIterceptorHandler,
@@ -648,19 +717,13 @@ const LOGGER_TITLE = "moost-http";
 				controllerMethod: opts.method,
 				controllerName: opts.controllerName,
 				resolveArgs: opts.resolveArgs,
-				manualUnscope: true,
-				hooks: { init: ({ unscope }) => {
-					if (handler.method === "UPGRADE") {
-						useRequest().raw.on("end", unscope);
-						return;
-					}
-					useResponse().getRawRes(true).once("close", unscope);
-				} },
+				manualUnscope: !isUpgrade,
+				hooks: isUpgrade ? void 0 : holdScopeUntilResponseCloses,
 				targetPath,
 				controllerPrefix: opts.prefix,
 				handlerType: handler.type
 			});
-			const routerBinding = handler.method === "UPGRADE" ? this.httpApp.upgrade(targetPath, fn) : this.httpApp.on(handler.method, targetPath, fn);
+			const routerBinding = isUpgrade ? this.httpApp.upgrade(targetPath, fn) : this.httpApp.on(handler.method, targetPath, fn);
 			const { getPath: pathBuilder } = routerBinding;
 			const id = (getMoostMate().read(opts.fakeInstance, opts.method) || {}).id || opts.method;
 			if (id) {
@@ -685,11 +748,12 @@ const LOGGER_TITLE = "moost-http";
 		_define_property(this, "httpApp", void 0);
 		_define_property(this, "pathBuilders", {});
 		_define_property(this, "moost", void 0);
+		_define_property(this, "notFoundHandler", void 0);
 		WooksHttpResponse.registerFramework({
 			image: "https://moost.org/moost-full-logo.svg",
 			link: "https://moost.org/",
 			poweredBy: "moostjs",
-			version: "0.6.41"
+			version: "0.6.43"
 		});
 		if (httpApp && httpApp instanceof WooksHttp) this.httpApp = httpApp;
 		else if (httpApp) this.httpApp = createHttpApp({
@@ -699,6 +763,7 @@ const LOGGER_TITLE = "moost-http";
 		else this.httpApp = createHttpApp({ onNotFound: this.onNotFound.bind(this) });
 	}
 };
+/** Names this adapter for DI independently of class identity (see `MOOST_ADAPTER_BRAND`). */ _define_property(MoostHttp, MOOST_ADAPTER_BRAND, "@moostjs/event-http/MoostHttp");
 
 //#endregion
 //#region packages/event-http/src/local-fetch.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/event-http",
-  "version": "0.6.41",
+  "version": "0.6.43",
   "description": "@moostjs/event-http",
   "keywords": [
     "composables",
@@ -38,16 +38,16 @@
     }
   },
   "dependencies": {
-    "@wooksjs/event-http": "^0.7.24",
-    "@wooksjs/http-body": "^0.7.24"
+    "@wooksjs/event-http": "^0.7.26",
+    "@wooksjs/http-body": "^0.7.26"
   },
   "devDependencies": {
     "vitest": "3.2.7"
   },
   "peerDependencies": {
     "@prostojs/infact": "^0.6.0",
-    "@wooksjs/event-core": "^0.7.24",
-    "moost": "^0.6.41"
+    "@wooksjs/event-core": "^0.7.26",
+    "moost": "^0.6.43"
   },
   "scripts": {
     "pub": "pnpm publish --access public",