@hono/node-server 2.0.0 → 2.0.2

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/dist/serve-static.cjs

@@ -1,9 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-let node_stream = require("node:stream");
+const require_utils_stream = require('./utils/stream.cjs');
 let hono_utils_mime = require("hono/utils/mime");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
-let node_process = require("node:process");
 
 //#region src/serve-static.ts
 const COMPRESSIBLE_CONTENT_TYPE_REGEX = /^\s*(?:text\/[^;\s]+|application\/(?:javascript|json|xml|xml-dtd|ecmascript|dart|postscript|rtf|tar|toml|vnd\.dart|vnd\.ms-fontobject|vnd\.ms-opentype|wasm|x-httpd-php|x-javascript|x-ns-proxy-autoconfig|x-sh|x-tar|x-virtualbox-hdd|x-virtualbox-ova|x-virtualbox-ovf|x-virtualbox-vbox|x-virtualbox-vdi|x-virtualbox-vhd|x-virtualbox-vmdk|x-www-form-urlencoded)|font\/(?:otf|ttf)|image\/(?:bmp|vnd\.adobe\.photoshop|vnd\.microsoft\.icon|vnd\.ms-dds|x-icon|x-ms-bmp)|message\/rfc822|model\/gltf-binary|x-shader\/x-fragment|x-shader\/x-vertex|[^;\s]+?\+(?:json|text|xml|yaml))(?:[;\s]|$)/i;
@@ -13,30 +12,6 @@ const ENCODINGS = {
 	gzip: ".gz"
 };
 const ENCODINGS_ORDERED_KEYS = Object.keys(ENCODINGS);
-const pr54206Applied = () => {
-	const [major, minor] = node_process.versions.node.split(".").map((component) => parseInt(component));
-	return major >= 23 || major === 22 && minor >= 7 || major === 20 && minor >= 18;
-};
-const useReadableToWeb = pr54206Applied();
-const createStreamBody = (stream) => {
-	if (useReadableToWeb) return node_stream.Readable.toWeb(stream);
-	return new ReadableStream({
-		start(controller) {
-			stream.on("data", (chunk) => {
-				controller.enqueue(chunk);
-			});
-			stream.on("error", (err) => {
-				controller.error(err);
-			});
-			stream.on("end", () => {
-				controller.close();
-			});
-		},
-		cancel() {
-			stream.destroy();
-		}
-	});
-};
 const getStats = (path) => {
 	let stats;
 	try {
@@ -103,16 +78,16 @@ const serveStatic = (options = { root: "" }) => {
 		let result;
 		const size = stats.size;
 		const range = c.req.header("range") || "";
+		c.header("Last-Modified", stats.mtime.toUTCString());
 		if (c.req.method == "HEAD" || c.req.method == "OPTIONS") {
 			c.header("Content-Length", size.toString());
 			c.status(200);
 			result = c.body(null);
 		} else if (!range) {
 			c.header("Content-Length", size.toString());
-			result = c.body(createStreamBody((0, node_fs.createReadStream)(path)), 200);
+			result = c.body(require_utils_stream.createStreamBody((0, node_fs.createReadStream)(path)), 200);
 		} else {
 			c.header("Accept-Ranges", "bytes");
-			c.header("Date", stats.birthtime.toUTCString());
 			const parts = range.replace(/bytes=/, "").split("-", 2);
 			const start = parseInt(parts[0], 10) || 0;
 			let end = parseInt(parts[1], 10) || size - 1;
@@ -124,7 +99,7 @@ const serveStatic = (options = { root: "" }) => {
 			});
 			c.header("Content-Length", chunksize.toString());
 			c.header("Content-Range", `bytes ${start}-${end}/${stats.size}`);
-			result = c.body(createStreamBody(stream), 206);
+			result = c.body(require_utils_stream.createStreamBody(stream), 206);
 		}
 		await options.onFound?.(path, c);
 		return result;

package/dist/serve-static.mjs

@@ -1,8 +1,7 @@
-import { Readable } from "node:stream";
+import { createStreamBody } from "./utils/stream.mjs";
 import { getMimeType } from "hono/utils/mime";
 import { createReadStream, existsSync, statSync } from "node:fs";
 import { join } from "node:path";
-import { versions } from "node:process";
 
 //#region src/serve-static.ts
 const COMPRESSIBLE_CONTENT_TYPE_REGEX = /^\s*(?:text\/[^;\s]+|application\/(?:javascript|json|xml|xml-dtd|ecmascript|dart|postscript|rtf|tar|toml|vnd\.dart|vnd\.ms-fontobject|vnd\.ms-opentype|wasm|x-httpd-php|x-javascript|x-ns-proxy-autoconfig|x-sh|x-tar|x-virtualbox-hdd|x-virtualbox-ova|x-virtualbox-ovf|x-virtualbox-vbox|x-virtualbox-vdi|x-virtualbox-vhd|x-virtualbox-vmdk|x-www-form-urlencoded)|font\/(?:otf|ttf)|image\/(?:bmp|vnd\.adobe\.photoshop|vnd\.microsoft\.icon|vnd\.ms-dds|x-icon|x-ms-bmp)|message\/rfc822|model\/gltf-binary|x-shader\/x-fragment|x-shader\/x-vertex|[^;\s]+?\+(?:json|text|xml|yaml))(?:[;\s]|$)/i;
@@ -12,30 +11,6 @@ const ENCODINGS = {
 	gzip: ".gz"
 };
 const ENCODINGS_ORDERED_KEYS = Object.keys(ENCODINGS);
-const pr54206Applied = () => {
-	const [major, minor] = versions.node.split(".").map((component) => parseInt(component));
-	return major >= 23 || major === 22 && minor >= 7 || major === 20 && minor >= 18;
-};
-const useReadableToWeb = pr54206Applied();
-const createStreamBody = (stream) => {
-	if (useReadableToWeb) return Readable.toWeb(stream);
-	return new ReadableStream({
-		start(controller) {
-			stream.on("data", (chunk) => {
-				controller.enqueue(chunk);
-			});
-			stream.on("error", (err) => {
-				controller.error(err);
-			});
-			stream.on("end", () => {
-				controller.close();
-			});
-		},
-		cancel() {
-			stream.destroy();
-		}
-	});
-};
 const getStats = (path) => {
 	let stats;
 	try {
@@ -102,6 +77,7 @@ const serveStatic = (options = { root: "" }) => {
 		let result;
 		const size = stats.size;
 		const range = c.req.header("range") || "";
+		c.header("Last-Modified", stats.mtime.toUTCString());
 		if (c.req.method == "HEAD" || c.req.method == "OPTIONS") {
 			c.header("Content-Length", size.toString());
 			c.status(200);
@@ -111,7 +87,6 @@ const serveStatic = (options = { root: "" }) => {
 			result = c.body(createStreamBody(createReadStream(path)), 200);
 		} else {
 			c.header("Accept-Ranges", "bytes");
-			c.header("Date", stats.birthtime.toUTCString());
 			const parts = range.replace(/bytes=/, "").split("-", 2);
 			const start = parseInt(parts[0], 10) || 0;
 			let end = parseInt(parts[1], 10) || size - 1;

package/dist/utils/stream.cjs

@@ -0,0 +1,65 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+let node_stream = require("node:stream");
+let node_process = require("node:process");
+
+//#region src/utils/stream.ts
+const pr54206Applied = () => {
+	const [major, minor] = node_process.versions.node.split(".").map((component) => parseInt(component));
+	return major >= 23 || major === 22 && minor >= 7 || major === 20 && minor >= 18;
+};
+const useReadableToWeb = pr54206Applied();
+const createStreamBody = (stream, useNativeReadableToWeb = useReadableToWeb) => {
+	if (useNativeReadableToWeb) return node_stream.Readable.toWeb(stream);
+	let controller;
+	let settled = false;
+	const cleanup = () => {
+		stream.off("data", onData);
+		stream.off("error", onError);
+		stream.off("end", onTerminate);
+		stream.off("close", onTerminate);
+	};
+	const settle = (callback) => {
+		if (settled) return;
+		settled = true;
+		cleanup();
+		callback?.();
+	};
+	const onData = (chunk) => {
+		if (settled || !controller) return;
+		controller.enqueue(chunk);
+		if ((controller.desiredSize ?? 0) <= 0) stream.pause();
+	};
+	const onError = (error) => {
+		settle(() => {
+			controller?.error(error);
+		});
+	};
+	const onTerminate = () => {
+		settle(() => {
+			controller?.close();
+		});
+	};
+	return new ReadableStream({
+		start(streamController) {
+			controller = streamController;
+			stream.on("data", onData);
+			stream.on("error", onError);
+			stream.on("end", onTerminate);
+			stream.on("close", onTerminate);
+			stream.pause();
+		},
+		pull() {
+			if (!settled) stream.resume();
+		},
+		cancel() {
+			settle();
+			const ignoreError = () => {};
+			stream.on("error", ignoreError);
+			stream.once("close", () => stream.off("error", ignoreError));
+			stream.destroy();
+		}
+	});
+};
+
+//#endregion
+exports.createStreamBody = createStreamBody;

package/dist/utils/stream.d.cts

@@ -0,0 +1,6 @@
+import { ReadStream } from "node:fs";
+
+//#region src/utils/stream.d.ts
+declare const createStreamBody: (stream: ReadStream, useNativeReadableToWeb?: boolean) => ReadableStream<Uint8Array>;
+//#endregion
+export { createStreamBody };

package/dist/utils/stream.d.mts

@@ -0,0 +1,6 @@
+import { ReadStream } from "node:fs";
+
+//#region src/utils/stream.d.ts
+declare const createStreamBody: (stream: ReadStream, useNativeReadableToWeb?: boolean) => ReadableStream<Uint8Array>;
+//#endregion
+export { createStreamBody };

package/dist/utils/stream.mjs

@@ -0,0 +1,64 @@
+import { Readable } from "node:stream";
+import { versions } from "node:process";
+
+//#region src/utils/stream.ts
+const pr54206Applied = () => {
+	const [major, minor] = versions.node.split(".").map((component) => parseInt(component));
+	return major >= 23 || major === 22 && minor >= 7 || major === 20 && minor >= 18;
+};
+const useReadableToWeb = pr54206Applied();
+const createStreamBody = (stream, useNativeReadableToWeb = useReadableToWeb) => {
+	if (useNativeReadableToWeb) return Readable.toWeb(stream);
+	let controller;
+	let settled = false;
+	const cleanup = () => {
+		stream.off("data", onData);
+		stream.off("error", onError);
+		stream.off("end", onTerminate);
+		stream.off("close", onTerminate);
+	};
+	const settle = (callback) => {
+		if (settled) return;
+		settled = true;
+		cleanup();
+		callback?.();
+	};
+	const onData = (chunk) => {
+		if (settled || !controller) return;
+		controller.enqueue(chunk);
+		if ((controller.desiredSize ?? 0) <= 0) stream.pause();
+	};
+	const onError = (error) => {
+		settle(() => {
+			controller?.error(error);
+		});
+	};
+	const onTerminate = () => {
+		settle(() => {
+			controller?.close();
+		});
+	};
+	return new ReadableStream({
+		start(streamController) {
+			controller = streamController;
+			stream.on("data", onData);
+			stream.on("error", onError);
+			stream.on("end", onTerminate);
+			stream.on("close", onTerminate);
+			stream.pause();
+		},
+		pull() {
+			if (!settled) stream.resume();
+		},
+		cancel() {
+			settle();
+			const ignoreError = () => {};
+			stream.on("error", ignoreError);
+			stream.once("close", () => stream.off("error", ignoreError));
+			stream.destroy();
+		}
+	});
+};
+
+//#endregion
+export { createStreamBody };

package/package.json

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