@hono/node-server 1.7.0 → 1.8.0

package/dist/index.js

@@ -58,7 +58,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) {
@@ -70,7 +70,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);
@@ -81,6 +82,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";
@@ -88,11 +91,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]
     );
   }
 };
@@ -186,18 +195,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);
   }
@@ -207,7 +217,7 @@ var Response2 = class _Response {
       const cachedGlobalResponse = init[responseCache];
       if (cachedGlobalResponse) {
         this.#init = cachedGlobalResponse;
-        this.cache;
+        this[getResponseCache]();
         return;
       } else {
         this.#init = init.#init;
@@ -216,7 +226,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);
       }
@@ -239,14 +249,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]();
     }
   });
 });
@@ -255,6 +265,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
 var import_node_crypto = __toESM(require("crypto"));
@@ -320,36 +346,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);
@@ -360,6 +390,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) {
@@ -379,7 +414,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);
+    }
   };
 };
 

package/dist/index.mjs

@@ -20,7 +20,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) {
@@ -32,7 +32,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);
@@ -43,6 +44,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";
@@ -50,11 +53,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]
     );
   }
 };
@@ -148,18 +157,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);
   }
@@ -169,7 +179,7 @@ var Response2 = class _Response {
       const cachedGlobalResponse = init[responseCache];
       if (cachedGlobalResponse) {
         this.#init = cachedGlobalResponse;
-        this.cache;
+        this[getResponseCache]();
         return;
       } else {
         this.#init = init.#init;
@@ -178,7 +188,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);
       }
@@ -201,14 +211,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]();
     }
   });
 });
@@ -217,6 +227,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";
@@ -282,36 +308,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);
@@ -322,6 +352,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) {
@@ -341,7 +376,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);
+    }
   };
 };
 

package/dist/listener.js

@@ -53,7 +53,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) {
@@ -65,7 +65,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);
@@ -76,6 +77,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";
@@ -83,11 +86,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]
     );
   }
 };
@@ -181,18 +190,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);
   }
@@ -202,7 +212,7 @@ var Response2 = class _Response {
       const cachedGlobalResponse = init[responseCache];
       if (cachedGlobalResponse) {
         this.#init = cachedGlobalResponse;
-        this.cache;
+        this[getResponseCache]();
         return;
       } else {
         this.#init = init.#init;
@@ -211,7 +221,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);
       }
@@ -234,14 +244,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]();
     }
   });
 });
@@ -250,6 +260,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
 var import_node_crypto = __toESM(require("crypto"));
@@ -315,36 +341,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);
@@ -355,6 +385,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) {
@@ -374,7 +409,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);
+    }
   };
 };
 // Annotate the CommonJS export names for ESM import in node: