@fedify/nuxt 2.4.2 → 2.4.3

package/dist/{logic-BIxb97Xx.js → logic-DeouaBCQ.js}

@@ -1,6 +1,7 @@
 //#region src/runtime/server/lib.ts
 const NOT_ACCEPTABLE_BODY = "Not acceptable";
 const DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY = "__fedify_deferred_not_acceptable__";
+const RENDERER_CONTEXT_KEY = "__fedify_nuxt_renderer__";
 //#endregion
 //#region src/runtime/server/logic.ts
 const DUMMY_NOT_FOUND_RESPONSE = new Response("", { status: 404 });
@@ -34,4 +35,4 @@ function resolveDeferredNotAcceptable(isDeferred, frameworkStatus, routeHandled)
 	return createNotAcceptableResponse();
 }
 //#endregion
-export { NOT_ACCEPTABLE_BODY as i, resolveDeferredNotAcceptable as n, DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY as r, fetchWithFedify as t };
+export { RENDERER_CONTEXT_KEY as a, NOT_ACCEPTABLE_BODY as i, resolveDeferredNotAcceptable as n, DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY as r, fetchWithFedify as t };

package/dist/{logic-pxL4Ir1z.cjs → logic-lho7Fe0z.cjs}

@@ -1,6 +1,7 @@
 //#region src/runtime/server/lib.ts
 const NOT_ACCEPTABLE_BODY = "Not acceptable";
 const DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY = "__fedify_deferred_not_acceptable__";
+const RENDERER_CONTEXT_KEY = "__fedify_nuxt_renderer__";
 //#endregion
 //#region src/runtime/server/logic.ts
 const DUMMY_NOT_FOUND_RESPONSE = new Response("", { status: 404 });
@@ -46,6 +47,12 @@ Object.defineProperty(exports, "NOT_ACCEPTABLE_BODY", {
 		return NOT_ACCEPTABLE_BODY;
 	}
 });
+Object.defineProperty(exports, "RENDERER_CONTEXT_KEY", {
+	enumerable: true,
+	get: function() {
+		return RENDERER_CONTEXT_KEY;
+	}
+});
 Object.defineProperty(exports, "fetchWithFedify", {
 	enumerable: true,
 	get: function() {

package/dist/runtime/server/middleware.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_logic = require("../../logic-pxL4Ir1z.cjs");
+const require_logic = require("../../logic-lho7Fe0z.cjs");
 let h3 = require("h3");
 //#region src/runtime/server/middleware.ts
 function assertFederation(federation) {

package/dist/runtime/server/middleware.js

@@ -1,4 +1,4 @@
-import { r as DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY, t as fetchWithFedify } from "../../logic-BIxb97Xx.js";
+import { r as DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY, t as fetchWithFedify } from "../../logic-DeouaBCQ.js";
 import { defineEventHandler, toWebRequest } from "h3";
 //#region src/runtime/server/middleware.ts
 function assertFederation(federation) {

package/dist/runtime/server/plugin.cjs

@@ -1,16 +1,55 @@
-const require_logic = require("../../logic-pxL4Ir1z.cjs");
+const require_logic = require("../../logic-lho7Fe0z.cjs");
 let h3 = require("h3");
 //#region src/runtime/server/plugin.ts
+function shouldConvert(event, status) {
+	return !event.handled && require_logic.resolveDeferredNotAcceptable(event.context["__fedify_deferred_not_acceptable__"] === true, status, event.context.matchedRoute != null && event.context["__fedify_nuxt_renderer__"] !== true) != null;
+}
+function setNotAcceptable(event) {
+	for (const name of [
+		"content-length",
+		"content-encoding",
+		"content-range",
+		"content-digest",
+		"digest",
+		"etag",
+		"last-modified",
+		"content-language",
+		"content-location"
+	]) (0, h3.removeResponseHeader)(event, name);
+	const existing = (0, h3.getResponseHeader)(event, "vary");
+	const vary = Array.isArray(existing) ? existing.join(", ") : String(existing ?? "");
+	if (!vary.split(/,\s*/).some((v) => v === "*" || v.toLowerCase() === "accept")) (0, h3.setResponseHeader)(event, "vary", [vary, "Accept"].filter(Boolean).join(", "));
+	(0, h3.setResponseHeader)(event, "content-type", "text/plain");
+	(0, h3.setResponseStatus)(event, 406, "Not Acceptable");
+}
 const fedifyPlugin = (nitroApp) => {
+	nitroApp.hooks.hook("render:before", ({ event }) => {
+		event.context[require_logic.RENDERER_CONTEXT_KEY] = true;
+	});
+	const options = nitroApp.h3App?.options;
+	if (options != null) {
+		const onError = options.onError;
+		options.onError = async (error, event) => {
+			if (!shouldConvert(event, error.statusCode)) return onError?.call(options, error, event);
+			setNotAcceptable(event);
+			await (0, h3.send)(event, require_logic.NOT_ACCEPTABLE_BODY);
+		};
+	}
 	nitroApp.hooks.hook("beforeResponse", (event, payload) => {
-		const deferred = event.context[require_logic.DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY] === true;
-		delete event.context[require_logic.DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY];
-		const negotiatedResponse = require_logic.resolveDeferredNotAcceptable(deferred, (0, h3.getResponseStatus)(event), event.context.matchedRoute != null);
-		if (negotiatedResponse == null) return;
-		(0, h3.setResponseStatus)(event, negotiatedResponse.status);
-		negotiatedResponse.headers.forEach((value, key) => {
-			(0, h3.setResponseHeader)(event, key, value);
-		});
+		const body = payload.body;
+		if (!shouldConvert(event, body instanceof Response ? body.status : (0, h3.getResponseStatus)(event))) return;
+		if (body instanceof Response) {
+			body.headers.forEach((value, name) => {
+				if (name === "set-cookie") {
+					(0, h3.appendResponseHeader)(event, name, (0, h3.splitCookiesString)(value));
+					return;
+				}
+				if (name === "vary") value = [(0, h3.getResponseHeader)(event, name), value].filter(Boolean).join(", ");
+				(0, h3.setResponseHeader)(event, name, value);
+			});
+			body.body?.cancel().catch(() => {});
+		}
+		setNotAcceptable(event);
 		payload.body = require_logic.NOT_ACCEPTABLE_BODY;
 	});
 };

package/dist/runtime/server/plugin.d.cts

@@ -1,12 +1,16 @@
-import { H3Event } from "h3";
+import { App, H3Event } from "h3";
 
 //#region src/runtime/server/plugin.d.ts
 interface ResponsePayload {
   body?: unknown;
 }
 interface MinimalNitroApp {
+  h3App?: App;
   hooks: {
     hook(name: "beforeResponse", callback: (event: H3Event, payload: ResponsePayload) => void): void;
+    hook(name: "render:before", callback: (context: {
+      event: H3Event;
+    }) => void): void;
   };
 }
 type NitroAppPlugin = (nitroApp: MinimalNitroApp) => void;

package/dist/runtime/server/plugin.d.ts

@@ -1,12 +1,16 @@
-import { H3Event } from "h3";
+import { App, H3Event } from "h3";
 
 //#region src/runtime/server/plugin.d.ts
 interface ResponsePayload {
   body?: unknown;
 }
 interface MinimalNitroApp {
+  h3App?: App;
   hooks: {
     hook(name: "beforeResponse", callback: (event: H3Event, payload: ResponsePayload) => void): void;
+    hook(name: "render:before", callback: (context: {
+      event: H3Event;
+    }) => void): void;
   };
 }
 type NitroAppPlugin = (nitroApp: MinimalNitroApp) => void;

package/dist/runtime/server/plugin.js

@@ -1,16 +1,55 @@
-import { i as NOT_ACCEPTABLE_BODY, n as resolveDeferredNotAcceptable, r as DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY } from "../../logic-BIxb97Xx.js";
-import { getResponseStatus, setResponseHeader, setResponseStatus } from "h3";
+import { a as RENDERER_CONTEXT_KEY, i as NOT_ACCEPTABLE_BODY, n as resolveDeferredNotAcceptable } from "../../logic-DeouaBCQ.js";
+import { appendResponseHeader, getResponseHeader, getResponseStatus, removeResponseHeader, send, setResponseHeader, setResponseStatus, splitCookiesString } from "h3";
 //#region src/runtime/server/plugin.ts
+function shouldConvert(event, status) {
+	return !event.handled && resolveDeferredNotAcceptable(event.context["__fedify_deferred_not_acceptable__"] === true, status, event.context.matchedRoute != null && event.context["__fedify_nuxt_renderer__"] !== true) != null;
+}
+function setNotAcceptable(event) {
+	for (const name of [
+		"content-length",
+		"content-encoding",
+		"content-range",
+		"content-digest",
+		"digest",
+		"etag",
+		"last-modified",
+		"content-language",
+		"content-location"
+	]) removeResponseHeader(event, name);
+	const existing = getResponseHeader(event, "vary");
+	const vary = Array.isArray(existing) ? existing.join(", ") : String(existing ?? "");
+	if (!vary.split(/,\s*/).some((v) => v === "*" || v.toLowerCase() === "accept")) setResponseHeader(event, "vary", [vary, "Accept"].filter(Boolean).join(", "));
+	setResponseHeader(event, "content-type", "text/plain");
+	setResponseStatus(event, 406, "Not Acceptable");
+}
 const fedifyPlugin = (nitroApp) => {
+	nitroApp.hooks.hook("render:before", ({ event }) => {
+		event.context[RENDERER_CONTEXT_KEY] = true;
+	});
+	const options = nitroApp.h3App?.options;
+	if (options != null) {
+		const onError = options.onError;
+		options.onError = async (error, event) => {
+			if (!shouldConvert(event, error.statusCode)) return onError?.call(options, error, event);
+			setNotAcceptable(event);
+			await send(event, NOT_ACCEPTABLE_BODY);
+		};
+	}
 	nitroApp.hooks.hook("beforeResponse", (event, payload) => {
-		const deferred = event.context[DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY] === true;
-		delete event.context[DEFERRED_NOT_ACCEPTABLE_CONTEXT_KEY];
-		const negotiatedResponse = resolveDeferredNotAcceptable(deferred, getResponseStatus(event), event.context.matchedRoute != null);
-		if (negotiatedResponse == null) return;
-		setResponseStatus(event, negotiatedResponse.status);
-		negotiatedResponse.headers.forEach((value, key) => {
-			setResponseHeader(event, key, value);
-		});
+		const body = payload.body;
+		if (!shouldConvert(event, body instanceof Response ? body.status : getResponseStatus(event))) return;
+		if (body instanceof Response) {
+			body.headers.forEach((value, name) => {
+				if (name === "set-cookie") {
+					appendResponseHeader(event, name, splitCookiesString(value));
+					return;
+				}
+				if (name === "vary") value = [getResponseHeader(event, name), value].filter(Boolean).join(", ");
+				setResponseHeader(event, name, value);
+			});
+			body.body?.cancel().catch(() => {});
+		}
+		setNotAcceptable(event);
 		payload.body = NOT_ACCEPTABLE_BODY;
 	});
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/nuxt",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Integrate Fedify with Nuxt",
   "keywords": [
     "Fedify",
@@ -50,7 +50,7 @@
     "@nuxt/schema": "^4.4.2",
     "h3": "^1.15.0",
     "nuxt": "^4.4.2",
-    "@fedify/fedify": "^2.4.2"
+    "@fedify/fedify": "^2.4.3"
   },
   "devDependencies": {
     "@types/node": "^24.12.2",