peakroute 0.5.2 → 0.5.3

package/dist/{chunk-ENHLKLCJ.js → chunk-IVO6GF7V.js}

@@ -538,33 +538,51 @@ function collectBinPaths(cwd) {
 function augmentedPath(env) {
   const base = (env ?? process.env).PATH ?? "";
   const bins = collectBinPaths(process.cwd());
+  if (IS_WINDOWS) {
+    const systemRoot = process.env.SystemRoot ?? "C:\\Windows";
+    const essentialPaths = [
+      path2.join(systemRoot, "System32"),
+      path2.join(systemRoot, "System32", "WindowsPowerShell", "v1.0"),
+      path2.join(systemRoot, "System32", "wbem")
+      // for WMI tools
+    ];
+    const bunPaths = [
+      path2.join(process.env.USERPROFILE ?? "C:\\Users\\" + process.env.USERNAME, ".bun", "bin"),
+      path2.join(process.env.LOCALAPPDATA ?? "", "bun", "bin")
+    ];
+    const pathEntries = base.split(path2.delimiter).filter(Boolean);
+    const missingSystemPaths = essentialPaths.filter(
+      (p) => pathEntries.every((entry) => entry.toLowerCase() !== p.toLowerCase())
+    );
+    const missingBunPaths = bunPaths.filter(
+      (p) => pathEntries.every((entry) => entry.toLowerCase() !== p.toLowerCase())
+    );
+    const allMissing = [...missingSystemPaths, ...missingBunPaths];
+    if (allMissing.length > 0) {
+      const newPath = allMissing.join(path2.delimiter) + path2.delimiter + base;
+      if (bins.length > 0) {
+        return bins.join(path2.delimiter) + path2.delimiter + newPath;
+      }
+      return newPath;
+    }
+  }
   return bins.length > 0 ? bins.join(path2.delimiter) + path2.delimiter + base : base;
 }
 function spawnCommand(commandArgs, options) {
   const env = { ...options?.env ?? process.env, PATH: augmentedPath(options?.env) };
   let child;
   if (IS_WINDOWS) {
-    const isPowerShell = !!process.env.PSModulePath || process.env.TERM === "xterm-256color";
-    if (isPowerShell) {
-      const shellCmd = commandArgs.map((a) => {
-        if (/[\s"'()$;|&<>@`]/.test(a)) {
-          return `"${a.replace(/"/g, '`"')}"`;
-        }
-        return a;
-      }).join(" ");
-      child = spawn("powershell.exe", ["-Command", shellCmd + "; exit $LASTEXITCODE"], {
-        stdio: "inherit",
-        env,
-        windowsHide: true
-      });
-    } else {
-      child = spawn(commandArgs[0], commandArgs.slice(1), {
-        stdio: "inherit",
-        env,
-        shell: true,
-        windowsHide: true
-      });
-    }
+    const shellCmd = commandArgs.map((a) => {
+      if (/[\s"&<>|^]/.test(a)) {
+        return `"${a.replace(/"/g, '""')}"`;
+      }
+      return a;
+    }).join(" ");
+    child = spawn("cmd.exe", ["/c", shellCmd], {
+      stdio: "inherit",
+      env,
+      windowsHide: true
+    });
   } else {
     const shellCmd = commandArgs.map(shellEscape).join(" ");
     child = spawn("/bin/sh", ["-c", shellCmd], {

package/dist/cli.js

@@ -24,13 +24,13 @@ import {
   spawnCommand,
   waitForProxy,
   writeTlsMarker
-} from "./chunk-ENHLKLCJ.js";
+} from "./chunk-IVO6GF7V.js";
 
 // src/cli.ts
 import chalk from "chalk";
 import * as fs2 from "fs";
 import * as path2 from "path";
-import { spawn, spawnSync } from "child_process";
+import { spawn, spawnSync, execSync } from "child_process";
 
 // src/certs.ts
 import * as fs from "fs";
@@ -435,6 +435,20 @@ var DEBOUNCE_MS = 100;
 var POLL_INTERVAL_MS = 3e3;
 var EXIT_TIMEOUT_MS = 2e3;
 var SUDO_SPAWN_TIMEOUT_MS = 3e4;
+function killProcess(pid, force = false) {
+  if (IS_WINDOWS) {
+    const args = force ? ["/F", "/T", "/PID", pid.toString()] : ["/T", "/PID", pid.toString()];
+    try {
+      execSync(`taskkill ${args.join(" ")}`, { windowsHide: true });
+    } catch {
+    }
+  } else {
+    try {
+      process.kill(pid, force ? "SIGKILL" : "SIGTERM");
+    } catch {
+    }
+  }
+}
 function startProxyServer(store, proxyPort, tlsOptions) {
   store.ensureDir();
   const isTls = !!tlsOptions;
@@ -540,7 +554,7 @@ async function stopProxy(store, proxyPort, tls2) {
       const pid = findPidOnPort(proxyPort);
       if (pid !== null) {
         try {
-          process.kill(pid, "SIGTERM");
+          killProcess(pid);
           try {
             fs2.unlinkSync(store.portFilePath);
           } catch {
@@ -615,7 +629,7 @@ async function stopProxy(store, proxyPort, tls2) {
       fs2.unlinkSync(pidPath);
       return;
     }
-    process.kill(pid, "SIGTERM");
+    killProcess(pid);
     fs2.unlinkSync(pidPath);
     try {
       fs2.unlinkSync(store.portFilePath);
@@ -884,7 +898,7 @@ ${chalk.bold("Skip peakroute:")}
     process.exit(0);
   }
   if (args[0] === "--version" || args[0] === "-v") {
-    console.log("0.5.2");
+    console.log("0.5.3");
     process.exit(0);
   }
   if (args[0] === "trust") {

package/dist/index.js

@@ -14,7 +14,7 @@ import {
   formatUrl,
   isErrnoException,
   parseHostname
-} from "./chunk-ENHLKLCJ.js";
+} from "./chunk-IVO6GF7V.js";
 export {
   DIR_MODE,
   FILE_MODE,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peakroute",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Replace port numbers with stable, named .localhost URLs. For humans and agents. (Formerly portless)",
   "type": "module",
   "main": "./dist/index.js",