@hono/node-server 2.0.3 → 2.0.5

package/dist/index.cjs

@@ -976,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

@@ -975,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.cjs

@@ -43,7 +43,7 @@ const serveStatic = (options = { root: "" }) => {
 		if (optionPath) filename = optionPath;
 		else try {
 			filename = tryDecodeURI(c.req.path);
-			if (/(?:^|[\/\\])\.{1,2}(?:$|[\/\\])|[\/\\]{2,}/.test(filename)) throw new Error();
+			if (/(?:^|[\/\\])\.{1,2}(?:$|[\/\\])|[\/\\]{2,}|\\/.test(filename)) throw new Error();
 		} catch {
 			await options.onNotFound?.(c.req.path, c);
 			return next();

package/dist/serve-static.mjs

@@ -42,7 +42,7 @@ const serveStatic = (options = { root: "" }) => {
 		if (optionPath) filename = optionPath;
 		else try {
 			filename = tryDecodeURI(c.req.path);
-			if (/(?:^|[\/\\])\.{1,2}(?:$|[\/\\])|[\/\\]{2,}/.test(filename)) throw new Error();
+			if (/(?:^|[\/\\])\.{1,2}(?:$|[\/\\])|[\/\\]{2,}|\\/.test(filename)) throw new Error();
 		} catch {
 			await options.onNotFound?.(c.req.path, c);
 			return next();

package/package.json

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