@hono/node-server 1.13.7 → 1.14.0

package/dist/index.js

@@ -94,7 +94,16 @@ var newRequestFromIncoming = (method, url, incoming, abortController) => {
     return req;
   }
   if (!(method === "GET" || method === "HEAD")) {
-    init.body = import_node_stream.Readable.toWeb(incoming);
+    if ("rawBody" in incoming && incoming.rawBody instanceof Buffer) {
+      init.body = new ReadableStream({
+        start(controller) {
+          controller.enqueue(incoming.rawBody);
+          controller.close();
+        }
+      });
+    } else {
+      init.body = import_node_stream.Readable.toWeb(incoming);
+    }
   }
   return new Request(url, init);
 };
@@ -157,13 +166,34 @@ Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming, defaultHostname) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
+  const incomingUrl = incoming.url || "";
+  if (incomingUrl[0] !== "/" && // short-circuit for performance. most requests are relative URL.
+  (incomingUrl.startsWith("http://") || incomingUrl.startsWith("https://"))) {
+    if (incoming instanceof import_node_http2.Http2ServerRequest) {
+      throw new RequestError("Absolute URL for :path is not allowed in HTTP/2");
+    }
+    try {
+      const url2 = new URL(incomingUrl);
+      req[urlKey] = url2.href;
+    } catch (e) {
+      throw new RequestError("Invalid absolute URL", { cause: e });
+    }
+    return req;
+  }
   const host = (incoming instanceof import_node_http2.Http2ServerRequest ? incoming.authority : incoming.headers.host) || defaultHostname;
   if (!host) {
     throw new RequestError("Missing host header");
   }
-  const url = new URL(
-    `${incoming instanceof import_node_http2.Http2ServerRequest || incoming.socket && incoming.socket.encrypted ? "https" : "http"}://${host}${incoming.url}`
-  );
+  let scheme;
+  if (incoming instanceof import_node_http2.Http2ServerRequest) {
+    scheme = incoming.scheme;
+    if (!(scheme === "http" || scheme === "https")) {
+      throw new RequestError("Unsupported scheme");
+    }
+  } else {
+    scheme = incoming.socket && incoming.socket.encrypted ? "https" : "http";
+  }
+  const url = new URL(`${scheme}://${host}${incomingUrl}`);
   if (url.hostname.length !== host.length && url.hostname !== host.replace(/:\d+$/, "")) {
     throw new RequestError("Invalid host header");
   }
@@ -442,10 +472,14 @@ var getRequestListener = (fetchCallback, options = {}) => {
     try {
       req = newRequest(incoming, options.hostname);
       outgoing.on("close", () => {
+        const abortController = req[abortControllerKey];
+        if (!abortController) {
+          return;
+        }
         if (incoming.errored) {
-          req[getAbortController]().abort(incoming.errored.toString());
+          req[abortControllerKey].abort(incoming.errored.toString());
         } else if (!outgoing.writableFinished) {
-          req[getAbortController]().abort("Client connection prematurely closed.");
+          req[abortControllerKey].abort("Client connection prematurely closed.");
         }
       });
       res = fetchCallback(req, { incoming, outgoing });

package/dist/index.mjs

@@ -55,7 +55,16 @@ var newRequestFromIncoming = (method, url, incoming, abortController) => {
     return req;
   }
   if (!(method === "GET" || method === "HEAD")) {
-    init.body = Readable.toWeb(incoming);
+    if ("rawBody" in incoming && incoming.rawBody instanceof Buffer) {
+      init.body = new ReadableStream({
+        start(controller) {
+          controller.enqueue(incoming.rawBody);
+          controller.close();
+        }
+      });
+    } else {
+      init.body = Readable.toWeb(incoming);
+    }
   }
   return new Request(url, init);
 };
@@ -118,13 +127,34 @@ Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming, defaultHostname) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
+  const incomingUrl = incoming.url || "";
+  if (incomingUrl[0] !== "/" && // short-circuit for performance. most requests are relative URL.
+  (incomingUrl.startsWith("http://") || incomingUrl.startsWith("https://"))) {
+    if (incoming instanceof Http2ServerRequest) {
+      throw new RequestError("Absolute URL for :path is not allowed in HTTP/2");
+    }
+    try {
+      const url2 = new URL(incomingUrl);
+      req[urlKey] = url2.href;
+    } catch (e) {
+      throw new RequestError("Invalid absolute URL", { cause: e });
+    }
+    return req;
+  }
   const host = (incoming instanceof Http2ServerRequest ? incoming.authority : incoming.headers.host) || defaultHostname;
   if (!host) {
     throw new RequestError("Missing host header");
   }
-  const url = new URL(
-    `${incoming instanceof Http2ServerRequest || incoming.socket && incoming.socket.encrypted ? "https" : "http"}://${host}${incoming.url}`
-  );
+  let scheme;
+  if (incoming instanceof Http2ServerRequest) {
+    scheme = incoming.scheme;
+    if (!(scheme === "http" || scheme === "https")) {
+      throw new RequestError("Unsupported scheme");
+    }
+  } else {
+    scheme = incoming.socket && incoming.socket.encrypted ? "https" : "http";
+  }
+  const url = new URL(`${scheme}://${host}${incomingUrl}`);
   if (url.hostname.length !== host.length && url.hostname !== host.replace(/:\d+$/, "")) {
     throw new RequestError("Invalid host header");
   }
@@ -403,10 +433,14 @@ var getRequestListener = (fetchCallback, options = {}) => {
     try {
       req = newRequest(incoming, options.hostname);
       outgoing.on("close", () => {
+        const abortController = req[abortControllerKey];
+        if (!abortController) {
+          return;
+        }
         if (incoming.errored) {
-          req[getAbortController]().abort(incoming.errored.toString());
+          req[abortControllerKey].abort(incoming.errored.toString());
         } else if (!outgoing.writableFinished) {
-          req[getAbortController]().abort("Client connection prematurely closed.");
+          req[abortControllerKey].abort("Client connection prematurely closed.");
         }
       });
       res = fetchCallback(req, { incoming, outgoing });

package/dist/listener.js

@@ -88,7 +88,16 @@ var newRequestFromIncoming = (method, url, incoming, abortController) => {
     return req;
   }
   if (!(method === "GET" || method === "HEAD")) {
-    init.body = import_node_stream.Readable.toWeb(incoming);
+    if ("rawBody" in incoming && incoming.rawBody instanceof Buffer) {
+      init.body = new ReadableStream({
+        start(controller) {
+          controller.enqueue(incoming.rawBody);
+          controller.close();
+        }
+      });
+    } else {
+      init.body = import_node_stream.Readable.toWeb(incoming);
+    }
   }
   return new Request(url, init);
 };
@@ -151,13 +160,34 @@ Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming, defaultHostname) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
+  const incomingUrl = incoming.url || "";
+  if (incomingUrl[0] !== "/" && // short-circuit for performance. most requests are relative URL.
+  (incomingUrl.startsWith("http://") || incomingUrl.startsWith("https://"))) {
+    if (incoming instanceof import_node_http2.Http2ServerRequest) {
+      throw new RequestError("Absolute URL for :path is not allowed in HTTP/2");
+    }
+    try {
+      const url2 = new URL(incomingUrl);
+      req[urlKey] = url2.href;
+    } catch (e) {
+      throw new RequestError("Invalid absolute URL", { cause: e });
+    }
+    return req;
+  }
   const host = (incoming instanceof import_node_http2.Http2ServerRequest ? incoming.authority : incoming.headers.host) || defaultHostname;
   if (!host) {
     throw new RequestError("Missing host header");
   }
-  const url = new URL(
-    `${incoming instanceof import_node_http2.Http2ServerRequest || incoming.socket && incoming.socket.encrypted ? "https" : "http"}://${host}${incoming.url}`
-  );
+  let scheme;
+  if (incoming instanceof import_node_http2.Http2ServerRequest) {
+    scheme = incoming.scheme;
+    if (!(scheme === "http" || scheme === "https")) {
+      throw new RequestError("Unsupported scheme");
+    }
+  } else {
+    scheme = incoming.socket && incoming.socket.encrypted ? "https" : "http";
+  }
+  const url = new URL(`${scheme}://${host}${incomingUrl}`);
   if (url.hostname.length !== host.length && url.hostname !== host.replace(/:\d+$/, "")) {
     throw new RequestError("Invalid host header");
   }
@@ -436,10 +466,14 @@ var getRequestListener = (fetchCallback, options = {}) => {
     try {
       req = newRequest(incoming, options.hostname);
       outgoing.on("close", () => {
+        const abortController = req[abortControllerKey];
+        if (!abortController) {
+          return;
+        }
         if (incoming.errored) {
-          req[getAbortController]().abort(incoming.errored.toString());
+          req[abortControllerKey].abort(incoming.errored.toString());
         } else if (!outgoing.writableFinished) {
-          req[getAbortController]().abort("Client connection prematurely closed.");
+          req[abortControllerKey].abort("Client connection prematurely closed.");
         }
       });
       res = fetchCallback(req, { incoming, outgoing });

package/dist/listener.mjs

@@ -52,7 +52,16 @@ var newRequestFromIncoming = (method, url, incoming, abortController) => {
     return req;
   }
   if (!(method === "GET" || method === "HEAD")) {
-    init.body = Readable.toWeb(incoming);
+    if ("rawBody" in incoming && incoming.rawBody instanceof Buffer) {
+      init.body = new ReadableStream({
+        start(controller) {
+          controller.enqueue(incoming.rawBody);
+          controller.close();
+        }
+      });
+    } else {
+      init.body = Readable.toWeb(incoming);
+    }
   }
   return new Request(url, init);
 };
@@ -115,13 +124,34 @@ Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming, defaultHostname) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
+  const incomingUrl = incoming.url || "";
+  if (incomingUrl[0] !== "/" && // short-circuit for performance. most requests are relative URL.
+  (incomingUrl.startsWith("http://") || incomingUrl.startsWith("https://"))) {
+    if (incoming instanceof Http2ServerRequest) {
+      throw new RequestError("Absolute URL for :path is not allowed in HTTP/2");
+    }
+    try {
+      const url2 = new URL(incomingUrl);
+      req[urlKey] = url2.href;
+    } catch (e) {
+      throw new RequestError("Invalid absolute URL", { cause: e });
+    }
+    return req;
+  }
   const host = (incoming instanceof Http2ServerRequest ? incoming.authority : incoming.headers.host) || defaultHostname;
   if (!host) {
     throw new RequestError("Missing host header");
   }
-  const url = new URL(
-    `${incoming instanceof Http2ServerRequest || incoming.socket && incoming.socket.encrypted ? "https" : "http"}://${host}${incoming.url}`
-  );
+  let scheme;
+  if (incoming instanceof Http2ServerRequest) {
+    scheme = incoming.scheme;
+    if (!(scheme === "http" || scheme === "https")) {
+      throw new RequestError("Unsupported scheme");
+    }
+  } else {
+    scheme = incoming.socket && incoming.socket.encrypted ? "https" : "http";
+  }
+  const url = new URL(`${scheme}://${host}${incomingUrl}`);
   if (url.hostname.length !== host.length && url.hostname !== host.replace(/:\d+$/, "")) {
     throw new RequestError("Invalid host header");
   }
@@ -400,10 +430,14 @@ var getRequestListener = (fetchCallback, options = {}) => {
     try {
       req = newRequest(incoming, options.hostname);
       outgoing.on("close", () => {
+        const abortController = req[abortControllerKey];
+        if (!abortController) {
+          return;
+        }
         if (incoming.errored) {
-          req[getAbortController]().abort(incoming.errored.toString());
+          req[abortControllerKey].abort(incoming.errored.toString());
         } else if (!outgoing.writableFinished) {
-          req[getAbortController]().abort("Client connection prematurely closed.");
+          req[abortControllerKey].abort("Client connection prematurely closed.");
         }
       });
       res = fetchCallback(req, { incoming, outgoing });

package/dist/request.d.mts

@@ -9,13 +9,14 @@ declare class RequestError extends Error {
 }
 declare const toRequestError: (e: unknown) => RequestError;
 declare const GlobalRequest: {
-    new (input: RequestInfo | URL, init?: RequestInit | undefined): globalThis.Request;
+    new (input: RequestInfo | URL, init?: RequestInit): globalThis.Request;
     prototype: globalThis.Request;
 };
 declare class Request extends GlobalRequest {
     constructor(input: string | Request, options?: RequestInit);
 }
+declare const abortControllerKey: unique symbol;
 declare const getAbortController: unique symbol;
 declare const newRequest: (incoming: IncomingMessage | Http2ServerRequest, defaultHostname?: string) => any;
 
-export { GlobalRequest, Request, RequestError, getAbortController, newRequest, toRequestError };
+export { GlobalRequest, Request, RequestError, abortControllerKey, getAbortController, newRequest, toRequestError };

package/dist/request.d.ts

@@ -9,13 +9,14 @@ declare class RequestError extends Error {
 }
 declare const toRequestError: (e: unknown) => RequestError;
 declare const GlobalRequest: {
-    new (input: RequestInfo | URL, init?: RequestInit | undefined): globalThis.Request;
+    new (input: RequestInfo | URL, init?: RequestInit): globalThis.Request;
     prototype: globalThis.Request;
 };
 declare class Request extends GlobalRequest {
     constructor(input: string | Request, options?: RequestInit);
 }
+declare const abortControllerKey: unique symbol;
 declare const getAbortController: unique symbol;
 declare const newRequest: (incoming: IncomingMessage | Http2ServerRequest, defaultHostname?: string) => any;
 
-export { GlobalRequest, Request, RequestError, getAbortController, newRequest, toRequestError };
+export { GlobalRequest, Request, RequestError, abortControllerKey, getAbortController, newRequest, toRequestError };

package/dist/request.js

@@ -23,6 +23,7 @@ __export(request_exports, {
   GlobalRequest: () => GlobalRequest,
   Request: () => Request,
   RequestError: () => RequestError,
+  abortControllerKey: () => abortControllerKey,
   getAbortController: () => getAbortController,
   newRequest: () => newRequest,
   toRequestError: () => toRequestError
@@ -81,7 +82,16 @@ var newRequestFromIncoming = (method, url, incoming, abortController) => {
     return req;
   }
   if (!(method === "GET" || method === "HEAD")) {
-    init.body = import_node_stream.Readable.toWeb(incoming);
+    if ("rawBody" in incoming && incoming.rawBody instanceof Buffer) {
+      init.body = new ReadableStream({
+        start(controller) {
+          controller.enqueue(incoming.rawBody);
+          controller.close();
+        }
+      });
+    } else {
+      init.body = import_node_stream.Readable.toWeb(incoming);
+    }
   }
   return new Request(url, init);
 };
@@ -144,13 +154,34 @@ Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming, defaultHostname) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
+  const incomingUrl = incoming.url || "";
+  if (incomingUrl[0] !== "/" && // short-circuit for performance. most requests are relative URL.
+  (incomingUrl.startsWith("http://") || incomingUrl.startsWith("https://"))) {
+    if (incoming instanceof import_node_http2.Http2ServerRequest) {
+      throw new RequestError("Absolute URL for :path is not allowed in HTTP/2");
+    }
+    try {
+      const url2 = new URL(incomingUrl);
+      req[urlKey] = url2.href;
+    } catch (e) {
+      throw new RequestError("Invalid absolute URL", { cause: e });
+    }
+    return req;
+  }
   const host = (incoming instanceof import_node_http2.Http2ServerRequest ? incoming.authority : incoming.headers.host) || defaultHostname;
   if (!host) {
     throw new RequestError("Missing host header");
   }
-  const url = new URL(
-    `${incoming instanceof import_node_http2.Http2ServerRequest || incoming.socket && incoming.socket.encrypted ? "https" : "http"}://${host}${incoming.url}`
-  );
+  let scheme;
+  if (incoming instanceof import_node_http2.Http2ServerRequest) {
+    scheme = incoming.scheme;
+    if (!(scheme === "http" || scheme === "https")) {
+      throw new RequestError("Unsupported scheme");
+    }
+  } else {
+    scheme = incoming.socket && incoming.socket.encrypted ? "https" : "http";
+  }
+  const url = new URL(`${scheme}://${host}${incomingUrl}`);
   if (url.hostname.length !== host.length && url.hostname !== host.replace(/:\d+$/, "")) {
     throw new RequestError("Invalid host header");
   }
@@ -162,6 +193,7 @@ var newRequest = (incoming, defaultHostname) => {
   GlobalRequest,
   Request,
   RequestError,
+  abortControllerKey,
   getAbortController,
   newRequest,
   toRequestError

package/dist/request.mjs

@@ -52,7 +52,16 @@ var newRequestFromIncoming = (method, url, incoming, abortController) => {
     return req;
   }
   if (!(method === "GET" || method === "HEAD")) {
-    init.body = Readable.toWeb(incoming);
+    if ("rawBody" in incoming && incoming.rawBody instanceof Buffer) {
+      init.body = new ReadableStream({
+        start(controller) {
+          controller.enqueue(incoming.rawBody);
+          controller.close();
+        }
+      });
+    } else {
+      init.body = Readable.toWeb(incoming);
+    }
   }
   return new Request(url, init);
 };
@@ -115,13 +124,34 @@ Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming, defaultHostname) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
+  const incomingUrl = incoming.url || "";
+  if (incomingUrl[0] !== "/" && // short-circuit for performance. most requests are relative URL.
+  (incomingUrl.startsWith("http://") || incomingUrl.startsWith("https://"))) {
+    if (incoming instanceof Http2ServerRequest) {
+      throw new RequestError("Absolute URL for :path is not allowed in HTTP/2");
+    }
+    try {
+      const url2 = new URL(incomingUrl);
+      req[urlKey] = url2.href;
+    } catch (e) {
+      throw new RequestError("Invalid absolute URL", { cause: e });
+    }
+    return req;
+  }
   const host = (incoming instanceof Http2ServerRequest ? incoming.authority : incoming.headers.host) || defaultHostname;
   if (!host) {
     throw new RequestError("Missing host header");
   }
-  const url = new URL(
-    `${incoming instanceof Http2ServerRequest || incoming.socket && incoming.socket.encrypted ? "https" : "http"}://${host}${incoming.url}`
-  );
+  let scheme;
+  if (incoming instanceof Http2ServerRequest) {
+    scheme = incoming.scheme;
+    if (!(scheme === "http" || scheme === "https")) {
+      throw new RequestError("Unsupported scheme");
+    }
+  } else {
+    scheme = incoming.socket && incoming.socket.encrypted ? "https" : "http";
+  }
+  const url = new URL(`${scheme}://${host}${incomingUrl}`);
   if (url.hostname.length !== host.length && url.hostname !== host.replace(/:\d+$/, "")) {
     throw new RequestError("Invalid host header");
   }
@@ -132,6 +162,7 @@ export {
   GlobalRequest,
   Request,
   RequestError,
+  abortControllerKey,
   getAbortController,
   newRequest,
   toRequestError

package/dist/response.d.mts

@@ -6,11 +6,11 @@ interface InternalBody {
 declare const getResponseCache: unique symbol;
 declare const cacheKey: unique symbol;
 declare const GlobalResponse: {
-    new (body?: BodyInit | null | undefined, init?: ResponseInit | undefined): globalThis.Response;
+    new (body?: BodyInit | null, init?: ResponseInit): globalThis.Response;
     prototype: globalThis.Response;
     error(): globalThis.Response;
-    json(data: any, init?: ResponseInit | undefined): globalThis.Response;
-    redirect(url: string | URL, status?: number | undefined): globalThis.Response;
+    json(data: any, init?: ResponseInit): globalThis.Response;
+    redirect(url: string | URL, status?: number): globalThis.Response;
 };
 declare class Response {
     #private;

package/dist/response.d.ts

@@ -6,11 +6,11 @@ interface InternalBody {
 declare const getResponseCache: unique symbol;
 declare const cacheKey: unique symbol;
 declare const GlobalResponse: {
-    new (body?: BodyInit | null | undefined, init?: ResponseInit | undefined): globalThis.Response;
+    new (body?: BodyInit | null, init?: ResponseInit): globalThis.Response;
     prototype: globalThis.Response;
     error(): globalThis.Response;
-    json(data: any, init?: ResponseInit | undefined): globalThis.Response;
-    redirect(url: string | URL, status?: number | undefined): globalThis.Response;
+    json(data: any, init?: ResponseInit): globalThis.Response;
+    redirect(url: string | URL, status?: number): globalThis.Response;
 };
 declare class Response {
     #private;

package/dist/serve-static.js

@@ -25,7 +25,7 @@ __export(serve_static_exports, {
 module.exports = __toCommonJS(serve_static_exports);
 var import_filepath = require("hono/utils/filepath");
 var import_mime = require("hono/utils/mime");
-var import_fs = require("fs");
+var import_node_fs = require("fs");
 var COMPRESSIBLE_CONTENT_TYPE_REGEX = /^\s*(?:text\/[^;\s]+|application\/(?:javascript|json|xml|xml-dtd|ecmascript|dart|postscript|rtf|tar|toml|vnd\.dart|vnd\.ms-fontobject|vnd\.ms-opentype|wasm|x-httpd-php|x-javascript|x-ns-proxy-autoconfig|x-sh|x-tar|x-virtualbox-hdd|x-virtualbox-ova|x-virtualbox-ovf|x-virtualbox-vbox|x-virtualbox-vdi|x-virtualbox-vhd|x-virtualbox-vmdk|x-www-form-urlencoded)|font\/(?:otf|ttf)|image\/(?:bmp|vnd\.adobe\.photoshop|vnd\.microsoft\.icon|vnd\.ms-dds|x-icon|x-ms-bmp)|message\/rfc822|model\/gltf-binary|x-shader\/x-fragment|x-shader\/x-vertex|[^;\s]+?\+(?:json|text|xml|yaml))(?:[;\s]|$)/i;
 var ENCODINGS = {
   br: ".br",
@@ -55,7 +55,7 @@ var addCurrentDirPrefix = (path) => {
 var getStats = (path) => {
   let stats;
   try {
-    stats = (0, import_fs.lstatSync)(path);
+    stats = (0, import_node_fs.lstatSync)(path);
   } catch {
   }
   return stats;
@@ -129,7 +129,7 @@ var serveStatic = (options = { root: "" }) => {
     const range = c.req.header("range") || "";
     if (!range) {
       c.header("Content-Length", size.toString());
-      return c.body(createStreamBody((0, import_fs.createReadStream)(path)), 200);
+      return c.body(createStreamBody((0, import_node_fs.createReadStream)(path)), 200);
     }
     c.header("Accept-Ranges", "bytes");
     c.header("Date", stats.birthtime.toUTCString());
@@ -140,7 +140,7 @@ var serveStatic = (options = { root: "" }) => {
       end = size - 1;
     }
     const chunksize = end - start + 1;
-    const stream = (0, import_fs.createReadStream)(path, { start, end });
+    const stream = (0, import_node_fs.createReadStream)(path, { start, end });
     c.header("Content-Length", chunksize.toString());
     c.header("Content-Range", `bytes ${start}-${end}/${stats.size}`);
     return c.body(createStreamBody(stream), 206);

package/dist/server.d.mts

@@ -5,6 +5,6 @@ import 'node:http2';
 import 'node:https';
 
 declare const createAdaptorServer: (options: Options) => ServerType;
-declare const serve: (options: Options, listeningListener?: ((info: AddressInfo) => void) | undefined) => ServerType;
+declare const serve: (options: Options, listeningListener?: (info: AddressInfo) => void) => ServerType;
 
 export { createAdaptorServer, serve };

package/dist/server.d.ts

@@ -5,6 +5,6 @@ import 'node:http2';
 import 'node:https';
 
 declare const createAdaptorServer: (options: Options) => ServerType;
-declare const serve: (options: Options, listeningListener?: ((info: AddressInfo) => void) | undefined) => ServerType;
+declare const serve: (options: Options, listeningListener?: (info: AddressInfo) => void) => ServerType;
 
 export { createAdaptorServer, serve };

package/dist/server.js

@@ -90,7 +90,16 @@ var newRequestFromIncoming = (method, url, incoming, abortController) => {
     return req;
   }
   if (!(method === "GET" || method === "HEAD")) {
-    init.body = import_node_stream.Readable.toWeb(incoming);
+    if ("rawBody" in incoming && incoming.rawBody instanceof Buffer) {
+      init.body = new ReadableStream({
+        start(controller) {
+          controller.enqueue(incoming.rawBody);
+          controller.close();
+        }
+      });
+    } else {
+      init.body = import_node_stream.Readable.toWeb(incoming);
+    }
   }
   return new Request(url, init);
 };
@@ -153,13 +162,34 @@ Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming, defaultHostname) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
+  const incomingUrl = incoming.url || "";
+  if (incomingUrl[0] !== "/" && // short-circuit for performance. most requests are relative URL.
+  (incomingUrl.startsWith("http://") || incomingUrl.startsWith("https://"))) {
+    if (incoming instanceof import_node_http2.Http2ServerRequest) {
+      throw new RequestError("Absolute URL for :path is not allowed in HTTP/2");
+    }
+    try {
+      const url2 = new URL(incomingUrl);
+      req[urlKey] = url2.href;
+    } catch (e) {
+      throw new RequestError("Invalid absolute URL", { cause: e });
+    }
+    return req;
+  }
   const host = (incoming instanceof import_node_http2.Http2ServerRequest ? incoming.authority : incoming.headers.host) || defaultHostname;
   if (!host) {
     throw new RequestError("Missing host header");
   }
-  const url = new URL(
-    `${incoming instanceof import_node_http2.Http2ServerRequest || incoming.socket && incoming.socket.encrypted ? "https" : "http"}://${host}${incoming.url}`
-  );
+  let scheme;
+  if (incoming instanceof import_node_http2.Http2ServerRequest) {
+    scheme = incoming.scheme;
+    if (!(scheme === "http" || scheme === "https")) {
+      throw new RequestError("Unsupported scheme");
+    }
+  } else {
+    scheme = incoming.socket && incoming.socket.encrypted ? "https" : "http";
+  }
+  const url = new URL(`${scheme}://${host}${incomingUrl}`);
   if (url.hostname.length !== host.length && url.hostname !== host.replace(/:\d+$/, "")) {
     throw new RequestError("Invalid host header");
   }
@@ -438,10 +468,14 @@ var getRequestListener = (fetchCallback, options = {}) => {
     try {
       req = newRequest(incoming, options.hostname);
       outgoing.on("close", () => {
+        const abortController = req[abortControllerKey];
+        if (!abortController) {
+          return;
+        }
         if (incoming.errored) {
-          req[getAbortController]().abort(incoming.errored.toString());
+          req[abortControllerKey].abort(incoming.errored.toString());
         } else if (!outgoing.writableFinished) {
-          req[getAbortController]().abort("Client connection prematurely closed.");
+          req[abortControllerKey].abort("Client connection prematurely closed.");
         }
       });
       res = fetchCallback(req, { incoming, outgoing });

package/dist/server.mjs

@@ -55,7 +55,16 @@ var newRequestFromIncoming = (method, url, incoming, abortController) => {
     return req;
   }
   if (!(method === "GET" || method === "HEAD")) {
-    init.body = Readable.toWeb(incoming);
+    if ("rawBody" in incoming && incoming.rawBody instanceof Buffer) {
+      init.body = new ReadableStream({
+        start(controller) {
+          controller.enqueue(incoming.rawBody);
+          controller.close();
+        }
+      });
+    } else {
+      init.body = Readable.toWeb(incoming);
+    }
   }
   return new Request(url, init);
 };
@@ -118,13 +127,34 @@ Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming, defaultHostname) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
+  const incomingUrl = incoming.url || "";
+  if (incomingUrl[0] !== "/" && // short-circuit for performance. most requests are relative URL.
+  (incomingUrl.startsWith("http://") || incomingUrl.startsWith("https://"))) {
+    if (incoming instanceof Http2ServerRequest) {
+      throw new RequestError("Absolute URL for :path is not allowed in HTTP/2");
+    }
+    try {
+      const url2 = new URL(incomingUrl);
+      req[urlKey] = url2.href;
+    } catch (e) {
+      throw new RequestError("Invalid absolute URL", { cause: e });
+    }
+    return req;
+  }
   const host = (incoming instanceof Http2ServerRequest ? incoming.authority : incoming.headers.host) || defaultHostname;
   if (!host) {
     throw new RequestError("Missing host header");
   }
-  const url = new URL(
-    `${incoming instanceof Http2ServerRequest || incoming.socket && incoming.socket.encrypted ? "https" : "http"}://${host}${incoming.url}`
-  );
+  let scheme;
+  if (incoming instanceof Http2ServerRequest) {
+    scheme = incoming.scheme;
+    if (!(scheme === "http" || scheme === "https")) {
+      throw new RequestError("Unsupported scheme");
+    }
+  } else {
+    scheme = incoming.socket && incoming.socket.encrypted ? "https" : "http";
+  }
+  const url = new URL(`${scheme}://${host}${incomingUrl}`);
   if (url.hostname.length !== host.length && url.hostname !== host.replace(/:\d+$/, "")) {
     throw new RequestError("Invalid host header");
   }
@@ -403,10 +433,14 @@ var getRequestListener = (fetchCallback, options = {}) => {
     try {
       req = newRequest(incoming, options.hostname);
       outgoing.on("close", () => {
+        const abortController = req[abortControllerKey];
+        if (!abortController) {
+          return;
+        }
         if (incoming.errored) {
-          req[getAbortController]().abort(incoming.errored.toString());
+          req[abortControllerKey].abort(incoming.errored.toString());
         } else if (!outgoing.writableFinished) {
-          req[getAbortController]().abort("Client connection prematurely closed.");
+          req[abortControllerKey].abort("Client connection prematurely closed.");
         }
       });
       res = fetchCallback(req, { incoming, outgoing });

package/dist/types.d.mts

@@ -40,4 +40,4 @@ type Options = {
 } & ServerOptions;
 type CustomErrorHandler = (err: unknown) => void | Response | Promise<void | Response>;
 
-export { CustomErrorHandler, FetchCallback, Http2Bindings, HttpBindings, NextHandlerOption, Options, ServerType };
+export { CustomErrorHandler, FetchCallback, Http2Bindings, HttpBindings, NextHandlerOption, Options, ServerOptions, ServerType };

package/dist/types.d.ts

@@ -40,4 +40,4 @@ type Options = {
 } & ServerOptions;
 type CustomErrorHandler = (err: unknown) => void | Response | Promise<void | Response>;
 
-export { CustomErrorHandler, FetchCallback, Http2Bindings, HttpBindings, NextHandlerOption, Options, ServerType };
+export { CustomErrorHandler, FetchCallback, Http2Bindings, HttpBindings, NextHandlerOption, Options, ServerOptions, ServerType };

package/dist/utils.d.mts

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

package/dist/utils.d.ts

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

package/dist/vercel.d.mts

@@ -2,6 +2,6 @@ import * as http2 from 'http2';
 import * as http from 'http';
 import { Hono } from 'hono';
 
-declare const handle: (app: Hono<any, any, any>) => (incoming: http.IncomingMessage | http2.Http2ServerRequest, outgoing: http.ServerResponse<http.IncomingMessage> | http2.Http2ServerResponse) => Promise<void>;
+declare const handle: (app: Hono<any, any, any>) => (incoming: http.IncomingMessage | http2.Http2ServerRequest, outgoing: http.ServerResponse | http2.Http2ServerResponse) => Promise<void>;
 
 export { handle };

package/dist/vercel.d.ts

@@ -2,6 +2,6 @@ import * as http2 from 'http2';
 import * as http from 'http';
 import { Hono } from 'hono';
 
-declare const handle: (app: Hono<any, any, any>) => (incoming: http.IncomingMessage | http2.Http2ServerRequest, outgoing: http.ServerResponse<http.IncomingMessage> | http2.Http2ServerResponse) => Promise<void>;
+declare const handle: (app: Hono<any, any, any>) => (incoming: http.IncomingMessage | http2.Http2ServerRequest, outgoing: http.ServerResponse | http2.Http2ServerResponse) => Promise<void>;
 
 export { handle };

package/dist/vercel.js

@@ -88,7 +88,16 @@ var newRequestFromIncoming = (method, url, incoming, abortController) => {
     return req;
   }
   if (!(method === "GET" || method === "HEAD")) {
-    init.body = import_node_stream.Readable.toWeb(incoming);
+    if ("rawBody" in incoming && incoming.rawBody instanceof Buffer) {
+      init.body = new ReadableStream({
+        start(controller) {
+          controller.enqueue(incoming.rawBody);
+          controller.close();
+        }
+      });
+    } else {
+      init.body = import_node_stream.Readable.toWeb(incoming);
+    }
   }
   return new Request(url, init);
 };
@@ -151,13 +160,34 @@ Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming, defaultHostname) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
+  const incomingUrl = incoming.url || "";
+  if (incomingUrl[0] !== "/" && // short-circuit for performance. most requests are relative URL.
+  (incomingUrl.startsWith("http://") || incomingUrl.startsWith("https://"))) {
+    if (incoming instanceof import_node_http2.Http2ServerRequest) {
+      throw new RequestError("Absolute URL for :path is not allowed in HTTP/2");
+    }
+    try {
+      const url2 = new URL(incomingUrl);
+      req[urlKey] = url2.href;
+    } catch (e) {
+      throw new RequestError("Invalid absolute URL", { cause: e });
+    }
+    return req;
+  }
   const host = (incoming instanceof import_node_http2.Http2ServerRequest ? incoming.authority : incoming.headers.host) || defaultHostname;
   if (!host) {
     throw new RequestError("Missing host header");
   }
-  const url = new URL(
-    `${incoming instanceof import_node_http2.Http2ServerRequest || incoming.socket && incoming.socket.encrypted ? "https" : "http"}://${host}${incoming.url}`
-  );
+  let scheme;
+  if (incoming instanceof import_node_http2.Http2ServerRequest) {
+    scheme = incoming.scheme;
+    if (!(scheme === "http" || scheme === "https")) {
+      throw new RequestError("Unsupported scheme");
+    }
+  } else {
+    scheme = incoming.socket && incoming.socket.encrypted ? "https" : "http";
+  }
+  const url = new URL(`${scheme}://${host}${incomingUrl}`);
   if (url.hostname.length !== host.length && url.hostname !== host.replace(/:\d+$/, "")) {
     throw new RequestError("Invalid host header");
   }
@@ -436,10 +466,14 @@ var getRequestListener = (fetchCallback, options = {}) => {
     try {
       req = newRequest(incoming, options.hostname);
       outgoing.on("close", () => {
+        const abortController = req[abortControllerKey];
+        if (!abortController) {
+          return;
+        }
         if (incoming.errored) {
-          req[getAbortController]().abort(incoming.errored.toString());
+          req[abortControllerKey].abort(incoming.errored.toString());
         } else if (!outgoing.writableFinished) {
-          req[getAbortController]().abort("Client connection prematurely closed.");
+          req[abortControllerKey].abort("Client connection prematurely closed.");
         }
       });
       res = fetchCallback(req, { incoming, outgoing });

package/dist/vercel.mjs

@@ -52,7 +52,16 @@ var newRequestFromIncoming = (method, url, incoming, abortController) => {
     return req;
   }
   if (!(method === "GET" || method === "HEAD")) {
-    init.body = Readable.toWeb(incoming);
+    if ("rawBody" in incoming && incoming.rawBody instanceof Buffer) {
+      init.body = new ReadableStream({
+        start(controller) {
+          controller.enqueue(incoming.rawBody);
+          controller.close();
+        }
+      });
+    } else {
+      init.body = Readable.toWeb(incoming);
+    }
   }
   return new Request(url, init);
 };
@@ -115,13 +124,34 @@ Object.setPrototypeOf(requestPrototype, Request.prototype);
 var newRequest = (incoming, defaultHostname) => {
   const req = Object.create(requestPrototype);
   req[incomingKey] = incoming;
+  const incomingUrl = incoming.url || "";
+  if (incomingUrl[0] !== "/" && // short-circuit for performance. most requests are relative URL.
+  (incomingUrl.startsWith("http://") || incomingUrl.startsWith("https://"))) {
+    if (incoming instanceof Http2ServerRequest) {
+      throw new RequestError("Absolute URL for :path is not allowed in HTTP/2");
+    }
+    try {
+      const url2 = new URL(incomingUrl);
+      req[urlKey] = url2.href;
+    } catch (e) {
+      throw new RequestError("Invalid absolute URL", { cause: e });
+    }
+    return req;
+  }
   const host = (incoming instanceof Http2ServerRequest ? incoming.authority : incoming.headers.host) || defaultHostname;
   if (!host) {
     throw new RequestError("Missing host header");
   }
-  const url = new URL(
-    `${incoming instanceof Http2ServerRequest || incoming.socket && incoming.socket.encrypted ? "https" : "http"}://${host}${incoming.url}`
-  );
+  let scheme;
+  if (incoming instanceof Http2ServerRequest) {
+    scheme = incoming.scheme;
+    if (!(scheme === "http" || scheme === "https")) {
+      throw new RequestError("Unsupported scheme");
+    }
+  } else {
+    scheme = incoming.socket && incoming.socket.encrypted ? "https" : "http";
+  }
+  const url = new URL(`${scheme}://${host}${incomingUrl}`);
   if (url.hostname.length !== host.length && url.hostname !== host.replace(/:\d+$/, "")) {
     throw new RequestError("Invalid host header");
   }
@@ -400,10 +430,14 @@ var getRequestListener = (fetchCallback, options = {}) => {
     try {
       req = newRequest(incoming, options.hostname);
       outgoing.on("close", () => {
+        const abortController = req[abortControllerKey];
+        if (!abortController) {
+          return;
+        }
         if (incoming.errored) {
-          req[getAbortController]().abort(incoming.errored.toString());
+          req[abortControllerKey].abort(incoming.errored.toString());
         } else if (!outgoing.writableFinished) {
-          req[getAbortController]().abort("Client connection prematurely closed.");
+          req[abortControllerKey].abort("Client connection prematurely closed.");
         }
       });
       res = fetchCallback(req, { incoming, outgoing });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hono/node-server",
-  "version": "1.13.7",
+  "version": "1.14.0",
   "description": "Node.js Adapter for Hono",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -58,7 +58,7 @@
     "build": "tsup --external hono",
     "watch": "tsup --watch",
     "postbuild": "publint",
-    "prerelease": "yarn build && yarn test",
+    "prerelease": "bun run build && bun run test",
     "release": "np",
     "lint": "eslint src test",
     "lint:fix": "eslint src test --fix",