bgrun 3.12.16 → 3.12.22

package/dist/deps.js

@@ -17,48 +17,59 @@ var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = import.meta.require;
 
 // src/platform.ts
-var exports_platform = {};
-__export(exports_platform, {
-  waitForPortFree: () => waitForPortFree,
-  terminateProcess: () => terminateProcess,
-  reconcileProcessPids: () => reconcileProcessPids,
-  readFileTail: () => readFileTail,
-  psExec: () => psExec,
-  parseUnixListeningPorts: () => parseUnixListeningPorts,
-  killProcessOnPort: () => killProcessOnPort,
-  isWindows: () => isWindows,
-  isProcessRunning: () => isProcessRunning,
-  isPortFree: () => isPortFree,
-  getShellCommand: () => getShellCommand,
-  getProcessPorts: () => getProcessPorts,
-  getProcessMemory: () => getProcessMemory,
-  getProcessBatchResources: () => getProcessBatchResources,
-  getPortInfo: () => getPortInfo,
-  getHomeDir: () => getHomeDir,
-  findPidByPort: () => findPidByPort,
-  findChildPid: () => findChildPid,
-  ensureDir: () => ensureDir,
-  copyFile: () => copyFile
-});
 import * as fs from "fs";
 import * as os from "os";
 import { join } from "path";
 var {$ } = globalThis.Bun;
 import { createMeasure } from "measure-fn";
-function psExec(command, _timeoutMs = 3000) {
-  const tmpFile = join(os.tmpdir(), `bgr-ps-${Date.now()}.ps1`);
+async function psExec(command, timeoutMs = 3000) {
+  const tmpFile = join(os.tmpdir(), `bgr-ps-${Date.now()}-${Math.random().toString(36).substr(2, 9)}.ps1`);
   try {
-    fs.writeFileSync(tmpFile, command);
-    const result = Bun.spawnSync(["powershell", "-NoProfile", "-ExecutionPolicy", "Bypass", "-File", tmpFile]);
+    await Bun.write(tmpFile, command);
+    const proc = Bun.spawn([
+      "powershell",
+      "-NoProfile",
+      "-ExecutionPolicy",
+      "Bypass",
+      "-File",
+      tmpFile
+    ], {
+      stdout: "pipe",
+      stderr: "pipe"
+    });
+    const timeoutPromise = new Promise((_, reject) => {
+      setTimeout(() => reject(new Error("PowerShell command timed out")), timeoutMs);
+    });
+    const resultPromise = new Promise(async (resolve, reject) => {
+      try {
+        const stdoutPromise = proc.stdout ? new Response(proc.stdout).text() : Promise.resolve("");
+        const stderrPromise = proc.stderr ? new Response(proc.stderr).text() : Promise.resolve("");
+        const exitCode = await proc.exited;
+        const stdout = await stdoutPromise;
+        const stderr = await stderrPromise;
+        if (exitCode === 0) {
+          resolve(stdout);
+        } else {
+          resolve(stderr || "");
+        }
+      } catch (error) {
+        reject(error);
+      }
+    });
     try {
-      fs.unlinkSync(tmpFile);
-    } catch {}
-    return result.stdout?.toString() || "";
-  } catch {
+      const result = await Promise.race([resultPromise, timeoutPromise]);
+      return result.trim();
+    } catch (error) {
+      return "";
+    } finally {
+      try {
+        await Bun.sleep(100);
+      } catch {}
+    }
+  } finally {
     try {
-      fs.unlinkSync(tmpFile);
+      fs.rmSync(tmpFile, { force: true });
     } catch {}
-    return "";
   }
 }
 function isWindows() {
@@ -80,7 +91,7 @@ async function isProcessRunning(pid, command) {
           process.kill(pid, 0);
           return true;
         } catch {
-          const output = psExec(`Get-Process -Id ${pid} -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Id`).trim();
+          const output = await psExec(`Get-Process -Id ${pid} -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Id`);
           return output === String(pid);
         }
       } else {
@@ -173,35 +184,6 @@ async function isPortFree(port) {
     return true;
   }
 }
-async function getPortInfo(port) {
-  try {
-    if (isWindows()) {
-      const result = await $`netstat -ano | findstr :${port}`.nothrow().quiet().text();
-      for (const line of result.split(`
-`)) {
-        const match = line.match(new RegExp(`:(${port})\\s+.*LISTENING\\s+(\\d+)`));
-        if (match) {
-          const pid = parseInt(match[2]);
-          if (pid > 0 && await isProcessRunning(pid)) {
-            const nameResult = await $`powershell -NoProfile -Command "(Get-Process -Id ${pid} -ErrorAction SilentlyContinue).ProcessName"`.nothrow().quiet().text();
-            return { inUse: true, pid, processName: nameResult.trim() || "unknown" };
-          }
-        }
-      }
-      return { inUse: false };
-    } else {
-      const result = await $`ss -tln sport = :${port}`.nothrow().quiet().text();
-      const lines = result.trim().split(`
-`).filter((l) => l.trim());
-      if (lines.length > 1) {
-        return { inUse: true };
-      }
-      return { inUse: false };
-    }
-  } catch {
-    return { inUse: false };
-  }
-}
 async function waitForPortFree(port, timeoutMs = 5000) {
   const startTime = Date.now();
   const pollInterval = 300;
@@ -409,9 +391,6 @@ async function readFileTail(filePath, lines) {
     }
   }) ?? "";
 }
-function copyFile(src, dest) {
-  fs.copyFileSync(src, dest);
-}
 async function getProcessMemory(pid) {
   const map = await getProcessBatchResources([pid]);
   return map.get(pid)?.memory || 0;
@@ -424,7 +403,7 @@ async function getProcessBatchResources(pids) {
     const pidSet = new Set(pids);
     try {
       if (isWindows()) {
-        const output = psExec(`Get-Process -Id ${pids.join(",")} -ErrorAction SilentlyContinue | Select-Object Id, WorkingSet64 | ForEach-Object { Write-Output "$($_.Id)|$($_.WorkingSet64)" }`);
+        const output = await psExec(`Get-Process -Id ${pids.join(",")} -ErrorAction SilentlyContinue | Select-Object Id, WorkingSet64 | ForEach-Object { Write-Output "$($_.Id)|$($_.WorkingSet64)" }`);
         for (const line of output.split(`
 `)) {
           const sepIdx = line.indexOf("|");
@@ -504,6 +483,21 @@ async function getProcessPorts(pid) {
     return [];
   }
 }
+async function resolvePidWithPorts(pid) {
+  const ports = await getProcessPorts(pid);
+  if (ports.length > 0 || !isWindows() || pid <= 0) {
+    return { pid, ports };
+  }
+  const childPid = await findChildPid(pid);
+  if (childPid === pid || childPid <= 0) {
+    return { pid, ports };
+  }
+  const childPorts = await getProcessPorts(childPid);
+  if (childPorts.length > 0) {
+    return { pid: childPid, ports: childPorts };
+  }
+  return { pid, ports };
+}
 var plat;
 var init_platform = __esm(() => {
   plat = createMeasure("platform");
@@ -580,7 +574,7 @@ function removeProcessByName(name) {
 function updateProcessPid(name, newPid) {
   const proc = db.process.select().where({ name }).limit(1).get();
   if (proc) {
-    db.process.update(proc.id, { pid: newPid });
+    proc.update({ pid: newPid });
   }
 }
 function removeAllProcesses() {
@@ -592,7 +586,7 @@ function removeAllProcesses() {
 function updateProcessEnv(name, envJson) {
   const proc = db.process.select().where({ name }).limit(1).get();
   if (proc) {
-    db.process.update(proc.id, { env: envJson });
+    proc.update({ env: envJson });
   }
 }
 function getAllTemplates() {
@@ -830,6 +824,8 @@ var init_db = __esm(() => {
 
 // src/utils.ts
 import * as fs2 from "fs";
+import * as os2 from "os";
+import { join as join3 } from "path";
 function parseEnvString(envString) {
   const env = {};
   envString.split(",").forEach((pair) => {
@@ -845,9 +841,92 @@ function calculateRuntime(startTime) {
   const diffInMinutes = Math.floor((now - start) / (1000 * 60));
   return `${diffInMinutes} minutes`;
 }
+function parseCommandEnv(command) {
+  const env = {};
+  const trimmed = command.trim();
+  const windowsSegments = trimmed.split(/&&/).map((segment) => segment.trim());
+  for (const segment of windowsSegments) {
+    const match = segment.match(/^set\s+([A-Za-z_][A-Za-z0-9_]*)=(.*)$/i);
+    if (!match)
+      break;
+    env[match[1]] = match[2].trim();
+  }
+  const unixPrefixRegex = /^(?:([A-Za-z_][A-Za-z0-9_]*)=([^\s]+)\s+)+/;
+  const unixPrefix = trimmed.match(unixPrefixRegex);
+  if (unixPrefix) {
+    const pairs = unixPrefix[0].trim().split(/\s+/);
+    for (const pair of pairs) {
+      const eqIdx = pair.indexOf("=");
+      if (eqIdx <= 0)
+        continue;
+      const key = pair.slice(0, eqIdx);
+      const value = pair.slice(eqIdx + 1);
+      if (key)
+        env[key] = value;
+    }
+  }
+  return env;
+}
+function getDeclaredPort(processEnv, command) {
+  const mergedEnv = { ...command ? parseCommandEnv(command) : {}, ...processEnv };
+  const raw = mergedEnv.PORT || mergedEnv.BUN_PORT || "";
+  const parsed = parseInt(raw, 10);
+  return !isNaN(parsed) && parsed > 0 ? parsed : null;
+}
+function buildManagedProcessEnv(parentEnv, processEnv = {}) {
+  const sanitizedParentEnv = {};
+  for (const [key, value] of Object.entries(parentEnv)) {
+    if (value === undefined)
+      continue;
+    if (INTERNAL_MANAGED_ENV_KEYS.includes(key))
+      continue;
+    sanitizedParentEnv[key] = value;
+  }
+  return { ...sanitizedParentEnv, ...processEnv };
+}
+function stringifyEnvString(env) {
+  return Object.entries(env).map(([key, value]) => `${key}=${value}`).join(",");
+}
+function getWatcherProcessName(targetName) {
+  return `${WATCHER_PREFIX}${encodeURIComponent(targetName)}`;
+}
+function getWatchedProcessName(watcherName) {
+  if (!watcherName.startsWith(WATCHER_PREFIX))
+    return null;
+  try {
+    return decodeURIComponent(watcherName.slice(WATCHER_PREFIX.length));
+  } catch {
+    return null;
+  }
+}
+function isWatcherProcessName(name) {
+  return getWatchedProcessName(name) !== null;
+}
+function isInternalProcessName(name) {
+  return name === "bgr-dashboard" || name === "bgr-guard" || isWatcherProcessName(name);
+}
+function getOperationLockPath(name) {
+  return join3(os2.homedir(), ".bgr", `${name}.operation.lock`);
+}
+function acquireProcessOperationLock(name) {
+  const lockPath = getOperationLockPath(name);
+  fs2.mkdirSync(join3(os2.homedir(), ".bgr"), { recursive: true });
+  fs2.writeFileSync(lockPath, JSON.stringify({ pid: process.pid, time: Date.now() }));
+  let released = false;
+  return () => {
+    if (released)
+      return;
+    released = true;
+    try {
+      fs2.unlinkSync(lockPath);
+    } catch {}
+  };
+}
+function isProcessOperationLocked(name) {
+  return fs2.existsSync(getOperationLockPath(name));
+}
 async function getVersion() {
   try {
-    const { join: join3 } = await import("path");
     const pkgPath = join3(import.meta.dir, "../package.json");
     const pkg = await Bun.file(pkgPath).json();
     return pkg.version || "0.0.0";
@@ -903,8 +982,10 @@ function tailFile(path, prefix, colorFn, lines) {
     } catch {}
   };
 }
+var INTERNAL_MANAGED_ENV_KEYS, WATCHER_PREFIX = "bgr-watch-";
 var init_utils = __esm(() => {
   init_platform();
+  INTERNAL_MANAGED_ENV_KEYS = ["BUN_PORT", "BGR_STDOUT", "BGR_STDERR"];
 });
 
 // src/deps.ts