vite-plugin-rpx 0.11.21 → 0.11.22

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);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-rpx",
   "type": "module",
-  "version": "0.11.21",
+  "version": "0.11.22",
   "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.22",
     "@stacksjs/tlsx": "^0.13.9"
   },
   "simple-git-hooks": {