npm - @hono/node-server - Versions diffs - 1.17.1 → 1.18.0 - Mend

@hono/node-server 1.17.1 → 1.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

package/dist/globals.d.mts CHANGED Viewed

@@ -1,2 +1,2 @@
-export { }
+export {  }

package/dist/globals.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-export { }
+export {  }

package/dist/index.js CHANGED Viewed

@@ -291,17 +291,14 @@ Object.setPrototypeOf(Response2, GlobalResponse);
 Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
 // src/utils.ts
-function writeFromReadableStream(stream, writable) {
-  if (stream.locked) {
-    throw new TypeError("ReadableStream is locked.");
-  } else if (writable.destroyed) {
-    return;
-  }
-  const reader = stream.getReader();
+async function readWithoutBlocking(readPromise) {
+  return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
+}
+function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
   const handleError = () => {
   };
   writable.on("error", handleError);
-  reader.read().then(flow, handleStreamError);
+  (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
     writable.off("error", handleError);
   });
@@ -327,6 +324,14 @@ function writeFromReadableStream(stream, writable) {
     }
   }
 }
+function writeFromReadableStream(stream, writable) {
+  if (stream.locked) {
+    throw new TypeError("ReadableStream is locked.");
+  } else if (writable.destroyed) {
+    return;
+  }
+  return writeFromReadableStreamDefaultReader(stream.getReader(), writable);
+}
 var buildOutgoingHttpHeaders = (headers) => {
   const res = {};
   if (!(headers instanceof Headers)) {
@@ -368,8 +373,6 @@ global.fetch = (info, init) => {
 // src/listener.ts
 var outgoingEnded = Symbol("outgoingEnded");
-var regBuffer = /^no$/i;
-var regContentType = /^(application\/json\b|text\/(?!event-stream\b))/i;
 var handleRequestError = () => new Response(null, {
   status: 400
 });
@@ -441,23 +444,48 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
   }
   const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
   if (res.body) {
-    const {
-      "transfer-encoding": transferEncoding,
-      "content-encoding": contentEncoding,
-      "content-length": contentLength,
-      "x-accel-buffering": accelBuffering,
-      "content-type": contentType
-    } = resHeaderRecord;
-    if (transferEncoding || contentEncoding || contentLength || // nginx buffering variant
-    accelBuffering && regBuffer.test(accelBuffering) || !regContentType.test(contentType)) {
-      outgoing.writeHead(res.status, resHeaderRecord);
-      flushHeaders(outgoing);
-      await writeFromReadableStream(res.body, outgoing);
+    const reader = res.body.getReader();
+    const values = [];
+    let done = false;
+    let currentReadPromise = void 0;
+    for (let i = 0; i < 2; i++) {
+      currentReadPromise = reader.read();
+      const chunk = await readWithoutBlocking(currentReadPromise).catch((e) => {
+        console.error(e);
+        done = true;
+      });
+      if (!chunk) {
+        if (i === 1 && resHeaderRecord["transfer-encoding"] !== "chunked") {
+          await new Promise((resolve) => setTimeout(resolve));
+          i--;
+          continue;
+        }
+        break;
+      }
+      currentReadPromise = void 0;
+      if (chunk.value) {
+        values.push(chunk.value);
+      }
+      if (chunk.done) {
+        done = true;
+        break;
+      }
+    }
+    if (done && !("content-length" in resHeaderRecord)) {
+      resHeaderRecord["content-length"] = values.reduce((acc, value) => acc + value.length, 0);
+    }
+    outgoing.writeHead(res.status, resHeaderRecord);
+    values.forEach((value) => {
+      ;
+      outgoing.write(value);
+    });
+    if (done) {
+      outgoing.end();
     } else {
-      const buffer = await res.arrayBuffer();
-      resHeaderRecord["content-length"] = buffer.byteLength;
-      outgoing.writeHead(res.status, resHeaderRecord);
-      outgoing.end(new Uint8Array(buffer));
+      if (values.length === 0) {
+        flushHeaders(outgoing);
+      }
+      await writeFromReadableStreamDefaultReader(reader, outgoing, currentReadPromise);
     }
   } else if (resHeaderRecord[X_ALREADY_SENT]) {
   } else {

package/dist/index.mjs CHANGED Viewed

@@ -252,17 +252,14 @@ Object.setPrototypeOf(Response2, GlobalResponse);
 Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
 // src/utils.ts
-function writeFromReadableStream(stream, writable) {
-  if (stream.locked) {
-    throw new TypeError("ReadableStream is locked.");
-  } else if (writable.destroyed) {
-    return;
-  }
-  const reader = stream.getReader();
+async function readWithoutBlocking(readPromise) {
+  return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
+}
+function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
   const handleError = () => {
   };
   writable.on("error", handleError);
-  reader.read().then(flow, handleStreamError);
+  (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
     writable.off("error", handleError);
   });
@@ -288,6 +285,14 @@ function writeFromReadableStream(stream, writable) {
     }
   }
 }
+function writeFromReadableStream(stream, writable) {
+  if (stream.locked) {
+    throw new TypeError("ReadableStream is locked.");
+  } else if (writable.destroyed) {
+    return;
+  }
+  return writeFromReadableStreamDefaultReader(stream.getReader(), writable);
+}
 var buildOutgoingHttpHeaders = (headers) => {
   const res = {};
   if (!(headers instanceof Headers)) {
@@ -329,8 +334,6 @@ global.fetch = (info, init) => {
 // src/listener.ts
 var outgoingEnded = Symbol("outgoingEnded");
-var regBuffer = /^no$/i;
-var regContentType = /^(application\/json\b|text\/(?!event-stream\b))/i;
 var handleRequestError = () => new Response(null, {
   status: 400
 });
@@ -402,23 +405,48 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
   }
   const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
   if (res.body) {
-    const {
-      "transfer-encoding": transferEncoding,
-      "content-encoding": contentEncoding,
-      "content-length": contentLength,
-      "x-accel-buffering": accelBuffering,
-      "content-type": contentType
-    } = resHeaderRecord;
-    if (transferEncoding || contentEncoding || contentLength || // nginx buffering variant
-    accelBuffering && regBuffer.test(accelBuffering) || !regContentType.test(contentType)) {
-      outgoing.writeHead(res.status, resHeaderRecord);
-      flushHeaders(outgoing);
-      await writeFromReadableStream(res.body, outgoing);
+    const reader = res.body.getReader();
+    const values = [];
+    let done = false;
+    let currentReadPromise = void 0;
+    for (let i = 0; i < 2; i++) {
+      currentReadPromise = reader.read();
+      const chunk = await readWithoutBlocking(currentReadPromise).catch((e) => {
+        console.error(e);
+        done = true;
+      });
+      if (!chunk) {
+        if (i === 1 && resHeaderRecord["transfer-encoding"] !== "chunked") {
+          await new Promise((resolve) => setTimeout(resolve));
+          i--;
+          continue;
+        }
+        break;
+      }
+      currentReadPromise = void 0;
+      if (chunk.value) {
+        values.push(chunk.value);
+      }
+      if (chunk.done) {
+        done = true;
+        break;
+      }
+    }
+    if (done && !("content-length" in resHeaderRecord)) {
+      resHeaderRecord["content-length"] = values.reduce((acc, value) => acc + value.length, 0);
+    }
+    outgoing.writeHead(res.status, resHeaderRecord);
+    values.forEach((value) => {
+      ;
+      outgoing.write(value);
+    });
+    if (done) {
+      outgoing.end();
     } else {
-      const buffer = await res.arrayBuffer();
-      resHeaderRecord["content-length"] = buffer.byteLength;
-      outgoing.writeHead(res.status, resHeaderRecord);
-      outgoing.end(new Uint8Array(buffer));
+      if (values.length === 0) {
+        flushHeaders(outgoing);
+      }
+      await writeFromReadableStreamDefaultReader(reader, outgoing, currentReadPromise);
     }
   } else if (resHeaderRecord[X_ALREADY_SENT]) {
   } else {

package/dist/listener.js CHANGED Viewed

@@ -283,17 +283,14 @@ Object.setPrototypeOf(Response2, GlobalResponse);
 Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
 // src/utils.ts
-function writeFromReadableStream(stream, writable) {
-  if (stream.locked) {
-    throw new TypeError("ReadableStream is locked.");
-  } else if (writable.destroyed) {
-    return;
-  }
-  const reader = stream.getReader();
+async function readWithoutBlocking(readPromise) {
+  return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
+}
+function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
   const handleError = () => {
   };
   writable.on("error", handleError);
-  reader.read().then(flow, handleStreamError);
+  (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
     writable.off("error", handleError);
   });
@@ -319,6 +316,14 @@ function writeFromReadableStream(stream, writable) {
     }
   }
 }
+function writeFromReadableStream(stream, writable) {
+  if (stream.locked) {
+    throw new TypeError("ReadableStream is locked.");
+  } else if (writable.destroyed) {
+    return;
+  }
+  return writeFromReadableStreamDefaultReader(stream.getReader(), writable);
+}
 var buildOutgoingHttpHeaders = (headers) => {
   const res = {};
   if (!(headers instanceof Headers)) {
@@ -360,8 +365,6 @@ global.fetch = (info, init) => {
 // src/listener.ts
 var outgoingEnded = Symbol("outgoingEnded");
-var regBuffer = /^no$/i;
-var regContentType = /^(application\/json\b|text\/(?!event-stream\b))/i;
 var handleRequestError = () => new Response(null, {
   status: 400
 });
@@ -433,23 +436,48 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
   }
   const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
   if (res.body) {
-    const {
-      "transfer-encoding": transferEncoding,
-      "content-encoding": contentEncoding,
-      "content-length": contentLength,
-      "x-accel-buffering": accelBuffering,
-      "content-type": contentType
-    } = resHeaderRecord;
-    if (transferEncoding || contentEncoding || contentLength || // nginx buffering variant
-    accelBuffering && regBuffer.test(accelBuffering) || !regContentType.test(contentType)) {
-      outgoing.writeHead(res.status, resHeaderRecord);
-      flushHeaders(outgoing);
-      await writeFromReadableStream(res.body, outgoing);
+    const reader = res.body.getReader();
+    const values = [];
+    let done = false;
+    let currentReadPromise = void 0;
+    for (let i = 0; i < 2; i++) {
+      currentReadPromise = reader.read();
+      const chunk = await readWithoutBlocking(currentReadPromise).catch((e) => {
+        console.error(e);
+        done = true;
+      });
+      if (!chunk) {
+        if (i === 1 && resHeaderRecord["transfer-encoding"] !== "chunked") {
+          await new Promise((resolve) => setTimeout(resolve));
+          i--;
+          continue;
+        }
+        break;
+      }
+      currentReadPromise = void 0;
+      if (chunk.value) {
+        values.push(chunk.value);
+      }
+      if (chunk.done) {
+        done = true;
+        break;
+      }
+    }
+    if (done && !("content-length" in resHeaderRecord)) {
+      resHeaderRecord["content-length"] = values.reduce((acc, value) => acc + value.length, 0);
+    }
+    outgoing.writeHead(res.status, resHeaderRecord);
+    values.forEach((value) => {
+      ;
+      outgoing.write(value);
+    });
+    if (done) {
+      outgoing.end();
     } else {
-      const buffer = await res.arrayBuffer();
-      resHeaderRecord["content-length"] = buffer.byteLength;
-      outgoing.writeHead(res.status, resHeaderRecord);
-      outgoing.end(new Uint8Array(buffer));
+      if (values.length === 0) {
+        flushHeaders(outgoing);
+      }
+      await writeFromReadableStreamDefaultReader(reader, outgoing, currentReadPromise);
     }
   } else if (resHeaderRecord[X_ALREADY_SENT]) {
   } else {

package/dist/listener.mjs CHANGED Viewed

@@ -249,17 +249,14 @@ Object.setPrototypeOf(Response2, GlobalResponse);
 Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
 // src/utils.ts
-function writeFromReadableStream(stream, writable) {
-  if (stream.locked) {
-    throw new TypeError("ReadableStream is locked.");
-  } else if (writable.destroyed) {
-    return;
-  }
-  const reader = stream.getReader();
+async function readWithoutBlocking(readPromise) {
+  return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
+}
+function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
   const handleError = () => {
   };
   writable.on("error", handleError);
-  reader.read().then(flow, handleStreamError);
+  (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
     writable.off("error", handleError);
   });
@@ -285,6 +282,14 @@ function writeFromReadableStream(stream, writable) {
     }
   }
 }
+function writeFromReadableStream(stream, writable) {
+  if (stream.locked) {
+    throw new TypeError("ReadableStream is locked.");
+  } else if (writable.destroyed) {
+    return;
+  }
+  return writeFromReadableStreamDefaultReader(stream.getReader(), writable);
+}
 var buildOutgoingHttpHeaders = (headers) => {
   const res = {};
   if (!(headers instanceof Headers)) {
@@ -326,8 +331,6 @@ global.fetch = (info, init) => {
 // src/listener.ts
 var outgoingEnded = Symbol("outgoingEnded");
-var regBuffer = /^no$/i;
-var regContentType = /^(application\/json\b|text\/(?!event-stream\b))/i;
 var handleRequestError = () => new Response(null, {
   status: 400
 });
@@ -399,23 +402,48 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
   }
   const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
   if (res.body) {
-    const {
-      "transfer-encoding": transferEncoding,
-      "content-encoding": contentEncoding,
-      "content-length": contentLength,
-      "x-accel-buffering": accelBuffering,
-      "content-type": contentType
-    } = resHeaderRecord;
-    if (transferEncoding || contentEncoding || contentLength || // nginx buffering variant
-    accelBuffering && regBuffer.test(accelBuffering) || !regContentType.test(contentType)) {
-      outgoing.writeHead(res.status, resHeaderRecord);
-      flushHeaders(outgoing);
-      await writeFromReadableStream(res.body, outgoing);
+    const reader = res.body.getReader();
+    const values = [];
+    let done = false;
+    let currentReadPromise = void 0;
+    for (let i = 0; i < 2; i++) {
+      currentReadPromise = reader.read();
+      const chunk = await readWithoutBlocking(currentReadPromise).catch((e) => {
+        console.error(e);
+        done = true;
+      });
+      if (!chunk) {
+        if (i === 1 && resHeaderRecord["transfer-encoding"] !== "chunked") {
+          await new Promise((resolve) => setTimeout(resolve));
+          i--;
+          continue;
+        }
+        break;
+      }
+      currentReadPromise = void 0;
+      if (chunk.value) {
+        values.push(chunk.value);
+      }
+      if (chunk.done) {
+        done = true;
+        break;
+      }
+    }
+    if (done && !("content-length" in resHeaderRecord)) {
+      resHeaderRecord["content-length"] = values.reduce((acc, value) => acc + value.length, 0);
+    }
+    outgoing.writeHead(res.status, resHeaderRecord);
+    values.forEach((value) => {
+      ;
+      outgoing.write(value);
+    });
+    if (done) {
+      outgoing.end();
     } else {
-      const buffer = await res.arrayBuffer();
-      resHeaderRecord["content-length"] = buffer.byteLength;
-      outgoing.writeHead(res.status, resHeaderRecord);
-      outgoing.end(new Uint8Array(buffer));
+      if (values.length === 0) {
+        flushHeaders(outgoing);
+      }
+      await writeFromReadableStreamDefaultReader(reader, outgoing, currentReadPromise);
     }
   } else if (resHeaderRecord[X_ALREADY_SENT]) {
   } else {

package/dist/request.d.mts CHANGED Viewed

@@ -22,4 +22,4 @@ declare const abortControllerKey: unique symbol;
 declare const getAbortController: unique symbol;
 declare const newRequest: (incoming: IncomingMessage | Http2ServerRequest, defaultHostname?: string) => any;
-export { GlobalRequest, IncomingMessageWithWrapBodyStream, Request, RequestError, abortControllerKey, getAbortController, newRequest, toRequestError, wrapBodyStream };
+export { GlobalRequest, type IncomingMessageWithWrapBodyStream, Request, RequestError, abortControllerKey, getAbortController, newRequest, toRequestError, wrapBodyStream };

package/dist/request.d.ts CHANGED Viewed

@@ -22,4 +22,4 @@ declare const abortControllerKey: unique symbol;
 declare const getAbortController: unique symbol;
 declare const newRequest: (incoming: IncomingMessage | Http2ServerRequest, defaultHostname?: string) => any;
-export { GlobalRequest, IncomingMessageWithWrapBodyStream, Request, RequestError, abortControllerKey, getAbortController, newRequest, toRequestError, wrapBodyStream };
+export { GlobalRequest, type IncomingMessageWithWrapBodyStream, Request, RequestError, abortControllerKey, getAbortController, newRequest, toRequestError, wrapBodyStream };

package/dist/response.d.mts CHANGED Viewed

@@ -23,4 +23,4 @@ declare class Response {
     get ok(): boolean;
 }
-export { GlobalResponse, InternalCache, Response, cacheKey };
+export { GlobalResponse, type InternalCache, Response, cacheKey };

package/dist/response.d.ts CHANGED Viewed

@@ -23,4 +23,4 @@ declare class Response {
     get ok(): boolean;
 }
-export { GlobalResponse, InternalCache, Response, cacheKey };
+export { GlobalResponse, type InternalCache, Response, cacheKey };

package/dist/serve-static.d.mts CHANGED Viewed

@@ -14,4 +14,4 @@ type ServeStaticOptions<E extends Env = Env> = {
 };
 declare const serveStatic: <E extends Env = any>(options?: ServeStaticOptions<E>) => MiddlewareHandler<E>;
-export { ServeStaticOptions, serveStatic };
+export { type ServeStaticOptions, serveStatic };

package/dist/serve-static.d.ts CHANGED Viewed

@@ -14,4 +14,4 @@ type ServeStaticOptions<E extends Env = Env> = {
 };
 declare const serveStatic: <E extends Env = any>(options?: ServeStaticOptions<E>) => MiddlewareHandler<E>;
-export { ServeStaticOptions, serveStatic };
+export { type ServeStaticOptions, serveStatic };

package/dist/server.js CHANGED Viewed

@@ -287,17 +287,14 @@ Object.setPrototypeOf(Response2, GlobalResponse);
 Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
 // src/utils.ts
-function writeFromReadableStream(stream, writable) {
-  if (stream.locked) {
-    throw new TypeError("ReadableStream is locked.");
-  } else if (writable.destroyed) {
-    return;
-  }
-  const reader = stream.getReader();
+async function readWithoutBlocking(readPromise) {
+  return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
+}
+function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
   const handleError = () => {
   };
   writable.on("error", handleError);
-  reader.read().then(flow, handleStreamError);
+  (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
     writable.off("error", handleError);
   });
@@ -323,6 +320,14 @@ function writeFromReadableStream(stream, writable) {
     }
   }
 }
+function writeFromReadableStream(stream, writable) {
+  if (stream.locked) {
+    throw new TypeError("ReadableStream is locked.");
+  } else if (writable.destroyed) {
+    return;
+  }
+  return writeFromReadableStreamDefaultReader(stream.getReader(), writable);
+}
 var buildOutgoingHttpHeaders = (headers) => {
   const res = {};
   if (!(headers instanceof Headers)) {
@@ -364,8 +369,6 @@ global.fetch = (info, init) => {
 // src/listener.ts
 var outgoingEnded = Symbol("outgoingEnded");
-var regBuffer = /^no$/i;
-var regContentType = /^(application\/json\b|text\/(?!event-stream\b))/i;
 var handleRequestError = () => new Response(null, {
   status: 400
 });
@@ -437,23 +440,48 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
   }
   const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
   if (res.body) {
-    const {
-      "transfer-encoding": transferEncoding,
-      "content-encoding": contentEncoding,
-      "content-length": contentLength,
-      "x-accel-buffering": accelBuffering,
-      "content-type": contentType
-    } = resHeaderRecord;
-    if (transferEncoding || contentEncoding || contentLength || // nginx buffering variant
-    accelBuffering && regBuffer.test(accelBuffering) || !regContentType.test(contentType)) {
-      outgoing.writeHead(res.status, resHeaderRecord);
-      flushHeaders(outgoing);
-      await writeFromReadableStream(res.body, outgoing);
+    const reader = res.body.getReader();
+    const values = [];
+    let done = false;
+    let currentReadPromise = void 0;
+    for (let i = 0; i < 2; i++) {
+      currentReadPromise = reader.read();
+      const chunk = await readWithoutBlocking(currentReadPromise).catch((e) => {
+        console.error(e);
+        done = true;
+      });
+      if (!chunk) {
+        if (i === 1 && resHeaderRecord["transfer-encoding"] !== "chunked") {
+          await new Promise((resolve) => setTimeout(resolve));
+          i--;
+          continue;
+        }
+        break;
+      }
+      currentReadPromise = void 0;
+      if (chunk.value) {
+        values.push(chunk.value);
+      }
+      if (chunk.done) {
+        done = true;
+        break;
+      }
+    }
+    if (done && !("content-length" in resHeaderRecord)) {
+      resHeaderRecord["content-length"] = values.reduce((acc, value) => acc + value.length, 0);
+    }
+    outgoing.writeHead(res.status, resHeaderRecord);
+    values.forEach((value) => {
+      ;
+      outgoing.write(value);
+    });
+    if (done) {
+      outgoing.end();
     } else {
-      const buffer = await res.arrayBuffer();
-      resHeaderRecord["content-length"] = buffer.byteLength;
-      outgoing.writeHead(res.status, resHeaderRecord);
-      outgoing.end(new Uint8Array(buffer));
+      if (values.length === 0) {
+        flushHeaders(outgoing);
+      }
+      await writeFromReadableStreamDefaultReader(reader, outgoing, currentReadPromise);
     }
   } else if (resHeaderRecord[X_ALREADY_SENT]) {
   } else {

package/dist/server.mjs CHANGED Viewed

@@ -252,17 +252,14 @@ Object.setPrototypeOf(Response2, GlobalResponse);
 Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
 // src/utils.ts
-function writeFromReadableStream(stream, writable) {
-  if (stream.locked) {
-    throw new TypeError("ReadableStream is locked.");
-  } else if (writable.destroyed) {
-    return;
-  }
-  const reader = stream.getReader();
+async function readWithoutBlocking(readPromise) {
+  return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
+}
+function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
   const handleError = () => {
   };
   writable.on("error", handleError);
-  reader.read().then(flow, handleStreamError);
+  (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
     writable.off("error", handleError);
   });
@@ -288,6 +285,14 @@ function writeFromReadableStream(stream, writable) {
     }
   }
 }
+function writeFromReadableStream(stream, writable) {
+  if (stream.locked) {
+    throw new TypeError("ReadableStream is locked.");
+  } else if (writable.destroyed) {
+    return;
+  }
+  return writeFromReadableStreamDefaultReader(stream.getReader(), writable);
+}
 var buildOutgoingHttpHeaders = (headers) => {
   const res = {};
   if (!(headers instanceof Headers)) {
@@ -329,8 +334,6 @@ global.fetch = (info, init) => {
 // src/listener.ts
 var outgoingEnded = Symbol("outgoingEnded");
-var regBuffer = /^no$/i;
-var regContentType = /^(application\/json\b|text\/(?!event-stream\b))/i;
 var handleRequestError = () => new Response(null, {
   status: 400
 });
@@ -402,23 +405,48 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
   }
   const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
   if (res.body) {
-    const {
-      "transfer-encoding": transferEncoding,
-      "content-encoding": contentEncoding,
-      "content-length": contentLength,
-      "x-accel-buffering": accelBuffering,
-      "content-type": contentType
-    } = resHeaderRecord;
-    if (transferEncoding || contentEncoding || contentLength || // nginx buffering variant
-    accelBuffering && regBuffer.test(accelBuffering) || !regContentType.test(contentType)) {
-      outgoing.writeHead(res.status, resHeaderRecord);
-      flushHeaders(outgoing);
-      await writeFromReadableStream(res.body, outgoing);
+    const reader = res.body.getReader();
+    const values = [];
+    let done = false;
+    let currentReadPromise = void 0;
+    for (let i = 0; i < 2; i++) {
+      currentReadPromise = reader.read();
+      const chunk = await readWithoutBlocking(currentReadPromise).catch((e) => {
+        console.error(e);
+        done = true;
+      });
+      if (!chunk) {
+        if (i === 1 && resHeaderRecord["transfer-encoding"] !== "chunked") {
+          await new Promise((resolve) => setTimeout(resolve));
+          i--;
+          continue;
+        }
+        break;
+      }
+      currentReadPromise = void 0;
+      if (chunk.value) {
+        values.push(chunk.value);
+      }
+      if (chunk.done) {
+        done = true;
+        break;
+      }
+    }
+    if (done && !("content-length" in resHeaderRecord)) {
+      resHeaderRecord["content-length"] = values.reduce((acc, value) => acc + value.length, 0);
+    }
+    outgoing.writeHead(res.status, resHeaderRecord);
+    values.forEach((value) => {
+      ;
+      outgoing.write(value);
+    });
+    if (done) {
+      outgoing.end();
     } else {
-      const buffer = await res.arrayBuffer();
-      resHeaderRecord["content-length"] = buffer.byteLength;
-      outgoing.writeHead(res.status, resHeaderRecord);
-      outgoing.end(new Uint8Array(buffer));
+      if (values.length === 0) {
+        flushHeaders(outgoing);
+      }
+      await writeFromReadableStreamDefaultReader(reader, outgoing, currentReadPromise);
     }
   } else if (resHeaderRecord[X_ALREADY_SENT]) {
   } else {

package/dist/types.d.mts CHANGED Viewed

@@ -1,5 +1,5 @@
-import { IncomingMessage, ServerResponse, Server, ServerOptions as ServerOptions$1, createServer } from 'node:http';
-import { Http2ServerRequest, Http2ServerResponse, Http2Server, Http2SecureServer, ServerOptions as ServerOptions$3, createServer as createServer$2, SecureServerOptions, createSecureServer } from 'node:http2';
+import { IncomingMessage, ServerResponse, ServerOptions as ServerOptions$1, createServer, Server } from 'node:http';
+import { Http2ServerRequest, Http2ServerResponse, ServerOptions as ServerOptions$3, createServer as createServer$2, SecureServerOptions, createSecureServer, Http2Server, Http2SecureServer } from 'node:http2';
 import { ServerOptions as ServerOptions$2, createServer as createServer$1 } from 'node:https';
 type HttpBindings = {
@@ -41,4 +41,4 @@ type Options = {
 } & ServerOptions;
 type CustomErrorHandler = (err: unknown) => void | Response | Promise<void | Response>;
-export { CustomErrorHandler, FetchCallback, Http2Bindings, HttpBindings, NextHandlerOption, Options, ServerOptions, ServerType };
+export type { CustomErrorHandler, FetchCallback, Http2Bindings, HttpBindings, NextHandlerOption, Options, ServerOptions, ServerType };

package/dist/types.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import { IncomingMessage, ServerResponse, Server, ServerOptions as ServerOptions$1, createServer } from 'node:http';
-import { Http2ServerRequest, Http2ServerResponse, Http2Server, Http2SecureServer, ServerOptions as ServerOptions$3, createServer as createServer$2, SecureServerOptions, createSecureServer } from 'node:http2';
+import { IncomingMessage, ServerResponse, ServerOptions as ServerOptions$1, createServer, Server } from 'node:http';
+import { Http2ServerRequest, Http2ServerResponse, ServerOptions as ServerOptions$3, createServer as createServer$2, SecureServerOptions, createSecureServer, Http2Server, Http2SecureServer } from 'node:http2';
 import { ServerOptions as ServerOptions$2, createServer as createServer$1 } from 'node:https';
 type HttpBindings = {
@@ -41,4 +41,4 @@ type Options = {
 } & ServerOptions;
 type CustomErrorHandler = (err: unknown) => void | Response | Promise<void | Response>;
-export { CustomErrorHandler, FetchCallback, Http2Bindings, HttpBindings, NextHandlerOption, Options, ServerOptions, ServerType };
+export type { CustomErrorHandler, FetchCallback, Http2Bindings, HttpBindings, NextHandlerOption, Options, ServerOptions, ServerType };

package/dist/utils.d.mts CHANGED Viewed

@@ -1,7 +1,9 @@
 import { OutgoingHttpHeaders } from 'node:http';
 import { Writable } from 'node:stream';
-declare function writeFromReadableStream(stream: ReadableStream<Uint8Array>, writable: Writable): Promise<void> | undefined;
+declare function readWithoutBlocking(readPromise: Promise<ReadableStreamReadResult<Uint8Array>>): Promise<ReadableStreamReadResult<Uint8Array> | undefined>;
+declare function writeFromReadableStreamDefaultReader(reader: ReadableStreamDefaultReader<Uint8Array>, writable: Writable, currentReadPromise?: Promise<ReadableStreamReadResult<Uint8Array>> | undefined): Promise<undefined>;
+declare function writeFromReadableStream(stream: ReadableStream<Uint8Array>, writable: Writable): Promise<undefined> | undefined;
 declare const buildOutgoingHttpHeaders: (headers: Headers | HeadersInit | null | undefined) => OutgoingHttpHeaders;
-export { buildOutgoingHttpHeaders, writeFromReadableStream };
+export { buildOutgoingHttpHeaders, readWithoutBlocking, writeFromReadableStream, writeFromReadableStreamDefaultReader };

package/dist/utils.d.ts CHANGED Viewed

@@ -1,7 +1,9 @@
 import { OutgoingHttpHeaders } from 'node:http';
 import { Writable } from 'node:stream';
-declare function writeFromReadableStream(stream: ReadableStream<Uint8Array>, writable: Writable): Promise<void> | undefined;
+declare function readWithoutBlocking(readPromise: Promise<ReadableStreamReadResult<Uint8Array>>): Promise<ReadableStreamReadResult<Uint8Array> | undefined>;
+declare function writeFromReadableStreamDefaultReader(reader: ReadableStreamDefaultReader<Uint8Array>, writable: Writable, currentReadPromise?: Promise<ReadableStreamReadResult<Uint8Array>> | undefined): Promise<undefined>;
+declare function writeFromReadableStream(stream: ReadableStream<Uint8Array>, writable: Writable): Promise<undefined> | undefined;
 declare const buildOutgoingHttpHeaders: (headers: Headers | HeadersInit | null | undefined) => OutgoingHttpHeaders;
-export { buildOutgoingHttpHeaders, writeFromReadableStream };
+export { buildOutgoingHttpHeaders, readWithoutBlocking, writeFromReadableStream, writeFromReadableStreamDefaultReader };

package/dist/utils.js CHANGED Viewed

@@ -21,20 +21,19 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   buildOutgoingHttpHeaders: () => buildOutgoingHttpHeaders,
-  writeFromReadableStream: () => writeFromReadableStream
+  readWithoutBlocking: () => readWithoutBlocking,
+  writeFromReadableStream: () => writeFromReadableStream,
+  writeFromReadableStreamDefaultReader: () => writeFromReadableStreamDefaultReader
 });
 module.exports = __toCommonJS(utils_exports);
-function writeFromReadableStream(stream, writable) {
-  if (stream.locked) {
-    throw new TypeError("ReadableStream is locked.");
-  } else if (writable.destroyed) {
-    return;
-  }
-  const reader = stream.getReader();
+async function readWithoutBlocking(readPromise) {
+  return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
+}
+function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
   const handleError = () => {
   };
   writable.on("error", handleError);
-  reader.read().then(flow, handleStreamError);
+  (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
     writable.off("error", handleError);
   });
@@ -60,6 +59,14 @@ function writeFromReadableStream(stream, writable) {
     }
   }
 }
+function writeFromReadableStream(stream, writable) {
+  if (stream.locked) {
+    throw new TypeError("ReadableStream is locked.");
+  } else if (writable.destroyed) {
+    return;
+  }
+  return writeFromReadableStreamDefaultReader(stream.getReader(), writable);
+}
 var buildOutgoingHttpHeaders = (headers) => {
   const res = {};
   if (!(headers instanceof Headers)) {
@@ -82,5 +89,7 @@ var buildOutgoingHttpHeaders = (headers) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildOutgoingHttpHeaders,
-  writeFromReadableStream
+  readWithoutBlocking,
+  writeFromReadableStream,
+  writeFromReadableStreamDefaultReader
 });

package/dist/utils.mjs CHANGED Viewed

@@ -1,15 +1,12 @@
 // src/utils.ts
-function writeFromReadableStream(stream, writable) {
-  if (stream.locked) {
-    throw new TypeError("ReadableStream is locked.");
-  } else if (writable.destroyed) {
-    return;
-  }
-  const reader = stream.getReader();
+async function readWithoutBlocking(readPromise) {
+  return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
+}
+function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
   const handleError = () => {
   };
   writable.on("error", handleError);
-  reader.read().then(flow, handleStreamError);
+  (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
     writable.off("error", handleError);
   });
@@ -35,6 +32,14 @@ function writeFromReadableStream(stream, writable) {
     }
   }
 }
+function writeFromReadableStream(stream, writable) {
+  if (stream.locked) {
+    throw new TypeError("ReadableStream is locked.");
+  } else if (writable.destroyed) {
+    return;
+  }
+  return writeFromReadableStreamDefaultReader(stream.getReader(), writable);
+}
 var buildOutgoingHttpHeaders = (headers) => {
   const res = {};
   if (!(headers instanceof Headers)) {
@@ -56,5 +61,7 @@ var buildOutgoingHttpHeaders = (headers) => {
 };
 export {
   buildOutgoingHttpHeaders,
-  writeFromReadableStream
+  readWithoutBlocking,
+  writeFromReadableStream,
+  writeFromReadableStreamDefaultReader
 };

package/dist/vercel.js CHANGED Viewed

@@ -285,17 +285,14 @@ Object.setPrototypeOf(Response2, GlobalResponse);
 Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
 // src/utils.ts
-function writeFromReadableStream(stream, writable) {
-  if (stream.locked) {
-    throw new TypeError("ReadableStream is locked.");
-  } else if (writable.destroyed) {
-    return;
-  }
-  const reader = stream.getReader();
+async function readWithoutBlocking(readPromise) {
+  return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
+}
+function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
   const handleError = () => {
   };
   writable.on("error", handleError);
-  reader.read().then(flow, handleStreamError);
+  (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
     writable.off("error", handleError);
   });
@@ -321,6 +318,14 @@ function writeFromReadableStream(stream, writable) {
     }
   }
 }
+function writeFromReadableStream(stream, writable) {
+  if (stream.locked) {
+    throw new TypeError("ReadableStream is locked.");
+  } else if (writable.destroyed) {
+    return;
+  }
+  return writeFromReadableStreamDefaultReader(stream.getReader(), writable);
+}
 var buildOutgoingHttpHeaders = (headers) => {
   const res = {};
   if (!(headers instanceof Headers)) {
@@ -362,8 +367,6 @@ global.fetch = (info, init) => {
 // src/listener.ts
 var outgoingEnded = Symbol("outgoingEnded");
-var regBuffer = /^no$/i;
-var regContentType = /^(application\/json\b|text\/(?!event-stream\b))/i;
 var handleRequestError = () => new Response(null, {
   status: 400
 });
@@ -435,23 +438,48 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
   }
   const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
   if (res.body) {
-    const {
-      "transfer-encoding": transferEncoding,
-      "content-encoding": contentEncoding,
-      "content-length": contentLength,
-      "x-accel-buffering": accelBuffering,
-      "content-type": contentType
-    } = resHeaderRecord;
-    if (transferEncoding || contentEncoding || contentLength || // nginx buffering variant
-    accelBuffering && regBuffer.test(accelBuffering) || !regContentType.test(contentType)) {
-      outgoing.writeHead(res.status, resHeaderRecord);
-      flushHeaders(outgoing);
-      await writeFromReadableStream(res.body, outgoing);
+    const reader = res.body.getReader();
+    const values = [];
+    let done = false;
+    let currentReadPromise = void 0;
+    for (let i = 0; i < 2; i++) {
+      currentReadPromise = reader.read();
+      const chunk = await readWithoutBlocking(currentReadPromise).catch((e) => {
+        console.error(e);
+        done = true;
+      });
+      if (!chunk) {
+        if (i === 1 && resHeaderRecord["transfer-encoding"] !== "chunked") {
+          await new Promise((resolve) => setTimeout(resolve));
+          i--;
+          continue;
+        }
+        break;
+      }
+      currentReadPromise = void 0;
+      if (chunk.value) {
+        values.push(chunk.value);
+      }
+      if (chunk.done) {
+        done = true;
+        break;
+      }
+    }
+    if (done && !("content-length" in resHeaderRecord)) {
+      resHeaderRecord["content-length"] = values.reduce((acc, value) => acc + value.length, 0);
+    }
+    outgoing.writeHead(res.status, resHeaderRecord);
+    values.forEach((value) => {
+      ;
+      outgoing.write(value);
+    });
+    if (done) {
+      outgoing.end();
     } else {
-      const buffer = await res.arrayBuffer();
-      resHeaderRecord["content-length"] = buffer.byteLength;
-      outgoing.writeHead(res.status, resHeaderRecord);
-      outgoing.end(new Uint8Array(buffer));
+      if (values.length === 0) {
+        flushHeaders(outgoing);
+      }
+      await writeFromReadableStreamDefaultReader(reader, outgoing, currentReadPromise);
     }
   } else if (resHeaderRecord[X_ALREADY_SENT]) {
   } else {

package/dist/vercel.mjs CHANGED Viewed

@@ -249,17 +249,14 @@ Object.setPrototypeOf(Response2, GlobalResponse);
 Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
 // src/utils.ts
-function writeFromReadableStream(stream, writable) {
-  if (stream.locked) {
-    throw new TypeError("ReadableStream is locked.");
-  } else if (writable.destroyed) {
-    return;
-  }
-  const reader = stream.getReader();
+async function readWithoutBlocking(readPromise) {
+  return Promise.race([readPromise, Promise.resolve().then(() => Promise.resolve(void 0))]);
+}
+function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromise) {
   const handleError = () => {
   };
   writable.on("error", handleError);
-  reader.read().then(flow, handleStreamError);
+  (currentReadPromise ?? reader.read()).then(flow, handleStreamError);
   return reader.closed.finally(() => {
     writable.off("error", handleError);
   });
@@ -285,6 +282,14 @@ function writeFromReadableStream(stream, writable) {
     }
   }
 }
+function writeFromReadableStream(stream, writable) {
+  if (stream.locked) {
+    throw new TypeError("ReadableStream is locked.");
+  } else if (writable.destroyed) {
+    return;
+  }
+  return writeFromReadableStreamDefaultReader(stream.getReader(), writable);
+}
 var buildOutgoingHttpHeaders = (headers) => {
   const res = {};
   if (!(headers instanceof Headers)) {
@@ -326,8 +331,6 @@ global.fetch = (info, init) => {
 // src/listener.ts
 var outgoingEnded = Symbol("outgoingEnded");
-var regBuffer = /^no$/i;
-var regContentType = /^(application\/json\b|text\/(?!event-stream\b))/i;
 var handleRequestError = () => new Response(null, {
   status: 400
 });
@@ -399,23 +402,48 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
   }
   const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
   if (res.body) {
-    const {
-      "transfer-encoding": transferEncoding,
-      "content-encoding": contentEncoding,
-      "content-length": contentLength,
-      "x-accel-buffering": accelBuffering,
-      "content-type": contentType
-    } = resHeaderRecord;
-    if (transferEncoding || contentEncoding || contentLength || // nginx buffering variant
-    accelBuffering && regBuffer.test(accelBuffering) || !regContentType.test(contentType)) {
-      outgoing.writeHead(res.status, resHeaderRecord);
-      flushHeaders(outgoing);
-      await writeFromReadableStream(res.body, outgoing);
+    const reader = res.body.getReader();
+    const values = [];
+    let done = false;
+    let currentReadPromise = void 0;
+    for (let i = 0; i < 2; i++) {
+      currentReadPromise = reader.read();
+      const chunk = await readWithoutBlocking(currentReadPromise).catch((e) => {
+        console.error(e);
+        done = true;
+      });
+      if (!chunk) {
+        if (i === 1 && resHeaderRecord["transfer-encoding"] !== "chunked") {
+          await new Promise((resolve) => setTimeout(resolve));
+          i--;
+          continue;
+        }
+        break;
+      }
+      currentReadPromise = void 0;
+      if (chunk.value) {
+        values.push(chunk.value);
+      }
+      if (chunk.done) {
+        done = true;
+        break;
+      }
+    }
+    if (done && !("content-length" in resHeaderRecord)) {
+      resHeaderRecord["content-length"] = values.reduce((acc, value) => acc + value.length, 0);
+    }
+    outgoing.writeHead(res.status, resHeaderRecord);
+    values.forEach((value) => {
+      ;
+      outgoing.write(value);
+    });
+    if (done) {
+      outgoing.end();
     } else {
-      const buffer = await res.arrayBuffer();
-      resHeaderRecord["content-length"] = buffer.byteLength;
-      outgoing.writeHead(res.status, resHeaderRecord);
-      outgoing.end(new Uint8Array(buffer));
+      if (values.length === 0) {
+        flushHeaders(outgoing);
+      }
+      await writeFromReadableStreamDefaultReader(reader, outgoing, currentReadPromise);
     }
   } else if (resHeaderRecord[X_ALREADY_SENT]) {
   } else {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@hono/node-server",
-  "version": "1.17.1",
+  "version": "1.18.0",
   "description": "Node.js Adapter for Hono",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",