@saptools/cf-debugger 0.2.0 → 0.2.1

package/dist/{chunk-ZWAQD7KL.js → chunk-AKQR4Y74.js}

@@ -846,8 +846,91 @@ var NODE_INSPECTOR_SCRIPT = [
 
 // src/cloud-foundry/ssh.ts
 import { spawn } from "child_process";
-import nodeProcess2 from "process";
+import nodeProcess3 from "process";
 import { StringDecoder } from "string_decoder";
+
+// src/debug-session/process-identity.ts
+import { execFile as execFile2 } from "child_process";
+import { readFile } from "fs/promises";
+import nodeProcess2 from "process";
+import { promisify } from "util";
+var execFileAsync = promisify(execFile2);
+function errorCode(error) {
+  if (typeof error !== "object" || error === null) {
+    return void 0;
+  }
+  const code = Reflect.get(error, "code");
+  return typeof code === "string" ? code : void 0;
+}
+function parseLinuxProcessStartTime(statLine) {
+  const commandEnd = statLine.lastIndexOf(")");
+  if (commandEnd < 0) {
+    return void 0;
+  }
+  const fieldsAfterCommand = statLine.slice(commandEnd + 1).trim().split(/\s+/);
+  const startTime = fieldsAfterCommand[19];
+  return startTime !== void 0 && /^\d+$/.test(startTime) ? startTime : void 0;
+}
+function throwIfAborted(signal) {
+  if (signal?.aborted) {
+    throw new CfDebuggerError("ABORTED", "Process identity inspection was aborted.");
+  }
+}
+async function linuxProcessIdentity(pid, signal) {
+  try {
+    const statLine = await readFile(`/proc/${pid.toString()}/stat`, {
+      encoding: "utf8",
+      ...signal === void 0 ? {} : { signal }
+    });
+    const startTime = parseLinuxProcessStartTime(statLine);
+    return startTime === void 0 ? void 0 : `linux:${startTime}`;
+  } catch (error) {
+    throwIfAborted(signal);
+    if (errorCode(error) === "ENOENT") {
+      return void 0;
+    }
+    return void 0;
+  }
+}
+async function darwinProcessIdentity(pid, signal) {
+  try {
+    const { stdout } = await execFileAsync("ps", ["-p", pid.toString(), "-o", "lstart="], {
+      ...signal === void 0 ? {} : { signal },
+      timeout: 2e3
+    });
+    const startedAt = stdout.trim();
+    return startedAt.length === 0 ? void 0 : `darwin:${startedAt}`;
+  } catch {
+    throwIfAborted(signal);
+    return void 0;
+  }
+}
+async function readProcessIdentity(pid, signal) {
+  throwIfAborted(signal);
+  if (!Number.isSafeInteger(pid) || pid <= 0) {
+    return void 0;
+  }
+  if (nodeProcess2.platform === "linux") {
+    return await linuxProcessIdentity(pid, signal);
+  }
+  if (nodeProcess2.platform === "darwin") {
+    return await darwinProcessIdentity(pid, signal);
+  }
+  return void 0;
+}
+async function inspectProcessIdentity(pid, expected, signal) {
+  throwIfAborted(signal);
+  if (expected === void 0) {
+    return "match";
+  }
+  const current = await readProcessIdentity(pid, signal);
+  if (current === void 0) {
+    return "unavailable";
+  }
+  return current === expected ? "match" : "mismatch";
+}
+
+// src/cloud-foundry/ssh.ts
 var DEFAULT_MAX_OUTPUT_BYTES = 65536;
 var LIVE_LINE_LIMIT_BYTES = 65536;
 var MAX_REDACTION_OVERLAP_BYTES = 4096;
@@ -986,14 +1069,77 @@ function createSshExecutionState(context, outputLimit) {
     redaction,
     settled: false,
     aborted: false,
-    timedOut: false
+    timedOut: false,
+    terminationStarted: false
   };
 }
-function terminateSshExecution(child, state) {
-  signalChild(child, "SIGTERM");
-  state.forceKillTimer ??= setTimeout(() => {
-    signalChild(child, "SIGKILL");
-  }, 1e3);
+function childIsOpen(child) {
+  return child.exitCode === null && child.signalCode === null;
+}
+async function captureSshChildIdentity(child) {
+  if (nodeProcess3.platform === "win32" || child.pid === void 0) {
+    return;
+  }
+  try {
+    return await readProcessIdentity(child.pid);
+  } catch {
+    return;
+  }
+}
+async function canSignalSshChild(child, childIdentity) {
+  if (!childIsOpen(child) || child.pid === void 0) {
+    return false;
+  }
+  if (nodeProcess3.platform === "win32") {
+    return true;
+  }
+  const expectedIdentity = await childIdentity;
+  if (expectedIdentity === void 0) {
+    return false;
+  }
+  return await inspectProcessIdentity(child.pid, expectedIdentity) === "match" && childIsOpen(child);
+}
+function abandonUnverifiedSshChild(child) {
+  try {
+    child.stdout?.destroy();
+  } catch {
+  }
+  try {
+    child.stderr?.destroy();
+  } catch {
+  }
+  try {
+    child.unref();
+  } catch {
+  }
+}
+function terminateSshExecution(child, childIdentity, state, settle) {
+  if (state.settled || state.terminationStarted) {
+    return;
+  }
+  state.terminationStarted = true;
+  const settleUnverified = () => {
+    if (!state.settled) {
+      abandonUnverifiedSshChild(child);
+      settle(createResult(null, state));
+    }
+  };
+  void (async () => {
+    if (!await canSignalSshChild(child, childIdentity) || state.settled) {
+      settleUnverified();
+      return;
+    }
+    signalChild(child, "SIGTERM");
+    state.forceKillTimer = setTimeout(() => {
+      void (async () => {
+        if (!await canSignalSshChild(child, childIdentity) || state.settled) {
+          settleUnverified();
+          return;
+        }
+        signalChild(child, "SIGKILL");
+      })().catch(settleUnverified);
+    }, 1e3);
+  })().catch(settleUnverified);
 }
 function sshAbortError(context) {
   if (context.deadlineAt !== void 0 && Date.now() >= context.deadlineAt) {
@@ -1023,16 +1169,16 @@ function createSshSettler(state, options, context, onAbort, resolve, reject) {
     resolve(state.timedOut ? { ...result, timedOutAfterMs: options.timeoutMs } : result);
   };
 }
-function attachSshExecution(child, context, options, resolve, reject) {
+function attachSshExecution(child, childIdentity, context, options, resolve, reject) {
   const state = createSshExecutionState(context, options.maxOutputBytes);
   const onAbort = () => {
     state.aborted = true;
-    terminateSshExecution(child, state);
+    terminateSshExecution(child, childIdentity, state, settle);
   };
   const settle = createSshSettler(state, options, context, onAbort, resolve, reject);
   state.timeoutTimer = setTimeout(() => {
     state.timedOut = true;
-    terminateSshExecution(child, state);
+    terminateSshExecution(child, childIdentity, state, settle);
   }, options.timeoutMs);
   if (context.signal?.aborted) {
     onAbort();
@@ -1061,16 +1207,17 @@ function runSshOneShot(args, context, options) {
   return new Promise((resolve, reject) => {
     const child = spawn(resolveBin(context), [...args], {
       env: buildEnv(context.cfHome),
-      detached: nodeProcess2.platform !== "win32",
+      detached: nodeProcess3.platform !== "win32",
       stdio: ["ignore", "pipe", "pipe"]
     });
-    attachSshExecution(child, context, options, resolve, reject);
+    const childIdentity = captureSshChildIdentity(child);
+    attachSshExecution(child, childIdentity, context, options, resolve, reject);
   });
 }
 function signalChild(child, signal) {
-  if (nodeProcess2.platform !== "win32" && child.pid !== void 0) {
+  if (nodeProcess3.platform !== "win32" && child.pid !== void 0) {
     try {
-      nodeProcess2.kill(-child.pid, signal);
+      nodeProcess3.kill(-child.pid, signal);
       return;
     } catch {
     }
@@ -1246,7 +1393,7 @@ function spawnSshTunnel(appName, localPort, remotePort, context, target = {}) {
   const args = buildCfSshArgs(appName, target, ["-N", "-L", tunnelArg]);
   const child = spawn(resolveBin(context), [...args], {
     env: buildEnv(context.cfHome),
-    detached: nodeProcess2.platform !== "win32",
+    detached: nodeProcess3.platform !== "win32",
     stdio: ["ignore", "pipe", "pipe"]
   });
   attachTunnelCapture(child, context);
@@ -1269,87 +1416,6 @@ var CHILD_SIGTERM_GRACE_MS = 2e3;
 var CHILD_SIGKILL_GRACE_MS = 1e3;
 var PID_TERMINATION_POLL_MS = 100;
 
-// src/debug-session/process-identity.ts
-import { execFile as execFile2 } from "child_process";
-import { readFile } from "fs/promises";
-import nodeProcess3 from "process";
-import { promisify } from "util";
-var execFileAsync = promisify(execFile2);
-function errorCode(error) {
-  if (typeof error !== "object" || error === null) {
-    return void 0;
-  }
-  const code = Reflect.get(error, "code");
-  return typeof code === "string" ? code : void 0;
-}
-function parseLinuxProcessStartTime(statLine) {
-  const commandEnd = statLine.lastIndexOf(")");
-  if (commandEnd < 0) {
-    return void 0;
-  }
-  const fieldsAfterCommand = statLine.slice(commandEnd + 1).trim().split(/\s+/);
-  const startTime = fieldsAfterCommand[19];
-  return startTime !== void 0 && /^\d+$/.test(startTime) ? startTime : void 0;
-}
-function throwIfAborted(signal) {
-  if (signal?.aborted) {
-    throw new CfDebuggerError("ABORTED", "Process identity inspection was aborted.");
-  }
-}
-async function linuxProcessIdentity(pid, signal) {
-  try {
-    const statLine = await readFile(`/proc/${pid.toString()}/stat`, {
-      encoding: "utf8",
-      ...signal === void 0 ? {} : { signal }
-    });
-    const startTime = parseLinuxProcessStartTime(statLine);
-    return startTime === void 0 ? void 0 : `linux:${startTime}`;
-  } catch (error) {
-    throwIfAborted(signal);
-    if (errorCode(error) === "ENOENT") {
-      return void 0;
-    }
-    return void 0;
-  }
-}
-async function darwinProcessIdentity(pid, signal) {
-  try {
-    const { stdout } = await execFileAsync("ps", ["-p", pid.toString(), "-o", "lstart="], {
-      ...signal === void 0 ? {} : { signal },
-      timeout: 2e3
-    });
-    const startedAt = stdout.trim();
-    return startedAt.length === 0 ? void 0 : `darwin:${startedAt}`;
-  } catch {
-    throwIfAborted(signal);
-    return void 0;
-  }
-}
-async function readProcessIdentity(pid, signal) {
-  throwIfAborted(signal);
-  if (!Number.isSafeInteger(pid) || pid <= 0) {
-    return void 0;
-  }
-  if (nodeProcess3.platform === "linux") {
-    return await linuxProcessIdentity(pid, signal);
-  }
-  if (nodeProcess3.platform === "darwin") {
-    return await darwinProcessIdentity(pid, signal);
-  }
-  return void 0;
-}
-async function inspectProcessIdentity(pid, expected, signal) {
-  throwIfAborted(signal);
-  if (expected === void 0) {
-    return "match";
-  }
-  const current = await readProcessIdentity(pid, signal);
-  if (current === void 0) {
-    return "unavailable";
-  }
-  return current === expected ? "match" : "mismatch";
-}
-
 // src/lock.ts
 import { randomUUID } from "crypto";
 import { chmod, mkdir, open, readFile as readFile2, stat, unlink } from "fs/promises";
@@ -2962,7 +3028,7 @@ async function tryRemoveOwnedSessionCfHome(sessionId, candidate) {
 
 // src/debug-session/lifecycle.ts
 var handleLifecycles = /* @__PURE__ */ new WeakMap();
-function childIsOpen(child) {
+function childIsOpen2(child) {
   return child.exitCode === null && child.signalCode === null;
 }
 function signalExitCode(signal) {
@@ -3094,12 +3160,12 @@ function createTunnelLifecycle(session, emit) {
   const verifyBeforeSignal = async (signal) => {
     const tunnelChild = child;
     const childPid = tunnelChild?.pid;
-    if (tunnelChild === void 0 || childPid === void 0 || !childIsOpen(tunnelChild)) {
+    if (tunnelChild === void 0 || childPid === void 0 || !childIsOpen2(tunnelChild)) {
       return false;
     }
     const expectedIdentity = await childIdentity;
     if (expectedIdentity !== void 0) {
-      return await inspectProcessIdentity(childPid, expectedIdentity) === "match" && childIsOpen(tunnelChild);
+      return await inspectProcessIdentity(childPid, expectedIdentity) === "match" && childIsOpen2(tunnelChild);
     }
     if (signal === "SIGKILL") {
       return await expectedTunnelStillOwned(session, tunnelChild) === true;
@@ -3126,7 +3192,7 @@ function createTunnelLifecycle(session, emit) {
   return {
     exitPromise,
     assertRunning: () => {
-      if (child === void 0 || !childIsOpen(child) || childFailed) {
+      if (child === void 0 || !childIsOpen2(child) || childFailed) {
         throw new CfDebuggerError(
           "TUNNEL_NOT_READY",
           `SSH tunnel for session ${session.sessionId} exited before readiness could be committed.`,
@@ -4731,4 +4797,4 @@ export {
   listSessions,
   getSession
 };
-//# sourceMappingURL=chunk-ZWAQD7KL.js.map
+//# sourceMappingURL=chunk-AKQR4Y74.js.map