unplugin-https-reverse-proxy 3.0.0 → 4.0.0

package/dist/vite.cjs

@@ -13476,33 +13476,63 @@ var caddyTemplate = `{
   }
 }
 
-{% for p in proxies %}
-{{ p.target }}{{ p.portSuffix }} {
-  {{ p.tls }}
-  reverse_proxy http://{{ p.source }} {% if p.healthCheck %} {
-    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
@@ -13667,8 +13697,13 @@ function useCaddyConfig() {
   function writeCaddyConfig(_proxies) {
     const proxies = configJsonRef() || {};
     _proxies.forEach((p) => {
-      const index = `${p.target}${p.portSuffix}`;
-      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);
@@ -13886,13 +13921,22 @@ 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,
         portSuffix: https ? "" : ":80",
         tls: https ? "tls internal" : "",
         source,
-        base,
+        base: baseNormalized,
         healthCheck
       }
     ];
@@ -13902,14 +13946,12 @@ var CaddyInstant = class {
       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))
@@ -14137,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 {
@@ -14168,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", () => {
@@ -14180,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 {
@@ -14224,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/vite.js

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

package/dist/webpack.cjs

@@ -13476,33 +13476,63 @@ var caddyTemplate = `{
   }
 }
 
-{% for p in proxies %}
-{{ p.target }}{{ p.portSuffix }} {
-  {{ p.tls }}
-  reverse_proxy http://{{ p.source }} {% if p.healthCheck %} {
-    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
@@ -13667,8 +13697,13 @@ function useCaddyConfig() {
   function writeCaddyConfig(_proxies) {
     const proxies = configJsonRef() || {};
     _proxies.forEach((p) => {
-      const index = `${p.target}${p.portSuffix}`;
-      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);
@@ -13886,13 +13921,22 @@ 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,
         portSuffix: https ? "" : ":80",
         tls: https ? "tls internal" : "",
         source,
-        base,
+        base: baseNormalized,
         healthCheck
       }
     ];
@@ -13902,14 +13946,12 @@ var CaddyInstant = class {
       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))
@@ -14137,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 {
@@ -14168,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", () => {
@@ -14180,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 {
@@ -14224,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/webpack.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unplugin-https-reverse-proxy",
   "type": "module",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "",
   "license": "MIT",
   "homepage": "https://github.com/zcf0508/unplugin-https-reverse-proxy#readme",

package/src/caddy/caddyfile.ts

@@ -46,27 +46,36 @@ export const caddyTemplate = `{
   }
 }
 
-{% for p in proxies %}
-{{ p.target }}{{ p.portSuffix }} {
-  {{ p.tls }}
-  reverse_proxy http://{{ p.source }} {% if p.healthCheck %} {
-    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
-
-    @error status 502 503 504 404
-    handle_response @error {
-      respond * 503 {
-        body "Service Unavailable"
-        close
+{% for host in hosts %}
+{{ host.host }}{{ host.portSuffix }} {
+  {{ host.tls }}
+
+  {% 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 %}
 `
@@ -74,5 +83,35 @@ export const caddyTemplate = `{
 const liquid = new Liquid()
 
 export async function genCaddyfile(ctx: typeof CaddyContext.infer): Promise<string> {
-  return await liquid.parseAndRender(caddyTemplate, ctx)
+  const hostsMap = new Map<string, {
+    host: string
+    portSuffix: string
+    tls: string
+    routes: typeof ProxyType.infer[]
+  }>()
+
+  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 })
 }

package/src/caddy/config.ts

@@ -44,8 +44,13 @@ export function useCaddyConfig(): {
     const proxies = configJsonRef() || {}
 
     _proxies.forEach((p) => {
-      const index = `${p.target}${p.portSuffix}`
-      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)

package/src/caddy/index.ts

@@ -199,6 +199,15 @@ export class CaddyInstant {
     consola.success('update host success\n')
 
     const targetHost = target.split(':')[0]
+    const normalizeBase = (b: string): string => {
+      let out = b || '/'
+      if (!out.startsWith('/'))
+        out = `/${out}`
+      if (out !== '/' && !out.endsWith('/'))
+        out = `${out}/`
+      return out
+    }
+    const baseNormalized = normalizeBase(base)
 
     const proxies = [
       {
@@ -206,7 +215,7 @@ export class CaddyInstant {
         portSuffix: https ? '' : ':80',
         tls: https ? 'tls internal' : '',
         source,
-        base,
+        base: baseNormalized,
         healthCheck,
       },
     ]
@@ -218,15 +227,13 @@ export class CaddyInstant {
       effect(async () => {
         const { configJsonRef } = getCaddyConfig()
         const proxies = Object.values(configJsonRef() || {})
-        if (!(this.caddyfile || '').includes(`${target.split(':')[0]}${https ? '' : ':80'}`)) {
-          const ctx = validateTemplateContext({
-            caddy_root: this.caddyRoot,
-            proxies,
-          })
-
-          this.caddyfile = await genCaddyfile(ctx)
-          await this.writeCaddyfile()
-        }
+        const ctx = validateTemplateContext({
+          caddy_root: this.caddyRoot,
+          proxies,
+        })
+
+        this.caddyfile = await genCaddyfile(ctx)
+        await this.writeCaddyfile()
       }),
     )
 

package/src/index.ts

@@ -160,6 +160,16 @@ export const unpluginFactory: UnpluginFactory<Options> = options => ({
     if (caddy)
       return
 
+    let base = '/'
+    const publicPath = compiler.options.output?.publicPath as unknown
+    if (typeof publicPath === 'string' && publicPath) {
+      base = publicPath
+    }
+    if (!base.startsWith('/'))
+      base = `/${base}`
+    if (base !== '/' && !base.endsWith('/'))
+      base = `${base}/`
+
     // https://github.com/webpack/webpack-dev-server/blob/master/lib/Server.js#L1913
     const _close = compiler.close?.bind(compiler)
     if (_close) {
@@ -177,12 +187,13 @@ export const unpluginFactory: UnpluginFactory<Options> = options => ({
     caddy = new CaddyInstant()
 
     caddy.run(source, target, {
+      base,
       ...options,
     }).then(() => {
       compiler.hooks.done.tap('unplugin-https-reverse-proxy', async () => {
         await printForwardProxy()
 
-        consola.success(`  ${c.green('➜')}  ${c.bold('run caddy reverse proxy success')}: ${colorUrl(`${options.https ? 'https' : 'http'}://${target}`)}`)
+        consola.success(`  ${c.green('➜')}  ${c.bold('run caddy reverse proxy success')}: ${colorUrl(`${options.https ? 'https' : 'http'}://${target}${base}`)}`)
       })
     }).catch((e) => {
       throw e
@@ -231,12 +242,23 @@ export const unpluginFactory: UnpluginFactory<Options> = options => ({
 
     caddy = new CaddyInstant()
 
+    let base = '/'
+    const publicPath = compiler.options.output?.publicPath as unknown
+    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(`  ${c.green('➜')}  ${c.bold('run caddy reverse proxy success')}: ${colorUrl(`${options.https ? 'https' : 'http'}://${target}`)}`)
+      consola.success(`  ${c.green('➜')}  ${c.bold('run caddy reverse proxy success')}: ${colorUrl(`${options.https ? 'https' : 'http'}://${target}${base}`)}`)
     }).catch((e) => {
       throw e
     })