@hono/node-server 2.0.0-rc.2 → 2.0.1

package/dist/index.cjs

@@ -836,10 +836,31 @@ const CloseEvent = globalThis.CloseEvent ?? class extends Event {
 const generateConnectionSymbol = () => Symbol("connection");
 const CONNECTION_SYMBOL_KEY = Symbol("CONNECTION_SYMBOL_KEY");
 const WAIT_FOR_WEBSOCKET_SYMBOL = Symbol("WAIT_FOR_WEBSOCKET_SYMBOL");
-const rejectUpgradeRequest = (socket, status) => {
-	socket.end(`HTTP/1.1 ${status.toString()} ${node_http.STATUS_CODES[status] ?? ""}\r\nConnection: close\r
-Content-Length: 0\r
-\r
+const responseHeadersToSkip = new Set([
+	"connection",
+	"content-length",
+	"keep-alive",
+	"proxy-authenticate",
+	"proxy-authorization",
+	"te",
+	"trailer",
+	"transfer-encoding",
+	"upgrade",
+	"sec-websocket-accept",
+	"sec-websocket-extensions",
+	"sec-websocket-protocol"
+]);
+const appendResponseHeaders = (headers, responseHeaders) => {
+	if (!responseHeaders) return;
+	responseHeaders.forEach((value, key) => {
+		if (responseHeadersToSkip.has(key.toLowerCase())) return;
+		headers.push(`${key}: ${value}`);
+	});
+};
+const rejectUpgradeRequest = (socket, status, responseHeaders) => {
+	const responseLines = ["Connection: close", "Content-Length: 0"];
+	appendResponseHeaders(responseLines, responseHeaders);
+	socket.end(`HTTP/1.1 ${status.toString()} ${node_http.STATUS_CODES[status] ?? ""}\r\n${responseLines.join("\r\n")}\r\n\r
 `);
 };
 const createUpgradeRequest = (request) => {
@@ -880,9 +901,13 @@ const setupWebSocket = (options) => {
 			[WAIT_FOR_WEBSOCKET_SYMBOL]: waitForWebSocket
 		};
 		let status = 400;
+		let responseHeaders;
 		try {
 			const response = await fetchCallback(createUpgradeRequest(request), env);
-			if (response instanceof Response) status = response.status;
+			if (response instanceof Response) {
+				status = response.status;
+				responseHeaders = response.headers;
+			}
 		} catch {
 			if (server.listenerCount("upgrade") === 1) rejectUpgradeRequest(socket, 500);
 			return;
@@ -890,12 +915,20 @@ const setupWebSocket = (options) => {
 		const waiter = waiterMap.get(request);
 		if (!waiter || waiter.connectionSymbol !== env[CONNECTION_SYMBOL_KEY]) {
 			waiterMap.delete(request);
-			if (server.listenerCount("upgrade") === 1) rejectUpgradeRequest(socket, status);
+			if (server.listenerCount("upgrade") === 1) rejectUpgradeRequest(socket, status, responseHeaders);
 			return;
 		}
-		wss.handleUpgrade(request, socket, head, (ws) => {
-			wss.emit("connection", ws, request);
-		});
+		const addResponseHeaders = (headers) => {
+			appendResponseHeaders(headers, responseHeaders);
+		};
+		wss.on("headers", addResponseHeaders);
+		try {
+			wss.handleUpgrade(request, socket, head, (ws) => {
+				wss.emit("connection", ws, request);
+			});
+		} finally {
+			wss.off("headers", addResponseHeaders);
+		}
 	});
 	server.on("close", () => {
 		wss.close();

package/dist/index.mjs

@@ -835,10 +835,31 @@ const CloseEvent = globalThis.CloseEvent ?? class extends Event {
 const generateConnectionSymbol = () => Symbol("connection");
 const CONNECTION_SYMBOL_KEY = Symbol("CONNECTION_SYMBOL_KEY");
 const WAIT_FOR_WEBSOCKET_SYMBOL = Symbol("WAIT_FOR_WEBSOCKET_SYMBOL");
-const rejectUpgradeRequest = (socket, status) => {
-	socket.end(`HTTP/1.1 ${status.toString()} ${STATUS_CODES[status] ?? ""}\r\nConnection: close\r
-Content-Length: 0\r
-\r
+const responseHeadersToSkip = new Set([
+	"connection",
+	"content-length",
+	"keep-alive",
+	"proxy-authenticate",
+	"proxy-authorization",
+	"te",
+	"trailer",
+	"transfer-encoding",
+	"upgrade",
+	"sec-websocket-accept",
+	"sec-websocket-extensions",
+	"sec-websocket-protocol"
+]);
+const appendResponseHeaders = (headers, responseHeaders) => {
+	if (!responseHeaders) return;
+	responseHeaders.forEach((value, key) => {
+		if (responseHeadersToSkip.has(key.toLowerCase())) return;
+		headers.push(`${key}: ${value}`);
+	});
+};
+const rejectUpgradeRequest = (socket, status, responseHeaders) => {
+	const responseLines = ["Connection: close", "Content-Length: 0"];
+	appendResponseHeaders(responseLines, responseHeaders);
+	socket.end(`HTTP/1.1 ${status.toString()} ${STATUS_CODES[status] ?? ""}\r\n${responseLines.join("\r\n")}\r\n\r
 `);
 };
 const createUpgradeRequest = (request) => {
@@ -879,9 +900,13 @@ const setupWebSocket = (options) => {
 			[WAIT_FOR_WEBSOCKET_SYMBOL]: waitForWebSocket
 		};
 		let status = 400;
+		let responseHeaders;
 		try {
 			const response = await fetchCallback(createUpgradeRequest(request), env);
-			if (response instanceof Response) status = response.status;
+			if (response instanceof Response) {
+				status = response.status;
+				responseHeaders = response.headers;
+			}
 		} catch {
 			if (server.listenerCount("upgrade") === 1) rejectUpgradeRequest(socket, 500);
 			return;
@@ -889,12 +914,20 @@ const setupWebSocket = (options) => {
 		const waiter = waiterMap.get(request);
 		if (!waiter || waiter.connectionSymbol !== env[CONNECTION_SYMBOL_KEY]) {
 			waiterMap.delete(request);
-			if (server.listenerCount("upgrade") === 1) rejectUpgradeRequest(socket, status);
+			if (server.listenerCount("upgrade") === 1) rejectUpgradeRequest(socket, status, responseHeaders);
 			return;
 		}
-		wss.handleUpgrade(request, socket, head, (ws) => {
-			wss.emit("connection", ws, request);
-		});
+		const addResponseHeaders = (headers) => {
+			appendResponseHeaders(headers, responseHeaders);
+		};
+		wss.on("headers", addResponseHeaders);
+		try {
+			wss.handleUpgrade(request, socket, head, (ws) => {
+				wss.emit("connection", ws, request);
+			});
+		} finally {
+			wss.off("headers", addResponseHeaders);
+		}
 	});
 	server.on("close", () => {
 		wss.close();

package/package.json

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