@hono/node-server 2.0.2 → 2.0.4

package/dist/index.cjs

@@ -400,8 +400,13 @@ var Response$1 = class Response$1 {
 	#body;
 	#init;
 	[getResponseCache]() {
+		const cache = this[cacheKey];
+		const liveHeaders = cache && cache[2] instanceof Headers ? cache[2] : void 0;
 		delete this[cacheKey];
-		return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
+		return this[responseCache] ||= new GlobalResponse(this.#body, liveHeaders ? {
+			...this.#init,
+			headers: liveHeaders
+		} : this.#init);
 	}
 	constructor(body, init) {
 		let headers;
@@ -414,7 +419,7 @@ var Response$1 = class Response$1 {
 				return;
 			} else {
 				this.#init = init.#init;
-				headers = new Headers(init.#init.headers);
+				headers = new Headers(init.headers);
 			}
 		} else this.#init = init;
 		if (body == null || typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) this[cacheKey] = [
@@ -971,7 +976,7 @@ const upgradeWebSocket = (0, hono_ws.defineWebSocketHelper)(async (c, events, op
 		const handleMessage = (data, isBinary) => {
 			const datas = Array.isArray(data) ? data : [data];
 			for (const data of datas) try {
-				events?.onMessage?.(new MessageEvent("message", { data: isBinary ? data instanceof ArrayBuffer ? data : data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength) : data.toString("utf-8") }), ctx);
+				events?.onMessage?.(new MessageEvent("message", { data: isBinary ? data instanceof ArrayBuffer ? data : data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength) : typeof data === "string" ? data : Buffer.from(data).toString("utf-8") }), ctx);
 			} catch (e) {
 				(options?.onError ?? console.error)(e);
 			}

package/dist/index.d.cts

@@ -1,10 +1,38 @@
 import { AddressInfo } from "node:net";
-import { WebSocket, WebSocketServer } from "ws";
 import { IncomingMessage, Server, ServerOptions, ServerResponse, createServer } from "node:http";
 import { Http2SecureServer, Http2Server, Http2ServerRequest, Http2ServerResponse, SecureServerOptions, ServerOptions as ServerOptions$1, createSecureServer, createServer as createServer$1 } from "node:http2";
 import { ServerOptions as ServerOptions$2, createServer as createServer$2 } from "node:https";
+import { Duplex } from "node:stream";
 import { UpgradeWebSocket } from "hono/ws";
 
+//#region src/websocket-types.d.ts
+type WSReadyState = 0 | 1 | 2 | 3;
+type WebSocketData = string | ArrayBuffer | Uint8Array | readonly Uint8Array[];
+type WebSocketSendOptions = {
+  compress?: boolean;
+};
+interface WebSocketLike {
+  protocol: string;
+  readyState: WSReadyState;
+  close(code?: number, reason?: string): void;
+  send(data: string | ArrayBuffer | ArrayBufferView, options?: WebSocketSendOptions): void;
+  on(event: 'message', listener: (data: WebSocketData, isBinary: boolean) => void): this;
+  on(event: 'close', listener: (code: number, reason: Uint8Array) => void): this;
+  on(event: 'error', listener: (error: unknown) => void): this;
+  off(event: 'message', listener: (data: WebSocketData, isBinary: boolean) => void): this;
+}
+interface WebSocketServerLike {
+  options: {
+    noServer?: boolean;
+  };
+  on(event: 'connection', listener: (ws: WebSocketLike, request: IncomingMessage) => void): this;
+  on(event: 'headers', listener: (headers: string[]) => void): this;
+  off(event: 'headers', listener: (headers: string[]) => void): this;
+  emit(event: 'connection', ws: WebSocketLike, request: IncomingMessage): boolean;
+  handleUpgrade(request: IncomingMessage, socket: Duplex, head: Buffer, callback: (ws: WebSocketLike) => void): void;
+  close(): void;
+}
+//#endregion
 //#region src/types.d.ts
 type HttpBindings = {
   incoming: IncomingMessage;
@@ -40,7 +68,7 @@ type Options = {
   port?: number;
   hostname?: string;
   websocket?: {
-    server: WebSocketServer;
+    server: WebSocketServerLike;
   };
 } & ServerOptions$3;
 type CustomErrorHandler = (err: unknown) => void | Response | Promise<void | Response>;
@@ -53,7 +81,7 @@ declare const serve: (options: Options, listeningListener?: (info: AddressInfo)
 type UpgradeWebSocketOptions = {
   onError: (err: unknown) => void;
 };
-declare const upgradeWebSocket: UpgradeWebSocket<WebSocket, UpgradeWebSocketOptions>;
+declare const upgradeWebSocket: UpgradeWebSocket<WebSocketLike, UpgradeWebSocketOptions>;
 //#endregion
 //#region src/listener.d.ts
 declare const getRequestListener: (fetchCallback: FetchCallback, options?: {
@@ -70,4 +98,4 @@ declare class RequestError extends Error {
   });
 }
 //#endregion
-export { type Http2Bindings, type HttpBindings, RequestError, type ServerType, createAdaptorServer, getRequestListener, serve, upgradeWebSocket };
+export { type Http2Bindings, type HttpBindings, RequestError, type ServerType, type WebSocketData, type WebSocketLike, type WebSocketServerLike, createAdaptorServer, getRequestListener, serve, upgradeWebSocket };

package/dist/index.d.mts

@@ -1,10 +1,38 @@
 import { IncomingMessage, Server, ServerOptions, ServerResponse, createServer } from "node:http";
 import { Http2SecureServer, Http2Server, Http2ServerRequest, Http2ServerResponse, SecureServerOptions, ServerOptions as ServerOptions$1, createSecureServer, createServer as createServer$1 } from "node:http2";
+import { Duplex } from "node:stream";
 import { UpgradeWebSocket } from "hono/ws";
 import { AddressInfo } from "node:net";
-import { WebSocket, WebSocketServer } from "ws";
 import { ServerOptions as ServerOptions$2, createServer as createServer$2 } from "node:https";
 
+//#region src/websocket-types.d.ts
+type WSReadyState = 0 | 1 | 2 | 3;
+type WebSocketData = string | ArrayBuffer | Uint8Array | readonly Uint8Array[];
+type WebSocketSendOptions = {
+  compress?: boolean;
+};
+interface WebSocketLike {
+  protocol: string;
+  readyState: WSReadyState;
+  close(code?: number, reason?: string): void;
+  send(data: string | ArrayBuffer | ArrayBufferView, options?: WebSocketSendOptions): void;
+  on(event: 'message', listener: (data: WebSocketData, isBinary: boolean) => void): this;
+  on(event: 'close', listener: (code: number, reason: Uint8Array) => void): this;
+  on(event: 'error', listener: (error: unknown) => void): this;
+  off(event: 'message', listener: (data: WebSocketData, isBinary: boolean) => void): this;
+}
+interface WebSocketServerLike {
+  options: {
+    noServer?: boolean;
+  };
+  on(event: 'connection', listener: (ws: WebSocketLike, request: IncomingMessage) => void): this;
+  on(event: 'headers', listener: (headers: string[]) => void): this;
+  off(event: 'headers', listener: (headers: string[]) => void): this;
+  emit(event: 'connection', ws: WebSocketLike, request: IncomingMessage): boolean;
+  handleUpgrade(request: IncomingMessage, socket: Duplex, head: Buffer, callback: (ws: WebSocketLike) => void): void;
+  close(): void;
+}
+//#endregion
 //#region src/types.d.ts
 type HttpBindings = {
   incoming: IncomingMessage;
@@ -40,7 +68,7 @@ type Options = {
   port?: number;
   hostname?: string;
   websocket?: {
-    server: WebSocketServer;
+    server: WebSocketServerLike;
   };
 } & ServerOptions$3;
 type CustomErrorHandler = (err: unknown) => void | Response | Promise<void | Response>;
@@ -53,7 +81,7 @@ declare const serve: (options: Options, listeningListener?: (info: AddressInfo)
 type UpgradeWebSocketOptions = {
   onError: (err: unknown) => void;
 };
-declare const upgradeWebSocket: UpgradeWebSocket<WebSocket, UpgradeWebSocketOptions>;
+declare const upgradeWebSocket: UpgradeWebSocket<WebSocketLike, UpgradeWebSocketOptions>;
 //#endregion
 //#region src/listener.d.ts
 declare const getRequestListener: (fetchCallback: FetchCallback, options?: {
@@ -70,4 +98,4 @@ declare class RequestError extends Error {
   });
 }
 //#endregion
-export { type Http2Bindings, type HttpBindings, RequestError, type ServerType, createAdaptorServer, getRequestListener, serve, upgradeWebSocket };
+export { type Http2Bindings, type HttpBindings, RequestError, type ServerType, type WebSocketData, type WebSocketLike, type WebSocketServerLike, createAdaptorServer, getRequestListener, serve, upgradeWebSocket };

package/dist/index.mjs

@@ -399,8 +399,13 @@ var Response$1 = class Response$1 {
 	#body;
 	#init;
 	[getResponseCache]() {
+		const cache = this[cacheKey];
+		const liveHeaders = cache && cache[2] instanceof Headers ? cache[2] : void 0;
 		delete this[cacheKey];
-		return this[responseCache] ||= new GlobalResponse(this.#body, this.#init);
+		return this[responseCache] ||= new GlobalResponse(this.#body, liveHeaders ? {
+			...this.#init,
+			headers: liveHeaders
+		} : this.#init);
 	}
 	constructor(body, init) {
 		let headers;
@@ -413,7 +418,7 @@ var Response$1 = class Response$1 {
 				return;
 			} else {
 				this.#init = init.#init;
-				headers = new Headers(init.#init.headers);
+				headers = new Headers(init.headers);
 			}
 		} else this.#init = init;
 		if (body == null || typeof body === "string" || typeof body?.getReader !== "undefined" || body instanceof Blob || body instanceof Uint8Array) this[cacheKey] = [
@@ -970,7 +975,7 @@ const upgradeWebSocket = defineWebSocketHelper(async (c, events, options) => {
 		const handleMessage = (data, isBinary) => {
 			const datas = Array.isArray(data) ? data : [data];
 			for (const data of datas) try {
-				events?.onMessage?.(new MessageEvent("message", { data: isBinary ? data instanceof ArrayBuffer ? data : data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength) : data.toString("utf-8") }), ctx);
+				events?.onMessage?.(new MessageEvent("message", { data: isBinary ? data instanceof ArrayBuffer ? data : data.buffer.slice(data.byteOffset, data.byteOffset + data.byteLength) : typeof data === "string" ? data : Buffer.from(data).toString("utf-8") }), ctx);
 			} catch (e) {
 				(options?.onError ?? console.error)(e);
 			}

package/dist/serve-static.d.cts

@@ -3,7 +3,7 @@ import { Context, Env, MiddlewareHandler } from "hono";
 //#region src/serve-static.d.ts
 type ServeStaticOptions<E extends Env = Env> = {
   /**
-   * Root path, relative to current working directory from which the app was started. Absolute paths are not supported.
+   * Root path. Relative path is based on current working directory from which the app was started.
    */
   root?: string;
   path?: string;

package/dist/serve-static.d.mts

@@ -3,7 +3,7 @@ import { Context, Env, MiddlewareHandler } from "hono";
 //#region src/serve-static.d.ts
 type ServeStaticOptions<E extends Env = Env> = {
   /**
-   * Root path, relative to current working directory from which the app was started. Absolute paths are not supported.
+   * Root path. Relative path is based on current working directory from which the app was started.
    */
   root?: string;
   path?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hono/node-server",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Node.js Adapter for Hono",
   "main": "dist/index.mjs",
   "type": "module",