unplugin-https-reverse-proxy 2.0.3-beta.2 → 4.0.0

package/dist/rollup.cjs

@@ -13437,11 +13437,11 @@ var Liquid = class _Liquid {
 // src/caddy/caddyfile.ts
 var ProxyType = type({
   target: "string",
-  port_suffix: "string",
+  portSuffix: "string",
   tls: "string",
   source: "string",
   base: "string",
-  health_check: "boolean"
+  healthCheck: "boolean"
 });
 var CaddyContext = type({
   caddy_root: "string",
@@ -13476,33 +13476,63 @@ var caddyTemplate = `{
   }
 }
 
-{% for p in proxies %}
-{{ p.target }}{{ p.port_suffix }} {
-  {{ p.tls }}
-  reverse_proxy http://{{ p.source }} {% if p.health_check %} {
-    health_uri {{ p.base }}
-    health_interval 2s
-    health_timeout 5s
-    fail_duration 2s
-    unhealthy_status 502 503 504 404
-    lb_try_duration 3s
-    lb_try_interval 300ms
+{% for host in hosts %}
+{{ host.host }}{{ host.portSuffix }} {
+  {{ host.tls }}
 
-    @error status 502 503 504 404
-    handle_response @error {
-      respond * 503 {
-        body "Service Unavailable"
-        close
+  {% for route in host.routes %}
+  handle {{ route.base }}* {
+    reverse_proxy http://{{ route.source }} {% if route.healthCheck %} {
+      health_uri {{ route.base }}
+      health_interval 2s
+      health_timeout 5s
+      health_headers {
+        User-Agent {http.request.header.User-Agent}
+        Accept text/html,application/json,*/*
+      }
+      fail_duration 2s
+      unhealthy_status 502 503 504 404
+      lb_try_duration 3s
+      lb_try_interval 300ms
+
+      @error status 502 503 504 404
+      handle_response @error {
+        respond * 503 {
+          body "Service Unavailable"
+          close
+        }
       }
     }
+    {% endif %}
   }
-  {% endif %}
+  {% endfor %}
 }
 {% endfor %}
 `;
 var liquid = new Liquid();
 async function genCaddyfile(ctx) {
-  return await liquid.parseAndRender(caddyTemplate, ctx);
+  const hostsMap = /* @__PURE__ */ new Map();
+  for (const proxy of ctx.proxies) {
+    const key = `${proxy.target}${proxy.portSuffix}`;
+    if (!hostsMap.has(key)) {
+      hostsMap.set(key, {
+        host: proxy.target,
+        portSuffix: proxy.portSuffix,
+        tls: proxy.tls,
+        routes: []
+      });
+    }
+    let base = proxy.base || "/";
+    if (!base.startsWith("/"))
+      base = `/${base}`;
+    if (base !== "/" && !base.endsWith("/"))
+      base = `${base}/`;
+    hostsMap.get(key).routes.push({ ...proxy, base });
+  }
+  for (const host of hostsMap.values())
+    host.routes.sort((a, b) => b.base.length - a.base.length);
+  const hosts = Array.from(hostsMap.values());
+  return await liquid.parseAndRender(caddyTemplate, { ...ctx, hosts });
 }
 
 // src/caddy/config.ts
@@ -13641,7 +13671,7 @@ var supportList = [
 // src/caddy/config.ts
 function useCaddyConfig() {
   const configContentRef = signal("{}");
-  const configJsonRef2 = computed(() => {
+  const configJsonRef = computed(() => {
     try {
       return JSON.parse(configContentRef());
     } catch {
@@ -13664,26 +13694,31 @@ function useCaddyConfig() {
   const watchCaddyConfig = (0, import_node_fs2.watch)(caddyConfigPath, () => {
     setConfigContent();
   });
-  function writeCaddyConfig2(_proxies) {
-    const proxies = configJsonRef2() || {};
+  function writeCaddyConfig(_proxies) {
+    const proxies = configJsonRef() || {};
     _proxies.forEach((p) => {
-      const index = `${p.target}${p.port_suffix}`;
-      proxies[index] = p;
+      let base = p.base || "/";
+      if (!base.startsWith("/"))
+        base = `/${base}`;
+      if (base !== "/" && !base.endsWith("/"))
+        base = `${base}/`;
+      const index = `${p.target}${p.portSuffix}${base}`;
+      proxies[index] = { ...p, base };
     });
     const content = JSON.stringify(proxies, null, 2);
     configContentRef(content);
     return (0, import_node_fs2.writeFileSync)(caddyConfigPath, content);
   }
-  async function cleanUp2() {
+  async function cleanUp() {
     await (0, import_promises2.unlink)(caddyConfigPath).catch(() => {
     });
     configContentRef("{}");
     watchCaddyConfig.close();
   }
   return {
-    configJsonRef: configJsonRef2,
-    writeCaddyConfig: writeCaddyConfig2,
-    cleanUp: cleanUp2
+    configJsonRef,
+    writeCaddyConfig,
+    cleanUp
   };
 }
 
@@ -13817,7 +13852,13 @@ function testCaddy() {
     });
   });
 }
-var { cleanUp, configJsonRef, writeCaddyConfig } = useCaddyConfig();
+var caddyConfig;
+function getCaddyConfig() {
+  if (!caddyConfig) {
+    caddyConfig = useCaddyConfig();
+  }
+  return caddyConfig;
+}
 var CaddyInstant = class {
   constructor() {
     this.inited = false;
@@ -13870,7 +13911,7 @@ var CaddyInstant = class {
       base = "/",
       showCaddyLog = false,
       https = false,
-      health_check = true
+      healthCheck = true
     } = options || {};
     this._source = source;
     this._target = target;
@@ -13880,28 +13921,37 @@ var CaddyInstant = class {
       throw new Error("update host failed");
     consola.success("update host success\n");
     const targetHost = target.split(":")[0];
+    const normalizeBase = (b) => {
+      let out = b || "/";
+      if (!out.startsWith("/"))
+        out = `/${out}`;
+      if (out !== "/" && !out.endsWith("/"))
+        out = `${out}/`;
+      return out;
+    };
+    const baseNormalized = normalizeBase(base);
     const proxies = [
       {
         target: targetHost,
-        port_suffix: https ? "" : ":80",
+        portSuffix: https ? "" : ":80",
         tls: https ? "tls internal" : "",
         source,
-        base,
-        health_check
+        base: baseNormalized,
+        healthCheck
       }
     ];
+    const { writeCaddyConfig } = getCaddyConfig();
     writeCaddyConfig(proxies);
     this._stopEffects.push(
       effect(async () => {
+        const { configJsonRef } = getCaddyConfig();
         const proxies2 = Object.values(configJsonRef() || {});
-        if (!(this.caddyfile || "").includes(`${target.split(":")[0]}${https ? "" : ":80"}`)) {
-          const ctx = validateTemplateContext({
-            caddy_root: this.caddyRoot,
-            proxies: proxies2
-          });
-          this.caddyfile = await genCaddyfile(ctx);
-          await this.writeCaddyfile();
-        }
+        const ctx = validateTemplateContext({
+          caddy_root: this.caddyRoot,
+          proxies: proxies2
+        });
+        this.caddyfile = await genCaddyfile(ctx);
+        await this.writeCaddyfile();
       })
     );
     if (!(0, import_node_fs3.existsSync)(caddyLockFilePath))
@@ -14027,7 +14077,9 @@ ${line}
         });
         await (0, import_promises3.unlink)(caddyLockFilePath).catch(() => {
         });
-        await cleanUp();
+        if (caddyConfig) {
+          await caddyConfig.cleanUp();
+        }
       } catch (e) {
         consola.error(e);
       }
@@ -14127,7 +14179,7 @@ var unpluginFactory = (options) => ({
     }
   },
   webpack(compiler) {
-    var _a4, _b3;
+    var _a4, _b3, _c2;
     if (import_node_process5.default.env.NODE_ENV !== "development")
       return;
     const {
@@ -14158,7 +14210,16 @@ var unpluginFactory = (options) => ({
     const source = `${devServer.host}:${devServer.port}`;
     if (caddy)
       return;
-    const _close = (_b3 = compiler.close) == null ? void 0 : _b3.bind(compiler);
+    let base = "/";
+    const publicPath = (_b3 = compiler.options.output) == null ? void 0 : _b3.publicPath;
+    if (typeof publicPath === "string" && publicPath) {
+      base = publicPath;
+    }
+    if (!base.startsWith("/"))
+      base = `/${base}`;
+    if (base !== "/" && !base.endsWith("/"))
+      base = `${base}/`;
+    const _close = (_c2 = compiler.close) == null ? void 0 : _c2.bind(compiler);
     if (_close) {
       compiler.close = async (callback) => {
         import_node_process5.default.on("exit", () => {
@@ -14170,18 +14231,19 @@ var unpluginFactory = (options) => ({
     }
     caddy = new CaddyInstant();
     caddy.run(source, target, {
+      base,
       ...options
     }).then(() => {
       compiler.hooks.done.tap("unplugin-https-reverse-proxy", async () => {
         await printForwardProxy();
-        consola.success(`  ${import_picocolors2.default.green("\u279C")}  ${import_picocolors2.default.bold("run caddy reverse proxy success")}: ${colorUrl(`${options.https ? "https" : "http"}://${target}`)}`);
+        consola.success(`  ${import_picocolors2.default.green("\u279C")}  ${import_picocolors2.default.bold("run caddy reverse proxy success")}: ${colorUrl(`${options.https ? "https" : "http"}://${target}${base}`)}`);
       });
     }).catch((e) => {
       throw e;
     });
   },
   async rspack(compiler) {
-    var _a4, _b3, _c2;
+    var _a4, _b3, _c2, _d2;
     if (import_node_process5.default.env.NODE_ENV !== "development")
       return;
     const {
@@ -14214,11 +14276,21 @@ var unpluginFactory = (options) => ({
     if (caddy)
       return;
     caddy = new CaddyInstant();
+    let base = "/";
+    const publicPath = (_d2 = compiler.options.output) == null ? void 0 : _d2.publicPath;
+    if (typeof publicPath === "string" && publicPath) {
+      base = publicPath;
+    }
+    if (!base.startsWith("/"))
+      base = `/${base}`;
+    if (base !== "/" && !base.endsWith("/"))
+      base = `${base}/`;
     caddy.run(source, target, {
+      base,
       ...options
     }).then(async () => {
       await printForwardProxy();
-      consola.success(`  ${import_picocolors2.default.green("\u279C")}  ${import_picocolors2.default.bold("run caddy reverse proxy success")}: ${colorUrl(`${options.https ? "https" : "http"}://${target}`)}`);
+      consola.success(`  ${import_picocolors2.default.green("\u279C")}  ${import_picocolors2.default.bold("run caddy reverse proxy success")}: ${colorUrl(`${options.https ? "https" : "http"}://${target}${base}`)}`);
     }).catch((e) => {
       throw e;
     });

package/dist/rollup.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-XGTVAT6M.js";
+} from "./chunk-K7HSLE6X.js";
 import "./chunk-2P7SUCQ3.js";
 
 // src/rollup.ts

package/dist/rspack.cjs

@@ -13436,11 +13436,11 @@ var Liquid = class _Liquid {
 // src/caddy/caddyfile.ts
 var ProxyType = type({
   target: "string",
-  port_suffix: "string",
+  portSuffix: "string",
   tls: "string",
   source: "string",
   base: "string",
-  health_check: "boolean"
+  healthCheck: "boolean"
 });
 var CaddyContext = type({
   caddy_root: "string",
@@ -13475,33 +13475,63 @@ var caddyTemplate = `{
   }
 }
 
-{% for p in proxies %}
-{{ p.target }}{{ p.port_suffix }} {
-  {{ p.tls }}
-  reverse_proxy http://{{ p.source }} {% if p.health_check %} {
-    health_uri {{ p.base }}
-    health_interval 2s
-    health_timeout 5s
-    fail_duration 2s
-    unhealthy_status 502 503 504 404
-    lb_try_duration 3s
-    lb_try_interval 300ms
+{% for host in hosts %}
+{{ host.host }}{{ host.portSuffix }} {
+  {{ host.tls }}
 
-    @error status 502 503 504 404
-    handle_response @error {
-      respond * 503 {
-        body "Service Unavailable"
-        close
+  {% for route in host.routes %}
+  handle {{ route.base }}* {
+    reverse_proxy http://{{ route.source }} {% if route.healthCheck %} {
+      health_uri {{ route.base }}
+      health_interval 2s
+      health_timeout 5s
+      health_headers {
+        User-Agent {http.request.header.User-Agent}
+        Accept text/html,application/json,*/*
+      }
+      fail_duration 2s
+      unhealthy_status 502 503 504 404
+      lb_try_duration 3s
+      lb_try_interval 300ms
+
+      @error status 502 503 504 404
+      handle_response @error {
+        respond * 503 {
+          body "Service Unavailable"
+          close
+        }
       }
     }
+    {% endif %}
   }
-  {% endif %}
+  {% endfor %}
 }
 {% endfor %}
 `;
 var liquid = new Liquid();
 async function genCaddyfile(ctx) {
-  return await liquid.parseAndRender(caddyTemplate, ctx);
+  const hostsMap = /* @__PURE__ */ new Map();
+  for (const proxy of ctx.proxies) {
+    const key = `${proxy.target}${proxy.portSuffix}`;
+    if (!hostsMap.has(key)) {
+      hostsMap.set(key, {
+        host: proxy.target,
+        portSuffix: proxy.portSuffix,
+        tls: proxy.tls,
+        routes: []
+      });
+    }
+    let base = proxy.base || "/";
+    if (!base.startsWith("/"))
+      base = `/${base}`;
+    if (base !== "/" && !base.endsWith("/"))
+      base = `${base}/`;
+    hostsMap.get(key).routes.push({ ...proxy, base });
+  }
+  for (const host of hostsMap.values())
+    host.routes.sort((a, b) => b.base.length - a.base.length);
+  const hosts = Array.from(hostsMap.values());
+  return await liquid.parseAndRender(caddyTemplate, { ...ctx, hosts });
 }
 
 // src/caddy/config.ts
@@ -13640,7 +13670,7 @@ var supportList = [
 // src/caddy/config.ts
 function useCaddyConfig() {
   const configContentRef = signal("{}");
-  const configJsonRef2 = computed(() => {
+  const configJsonRef = computed(() => {
     try {
       return JSON.parse(configContentRef());
     } catch {
@@ -13663,26 +13693,31 @@ function useCaddyConfig() {
   const watchCaddyConfig = (0, import_node_fs2.watch)(caddyConfigPath, () => {
     setConfigContent();
   });
-  function writeCaddyConfig2(_proxies) {
-    const proxies = configJsonRef2() || {};
+  function writeCaddyConfig(_proxies) {
+    const proxies = configJsonRef() || {};
     _proxies.forEach((p) => {
-      const index = `${p.target}${p.port_suffix}`;
-      proxies[index] = p;
+      let base = p.base || "/";
+      if (!base.startsWith("/"))
+        base = `/${base}`;
+      if (base !== "/" && !base.endsWith("/"))
+        base = `${base}/`;
+      const index = `${p.target}${p.portSuffix}${base}`;
+      proxies[index] = { ...p, base };
     });
     const content = JSON.stringify(proxies, null, 2);
     configContentRef(content);
     return (0, import_node_fs2.writeFileSync)(caddyConfigPath, content);
   }
-  async function cleanUp2() {
+  async function cleanUp() {
     await (0, import_promises2.unlink)(caddyConfigPath).catch(() => {
     });
     configContentRef("{}");
     watchCaddyConfig.close();
   }
   return {
-    configJsonRef: configJsonRef2,
-    writeCaddyConfig: writeCaddyConfig2,
-    cleanUp: cleanUp2
+    configJsonRef,
+    writeCaddyConfig,
+    cleanUp
   };
 }
 
@@ -13816,7 +13851,13 @@ function testCaddy() {
     });
   });
 }
-var { cleanUp, configJsonRef, writeCaddyConfig } = useCaddyConfig();
+var caddyConfig;
+function getCaddyConfig() {
+  if (!caddyConfig) {
+    caddyConfig = useCaddyConfig();
+  }
+  return caddyConfig;
+}
 var CaddyInstant = class {
   constructor() {
     this.inited = false;
@@ -13869,7 +13910,7 @@ var CaddyInstant = class {
       base = "/",
       showCaddyLog = false,
       https = false,
-      health_check = true
+      healthCheck = true
     } = options || {};
     this._source = source;
     this._target = target;
@@ -13879,28 +13920,37 @@ var CaddyInstant = class {
       throw new Error("update host failed");
     consola.success("update host success\n");
     const targetHost = target.split(":")[0];
+    const normalizeBase = (b) => {
+      let out = b || "/";
+      if (!out.startsWith("/"))
+        out = `/${out}`;
+      if (out !== "/" && !out.endsWith("/"))
+        out = `${out}/`;
+      return out;
+    };
+    const baseNormalized = normalizeBase(base);
     const proxies = [
       {
         target: targetHost,
-        port_suffix: https ? "" : ":80",
+        portSuffix: https ? "" : ":80",
         tls: https ? "tls internal" : "",
         source,
-        base,
-        health_check
+        base: baseNormalized,
+        healthCheck
       }
     ];
+    const { writeCaddyConfig } = getCaddyConfig();
     writeCaddyConfig(proxies);
     this._stopEffects.push(
       effect(async () => {
+        const { configJsonRef } = getCaddyConfig();
         const proxies2 = Object.values(configJsonRef() || {});
-        if (!(this.caddyfile || "").includes(`${target.split(":")[0]}${https ? "" : ":80"}`)) {
-          const ctx = validateTemplateContext({
-            caddy_root: this.caddyRoot,
-            proxies: proxies2
-          });
-          this.caddyfile = await genCaddyfile(ctx);
-          await this.writeCaddyfile();
-        }
+        const ctx = validateTemplateContext({
+          caddy_root: this.caddyRoot,
+          proxies: proxies2
+        });
+        this.caddyfile = await genCaddyfile(ctx);
+        await this.writeCaddyfile();
       })
     );
     if (!(0, import_node_fs3.existsSync)(caddyLockFilePath))
@@ -14026,7 +14076,9 @@ ${line}
         });
         await (0, import_promises3.unlink)(caddyLockFilePath).catch(() => {
         });
-        await cleanUp();
+        if (caddyConfig) {
+          await caddyConfig.cleanUp();
+        }
       } catch (e) {
         consola.error(e);
       }
@@ -14126,7 +14178,7 @@ var unpluginFactory = (options) => ({
     }
   },
   webpack(compiler) {
-    var _a4, _b3;
+    var _a4, _b3, _c2;
     if (import_node_process5.default.env.NODE_ENV !== "development")
       return;
     const {
@@ -14157,7 +14209,16 @@ var unpluginFactory = (options) => ({
     const source = `${devServer.host}:${devServer.port}`;
     if (caddy)
       return;
-    const _close = (_b3 = compiler.close) == null ? void 0 : _b3.bind(compiler);
+    let base = "/";
+    const publicPath = (_b3 = compiler.options.output) == null ? void 0 : _b3.publicPath;
+    if (typeof publicPath === "string" && publicPath) {
+      base = publicPath;
+    }
+    if (!base.startsWith("/"))
+      base = `/${base}`;
+    if (base !== "/" && !base.endsWith("/"))
+      base = `${base}/`;
+    const _close = (_c2 = compiler.close) == null ? void 0 : _c2.bind(compiler);
     if (_close) {
       compiler.close = async (callback) => {
         import_node_process5.default.on("exit", () => {
@@ -14169,18 +14230,19 @@ var unpluginFactory = (options) => ({
     }
     caddy = new CaddyInstant();
     caddy.run(source, target, {
+      base,
       ...options
     }).then(() => {
       compiler.hooks.done.tap("unplugin-https-reverse-proxy", async () => {
         await printForwardProxy();
-        consola.success(`  ${import_picocolors2.default.green("\u279C")}  ${import_picocolors2.default.bold("run caddy reverse proxy success")}: ${colorUrl(`${options.https ? "https" : "http"}://${target}`)}`);
+        consola.success(`  ${import_picocolors2.default.green("\u279C")}  ${import_picocolors2.default.bold("run caddy reverse proxy success")}: ${colorUrl(`${options.https ? "https" : "http"}://${target}${base}`)}`);
       });
     }).catch((e) => {
       throw e;
     });
   },
   async rspack(compiler) {
-    var _a4, _b3, _c2;
+    var _a4, _b3, _c2, _d2;
     if (import_node_process5.default.env.NODE_ENV !== "development")
       return;
     const {
@@ -14213,11 +14275,21 @@ var unpluginFactory = (options) => ({
     if (caddy)
       return;
     caddy = new CaddyInstant();
+    let base = "/";
+    const publicPath = (_d2 = compiler.options.output) == null ? void 0 : _d2.publicPath;
+    if (typeof publicPath === "string" && publicPath) {
+      base = publicPath;
+    }
+    if (!base.startsWith("/"))
+      base = `/${base}`;
+    if (base !== "/" && !base.endsWith("/"))
+      base = `${base}/`;
     caddy.run(source, target, {
+      base,
       ...options
     }).then(async () => {
       await printForwardProxy();
-      consola.success(`  ${import_picocolors2.default.green("\u279C")}  ${import_picocolors2.default.bold("run caddy reverse proxy success")}: ${colorUrl(`${options.https ? "https" : "http"}://${target}`)}`);
+      consola.success(`  ${import_picocolors2.default.green("\u279C")}  ${import_picocolors2.default.bold("run caddy reverse proxy success")}: ${colorUrl(`${options.https ? "https" : "http"}://${target}${base}`)}`);
     }).catch((e) => {
       throw e;
     });

package/dist/rspack.js

@@ -1,6 +1,6 @@
 import {
   src_default
-} from "./chunk-XGTVAT6M.js";
+} from "./chunk-K7HSLE6X.js";
 import "./chunk-2P7SUCQ3.js";
 
 // src/rspack.ts

package/dist/types.d.cts

@@ -4,7 +4,7 @@ interface Options {
     showCaddyLog?: boolean;
     /** default `false` */
     https?: boolean;
-    health_check?: boolean;
+    healthCheck?: boolean;
 }
 
 export type { Options };

package/dist/types.d.ts

@@ -4,7 +4,7 @@ interface Options {
     showCaddyLog?: boolean;
     /** default `false` */
     https?: boolean;
-    health_check?: boolean;
+    healthCheck?: boolean;
 }
 
 export type { Options };