unplugin-https-reverse-proxy 4.1.0-beta.7 → 4.1.0-beta.9

package/dist/{chunk-FNF6HQJB.js → chunk-3NHJSYFO.js}

@@ -13149,29 +13149,31 @@ function writeConfig(proxies) {
   writeFileSync(temp, content);
   renameSync(temp, caddyConfigPath);
 }
-async function mutateConfig(lock3, mutate) {
-  const release = await lock3.acquire();
-  try {
-    const proxies = readConfig();
-    mutate(proxies);
-    writeConfig(proxies);
-    return proxies;
-  } finally {
-    release();
-  }
-}
 function useCaddyConfig(options = {}) {
   const lock3 = options.lock ?? createFileLock();
+  async function mutate(apply) {
+    var _a4;
+    const release = await lock3.acquire();
+    try {
+      const proxies = readConfig();
+      apply(proxies);
+      writeConfig(proxies);
+      await ((_a4 = options.renderCaddyfile) == null ? void 0 : _a4.call(options, proxies));
+      return proxies;
+    } finally {
+      release();
+    }
+  }
   return {
     configJsonRef: () => existsSync2(caddyConfigPath) ? readConfig() : void 0,
     async writeCaddyConfig(_proxies, key) {
-      await mutateConfig(lock3, (proxies) => {
+      await mutate((proxies) => {
         for (const p of _proxies)
           proxies[routeKey(p, key)] = { ...p, base: normalizeBase(p.base), ownerPid: process3.pid };
       });
     },
     async removeProxy(key) {
-      const proxies = await mutateConfig(lock3, (current) => {
+      const proxies = await mutate((current) => {
         for (const route of Object.keys(current)) {
           if (route.endsWith(`#${key}`))
             delete current[route];
@@ -13575,19 +13577,22 @@ function takeBackTerminal() {
     return () => {
     };
   const wasRaw = stdin.isRaw === true;
+  stdin.pause();
   try {
     stdin.setRawMode(false);
   } catch {
+    stdin.resume();
     return () => {
     };
   }
   return () => {
-    if (!wasRaw)
-      return;
-    try {
-      stdin.setRawMode(true);
-    } catch {
+    if (wasRaw) {
+      try {
+        stdin.setRawMode(true);
+      } catch {
+      }
     }
+    stdin.resume();
   };
 }
 var PrivilegeDeniedError = class extends Error {
@@ -14017,10 +14022,23 @@ function testCaddy() {
     });
   });
 }
+function caddyRootPath() {
+  return join6(
+    process8.platform === "win32" ? `${process8.env.AppData}/Caddy` : `${process8.env.HOME}/Library/Application Support/Caddy`,
+    "./pki/authorities/local"
+  );
+}
+async function renderCaddyfile(proxies) {
+  const ctx = validateTemplateContext({
+    caddy_root: caddyRootPath(),
+    proxies: Object.values(proxies)
+  });
+  await writeFile2(caddyFilePath, await genCaddyfile(ctx));
+}
 var caddyConfig;
 function getCaddyConfig() {
   if (!caddyConfig) {
-    caddyConfig = useCaddyConfig();
+    caddyConfig = useCaddyConfig({ renderCaddyfile });
   }
   return caddyConfig;
 }
@@ -14076,10 +14094,7 @@ var CaddyInstant = class {
     return this.caddyfile;
   }
   get caddyRoot() {
-    return join6(
-      process8.platform === "win32" ? `${process8.env.AppData}/Caddy` : `${process8.env.HOME}/Library/Application Support/Caddy`,
-      "./pki/authorities/local"
-    );
+    return caddyRootPath();
   }
   async writeCaddyfile() {
     return await writeFile2(caddyFilePath, this.caddyfile || "");

package/dist/esbuild.cjs

@@ -13197,29 +13197,31 @@ function writeConfig(proxies) {
   (0, import_node_fs.writeFileSync)(temp, content);
   (0, import_node_fs.renameSync)(temp, caddyConfigPath);
 }
-async function mutateConfig(lock3, mutate) {
-  const release = await lock3.acquire();
-  try {
-    const proxies = readConfig();
-    mutate(proxies);
-    writeConfig(proxies);
-    return proxies;
-  } finally {
-    release();
-  }
-}
 function useCaddyConfig(options = {}) {
   const lock3 = options.lock ?? createFileLock();
+  async function mutate(apply) {
+    var _a4;
+    const release = await lock3.acquire();
+    try {
+      const proxies = readConfig();
+      apply(proxies);
+      writeConfig(proxies);
+      await ((_a4 = options.renderCaddyfile) == null ? void 0 : _a4.call(options, proxies));
+      return proxies;
+    } finally {
+      release();
+    }
+  }
   return {
     configJsonRef: () => (0, import_node_fs.existsSync)(caddyConfigPath) ? readConfig() : void 0,
     async writeCaddyConfig(_proxies, key) {
-      await mutateConfig(lock3, (proxies) => {
+      await mutate((proxies) => {
         for (const p of _proxies)
           proxies[routeKey(p, key)] = { ...p, base: normalizeBase(p.base), ownerPid: import_node_process2.default.pid };
       });
     },
     async removeProxy(key) {
-      const proxies = await mutateConfig(lock3, (current) => {
+      const proxies = await mutate((current) => {
         for (const route of Object.keys(current)) {
           if (route.endsWith(`#${key}`))
             delete current[route];
@@ -13674,19 +13676,22 @@ function takeBackTerminal() {
     return () => {
     };
   const wasRaw = stdin.isRaw === true;
+  stdin.pause();
   try {
     stdin.setRawMode(false);
   } catch {
+    stdin.resume();
     return () => {
     };
   }
   return () => {
-    if (!wasRaw)
-      return;
-    try {
-      stdin.setRawMode(true);
-    } catch {
+    if (wasRaw) {
+      try {
+        stdin.setRawMode(true);
+      } catch {
+      }
     }
+    stdin.resume();
   };
 }
 var PrivilegeDeniedError = class extends Error {
@@ -14117,10 +14122,23 @@ function testCaddy() {
     });
   });
 }
+function caddyRootPath() {
+  return (0, import_node_path5.join)(
+    import_node_process8.default.platform === "win32" ? `${import_node_process8.default.env.AppData}/Caddy` : `${import_node_process8.default.env.HOME}/Library/Application Support/Caddy`,
+    "./pki/authorities/local"
+  );
+}
+async function renderCaddyfile(proxies) {
+  const ctx = validateTemplateContext({
+    caddy_root: caddyRootPath(),
+    proxies: Object.values(proxies)
+  });
+  await (0, import_promises2.writeFile)(caddyFilePath, await genCaddyfile(ctx));
+}
 var caddyConfig;
 function getCaddyConfig() {
   if (!caddyConfig) {
-    caddyConfig = useCaddyConfig();
+    caddyConfig = useCaddyConfig({ renderCaddyfile });
   }
   return caddyConfig;
 }
@@ -14176,10 +14194,7 @@ var CaddyInstant = class {
     return this.caddyfile;
   }
   get caddyRoot() {
-    return (0, import_node_path5.join)(
-      import_node_process8.default.platform === "win32" ? `${import_node_process8.default.env.AppData}/Caddy` : `${import_node_process8.default.env.HOME}/Library/Application Support/Caddy`,
-      "./pki/authorities/local"
-    );
+    return caddyRootPath();
   }
   async writeCaddyfile() {
     return await (0, import_promises2.writeFile)(caddyFilePath, this.caddyfile || "");

package/dist/esbuild.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-FNF6HQJB.js";
+} from "./chunk-3NHJSYFO.js";
 import "./chunk-EY3HXBJ4.js";
 import "./chunk-C5A7XLKL.js";
 import "./chunk-WOMR3ZLM.js";

package/dist/index.cjs

@@ -13197,29 +13197,31 @@ function writeConfig(proxies) {
   (0, import_node_fs.writeFileSync)(temp, content);
   (0, import_node_fs.renameSync)(temp, caddyConfigPath);
 }
-async function mutateConfig(lock3, mutate) {
-  const release = await lock3.acquire();
-  try {
-    const proxies = readConfig();
-    mutate(proxies);
-    writeConfig(proxies);
-    return proxies;
-  } finally {
-    release();
-  }
-}
 function useCaddyConfig(options = {}) {
   const lock3 = options.lock ?? createFileLock();
+  async function mutate(apply) {
+    var _a4;
+    const release = await lock3.acquire();
+    try {
+      const proxies = readConfig();
+      apply(proxies);
+      writeConfig(proxies);
+      await ((_a4 = options.renderCaddyfile) == null ? void 0 : _a4.call(options, proxies));
+      return proxies;
+    } finally {
+      release();
+    }
+  }
   return {
     configJsonRef: () => (0, import_node_fs.existsSync)(caddyConfigPath) ? readConfig() : void 0,
     async writeCaddyConfig(_proxies, key) {
-      await mutateConfig(lock3, (proxies) => {
+      await mutate((proxies) => {
         for (const p of _proxies)
           proxies[routeKey(p, key)] = { ...p, base: normalizeBase(p.base), ownerPid: import_node_process2.default.pid };
       });
     },
     async removeProxy(key) {
-      const proxies = await mutateConfig(lock3, (current) => {
+      const proxies = await mutate((current) => {
         for (const route of Object.keys(current)) {
           if (route.endsWith(`#${key}`))
             delete current[route];
@@ -13674,19 +13676,22 @@ function takeBackTerminal() {
     return () => {
     };
   const wasRaw = stdin.isRaw === true;
+  stdin.pause();
   try {
     stdin.setRawMode(false);
   } catch {
+    stdin.resume();
     return () => {
     };
   }
   return () => {
-    if (!wasRaw)
-      return;
-    try {
-      stdin.setRawMode(true);
-    } catch {
+    if (wasRaw) {
+      try {
+        stdin.setRawMode(true);
+      } catch {
+      }
     }
+    stdin.resume();
   };
 }
 var PrivilegeDeniedError = class extends Error {
@@ -14117,10 +14122,23 @@ function testCaddy() {
     });
   });
 }
+function caddyRootPath() {
+  return (0, import_node_path5.join)(
+    import_node_process8.default.platform === "win32" ? `${import_node_process8.default.env.AppData}/Caddy` : `${import_node_process8.default.env.HOME}/Library/Application Support/Caddy`,
+    "./pki/authorities/local"
+  );
+}
+async function renderCaddyfile(proxies) {
+  const ctx = validateTemplateContext({
+    caddy_root: caddyRootPath(),
+    proxies: Object.values(proxies)
+  });
+  await (0, import_promises2.writeFile)(caddyFilePath, await genCaddyfile(ctx));
+}
 var caddyConfig;
 function getCaddyConfig() {
   if (!caddyConfig) {
-    caddyConfig = useCaddyConfig();
+    caddyConfig = useCaddyConfig({ renderCaddyfile });
   }
   return caddyConfig;
 }
@@ -14176,10 +14194,7 @@ var CaddyInstant = class {
     return this.caddyfile;
   }
   get caddyRoot() {
-    return (0, import_node_path5.join)(
-      import_node_process8.default.platform === "win32" ? `${import_node_process8.default.env.AppData}/Caddy` : `${import_node_process8.default.env.HOME}/Library/Application Support/Caddy`,
-      "./pki/authorities/local"
-    );
+    return caddyRootPath();
   }
   async writeCaddyfile() {
     return await (0, import_promises2.writeFile)(caddyFilePath, this.caddyfile || "");

package/dist/index.js

@@ -3,7 +3,7 @@ import {
   unplugin,
   unpluginFactory,
   vitePrintUrls
-} from "./chunk-FNF6HQJB.js";
+} from "./chunk-3NHJSYFO.js";
 import "./chunk-EY3HXBJ4.js";
 import "./chunk-C5A7XLKL.js";
 import "./chunk-WOMR3ZLM.js";

package/dist/nuxt.cjs

@@ -13198,29 +13198,31 @@ function writeConfig(proxies) {
   (0, import_node_fs.writeFileSync)(temp, content);
   (0, import_node_fs.renameSync)(temp, caddyConfigPath);
 }
-async function mutateConfig(lock3, mutate) {
-  const release = await lock3.acquire();
-  try {
-    const proxies = readConfig();
-    mutate(proxies);
-    writeConfig(proxies);
-    return proxies;
-  } finally {
-    release();
-  }
-}
 function useCaddyConfig(options = {}) {
   const lock3 = options.lock ?? createFileLock();
+  async function mutate(apply) {
+    var _a4;
+    const release = await lock3.acquire();
+    try {
+      const proxies = readConfig();
+      apply(proxies);
+      writeConfig(proxies);
+      await ((_a4 = options.renderCaddyfile) == null ? void 0 : _a4.call(options, proxies));
+      return proxies;
+    } finally {
+      release();
+    }
+  }
   return {
     configJsonRef: () => (0, import_node_fs.existsSync)(caddyConfigPath) ? readConfig() : void 0,
     async writeCaddyConfig(_proxies, key) {
-      await mutateConfig(lock3, (proxies) => {
+      await mutate((proxies) => {
         for (const p of _proxies)
           proxies[routeKey(p, key)] = { ...p, base: normalizeBase(p.base), ownerPid: import_node_process2.default.pid };
       });
     },
     async removeProxy(key) {
-      const proxies = await mutateConfig(lock3, (current) => {
+      const proxies = await mutate((current) => {
         for (const route of Object.keys(current)) {
           if (route.endsWith(`#${key}`))
             delete current[route];
@@ -13675,19 +13677,22 @@ function takeBackTerminal() {
     return () => {
     };
   const wasRaw = stdin.isRaw === true;
+  stdin.pause();
   try {
     stdin.setRawMode(false);
   } catch {
+    stdin.resume();
     return () => {
     };
   }
   return () => {
-    if (!wasRaw)
-      return;
-    try {
-      stdin.setRawMode(true);
-    } catch {
+    if (wasRaw) {
+      try {
+        stdin.setRawMode(true);
+      } catch {
+      }
     }
+    stdin.resume();
   };
 }
 var PrivilegeDeniedError = class extends Error {
@@ -14118,10 +14123,23 @@ function testCaddy() {
     });
   });
 }
+function caddyRootPath() {
+  return (0, import_node_path5.join)(
+    import_node_process8.default.platform === "win32" ? `${import_node_process8.default.env.AppData}/Caddy` : `${import_node_process8.default.env.HOME}/Library/Application Support/Caddy`,
+    "./pki/authorities/local"
+  );
+}
+async function renderCaddyfile(proxies) {
+  const ctx = validateTemplateContext({
+    caddy_root: caddyRootPath(),
+    proxies: Object.values(proxies)
+  });
+  await (0, import_promises2.writeFile)(caddyFilePath, await genCaddyfile(ctx));
+}
 var caddyConfig;
 function getCaddyConfig() {
   if (!caddyConfig) {
-    caddyConfig = useCaddyConfig();
+    caddyConfig = useCaddyConfig({ renderCaddyfile });
   }
   return caddyConfig;
 }
@@ -14177,10 +14195,7 @@ var CaddyInstant = class {
     return this.caddyfile;
   }
   get caddyRoot() {
-    return (0, import_node_path5.join)(
-      import_node_process8.default.platform === "win32" ? `${import_node_process8.default.env.AppData}/Caddy` : `${import_node_process8.default.env.HOME}/Library/Application Support/Caddy`,
-      "./pki/authorities/local"
-    );
+    return caddyRootPath();
   }
   async writeCaddyfile() {
     return await (0, import_promises2.writeFile)(caddyFilePath, this.caddyfile || "");

package/dist/nuxt.js

@@ -1,6 +1,6 @@
 import {
   vitePrintUrls
-} from "./chunk-FNF6HQJB.js";
+} from "./chunk-3NHJSYFO.js";
 import {
   consola
 } from "./chunk-EY3HXBJ4.js";

package/dist/privileged-helper.cjs

@@ -381,7 +381,8 @@ function createHelperRuntime(deps) {
         await dispose();
     },
     dispose,
-    sweepStaleEntries
+    sweepStaleEntries,
+    clientCount: () => clients.size
   };
 }
 async function reclaimTree(target, uid, gid) {
@@ -432,6 +433,14 @@ function createNodeHelperDeps(options) {
   const log = options.log ?? ((message) => import_node_process.default.stdout.write(`${message}
 `));
   let caddy;
+  import_node_process.default.on("exit", () => {
+    if ((caddy == null ? void 0 : caddy.pid) === void 0)
+      return;
+    try {
+      import_node_process.default.kill(caddy.pid, "SIGTERM");
+    } catch {
+    }
+  });
   return {
     readHosts: () => (0, import_node_fs.readFileSync)(hostsPath, "utf8"),
     writeHosts: (content) => {
@@ -476,7 +485,8 @@ function createNodeHelperDeps(options) {
       const child = (0, import_node_child_process.spawn)(options.caddyBin, ["run", "--adapter", "caddyfile", "--config", options.caddyConfigPath, "--watch"], {
         cwd: options.caddyCwd ?? import_node_process.default.cwd(),
         env: { ...import_node_process.default.env, ...options.caddyEnv },
-        stdio: ["ignore", "pipe", "pipe"]
+        stdio: ["ignore", "pipe", "pipe"],
+        detached: (0, import_node_os.platform)() !== "win32"
       });
       const handle = {
         pid: child.pid,
@@ -750,13 +760,14 @@ async function main() {
       XDG_DATA_HOME: import_node_process3.default.env.XDG_DATA_HOME ?? ""
     }
   });
-  import_node_process3.default.on("SIGINT", () => {
-  });
-  const shutdown = () => {
+  for (const signal of ["SIGINT", "SIGQUIT", "SIGTSTP", "SIGHUP"])
+    import_node_process3.default.on(signal, () => {
+    });
+  import_node_process3.default.on("SIGTERM", () => {
+    if (helper.runtime.clientCount() > 0)
+      return;
     void helper.runtime.dispose().finally(() => import_node_process3.default.exit(0));
-  };
-  import_node_process3.default.on("SIGTERM", shutdown);
-  import_node_process3.default.on("SIGHUP", shutdown);
+  });
   import_node_process3.default.stdout.on("error", () => {
   });
   import_node_process3.default.stderr.on("error", () => {

package/dist/privileged-helper.js

@@ -355,7 +355,8 @@ function createHelperRuntime(deps) {
         await dispose();
     },
     dispose,
-    sweepStaleEntries
+    sweepStaleEntries,
+    clientCount: () => clients.size
   };
 }
 async function reclaimTree(target, uid, gid) {
@@ -406,6 +407,14 @@ function createNodeHelperDeps(options) {
   const log = options.log ?? ((message) => process.stdout.write(`${message}
 `));
   let caddy;
+  process.on("exit", () => {
+    if ((caddy == null ? void 0 : caddy.pid) === void 0)
+      return;
+    try {
+      process.kill(caddy.pid, "SIGTERM");
+    } catch {
+    }
+  });
   return {
     readHosts: () => readFileSync(hostsPath, "utf8"),
     writeHosts: (content) => {
@@ -450,7 +459,8 @@ function createNodeHelperDeps(options) {
       const child = spawn(options.caddyBin, ["run", "--adapter", "caddyfile", "--config", options.caddyConfigPath, "--watch"], {
         cwd: options.caddyCwd ?? process.cwd(),
         env: { ...process.env, ...options.caddyEnv },
-        stdio: ["ignore", "pipe", "pipe"]
+        stdio: ["ignore", "pipe", "pipe"],
+        detached: platform() !== "win32"
       });
       const handle = {
         pid: child.pid,
@@ -724,13 +734,14 @@ async function main() {
       XDG_DATA_HOME: process3.env.XDG_DATA_HOME ?? ""
     }
   });
-  process3.on("SIGINT", () => {
-  });
-  const shutdown = () => {
+  for (const signal of ["SIGINT", "SIGQUIT", "SIGTSTP", "SIGHUP"])
+    process3.on(signal, () => {
+    });
+  process3.on("SIGTERM", () => {
+    if (helper.runtime.clientCount() > 0)
+      return;
     void helper.runtime.dispose().finally(() => process3.exit(0));
-  };
-  process3.on("SIGTERM", shutdown);
-  process3.on("SIGHUP", shutdown);
+  });
   process3.stdout.on("error", () => {
   });
   process3.stderr.on("error", () => {

package/dist/rollup.cjs

@@ -13197,29 +13197,31 @@ function writeConfig(proxies) {
   (0, import_node_fs.writeFileSync)(temp, content);
   (0, import_node_fs.renameSync)(temp, caddyConfigPath);
 }
-async function mutateConfig(lock3, mutate) {
-  const release = await lock3.acquire();
-  try {
-    const proxies = readConfig();
-    mutate(proxies);
-    writeConfig(proxies);
-    return proxies;
-  } finally {
-    release();
-  }
-}
 function useCaddyConfig(options = {}) {
   const lock3 = options.lock ?? createFileLock();
+  async function mutate(apply) {
+    var _a4;
+    const release = await lock3.acquire();
+    try {
+      const proxies = readConfig();
+      apply(proxies);
+      writeConfig(proxies);
+      await ((_a4 = options.renderCaddyfile) == null ? void 0 : _a4.call(options, proxies));
+      return proxies;
+    } finally {
+      release();
+    }
+  }
   return {
     configJsonRef: () => (0, import_node_fs.existsSync)(caddyConfigPath) ? readConfig() : void 0,
     async writeCaddyConfig(_proxies, key) {
-      await mutateConfig(lock3, (proxies) => {
+      await mutate((proxies) => {
         for (const p of _proxies)
           proxies[routeKey(p, key)] = { ...p, base: normalizeBase(p.base), ownerPid: import_node_process2.default.pid };
       });
     },
     async removeProxy(key) {
-      const proxies = await mutateConfig(lock3, (current) => {
+      const proxies = await mutate((current) => {
         for (const route of Object.keys(current)) {
           if (route.endsWith(`#${key}`))
             delete current[route];
@@ -13674,19 +13676,22 @@ function takeBackTerminal() {
     return () => {
     };
   const wasRaw = stdin.isRaw === true;
+  stdin.pause();
   try {
     stdin.setRawMode(false);
   } catch {
+    stdin.resume();
     return () => {
     };
   }
   return () => {
-    if (!wasRaw)
-      return;
-    try {
-      stdin.setRawMode(true);
-    } catch {
+    if (wasRaw) {
+      try {
+        stdin.setRawMode(true);
+      } catch {
+      }
     }
+    stdin.resume();
   };
 }
 var PrivilegeDeniedError = class extends Error {
@@ -14117,10 +14122,23 @@ function testCaddy() {
     });
   });
 }
+function caddyRootPath() {
+  return (0, import_node_path5.join)(
+    import_node_process8.default.platform === "win32" ? `${import_node_process8.default.env.AppData}/Caddy` : `${import_node_process8.default.env.HOME}/Library/Application Support/Caddy`,
+    "./pki/authorities/local"
+  );
+}
+async function renderCaddyfile(proxies) {
+  const ctx = validateTemplateContext({
+    caddy_root: caddyRootPath(),
+    proxies: Object.values(proxies)
+  });
+  await (0, import_promises2.writeFile)(caddyFilePath, await genCaddyfile(ctx));
+}
 var caddyConfig;
 function getCaddyConfig() {
   if (!caddyConfig) {
-    caddyConfig = useCaddyConfig();
+    caddyConfig = useCaddyConfig({ renderCaddyfile });
   }
   return caddyConfig;
 }
@@ -14176,10 +14194,7 @@ var CaddyInstant = class {
     return this.caddyfile;
   }
   get caddyRoot() {
-    return (0, import_node_path5.join)(
-      import_node_process8.default.platform === "win32" ? `${import_node_process8.default.env.AppData}/Caddy` : `${import_node_process8.default.env.HOME}/Library/Application Support/Caddy`,
-      "./pki/authorities/local"
-    );
+    return caddyRootPath();
   }
   async writeCaddyfile() {
     return await (0, import_promises2.writeFile)(caddyFilePath, this.caddyfile || "");