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

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

@@ -13532,7 +13532,7 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
     return { ok: true };
   if (spawnSync(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
     return { ok: true };
-  if (options.target) {
+  if (options.target && !options.quiet) {
     for (const line of describePasswordReason(options.target, options.https ?? false))
       process6.stderr.write(`${line}
 `);
@@ -13559,11 +13559,37 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
 }
 function runPrompt(sudoCommand) {
   return new Promise((resolve2) => {
+    const restore = takeBackTerminal();
     const child = spawn2(sudoCommand, ["-v"], { stdio: "inherit" });
-    child.on("error", () => resolve2({ status: 1, signal: null }));
-    child.on("exit", (status, signal) => resolve2({ status, signal }));
+    const finish = (result) => {
+      restore();
+      resolve2(result);
+    };
+    child.on("error", () => finish({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => finish({ status, signal }));
   });
 }
+function takeBackTerminal() {
+  const stdin = process6.stdin;
+  if (!stdin.isTTY || typeof stdin.setRawMode !== "function")
+    return () => {
+    };
+  const wasRaw = stdin.isRaw === true;
+  try {
+    stdin.setRawMode(false);
+  } catch {
+    return () => {
+    };
+  }
+  return () => {
+    if (!wasRaw)
+      return;
+    try {
+      stdin.setRawMode(true);
+    } catch {
+    }
+  };
+}
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
     super(message);

package/dist/esbuild.cjs

@@ -13631,7 +13631,7 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
     return { ok: true };
-  if (options.target) {
+  if (options.target && !options.quiet) {
     for (const line of describePasswordReason(options.target, options.https ?? false))
       import_node_process6.default.stderr.write(`${line}
 `);
@@ -13658,11 +13658,37 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
 }
 function runPrompt(sudoCommand) {
   return new Promise((resolve2) => {
+    const restore = takeBackTerminal();
     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 }));
+    const finish = (result) => {
+      restore();
+      resolve2(result);
+    };
+    child.on("error", () => finish({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => finish({ status, signal }));
   });
 }
+function takeBackTerminal() {
+  const stdin = import_node_process6.default.stdin;
+  if (!stdin.isTTY || typeof stdin.setRawMode !== "function")
+    return () => {
+    };
+  const wasRaw = stdin.isRaw === true;
+  try {
+    stdin.setRawMode(false);
+  } catch {
+    return () => {
+    };
+  }
+  return () => {
+    if (!wasRaw)
+      return;
+    try {
+      stdin.setRawMode(true);
+    } catch {
+    }
+  };
+}
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
     super(message);

package/dist/esbuild.js

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

package/dist/index.cjs

@@ -13631,7 +13631,7 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
     return { ok: true };
-  if (options.target) {
+  if (options.target && !options.quiet) {
     for (const line of describePasswordReason(options.target, options.https ?? false))
       import_node_process6.default.stderr.write(`${line}
 `);
@@ -13658,11 +13658,37 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
 }
 function runPrompt(sudoCommand) {
   return new Promise((resolve2) => {
+    const restore = takeBackTerminal();
     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 }));
+    const finish = (result) => {
+      restore();
+      resolve2(result);
+    };
+    child.on("error", () => finish({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => finish({ status, signal }));
   });
 }
+function takeBackTerminal() {
+  const stdin = import_node_process6.default.stdin;
+  if (!stdin.isTTY || typeof stdin.setRawMode !== "function")
+    return () => {
+    };
+  const wasRaw = stdin.isRaw === true;
+  try {
+    stdin.setRawMode(false);
+  } catch {
+    return () => {
+    };
+  }
+  return () => {
+    if (!wasRaw)
+      return;
+    try {
+      stdin.setRawMode(true);
+    } catch {
+    }
+  };
+}
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
     super(message);

package/dist/index.js

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

package/dist/nuxt.cjs

@@ -13632,7 +13632,7 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
     return { ok: true };
-  if (options.target) {
+  if (options.target && !options.quiet) {
     for (const line of describePasswordReason(options.target, options.https ?? false))
       import_node_process6.default.stderr.write(`${line}
 `);
@@ -13659,11 +13659,37 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
 }
 function runPrompt(sudoCommand) {
   return new Promise((resolve2) => {
+    const restore = takeBackTerminal();
     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 }));
+    const finish = (result) => {
+      restore();
+      resolve2(result);
+    };
+    child.on("error", () => finish({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => finish({ status, signal }));
   });
 }
+function takeBackTerminal() {
+  const stdin = import_node_process6.default.stdin;
+  if (!stdin.isTTY || typeof stdin.setRawMode !== "function")
+    return () => {
+    };
+  const wasRaw = stdin.isRaw === true;
+  try {
+    stdin.setRawMode(false);
+  } catch {
+    return () => {
+    };
+  }
+  return () => {
+    if (!wasRaw)
+      return;
+    try {
+      stdin.setRawMode(true);
+    } catch {
+    }
+  };
+}
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
     super(message);

package/dist/nuxt.js

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

package/dist/privileged-helper.cjs

@@ -564,6 +564,7 @@ async function startHelper(options) {
   }
   const connections = /* @__PURE__ */ new Set();
   const idleTimeoutMs = options.idleTimeoutMs ?? DEFAULT_IDLE_TIMEOUT_MS;
+  const exitOnIdle = options.exitOnIdle ?? true;
   let idleTimer;
   const stopIdleTimer = () => {
     if (idleTimer) {
@@ -634,6 +635,10 @@ async function startHelper(options) {
         return;
       log("no clients left; shutting down");
       removeOwnSocket(socketPath, token);
+      if (!exitOnIdle) {
+        server.close();
+        return;
+      }
       server.close(() => import_node_process2.default.exit(0));
       (_b = (_a2 = setTimeout(() => import_node_process2.default.exit(0), 1e3)).unref) == null ? void 0 : _b.call(_a2);
     }, idleTimeoutMs);

package/dist/privileged-helper.js

@@ -538,6 +538,7 @@ async function startHelper(options) {
   }
   const connections = /* @__PURE__ */ new Set();
   const idleTimeoutMs = options.idleTimeoutMs ?? DEFAULT_IDLE_TIMEOUT_MS;
+  const exitOnIdle = options.exitOnIdle ?? true;
   let idleTimer;
   const stopIdleTimer = () => {
     if (idleTimer) {
@@ -608,6 +609,10 @@ async function startHelper(options) {
         return;
       log("no clients left; shutting down");
       removeOwnSocket(socketPath, token);
+      if (!exitOnIdle) {
+        server.close();
+        return;
+      }
       server.close(() => process2.exit(0));
       (_b = (_a2 = setTimeout(() => process2.exit(0), 1e3)).unref) == null ? void 0 : _b.call(_a2);
     }, idleTimeoutMs);

package/dist/rollup.cjs

@@ -13631,7 +13631,7 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
     return { ok: true };
-  if (options.target) {
+  if (options.target && !options.quiet) {
     for (const line of describePasswordReason(options.target, options.https ?? false))
       import_node_process6.default.stderr.write(`${line}
 `);
@@ -13658,11 +13658,37 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
 }
 function runPrompt(sudoCommand) {
   return new Promise((resolve2) => {
+    const restore = takeBackTerminal();
     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 }));
+    const finish = (result) => {
+      restore();
+      resolve2(result);
+    };
+    child.on("error", () => finish({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => finish({ status, signal }));
   });
 }
+function takeBackTerminal() {
+  const stdin = import_node_process6.default.stdin;
+  if (!stdin.isTTY || typeof stdin.setRawMode !== "function")
+    return () => {
+    };
+  const wasRaw = stdin.isRaw === true;
+  try {
+    stdin.setRawMode(false);
+  } catch {
+    return () => {
+    };
+  }
+  return () => {
+    if (!wasRaw)
+      return;
+    try {
+      stdin.setRawMode(true);
+    } catch {
+    }
+  };
+}
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
     super(message);

package/dist/rollup.js

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

package/dist/rspack.cjs

@@ -13630,7 +13630,7 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
     return { ok: true };
-  if (options.target) {
+  if (options.target && !options.quiet) {
     for (const line of describePasswordReason(options.target, options.https ?? false))
       import_node_process6.default.stderr.write(`${line}
 `);
@@ -13657,11 +13657,37 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
 }
 function runPrompt(sudoCommand) {
   return new Promise((resolve2) => {
+    const restore = takeBackTerminal();
     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 }));
+    const finish = (result) => {
+      restore();
+      resolve2(result);
+    };
+    child.on("error", () => finish({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => finish({ status, signal }));
   });
 }
+function takeBackTerminal() {
+  const stdin = import_node_process6.default.stdin;
+  if (!stdin.isTTY || typeof stdin.setRawMode !== "function")
+    return () => {
+    };
+  const wasRaw = stdin.isRaw === true;
+  try {
+    stdin.setRawMode(false);
+  } catch {
+    return () => {
+    };
+  }
+  return () => {
+    if (!wasRaw)
+      return;
+    try {
+      stdin.setRawMode(true);
+    } catch {
+    }
+  };
+}
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
     super(message);

package/dist/rspack.js

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

package/dist/vite.cjs

@@ -13631,7 +13631,7 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
     return { ok: true };
-  if (options.target) {
+  if (options.target && !options.quiet) {
     for (const line of describePasswordReason(options.target, options.https ?? false))
       import_node_process6.default.stderr.write(`${line}
 `);
@@ -13658,11 +13658,37 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
 }
 function runPrompt(sudoCommand) {
   return new Promise((resolve2) => {
+    const restore = takeBackTerminal();
     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 }));
+    const finish = (result) => {
+      restore();
+      resolve2(result);
+    };
+    child.on("error", () => finish({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => finish({ status, signal }));
   });
 }
+function takeBackTerminal() {
+  const stdin = import_node_process6.default.stdin;
+  if (!stdin.isTTY || typeof stdin.setRawMode !== "function")
+    return () => {
+    };
+  const wasRaw = stdin.isRaw === true;
+  try {
+    stdin.setRawMode(false);
+  } catch {
+    return () => {
+    };
+  }
+  return () => {
+    if (!wasRaw)
+      return;
+    try {
+      stdin.setRawMode(true);
+    } catch {
+    }
+  };
+}
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
     super(message);

package/dist/vite.js

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

package/dist/webpack.cjs

@@ -13631,7 +13631,7 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
     return { ok: true };
   if ((0, import_node_child_process2.spawnSync)(sudoCommand, ["-n", "true"], { stdio: "ignore" }).status === 0)
     return { ok: true };
-  if (options.target) {
+  if (options.target && !options.quiet) {
     for (const line of describePasswordReason(options.target, options.https ?? false))
       import_node_process6.default.stderr.write(`${line}
 `);
@@ -13658,11 +13658,37 @@ async function authenticateSudo(sudoCommand = "sudo", options = {}) {
 }
 function runPrompt(sudoCommand) {
   return new Promise((resolve2) => {
+    const restore = takeBackTerminal();
     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 }));
+    const finish = (result) => {
+      restore();
+      resolve2(result);
+    };
+    child.on("error", () => finish({ status: 1, signal: null }));
+    child.on("exit", (status, signal) => finish({ status, signal }));
   });
 }
+function takeBackTerminal() {
+  const stdin = import_node_process6.default.stdin;
+  if (!stdin.isTTY || typeof stdin.setRawMode !== "function")
+    return () => {
+    };
+  const wasRaw = stdin.isRaw === true;
+  try {
+    stdin.setRawMode(false);
+  } catch {
+    return () => {
+    };
+  }
+  return () => {
+    if (!wasRaw)
+      return;
+    try {
+      stdin.setRawMode(true);
+    } catch {
+    }
+  };
+}
 var PrivilegeDeniedError = class extends Error {
   constructor(message) {
     super(message);

package/dist/webpack.js

@@ -1,6 +1,6 @@
 import {
   unpluginFactory
-} from "./chunk-Y4TJZ6XZ.js";
+} from "./chunk-FNF6HQJB.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.6",
+  "version": "4.1.0-beta.7",
   "description": "",
   "license": "MIT",
   "homepage": "https://github.com/zcf0508/unplugin-https-reverse-proxy#readme",

package/src/privileged/bootstrap.ts

@@ -35,6 +35,14 @@ export interface HelperBootstrapOptions {
    * sooner than this and still reuses the running helper.
    */
   idleTimeoutMs?: number
+  /**
+   * Whether the idle timer may end this process.
+   *
+   * True for the real helper, which owns its process. False when `startHelper`
+   * is called in-process (tests): exiting there would take the caller down
+   * with it.
+   */
+  exitOnIdle?: boolean
   deps?: HelperDeps
   log?: (message: string) => void
 }
@@ -83,6 +91,9 @@ export async function startHelper(options: HelperBootstrapOptions): Promise<Runn
 
   const connections = new Set<Socket>()
   const idleTimeoutMs = options.idleTimeoutMs ?? DEFAULT_IDLE_TIMEOUT_MS
+  // The real helper is a process of its own and may end itself. When this runs
+  // inside a host process (tests), only the socket is released.
+  const exitOnIdle = options.exitOnIdle ?? true
   let idleTimer: ReturnType<typeof setTimeout> | undefined
 
   const stopIdleTimer = (): void => {
@@ -171,6 +182,12 @@ export async function startHelper(options: HelperBootstrapOptions): Promise<Runn
 
       log('no clients left; shutting down')
       removeOwnSocket(socketPath, token)
+
+      if (!exitOnIdle) {
+        server.close()
+        return
+      }
+
       server.close(() => process.exit(0))
       // A listener with no clients closes synchronously, but keep a backstop so
       // the process cannot linger if a close callback never arrives.

package/src/privileged/launch.ts

@@ -72,7 +72,7 @@ export function describePasswordReason(target: string, https: boolean): string[]
  */
 export async function authenticateSudo(
   sudoCommand = 'sudo',
-  options: { target?: string, https?: boolean } = {},
+  options: { target?: string, https?: boolean, quiet?: boolean } = {},
 ): Promise<{ ok: boolean, denied?: boolean, message?: string }> {
   if (platform() === 'win32')
     return { ok: true }
@@ -80,7 +80,9 @@ export async function authenticateSudo(
   if (spawnSync(sudoCommand, ['-n', 'true'], { stdio: 'ignore' }).status === 0)
     return { ok: true }
 
-  if (options.target) {
+  // Tests drive this without a terminal; writing the notice there would print
+  // password instructions into the middle of the test output.
+  if (options.target && !options.quiet) {
     for (const line of describePasswordReason(options.target, options.https ?? false))
       process.stderr.write(`${line}\n`)
     process.stderr.write('\n')
@@ -123,16 +125,58 @@ export async function authenticateSudo(
  * 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.
+ *
+ * The terminal is put back into cooked mode first. Vite turns on raw mode for
+ * its `h + enter` shortcuts, and in that mode Enter no longer terminates the
+ * line sudo is reading, so the password appears to need a second Enter.
  */
 function runPrompt(sudoCommand: string): Promise<{ status: number | null, signal: NodeJS.Signals | null }> {
   return new Promise((resolve) => {
+    const restore = takeBackTerminal()
     const child = spawn(sudoCommand, ['-v'], { stdio: 'inherit' })
 
-    child.on('error', () => resolve({ status: 1, signal: null }))
-    child.on('exit', (status, signal) => resolve({ status, signal }))
+    const finish = (result: { status: number | null, signal: NodeJS.Signals | null }): void => {
+      restore()
+      resolve(result)
+    }
+
+    child.on('error', () => finish({ status: 1, signal: null }))
+    child.on('exit', (status, signal) => finish({ status, signal }))
   })
 }
 
+/**
+ * Returns the terminal to cooked mode for the duration of the prompt.
+ *
+ * Vite leaves stdin in raw mode while it listens for its own shortcuts. In raw
+ * mode the tty does no line editing, so the Enter that should submit the
+ * password only reaches sudo as a bare carriage return and the read does not
+ * complete. The returned function puts the previous state back, so Vite's
+ * shortcuts keep working afterwards.
+ */
+function takeBackTerminal(): () => void {
+  const stdin = process.stdin
+  if (!stdin.isTTY || typeof stdin.setRawMode !== 'function')
+    return () => {}
+
+  const wasRaw = stdin.isRaw === true
+  try {
+    stdin.setRawMode(false)
+  }
+  catch {
+    return () => {}
+  }
+
+  return () => {
+    if (!wasRaw)
+      return
+    try {
+      stdin.setRawMode(true)
+    }
+    catch {}
+  }
+}
+
 /** The user dismissed the password prompt; this is a choice, not a failure. */
 export class PrivilegeDeniedError extends Error {
   constructor(message: string) {