@hono/node-server 1.7.0 → 1.8.1

package/dist/listener.mjs

@@ -17,7 +17,7 @@ var Request = class extends GlobalRequest {
 Object.defineProperty(global, "Request", {
   value: Request
 });
-var newRequestFromIncoming = (method, url, incoming) => {
+var newRequestFromIncoming = (method, url, incoming, abortController) => {
   const headerRecord = [];
   const rawHeaders = incoming.rawHeaders;
   for (let i = 0; i < rawHeaders.length; i += 2) {
@@ -29,7 +29,8 @@ var newRequestFromIncoming = (method, url, incoming) => {
   }
   const init = {
     method,
-    headers: headerRecord
+    headers: headerRecord,
+    signal: abortController.signal
   };
   if (!(method === "GET" || method === "HEAD")) {
     init.body = Readable.toWeb(incoming);
@@ -40,6 +41,8 @@ var getRequestCache = Symbol("getRequestCache");
 var requestCache = Symbol("requestCache");
 var incomingKey = Symbol("incomingKey");
 var urlKey = Symbol("urlKey");
+var abortControllerKey = Symbol("abortControllerKey");
+var getAbortController = Symbol("getAbortController");
 var requestPrototype = {
   get method() {
     return this[incomingKey].method || "GET";
@@ -47,11 +50,17 @@ var requestPrototype = {
   get url() {
     return this[urlKey];
   },
+  [getAbortController]() {
+    this[getRequestCache]();
+    return this[abortControllerKey];
+  },
   [getRequestCache]() {
+    this[abortControllerKey] ||= new AbortController();
     return this[requestCache] ||= newRequestFromIncoming(
       this.method,
       this[urlKey],
-      this[incomingKey]
+      this[incomingKey],
+      this[abortControllerKey]
     );
   }
 };
@@ -67,7 +76,8 @@ var requestPrototype = {
   "redirect",
   "referrer",
   "referrerPolicy",
-  "signal"
+  "signal",
+  "keepalive"
 ].forEach((k) => {
   Object.defineProperty(requestPrototype, k, {
     get() {
@@ -145,18 +155,19 @@ var buildOutgoingHttpHeaders = (headers) => {
   if (cookies.length > 0) {
     res["set-cookie"] = cookies;
   }
-  res["content-type"] ??= "text/plain;charset=UTF-8";
+  res["content-type"] ??= "text/plain; charset=UTF-8";
   return res;
 };
 
 // src/response.ts
 var responseCache = Symbol("responseCache");
+var getResponseCache = Symbol("getResponseCache");
 var cacheKey = Symbol("cache");
 var GlobalResponse = global.Response;
 var Response2 = class _Response {
   #body;
   #init;
-  get cache() {
+  [getResponseCache]() {
     delete this[cacheKey];
     return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
   }
@@ -166,7 +177,7 @@ var Response2 = class _Response {
       const cachedGlobalResponse = init[responseCache];
       if (cachedGlobalResponse) {
         this.#init = cachedGlobalResponse;
-        this.cache;
+        this[getResponseCache]();
         return;
       } else {
         this.#init = init.#init;
@@ -175,7 +186,7 @@ var Response2 = class _Response {
       this.#init = init;
     }
     if (typeof body === "string" || body instanceof ReadableStream) {
-      let headers = init?.headers || { "content-type": "text/plain;charset=UTF-8" };
+      let headers = init?.headers || { "content-type": "text/plain; charset=UTF-8" };
       if (headers instanceof Headers) {
         headers = buildOutgoingHttpHeaders(headers);
       }
@@ -198,14 +209,14 @@ var Response2 = class _Response {
 ].forEach((k) => {
   Object.defineProperty(Response2.prototype, k, {
     get() {
-      return this.cache[k];
+      return this[getResponseCache]()[k];
     }
   });
 });
 ["arrayBuffer", "blob", "clone", "formData", "json", "text"].forEach((k) => {
   Object.defineProperty(Response2.prototype, k, {
     value: function() {
-      return this.cache[k]();
+      return this[getResponseCache]()[k]();
     }
   });
 });
@@ -214,6 +225,22 @@ Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
 Object.defineProperty(global, "Response", {
   value: Response2
 });
+var stateKey = Reflect.ownKeys(new GlobalResponse()).find(
+  (k) => typeof k === "symbol" && k.toString() === "Symbol(state)"
+);
+if (!stateKey) {
+  console.warn("Failed to find Response internal state key");
+}
+function getInternalBody(response) {
+  if (!stateKey) {
+    return;
+  }
+  if (response instanceof Response2) {
+    response = response[getResponseCache]();
+  }
+  const state = response[stateKey];
+  return state && state.body || void 0;
+}
 
 // src/globals.ts
 import crypto from "crypto";
@@ -279,36 +306,40 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
       res = await res.catch(handleFetchError);
     }
   }
-  try {
-    const isCached = cacheKey in res;
-    if (isCached) {
-      return responseViaCache(res, outgoing);
-    }
-  } catch (e) {
-    return handleResponseError(e, outgoing);
+  if (cacheKey in res) {
+    return responseViaCache(res, outgoing);
   }
   const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
-  if (res.body) {
-    try {
-      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);
-        await writeFromReadableStream(res.body, outgoing);
-      } else {
-        const buffer = await res.arrayBuffer();
-        resHeaderRecord["content-length"] = buffer.byteLength;
-        outgoing.writeHead(res.status, resHeaderRecord);
-        outgoing.end(new Uint8Array(buffer));
-      }
-    } catch (e) {
-      handleResponseError(e, outgoing);
+  const internalBody = getInternalBody(res);
+  if (internalBody) {
+    if (internalBody.length) {
+      resHeaderRecord["content-length"] = internalBody.length;
+    }
+    outgoing.writeHead(res.status, resHeaderRecord);
+    if (typeof internalBody.source === "string" || internalBody.source instanceof Uint8Array) {
+      outgoing.end(internalBody.source);
+    } else if (internalBody.source instanceof Blob) {
+      outgoing.end(new Uint8Array(await internalBody.source.arrayBuffer()));
+    } else {
+      await writeFromReadableStream(internalBody.stream, outgoing);
+    }
+  } else 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);
+      await writeFromReadableStream(res.body, outgoing);
+    } else {
+      const buffer = await res.arrayBuffer();
+      resHeaderRecord["content-length"] = buffer.byteLength;
+      outgoing.writeHead(res.status, resHeaderRecord);
+      outgoing.end(new Uint8Array(buffer));
     }
   } else {
     outgoing.writeHead(res.status, resHeaderRecord);
@@ -319,6 +350,11 @@ var getRequestListener = (fetchCallback, options = {}) => {
   return async (incoming, outgoing) => {
     let res;
     const req = newRequest(incoming);
+    outgoing.on("close", () => {
+      if (incoming.destroyed) {
+        req[getAbortController]().abort();
+      }
+    });
     try {
       res = fetchCallback(req, { incoming, outgoing });
       if (cacheKey in res) {
@@ -338,7 +374,11 @@ var getRequestListener = (fetchCallback, options = {}) => {
         return handleResponseError(e, outgoing);
       }
     }
-    return responseViaResponseObject(res, outgoing, options);
+    try {
+      return responseViaResponseObject(res, outgoing, options);
+    } catch (e) {
+      return handleResponseError(e, outgoing);
+    }
   };
 };
 export {

package/dist/request.d.mts

@@ -8,6 +8,7 @@ declare const GlobalRequest: {
 declare class Request extends GlobalRequest {
     constructor(input: string | Request, options?: RequestInit);
 }
+declare const getAbortController: unique symbol;
 declare const newRequest: (incoming: IncomingMessage | Http2ServerRequest) => any;
 
-export { GlobalRequest, Request, newRequest };
+export { GlobalRequest, Request, getAbortController, newRequest };

package/dist/request.d.ts

@@ -8,6 +8,7 @@ declare const GlobalRequest: {
 declare class Request extends GlobalRequest {
     constructor(input: string | Request, options?: RequestInit);
 }
+declare const getAbortController: unique symbol;
 declare const newRequest: (incoming: IncomingMessage | Http2ServerRequest) => any;
 
-export { GlobalRequest, Request, newRequest };
+export { GlobalRequest, Request, getAbortController, newRequest };

package/dist/request.js

@@ -22,6 +22,7 @@ var request_exports = {};
 __export(request_exports, {
   GlobalRequest: () => GlobalRequest,
   Request: () => Request,
+  getAbortController: () => getAbortController,
   newRequest: () => newRequest
 });
 module.exports = __toCommonJS(request_exports);
@@ -43,7 +44,7 @@ var Request = class extends GlobalRequest {
 Object.defineProperty(global, "Request", {
   value: Request
 });
-var newRequestFromIncoming = (method, url, incoming) => {
+var newRequestFromIncoming = (method, url, incoming, abortController) => {
   const headerRecord = [];
   const rawHeaders = incoming.rawHeaders;
   for (let i = 0; i < rawHeaders.length; i += 2) {
@@ -55,7 +56,8 @@ var newRequestFromIncoming = (method, url, incoming) => {
   }
   const init = {
     method,
-    headers: headerRecord
+    headers: headerRecord,
+    signal: abortController.signal
   };
   if (!(method === "GET" || method === "HEAD")) {
     init.body = import_node_stream.Readable.toWeb(incoming);
@@ -66,6 +68,8 @@ var getRequestCache = Symbol("getRequestCache");
 var requestCache = Symbol("requestCache");
 var incomingKey = Symbol("incomingKey");
 var urlKey = Symbol("urlKey");
+var abortControllerKey = Symbol("abortControllerKey");
+var getAbortController = Symbol("getAbortController");
 var requestPrototype = {
   get method() {
     return this[incomingKey].method || "GET";
@@ -73,11 +77,17 @@ var requestPrototype = {
   get url() {
     return this[urlKey];
   },
+  [getAbortController]() {
+    this[getRequestCache]();
+    return this[abortControllerKey];
+  },
   [getRequestCache]() {
+    this[abortControllerKey] ||= new AbortController();
     return this[requestCache] ||= newRequestFromIncoming(
       this.method,
       this[urlKey],
-      this[incomingKey]
+      this[incomingKey],
+      this[abortControllerKey]
     );
   }
 };
@@ -93,7 +103,8 @@ var requestPrototype = {
   "redirect",
   "referrer",
   "referrerPolicy",
-  "signal"
+  "signal",
+  "keepalive"
 ].forEach((k) => {
   Object.defineProperty(requestPrototype, k, {
     get() {
@@ -121,5 +132,6 @@ var newRequest = (incoming) => {
 0 && (module.exports = {
   GlobalRequest,
   Request,
+  getAbortController,
   newRequest
 });

package/dist/request.mjs

@@ -17,7 +17,7 @@ var Request = class extends GlobalRequest {
 Object.defineProperty(global, "Request", {
   value: Request
 });
-var newRequestFromIncoming = (method, url, incoming) => {
+var newRequestFromIncoming = (method, url, incoming, abortController) => {
   const headerRecord = [];
   const rawHeaders = incoming.rawHeaders;
   for (let i = 0; i < rawHeaders.length; i += 2) {
@@ -29,7 +29,8 @@ var newRequestFromIncoming = (method, url, incoming) => {
   }
   const init = {
     method,
-    headers: headerRecord
+    headers: headerRecord,
+    signal: abortController.signal
   };
   if (!(method === "GET" || method === "HEAD")) {
     init.body = Readable.toWeb(incoming);
@@ -40,6 +41,8 @@ var getRequestCache = Symbol("getRequestCache");
 var requestCache = Symbol("requestCache");
 var incomingKey = Symbol("incomingKey");
 var urlKey = Symbol("urlKey");
+var abortControllerKey = Symbol("abortControllerKey");
+var getAbortController = Symbol("getAbortController");
 var requestPrototype = {
   get method() {
     return this[incomingKey].method || "GET";
@@ -47,11 +50,17 @@ var requestPrototype = {
   get url() {
     return this[urlKey];
   },
+  [getAbortController]() {
+    this[getRequestCache]();
+    return this[abortControllerKey];
+  },
   [getRequestCache]() {
+    this[abortControllerKey] ||= new AbortController();
     return this[requestCache] ||= newRequestFromIncoming(
       this.method,
       this[urlKey],
-      this[incomingKey]
+      this[incomingKey],
+      this[abortControllerKey]
     );
   }
 };
@@ -67,7 +76,8 @@ var requestPrototype = {
   "redirect",
   "referrer",
   "referrerPolicy",
-  "signal"
+  "signal",
+  "keepalive"
 ].forEach((k) => {
   Object.defineProperty(requestPrototype, k, {
     get() {
@@ -94,5 +104,6 @@ var newRequest = (incoming) => {
 export {
   GlobalRequest,
   Request,
+  getAbortController,
   newRequest
 };

package/dist/response.d.mts

@@ -1,3 +1,9 @@
+interface InternalBody {
+    source: string | Uint8Array | FormData | Blob | null;
+    stream: ReadableStream;
+    length: number | null;
+}
+declare const getResponseCache: unique symbol;
 declare const cacheKey: unique symbol;
 declare const GlobalResponse: {
     new (body?: BodyInit | null | undefined, init?: ResponseInit | undefined): globalThis.Response;
@@ -8,8 +14,9 @@ declare const GlobalResponse: {
 };
 declare class Response {
     #private;
-    private get cache();
+    [getResponseCache](): typeof GlobalResponse;
     constructor(body?: BodyInit | null, init?: ResponseInit);
 }
+declare function getInternalBody(response: Response | typeof GlobalResponse): InternalBody | undefined;
 
-export { GlobalResponse, Response, cacheKey };
+export { GlobalResponse, Response, cacheKey, getInternalBody };

package/dist/response.d.ts

@@ -1,3 +1,9 @@
+interface InternalBody {
+    source: string | Uint8Array | FormData | Blob | null;
+    stream: ReadableStream;
+    length: number | null;
+}
+declare const getResponseCache: unique symbol;
 declare const cacheKey: unique symbol;
 declare const GlobalResponse: {
     new (body?: BodyInit | null | undefined, init?: ResponseInit | undefined): globalThis.Response;
@@ -8,8 +14,9 @@ declare const GlobalResponse: {
 };
 declare class Response {
     #private;
-    private get cache();
+    [getResponseCache](): typeof GlobalResponse;
     constructor(body?: BodyInit | null, init?: ResponseInit);
 }
+declare function getInternalBody(response: Response | typeof GlobalResponse): InternalBody | undefined;
 
-export { GlobalResponse, Response, cacheKey };
+export { GlobalResponse, Response, cacheKey, getInternalBody };

package/dist/response.js

@@ -22,7 +22,8 @@ var response_exports = {};
 __export(response_exports, {
   GlobalResponse: () => GlobalResponse,
   Response: () => Response,
-  cacheKey: () => cacheKey
+  cacheKey: () => cacheKey,
+  getInternalBody: () => getInternalBody
 });
 module.exports = __toCommonJS(response_exports);
 
@@ -40,18 +41,19 @@ var buildOutgoingHttpHeaders = (headers) => {
   if (cookies.length > 0) {
     res["set-cookie"] = cookies;
   }
-  res["content-type"] ??= "text/plain;charset=UTF-8";
+  res["content-type"] ??= "text/plain; charset=UTF-8";
   return res;
 };
 
 // src/response.ts
 var responseCache = Symbol("responseCache");
+var getResponseCache = Symbol("getResponseCache");
 var cacheKey = Symbol("cache");
 var GlobalResponse = global.Response;
 var Response = class _Response {
   #body;
   #init;
-  get cache() {
+  [getResponseCache]() {
     delete this[cacheKey];
     return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
   }
@@ -61,7 +63,7 @@ var Response = class _Response {
       const cachedGlobalResponse = init[responseCache];
       if (cachedGlobalResponse) {
         this.#init = cachedGlobalResponse;
-        this.cache;
+        this[getResponseCache]();
         return;
       } else {
         this.#init = init.#init;
@@ -70,7 +72,7 @@ var Response = class _Response {
       this.#init = init;
     }
     if (typeof body === "string" || body instanceof ReadableStream) {
-      let headers = init?.headers || { "content-type": "text/plain;charset=UTF-8" };
+      let headers = init?.headers || { "content-type": "text/plain; charset=UTF-8" };
       if (headers instanceof Headers) {
         headers = buildOutgoingHttpHeaders(headers);
       }
@@ -93,14 +95,14 @@ var Response = class _Response {
 ].forEach((k) => {
   Object.defineProperty(Response.prototype, k, {
     get() {
-      return this.cache[k];
+      return this[getResponseCache]()[k];
     }
   });
 });
 ["arrayBuffer", "blob", "clone", "formData", "json", "text"].forEach((k) => {
   Object.defineProperty(Response.prototype, k, {
     value: function() {
-      return this.cache[k]();
+      return this[getResponseCache]()[k]();
     }
   });
 });
@@ -109,9 +111,26 @@ Object.setPrototypeOf(Response.prototype, GlobalResponse.prototype);
 Object.defineProperty(global, "Response", {
   value: Response
 });
+var stateKey = Reflect.ownKeys(new GlobalResponse()).find(
+  (k) => typeof k === "symbol" && k.toString() === "Symbol(state)"
+);
+if (!stateKey) {
+  console.warn("Failed to find Response internal state key");
+}
+function getInternalBody(response) {
+  if (!stateKey) {
+    return;
+  }
+  if (response instanceof Response) {
+    response = response[getResponseCache]();
+  }
+  const state = response[stateKey];
+  return state && state.body || void 0;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   GlobalResponse,
   Response,
-  cacheKey
+  cacheKey,
+  getInternalBody
 });

package/dist/response.mjs

@@ -12,18 +12,19 @@ var buildOutgoingHttpHeaders = (headers) => {
   if (cookies.length > 0) {
     res["set-cookie"] = cookies;
   }
-  res["content-type"] ??= "text/plain;charset=UTF-8";
+  res["content-type"] ??= "text/plain; charset=UTF-8";
   return res;
 };
 
 // src/response.ts
 var responseCache = Symbol("responseCache");
+var getResponseCache = Symbol("getResponseCache");
 var cacheKey = Symbol("cache");
 var GlobalResponse = global.Response;
 var Response = class _Response {
   #body;
   #init;
-  get cache() {
+  [getResponseCache]() {
     delete this[cacheKey];
     return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
   }
@@ -33,7 +34,7 @@ var Response = class _Response {
       const cachedGlobalResponse = init[responseCache];
       if (cachedGlobalResponse) {
         this.#init = cachedGlobalResponse;
-        this.cache;
+        this[getResponseCache]();
         return;
       } else {
         this.#init = init.#init;
@@ -42,7 +43,7 @@ var Response = class _Response {
       this.#init = init;
     }
     if (typeof body === "string" || body instanceof ReadableStream) {
-      let headers = init?.headers || { "content-type": "text/plain;charset=UTF-8" };
+      let headers = init?.headers || { "content-type": "text/plain; charset=UTF-8" };
       if (headers instanceof Headers) {
         headers = buildOutgoingHttpHeaders(headers);
       }
@@ -65,14 +66,14 @@ var Response = class _Response {
 ].forEach((k) => {
   Object.defineProperty(Response.prototype, k, {
     get() {
-      return this.cache[k];
+      return this[getResponseCache]()[k];
     }
   });
 });
 ["arrayBuffer", "blob", "clone", "formData", "json", "text"].forEach((k) => {
   Object.defineProperty(Response.prototype, k, {
     value: function() {
-      return this.cache[k]();
+      return this[getResponseCache]()[k]();
     }
   });
 });
@@ -81,8 +82,25 @@ Object.setPrototypeOf(Response.prototype, GlobalResponse.prototype);
 Object.defineProperty(global, "Response", {
   value: Response
 });
+var stateKey = Reflect.ownKeys(new GlobalResponse()).find(
+  (k) => typeof k === "symbol" && k.toString() === "Symbol(state)"
+);
+if (!stateKey) {
+  console.warn("Failed to find Response internal state key");
+}
+function getInternalBody(response) {
+  if (!stateKey) {
+    return;
+  }
+  if (response instanceof Response) {
+    response = response[getResponseCache]();
+  }
+  const state = response[stateKey];
+  return state && state.body || void 0;
+}
 export {
   GlobalResponse,
   Response,
-  cacheKey
+  cacheKey,
+  getInternalBody
 };