@rsbuild/core 2.0.11 → 2.0.12

package/dist/client/hmr.js

@@ -38,7 +38,7 @@ const registerOverlay = (createFn, clearFn)=>{
     createOverlay = createFn;
     clearOverlay = clearFn;
 };
-function init(token, config, serverHost, serverPort, serverBase, liveReload, browserLogs, logLevel) {
+function init(token, config, serverHost, serverPort, serverBase, liveReload, browserLogs, logLevel, resolveWebSocketUrl) {
     logger.level = logLevel;
     const queuedMessages = [];
     const clientErrors = [];
@@ -64,6 +64,10 @@ function init(token, config, serverHost, serverPort, serverBase, liveReload, bro
         const colon = -1 === protocol.indexOf(':') ? ':' : '';
         return `${protocol}${colon}//${hostname}:${port}${pathname}?token=${token}`;
     }
+    function getSocketURL(fallback) {
+        const url = formatURL(fallback);
+        return resolveWebSocketUrl ? resolveWebSocketUrl(url) : url;
+    }
     function clearBuildErrors() {
         if (console.clear && hasBuildErrors) console.clear();
         hasBuildErrors = false;
@@ -189,7 +193,8 @@ function init(token, config, serverHost, serverPort, serverBase, liveReload, bro
         setTimeout(connect, 1000 * 1.5 ** reconnectCount);
     }
     function onSocketError() {
-        if (formatURL() !== formatURL(true)) {
+        if (resolveWebSocketUrl) return;
+        if (getSocketURL() !== getSocketURL(true)) {
             logger.error('[rsbuild] WebSocket connection failed. Trying direct connection fallback.');
             removeListeners();
             socket = null;
@@ -225,7 +230,7 @@ function init(token, config, serverHost, serverPort, serverBase, liveReload, bro
     }
     function connect(fallback = false) {
         if (0 === reconnectCount) logger.info('[rsbuild] WebSocket connecting...');
-        const socketUrl = formatURL(fallback);
+        const socketUrl = getSocketURL(fallback);
         socket = new WebSocket(socketUrl);
         socket.addEventListener('open', onOpen);
         socket.addEventListener('close', onClose);

package/dist/connect-next.js

@@ -17,15 +17,18 @@ __nested_rspack_require_364__.m = __webpack_modules__, __nested_rspack_require_3
     return __nested_rspack_require_364__.d(getter, {
         a: getter
     }), getter;
-}, __nested_rspack_require_364__.d = (exports, definition)=>{
-    for(var key in definition)__nested_rspack_require_364__.o(definition, key) && !__nested_rspack_require_364__.o(exports, key) && Object.defineProperty(exports, key, {
-        enumerable: !0,
-        get: definition[key]
-    });
+}, __nested_rspack_require_364__.d = (exports, getters, values)=>{
+    var define = (defs, kind)=>{
+        for(var key in defs)__nested_rspack_require_364__.o(defs, key) && !__nested_rspack_require_364__.o(exports, key) && Object.defineProperty(exports, key, {
+            enumerable: !0,
+            [kind]: defs[key]
+        });
+    };
+    define(getters, "get"), define(values, "value");
 }, __nested_rspack_require_364__.add = function(modules) {
     Object.assign(__nested_rspack_require_364__.m, modules);
 }, __nested_rspack_require_364__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop), __nested_rspack_require_364__.add({
-    "./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/browser.js" (module, exports, __nested_rspack_require_1677_1696__) {
+    "./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/browser.js" (module, exports, __nested_rspack_require_1796_1815__) {
         let warned;
         function useColors() {
             let m;
@@ -136,7 +139,7 @@ __nested_rspack_require_364__.m = __webpack_modules__, __nested_rspack_require_3
             '#FF9933',
             '#FFCC00',
             '#FFCC33'
-        ], exports.log = console.debug || console.log || (()=>{}), module.exports = __nested_rspack_require_1677_1696__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/common.js")(exports);
+        ], exports.log = console.debug || console.log || (()=>{}), module.exports = __nested_rspack_require_1796_1815__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/common.js")(exports);
         let { formatters } = module.exports;
         formatters.j = function(v) {
             try {
@@ -146,7 +149,7 @@ __nested_rspack_require_364__.m = __webpack_modules__, __nested_rspack_require_3
             }
         };
     },
-    "./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/common.js" (module, __unused_rspack_exports, __nested_rspack_require_6843_6862__) {
+    "./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/common.js" (module, __unused_rspack_exports, __nested_rspack_require_6962_6981__) {
         module.exports = function setup(env) {
             function selectColor(namespace) {
                 let hash = 0;
@@ -215,16 +218,16 @@ __nested_rspack_require_364__.m = __webpack_modules__, __nested_rspack_require_3
             function destroy() {
                 console.warn('Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.');
             }
-            return createDebug.debug = createDebug, createDebug.default = createDebug, createDebug.coerce = coerce, createDebug.disable = disable, createDebug.enable = enable, createDebug.enabled = enabled, createDebug.humanize = __nested_rspack_require_6843_6862__("./node_modules/.pnpm/ms@2.1.3/node_modules/ms/index.js"), createDebug.destroy = destroy, Object.keys(env).forEach((key)=>{
+            return createDebug.debug = createDebug, createDebug.default = createDebug, createDebug.coerce = coerce, createDebug.disable = disable, createDebug.enable = enable, createDebug.enabled = enabled, createDebug.humanize = __nested_rspack_require_6962_6981__("./node_modules/.pnpm/ms@2.1.3/node_modules/ms/index.js"), createDebug.destroy = destroy, Object.keys(env).forEach((key)=>{
                 createDebug[key] = env[key];
             }), createDebug.names = [], createDebug.skips = [], createDebug.formatters = {}, createDebug.selectColor = selectColor, createDebug.enable(createDebug.load()), createDebug;
         };
     },
-    "./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/index.js" (module, __unused_rspack_exports, __nested_rspack_require_13591_13610__) {
-        "u" < typeof process || 'renderer' === process.type || !0 === process.browser || process.__nwjs ? module.exports = __nested_rspack_require_13591_13610__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/browser.js") : module.exports = __nested_rspack_require_13591_13610__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/node.js");
+    "./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/index.js" (module, __unused_rspack_exports, __nested_rspack_require_13710_13729__) {
+        "u" < typeof process || 'renderer' === process.type || !0 === process.browser || process.__nwjs ? module.exports = __nested_rspack_require_13710_13729__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/browser.js") : module.exports = __nested_rspack_require_13710_13729__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/node.js");
     },
-    "./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/node.js" (module, exports, __nested_rspack_require_14109_14128__) {
-        let tty = __nested_rspack_require_14109_14128__("tty"), util = __nested_rspack_require_14109_14128__("util");
+    "./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/node.js" (module, exports, __nested_rspack_require_14228_14247__) {
+        let tty = __nested_rspack_require_14228_14247__("tty"), util = __nested_rspack_require_14228_14247__("util");
         exports.init = init, exports.log = log, exports.formatArgs = formatArgs, exports.save = save, exports.load = load, exports.useColors = useColors, exports.destroy = util.deprecate(()=>{}, 'Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.'), exports.colors = [
             6,
             2,
@@ -234,7 +237,7 @@ __nested_rspack_require_364__.m = __webpack_modules__, __nested_rspack_require_3
             1
         ];
         try {
-            let supportsColor = __nested_rspack_require_14109_14128__("./node_modules/.pnpm/supports-color@8.1.1/node_modules/supports-color/index.js");
+            let supportsColor = __nested_rspack_require_14228_14247__("./node_modules/.pnpm/supports-color@8.1.1/node_modules/supports-color/index.js");
             supportsColor && (supportsColor.stderr || supportsColor).level >= 2 && (exports.colors = [
                 20,
                 21,
@@ -344,7 +347,7 @@ __nested_rspack_require_364__.m = __webpack_modules__, __nested_rspack_require_3
         exports.inspectOpts = Object.keys(process.env).filter((key)=>/^debug_/i.test(key)).reduce((obj, key)=>{
             let prop = key.substring(6).toLowerCase().replace(/_([a-z])/g, (_, k)=>k.toUpperCase()), val = process.env[key];
             return val = !!/^(yes|on|true|enabled)$/i.test(val) || !/^(no|off|false|disabled)$/i.test(val) && ('null' === val ? null : Number(val)), obj[prop] = val, obj;
-        }, {}), module.exports = __nested_rspack_require_14109_14128__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/common.js")(exports);
+        }, {}), module.exports = __nested_rspack_require_14228_14247__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/common.js")(exports);
         let { formatters } = module.exports;
         formatters.o = function(v) {
             return this.inspectOpts.colors = this.useColors, util.inspect(v, this.inspectOpts).split('\n').map((str)=>str.trim()).join(' ');
@@ -423,8 +426,8 @@ __nested_rspack_require_364__.m = __webpack_modules__, __nested_rspack_require_3
             return lastIndex !== index ? html + str.substring(lastIndex, index) : html;
         };
     },
-    "./node_modules/.pnpm/finalhandler@2.1.1/node_modules/finalhandler/index.js" (module, __unused_rspack_exports, __nested_rspack_require_23374_23393__) {
-        var debug = __nested_rspack_require_23374_23393__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/index.js")('finalhandler'), encodeUrl = __nested_rspack_require_23374_23393__("./node_modules/.pnpm/encodeurl@2.0.0/node_modules/encodeurl/index.js"), escapeHtml = __nested_rspack_require_23374_23393__("./node_modules/.pnpm/escape-html@1.0.3/node_modules/escape-html/index.js"), onFinished = __nested_rspack_require_23374_23393__("./node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js"), parseUrl = __nested_rspack_require_23374_23393__("./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js"), statuses = __nested_rspack_require_23374_23393__("./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/index.js"), isFinished = onFinished.isFinished;
+    "./node_modules/.pnpm/finalhandler@2.1.1/node_modules/finalhandler/index.js" (module, __unused_rspack_exports, __nested_rspack_require_23493_23512__) {
+        var debug = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/index.js")('finalhandler'), encodeUrl = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/encodeurl@2.0.0/node_modules/encodeurl/index.js"), escapeHtml = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/escape-html@1.0.3/node_modules/escape-html/index.js"), onFinished = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js"), parseUrl = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js"), statuses = __nested_rspack_require_23493_23512__("./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/index.js"), isFinished = onFinished.isFinished;
         function createHtmlDocument(message) {
             return '<!DOCTYPE html>\n<html lang="en">\n<head>\n<meta charset="utf-8">\n<title>Error</title>\n</head>\n<body>\n<pre>' + escapeHtml(message).replaceAll('\n', '<br>').replaceAll('  ', ' &nbsp;') + "</pre>\n</body>\n</html>\n";
         }
@@ -548,9 +551,9 @@ __nested_rspack_require_364__.m = __webpack_modules__, __nested_rspack_require_3
             throw Error('val is not a non-empty string or a valid number. val=' + JSON.stringify(val));
         };
     },
-    "./node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js" (module, __unused_rspack_exports, __nested_rspack_require_31978_31997__) {
+    "./node_modules/.pnpm/on-finished@2.4.1/node_modules/on-finished/index.js" (module, __unused_rspack_exports, __nested_rspack_require_32097_32116__) {
         module.exports = onFinished, module.exports.isFinished = isFinished;
-        var asyncHooks = tryRequireAsyncHooks(), first = __nested_rspack_require_31978_31997__("./node_modules/.pnpm/ee-first@1.1.1/node_modules/ee-first/index.js"), defer = 'function' == typeof setImmediate ? setImmediate : function(fn) {
+        var asyncHooks = tryRequireAsyncHooks(), first = __nested_rspack_require_32097_32116__("./node_modules/.pnpm/ee-first@1.1.1/node_modules/ee-first/index.js"), defer = 'function' == typeof setImmediate ? setImmediate : function(fn) {
             process.nextTick(fn.bind.apply(fn, arguments));
         };
         function onFinished(msg, listener) {
@@ -604,7 +607,7 @@ __nested_rspack_require_364__.m = __webpack_modules__, __nested_rspack_require_3
         }
         function tryRequireAsyncHooks() {
             try {
-                return __nested_rspack_require_31978_31997__("async_hooks");
+                return __nested_rspack_require_32097_32116__("async_hooks");
             } catch (e) {
                 return {};
             }
@@ -614,8 +617,8 @@ __nested_rspack_require_364__.m = __webpack_modules__, __nested_rspack_require_3
             return (asyncHooks.AsyncResource && (res = new asyncHooks.AsyncResource(fn.name || 'bound-anonymous-fn')), res && res.runInAsyncScope) ? res.runInAsyncScope.bind(res, fn, null) : fn;
         }
     },
-    "./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js" (module, __unused_rspack_exports, __nested_rspack_require_35898_35917__) {
-        var url = __nested_rspack_require_35898_35917__("url"), parse = url.parse, Url = url.Url;
+    "./node_modules/.pnpm/parseurl@1.3.3/node_modules/parseurl/index.js" (module, __unused_rspack_exports, __nested_rspack_require_36017_36036__) {
+        var url = __nested_rspack_require_36017_36036__("url"), parse = url.parse, Url = url.Url;
         function parseurl(req) {
             var url = req.url;
             if (void 0 !== url) {
@@ -653,8 +656,8 @@ __nested_rspack_require_364__.m = __webpack_modules__, __nested_rspack_require_3
         }
         module.exports = parseurl, module.exports.original = originalurl;
     },
-    "./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/index.js" (module, __unused_rspack_exports, __nested_rspack_require_38369_38388__) {
-        var codes = __nested_rspack_require_38369_38388__("./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/codes.json");
+    "./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/index.js" (module, __unused_rspack_exports, __nested_rspack_require_38488_38507__) {
+        var codes = __nested_rspack_require_38488_38507__("./node_modules/.pnpm/statuses@2.0.2/node_modules/statuses/codes.json");
         function createMessageToStatusCodeMap(codes) {
             var map = {};
             return Object.keys(codes).forEach(function(code) {
@@ -700,8 +703,8 @@ __nested_rspack_require_364__.m = __webpack_modules__, __nested_rspack_require_3
             504: !0
         };
     },
-    "./node_modules/.pnpm/supports-color@8.1.1/node_modules/supports-color/index.js" (module, __unused_rspack_exports, __nested_rspack_require_40661_40680__) {
-        let flagForceColor, os = __nested_rspack_require_40661_40680__("os"), tty = __nested_rspack_require_40661_40680__("tty"), hasFlag = __nested_rspack_require_40661_40680__("./node_modules/.pnpm/has-flag@4.0.0/node_modules/has-flag/index.js"), { env } = process;
+    "./node_modules/.pnpm/supports-color@8.1.1/node_modules/supports-color/index.js" (module, __unused_rspack_exports, __nested_rspack_require_40780_40799__) {
+        let flagForceColor, os = __nested_rspack_require_40780_40799__("os"), tty = __nested_rspack_require_40780_40799__("tty"), hasFlag = __nested_rspack_require_40780_40799__("./node_modules/.pnpm/has-flag@4.0.0/node_modules/has-flag/index.js"), { env } = process;
         function envForceColor() {
             if ('FORCE_COLOR' in env) return 'true' === env.FORCE_COLOR ? 1 : 'false' === env.FORCE_COLOR ? 0 : 0 === env.FORCE_COLOR.length ? 1 : Math.min(Number.parseInt(env.FORCE_COLOR, 10), 3);
         }

package/dist/http-proxy-middleware.js

@@ -2272,6 +2272,10 @@ function setupOutgoing(outgoing, options, req, forward) {
         let value = options[forward || "target"][e];
         void 0 !== value && (outgoing[e] = value);
     }
+    if (void 0 === outgoing.host && "string" == typeof outgoing.hostname) {
+        let bracketedHost = outgoing.hostname.includes(":") && !outgoing.hostname.startsWith("[") ? `[${outgoing.hostname}]` : outgoing.hostname;
+        outgoing.host = outgoing.port ? `${bracketedHost}:${outgoing.port}` : bracketedHost;
+    }
     if (outgoing.method = options.method || req.method, outgoing.headers = {
         ...req.headers
     }, req.headers?.[":authority"] && (outgoing.headers.host = req.headers[":authority"]), options.headers) for (let key of Object.keys(options.headers))outgoing.headers[key] = options.headers[key];
@@ -2621,11 +2625,11 @@ function _createProxyFn(type, server) {
         }), server._getPasses(type))){
             let stop;
             try {
-                stop = pass(req, res, requestOptions, server, head, (error)=>{
-                    server.listenerCount("error") > 0 ? (server.emit("error", error, req, res), _resolve()) : _reject(error);
+                stop = pass(req, res, requestOptions, server, head, (error, _req, _res, url)=>{
+                    server.listenerCount("error") > 0 ? (server.emit("error", error, req, res, url), _resolve()) : _reject(error);
                 });
             } catch (error) {
-                server.listenerCount("error") > 0 ? (server.emit("error", error, req, res), _resolve()) : _reject(error);
+                server.listenerCount("error") > 0 ? (server.emit("error", error, req, res, requestOptions.target || requestOptions.forward), _resolve()) : _reject(error);
                 break;
             }
             if (stop) {
@@ -2640,7 +2644,7 @@ function verifyConfig(options) {
     if (!options.target && !options.router) throw Error(errors_ERRORS.ERR_CONFIG_FACTORY_TARGET_MISSING);
 }
 (ERRORS = errors_ERRORS || (errors_ERRORS = {})).ERR_CONFIG_FACTORY_TARGET_MISSING = "[HPM] Missing \"target\" option. Example: {target: \"http://www.example.org\"}", ERRORS.ERR_CONTEXT_MATCHER_GENERIC = "[HPM] Invalid pathFilter. Expecting something like: \"/api\" or [\"/api\", \"/ajax\"]", ERRORS.ERR_CONTEXT_MATCHER_INVALID_ARRAY = "[HPM] Invalid pathFilter. Plain paths (e.g. \"/api\") can not be mixed with globs (e.g. \"/api/**\"). Expecting something like: [\"/api\", \"/ajax\"] or [\"/api/**\", \"!**.html\"].", ERRORS.ERR_PATH_REWRITER_CONFIG = "[HPM] Invalid pathRewrite config. Expecting object with pathRewrite config or a rewrite function";
-let Debug = __webpack_require__("../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/index.js")('http-proxy-middleware'), debug = Debug.extend('debug-proxy-errors-plugin'), debugProxyErrorsPlugin = (proxyServer)=>{
+let Debug = __webpack_require__("../../node_modules/.pnpm/debug@4.4.3/node_modules/debug/src/index.js")('http-proxy-middleware'), debug = Debug.extend('debug-proxy-errors-plugin'), debugProxyErrorsPlugin = (proxyServer, options)=>{
     proxyServer.on('error', (error, req, res, target)=>{
         debug(`httpxy error event: \n%O`, error);
     }), proxyServer.on('proxyReq', (proxyReq, req, socket)=>{
@@ -2777,7 +2781,7 @@ function matchPathFilter(pathFilter = '/', uri, req) {
         if (pathFilter.every(isGlobPath)) return matchMultiGlobPath(pathFilter, uri);
         throw Error(errors_ERRORS.ERR_CONTEXT_MATCHER_INVALID_ARRAY);
     }
-    if ('function' == typeof pathFilter) return pathFilter(getUrlPathName(uri), req);
+    if ('function' == typeof pathFilter) return !!pathFilter(getUrlPathName(uri), req);
     throw Error(errors_ERRORS.ERR_CONTEXT_MATCHER_GENERIC);
 }
 function matchSingleStringPath(pathFilter, uri) {
@@ -2844,14 +2848,20 @@ function parsePathRewriteRules(rewriteConfig) {
     return rules;
 }
 let router_debug = Debug.extend('router');
-async function getTarget(req, config) {
+async function getTarget(req, res, config) {
     let newTarget, router = config.router;
-    return isPlainObject(router) ? newTarget = getTargetFromProxyTable(req, router) : 'function' == typeof router && (newTarget = await router(req)), newTarget;
+    return isPlainObject(router) ? newTarget = getTargetFromProxyTable(req, router) : 'function' == typeof router && (newTarget = await router(req, res, config)), newTarget;
 }
 function getTargetFromProxyTable(req, table) {
-    let result, host = req.headers.host ?? '', hostAndPath = host + (req.url ?? '');
+    let result, host = req.headers.host ?? '', path = req.url ?? '';
     for (let [key, value] of Object.entries(table))if (containsPath(key)) {
-        if (hostAndPath.indexOf(key) > -1) {
+        if (isHostAndPathKey(key)) {
+            let [keyHost, keyPath] = splitHostAndPathKey(key);
+            if (host === keyHost && path.startsWith(keyPath)) {
+                router_debug('match: "%s" -> "%s"', key, result = value);
+                break;
+            }
+        } else if (path.startsWith(key)) {
             router_debug('match: "%s" -> "%s"', key, result = value);
             break;
         }
@@ -2864,19 +2874,34 @@ function getTargetFromProxyTable(req, table) {
 function containsPath(v) {
     return v.indexOf('/') > -1;
 }
+function isHostAndPathKey(v) {
+    return containsPath(v) && !v.startsWith('/');
+}
+function splitHostAndPathKey(v) {
+    let firstSlash = v.indexOf('/');
+    return [
+        v.slice(0, firstSlash),
+        v.slice(firstSlash)
+    ];
+}
 let ipv6_debug = Debug.extend('ipv6');
 function normalizeIPv6LiteralTargets(options) {
     options.target = normalizeIPv6ProxyTarget(options.target, 'target'), options.forward = normalizeIPv6ProxyTarget(options.forward, 'forward');
 }
 function normalizeIPv6ProxyTarget(target, optionName) {
     let targetUrl = toTargetUrl(target);
-    return targetUrl && isBracketedIPv6Hostname(targetUrl.hostname) ? (ipv6_debug('normalized IPv6 "%s" %s', optionName, target), {
-        hostname: stripBrackets(targetUrl.hostname),
-        pathname: targetUrl.pathname,
-        port: targetUrl.port,
-        protocol: targetUrl.protocol,
-        search: targetUrl.search
-    }) : target;
+    if (targetUrl && isBracketedIPv6Hostname(targetUrl.hostname)) {
+        let normalizedHostname = normalizeIPv6DestinationHostname(stripBrackets(targetUrl.hostname));
+        return ipv6_debug('normalized IPv6 "%s" %s', optionName, target), {
+            hostname: normalizedHostname,
+            auth: targetUrl.username || targetUrl.password ? `${targetUrl.username}:${targetUrl.password}` : void 0,
+            pathname: targetUrl.pathname,
+            port: targetUrl.port,
+            protocol: targetUrl.protocol,
+            search: targetUrl.search
+        };
+    }
+    return target;
 }
 function toTargetUrl(target) {
     return 'string' == typeof target ? new URL(target) : target instanceof URL ? target : void 0;
@@ -2887,23 +2912,30 @@ function isBracketedIPv6Hostname(hostname) {
 function stripBrackets(hostname) {
     return hostname.replace(/^\[|\]$/g, '');
 }
+function normalizeIPv6DestinationHostname(hostname) {
+    return '::' === hostname ? (ipv6_debug('normalizing hostname unspecified IPv6 address (::) to loopback (::1)'), '::1') : hostname;
+}
 class HttpProxyMiddleware {
-    wsInternalSubscribed = !1;
-    serverOnCloseSubscribed = !1;
+    wsInternalSubscribedServers = new WeakSet();
+    activeServers = new Set();
     proxyOptions;
     proxy;
     pathRewriter;
     logger;
     constructor(options){
         verifyConfig(options), this.proxyOptions = options, this.logger = options.logger || noopLogger, Debug("create proxy server"), this.proxy = createProxyServer({}), this.registerPlugins(this.proxy, this.proxyOptions), this.pathRewriter = createPathRewriter(this.proxyOptions.pathRewrite), this.middleware.upgrade = (req, socket, head)=>{
-            this.wsInternalSubscribed || this.handleUpgrade(req, socket, head);
+            let server = this.#getServer(req);
+            server && !this.wsInternalSubscribedServers.has(server) && this.handleUpgrade(req, socket, head);
         };
     }
+    #getServer(req) {
+        return req.socket?.server;
+    }
     middleware = async (req, res, next)=>{
         if (this.shouldProxy(this.proxyOptions.pathFilter, req)) {
             let activeProxyOptions;
             try {
-                if (!(activeProxyOptions = await this.prepareProxyRequest(req)).target && !activeProxyOptions.forward) throw Error('Must provide a proper URL as target');
+                if (!(activeProxyOptions = await this.prepareProxyRequest(req, res)).target && !activeProxyOptions.forward) throw Error('Must provide a proper URL as target');
             } catch (err) {
                 next?.(err);
                 return;
@@ -2914,12 +2946,10 @@ class HttpProxyMiddleware {
                 this.proxy.emit('error', err, req, res, activeProxyOptions.target), next?.(err);
             }
         } else next?.();
-        let server = req.socket?.server;
-        server && !this.serverOnCloseSubscribed && (server.on('close', ()=>{
-            Debug('server close signal received: closing proxy server'), this.proxy.close(()=>{
-                Debug('proxy server closed');
-            });
-        }), this.serverOnCloseSubscribed = !0), !0 === this.proxyOptions.ws && server && this.catchUpgradeRequest(server);
+        let server = this.#getServer(req);
+        server && !this.activeServers.has(server) && (Debug('registering server close listener'), this.activeServers.add(server), server.on('close', ()=>{
+            (Debug('server close signal received.'), this.activeServers.delete(server), this.activeServers.size > 0) ? Debug(`proxy server not closed: ${this.activeServers.size} server(s) still active`) : (Debug('closing proxy server'), this.proxy.close(()=>Debug('proxy server closed')));
+        })), !0 === this.proxyOptions.ws && server && this.catchUpgradeRequest(server);
     };
     registerPlugins(proxy, options) {
         getPlugins(options).forEach((plugin)=>{
@@ -2927,12 +2957,12 @@ class HttpProxyMiddleware {
         });
     }
     catchUpgradeRequest = (server)=>{
-        this.wsInternalSubscribed || (Debug('subscribing to server upgrade event'), server.on('upgrade', this.handleUpgrade), this.wsInternalSubscribed = !0);
+        this.wsInternalSubscribedServers.has(server) || (Debug('subscribing to server upgrade event'), server.on('upgrade', this.handleUpgrade), this.wsInternalSubscribedServers.add(server));
     };
     handleUpgrade = async (req, socket, head)=>{
         try {
             if (this.shouldProxy(this.proxyOptions.pathFilter, req)) {
-                let activeProxyOptions = await this.prepareProxyRequest(req);
+                let activeProxyOptions = await this.prepareProxyRequest(req, void 0);
                 await this.proxy.ws(req, socket, activeProxyOptions, head), Debug('server upgrade event received. Proxying WebSocket');
             }
         } catch (err) {
@@ -2946,17 +2976,17 @@ class HttpProxyMiddleware {
             return Debug('Error: matchPathFilter() called with request url: ', `"${req.url}"`), this.logger.error(err), !1;
         }
     };
-    prepareProxyRequest = async (req)=>{
+    prepareProxyRequest = async (req, res)=>{
         let newProxyOptions = Object.assign({}, this.proxyOptions);
-        return await this.applyRouter(req, newProxyOptions), normalizeIPv6LiteralTargets(newProxyOptions), await this.applyPathRewrite(req, this.pathRewriter), newProxyOptions;
+        return await this.applyRouter(req, res, newProxyOptions), normalizeIPv6LiteralTargets(newProxyOptions), await this.applyPathRewrite(req, res, this.pathRewriter, newProxyOptions), newProxyOptions;
     };
-    applyRouter = async (req, options)=>{
+    applyRouter = async (req, res, options)=>{
         let newTarget;
-        options.router && (newTarget = await getTarget(req, options)) && (Debug('router new target: "%s"', newTarget), options.target = newTarget);
+        options.router && (newTarget = await getTarget(req, res, options)) && (Debug('router new target: "%s"', newTarget), options.target = newTarget);
     };
-    applyPathRewrite = async (req, pathRewriter)=>{
+    applyPathRewrite = async (req, res, pathRewriter, options)=>{
         if (req.url && pathRewriter) {
-            let path = await pathRewriter(req.url, req);
+            let path = await pathRewriter(req.url, req, res, options);
             'string' == typeof path ? (Debug('pathRewrite new path: %s', path), req.url = path) : Debug('pathRewrite: no rewritten path found: %s', req.url);
         }
     };

package/dist/launch-editor-middleware.js

@@ -1,8 +1,8 @@
 import { __webpack_require__ } from "./1~rslib-runtime.js";
 import "./756.js";
 __webpack_require__.add({
-    "../../node_modules/.pnpm/launch-editor-middleware@2.14.0/node_modules/launch-editor-middleware/index.js" (module, __unused_rspack_exports, __webpack_require__) {
-        let path = __webpack_require__("path?aeb1"), launch = __webpack_require__("../../node_modules/.pnpm/launch-editor@2.14.0/node_modules/launch-editor/index.js");
+    "../../node_modules/.pnpm/launch-editor-middleware@2.14.1/node_modules/launch-editor-middleware/index.js" (module, __unused_rspack_exports, __webpack_require__) {
+        let path = __webpack_require__("path?aeb1"), launch = __webpack_require__("../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/index.js");
         module.exports = (specifiedEditor, srcRoot, onErrorCallback)=>('function' == typeof specifiedEditor && (onErrorCallback = specifiedEditor, specifiedEditor = void 0), 'function' == typeof srcRoot && (onErrorCallback = srcRoot, srcRoot = void 0), srcRoot = srcRoot || process.cwd(), function launchEditorMiddleware(req, res) {
                 let url;
                 try {
@@ -16,7 +16,7 @@ __webpack_require__.add({
                 file ? (launch(file.startsWith('file://') ? file : path.resolve(srcRoot, file), specifiedEditor, onErrorCallback), res.end()) : (res.statusCode = 500, res.end('launch-editor-middleware: required query param "file" is missing.'));
             });
     },
-    "../../node_modules/.pnpm/launch-editor@2.14.0/node_modules/launch-editor/editor-info/linux.js" (module) {
+    "../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/editor-info/linux.js" (module) {
         module.exports = {
             atom: 'atom',
             Brackets: 'brackets',
@@ -48,7 +48,7 @@ __webpack_require__.add({
             zed: 'zed'
         };
     },
-    "../../node_modules/.pnpm/launch-editor@2.14.0/node_modules/launch-editor/editor-info/macos.js" (module) {
+    "../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/editor-info/macos.js" (module) {
         module.exports = {
             '/Applications/Atom.app/Contents/MacOS/Atom': 'atom',
             '/Applications/Atom Beta.app/Contents/MacOS/Atom Beta': '/Applications/Atom Beta.app/Contents/MacOS/Atom Beta',
@@ -81,7 +81,7 @@ __webpack_require__.add({
             '/Applications/Zed.app/Contents/MacOS/zed': 'zed'
         };
     },
-    "../../node_modules/.pnpm/launch-editor@2.14.0/node_modules/launch-editor/editor-info/windows.js" (module) {
+    "../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/editor-info/windows.js" (module) {
         module.exports = [
             'Brackets.exe',
             'Code.exe',
@@ -112,7 +112,7 @@ __webpack_require__.add({
             'Antigravity.exe'
         ];
     },
-    "../../node_modules/.pnpm/launch-editor@2.14.0/node_modules/launch-editor/get-args.js" (module, __unused_rspack_exports, __webpack_require__) {
+    "../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/get-args.js" (module, __unused_rspack_exports, __webpack_require__) {
         let path = __webpack_require__("path?aeb1");
         module.exports = function getArgumentsForPosition(editor, fileName, lineNumber, columnNumber = 1) {
             switch(path.basename(editor).replace(/\.(exe|cmd|bat)$/i, '')){
@@ -209,8 +209,35 @@ __webpack_require__.add({
             ];
         };
     },
-    "../../node_modules/.pnpm/launch-editor@2.14.0/node_modules/launch-editor/guess.js" (module, __unused_rspack_exports, __webpack_require__) {
-        let path = __webpack_require__("path?aeb1"), shellQuote = __webpack_require__("../../node_modules/.pnpm/shell-quote@1.8.4/node_modules/shell-quote/index.js"), childProcess = __webpack_require__("child_process"), COMMON_EDITORS_MACOS = __webpack_require__("../../node_modules/.pnpm/launch-editor@2.14.0/node_modules/launch-editor/editor-info/macos.js"), COMMON_EDITORS_LINUX = __webpack_require__("../../node_modules/.pnpm/launch-editor@2.14.0/node_modules/launch-editor/editor-info/linux.js"), COMMON_EDITORS_WIN = __webpack_require__("../../node_modules/.pnpm/launch-editor@2.14.0/node_modules/launch-editor/editor-info/windows.js");
+    "../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/guess.js" (module, __unused_rspack_exports, __webpack_require__) {
+        let path = __webpack_require__("path?aeb1"), shellQuote = __webpack_require__("../../node_modules/.pnpm/shell-quote@1.8.4/node_modules/shell-quote/index.js"), childProcess = __webpack_require__("child_process"), COMMON_EDITORS_MACOS = __webpack_require__("../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/editor-info/macos.js"), COMMON_EDITORS_LINUX = __webpack_require__("../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/editor-info/linux.js"), COMMON_EDITORS_WIN = __webpack_require__("../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/editor-info/windows.js");
+        function getEditorFromMacProcesses(output) {
+            let processNames = Object.keys(COMMON_EDITORS_MACOS), processList = output.split('\n');
+            for(let i = 0; i < processNames.length; i++){
+                let processName = processNames[i];
+                if (processList.includes(processName)) return COMMON_EDITORS_MACOS[processName];
+                let processNameWithoutApplications = processName.replace('/Applications', '');
+                if (-1 !== output.indexOf(processNameWithoutApplications)) {
+                    if (processName !== COMMON_EDITORS_MACOS[processName]) return COMMON_EDITORS_MACOS[processName];
+                    let runningProcess = processList.find((procName)=>procName.endsWith(processNameWithoutApplications));
+                    if (void 0 !== runningProcess) return runningProcess;
+                }
+            }
+        }
+        function getEditorFromWindowsProcesses(output) {
+            let runningProcesses = output.split('\r\n');
+            for(let i = 0; i < runningProcesses.length; i++){
+                let fullProcessPath = runningProcesses[i].trim(), shortProcessName = path.win32.basename(fullProcessPath);
+                if (-1 !== COMMON_EDITORS_WIN.indexOf(shortProcessName)) return fullProcessPath;
+            }
+        }
+        function getEditorFromLinuxProcesses(output) {
+            let processNames = Object.keys(COMMON_EDITORS_LINUX);
+            for(let i = 0; i < processNames.length; i++){
+                let processName = processNames[i];
+                if (-1 !== output.indexOf(processName)) return COMMON_EDITORS_LINUX[processName];
+            }
+        }
         module.exports = function guessEditor(specifiedEditor) {
             if (specifiedEditor) return shellQuote.parse(specifiedEditor);
             if (process.env.LAUNCH_EDITOR) return [
@@ -227,37 +254,21 @@ __webpack_require__.add({
                             'pipe',
                             'ignore'
                         ]
-                    }).toString(), processNames = Object.keys(COMMON_EDITORS_MACOS), processList = output.split('\n');
-                    for(let i = 0; i < processNames.length; i++){
-                        let processName = processNames[i];
-                        if (processList.includes(processName)) return [
-                            COMMON_EDITORS_MACOS[processName]
-                        ];
-                        let processNameWithoutApplications = processName.replace('/Applications', '');
-                        if (-1 !== output.indexOf(processNameWithoutApplications)) {
-                            if (processName !== COMMON_EDITORS_MACOS[processName]) return [
-                                COMMON_EDITORS_MACOS[processName]
-                            ];
-                            let runningProcess = processList.find((procName)=>procName.endsWith(processNameWithoutApplications));
-                            if (void 0 !== runningProcess) return [
-                                runningProcess
-                            ];
-                        }
-                    }
+                    }).toString(), editor = getEditorFromMacProcesses(output);
+                    if (void 0 !== editor) return [
+                        editor
+                    ];
                 } else if ('win32' === process.platform) {
-                    let runningProcesses = childProcess.execSync('powershell -NoProfile -Command "[Console]::OutputEncoding=[Text.Encoding]::UTF8;Get-CimInstance -Query \\"select executablepath from win32_process where executablepath is not null\\" | % { $_.ExecutablePath }"', {
+                    let output = childProcess.execSync('powershell -NoProfile -Command "[Console]::OutputEncoding=[Text.Encoding]::UTF8;Get-CimInstance -Query \\"select executablepath from win32_process where executablepath is not null\\" | % { $_.ExecutablePath }"', {
                         stdio: [
                             'pipe',
                             'pipe',
                             'ignore'
                         ]
-                    }).toString().split('\r\n');
-                    for(let i = 0; i < runningProcesses.length; i++){
-                        let fullProcessPath = runningProcesses[i].trim(), shortProcessName = path.basename(fullProcessPath);
-                        if (-1 !== COMMON_EDITORS_WIN.indexOf(shortProcessName)) return [
-                            fullProcessPath
-                        ];
-                    }
+                    }).toString(), editor = getEditorFromWindowsProcesses(output);
+                    if (void 0 !== editor) return [
+                        editor
+                    ];
                 } else if ('linux' === process.platform) {
                     let output = childProcess.execSync('ps x --no-heading -o comm --sort=comm', {
                         stdio: [
@@ -265,13 +276,10 @@ __webpack_require__.add({
                             'pipe',
                             'ignore'
                         ]
-                    }).toString(), processNames = Object.keys(COMMON_EDITORS_LINUX);
-                    for(let i = 0; i < processNames.length; i++){
-                        let processName = processNames[i];
-                        if (-1 !== output.indexOf(processName)) return [
-                            COMMON_EDITORS_LINUX[processName]
-                        ];
-                    }
+                    }).toString(), editor = getEditorFromLinuxProcesses(output);
+                    if (void 0 !== editor) return [
+                        editor
+                    ];
                 }
             } catch (ignoreError) {}
             return process.env.VISUAL ? [
@@ -281,10 +289,10 @@ __webpack_require__.add({
             ] : [
                 null
             ];
-        };
+        }, module.exports.getEditorFromMacProcesses = getEditorFromMacProcesses, module.exports.getEditorFromWindowsProcesses = getEditorFromWindowsProcesses, module.exports.getEditorFromLinuxProcesses = getEditorFromLinuxProcesses;
     },
-    "../../node_modules/.pnpm/launch-editor@2.14.0/node_modules/launch-editor/index.js" (module, __unused_rspack_exports, __webpack_require__) {
-        let fs = __webpack_require__("fs?8b28"), os = __webpack_require__("os"), path = __webpack_require__("path?aeb1"), colors = __webpack_require__("../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js"), childProcess = __webpack_require__("child_process"), guessEditor = __webpack_require__("../../node_modules/.pnpm/launch-editor@2.14.0/node_modules/launch-editor/guess.js"), getArgumentsForPosition = __webpack_require__("../../node_modules/.pnpm/launch-editor@2.14.0/node_modules/launch-editor/get-args.js");
+    "../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/index.js" (module, __unused_rspack_exports, __webpack_require__) {
+        let fs = __webpack_require__("fs?8b28"), os = __webpack_require__("os"), path = __webpack_require__("path?aeb1"), colors = __webpack_require__("../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js"), childProcess = __webpack_require__("child_process"), guessEditor = __webpack_require__("../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/guess.js"), getArgumentsForPosition = __webpack_require__("../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/get-args.js");
         function wrapErrorCallback(cb) {
             return (fileName, errorMessage)=>{
                 console.log(), console.log(colors.red('Could not open ' + path.basename(fileName) + ' in the editor.')), errorMessage && ('.' !== errorMessage[errorMessage.length - 1] && (errorMessage += '.'), console.log(colors.red('The editor process exited with an error: ' + errorMessage))), console.log(), cb && cb(fileName, errorMessage);
@@ -312,6 +320,7 @@ __webpack_require__.add({
         let currentChildProcess = null;
         module.exports = function launchEditor(file, specifiedEditor, onErrorCallback) {
             let parsed = parseFile(file), { fileName } = parsed, { lineNumber, columnNumber } = parsed;
+            if ('win32' === process.platform && path.resolve(fileName).startsWith('\\\\')) return onErrorCallback(fileName, "UNC paths are not supported on Windows to avoid security issues. See https://github.com/vitejs/launch-editor/tree/main/packages/launch-editor#unc-paths-on-windows for details.");
             if (!fs.existsSync(fileName)) return;
             'function' == typeof specifiedEditor && (onErrorCallback = specifiedEditor, specifiedEditor = void 0), onErrorCallback = wrapErrorCallback(onErrorCallback);
             let [editor, ...args] = guessEditor(specifiedEditor);
@@ -532,4 +541,4 @@ __webpack_require__.add({
             }).join(' ');
         };
     }
-}), __webpack_require__("../../node_modules/.pnpm/launch-editor-middleware@2.14.0/node_modules/launch-editor-middleware/index.js");
+}), __webpack_require__("../../node_modules/.pnpm/launch-editor-middleware@2.14.1/node_modules/launch-editor-middleware/index.js");