unplugin-https-reverse-proxy 4.1.0-beta.3 → 4.1.0-beta.5

package/dist/nuxt.js

@@ -1,6 +1,6 @@
 import {
   vitePrintUrls
-} from "./chunk-HBXMM25C.js";
+} from "./chunk-A3KSOGWY.js";
 import {
   consola
 } from "./chunk-EY3HXBJ4.js";

package/dist/privileged-helper.cjs

@@ -29,6 +29,7 @@ var import_node_process3 = __toESM(require("process"), 1);
 var import_node_buffer = require("buffer");
 var import_node_fs2 = require("fs");
 var import_node_net3 = require("net");
+var import_node_path2 = require("path");
 var import_node_process2 = __toESM(require("process"), 1);
 
 // src/privileged/server.ts
@@ -215,6 +216,28 @@ function createHelperRuntime(deps) {
   let teardown;
   let generation = 0;
   let caddy;
+  const hostOwners = /* @__PURE__ */ new Map();
+  const hostId = (ip, host) => `${ip} ${host.toLowerCase()}`;
+  function addHostOwner(client, ip, host) {
+    const id = hostId(ip, host);
+    let owners = hostOwners.get(id);
+    if (!owners) {
+      owners = /* @__PURE__ */ new Set();
+      hostOwners.set(id, owners);
+    }
+    owners.add(client ?? deps);
+  }
+  function releaseHostOwner(client, ip, host) {
+    const id = hostId(ip, host);
+    const owners = hostOwners.get(id);
+    if (!owners)
+      return true;
+    owners.delete(client ?? deps);
+    if (owners.size > 0)
+      return false;
+    hostOwners.delete(id);
+    return true;
+  }
   const broadcast = (event) => {
     const line = serializeMessage(event);
     for (const client of clients) {
@@ -273,7 +296,7 @@ function createHelperRuntime(deps) {
       return false;
     }
   }
-  async function handle(request) {
+  async function handle(request, client) {
     try {
       switch (request.method) {
         case "ping":
@@ -285,6 +308,7 @@ function createHelperRuntime(deps) {
           const edited = addHost(deps.readHosts(), ip, host);
           if (edited.changed)
             deps.writeHosts(edited.content);
+          addHostOwner(client, ip, host);
           await flushDnsBestEffort(deps);
           return { id: request.id, ok: true };
         }
@@ -292,6 +316,9 @@ function createHelperRuntime(deps) {
           const { ip, host } = request.params;
           if (!isSafeIp(ip) || !isSafeHost(host))
             return { id: request.id, ok: false, error: { message: "invalid hosts entry" } };
+          const last = releaseHostOwner(client, ip, host);
+          if (!last)
+            return { id: request.id, ok: true, result: { kept: true } };
           const edited = removeHost(deps.readHosts(), ip, host);
           if (edited.changed)
             deps.writeHosts(edited.content);
@@ -302,14 +329,14 @@ function createHelperRuntime(deps) {
           const { port } = request.params;
           if (!isAllowedFreePort(port))
             return { id: request.id, ok: false, error: { message: `port ${port} is not releasable` } };
-          const killed = await deps.freePort(port);
+          const killed = await deps.freePort(port, caddy == null ? void 0 : caddy.pid);
           return { id: request.id, ok: true, result: { killed } };
         }
         case "caddy.start": {
-          if (caddy)
-            await stopCaddy();
+          if (caddy && caddy.running !== false)
+            return { id: request.id, ok: true, result: { pid: caddy.pid, started: false } };
           caddy = deps.startCaddy(broadcast);
-          return { id: request.id, ok: true, result: { pid: caddy.pid } };
+          return { id: request.id, ok: true, result: { pid: caddy.pid, started: true } };
         }
         case "caddy.stop": {
           await stopCaddy();
@@ -335,6 +362,21 @@ function createHelperRuntime(deps) {
     },
     async detach(client) {
       clients.delete(client);
+      for (const [id, owners] of [...hostOwners]) {
+        if (!owners.delete(client) || owners.size > 0)
+          continue;
+        hostOwners.delete(id);
+        const [ip, host] = id.split(" ");
+        try {
+          const edited = removeHost(deps.readHosts(), ip, host);
+          if (edited.changed) {
+            deps.writeHosts(edited.content);
+            await flushDnsBestEffort(deps);
+          }
+        } catch (error) {
+          deps.log(`hosts cleanup failed: ${error.message}`);
+        }
+      }
       if (clients.size === 0)
         await dispose();
     },
@@ -408,11 +450,11 @@ function createNodeHelperDeps(options) {
       }
       throw lastError ?? new Error("no DNS cache flush command for this platform");
     },
-    freePort: async (port) => {
+    freePort: async (port, keepPid) => {
       const pids = (0, import_node_os.platform)() === "win32" ? parseWindowsListeningPids((await execFileAsync("netstat", ["-ano"])).stdout, port) : parseListeningPids((await execFileQuiet("lsof", [`-ti:${port}`, "-sTCP:LISTEN"])).stdout);
       const killed = [];
       for (const pid of pids) {
-        if (pid === import_node_process.default.pid)
+        if (pid === import_node_process.default.pid || keepPid !== void 0 && pid === keepPid)
           continue;
         try {
           import_node_process.default.kill(pid, "SIGTERM");
@@ -431,16 +473,24 @@ function createNodeHelperDeps(options) {
     storageOwner: options.storageOwner,
     startCaddy: (emit) => {
       var _a, _b;
-      const child = (0, import_node_child_process.spawn)(options.caddyBin, ["run", "--adapter", "caddyfile", "--config", options.caddyConfigPath], {
+      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"]
       });
+      const handle = {
+        pid: child.pid,
+        kill: (signal) => child.kill(signal),
+        running: true
+      };
       (_a = child.stdout) == null ? void 0 : _a.on("data", (data) => emit({ type: "event", kind: "caddy.stdout", data: data.toString() }));
       (_b = child.stderr) == null ? void 0 : _b.on("data", (data) => emit({ type: "event", kind: "caddy.stderr", data: data.toString() }));
-      child.on("exit", (code, signal) => emit({ type: "event", kind: "caddy.exit", code, signal }));
-      caddy = child;
-      return caddy;
+      child.on("exit", (code, signal) => {
+        handle.running = false;
+        emit({ type: "event", kind: "caddy.exit", code, signal });
+      });
+      caddy = handle;
+      return handle;
     },
     stopCaddy: async () => {
       const current = caddy;
@@ -474,7 +524,7 @@ function attachSocket(socket, runtime, log) {
         log(`invalid request: ${error.message}`);
         continue;
       }
-      void runtime.handle(request).then((response) => {
+      void runtime.handle(request, socket).then((response) => {
         if (!socket.destroyed)
           socket.write(serializeMessage(response));
       });
@@ -490,6 +540,7 @@ function attachSocket(socket, runtime, log) {
 
 // src/privileged/bootstrap.ts
 var HANDSHAKE_TIMEOUT_MS = 12e4;
+var DEFAULT_IDLE_TIMEOUT_MS = 3e4;
 async function startHelper(options) {
   const { socketPath, token } = options;
   const log = options.log ?? ((message) => import_node_process2.default.stdout.write(`[uhrp-helper] ${message}
@@ -512,12 +563,25 @@ async function startHelper(options) {
   } catch {
   }
   const connections = /* @__PURE__ */ new Set();
+  const idleTimeoutMs = options.idleTimeoutMs ?? DEFAULT_IDLE_TIMEOUT_MS;
+  let idleTimer;
+  const stopIdleTimer = () => {
+    if (idleTimer) {
+      clearTimeout(idleTimer);
+      idleTimer = void 0;
+    }
+  };
   const server = (0, import_node_net3.createServer)((socket) => {
     var _a;
     let buffer = "";
     let authenticated = false;
+    stopIdleTimer();
     connections.add(socket);
-    socket.on("close", () => connections.delete(socket));
+    socket.on("close", () => {
+      connections.delete(socket);
+      if (connections.size === 0)
+        scheduleIdleExit();
+    });
     const timer = setTimeout(() => {
       if (!authenticated)
         socket.destroy();
@@ -559,10 +623,27 @@ async function startHelper(options) {
     socket.on("error", () => {
     });
   });
+  function scheduleIdleExit() {
+    var _a;
+    if (idleTimer || connections.size > 0)
+      return;
+    idleTimer = setTimeout(() => {
+      var _a2, _b;
+      idleTimer = void 0;
+      if (connections.size > 0)
+        return;
+      log("no clients left; shutting down");
+      removeOwnSocket(socketPath, token);
+      server.close(() => import_node_process2.default.exit(0));
+      (_b = (_a2 = setTimeout(() => import_node_process2.default.exit(0), 1e3)).unref) == null ? void 0 : _b.call(_a2);
+    }, idleTimeoutMs);
+    (_a = idleTimer.unref) == null ? void 0 : _a.call(idleTimer);
+  }
   await new Promise((resolve, reject) => {
     server.once("error", reject);
     server.listen(socketPath, () => resolve());
   });
+  scheduleIdleExit();
   try {
     if (typeof options.ownerUid === "number") {
       (0, import_node_fs2.chownSync)(socketPath, options.ownerUid, options.ownerGid ?? options.ownerUid);
@@ -585,6 +666,22 @@ async function startHelper(options) {
     }
   };
 }
+function removeOwnSocket(socketPath, token) {
+  if (import_node_process2.default.platform === "win32")
+    return;
+  try {
+    const tokensDir = (0, import_node_path2.dirname)(socketPath);
+    const tokenFile = (0, import_node_path2.join)(tokensDir, "helper.token");
+    const current = (0, import_node_fs2.existsSync)(tokenFile) ? (0, import_node_fs2.readFileSync)(tokenFile, "utf8").trim() : void 0;
+    if (current === token)
+      (0, import_node_fs2.rmSync)(tokenFile, { force: true });
+  } catch {
+  }
+  try {
+    (0, import_node_fs2.rmSync)(socketPath, { force: true });
+  } catch {
+  }
+}
 
 // src/privileged-helper.ts
 function parseArgs(argv) {

package/dist/privileged-helper.js

@@ -7,8 +7,9 @@ import process3 from "node:process";
 
 // src/privileged/bootstrap.ts
 import { Buffer } from "node:buffer";
-import { chmodSync, chownSync, rmSync } from "node:fs";
+import { chmodSync, chownSync, existsSync, readFileSync as readFileSync2, rmSync } from "node:fs";
 import { createServer } from "node:net";
+import { dirname, join as join2 } from "node:path";
 import process2 from "node:process";
 
 // src/privileged/server.ts
@@ -189,6 +190,28 @@ function createHelperRuntime(deps) {
   let teardown;
   let generation = 0;
   let caddy;
+  const hostOwners = /* @__PURE__ */ new Map();
+  const hostId = (ip, host) => `${ip} ${host.toLowerCase()}`;
+  function addHostOwner(client, ip, host) {
+    const id = hostId(ip, host);
+    let owners = hostOwners.get(id);
+    if (!owners) {
+      owners = /* @__PURE__ */ new Set();
+      hostOwners.set(id, owners);
+    }
+    owners.add(client ?? deps);
+  }
+  function releaseHostOwner(client, ip, host) {
+    const id = hostId(ip, host);
+    const owners = hostOwners.get(id);
+    if (!owners)
+      return true;
+    owners.delete(client ?? deps);
+    if (owners.size > 0)
+      return false;
+    hostOwners.delete(id);
+    return true;
+  }
   const broadcast = (event) => {
     const line = serializeMessage(event);
     for (const client of clients) {
@@ -247,7 +270,7 @@ function createHelperRuntime(deps) {
       return false;
     }
   }
-  async function handle(request) {
+  async function handle(request, client) {
     try {
       switch (request.method) {
         case "ping":
@@ -259,6 +282,7 @@ function createHelperRuntime(deps) {
           const edited = addHost(deps.readHosts(), ip, host);
           if (edited.changed)
             deps.writeHosts(edited.content);
+          addHostOwner(client, ip, host);
           await flushDnsBestEffort(deps);
           return { id: request.id, ok: true };
         }
@@ -266,6 +290,9 @@ function createHelperRuntime(deps) {
           const { ip, host } = request.params;
           if (!isSafeIp(ip) || !isSafeHost(host))
             return { id: request.id, ok: false, error: { message: "invalid hosts entry" } };
+          const last = releaseHostOwner(client, ip, host);
+          if (!last)
+            return { id: request.id, ok: true, result: { kept: true } };
           const edited = removeHost(deps.readHosts(), ip, host);
           if (edited.changed)
             deps.writeHosts(edited.content);
@@ -276,14 +303,14 @@ function createHelperRuntime(deps) {
           const { port } = request.params;
           if (!isAllowedFreePort(port))
             return { id: request.id, ok: false, error: { message: `port ${port} is not releasable` } };
-          const killed = await deps.freePort(port);
+          const killed = await deps.freePort(port, caddy == null ? void 0 : caddy.pid);
           return { id: request.id, ok: true, result: { killed } };
         }
         case "caddy.start": {
-          if (caddy)
-            await stopCaddy();
+          if (caddy && caddy.running !== false)
+            return { id: request.id, ok: true, result: { pid: caddy.pid, started: false } };
           caddy = deps.startCaddy(broadcast);
-          return { id: request.id, ok: true, result: { pid: caddy.pid } };
+          return { id: request.id, ok: true, result: { pid: caddy.pid, started: true } };
         }
         case "caddy.stop": {
           await stopCaddy();
@@ -309,6 +336,21 @@ function createHelperRuntime(deps) {
     },
     async detach(client) {
       clients.delete(client);
+      for (const [id, owners] of [...hostOwners]) {
+        if (!owners.delete(client) || owners.size > 0)
+          continue;
+        hostOwners.delete(id);
+        const [ip, host] = id.split(" ");
+        try {
+          const edited = removeHost(deps.readHosts(), ip, host);
+          if (edited.changed) {
+            deps.writeHosts(edited.content);
+            await flushDnsBestEffort(deps);
+          }
+        } catch (error) {
+          deps.log(`hosts cleanup failed: ${error.message}`);
+        }
+      }
       if (clients.size === 0)
         await dispose();
     },
@@ -382,11 +424,11 @@ function createNodeHelperDeps(options) {
       }
       throw lastError ?? new Error("no DNS cache flush command for this platform");
     },
-    freePort: async (port) => {
+    freePort: async (port, keepPid) => {
       const pids = platform() === "win32" ? parseWindowsListeningPids((await execFileAsync("netstat", ["-ano"])).stdout, port) : parseListeningPids((await execFileQuiet("lsof", [`-ti:${port}`, "-sTCP:LISTEN"])).stdout);
       const killed = [];
       for (const pid of pids) {
-        if (pid === process.pid)
+        if (pid === process.pid || keepPid !== void 0 && pid === keepPid)
           continue;
         try {
           process.kill(pid, "SIGTERM");
@@ -405,16 +447,24 @@ function createNodeHelperDeps(options) {
     storageOwner: options.storageOwner,
     startCaddy: (emit) => {
       var _a, _b;
-      const child = spawn(options.caddyBin, ["run", "--adapter", "caddyfile", "--config", options.caddyConfigPath], {
+      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"]
       });
+      const handle = {
+        pid: child.pid,
+        kill: (signal) => child.kill(signal),
+        running: true
+      };
       (_a = child.stdout) == null ? void 0 : _a.on("data", (data) => emit({ type: "event", kind: "caddy.stdout", data: data.toString() }));
       (_b = child.stderr) == null ? void 0 : _b.on("data", (data) => emit({ type: "event", kind: "caddy.stderr", data: data.toString() }));
-      child.on("exit", (code, signal) => emit({ type: "event", kind: "caddy.exit", code, signal }));
-      caddy = child;
-      return caddy;
+      child.on("exit", (code, signal) => {
+        handle.running = false;
+        emit({ type: "event", kind: "caddy.exit", code, signal });
+      });
+      caddy = handle;
+      return handle;
     },
     stopCaddy: async () => {
       const current = caddy;
@@ -448,7 +498,7 @@ function attachSocket(socket, runtime, log) {
         log(`invalid request: ${error.message}`);
         continue;
       }
-      void runtime.handle(request).then((response) => {
+      void runtime.handle(request, socket).then((response) => {
         if (!socket.destroyed)
           socket.write(serializeMessage(response));
       });
@@ -464,6 +514,7 @@ function attachSocket(socket, runtime, log) {
 
 // src/privileged/bootstrap.ts
 var HANDSHAKE_TIMEOUT_MS = 12e4;
+var DEFAULT_IDLE_TIMEOUT_MS = 3e4;
 async function startHelper(options) {
   const { socketPath, token } = options;
   const log = options.log ?? ((message) => process2.stdout.write(`[uhrp-helper] ${message}
@@ -486,12 +537,25 @@ async function startHelper(options) {
   } catch {
   }
   const connections = /* @__PURE__ */ new Set();
+  const idleTimeoutMs = options.idleTimeoutMs ?? DEFAULT_IDLE_TIMEOUT_MS;
+  let idleTimer;
+  const stopIdleTimer = () => {
+    if (idleTimer) {
+      clearTimeout(idleTimer);
+      idleTimer = void 0;
+    }
+  };
   const server = createServer((socket) => {
     var _a;
     let buffer = "";
     let authenticated = false;
+    stopIdleTimer();
     connections.add(socket);
-    socket.on("close", () => connections.delete(socket));
+    socket.on("close", () => {
+      connections.delete(socket);
+      if (connections.size === 0)
+        scheduleIdleExit();
+    });
     const timer = setTimeout(() => {
       if (!authenticated)
         socket.destroy();
@@ -533,10 +597,27 @@ async function startHelper(options) {
     socket.on("error", () => {
     });
   });
+  function scheduleIdleExit() {
+    var _a;
+    if (idleTimer || connections.size > 0)
+      return;
+    idleTimer = setTimeout(() => {
+      var _a2, _b;
+      idleTimer = void 0;
+      if (connections.size > 0)
+        return;
+      log("no clients left; shutting down");
+      removeOwnSocket(socketPath, token);
+      server.close(() => process2.exit(0));
+      (_b = (_a2 = setTimeout(() => process2.exit(0), 1e3)).unref) == null ? void 0 : _b.call(_a2);
+    }, idleTimeoutMs);
+    (_a = idleTimer.unref) == null ? void 0 : _a.call(idleTimer);
+  }
   await new Promise((resolve, reject) => {
     server.once("error", reject);
     server.listen(socketPath, () => resolve());
   });
+  scheduleIdleExit();
   try {
     if (typeof options.ownerUid === "number") {
       chownSync(socketPath, options.ownerUid, options.ownerGid ?? options.ownerUid);
@@ -559,6 +640,22 @@ async function startHelper(options) {
     }
   };
 }
+function removeOwnSocket(socketPath, token) {
+  if (process2.platform === "win32")
+    return;
+  try {
+    const tokensDir = dirname(socketPath);
+    const tokenFile = join2(tokensDir, "helper.token");
+    const current = existsSync(tokenFile) ? readFileSync2(tokenFile, "utf8").trim() : void 0;
+    if (current === token)
+      rmSync(tokenFile, { force: true });
+  } catch {
+  }
+  try {
+    rmSync(socketPath, { force: true });
+  } catch {
+  }
+}
 
 // src/privileged-helper.ts
 function parseArgs(argv) {