vite-plugin-rpx 0.11.21 → 0.11.23

package/dist/index.js

@@ -22765,6 +22765,7 @@ class UpstreamPool {
   host;
   port;
   maxTotal;
+  key;
   idle = [];
   waiters = [];
   open = 0;
@@ -22773,10 +22774,11 @@ class UpstreamPool {
   maxWaiters;
   checkoutIdleMs = checkoutIdleMs();
   inUse = new Set;
-  constructor(host, port, maxTotal) {
+  constructor(host, port, maxTotal, key = "") {
     this.host = host;
     this.port = port;
     this.maxTotal = maxTotal;
+    this.key = key;
     this.maxWaiters = maxQueued(maxTotal);
   }
   trackCheckout(conn) {
@@ -22935,6 +22937,8 @@ class UpstreamPool {
     if (this.idle.length === 0 && this.inUse.size === 0 && this.sweeper) {
       clearInterval(this.sweeper);
       this.sweeper = null;
+      if (this.key && pools.get(this.key) === this)
+        pools.delete(this.key);
     }
   }
 }
@@ -22944,7 +22948,7 @@ function poolFor(hostPort, maxPerHost) {
     const idx = hostPort.lastIndexOf(":");
     const host = idx === -1 ? hostPort : hostPort.slice(0, idx);
     const port = idx === -1 ? 80 : Number(hostPort.slice(idx + 1));
-    pool = new UpstreamPool(host, port, maxPerHost);
+    pool = new UpstreamPool(host, port, maxPerHost, hostPort);
     pools.set(hostPort, pool);
   }
   return pool;
@@ -23519,6 +23523,9 @@ var init_static_files = __esm(() => {
 });
 
 // ../rpx/src/proxy-handler.ts
+function wsPendingCapBytes() {
+  return Math.max(0, Number(process.env.RPX_MAX_WS_PENDING_BYTES)) || 8 * 1024 * 1024;
+}
 function extractHostname2(req) {
   const hostHeader = req.headers.get("host") || "";
   const colon = hostHeader.indexOf(":");
@@ -23678,6 +23685,7 @@ function createProxyFetchHandler(getRoute, verbose, onNoRoute) {
 }
 function createProxyWebSocketHandler(verbose) {
   const state = new WeakMap;
+  const maxPendingBytes = wsPendingCapBytes();
   return {
     open(ws) {
       const { targetUrl, forwardHeaders } = ws.data;
@@ -23690,13 +23698,14 @@ function createProxyWebSocketHandler(verbose) {
         return;
       }
       upstream.binaryType = "arraybuffer";
-      const st = { upstream, upstreamOpen: false, pending: [] };
+      const st = { upstream, upstreamOpen: false, pending: [], pendingBytes: 0 };
       state.set(ws, st);
       upstream.addEventListener("open", () => {
         st.upstreamOpen = true;
         for (const frame of st.pending)
           upstream.send(frame);
         st.pending = [];
+        st.pendingBytes = 0;
       });
       upstream.addEventListener("message", (ev) => {
         ws.send(ev.data);
@@ -23718,10 +23727,24 @@ function createProxyWebSocketHandler(verbose) {
       if (!st)
         return;
       const frame = typeof message === "string" ? message : new Uint8Array(message);
-      if (st.upstreamOpen)
+      if (st.upstreamOpen) {
         st.upstream.send(frame);
-      else
-        st.pending.push(frame);
+        return;
+      }
+      const size = typeof frame === "string" ? Buffer.byteLength(frame) : frame.byteLength;
+      if (st.pendingBytes + size > maxPendingBytes) {
+        debugLog("ws", `pending buffer would exceed ${maxPendingBytes}B before upstream open; closing socket`, verbose);
+        try {
+          ws.close(1009, "buffer limit");
+        } catch {}
+        try {
+          st.upstream.close(1011, "client buffer overflow");
+        } catch {}
+        state.delete(ws);
+        return;
+      }
+      st.pending.push(frame);
+      st.pendingBytes += size;
     },
     close(ws, code, reason) {
       const st = state.get(ws);
@@ -23755,6 +23778,24 @@ var init_proxy_handler = __esm(() => {
   ]);
 });
 
+// ../rpx/src/acme-challenge.ts
+import * as fs3 from "node:fs";
+import * as path3 from "node:path";
+function readAcmeChallenge(webroot, pathname) {
+  if (!webroot || !pathname.startsWith(ACME_CHALLENGE_PREFIX2))
+    return null;
+  const token = pathname.slice(ACME_CHALLENGE_PREFIX2.length);
+  if (!token || !/^[A-Za-z0-9_-]+$/.test(token))
+    return null;
+  try {
+    return fs3.readFileSync(path3.join(webroot, token), "utf8");
+  } catch {
+    return null;
+  }
+}
+var ACME_CHALLENGE_PREFIX2 = "/.well-known/acme-challenge/";
+var init_acme_challenge = () => {};
+
 // ../rpx/src/host-match.ts
 function isWildcardPattern(pattern) {
   return pattern.startsWith("*.");
@@ -23767,10 +23808,10 @@ function matchesWildcard(hostname, pattern) {
 }
 
 // ../rpx/src/host-routes.ts
-function normalizePathPrefix(path3) {
-  if (!path3 || path3 === "/")
+function normalizePathPrefix(path4) {
+  if (!path4 || path4 === "/")
     return "/";
-  let p2 = path3.trim();
+  let p2 = path4.trim();
   if (!p2.startsWith("/"))
     p2 = `/${p2}`;
   p2 = p2.replace(/\/+$/, "");
@@ -23797,8 +23838,8 @@ function buildHostRoutes(entries) {
   const table = new Map;
   for (const [host, paths] of byHost) {
     const list = [];
-    for (const [path3, route] of paths)
-      list.push({ path: path3, route });
+    for (const [path4, route] of paths)
+      list.push({ path: path4, route });
     list.sort((a2, b2) => b2.path.length - a2.path.length);
     table.set(host, list);
   }
@@ -23837,7 +23878,7 @@ var init_host_routes = () => {};
 
 // ../rpx/src/sni.ts
 import * as fsp from "node:fs/promises";
-import * as path3 from "node:path";
+import * as path4 from "node:path";
 function serverNameFromCertFilename(filename) {
   if (!filename.endsWith(".crt"))
     return null;
@@ -23875,8 +23916,8 @@ async function buildSniTlsConfig(cfg, verbose) {
         continue;
       const base = name.slice(0, -".crt".length);
       bySrvName.set(serverName, {
-        certPath: path3.join(cfg.certsDir, name),
-        keyPath: path3.join(cfg.certsDir, `${base}.key`)
+        certPath: path4.join(cfg.certsDir, name),
+        keyPath: path4.join(cfg.certsDir, `${base}.key`)
       });
     }
   }
@@ -23898,7 +23939,7 @@ var init_sni = __esm(() => {
 
 // ../rpx/src/on-demand.ts
 import * as fsp2 from "node:fs/promises";
-import * as path4 from "node:path";
+import * as path5 from "node:path";
 function matchesAllowedSuffix(host, suffixes) {
   if (!suffixes || suffixes.length === 0)
     return false;
@@ -24049,8 +24090,8 @@ class OnDemandCertManager {
   }
   pathsFor(host) {
     return {
-      certPath: path4.join(this.certsDir, `${host}.crt`),
-      keyPath: path4.join(this.certsDir, `${host}.key`)
+      certPath: path5.join(this.certsDir, `${host}.crt`),
+      keyPath: path5.join(this.certsDir, `${host}.key`)
     };
   }
   async persist(host, certPem, keyPem) {
@@ -24209,10 +24250,10 @@ var init_port_manager = __esm(() => {
 // ../rpx/src/registry.ts
 import * as fsp3 from "node:fs/promises";
 import { homedir as homedir9 } from "node:os";
-import * as path5 from "node:path";
+import * as path6 from "node:path";
 import * as process23 from "node:process";
 function getRegistryDir() {
-  return path5.join(homedir9(), ".stacks", "rpx", "registry.d");
+  return path6.join(homedir9(), ".stacks", "rpx", "registry.d");
 }
 function isValidId(id) {
   return typeof id === "string" && id.length > 0 && id.length <= 128 && ID_PATTERN.test(id);
@@ -24220,7 +24261,7 @@ function isValidId(id) {
 function entryPath(dir, id) {
   if (!isValidId(id))
     throw new Error(`invalid registry id: ${JSON.stringify(id)}`);
-  return path5.join(dir, `${id}.json`);
+  return path6.join(dir, `${id}.json`);
 }
 function isPidAlive(pid2) {
   if (!Number.isInteger(pid2) || pid2 <= 0)
@@ -24278,11 +24319,11 @@ var init_registry = __esm(() => {
 });
 
 // ../rpx/src/site-supervisor.ts
-import { closeSync as closeSync6, openSync as openSync6, readFileSync as readFileSync3 } from "node:fs";
+import { closeSync as closeSync6, openSync as openSync6, readFileSync as readFileSync4 } from "node:fs";
 import * as fsp4 from "node:fs/promises";
 import { spawn } from "node:child_process";
 import { homedir as homedir10 } from "node:os";
-import * as path6 from "node:path";
+import * as path7 from "node:path";
 import * as process25 from "node:process";
 
 class SiteSupervisor {
@@ -24308,7 +24349,7 @@ class SiteSupervisor {
   constructor(opts) {
     this.resolver = opts.resolver;
     this.registryDir = opts.registryDir ?? getRegistryDir();
-    this.rpxDir = opts.rpxDir ?? path6.join(homedir10(), ".stacks", "rpx");
+    this.rpxDir = opts.rpxDir ?? path7.join(homedir10(), ".stacks", "rpx");
     this.verbose = opts.verbose ?? false;
     this.startupTimeoutMs = opts.startupTimeoutMs ?? DEFAULT_STARTUP_TIMEOUT_MS;
     this.pollIntervalMs = opts.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
@@ -24363,8 +24404,8 @@ class SiteSupervisor {
         ports.set(route.portEnv, port);
       }
     }
-    const logPath = path6.join(this.rpxDir, "sites", `${site.id}.log`);
-    await fsp4.mkdir(path6.dirname(logPath), { recursive: true }).catch(() => {});
+    const logPath = path7.join(this.rpxDir, "sites", `${site.id}.log`);
+    await fsp4.mkdir(path7.dirname(logPath), { recursive: true }).catch(() => {});
     const env2 = this.buildEnv(site, ports);
     let handle = null;
     let startError;
@@ -24502,7 +24543,7 @@ class SiteSupervisor {
   }
   readLogTail(state, lines = 40) {
     try {
-      const text = readFileSync3(state.logPath, "utf8");
+      const text = readFileSync4(state.logPath, "utf8");
       return text.split(`
 `).slice(-lines).join(`
 `).trim();
@@ -24660,12 +24701,12 @@ var init_site_supervisor = __esm(() => {
 // ../rpx/src/dns-state.ts
 import * as fsp5 from "node:fs/promises";
 import { homedir as homedir11 } from "node:os";
-import * as path7 from "node:path";
+import * as path8 from "node:path";
 function defaultRpxDir() {
-  return path7.join(homedir11(), ".stacks", "rpx");
+  return path8.join(homedir11(), ".stacks", "rpx");
 }
 function getDnsStatePath(rpxDir = defaultRpxDir()) {
-  return path7.join(rpxDir, RPX_DNS_STATE_FILE);
+  return path8.join(rpxDir, RPX_DNS_STATE_FILE);
 }
 async function loadDnsState(rpxDir = defaultRpxDir()) {
   try {
@@ -24769,7 +24810,7 @@ __export(exports_dns, {
 });
 import dgram from "node:dgram";
 import * as fsp6 from "node:fs/promises";
-import * as path8 from "node:path";
+import * as path9 from "node:path";
 import * as process26 from "node:process";
 function parseHeader(buffer) {
   return {
@@ -25004,7 +25045,7 @@ port ${DNS_PORT}
 `;
 }
 function resolverFilePath(basename) {
-  return path8.join(MACOS_RESOLVER_DIR, basename);
+  return path9.join(MACOS_RESOLVER_DIR, basename);
 }
 function contentLooksLikeRpxResolver(content) {
   return content.includes("127.0.0.1") && content.includes(String(DNS_PORT));
@@ -25189,13 +25230,13 @@ var init_dns = __esm(() => {
 import { spawn as nodeSpawn } from "node:child_process";
 import * as fsp7 from "node:fs/promises";
 import { homedir as homedir12 } from "node:os";
-import * as path9 from "node:path";
+import * as path10 from "node:path";
 import * as process27 from "node:process";
 function getDaemonRpxDir() {
-  return path9.join(homedir12(), ".stacks", "rpx");
+  return path10.join(homedir12(), ".stacks", "rpx");
 }
 function getDaemonPidPath(rpxDir = getDaemonRpxDir()) {
-  return path9.join(rpxDir, "daemon.pid");
+  return path10.join(rpxDir, "daemon.pid");
 }
 async function readDaemonPid(rpxDir = getDaemonRpxDir()) {
   try {
@@ -25215,7 +25256,7 @@ async function releaseDaemonLock(rpxDir = getDaemonRpxDir()) {
 }
 function defaultDaemonSpawnCommand() {
   const exec = process27.execPath;
-  const interpName = path9.basename(exec).toLowerCase();
+  const interpName = path10.basename(exec).toLowerCase();
   const isInterpreter = interpName === "bun" || interpName === "node" || interpName.startsWith("bun-");
   if (isInterpreter && process27.argv[1])
     return [exec, process27.argv[1], "daemon:start"];
@@ -25273,6 +25314,7 @@ var init_daemon = __esm(() => {
   init_logger();
   init_https();
   init_proxy_handler();
+  init_acme_challenge();
   init_host_routes();
   init_sni();
   init_on_demand();
@@ -25314,8 +25356,8 @@ init_daemon();
 init_logger();
 init_registry();
 init_utils();
-import * as fs3 from "node:fs";
-import * as path10 from "node:path";
+import * as fs4 from "node:fs";
+import * as path11 from "node:path";
 import * as process28 from "node:process";
 function deriveIdFromTarget(to, routePath) {
   const base = routePath && routePath !== "/" ? `${to}${routePath}` : to;
@@ -25391,7 +25433,7 @@ async function runViaDaemon(opts) {
       return;
     for (const id of idsForCleanup) {
       try {
-        fs3.unlinkSync(path10.join(dirForCleanup, `${id}.json`));
+        fs4.unlinkSync(path11.join(dirForCleanup, `${id}.json`));
       } catch {}
     }
   });
@@ -25401,9 +25443,9 @@ async function runViaDaemon(opts) {
 // ../rpx/src/hosts.ts
 init_utils();
 import { exec } from "node:child_process";
-import fs4 from "node:fs";
+import fs5 from "node:fs";
 import os2 from "node:os";
-import path11 from "node:path";
+import path12 from "node:path";
 import * as process29 from "node:process";
 import { promisify } from "node:util";
 var execAsync = promisify(exec);
@@ -25411,7 +25453,7 @@ function isLoopbackDevelopmentHost(host) {
   const normalized = host.trim().toLowerCase();
   return normalized === "localhost" || normalized.endsWith(".localhost") || normalized.endsWith(".localhost.");
 }
-var hostsFilePath = process29.platform === "win32" ? path11.join(process29.env.windir || "C:\\Windows", "System32", "drivers", "etc", "hosts") : "/etc/hosts";
+var hostsFilePath = process29.platform === "win32" ? path12.join(process29.env.windir || "C:\\Windows", "System32", "drivers", "etc", "hosts") : "/etc/hosts";
 var sudoPrivilegesAcquired = false;
 async function execSudo(command) {
   if (process29.platform === "win32")
@@ -25460,7 +25502,7 @@ async function addHosts(hosts, verbose) {
   try {
     let existingContent;
     try {
-      existingContent = await fs4.promises.readFile(hostsFilePath, "utf-8");
+      existingContent = await fs5.promises.readFile(hostsFilePath, "utf-8");
     } catch {
       debugLog("hosts", "Reading hosts file requires elevated permissions, using sudo", verbose);
       try {
@@ -25485,9 +25527,9 @@ async function addHosts(hosts, verbose) {
 127.0.0.1 ${host}
 ::1 ${host}`).join(`
 `);
-    const tmpFile = path11.join(os2.tmpdir(), `rpx-hosts-${Date.now()}.tmp`);
+    const tmpFile = path12.join(os2.tmpdir(), `rpx-hosts-${Date.now()}.tmp`);
     try {
-      await fs4.promises.writeFile(tmpFile, existingContent + hostEntries, "utf8");
+      await fs5.promises.writeFile(tmpFile, existingContent + hostEntries, "utf8");
       await execSudo(`cat "${tmpFile}" | tee "${hostsFilePath}" > /dev/null`);
       console.log(`  Hosts updated: ${newEntries.join(", ")}`);
     } catch (error) {
@@ -25500,7 +25542,7 @@ async function addHosts(hosts, verbose) {
       console.log(`  Or run: sudo nano ${hostsFilePath}`);
     } finally {
       try {
-        await fs4.promises.unlink(tmpFile);
+        await fs5.promises.unlink(tmpFile);
       } catch {}
     }
   } catch (err) {
@@ -25513,7 +25555,7 @@ async function removeHosts(hosts, verbose) {
   try {
     let content;
     try {
-      content = await fs4.promises.readFile(hostsFilePath, "utf-8");
+      content = await fs5.promises.readFile(hostsFilePath, "utf-8");
     } catch {
       debugLog("hosts", "Reading hosts file requires elevated permissions, using sudo", verbose);
       try {
@@ -25547,16 +25589,16 @@ async function removeHosts(hosts, verbose) {
     const newContent = `${filteredLines.join(`
 `)}
 `;
-    const tmpFile = path11.join(os2.tmpdir(), `rpx-hosts-${Date.now()}.tmp`);
+    const tmpFile = path12.join(os2.tmpdir(), `rpx-hosts-${Date.now()}.tmp`);
     try {
-      await fs4.promises.writeFile(tmpFile, newContent, "utf8");
+      await fs5.promises.writeFile(tmpFile, newContent, "utf8");
       await execSudo(`cat "${tmpFile}" | tee "${hostsFilePath}" > /dev/null`);
       debugLog("hosts", "Hosts removed successfully", verbose);
     } catch (error) {
       debugLog("hosts", "Could not clean up hosts file automatically", verbose);
     } finally {
       try {
-        await fs4.promises.unlink(tmpFile);
+        await fs5.promises.unlink(tmpFile);
       } catch (unlinkErr) {
         debugLog("hosts", `Failed to remove temporary file: ${unlinkErr}`, verbose);
       }
@@ -25569,7 +25611,7 @@ async function checkHosts(hosts, verbose) {
   debugLog("hosts", `Checking hosts: ${hosts}`, verbose);
   let content;
   try {
-    content = await fs4.promises.readFile(hostsFilePath, "utf-8");
+    content = await fs5.promises.readFile(hostsFilePath, "utf-8");
   } catch (readErr) {
     debugLog("hosts", `Error reading hosts file: ${readErr}`, verbose);
     try {
@@ -25782,25 +25824,7 @@ function createOriginGuard(options) {
 
 // ../rpx/src/start.ts
 init_proxy_handler();
-
-// ../rpx/src/acme-challenge.ts
-import * as fs5 from "node:fs";
-import * as path12 from "node:path";
-var ACME_CHALLENGE_PREFIX2 = "/.well-known/acme-challenge/";
-function readAcmeChallenge(webroot, pathname) {
-  if (!webroot || !pathname.startsWith(ACME_CHALLENGE_PREFIX2))
-    return null;
-  const token = pathname.slice(ACME_CHALLENGE_PREFIX2.length);
-  if (!token || !/^[A-Za-z0-9_-]+$/.test(token))
-    return null;
-  try {
-    return fs5.readFileSync(path12.join(webroot, token), "utf8");
-  } catch {
-    return null;
-  }
-}
-
-// ../rpx/src/start.ts
+init_acme_challenge();
 init_auth();
 init_host_routes();
 init_sni();
@@ -26632,6 +26656,7 @@ init_dns();
 init_dns_state();
 init_daemon();
 init_proxy_handler();
+init_acme_challenge();
 init_auth();
 init_host_routes();
 init_static_files();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-rpx",
   "type": "module",
-  "version": "0.11.21",
+  "version": "0.11.23",
   "description": "A modern and smart reverse proxy. Vite plugin.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",
@@ -47,7 +47,7 @@
     "typecheck": "bunx tsc --noEmit"
   },
   "dependencies": {
-    "@stacksjs/rpx": "0.11.21",
+    "@stacksjs/rpx": "0.11.23",
     "@stacksjs/tlsx": "^0.13.9"
   },
   "simple-git-hooks": {