@standardserver/node 0.0.10 → 0.0.11

package/dist/index.mjs

@@ -20,80 +20,83 @@ async function toStandardBody(req, options = {}) {
   const hint = flattenStandardHeader(req.headers["standard-server"]) ?? options?.hint;
   const contentType = req.headers["content-type"];
   const mimeType = contentType?.split(";")[0]?.trim();
-  const contentDisposition = req.headers["content-disposition"];
   const contentLength = req.headers["content-length"];
-  if (hint === "none") {
+  if (req.body !== void 0) {
+    return req.body;
+  }
+  if (hint === "none" || hint === void 0 && mimeType === void 0 && (contentLength === "0" || contentLength === void 0)) {
     return void 0;
   }
   if (hint === void 0 && EMPTY_BODY_METHOD_SET.has(toStandardMethod(req.method))) {
     return void 0;
   }
-  if (req.body !== void 0) {
-    return req.body;
-  }
   if (!req.readable) {
     throw new TypeError("Failed to read body: body stream already read or destroyed");
   }
-  if (hint === "json" || hint === void 0 && contentDisposition === void 0 && mimeType === "application/json") {
+  if (hint === "json" || hint === void 0 && mimeType === "application/json") {
     const text = await _streamToString(req);
     return parseEmptyableJSON(text);
   }
-  if (hint === "form-data" || hint === void 0 && contentDisposition === void 0 && mimeType === "multipart/form-data") {
+  if (hint === "form-data" || hint === void 0 && mimeType === "multipart/form-data") {
     return _streamToFormData(req, contentType);
   }
-  if (hint === "url-search-params" || hint === void 0 && contentDisposition === void 0 && mimeType === "application/x-www-form-urlencoded") {
+  if (hint === "url-search-params" || hint === void 0 && mimeType === "application/x-www-form-urlencoded") {
     const text = await _streamToString(req);
     return new URLSearchParams(text);
   }
-  if (hint === "event-stream" || hint === void 0 && contentDisposition === void 0 && mimeType === "text/event-stream") {
+  if (hint === "event-stream" || hint === void 0 && mimeType === "text/event-stream") {
     return toEventIterator(req);
   }
-  if (hint === "file" || hint === void 0 && (contentDisposition !== void 0 || contentLength !== void 0)) {
+  if (hint === "file" || hint === void 0 && contentLength !== void 0) {
+    const contentDisposition = req.headers["content-disposition"];
     const fileName = contentDisposition !== void 0 ? getFilenameFromContentDisposition(contentDisposition) : void 0;
     return _streamToFile(req, fileName ?? "blob", contentType ?? "");
   }
   return Readable.toWeb(req);
 }
 async function toNodeHttpBody(body, headers, options = {}) {
-  headers = { ...headers };
+  const originalContentType = headers["content-type"];
+  const originalContentLength = headers["content-length"];
+  headers = {
+    ...headers,
+    "standard-server": void 0,
+    "content-type": void 0,
+    "content-length": void 0
+  };
   if (body === void 0) {
-    headers["standard-server"] = "none";
     return [void 0, headers];
   }
   if (body instanceof ReadableStream) {
     headers["standard-server"] = "octet-stream";
-    headers["content-type"] ??= "application/octet-stream";
+    headers["content-type"] = originalContentType ?? "application/octet-stream";
+    headers["content-length"] = originalContentLength;
     return [Readable.fromWeb(body), headers];
   }
   if (body instanceof Blob) {
     headers["standard-server"] = "file";
-    headers["content-type"] ??= body.type;
+    headers["content-type"] = body.type;
     headers["content-disposition"] ??= generateContentDisposition(body instanceof File ? body.name : "blob");
     if (!Number.isNaN(body.size)) {
-      headers["content-length"] ??= body.size.toString();
+      headers["content-length"] = body.size.toString();
     }
     return [Readable.fromWeb(body.stream()), headers];
   }
   if (body instanceof FormData) {
     const response = new Response(body);
     const blob = await response.blob();
-    headers["standard-server"] = "form-data";
-    headers["content-type"] ??= blob.type;
-    headers["content-length"] ??= blob.size.toString();
+    headers["content-type"] = blob.type;
+    headers["content-length"] = blob.size.toString();
     return [Readable.fromWeb(blob.stream()), headers];
   }
   if (body instanceof URLSearchParams) {
-    headers["standard-server"] = "url-search-params";
-    headers["content-type"] ??= "application/x-www-form-urlencoded";
+    headers["content-type"] = "application/x-www-form-urlencoded";
     return [body.toString(), headers];
   }
   if (isAsyncIteratorObject(body)) {
-    headers["standard-server"] = "event-stream";
-    headers["content-type"] ??= "text/event-stream";
+    headers["content-type"] = "text/event-stream";
     return [toEventStream(body, options.eventStream), headers];
   }
-  headers["standard-server"] = "json";
-  headers["content-type"] ??= "application/json";
+  headers["content-type"] = "application/json";
   return [stringifyJSON(body), headers];
 }
 function _streamToFormData(stream, contentType) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@standardserver/node",
   "type": "module",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "license": "MIT",
   "homepage": "https://standardserver.dev",
   "repository": {
@@ -20,9 +20,9 @@
     "dist"
   ],
   "dependencies": {
-    "@standardserver/core": "0.0.10",
-    "@standardserver/fetch": "0.0.10",
-    "@standardserver/shared": "0.0.10"
+    "@standardserver/core": "0.0.11",
+    "@standardserver/shared": "0.0.11",
+    "@standardserver/fetch": "0.0.11"
   },
   "devDependencies": {
     "@types/node": "^25.0.3",