@hono/node-server 1.14.1 → 1.14.2

package/dist/listener.mjs

@@ -159,6 +159,74 @@ var newRequest = (incoming, defaultHostname) => {
   return req;
 };
 
+// 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;
+  [getResponseCache]() {
+    delete this[cacheKey];
+    return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
+  }
+  constructor(body, init) {
+    let headers;
+    this.#body = body;
+    if (init instanceof _Response) {
+      const cachedGlobalResponse = init[responseCache];
+      if (cachedGlobalResponse) {
+        this.#init = cachedGlobalResponse;
+        this[getResponseCache]();
+        return;
+      } else {
+        this.#init = init.#init;
+        headers = new Headers(init.#init.headers);
+      }
+    } else {
+      this.#init = init;
+    }
+    if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
+      headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
+      this[cacheKey] = [init?.status || 200, body, headers];
+    }
+  }
+  get headers() {
+    const cache = this[cacheKey];
+    if (cache) {
+      if (!(cache[2] instanceof Headers)) {
+        cache[2] = new Headers(cache[2]);
+      }
+      return cache[2];
+    }
+    return this[getResponseCache]().headers;
+  }
+  get status() {
+    return this[cacheKey]?.[0] ?? this[getResponseCache]().status;
+  }
+  get ok() {
+    const status = this.status;
+    return status >= 200 && status < 300;
+  }
+};
+["body", "bodyUsed", "redirected", "statusText", "trailers", "type", "url"].forEach((k) => {
+  Object.defineProperty(Response2.prototype, k, {
+    get() {
+      return this[getResponseCache]()[k];
+    }
+  });
+});
+["arrayBuffer", "blob", "clone", "formData", "json", "text"].forEach((k) => {
+  Object.defineProperty(Response2.prototype, k, {
+    value: function() {
+      return this[getResponseCache]()[k]();
+    }
+  });
+});
+Object.setPrototypeOf(Response2, GlobalResponse);
+Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
+
 // src/utils.ts
 function writeFromReadableStream(stream, writable) {
   if (stream.locked) {
@@ -219,86 +287,6 @@ var buildOutgoingHttpHeaders = (headers) => {
   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;
-  [getResponseCache]() {
-    delete this[cacheKey];
-    return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
-  }
-  constructor(body, init) {
-    this.#body = body;
-    if (init instanceof _Response) {
-      const cachedGlobalResponse = init[responseCache];
-      if (cachedGlobalResponse) {
-        this.#init = cachedGlobalResponse;
-        this[getResponseCache]();
-        return;
-      } else {
-        this.#init = init.#init;
-      }
-    } else {
-      this.#init = init;
-    }
-    if (typeof body === "string" || typeof body?.getReader !== "undefined") {
-      let headers = init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-      if (headers instanceof Headers) {
-        headers = buildOutgoingHttpHeaders(headers);
-      }
-      ;
-      this[cacheKey] = [init?.status || 200, body, headers];
-    }
-  }
-};
-[
-  "body",
-  "bodyUsed",
-  "headers",
-  "ok",
-  "redirected",
-  "status",
-  "statusText",
-  "trailers",
-  "type",
-  "url"
-].forEach((k) => {
-  Object.defineProperty(Response2.prototype, k, {
-    get() {
-      return this[getResponseCache]()[k];
-    }
-  });
-});
-["arrayBuffer", "blob", "clone", "formData", "json", "text"].forEach((k) => {
-  Object.defineProperty(Response2.prototype, k, {
-    value: function() {
-      return this[getResponseCache]()[k]();
-    }
-  });
-});
-Object.setPrototypeOf(Response2, GlobalResponse);
-Object.setPrototypeOf(Response2.prototype, GlobalResponse.prototype);
-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/utils/response/constants.ts
 var X_ALREADY_SENT = "x-hono-already-sent";
 
@@ -340,14 +328,24 @@ var handleResponseError = (e, outgoing) => {
     outgoing.destroy(err);
   }
 };
-var responseViaCache = (res, outgoing) => {
-  const [status, body, header] = res[cacheKey];
+var responseViaCache = async (res, outgoing) => {
+  let [status, body, header] = res[cacheKey];
+  if (header instanceof Headers) {
+    header = buildOutgoingHttpHeaders(header);
+  }
   if (typeof body === "string") {
     header["Content-Length"] = Buffer.byteLength(body);
-    outgoing.writeHead(status, header);
+  } else if (body instanceof Uint8Array) {
+    header["Content-Length"] = body.byteLength;
+  } else if (body instanceof Blob) {
+    header["Content-Length"] = body.size;
+  }
+  outgoing.writeHead(status, header);
+  if (typeof body === "string" || body instanceof Uint8Array) {
     outgoing.end(body);
+  } else if (body instanceof Blob) {
+    outgoing.end(new Uint8Array(await body.arrayBuffer()));
   } else {
-    outgoing.writeHead(status, header);
     return writeFromReadableStream(body, outgoing)?.catch(
       (e) => handleResponseError(e, outgoing)
     );
@@ -373,25 +371,6 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
     return responseViaCache(res, outgoing);
   }
   const resHeaderRecord = buildOutgoingHttpHeaders(res.headers);
-  const internalBody = getInternalBody(res);
-  if (internalBody) {
-    const { length, source, stream } = internalBody;
-    if (source instanceof Uint8Array && source.byteLength !== length) {
-    } else {
-      if (length) {
-        resHeaderRecord["content-length"] = length;
-      }
-      outgoing.writeHead(res.status, resHeaderRecord);
-      if (typeof source === "string" || source instanceof Uint8Array) {
-        outgoing.end(source);
-      } else if (source instanceof Blob) {
-        outgoing.end(new Uint8Array(await source.arrayBuffer()));
-      } else {
-        await writeFromReadableStream(stream, outgoing);
-      }
-      return;
-    }
-  }
   if (res.body) {
     const {
       "transfer-encoding": transferEncoding,

package/dist/response.d.mts

@@ -1,10 +1,12 @@
-interface InternalBody {
-    source: string | Uint8Array | FormData | Blob | null;
-    stream: ReadableStream;
-    length: number | null;
-}
+import { OutgoingHttpHeaders } from 'node:http';
+
 declare const getResponseCache: unique symbol;
 declare const cacheKey: unique symbol;
+type InternalCache = [
+    number,
+    string | ReadableStream,
+    Record<string, string> | Headers | OutgoingHttpHeaders
+];
 declare const GlobalResponse: {
     new (body?: BodyInit | null, init?: ResponseInit): globalThis.Response;
     prototype: globalThis.Response;
@@ -14,9 +16,11 @@ declare const GlobalResponse: {
 };
 declare class Response {
     #private;
-    [getResponseCache](): typeof GlobalResponse;
+    [getResponseCache](): globalThis.Response;
     constructor(body?: BodyInit | null, init?: ResponseInit);
+    get headers(): Headers;
+    get status(): number;
+    get ok(): boolean;
 }
-declare function getInternalBody(response: Response | typeof GlobalResponse): InternalBody | undefined;
 
-export { GlobalResponse, Response, cacheKey, getInternalBody };
+export { GlobalResponse, InternalCache, Response, cacheKey };

package/dist/response.d.ts

@@ -1,10 +1,12 @@
-interface InternalBody {
-    source: string | Uint8Array | FormData | Blob | null;
-    stream: ReadableStream;
-    length: number | null;
-}
+import { OutgoingHttpHeaders } from 'node:http';
+
 declare const getResponseCache: unique symbol;
 declare const cacheKey: unique symbol;
+type InternalCache = [
+    number,
+    string | ReadableStream,
+    Record<string, string> | Headers | OutgoingHttpHeaders
+];
 declare const GlobalResponse: {
     new (body?: BodyInit | null, init?: ResponseInit): globalThis.Response;
     prototype: globalThis.Response;
@@ -14,9 +16,11 @@ declare const GlobalResponse: {
 };
 declare class Response {
     #private;
-    [getResponseCache](): typeof GlobalResponse;
+    [getResponseCache](): globalThis.Response;
     constructor(body?: BodyInit | null, init?: ResponseInit);
+    get headers(): Headers;
+    get status(): number;
+    get ok(): boolean;
 }
-declare function getInternalBody(response: Response | typeof GlobalResponse): InternalBody | undefined;
 
-export { GlobalResponse, Response, cacheKey, getInternalBody };
+export { GlobalResponse, InternalCache, Response, cacheKey };

package/dist/response.js

@@ -22,33 +22,9 @@ var response_exports = {};
 __export(response_exports, {
   GlobalResponse: () => GlobalResponse,
   Response: () => Response,
-  cacheKey: () => cacheKey,
-  getInternalBody: () => getInternalBody
+  cacheKey: () => cacheKey
 });
 module.exports = __toCommonJS(response_exports);
-
-// src/utils.ts
-var buildOutgoingHttpHeaders = (headers) => {
-  const res = {};
-  if (!(headers instanceof Headers)) {
-    headers = new Headers(headers ?? void 0);
-  }
-  const cookies = [];
-  for (const [k, v] of headers) {
-    if (k === "set-cookie") {
-      cookies.push(v);
-    } else {
-      res[k] = v;
-    }
-  }
-  if (cookies.length > 0) {
-    res["set-cookie"] = cookies;
-  }
-  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");
@@ -61,6 +37,7 @@ var Response = class _Response {
     return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
   }
   constructor(body, init) {
+    let headers;
     this.#body = body;
     if (init instanceof _Response) {
       const cachedGlobalResponse = init[responseCache];
@@ -70,32 +47,35 @@ var Response = class _Response {
         return;
       } else {
         this.#init = init.#init;
+        headers = new Headers(init.#init.headers);
       }
     } else {
       this.#init = init;
     }
-    if (typeof body === "string" || typeof body?.getReader !== "undefined") {
-      let headers = init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-      if (headers instanceof Headers) {
-        headers = buildOutgoingHttpHeaders(headers);
-      }
-      ;
+    if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
+      headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
       this[cacheKey] = [init?.status || 200, body, headers];
     }
   }
+  get headers() {
+    const cache = this[cacheKey];
+    if (cache) {
+      if (!(cache[2] instanceof Headers)) {
+        cache[2] = new Headers(cache[2]);
+      }
+      return cache[2];
+    }
+    return this[getResponseCache]().headers;
+  }
+  get status() {
+    return this[cacheKey]?.[0] ?? this[getResponseCache]().status;
+  }
+  get ok() {
+    const status = this.status;
+    return status >= 200 && status < 300;
+  }
 };
-[
-  "body",
-  "bodyUsed",
-  "headers",
-  "ok",
-  "redirected",
-  "status",
-  "statusText",
-  "trailers",
-  "type",
-  "url"
-].forEach((k) => {
+["body", "bodyUsed", "redirected", "statusText", "trailers", "type", "url"].forEach((k) => {
   Object.defineProperty(Response.prototype, k, {
     get() {
       return this[getResponseCache]()[k];
@@ -111,26 +91,9 @@ var Response = class _Response {
 });
 Object.setPrototypeOf(Response, GlobalResponse);
 Object.setPrototypeOf(Response.prototype, GlobalResponse.prototype);
-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,
-  getInternalBody
+  cacheKey
 });

package/dist/response.mjs

@@ -1,24 +1,3 @@
-// src/utils.ts
-var buildOutgoingHttpHeaders = (headers) => {
-  const res = {};
-  if (!(headers instanceof Headers)) {
-    headers = new Headers(headers ?? void 0);
-  }
-  const cookies = [];
-  for (const [k, v] of headers) {
-    if (k === "set-cookie") {
-      cookies.push(v);
-    } else {
-      res[k] = v;
-    }
-  }
-  if (cookies.length > 0) {
-    res["set-cookie"] = cookies;
-  }
-  res["content-type"] ??= "text/plain; charset=UTF-8";
-  return res;
-};
-
 // src/response.ts
 var responseCache = Symbol("responseCache");
 var getResponseCache = Symbol("getResponseCache");
@@ -32,6 +11,7 @@ var Response = class _Response {
     return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
   }
   constructor(body, init) {
+    let headers;
     this.#body = body;
     if (init instanceof _Response) {
       const cachedGlobalResponse = init[responseCache];
@@ -41,32 +21,35 @@ var Response = class _Response {
         return;
       } else {
         this.#init = init.#init;
+        headers = new Headers(init.#init.headers);
       }
     } else {
       this.#init = init;
     }
-    if (typeof body === "string" || typeof body?.getReader !== "undefined") {
-      let headers = init?.headers || { "content-type": "text/plain; charset=UTF-8" };
-      if (headers instanceof Headers) {
-        headers = buildOutgoingHttpHeaders(headers);
-      }
-      ;
+    if (typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) {
+      headers ||= init?.headers || { "content-type": "text/plain; charset=UTF-8" };
       this[cacheKey] = [init?.status || 200, body, headers];
     }
   }
+  get headers() {
+    const cache = this[cacheKey];
+    if (cache) {
+      if (!(cache[2] instanceof Headers)) {
+        cache[2] = new Headers(cache[2]);
+      }
+      return cache[2];
+    }
+    return this[getResponseCache]().headers;
+  }
+  get status() {
+    return this[cacheKey]?.[0] ?? this[getResponseCache]().status;
+  }
+  get ok() {
+    const status = this.status;
+    return status >= 200 && status < 300;
+  }
 };
-[
-  "body",
-  "bodyUsed",
-  "headers",
-  "ok",
-  "redirected",
-  "status",
-  "statusText",
-  "trailers",
-  "type",
-  "url"
-].forEach((k) => {
+["body", "bodyUsed", "redirected", "statusText", "trailers", "type", "url"].forEach((k) => {
   Object.defineProperty(Response.prototype, k, {
     get() {
       return this[getResponseCache]()[k];
@@ -82,25 +65,8 @@ var Response = class _Response {
 });
 Object.setPrototypeOf(Response, GlobalResponse);
 Object.setPrototypeOf(Response.prototype, GlobalResponse.prototype);
-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,
-  getInternalBody
+  cacheKey
 };