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

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

@@ -13527,7 +13527,7 @@ function describePasswordReason(target, https) {
     "Press Ctrl+C at the prompt to skip the proxy and keep the dev server."
   ];
 }
-function authenticateSudo(sudoCommand = "sudo", options = {}) {
+async function authenticateSudo(sudoCommand = "sudo", options = {}) {
   if (platform() === "win32")
     return { ok: true };
   if (spawnSync(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
@@ -13538,13 +13538,31 @@ function authenticateSudo(sudoCommand = "sudo", options = {}) {
 `);
     process6.stderr.write("\n");
   }
-  if (spawnSync(sudoCommand, ["-v"], { stdio: "inherit" }).status === 0)
-    return { ok: true };
-  return {
-    ok: false,
-    denied: true,
-    message: "administrator permission is required to edit the hosts file and bind ports 80/443"
+  let interrupted = false;
+  const onSigint = () => {
+    interrupted = true;
   };
+  process6.on("SIGINT", onSigint);
+  try {
+    const { status, signal } = await runPrompt(sudoCommand);
+    if (status === 0)
+      return { ok: true };
+    const cancelled = interrupted || signal === "SIGINT";
+    return {
+      ok: false,
+      denied: true,
+      message: cancelled ? "administrator permission was cancelled" : "administrator permission is required to edit the hosts file and bind ports 80/443"
+    };
+  } finally {
+    process6.off("SIGINT", onSigint);
+  }
+}
+function runPrompt(sudoCommand) {
+  return new Promise((resolve2) => {
+    const child = spawn2(sudoCommand, ["-v"], { stdio: "inherit" });
+    child.on("error", () => resolve2({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => resolve2({ status, signal }));
+  });
 }
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
@@ -13567,7 +13585,7 @@ async function startPrivilegedHelper(options) {
     connectTimeoutMs = 12e4
   } = options;
   if (!skipAuth && !direct) {
-    const auth = authenticateSudo(sudoCommand, options.reason);
+    const auth = await authenticateSudo(sudoCommand, options.reason);
     if (!auth.ok) {
       const message = auth.message ?? "administrator permission is required";
       throw auth.denied ? new PrivilegeDeniedError(message) : new Error(message);
@@ -14212,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

@@ -13626,7 +13626,7 @@ function describePasswordReason(target, https) {
     "Press Ctrl+C at the prompt to skip the proxy and keep the dev server."
   ];
 }
-function authenticateSudo(sudoCommand = "sudo", options = {}) {
+async function authenticateSudo(sudoCommand = "sudo", options = {}) {
   if ((0, import_node_os3.platform)() === "win32")
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
@@ -13637,13 +13637,31 @@ function authenticateSudo(sudoCommand = "sudo", options = {}) {
 `);
     import_node_process6.default.stderr.write("\n");
   }
-  if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-v"], { stdio: "inherit" }).status === 0)
-    return { ok: true };
-  return {
-    ok: false,
-    denied: true,
-    message: "administrator permission is required to edit the hosts file and bind ports 80/443"
+  let interrupted = false;
+  const onSigint = () => {
+    interrupted = true;
   };
+  import_node_process6.default.on("SIGINT", onSigint);
+  try {
+    const { status, signal } = await runPrompt(sudoCommand);
+    if (status === 0)
+      return { ok: true };
+    const cancelled = interrupted || signal === "SIGINT";
+    return {
+      ok: false,
+      denied: true,
+      message: cancelled ? "administrator permission was cancelled" : "administrator permission is required to edit the hosts file and bind ports 80/443"
+    };
+  } finally {
+    import_node_process6.default.off("SIGINT", onSigint);
+  }
+}
+function runPrompt(sudoCommand) {
+  return new Promise((resolve2) => {
+    const child = (0, import_node_child_process2.spawn)(sudoCommand, ["-v"], { stdio: "inherit" });
+    child.on("error", () => resolve2({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => resolve2({ status, signal }));
+  });
 }
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
@@ -13666,7 +13684,7 @@ async function startPrivilegedHelper(options) {
     connectTimeoutMs = 12e4
   } = options;
   if (!skipAuth && !direct) {
-    const auth = authenticateSudo(sudoCommand, options.reason);
+    const auth = await authenticateSudo(sudoCommand, options.reason);
     if (!auth.ok) {
       const message = auth.message ?? "administrator permission is required";
       throw auth.denied ? new PrivilegeDeniedError(message) : new Error(message);
@@ -14312,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-H7LIW3S4.js";
+} from "./chunk-Y4TJZ6XZ.js";
 import "./chunk-EY3HXBJ4.js";
 import "./chunk-C5A7XLKL.js";
 import "./chunk-WOMR3ZLM.js";

package/dist/index.cjs

@@ -13626,7 +13626,7 @@ function describePasswordReason(target, https) {
     "Press Ctrl+C at the prompt to skip the proxy and keep the dev server."
   ];
 }
-function authenticateSudo(sudoCommand = "sudo", options = {}) {
+async function authenticateSudo(sudoCommand = "sudo", options = {}) {
   if ((0, import_node_os3.platform)() === "win32")
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
@@ -13637,13 +13637,31 @@ function authenticateSudo(sudoCommand = "sudo", options = {}) {
 `);
     import_node_process6.default.stderr.write("\n");
   }
-  if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-v"], { stdio: "inherit" }).status === 0)
-    return { ok: true };
-  return {
-    ok: false,
-    denied: true,
-    message: "administrator permission is required to edit the hosts file and bind ports 80/443"
+  let interrupted = false;
+  const onSigint = () => {
+    interrupted = true;
   };
+  import_node_process6.default.on("SIGINT", onSigint);
+  try {
+    const { status, signal } = await runPrompt(sudoCommand);
+    if (status === 0)
+      return { ok: true };
+    const cancelled = interrupted || signal === "SIGINT";
+    return {
+      ok: false,
+      denied: true,
+      message: cancelled ? "administrator permission was cancelled" : "administrator permission is required to edit the hosts file and bind ports 80/443"
+    };
+  } finally {
+    import_node_process6.default.off("SIGINT", onSigint);
+  }
+}
+function runPrompt(sudoCommand) {
+  return new Promise((resolve2) => {
+    const child = (0, import_node_child_process2.spawn)(sudoCommand, ["-v"], { stdio: "inherit" });
+    child.on("error", () => resolve2({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => resolve2({ status, signal }));
+  });
 }
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
@@ -13666,7 +13684,7 @@ async function startPrivilegedHelper(options) {
     connectTimeoutMs = 12e4
   } = options;
   if (!skipAuth && !direct) {
-    const auth = authenticateSudo(sudoCommand, options.reason);
+    const auth = await authenticateSudo(sudoCommand, options.reason);
     if (!auth.ok) {
       const message = auth.message ?? "administrator permission is required";
       throw auth.denied ? new PrivilegeDeniedError(message) : new Error(message);
@@ -14312,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-H7LIW3S4.js";
+} from "./chunk-Y4TJZ6XZ.js";
 import "./chunk-EY3HXBJ4.js";
 import "./chunk-C5A7XLKL.js";
 import "./chunk-WOMR3ZLM.js";

package/dist/nuxt.cjs

@@ -13627,7 +13627,7 @@ function describePasswordReason(target, https) {
     "Press Ctrl+C at the prompt to skip the proxy and keep the dev server."
   ];
 }
-function authenticateSudo(sudoCommand = "sudo", options = {}) {
+async function authenticateSudo(sudoCommand = "sudo", options = {}) {
   if ((0, import_node_os3.platform)() === "win32")
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
@@ -13638,13 +13638,31 @@ function authenticateSudo(sudoCommand = "sudo", options = {}) {
 `);
     import_node_process6.default.stderr.write("\n");
   }
-  if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-v"], { stdio: "inherit" }).status === 0)
-    return { ok: true };
-  return {
-    ok: false,
-    denied: true,
-    message: "administrator permission is required to edit the hosts file and bind ports 80/443"
+  let interrupted = false;
+  const onSigint = () => {
+    interrupted = true;
   };
+  import_node_process6.default.on("SIGINT", onSigint);
+  try {
+    const { status, signal } = await runPrompt(sudoCommand);
+    if (status === 0)
+      return { ok: true };
+    const cancelled = interrupted || signal === "SIGINT";
+    return {
+      ok: false,
+      denied: true,
+      message: cancelled ? "administrator permission was cancelled" : "administrator permission is required to edit the hosts file and bind ports 80/443"
+    };
+  } finally {
+    import_node_process6.default.off("SIGINT", onSigint);
+  }
+}
+function runPrompt(sudoCommand) {
+  return new Promise((resolve2) => {
+    const child = (0, import_node_child_process2.spawn)(sudoCommand, ["-v"], { stdio: "inherit" });
+    child.on("error", () => resolve2({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => resolve2({ status, signal }));
+  });
 }
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
@@ -13667,7 +13685,7 @@ async function startPrivilegedHelper(options) {
     connectTimeoutMs = 12e4
   } = options;
   if (!skipAuth && !direct) {
-    const auth = authenticateSudo(sudoCommand, options.reason);
+    const auth = await authenticateSudo(sudoCommand, options.reason);
     if (!auth.ok) {
       const message = auth.message ?? "administrator permission is required";
       throw auth.denied ? new PrivilegeDeniedError(message) : new Error(message);
@@ -14313,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-H7LIW3S4.js";
+} from "./chunk-Y4TJZ6XZ.js";
 import {
   consola
 } from "./chunk-EY3HXBJ4.js";

package/dist/rollup.cjs

@@ -13626,7 +13626,7 @@ function describePasswordReason(target, https) {
     "Press Ctrl+C at the prompt to skip the proxy and keep the dev server."
   ];
 }
-function authenticateSudo(sudoCommand = "sudo", options = {}) {
+async function authenticateSudo(sudoCommand = "sudo", options = {}) {
   if ((0, import_node_os3.platform)() === "win32")
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
@@ -13637,13 +13637,31 @@ function authenticateSudo(sudoCommand = "sudo", options = {}) {
 `);
     import_node_process6.default.stderr.write("\n");
   }
-  if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-v"], { stdio: "inherit" }).status === 0)
-    return { ok: true };
-  return {
-    ok: false,
-    denied: true,
-    message: "administrator permission is required to edit the hosts file and bind ports 80/443"
+  let interrupted = false;
+  const onSigint = () => {
+    interrupted = true;
   };
+  import_node_process6.default.on("SIGINT", onSigint);
+  try {
+    const { status, signal } = await runPrompt(sudoCommand);
+    if (status === 0)
+      return { ok: true };
+    const cancelled = interrupted || signal === "SIGINT";
+    return {
+      ok: false,
+      denied: true,
+      message: cancelled ? "administrator permission was cancelled" : "administrator permission is required to edit the hosts file and bind ports 80/443"
+    };
+  } finally {
+    import_node_process6.default.off("SIGINT", onSigint);
+  }
+}
+function runPrompt(sudoCommand) {
+  return new Promise((resolve2) => {
+    const child = (0, import_node_child_process2.spawn)(sudoCommand, ["-v"], { stdio: "inherit" });
+    child.on("error", () => resolve2({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => resolve2({ status, signal }));
+  });
 }
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
@@ -13666,7 +13684,7 @@ async function startPrivilegedHelper(options) {
     connectTimeoutMs = 12e4
   } = options;
   if (!skipAuth && !direct) {
-    const auth = authenticateSudo(sudoCommand, options.reason);
+    const auth = await authenticateSudo(sudoCommand, options.reason);
     if (!auth.ok) {
       const message = auth.message ?? "administrator permission is required";
       throw auth.denied ? new PrivilegeDeniedError(message) : new Error(message);
@@ -14312,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-H7LIW3S4.js";
+} from "./chunk-Y4TJZ6XZ.js";
 import "./chunk-EY3HXBJ4.js";
 import "./chunk-C5A7XLKL.js";
 import "./chunk-WOMR3ZLM.js";

package/dist/rspack.cjs

@@ -13625,7 +13625,7 @@ function describePasswordReason(target, https) {
     "Press Ctrl+C at the prompt to skip the proxy and keep the dev server."
   ];
 }
-function authenticateSudo(sudoCommand = "sudo", options = {}) {
+async function authenticateSudo(sudoCommand = "sudo", options = {}) {
   if ((0, import_node_os3.platform)() === "win32")
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
@@ -13636,13 +13636,31 @@ function authenticateSudo(sudoCommand = "sudo", options = {}) {
 `);
     import_node_process6.default.stderr.write("\n");
   }
-  if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-v"], { stdio: "inherit" }).status === 0)
-    return { ok: true };
-  return {
-    ok: false,
-    denied: true,
-    message: "administrator permission is required to edit the hosts file and bind ports 80/443"
+  let interrupted = false;
+  const onSigint = () => {
+    interrupted = true;
   };
+  import_node_process6.default.on("SIGINT", onSigint);
+  try {
+    const { status, signal } = await runPrompt(sudoCommand);
+    if (status === 0)
+      return { ok: true };
+    const cancelled = interrupted || signal === "SIGINT";
+    return {
+      ok: false,
+      denied: true,
+      message: cancelled ? "administrator permission was cancelled" : "administrator permission is required to edit the hosts file and bind ports 80/443"
+    };
+  } finally {
+    import_node_process6.default.off("SIGINT", onSigint);
+  }
+}
+function runPrompt(sudoCommand) {
+  return new Promise((resolve2) => {
+    const child = (0, import_node_child_process2.spawn)(sudoCommand, ["-v"], { stdio: "inherit" });
+    child.on("error", () => resolve2({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => resolve2({ status, signal }));
+  });
 }
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
@@ -13665,7 +13683,7 @@ async function startPrivilegedHelper(options) {
     connectTimeoutMs = 12e4
   } = options;
   if (!skipAuth && !direct) {
-    const auth = authenticateSudo(sudoCommand, options.reason);
+    const auth = await authenticateSudo(sudoCommand, options.reason);
     if (!auth.ok) {
       const message = auth.message ?? "administrator permission is required";
       throw auth.denied ? new PrivilegeDeniedError(message) : new Error(message);
@@ -14311,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-H7LIW3S4.js";
+} from "./chunk-Y4TJZ6XZ.js";
 import "./chunk-EY3HXBJ4.js";
 import "./chunk-C5A7XLKL.js";
 import "./chunk-WOMR3ZLM.js";

package/dist/vite.cjs

@@ -13626,7 +13626,7 @@ function describePasswordReason(target, https) {
     "Press Ctrl+C at the prompt to skip the proxy and keep the dev server."
   ];
 }
-function authenticateSudo(sudoCommand = "sudo", options = {}) {
+async function authenticateSudo(sudoCommand = "sudo", options = {}) {
   if ((0, import_node_os3.platform)() === "win32")
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
@@ -13637,13 +13637,31 @@ function authenticateSudo(sudoCommand = "sudo", options = {}) {
 `);
     import_node_process6.default.stderr.write("\n");
   }
-  if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-v"], { stdio: "inherit" }).status === 0)
-    return { ok: true };
-  return {
-    ok: false,
-    denied: true,
-    message: "administrator permission is required to edit the hosts file and bind ports 80/443"
+  let interrupted = false;
+  const onSigint = () => {
+    interrupted = true;
   };
+  import_node_process6.default.on("SIGINT", onSigint);
+  try {
+    const { status, signal } = await runPrompt(sudoCommand);
+    if (status === 0)
+      return { ok: true };
+    const cancelled = interrupted || signal === "SIGINT";
+    return {
+      ok: false,
+      denied: true,
+      message: cancelled ? "administrator permission was cancelled" : "administrator permission is required to edit the hosts file and bind ports 80/443"
+    };
+  } finally {
+    import_node_process6.default.off("SIGINT", onSigint);
+  }
+}
+function runPrompt(sudoCommand) {
+  return new Promise((resolve2) => {
+    const child = (0, import_node_child_process2.spawn)(sudoCommand, ["-v"], { stdio: "inherit" });
+    child.on("error", () => resolve2({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => resolve2({ status, signal }));
+  });
 }
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
@@ -13666,7 +13684,7 @@ async function startPrivilegedHelper(options) {
     connectTimeoutMs = 12e4
   } = options;
   if (!skipAuth && !direct) {
-    const auth = authenticateSudo(sudoCommand, options.reason);
+    const auth = await authenticateSudo(sudoCommand, options.reason);
     if (!auth.ok) {
       const message = auth.message ?? "administrator permission is required";
       throw auth.denied ? new PrivilegeDeniedError(message) : new Error(message);
@@ -14312,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-H7LIW3S4.js";
+} from "./chunk-Y4TJZ6XZ.js";
 import "./chunk-EY3HXBJ4.js";
 import "./chunk-C5A7XLKL.js";
 import "./chunk-WOMR3ZLM.js";

package/dist/webpack.cjs

@@ -13626,7 +13626,7 @@ function describePasswordReason(target, https) {
     "Press Ctrl+C at the prompt to skip the proxy and keep the dev server."
   ];
 }
-function authenticateSudo(sudoCommand = "sudo", options = {}) {
+async function authenticateSudo(sudoCommand = "sudo", options = {}) {
   if ((0, import_node_os3.platform)() === "win32")
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
@@ -13637,13 +13637,31 @@ function authenticateSudo(sudoCommand = "sudo", options = {}) {
 `);
     import_node_process6.default.stderr.write("\n");
   }
-  if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-v"], { stdio: "inherit" }).status === 0)
-    return { ok: true };
-  return {
-    ok: false,
-    denied: true,
-    message: "administrator permission is required to edit the hosts file and bind ports 80/443"
+  let interrupted = false;
+  const onSigint = () => {
+    interrupted = true;
   };
+  import_node_process6.default.on("SIGINT", onSigint);
+  try {
+    const { status, signal } = await runPrompt(sudoCommand);
+    if (status === 0)
+      return { ok: true };
+    const cancelled = interrupted || signal === "SIGINT";
+    return {
+      ok: false,
+      denied: true,
+      message: cancelled ? "administrator permission was cancelled" : "administrator permission is required to edit the hosts file and bind ports 80/443"
+    };
+  } finally {
+    import_node_process6.default.off("SIGINT", onSigint);
+  }
+}
+function runPrompt(sudoCommand) {
+  return new Promise((resolve2) => {
+    const child = (0, import_node_child_process2.spawn)(sudoCommand, ["-v"], { stdio: "inherit" });
+    child.on("error", () => resolve2({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => resolve2({ status, signal }));
+  });
 }
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
@@ -13666,7 +13684,7 @@ async function startPrivilegedHelper(options) {
     connectTimeoutMs = 12e4
   } = options;
   if (!skipAuth && !direct) {
-    const auth = authenticateSudo(sudoCommand, options.reason);
+    const auth = await authenticateSudo(sudoCommand, options.reason);
     if (!auth.ok) {
       const message = auth.message ?? "administrator permission is required";
       throw auth.denied ? new PrivilegeDeniedError(message) : new Error(message);
@@ -14312,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-H7LIW3S4.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.4",
+  "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 }
 }

package/src/privileged/launch.ts

@@ -70,10 +70,10 @@ export function describePasswordReason(target: string, https: boolean): string[]
  * Returns `denied` when the user dismissed the prompt, so the caller can keep
  * the dev server running instead of treating it as a crash.
  */
-export function authenticateSudo(
+export async function authenticateSudo(
   sudoCommand = 'sudo',
   options: { target?: string, https?: boolean } = {},
-): { ok: boolean, denied?: boolean, message?: string } {
+): Promise<{ ok: boolean, denied?: boolean, message?: string }> {
   if (platform() === 'win32')
     return { ok: true }
 
@@ -86,16 +86,53 @@ export function authenticateSudo(
     process.stderr.write('\n')
   }
 
-  if (spawnSync(sudoCommand, ['-v'], { stdio: 'inherit' }).status === 0)
-    return { ok: true }
+  // `sudo -v` inherits the terminal, so Ctrl+C reaches this process too. Without
+  // a handler the default action kills the dev server, which reads as "the
+  // proxy crashed my dev server" when the user only meant to skip it.
+  let interrupted = false
+  const onSigint = (): void => {
+    interrupted = true
+  }
+  process.on('SIGINT', onSigint)
+
+  try {
+    const { status, signal } = await runPrompt(sudoCommand)
+    if (status === 0)
+      return { ok: true }
 
-  return {
-    ok: false,
-    denied: true,
-    message: 'administrator permission is required to edit the hosts file and bind ports 80/443',
+    // `sudo` exits 1 on a wrong password and dies by the signal on Ctrl+C.
+    // Both are checked: a real Ctrl+C reaches this process and the child
+    // together, while a signal aimed at the child alone only shows up here.
+    const cancelled = interrupted || signal === 'SIGINT'
+    return {
+      ok: false,
+      denied: true,
+      message: cancelled
+        ? 'administrator permission was cancelled'
+        : 'administrator permission is required to edit the hosts file and bind ports 80/443',
+    }
+  }
+  finally {
+    process.off('SIGINT', onSigint)
   }
 }
 
+/**
+ * Runs `sudo -v` with the terminal attached.
+ *
+ * Spawned asynchronously rather than with `spawnSync`: the synchronous form
+ * blocks the event loop, so the SIGINT handler above never runs and the exit
+ * looks like a plain failure instead of a cancellation.
+ */
+function runPrompt(sudoCommand: string): Promise<{ status: number | null, signal: NodeJS.Signals | null }> {
+  return new Promise((resolve) => {
+    const child = spawn(sudoCommand, ['-v'], { stdio: 'inherit' })
+
+    child.on('error', () => resolve({ status: 1, signal: null }))
+    child.on('exit', (status, signal) => resolve({ status, signal }))
+  })
+}
+
 /** The user dismissed the password prompt; this is a choice, not a failure. */
 export class PrivilegeDeniedError extends Error {
   constructor(message: string) {
@@ -132,7 +169,7 @@ export async function startPrivilegedHelper(options: LaunchOptions): Promise<Pri
   } = options
 
   if (!skipAuth && !direct) {
-    const auth = authenticateSudo(sudoCommand, options.reason)
+    const auth = await authenticateSudo(sudoCommand, options.reason)
     if (!auth.ok) {
       const message = auth.message ?? 'administrator permission is required'
       throw auth.denied ? new PrivilegeDeniedError(message) : new Error(message)