vite-plugin-rpx 0.11.33 → 0.11.35

package/dist/index.js

@@ -23434,6 +23434,7 @@ function chunkedStream(pool, conn, closeConn) {
   conn.streamingBody = true;
   let remaining = 0;
   let needTrailerCrlf = false;
+  let cancelled = false;
   async function readLine() {
     for (;; ) {
       for (let i2 = conn.pos;i2 + 1 < conn.len; i2++) {
@@ -23452,52 +23453,59 @@ function chunkedStream(pool, conn, closeConn) {
   }
   return new ReadableStream({
     async pull(controller) {
-      for (;; ) {
-        if (remaining > 0) {
-          if (conn.len === conn.pos) {
-            if (conn.closed) {
-              pool.destroy(conn);
-              controller.error(new Error("upstream closed mid-chunk"));
-              return;
+      try {
+        for (;; ) {
+          if (remaining > 0) {
+            if (conn.len === conn.pos) {
+              if (conn.closed) {
+                pool.destroy(conn);
+                controller.error(new Error("upstream closed mid-chunk"));
+                return;
+              }
+              await conn.waitForData(conn.len);
+              continue;
             }
-            await conn.waitForData(conn.len);
-            continue;
+            const take = Math.min(remaining, conn.len - conn.pos);
+            controller.enqueue(conn.buf.slice(conn.pos, conn.pos + take));
+            conn.pos += take;
+            remaining -= take;
+            conn.resumeIfDrained();
+            if (remaining === 0)
+              needTrailerCrlf = true;
+            return;
           }
-          const take = Math.min(remaining, conn.len - conn.pos);
-          controller.enqueue(conn.buf.slice(conn.pos, conn.pos + take));
-          conn.pos += take;
-          remaining -= take;
-          conn.resumeIfDrained();
-          if (remaining === 0)
-            needTrailerCrlf = true;
-          return;
-        }
-        if (needTrailerCrlf) {
-          await readLine();
-          needTrailerCrlf = false;
-        }
-        const sizeLine = await readLine();
-        const semi = sizeLine.indexOf(";");
-        const size = Number.parseInt(semi === -1 ? sizeLine : sizeLine.slice(0, semi), 16);
-        if (!Number.isInteger(size) || size < 0) {
-          pool.destroy(conn);
-          controller.error(new Error("upstream sent malformed chunk size"));
-          return;
-        }
-        if (size === 0) {
-          for (;; ) {
-            const t2 = await readLine();
-            if (t2 === "")
-              break;
+          if (needTrailerCrlf) {
+            await readLine();
+            needTrailerCrlf = false;
           }
-          finishConn(pool, conn, closeConn);
-          controller.close();
-          return;
+          const sizeLine = await readLine();
+          const semi = sizeLine.indexOf(";");
+          const size = Number.parseInt(semi === -1 ? sizeLine : sizeLine.slice(0, semi), 16);
+          if (!Number.isInteger(size) || size < 0) {
+            pool.destroy(conn);
+            controller.error(new Error("upstream sent malformed chunk size"));
+            return;
+          }
+          if (size === 0) {
+            for (;; ) {
+              const t2 = await readLine();
+              if (t2 === "")
+                break;
+            }
+            finishConn(pool, conn, closeConn);
+            controller.close();
+            return;
+          }
+          remaining = size;
         }
-        remaining = size;
+      } catch (error) {
+        pool.destroy(conn);
+        if (!cancelled)
+          controller.error(error);
       }
     },
     cancel() {
+      cancelled = true;
       pool.destroy(conn);
     }
   });
@@ -24202,6 +24210,7 @@ class OnDemandCertManager {
   certs = new Map;
   inFlight = new Map;
   negativeCache = new Map;
+  accountKeyPem;
   constructor(opts) {
     this.config = opts.config;
     this.certsDir = opts.certsDir;
@@ -24274,13 +24283,16 @@ class OnDemandCertManager {
     }
     try {
       debugLog("on-demand", `issuing cert for ${host} (staging=${this.config.staging ?? false})`, this.verbose);
+      this.accountKeyPem ??= await this.loadAccountKey();
       const result = await this.issuer({
         domains: [host],
         method: "http-01",
         http01Store: this.http01Store,
         email: this.config.email,
-        staging: this.config.staging
+        accountKeyPem: this.accountKeyPem,
+        staging: this.config.staging ?? false
       });
+      await this.saveAccountKey(result.accountKeyPem);
       await this.persist(host, result.fullChainPem, result.keyPem);
       const entry = { serverName: host, cert: result.fullChainPem, key: result.keyPem };
       this.certs.set(host, entry);
@@ -24339,8 +24351,25 @@ class OnDemandCertManager {
       fsp2.writeFile(keyPath, keyPem, { encoding: "utf8", mode: 384 })
     ]);
   }
+  get accountKeyPath() {
+    return path5.join(this.certsDir, ACCOUNT_KEY_FILE);
+  }
+  async loadAccountKey() {
+    try {
+      return await fsp2.readFile(this.accountKeyPath, "utf8");
+    } catch {
+      return;
+    }
+  }
+  async saveAccountKey(pem) {
+    if (!pem || this.accountKeyPem === pem)
+      return;
+    this.accountKeyPem = pem;
+    await fsp2.mkdir(this.certsDir, { recursive: true }).catch(() => {});
+    await fsp2.writeFile(this.accountKeyPath, pem, { encoding: "utf8", mode: 384 }).catch(() => {});
+  }
 }
-var DEFAULT_NEGATIVE_CACHE_MS = 60000, MAX_NEGATIVE_CACHE = 4096;
+var ACCOUNT_KEY_FILE = "acme-account.key", DEFAULT_NEGATIVE_CACHE_MS = 60000, MAX_NEGATIVE_CACHE = 4096;
 var init_on_demand = __esm(() => {
   init_src();
   init_utils();

package/package.json

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