@fedify/nestjs 2.3.12-dev.2365 → 2.3.13

package/dist/index.cjs

@@ -51,6 +51,7 @@ function integrateFederation(federation, contextDataFactory) {
 				},
 				onNotAcceptable: () => {
 					notAcceptable = true;
+					installNotAcceptableFallback(req, res);
 					next();
 					return new Response("Not acceptable", {
 						status: 406,
@@ -61,7 +62,7 @@ function integrateFederation(federation, contextDataFactory) {
 					});
 				}
 			});
-			if (notFound || notAcceptable && req.route != null) return;
+			if (notFound || notAcceptable) return;
 			await setEResponse(res, response);
 			next();
 		}
@@ -99,6 +100,69 @@ function setEResponse(res, response) {
 		});
 	});
 }
+/**
+* Waits for downstream handling to finish before replacing an unsent 404.
+* A matched route can still fall through, and next() does not wait for an
+* asynchronous handler. Already committed responses belong to the application.
+*/
+function installNotAcceptableFallback(req, res) {
+	const end = res.end;
+	const json = res.json;
+	let pending = true;
+	let defaultNotFound = false;
+	const wrappedJson = function(body) {
+		defaultNotFound = this.statusCode === 404 && isDefaultNotFound(req, body);
+		return json.call(this, body);
+	};
+	res.json = wrappedJson;
+	const wrapEnd = (end) => function(...args) {
+		if (pending) {
+			Object.defineProperty(this, "end", {
+				configurable: true,
+				enumerable: true,
+				writable: true,
+				value: end
+			});
+			if (this.json === wrappedJson) this.json = json;
+		}
+		if (!pending || !defaultNotFound || this.headersSent || this.statusCode !== 404) {
+			pending = false;
+			return end.apply(this, args);
+		}
+		pending = false;
+		const callback = args.find((arg) => typeof arg === "function");
+		const body = "Not acceptable";
+		this.statusCode = 406;
+		this.statusMessage = "Not Acceptable";
+		for (const header of [
+			"Content-Encoding",
+			"Content-Language",
+			"Content-Range",
+			"ETag",
+			"Last-Modified",
+			"Transfer-Encoding"
+		]) this.removeHeader(header);
+		this.setHeader("Content-Type", "text/plain; charset=utf-8");
+		this.setHeader("Content-Length", node_buffer.Buffer.byteLength(body));
+		this.vary("Accept");
+		return end.call(this, req.method === "HEAD" ? void 0 : body, "utf8", callback);
+	};
+	let wrappedEnd = wrapEnd(end);
+	Object.defineProperty(res, "end", {
+		configurable: true,
+		enumerable: true,
+		get: () => wrappedEnd,
+		set: (value) => {
+			wrappedEnd = wrapEnd(value);
+		}
+	});
+}
+/** A custom response copying Nest's exact default 404 is indistinguishable. */
+function isDefaultNotFound(req, body) {
+	if (body == null || typeof body !== "object" || Object.keys(body).length !== 3) return false;
+	const error = body;
+	return error.statusCode === 404 && error.error === "Not Found" && error.message === `Cannot ${req.method} ${req.originalUrl}`;
+}
 //#endregion
 exports.FEDIFY_FEDERATION = FEDIFY_FEDERATION;
 Object.defineProperty(exports, "FedifyModule", {

package/dist/index.mjs

@@ -50,6 +50,7 @@ function integrateFederation(federation, contextDataFactory) {
 				},
 				onNotAcceptable: () => {
 					notAcceptable = true;
+					installNotAcceptableFallback(req, res);
 					next();
 					return new Response("Not acceptable", {
 						status: 406,
@@ -60,7 +61,7 @@ function integrateFederation(federation, contextDataFactory) {
 					});
 				}
 			});
-			if (notFound || notAcceptable && req.route != null) return;
+			if (notFound || notAcceptable) return;
 			await setEResponse(res, response);
 			next();
 		}
@@ -98,5 +99,68 @@ function setEResponse(res, response) {
 		});
 	});
 }
+/**
+* Waits for downstream handling to finish before replacing an unsent 404.
+* A matched route can still fall through, and next() does not wait for an
+* asynchronous handler. Already committed responses belong to the application.
+*/
+function installNotAcceptableFallback(req, res) {
+	const end = res.end;
+	const json = res.json;
+	let pending = true;
+	let defaultNotFound = false;
+	const wrappedJson = function(body) {
+		defaultNotFound = this.statusCode === 404 && isDefaultNotFound(req, body);
+		return json.call(this, body);
+	};
+	res.json = wrappedJson;
+	const wrapEnd = (end) => function(...args) {
+		if (pending) {
+			Object.defineProperty(this, "end", {
+				configurable: true,
+				enumerable: true,
+				writable: true,
+				value: end
+			});
+			if (this.json === wrappedJson) this.json = json;
+		}
+		if (!pending || !defaultNotFound || this.headersSent || this.statusCode !== 404) {
+			pending = false;
+			return end.apply(this, args);
+		}
+		pending = false;
+		const callback = args.find((arg) => typeof arg === "function");
+		const body = "Not acceptable";
+		this.statusCode = 406;
+		this.statusMessage = "Not Acceptable";
+		for (const header of [
+			"Content-Encoding",
+			"Content-Language",
+			"Content-Range",
+			"ETag",
+			"Last-Modified",
+			"Transfer-Encoding"
+		]) this.removeHeader(header);
+		this.setHeader("Content-Type", "text/plain; charset=utf-8");
+		this.setHeader("Content-Length", Buffer.byteLength(body));
+		this.vary("Accept");
+		return end.call(this, req.method === "HEAD" ? void 0 : body, "utf8", callback);
+	};
+	let wrappedEnd = wrapEnd(end);
+	Object.defineProperty(res, "end", {
+		configurable: true,
+		enumerable: true,
+		get: () => wrappedEnd,
+		set: (value) => {
+			wrappedEnd = wrapEnd(value);
+		}
+	});
+}
+/** A custom response copying Nest's exact default 404 is indistinguishable. */
+function isDefaultNotFound(req, body) {
+	if (body == null || typeof body !== "object" || Object.keys(body).length !== 3) return false;
+	const error = body;
+	return error.statusCode === 404 && error.error === "Not Found" && error.message === `Cannot ${req.method} ${req.originalUrl}`;
+}
 //#endregion
 export { FEDIFY_FEDERATION, FedifyModule, integrateFederation };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/nestjs",
-  "version": "2.3.12-dev.2365+89254121",
+  "version": "2.3.13",
   "description": "Integrate Fedify with Nest.js",
   "keywords": [
     "Fedify",
@@ -49,17 +49,23 @@
   "peerDependencies": {
     "@nestjs/common": "^11.0.1",
     "express": "^4.0.0 || ^5.0.0",
-    "@fedify/fedify": "^2.3.12-dev.2365+89254121"
+    "@fedify/fedify": "^2.3.13"
   },
   "devDependencies": {
     "@types/express": "^4.0.0",
     "@types/node": "^22.17.0",
     "tsdown": "^0.22.0",
-    "typescript": "^6.0.0"
+    "typescript": "^6.0.0",
+    "@nestjs/core": "11.1.4",
+    "@nestjs/platform-express": "11.1.4",
+    "reflect-metadata": "^0.2.2",
+    "@fedify/fixture": "2.0.0"
   },
   "scripts": {
     "build:self": "tsdown",
     "build": "pnpm --filter @fedify/nestjs... run build:self",
-    "prepublish": "pnpm build"
+    "prepublish": "pnpm build",
+    "test": "pnpm build:self && node --experimental-transform-types --test",
+    "test:bun": "pnpm build:self && bun test"
   }
 }