vite-plugin-rpx 0.11.37 → 0.11.39

package/dist/index.js

@@ -23267,7 +23267,7 @@ async function proxyViaPool(reqOpts) {
       const written = conn.socket.write(payload);
       if (written < payload.length)
         await conn.writeAll(payload.subarray(written));
-      return await readResponse(pool, conn, isHead);
+      return await readResponse(pool, conn, isHead, reqOpts.signal);
     } catch (err) {
       const retryable = err === STALE && attempt < MAX_STALE_RETRIES && (conn.fresh || isIdempotent(method));
       pool.destroy(conn);
@@ -23296,7 +23296,7 @@ async function waitForHead(conn) {
   }
   return headerEnd;
 }
-async function readResponse(pool, conn, isHead) {
+async function readResponse(pool, conn, isHead, signal) {
   let head;
   for (;; ) {
     const headerEnd = await waitForHead(conn);
@@ -23316,7 +23316,10 @@ async function readResponse(pool, conn, isHead) {
     return new Response(null, { status: head.status, headers: responseHeaders });
   }
   if (head.chunked)
-    return new Response(chunkedStream(pool, conn, head.closeConn), { status: head.status, headers: responseHeaders });
+    return new Response(chunkedStream(pool, conn, head.closeConn, signal), {
+      status: head.status,
+      headers: responseHeaders
+    });
   if (head.contentLength >= 0) {
     const available = conn.len - conn.pos;
     if (available >= head.contentLength) {
@@ -23430,12 +23433,23 @@ function untilCloseStream(conn) {
     }
   });
 }
-function chunkedStream(pool, conn, closeConn) {
+function chunkedStream(pool, conn, closeConn, signal) {
   conn.streamingBody = true;
   let remaining = 0;
   let needTrailerCrlf = false;
   let cancelled = false;
-  async function readLine() {
+  let downstreamController;
+  const cleanupSignal = () => signal?.removeEventListener("abort", abortDownstream);
+  const abortDownstream = () => {
+    if (cancelled)
+      return;
+    cancelled = true;
+    pool.destroy(conn);
+    try {
+      downstreamController?.close();
+    } catch {}
+  };
+  async function readLine(allowCleanEof = false) {
     for (;; ) {
       for (let i2 = conn.pos;i2 + 1 < conn.len; i2++) {
         if (conn.buf[i2] === 13 && conn.buf[i2 + 1] === 10) {
@@ -23444,14 +23458,24 @@ function chunkedStream(pool, conn, closeConn) {
           return line;
         }
       }
-      if (conn.closed)
+      if (conn.closed) {
+        if (allowCleanEof && conn.pos === conn.len)
+          return null;
         throw new Error("upstream closed mid-chunk-header");
+      }
       if (conn.len - conn.pos > MAX_HEADER_BYTES)
         throw new Error("upstream chunk header too large");
       await conn.waitForData(conn.len);
     }
   }
   return new ReadableStream({
+    start(controller) {
+      downstreamController = controller;
+      if (signal?.aborted)
+        abortDownstream();
+      else
+        signal?.addEventListener("abort", abortDownstream, { once: true });
+    },
     async pull(controller) {
       try {
         for (;; ) {
@@ -23478,7 +23502,13 @@ function chunkedStream(pool, conn, closeConn) {
             await readLine();
             needTrailerCrlf = false;
           }
-          const sizeLine = await readLine();
+          const sizeLine = await readLine(true);
+          if (sizeLine === null) {
+            pool.destroy(conn);
+            cleanupSignal();
+            controller.close();
+            return;
+          }
           const semi = sizeLine.indexOf(";");
           const size = Number.parseInt(semi === -1 ? sizeLine : sizeLine.slice(0, semi), 16);
           if (!Number.isInteger(size) || size < 0) {
@@ -23493,6 +23523,7 @@ function chunkedStream(pool, conn, closeConn) {
                 break;
             }
             finishConn(pool, conn, closeConn);
+            cleanupSignal();
             controller.close();
             return;
           }
@@ -23500,12 +23531,14 @@ function chunkedStream(pool, conn, closeConn) {
         }
       } catch (error) {
         pool.destroy(conn);
+        cleanupSignal();
         if (!cancelled)
           controller.error(error);
       }
     },
     cancel() {
       cancelled = true;
+      cleanupSignal();
       pool.destroy(conn);
     }
   });
@@ -23860,7 +23893,8 @@ function createProxyFetchHandler(getRoute, verbose, onNoRoute) {
         reqHeaders: req.headers,
         forwardedHost: hostname,
         originOverride,
-        body: req.body
+        body: req.body,
+        signal: req.signal
       });
       if (pool)
         markSuccess(pool, upstream);
@@ -26165,7 +26199,7 @@ init_utils();
 var package_default = {
   name: "@stacksjs/rpx",
   type: "module",
-  version: "0.11.37",
+  version: "0.11.39",
   description: "A modern and smart reverse proxy.",
   author: "Chris Breuer <chris@stacksjs.org>",
   license: "MIT",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-rpx",
   "type": "module",
-  "version": "0.11.37",
+  "version": "0.11.39",
   "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.37",
+    "@stacksjs/rpx": "0.11.39",
     "@stacksjs/tlsx": "^0.13.13"
   },
   "simple-git-hooks": {