@znight/http 0.2.2 → 0.4.0

package/dist/express.d.mts

@@ -1,4 +1,4 @@
-import { s as HttpAdapter } from "./adapter-J0UXFnNM.mjs";
+import { s as HttpAdapter } from "./adapter-DmhQGqAR.mjs";
 import { Server } from "node:http";
 import { Express, Router } from "express";
 /** Options of {@link expressAdapter}. */

package/dist/fastify.d.mts

@@ -1,4 +1,4 @@
-import { s as HttpAdapter } from "./adapter-J0UXFnNM.mjs";
+import { s as HttpAdapter } from "./adapter-DmhQGqAR.mjs";
 import { FastifyInstance, FastifyServerOptions } from "fastify";
 /** Options of {@link fastifyAdapter}. */
 export interface FastifyAdapterOptions {

package/dist/hono.d.mts

@@ -1,4 +1,4 @@
-import { s as HttpAdapter } from "./adapter-J0UXFnNM.mjs";
+import { s as HttpAdapter } from "./adapter-DmhQGqAR.mjs";
 import { Hono } from "hono";
 /** Options of {@link honoAdapter}. */
 export interface HonoAdapterOptions {

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { $ as PayloadTooLargeException, A as UploadedFileOptions, B as BadRequestException, C as HttpUploadDefinition, Ct as CookieOptions, D as RequestAbortedError, Dt as parseSetCookie, E as RequestAbortKind, Et as parseCookieHeader, F as formatByteSize, G as HeaderValue, H as ForbiddenException, I as parseByteSize, J as HttpExceptionOptions, K as HttpErrorBody, L as QueryRecord, M as Uploads, N as uploads, O as RequestId, Ot as serializeClearCookie, P as ByteSize, Q as NotImplementedException, R as parseQuery, S as HttpSseDefinition, St as CookieDefaults, T as HttpRouteInfo, Tt as SetCookieInfo, U as GatewayTimeoutException, V as ConflictException, W as GoneException, X as MethodNotAllowedException, Y as InternalServerErrorException, Z as NotFoundException, _ as HttpMethod, _t as StandardSchemaV1Result, a as AdapterRoute, at as ValidationException, b as HttpRouteDefinition, bt as isStandardSchema, c as HttpServerAddress, ct as toIssueDetail, d as InjectStreamOptions, dt as StandardSchemaV1, et as ServiceUnavailableException, f as InjectStreamRequest, ft as StandardSchemaV1FailureResult, g as HttpMetadata, gt as StandardSchemaV1Props, h as HttpControllerDefinition, ht as StandardSchemaV1PathSegment, i as AdapterRequest, it as UnsupportedMediaTypeException, j as UploadedFilesOptions, k as UploadLimits, kt as serializeCookie, l as InjectRequest, lt as InferSchemaInput, m as ReplyBody, mt as StandardSchemaV1Options, n as AdapterHandler, nt as UnauthorizedException, o as FallbackHandler, ot as ValidationIssueDetail, p as InjectStreamResponse, pt as StandardSchemaV1Issue, q as HttpException, r as AdapterReply, rt as UnprocessableEntityException, s as HttpAdapter, st as isHttpException, t as AdapterCloseOptions, tt as TooManyRequestsException, u as InjectResponse, ut as InferSchemaOutput, v as HttpParamDefinition, vt as StandardSchemaV1SuccessResult, w as HttpContext, wt as ResponseCookie, x as HttpRouteGroupDefinition, xt as ClearCookieOptions, y as HttpParamSource, yt as StandardSchemaV1Types, z as BadGatewayException } from "./adapter-J0UXFnNM.mjs";
+import { $ as PayloadTooLargeException, A as UploadedFileOptions, B as BadRequestException, C as HttpUploadDefinition, Ct as CookieOptions, D as RequestAbortedError, Dt as parseSetCookie, E as RequestAbortKind, Et as parseCookieHeader, F as formatByteSize, G as HeaderValue, H as ForbiddenException, I as parseByteSize, J as HttpExceptionOptions, K as HttpErrorBody, L as QueryRecord, M as Uploads, N as uploads, O as RequestId, Ot as serializeClearCookie, P as ByteSize, Q as NotImplementedException, R as parseQuery, S as HttpSseDefinition, St as CookieDefaults, T as HttpRouteInfo, Tt as SetCookieInfo, U as GatewayTimeoutException, V as ConflictException, W as GoneException, X as MethodNotAllowedException, Y as InternalServerErrorException, Z as NotFoundException, _ as HttpMethod, _t as StandardSchemaV1Result, a as AdapterRoute, at as ValidationException, b as HttpRouteDefinition, bt as isStandardSchema, c as HttpServerAddress, ct as toIssueDetail, d as InjectStreamOptions, dt as StandardSchemaV1, et as ServiceUnavailableException, f as InjectStreamRequest, ft as StandardSchemaV1FailureResult, g as HttpMetadata, gt as StandardSchemaV1Props, h as HttpControllerDefinition, ht as StandardSchemaV1PathSegment, i as AdapterRequest, it as UnsupportedMediaTypeException, j as UploadedFilesOptions, k as UploadLimits, kt as serializeCookie, l as InjectRequest, lt as InferSchemaInput, m as ReplyBody, mt as StandardSchemaV1Options, n as AdapterHandler, nt as UnauthorizedException, o as FallbackHandler, ot as ValidationIssueDetail, p as InjectStreamResponse, pt as StandardSchemaV1Issue, q as HttpException, r as AdapterReply, rt as UnprocessableEntityException, s as HttpAdapter, st as isHttpException, t as AdapterCloseOptions, tt as TooManyRequestsException, u as InjectResponse, ut as InferSchemaOutput, v as HttpParamDefinition, vt as StandardSchemaV1SuccessResult, w as HttpContext, wt as ResponseCookie, x as HttpRouteGroupDefinition, xt as ClearCookieOptions, y as HttpParamSource, yt as StandardSchemaV1Types, z as BadGatewayException } from "./adapter-DmhQGqAR.mjs";
 import { NodeAdapter, NodeAdapterOptions, nodeAdapter } from "./node.mjs";
 import { ClassMarker, Container, MethodMarker, ParameterMarker, Plugin, PluginContext, PluginOptions, ProviderKey, Scope, TypedToken } from "@znight/core";
 /**
@@ -1162,6 +1162,14 @@ interface PluginHttpRoutesContext {
  */
 interface PluginHttpRoutes {
   httpRoutes(context: PluginHttpRoutesContext): readonly PluginRoute[];
+  /**
+   * Called once when `HttpPlugin` starts draining (its `onStop`, whatever the plugin order), after
+   * it stopped accepting connections and started closing its event streams: end the long-lived
+   * responses `HttpPlugin` does not know of (a stream another server produced), so that the drain
+   * does not wait for them until `drainTimeoutMs`. Requests still in flight are served. The drain
+   * waits for a returned promise too (within `drainTimeoutMs`); a failure is logged.
+   */
+  onHttpDrain?(): void | Promise<void>;
 }
 /** A parsed `content-type` header. */
 interface MediaType {

package/dist/index.mjs

@@ -3967,7 +3967,7 @@ var Pipeline = class {
 		let result;
 		let reply;
 		try {
-			result = plan.definition.invoke(this.#resolve(plan.controller), ctx);
+			result = plan.invoke(this.#resolve(plan.controller), ctx);
 			if (isThenable(result)) return this.#fastLater(route, request, ctx, result, startTime);
 			reply = this.#fastReply(route, ctx, result);
 		} catch (error) {
@@ -4003,7 +4003,7 @@ var Pipeline = class {
 			if (result === NO_RESULT) {
 				const controller = this.#resolve(plan.controller);
 				await ctx.parseBody();
-				result = plan.definition.invoke(controller, ctx);
+				result = plan.invoke(controller, ctx);
 			}
 			if (isThenable(result)) result = await result;
 			reply = this.#fastReply(route, ctx, result);
@@ -4091,7 +4091,7 @@ var Pipeline = class {
 		if (plan.parseBody) return this.#fastOperationLater(x, route, NO_RESULT);
 		let result;
 		try {
-			result = plan.definition.invoke(this.#resolve(plan.controller), ctx);
+			result = plan.invoke(this.#resolve(plan.controller), ctx);
 		} catch (error) {
 			return this.#fastChecked(x, this.#failed(error, ctx, x.event));
 		}
@@ -4107,7 +4107,7 @@ var Pipeline = class {
 			if (result === NO_RESULT) {
 				const controller = this.#resolve(plan.controller);
 				await ctx.parseBody();
-				result = plan.definition.invoke(controller, ctx);
+				result = plan.invoke(controller, ctx);
 			}
 			if (isThenable(result)) result = await result;
 		} catch (error) {
@@ -4634,12 +4634,11 @@ var Pipeline = class {
 			const controller = this.#resolve(plan.controller);
 			for (const guard of plan.guards) if (await this.#resolve(guard).canActivate(ctx) !== true) throw new ForbiddenException("Forbidden resource");
 			if (plan.parseBody) await ctx.parseBody();
-			const definition = plan.definition;
 			const interceptors = plan.interceptors;
-			if (interceptors.length === 0) result = definition.invoke(controller, ctx);
+			if (interceptors.length === 0) result = plan.invoke(controller, ctx);
 			else {
 				const chain = async (index) => {
-					if (index === interceptors.length) return await definition.invoke(controller, ctx);
+					if (index === interceptors.length) return await plan.invoke(controller, ctx);
 					return await this.#resolve(interceptors[index]).intercept(ctx, () => chain(index + 1));
 				};
 				result = chain(0);
@@ -5135,6 +5134,28 @@ function collectPluginRoutes(plugins, self, context) {
 	}
 	return collected;
 }
+/**
+* Calls `onHttpDrain()` on every other plugin implementing it, in plugin order: the promises the
+* drain waits for (they never reject: a failure is logged).
+*/
+function drainPlugins(plugins, self, logger) {
+	const pending = [];
+	for (const plugin of plugins) {
+		if (plugin === self) continue;
+		const drain = plugin.onHttpDrain;
+		if (typeof drain !== "function") continue;
+		const failed = (error) => {
+			logger.error(`HttpPlugin: onHttpDrain() of the plugin "${String(plugin.name)}" failed`, { err: error });
+		};
+		try {
+			const result = drain.call(plugin);
+			if (typeof result?.then === "function") pending.push(Promise.resolve(result).then(void 0, failed));
+		} catch (error) {
+			failed(error);
+		}
+	}
+	return pending;
+}
 function validateRoute(instance, plugin, value, prefix) {
 	if (value === null || typeof value !== "object") throw invalid(plugin, `invalid route ${describe(value)}`);
 	const route = value;
@@ -5827,13 +5848,18 @@ var HttpPlugin = class HttpPlugin {
 		if (runtime === void 0) return;
 		runtime.pipeline.draining = true;
 		runtime.pipeline.closeStreams("shutdown");
+		const drains = drainPlugins(ctx.app.plugins, this, ctx.logger);
 		const timeoutMs = runtime.options.drainTimeoutMs;
 		let timer;
 		const timeout = new Promise((resolve) => {
 			if (timeoutMs !== Number.POSITIVE_INFINITY) timer = setTimeout(() => resolve("timeout"), Math.min(timeoutMs, MAX_TIMER_MS));
 		});
 		try {
-			const drained = Promise.all([runtime.adapter.close(), runtime.pipeline.whenIdle()]).then(() => "drained");
+			const drained = Promise.all([
+				runtime.adapter.close(),
+				runtime.pipeline.whenIdle(),
+				...drains
+			]).then(() => "drained");
 			if (await Promise.race([drained, timeout]) === "timeout") {
 				ctx.logger.warn(`HTTP server: closing ${runtime.pipeline.inflight} in-flight request(s) after ${timeoutMs} ms`);
 				await runtime.adapter.close({ force: true });
@@ -6102,6 +6128,7 @@ function buildRegistrations(ctx, options, raw, pluginRoutes) {
 			const body = bodyPlan(route, options.bodyLimit, options.uploads);
 			const parseBody = body.upload || route.params.some((param) => param.source === "body");
 			const chain = guards.map((guard) => guard.resolvable);
+			const invoke = routeInvoke(container, route, lookup, where);
 			let meta;
 			const effective = () => {
 				meta ??= effectiveMeta(controllerMeta, routeMeta, groupOf);
@@ -6113,6 +6140,7 @@ function buildRegistrations(ctx, options, raw, pluginRoutes) {
 				path,
 				plan: (method) => ({
 					definition: route,
+					invoke,
 					path,
 					info: Object.freeze({
 						method,
@@ -6166,6 +6194,7 @@ function buildRegistrations(ctx, options, raw, pluginRoutes) {
 			path,
 			plan: (method) => ({
 				definition,
+				invoke: definition.invoke,
 				path,
 				info: Object.freeze({
 					method,
@@ -6320,6 +6349,7 @@ function assertRoute(route, where) {
 	if (route.bodyLimit !== void 0 && !isSize(route.bodyLimit)) throw new ZnightError(ErrorCode.InvalidRoute, `Invalid route ${where}: bodyLimit must be a number of bytes (or Infinity), got ${describeValue(route.bodyLimit)}`);
 	if (route.uploads !== void 0) assertUploads(route, where);
 	if (route.sse !== void 0) assertSse(route, where);
+	if (route.paramResolvers !== void 0 && !Array.isArray(route.paramResolvers)) throw new ZnightError(ErrorCode.InvalidRoute, `Invalid route ${where}: paramResolvers must be an array of tokens`);
 }
 function assertSse(route, where) {
 	const sse = route.sse;
@@ -6359,6 +6389,22 @@ function describeValue(value) {
 	}
 }
 /**
+* The `invoke` of a route plan: the generated `invoke` itself, unless the route has parameter
+* resolvers (RFC 0010), whose instances are passed as its third argument: one frozen array resolved
+* at bootstrap when they are all singletons, otherwise an array resolved in the request scope.
+*/
+function routeInvoke(container, route, lookup, where) {
+	const invoke = route.invoke;
+	const tokens = route.paramResolvers;
+	if (tokens === void 0 || tokens.length === 0) return invoke;
+	const resolvers = tokens.map((token) => lookup(token, `parameter resolver of ${where}`));
+	if (resolvers.every((resolver) => "instance" in resolver)) {
+		const instances = Object.freeze(resolvers.map((resolver) => resolver.instance));
+		return (controller, ctx) => invoke(controller, ctx, instances);
+	}
+	return (controller, ctx) => invoke(controller, ctx, resolvers.map((resolver) => "instance" in resolver ? resolver.instance : container.get(resolver.token)));
+}
+/**
 * Singletons (and registered values) are resolved once at bootstrap; request-scoped and transient
 * providers on every request.
 */