@fedify/express 2.0.29-dev.2018 → 2.0.29-dev.2046

package/dist/index.cjs

@@ -49,9 +49,29 @@ function fromERequest(req) {
 		method: req.method,
 		headers,
 		duplex: "half",
-		body: req.method === "GET" || req.method === "HEAD" ? void 0 : node_stream.Readable.toWeb(req)
+		body: req.method === "GET" || req.method === "HEAD" ? void 0 : lazyRequestBody(req)
 	});
 }
+/**
+* Wraps the raw `IncomingMessage` in a `ReadableStream` that stays inert until
+* first read.  The `Request` is built before Fedify decides whether it handles
+* the request; an eager `Readable.toWeb()` would start draining the socket and
+* leave the body parsers of the declined requests waiting forever.
+*/
+function lazyRequestBody(message) {
+	let reader;
+	return new ReadableStream({
+		async pull(controller) {
+			reader ??= node_stream.Readable.toWeb(message).getReader();
+			const { done, value } = await reader.read();
+			if (done) controller.close();
+			else controller.enqueue(value);
+		},
+		cancel(reason) {
+			return reader?.cancel(reason);
+		}
+	}, { highWaterMark: 0 });
+}
 function setEResponse(res, response) {
 	res.status(response.status);
 	response.headers.forEach((value, key) => res.setHeader(key, value));

package/dist/index.js

@@ -48,9 +48,29 @@ function fromERequest(req) {
 		method: req.method,
 		headers,
 		duplex: "half",
-		body: req.method === "GET" || req.method === "HEAD" ? void 0 : Readable.toWeb(req)
+		body: req.method === "GET" || req.method === "HEAD" ? void 0 : lazyRequestBody(req)
 	});
 }
+/**
+* Wraps the raw `IncomingMessage` in a `ReadableStream` that stays inert until
+* first read.  The `Request` is built before Fedify decides whether it handles
+* the request; an eager `Readable.toWeb()` would start draining the socket and
+* leave the body parsers of the declined requests waiting forever.
+*/
+function lazyRequestBody(message) {
+	let reader;
+	return new ReadableStream({
+		async pull(controller) {
+			reader ??= Readable.toWeb(message).getReader();
+			const { done, value } = await reader.read();
+			if (done) controller.close();
+			else controller.enqueue(value);
+		},
+		cancel(reason) {
+			return reader?.cancel(reason);
+		}
+	}, { highWaterMark: 0 });
+}
 function setEResponse(res, response) {
 	res.status(response.status);
 	response.headers.forEach((value, key) => res.setHeader(key, value));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/express",
-  "version": "2.0.29-dev.2018+2e67253f",
+  "version": "2.0.29-dev.2046+5211d803",
   "description": "Integrate Fedify with Express",
   "keywords": [
     "Fedify",
@@ -49,7 +49,7 @@
   ],
   "peerDependencies": {
     "express": "^4.0.0",
-    "@fedify/fedify": "^2.0.29-dev.2018+2e67253f"
+    "@fedify/fedify": "^2.0.29-dev.2046+5211d803"
   },
   "devDependencies": {
     "@types/express": "^4.0.0",
@@ -60,6 +60,8 @@
   "scripts": {
     "build:self": "tsdown",
     "build": "pnpm --filter @fedify/express... run build:self",
-    "prepublish": "pnpm build"
+    "prepublish": "pnpm build",
+    "test": "node --experimental-transform-types --test",
+    "test:bun": "bun test"
   }
 }