nitro 3.0.260415-beta → 3.0.260522-beta

package/dist/_libs/hasown+resolve+deepmerge.mjs

@@ -1,5 +1,5 @@
-import { i as __toESM, r as __require, t as __commonJSMin } from "../_common.mjs";
-import { i as createFilter } from "../_build/common.mjs";
+import { __commonJSMin, __require, __toESM } from "../_common.mjs";
+import { createFilter } from "../_build/common.mjs";
 import { builtinModules } from "module";
 import fs, { realpathSync } from "fs";
 import path, { dirname, extname, normalize, resolve, sep } from "path";
@@ -95,20 +95,24 @@ var require_homedir = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = __require("os").homedir || function homedir() {
 		var home = process.env.HOME;
 		var user = process.env.LOGNAME || process.env.USER || process.env.LNAME || process.env.USERNAME;
-		if (process.platform === "win32") return process.env.USERPROFILE || process.env.HOMEDRIVE + process.env.HOMEPATH || home || null;
+		if (process.platform === "win32") return process.env.USERPROFILE || process.env.HOMEDRIVE && process.env.HOMEPATH && process.env.HOMEDRIVE + process.env.HOMEPATH || home || null;
 		if (process.platform === "darwin") return home || (user ? "/Users/" + user : null);
 		if (process.platform === "linux") return home || (process.getuid() === 0 ? "/root" : user ? "/home/" + user : null);
 		return home || null;
 	};
 }));
+var require_es_errors = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	module.exports = Error;
+}));
 var require_caller = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	var $Error = require_es_errors();
 	module.exports = function() {
-		var origPrepareStackTrace = Error.prepareStackTrace;
-		Error.prepareStackTrace = function(_, stack) {
+		var origPrepareStackTrace = $Error.prepareStackTrace;
+		$Error.prepareStackTrace = function(_, stack) {
 			return stack;
 		};
-		var stack = (/* @__PURE__ */ new Error()).stack;
-		Error.prepareStackTrace = origPrepareStackTrace;
+		var stack = new $Error().stack;
+		$Error.prepareStackTrace = origPrepareStackTrace;
 		return stack[2].getFileName();
 	};
 }));
@@ -158,7 +162,7 @@ var require_node_modules_paths = /* @__PURE__ */ __commonJSMin(((exports, module
 	var parse = path$3.parse || require_path_parse();
 	var driveLetterRegex = /^([A-Za-z]:)/;
 	var uncPathRegex = /^\\\\/;
-	var getNodeModulesDirs = function getNodeModulesDirs(absoluteStart, modules) {
+	function getNodeModulesDirs(absoluteStart, modules) {
 		var prefix = "/";
 		if (driveLetterRegex.test(absoluteStart)) prefix = "";
 		else if (uncPathRegex.test(absoluteStart)) prefix = "\\\\";
@@ -173,7 +177,7 @@ var require_node_modules_paths = /* @__PURE__ */ __commonJSMin(((exports, module
 				return path$3.resolve(prefix, aPath, moduleDir);
 			}));
 		}, []);
-	};
+	}
 	module.exports = function nodeModulesPaths(start, opts, request) {
 		var modules = opts && opts.moduleDirectory ? [].concat(opts.moduleDirectory) : ["node_modules"];
 		if (opts && typeof opts.paths === "function") return opts.paths(request, start, function() {
@@ -342,18 +346,18 @@ var require_core$2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		"node:sea": [">= 20.12 && < 21", ">= 21.7"],
 		"smalloc": ">= 0.11.5 && < 3",
 		"node:sqlite": [">= 22.13 && < 23", ">= 23.4"],
-		"_stream_duplex": ">= 0.9.4",
-		"node:_stream_duplex": [">= 14.18 && < 15", ">= 16"],
-		"_stream_transform": ">= 0.9.4",
-		"node:_stream_transform": [">= 14.18 && < 15", ">= 16"],
-		"_stream_wrap": ">= 1.4.1",
-		"node:_stream_wrap": [">= 14.18 && < 15", ">= 16"],
-		"_stream_passthrough": ">= 0.9.4",
-		"node:_stream_passthrough": [">= 14.18 && < 15", ">= 16"],
-		"_stream_readable": ">= 0.9.4",
-		"node:_stream_readable": [">= 14.18 && < 15", ">= 16"],
-		"_stream_writable": ">= 0.9.4",
-		"node:_stream_writable": [">= 14.18 && < 15", ">= 16"],
+		"_stream_duplex": ">= 0.9.4 && < 26",
+		"node:_stream_duplex": [">= 14.18 && < 15", ">= 16 && < 26"],
+		"_stream_transform": ">= 0.9.4 && < 26",
+		"node:_stream_transform": [">= 14.18 && < 15", ">= 16 && < 26"],
+		"_stream_wrap": ">= 1.4.1 && < 26",
+		"node:_stream_wrap": [">= 14.18 && < 15", ">= 16 && < 26"],
+		"_stream_passthrough": ">= 0.9.4 && < 26",
+		"node:_stream_passthrough": [">= 14.18 && < 15", ">= 16 && < 26"],
+		"_stream_readable": ">= 0.9.4 && < 26",
+		"node:_stream_readable": [">= 14.18 && < 15", ">= 16 && < 26"],
+		"_stream_writable": ">= 0.9.4 && < 26",
+		"node:_stream_writable": [">= 14.18 && < 15", ">= 16 && < 26"],
 		"stream": true,
 		"node:stream": [">= 14.18 && < 15", ">= 16"],
 		"stream/consumers": ">= 16.7",
@@ -457,6 +461,9 @@ var require_is_core_module = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 		return hasOwn(data, x) && versionIncluded(nodeVersion, data[x]);
 	};
 }));
+var require_type = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	module.exports = TypeError;
+}));
 var require_async = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var fs$2 = __require("fs");
 	var getHomedir = require_homedir();
@@ -465,14 +472,17 @@ var require_async = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var nodeModulesPaths = require_node_modules_paths();
 	var normalizeOptions = require_normalize_options();
 	var isCore = require_is_core_module();
+	var $Error = require_es_errors();
+	var $TypeError = require_type();
 	var realpathFS = process.platform !== "win32" && fs$2.realpath && typeof fs$2.realpath.native === "function" ? fs$2.realpath.native : fs$2.realpath;
 	var relativePathRegex = /^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/;
 	var windowsDriveRegex = /^\w:[/\\]*$/;
 	var nodeModulesRegex = /[/\\]node_modules[/\\]*$/;
 	var homedir = getHomedir();
-	var defaultPaths = function() {
+	function defaultPaths() {
+		if (!homedir) return [];
 		return [path$2.join(homedir, ".node_modules"), path$2.join(homedir, ".node_libraries")];
-	};
+	}
 	var defaultIsFile = function isFile(file, cb) {
 		fs$2.stat(file, function(err, stat) {
 			if (!err) return cb(null, stat.isFile() || stat.isFIFO());
@@ -493,11 +503,11 @@ var require_async = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			else cb(null, realpathErr ? x : realPath);
 		});
 	};
-	var maybeRealpath = function maybeRealpath(realpath, x, opts, cb) {
+	function maybeRealpath(realpath, x, opts, cb) {
 		if (opts && opts.preserveSymlinks === false) realpath(x, cb);
 		else cb(null, x);
-	};
-	var defaultReadPackage = function defaultReadPackage(readFile, pkgfile, cb) {
+	}
+	function defaultReadPackage(readFile, pkgfile, cb) {
 		readFile(pkgfile, function(readFileErr, body) {
 			if (readFileErr) cb(readFileErr);
 			else try {
@@ -506,12 +516,12 @@ var require_async = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				cb(null);
 			}
 		});
-	};
-	var getPackageCandidates = function getPackageCandidates(x, start, opts) {
+	}
+	function getPackageCandidates(x, start, opts) {
 		var dirs = nodeModulesPaths(start, opts, x);
 		for (var i = 0; i < dirs.length; i++) dirs[i] = path$2.join(dirs[i], x);
 		return dirs;
-	};
+	}
 	module.exports = function resolve(x, options, callback) {
 		var cb = callback;
 		var opts = options;
@@ -520,7 +530,7 @@ var require_async = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			opts = {};
 		}
 		if (typeof x !== "string") {
-			var err = /* @__PURE__ */ new TypeError("Path must be a string.");
+			var err = new $TypeError("Path must be a string.");
 			return process.nextTick(function() {
 				cb(err);
 			});
@@ -532,7 +542,7 @@ var require_async = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		var realpath = opts.realpath || defaultRealpath;
 		var readPackage = opts.readPackage || defaultReadPackage;
 		if (opts.readFile && opts.readPackage) {
-			var conflictErr = /* @__PURE__ */ new TypeError("`readFile` and `readPackage` are mutually exclusive.");
+			var conflictErr = new $TypeError("`readFile` and `readPackage` are mutually exclusive.");
 			return process.nextTick(function() {
 				cb(conflictErr);
 			});
@@ -562,7 +572,7 @@ var require_async = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					else cb(null, realN, pkg);
 				});
 				else {
-					var moduleError = /* @__PURE__ */ new Error("Cannot find module '" + x + "' from '" + parent + "'");
+					var moduleError = new $Error("Cannot find module '" + x + "' from '" + parent + "'");
 					moduleError.code = "MODULE_NOT_FOUND";
 					cb(moduleError);
 				}
@@ -578,7 +588,7 @@ var require_async = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					else cb(null, realD, pkg);
 				});
 				else {
-					var moduleError = /* @__PURE__ */ new Error("Cannot find module '" + x + "' from '" + parent + "'");
+					var moduleError = new $Error("Cannot find module '" + x + "' from '" + parent + "'");
 					moduleError.code = "MODULE_NOT_FOUND";
 					cb(moduleError);
 				}
@@ -605,7 +615,7 @@ var require_async = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 						var rfile = path$2.relative(dir, file);
 						var rel = rfile.slice(0, rfile.length - exts[0].length);
 						var r = opts.pathFilter(pkg, x, rel);
-						if (r) return load([""].concat(extensions.slice()), path$2.resolve(dir, r), pkg);
+						if (r) return load([""].concat(extensions), path$2.resolve(dir, r), pkg);
 					}
 					isFile(file, onex);
 				}
@@ -626,7 +636,7 @@ var require_async = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				isFile(pkgfile, function(err, ex) {
 					if (!ex) return loadpkg(path$2.dirname(dir), cb);
 					readPackage(readFile, pkgfile, function(err, pkgParam) {
-						if (err) cb(err);
+						if (err) return cb(err);
 						var pkg = pkgParam;
 						if (pkg && opts.packageFilter) pkg = opts.packageFilter(pkg, pkgfile);
 						cb(null, pkg, dir);
@@ -653,7 +663,7 @@ var require_async = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 						if (pkg && opts.packageFilter) pkg = opts.packageFilter(pkg, pkgfile);
 						if (pkg && pkg.main) {
 							if (typeof pkg.main !== "string") {
-								var mainError = /* @__PURE__ */ new TypeError("package “" + pkg.name + "” `main` must be a string");
+								var mainError = new $TypeError("package “" + pkg.name + "” `main` must be a string");
 								mainError.code = "INVALID_PACKAGE_MAIN";
 								return cb(mainError);
 							}
@@ -892,6 +902,8 @@ var require_sync = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var isCore = require_is_core_module();
 	var fs$1 = __require("fs");
 	var path$1 = __require("path");
+	var $Error = require_es_errors();
+	var $TypeError = require_type();
 	var getHomedir = require_homedir();
 	var caller = require_caller();
 	var nodeModulesPaths = require_node_modules_paths();
@@ -901,9 +913,10 @@ var require_sync = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var windowsDriveRegex = /^\w:[/\\]*$/;
 	var nodeModulesRegex = /[/\\]node_modules[/\\]*$/;
 	var homedir = getHomedir();
-	var defaultPaths = function() {
+	function defaultPaths() {
+		if (!homedir) return [];
 		return [path$1.join(homedir, ".node_modules"), path$1.join(homedir, ".node_libraries")];
-	};
+	}
 	var defaultIsFile = function isFile(file) {
 		try {
 			var stat = fs$1.statSync(file, { throwIfNoEntry: false });
@@ -930,30 +943,30 @@ var require_sync = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		}
 		return x;
 	};
-	var maybeRealpathSync = function maybeRealpathSync(realpathSync, x, opts) {
+	function maybeRealpathSync(realpathSync, x, opts) {
 		if (opts && opts.preserveSymlinks === false) return realpathSync(x);
 		return x;
-	};
-	var defaultReadPackageSync = function defaultReadPackageSync(readFileSync, pkgfile) {
+	}
+	function defaultReadPackageSync(readFileSync, pkgfile) {
 		var body = readFileSync(pkgfile);
 		try {
 			return JSON.parse(body);
 		} catch (jsonErr) {}
-	};
-	var getPackageCandidates = function getPackageCandidates(x, start, opts) {
+	}
+	function getPackageCandidates(x, start, opts) {
 		var dirs = nodeModulesPaths(start, opts, x);
 		for (var i = 0; i < dirs.length; i++) dirs[i] = path$1.join(dirs[i], x);
 		return dirs;
-	};
+	}
 	module.exports = function resolveSync(x, options) {
-		if (typeof x !== "string") throw new TypeError("Path must be a string.");
+		if (typeof x !== "string") throw new $TypeError("Path must be a string.");
 		var opts = normalizeOptions(x, options);
 		var isFile = opts.isFile || defaultIsFile;
 		var readFileSync = opts.readFileSync || fs$1.readFileSync;
 		var isDirectory = opts.isDirectory || defaultIsDir;
 		var realpathSync = opts.realpathSync || defaultRealpathSync;
 		var readPackageSync = opts.readPackageSync || defaultReadPackageSync;
-		if (opts.readFileSync && opts.readPackageSync) throw new TypeError("`readFileSync` and `readPackageSync` are mutually exclusive.");
+		if (opts.readFileSync && opts.readPackageSync) throw new $TypeError("`readFileSync` and `readPackageSync` are mutually exclusive.");
 		var packageIterator = opts.packageIterator;
 		var extensions = opts.extensions || [".js"];
 		var includeCoreModules = opts.includeCoreModules !== false;
@@ -971,7 +984,7 @@ var require_sync = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			var n = loadNodeModulesSync(x, absoluteStart);
 			if (n) return maybeRealpathSync(realpathSync, n, opts);
 		}
-		var err = /* @__PURE__ */ new Error("Cannot find module '" + x + "' from '" + parent + "'");
+		var err = new $Error("Cannot find module '" + x + "' from '" + parent + "'");
 		err.code = "MODULE_NOT_FOUND";
 		throw err;
 		function loadAsFileSync(x) {
@@ -1009,7 +1022,7 @@ var require_sync = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				if (pkg && opts.packageFilter) pkg = opts.packageFilter(pkg, x);
 				if (pkg && pkg.main) {
 					if (typeof pkg.main !== "string") {
-						var mainError = /* @__PURE__ */ new TypeError("package “" + pkg.name + "” `main` must be a string");
+						var mainError = new $TypeError("package “" + pkg.name + "” `main` must be a string");
 						mainError.code = "INVALID_PACKAGE_MAIN";
 						throw mainError;
 					}
@@ -1883,4 +1896,4 @@ function nodeResolve(opts = {}) {
 		}
 	};
 }
-export { nodeResolve as t };
+export { nodeResolve };

package/dist/_libs/httpxy.d.mts

@@ -3,7 +3,6 @@ import * as stream from "node:stream";
 import http, { IncomingMessage } from "node:http";
 import http2 from "node:http2";
 import { Socket } from "node:net";
-//#region src/types.d.ts
 interface ProxyTargetDetailed {
   host?: string;
   port?: number | string;
@@ -81,6 +80,5 @@ interface ProxyServerOptions {
   followRedirects?: boolean | number;
   /** Buffer */
   buffer?: stream.Stream;
-} //#endregion
-//#region src/middleware/_utils.d.ts
-export { ProxyServerOptions as t };
+}
+export type { ProxyServerOptions };

package/dist/_libs/httpxy.mjs

@@ -40,6 +40,10 @@ function setupOutgoing(outgoing, options, req, forward) {
 		const value = options[forward || "target"][e];
 		if (value !== void 0) outgoing[e] = value;
 	}
+	if (outgoing.host === void 0 && typeof outgoing.hostname === "string") {
+		const bracketedHost = outgoing.hostname.includes(":") && !outgoing.hostname.startsWith("[") ? `[${outgoing.hostname}]` : outgoing.hostname;
+		outgoing.host = outgoing.port ? `${bracketedHost}:${outgoing.port}` : bracketedHost;
+	}
 	outgoing.method = options.method || req.method;
 	outgoing.headers = { ...req.headers };
 	if (req.headers?.[":authority"]) outgoing.headers.host = req.headers[":authority"];
@@ -49,7 +53,7 @@ function setupOutgoing(outgoing, options, req, forward) {
 	if (options.ca) outgoing.ca = options.ca;
 	if (isSSL.test(options[forward || "target"].protocol ?? "http")) outgoing.rejectUnauthorized = options.secure === void 0 ? true : options.secure;
 	if (options.agent !== void 0) outgoing.agent = options.agent || false;
-	else if (req.httpVersionMajor > 1) outgoing.agent = false;
+	else if (req.httpVersionMajor > 1 || upgradeHeader.test(req.headers.connection || "")) outgoing.agent = false;
 	else {
 		const targetProto = options[forward || "target"].protocol ?? "http";
 		outgoing.agent = isSSL.test(targetProto) ? defaultAgents.https : defaultAgents.http;
@@ -248,7 +252,7 @@ const webIncomingMiddleware = [
 			"proto"
 		]) {
 			const key = "x-forwarded-" + header;
-			if (!req.headers[key]) req.headers[key] = values[header];
+			if (!req.headers[key] && values[header] !== void 0) req.headers[key] = values[header];
 		}
 		req.headers["x-forwarded-host"] = req.headers["x-forwarded-host"] || req.headers[":authority"] || req.headers.host || "";
 	}),
@@ -406,7 +410,7 @@ const websocketIncomingMiddleware = [
 			"proto"
 		]) {
 			const key = "x-forwarded-" + header;
-			if (!req.headers[key]) req.headers[key] = values[header];
+			if (!req.headers[key] && values[header] !== void 0) req.headers[key] = values[header];
 		}
 	}),
 	defineProxyMiddleware((req, socket, options, server, head, callback) => {
@@ -477,7 +481,7 @@ var ProxyServer = class extends EventEmitter {
 		this.web = _createProxyFn("web", this);
 		this.ws = _createProxyFn("ws", this);
 	}
-	listen(port, hostname) {
+	listen(port, hostname, listeningListener) {
 		const closure = (req, res) => {
 			return this.web(req, res);
 		};
@@ -492,7 +496,7 @@ var ProxyServer = class extends EventEmitter {
 		if (this.options.ws) this._server.on("upgrade", (req, socket, head) => {
 			this.ws(req, socket, this.options, head).catch(() => {});
 		});
-		this._server.listen(port, hostname);
+		this._server.listen(port, hostname, listeningListener);
 		return this;
 	}
 	close(callback) {
@@ -550,15 +554,15 @@ function _createProxyFn(type, server) {
 		for (const pass of server._getPasses(type)) {
 			let stop;
 			try {
-				stop = pass(req, res, requestOptions, server, head, (error) => {
+				stop = pass(req, res, requestOptions, server, head, (error, _req, _res, url) => {
 					if (server.listenerCount("error") > 0) {
-						server.emit("error", error, req, res);
+						server.emit("error", error, req, res, url);
 						_resolve();
 					} else _reject(error);
 				});
 			} catch (error) {
 				if (server.listenerCount("error") > 0) {
-					server.emit("error", error, req, res);
+					server.emit("error", error, req, res, requestOptions.target || requestOptions.forward);
 					_resolve();
 				} else _reject(error);
 				break;
@@ -836,4 +840,4 @@ function _createHttpHeader(line, headers) {
 	}
 	return `${result}\r\n\r\n`;
 }
-export { proxyFetch as n, proxyUpgrade as r, createProxyServer as t };
+export { createProxyServer, proxyFetch, proxyUpgrade };