@moostjs/event-http 0.7.2 → 0.7.3

package/dist/index.cjs

@@ -618,40 +618,25 @@ function _define_property(obj, key, value) {
 	return obj;
 }
 /** Marks the child context of {@link MoostHttp.invoke}. */ const invocationKey = (0, moost.globalKey)("moost-http.invocation");
-/**
-* Releases of queued (pipelined) responses per connection: one socket 'close' listener per
-* connection, however many requests are queued on it.
-*/ const queuedReleases = /* @__PURE__ */ new WeakMap();
-function releaseQueued() {
-	const releases = queuedReleases.get(this);
-	queuedReleases.delete(this);
-	releases?.forEach((release) => release());
-}
 const holdScopeUntilResponseCloses = { init: ({ unscope }) => {
 	const ctx = (0, moost.current)();
-	const res = ctx.hasOwn(invocationKey) ? void 0 : (0, _wooksjs_event_http.useResponse)(ctx).getRawRes(true);
-	const connection = res && !res.closed ? res.socket ?? res.req?.socket : void 0;
-	if (!res || !(connection instanceof net.Socket)) {
+	const response = (0, _wooksjs_event_http.useResponse)(ctx);
+	if (ctx.hasOwn(invocationKey) || !(response.getRawRes(true).req?.socket instanceof net.Socket)) {
 		unscope();
 		return;
 	}
-	if (res.socket) {
-		res.on("close", unscope);
-		return;
-	}
-	let releases = queuedReleases.get(connection);
-	if (!releases) {
-		queuedReleases.set(connection, releases = /* @__PURE__ */ new Set());
-		connection.once("close", releaseQueued);
-	}
-	releases.add(unscope);
-	res.on("close", () => {
-		releases.delete(unscope);
-		unscope();
-	});
+	response.onClose(unscope);
 } };
 const LOGGER_TITLE = "moost-http";
 /**
+* The default locale policy: `Accept-Language` negotiated against the translator's locales
+* (the first without a match or header). Nothing to negotiate — no locale or a single one —
+* adds no `Vary`.
+*/ function negotiateTranslatorLocale() {
+	const locales = (0, moost.getTranslatorLocales)();
+	return locales.length > 1 ? (0, _wooksjs_event_http.useAcceptLanguage)().negotiate(locales, locales[0]) : locales[0];
+}
+/**
 * ## Moost HTTP Adapter
 *
 * Moost Adapter for HTTP events
@@ -858,7 +843,14 @@ const LOGGER_TITLE = "moost-http";
 			opts.register(handler, routerBinding.getPath(params), args);
 		}
 	}
-	constructor(httpApp) {
+	/**
+	* @param httpApp - A `WooksHttp` to use as is, or the options of the one `MoostHttp` creates.
+	*   A created app translates error bodies (`translateErrorBody`, before your
+	*   `transformErrorBody`) and, without your `resolveLocale`, picks each request's locale from
+	*   the translator's `locales` by `Accept-Language` (see `setTranslator`). Both are no-ops
+	*   while no translator is registered. Your `transformErrorBody` runs even if the translation
+	*   throws (it then gets the untranslated body; logged once).
+	*/ constructor(httpApp) {
 		_define_property(this, "name", "http");
 		_define_property(this, "httpApp", void 0);
 		_define_property(this, "pathBuilders", {});
@@ -868,14 +860,30 @@ const LOGGER_TITLE = "moost-http";
 			image: "https://moost.org/moost-full-logo.svg",
 			link: "https://moost.org/",
 			poweredBy: "moostjs",
-			version: "0.7.2"
+			version: "0.7.3"
 		});
 		if (httpApp && httpApp instanceof _wooksjs_event_http.WooksHttp) this.httpApp = httpApp;
-		else if (httpApp) this.httpApp = (0, _wooksjs_event_http.createHttpApp)({
-			...httpApp,
-			onNotFound: this.onNotFound.bind(this)
-		});
-		else this.httpApp = (0, _wooksjs_event_http.createHttpApp)({ onNotFound: this.onNotFound.bind(this) });
+		else {
+			const transform = httpApp?.transformErrorBody;
+			let failureLogged = false;
+			this.httpApp = (0, _wooksjs_event_http.createHttpApp)({
+				...httpApp,
+				resolveLocale: httpApp?.resolveLocale ?? negotiateTranslatorLocale,
+				transformErrorBody: (body, error, ctx) => {
+					let out = body;
+					try {
+						out = (0, moost.translateErrorBody)(body, ctx);
+					} catch (translationError) {
+						if (!failureLogged) {
+							failureLogged = true;
+							(0, moost.useLogger)(LOGGER_TITLE, ctx).error("Error body translation failed, sending it untranslated (logged once)", translationError);
+						}
+					}
+					return transform ? transform(out, error, ctx) : out;
+				},
+				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");

package/dist/index.d.ts

@@ -481,6 +481,14 @@ declare class MoostHttp implements TMoostAdapter<THttpHandlerMeta> {
     static readonly [MOOST_ADAPTER_BRAND] = "@moostjs/event-http/MoostHttp";
     readonly name = "http";
     protected httpApp: WooksHttp;
+    /**
+     * @param httpApp - A `WooksHttp` to use as is, or the options of the one `MoostHttp` creates.
+     *   A created app translates error bodies (`translateErrorBody`, before your
+     *   `transformErrorBody`) and, without your `resolveLocale`, picks each request's locale from
+     *   the translator's `locales` by `Accept-Language` (see `setTranslator`). Both are no-ops
+     *   while no translator is registered. Your `transformErrorBody` runs even if the translation
+     *   throws (it then gets the untranslated body; logged once).
+     */
     constructor(httpApp?: WooksHttp | TWooksHttpOptions);
     getHttpApp(): WooksHttp;
     /**

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { current, eventTypeKey, key } from "@wooksjs/event-core";
-import { DEFAULT_HTTP_STATUS, HttpError, HttpError as HttpError$1, WooksHttp, WooksHttpResponse, createHttpApp, getDefaultHttpStatus, httpKind, httpKind as httpKind$1, isCompressibleType, prerenderJson, useAcceptLanguage, 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 { DEFAULT_HTTP_STATUS, HttpError, HttpError as HttpError$1, WooksHttp, WooksHttpResponse, createHttpApp, getDefaultHttpStatus, httpKind, httpKind as httpKind$1, isCompressibleType, prerenderJson, useAcceptLanguage, useAcceptLanguage as useAcceptLanguage$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, getTranslatorLocales, globalKey, run, translateErrorBody, useLogger } from "moost";
 import { seedBody, useBody } from "@wooksjs/http-body";
 import { createProvideRegistry } from "@prostojs/infact";
 import { Server } from "http";
@@ -617,40 +617,25 @@ function _define_property(obj, key, value) {
 	return obj;
 }
 /** Marks the child context of {@link MoostHttp.invoke}. */ const invocationKey = globalKey("moost-http.invocation");
-/**
-* Releases of queued (pipelined) responses per connection: one socket 'close' listener per
-* connection, however many requests are queued on it.
-*/ const queuedReleases = /* @__PURE__ */ new WeakMap();
-function releaseQueued() {
-	const releases = queuedReleases.get(this);
-	queuedReleases.delete(this);
-	releases?.forEach((release) => release());
-}
 const holdScopeUntilResponseCloses = { init: ({ unscope }) => {
 	const ctx = current$1();
-	const res = ctx.hasOwn(invocationKey) ? void 0 : useResponse(ctx).getRawRes(true);
-	const connection = res && !res.closed ? res.socket ?? res.req?.socket : void 0;
-	if (!res || !(connection instanceof Socket)) {
+	const response = useResponse(ctx);
+	if (ctx.hasOwn(invocationKey) || !(response.getRawRes(true).req?.socket instanceof Socket)) {
 		unscope();
 		return;
 	}
-	if (res.socket) {
-		res.on("close", unscope);
-		return;
-	}
-	let releases = queuedReleases.get(connection);
-	if (!releases) {
-		queuedReleases.set(connection, releases = /* @__PURE__ */ new Set());
-		connection.once("close", releaseQueued);
-	}
-	releases.add(unscope);
-	res.on("close", () => {
-		releases.delete(unscope);
-		unscope();
-	});
+	response.onClose(unscope);
 } };
 const LOGGER_TITLE = "moost-http";
 /**
+* The default locale policy: `Accept-Language` negotiated against the translator's locales
+* (the first without a match or header). Nothing to negotiate — no locale or a single one —
+* adds no `Vary`.
+*/ function negotiateTranslatorLocale() {
+	const locales = getTranslatorLocales();
+	return locales.length > 1 ? useAcceptLanguage$1().negotiate(locales, locales[0]) : locales[0];
+}
+/**
 * ## Moost HTTP Adapter
 *
 * Moost Adapter for HTTP events
@@ -857,7 +842,14 @@ const LOGGER_TITLE = "moost-http";
 			opts.register(handler, routerBinding.getPath(params), args);
 		}
 	}
-	constructor(httpApp) {
+	/**
+	* @param httpApp - A `WooksHttp` to use as is, or the options of the one `MoostHttp` creates.
+	*   A created app translates error bodies (`translateErrorBody`, before your
+	*   `transformErrorBody`) and, without your `resolveLocale`, picks each request's locale from
+	*   the translator's `locales` by `Accept-Language` (see `setTranslator`). Both are no-ops
+	*   while no translator is registered. Your `transformErrorBody` runs even if the translation
+	*   throws (it then gets the untranslated body; logged once).
+	*/ constructor(httpApp) {
 		_define_property(this, "name", "http");
 		_define_property(this, "httpApp", void 0);
 		_define_property(this, "pathBuilders", {});
@@ -867,14 +859,30 @@ const LOGGER_TITLE = "moost-http";
 			image: "https://moost.org/moost-full-logo.svg",
 			link: "https://moost.org/",
 			poweredBy: "moostjs",
-			version: "0.7.2"
+			version: "0.7.3"
 		});
 		if (httpApp && httpApp instanceof WooksHttp) this.httpApp = httpApp;
-		else if (httpApp) this.httpApp = createHttpApp({
-			...httpApp,
-			onNotFound: this.onNotFound.bind(this)
-		});
-		else this.httpApp = createHttpApp({ onNotFound: this.onNotFound.bind(this) });
+		else {
+			const transform = httpApp?.transformErrorBody;
+			let failureLogged = false;
+			this.httpApp = createHttpApp({
+				...httpApp,
+				resolveLocale: httpApp?.resolveLocale ?? negotiateTranslatorLocale,
+				transformErrorBody: (body, error, ctx) => {
+					let out = body;
+					try {
+						out = translateErrorBody(body, ctx);
+					} catch (translationError) {
+						if (!failureLogged) {
+							failureLogged = true;
+							useLogger(LOGGER_TITLE, ctx).error("Error body translation failed, sending it untranslated (logged once)", translationError);
+						}
+					}
+					return transform ? transform(out, error, ctx) : out;
+				},
+				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");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/event-http",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "@moostjs/event-http",
   "keywords": [
     "composables",
@@ -38,17 +38,17 @@
     }
   },
   "dependencies": {
-    "@wooksjs/event-http": "^0.8.0",
-    "@wooksjs/http-body": "^0.8.0"
+    "@wooksjs/event-http": "^0.8.1",
+    "@wooksjs/http-body": "^0.8.1"
   },
   "devDependencies": {
     "vitest": "4.1.12",
-    "@moostjs/event-wf": "^0.7.2"
+    "@moostjs/event-wf": "^0.7.3"
   },
   "peerDependencies": {
     "@prostojs/infact": "^0.6.1",
-    "@wooksjs/event-core": "^0.8.0",
-    "moost": "^0.7.2"
+    "@wooksjs/event-core": "^0.8.1",
+    "moost": "^0.7.3"
   },
   "scripts": {
     "pub": "pnpm publish --access public",