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

package/dist/{chunk-A3KSOGWY.js → chunk-Y4TJZ6XZ.js}

@@ -14230,11 +14230,16 @@ Run \`${caddyPath} trust\` manually if the browser warns about the certificate.`
         try {
           const child = new HelperCaddyProcess(session.client);
           this._caddyChild = child;
-          await session.client.call("caddy.start");
+          const started = await session.client.call("caddy.start");
           child.on("exit", (code) => {
             if (code !== null && code !== 0)
               reject2(new Error(`Caddy exited with code ${code}`));
           });
+          if ((started == null ? void 0 : started.started) === false) {
+            consola.info("Caddy is already running; added this route to it.");
+            void resolveWhenReady();
+            return;
+          }
           child.stderr.on("data", async (data) => {
             const lines = data.toString().split("\n").map((line) => line.trim());
             for (const line of lines) {

package/dist/esbuild.cjs

@@ -14330,11 +14330,16 @@ Run \`${caddyPath} trust\` manually if the browser warns about the certificate.`
         try {
           const child = new HelperCaddyProcess(session.client);
           this._caddyChild = child;
-          await session.client.call("caddy.start");
+          const started = await session.client.call("caddy.start");
           child.on("exit", (code) => {
             if (code !== null && code !== 0)
               reject2(new Error(`Caddy exited with code ${code}`));
           });
+          if ((started == null ? void 0 : started.started) === false) {
+            consola.info("Caddy is already running; added this route to it.");
+            void resolveWhenReady();
+            return;
+          }
           child.stderr.on("data", async (data) => {
             const lines = data.toString().split("\n").map((line) => line.trim());
             for (const line of lines) {

package/dist/esbuild.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-A3KSOGWY.js";
+} from "./chunk-Y4TJZ6XZ.js";
 import "./chunk-EY3HXBJ4.js";
 import "./chunk-C5A7XLKL.js";
 import "./chunk-WOMR3ZLM.js";

package/dist/index.cjs

@@ -14330,11 +14330,16 @@ Run \`${caddyPath} trust\` manually if the browser warns about the certificate.`
         try {
           const child = new HelperCaddyProcess(session.client);
           this._caddyChild = child;
-          await session.client.call("caddy.start");
+          const started = await session.client.call("caddy.start");
           child.on("exit", (code) => {
             if (code !== null && code !== 0)
               reject2(new Error(`Caddy exited with code ${code}`));
           });
+          if ((started == null ? void 0 : started.started) === false) {
+            consola.info("Caddy is already running; added this route to it.");
+            void resolveWhenReady();
+            return;
+          }
           child.stderr.on("data", async (data) => {
             const lines = data.toString().split("\n").map((line) => line.trim());
             for (const line of lines) {

package/dist/index.js

@@ -3,7 +3,7 @@ import {
   unplugin,
   unpluginFactory,
   vitePrintUrls
-} from "./chunk-A3KSOGWY.js";
+} from "./chunk-Y4TJZ6XZ.js";
 import "./chunk-EY3HXBJ4.js";
 import "./chunk-C5A7XLKL.js";
 import "./chunk-WOMR3ZLM.js";

package/dist/nuxt.cjs

@@ -14331,11 +14331,16 @@ Run \`${caddyPath} trust\` manually if the browser warns about the certificate.`
         try {
           const child = new HelperCaddyProcess(session.client);
           this._caddyChild = child;
-          await session.client.call("caddy.start");
+          const started = await session.client.call("caddy.start");
           child.on("exit", (code) => {
             if (code !== null && code !== 0)
               reject2(new Error(`Caddy exited with code ${code}`));
           });
+          if ((started == null ? void 0 : started.started) === false) {
+            consola.info("Caddy is already running; added this route to it.");
+            void resolveWhenReady();
+            return;
+          }
           child.stderr.on("data", async (data) => {
             const lines = data.toString().split("\n").map((line) => line.trim());
             for (const line of lines) {

package/dist/nuxt.js

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

package/dist/rollup.cjs

@@ -14330,11 +14330,16 @@ Run \`${caddyPath} trust\` manually if the browser warns about the certificate.`
         try {
           const child = new HelperCaddyProcess(session.client);
           this._caddyChild = child;
-          await session.client.call("caddy.start");
+          const started = await session.client.call("caddy.start");
           child.on("exit", (code) => {
             if (code !== null && code !== 0)
               reject2(new Error(`Caddy exited with code ${code}`));
           });
+          if ((started == null ? void 0 : started.started) === false) {
+            consola.info("Caddy is already running; added this route to it.");
+            void resolveWhenReady();
+            return;
+          }
           child.stderr.on("data", async (data) => {
             const lines = data.toString().split("\n").map((line) => line.trim());
             for (const line of lines) {

package/dist/rollup.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-A3KSOGWY.js";
+} from "./chunk-Y4TJZ6XZ.js";
 import "./chunk-EY3HXBJ4.js";
 import "./chunk-C5A7XLKL.js";
 import "./chunk-WOMR3ZLM.js";

package/dist/rspack.cjs

@@ -14329,11 +14329,16 @@ Run \`${caddyPath} trust\` manually if the browser warns about the certificate.`
         try {
           const child = new HelperCaddyProcess(session.client);
           this._caddyChild = child;
-          await session.client.call("caddy.start");
+          const started = await session.client.call("caddy.start");
           child.on("exit", (code) => {
             if (code !== null && code !== 0)
               reject2(new Error(`Caddy exited with code ${code}`));
           });
+          if ((started == null ? void 0 : started.started) === false) {
+            consola.info("Caddy is already running; added this route to it.");
+            void resolveWhenReady();
+            return;
+          }
           child.stderr.on("data", async (data) => {
             const lines = data.toString().split("\n").map((line) => line.trim());
             for (const line of lines) {

package/dist/rspack.js

@@ -1,6 +1,6 @@
 import {
   src_default
-} from "./chunk-A3KSOGWY.js";
+} from "./chunk-Y4TJZ6XZ.js";
 import "./chunk-EY3HXBJ4.js";
 import "./chunk-C5A7XLKL.js";
 import "./chunk-WOMR3ZLM.js";

package/dist/vite.cjs

@@ -14330,11 +14330,16 @@ Run \`${caddyPath} trust\` manually if the browser warns about the certificate.`
         try {
           const child = new HelperCaddyProcess(session.client);
           this._caddyChild = child;
-          await session.client.call("caddy.start");
+          const started = await session.client.call("caddy.start");
           child.on("exit", (code) => {
             if (code !== null && code !== 0)
               reject2(new Error(`Caddy exited with code ${code}`));
           });
+          if ((started == null ? void 0 : started.started) === false) {
+            consola.info("Caddy is already running; added this route to it.");
+            void resolveWhenReady();
+            return;
+          }
           child.stderr.on("data", async (data) => {
             const lines = data.toString().split("\n").map((line) => line.trim());
             for (const line of lines) {

package/dist/vite.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-A3KSOGWY.js";
+} from "./chunk-Y4TJZ6XZ.js";
 import "./chunk-EY3HXBJ4.js";
 import "./chunk-C5A7XLKL.js";
 import "./chunk-WOMR3ZLM.js";

package/dist/webpack.cjs

@@ -14330,11 +14330,16 @@ Run \`${caddyPath} trust\` manually if the browser warns about the certificate.`
         try {
           const child = new HelperCaddyProcess(session.client);
           this._caddyChild = child;
-          await session.client.call("caddy.start");
+          const started = await session.client.call("caddy.start");
           child.on("exit", (code) => {
             if (code !== null && code !== 0)
               reject2(new Error(`Caddy exited with code ${code}`));
           });
+          if ((started == null ? void 0 : started.started) === false) {
+            consola.info("Caddy is already running; added this route to it.");
+            void resolveWhenReady();
+            return;
+          }
           child.stderr.on("data", async (data) => {
             const lines = data.toString().split("\n").map((line) => line.trim());
             for (const line of lines) {

package/dist/webpack.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-A3KSOGWY.js";
+} from "./chunk-Y4TJZ6XZ.js";
 import "./chunk-EY3HXBJ4.js";
 import "./chunk-C5A7XLKL.js";
 import "./chunk-WOMR3ZLM.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unplugin-https-reverse-proxy",
   "type": "module",
-  "version": "4.1.0-beta.5",
+  "version": "4.1.0-beta.6",
   "description": "",
   "license": "MIT",
   "homepage": "https://github.com/zcf0508/unplugin-https-reverse-proxy#readme",

package/src/caddy/index.ts

@@ -420,13 +420,22 @@ export class CaddyInstant {
           const child = new HelperCaddyProcess(session.client)
           this._caddyChild = child
 
-          await session.client.call('caddy.start')
+          const started = await session.client.call('caddy.start')
 
           child.on('exit', (code: number | null) => {
             if (code !== null && code !== 0)
               reject(new Error(`Caddy exited with code ${code}`))
           })
 
+          // Caddy was already serving: its "serving initial" line was emitted
+          // when the first project started it, so waiting for it again would
+          // hang this instance forever.
+          if (started?.started === false) {
+            consola.info('Caddy is already running; added this route to it.')
+            void resolveWhenReady()
+            return
+          }
+
           child.stderr.on('data', async (data: Buffer) => {
             const lines = data.toString().split('\n').map((line: string) => line.trim())
             for (const line of lines) {

package/src/privileged/client.ts

@@ -44,7 +44,8 @@ export interface HelperResults {
   'hosts.add': void
   'hosts.remove': void
   'port.free': { killed: number[] }
-  'caddy.start': { pid?: number }
+  /** `started: false` means Caddy was already running and was reused. */
+  'caddy.start': { pid?: number, started?: boolean }
   'caddy.stop': void
   'ca.trust': { trusted: boolean, output: string }
 }