openk8s 1.0.4 → 1.1.0

package/src/lib/kubectl/spawn-utils.ts

@@ -1,14 +1,31 @@
 import { spawn, type ChildProcess, type StdioOptions } from "node:child_process";
+import { parseKubectlError } from "./kubectl-helpers";
 
 const DEFAULT_TIMEOUT_MS = 15_000;
 let shutdownController: AbortController | undefined;
 
+const persistentProcesses = new Set<ChildProcess>();
+
 export function setAbortController(controller: AbortController): void {
   shutdownController = controller;
 }
 
 export function abortRunningProcesses(): void {
   shutdownController?.abort();
+  for (const child of persistentProcesses) {
+    safeKill(child, "SIGTERM");
+  }
+  persistentProcesses.clear();
+}
+
+export function safeKill(child: ChildProcess, signal: NodeJS.Signals = "SIGTERM"): void {
+  try {
+    if (child.exitCode === null && !child.killed) {
+      child.kill(signal);
+    }
+  } catch {
+    // ESRCH: process already exited. Safe to ignore.
+  }
 }
 
 export interface RunCommandOptions {
@@ -28,23 +45,30 @@ export function runCommand(options: RunCommandOptions): Promise<CommandResult> {
     const child = spawn(options.command, options.args, { env: process.env, stdio: ["pipe", "pipe", "pipe"] });
     const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
 
-    const timeoutId = setTimeout(() => {
+    const onShutdown = (): void => {
       if (settled) {
         return;
       }
       settled = true;
-      child.kill("SIGTERM");
-      reject(new Error(`${options.command} ${options.args.slice(0, 4).join(" ")} timed out after ${timeoutMs / 1_000}s`));
-    }, timeoutMs);
+      clearTimeout(timeoutId);
+      safeKill(child, "SIGTERM");
+      reject(new Error("Application shutting down"));
+    };
 
-    const onShutdown = (): void => {
+    const timeoutId = setTimeout(() => {
       if (settled) {
         return;
       }
       settled = true;
-      clearTimeout(timeoutId);
-      child.kill("SIGTERM");
-      reject(new Error("Application shutting down"));
+      removeAbortListener();
+      safeKill(child, "SIGTERM");
+      reject(new Error(`${options.command} ${options.args.slice(0, 4).join(" ")} timed out after ${timeoutMs / 1_000}s`));
+    }, timeoutMs);
+
+    const removeAbortListener = (): void => {
+      if (shutdownController) {
+        shutdownController.signal.removeEventListener("abort", onShutdown);
+      }
     };
 
     if (shutdownController) {
@@ -68,12 +92,15 @@ export function runCommand(options: RunCommandOptions): Promise<CommandResult> {
 
     child.on("error", (error) => {
       clearTimeout(timeoutId);
+      removeAbortListener();
+      if (settled) return;
       settled = true;
       reject(error);
     });
 
     child.on("close", (code) => {
       clearTimeout(timeoutId);
+      removeAbortListener();
 
       if (settled) {
         return;
@@ -86,8 +113,7 @@ export function runCommand(options: RunCommandOptions): Promise<CommandResult> {
       }
 
       settled = true;
-      const message = stderr.trim() || `${options.command} ${options.args.join(" ")} failed`;
-      reject(new Error(message));
+      reject(parseKubectlError(stderr, options.args, options.command));
     });
   });
 }
@@ -101,8 +127,21 @@ export function runJson<T>(options: RunCommandOptions): Promise<T> {
 }
 
 export function startPersistentProcess(options: { command: string; args: string[]; stdio?: StdioOptions }): ChildProcess {
-  return spawn(options.command, options.args, {
+  const child = spawn(options.command, options.args, {
     env: process.env,
     stdio: options.stdio ?? ["ignore", "pipe", "pipe"],
   });
+  persistentProcesses.add(child);
+  child.on("close", () => {
+    persistentProcesses.delete(child);
+  });
+  child.on("error", () => {
+    persistentProcesses.delete(child);
+  });
+  return child;
+}
+
+export function stopPersistentProcess(child: ChildProcess): void {
+  persistentProcesses.delete(child);
+  safeKill(child, "SIGINT");
 }

package/src/app/__tests__/components/inspector-tokens.test.ts

@@ -1,101 +0,0 @@
-import { describe, expect, test } from "bun:test";
-import { tokenizeYamlLine, tokenizeDescribeLine } from "../../components/inspector-tokens";
-import { YAML_COMMENT, YAML_KEY, TEXT_SUBTLE, YAML_VALUE } from "../../theme";
-
-describe("tokenizeYamlLine", () => {
-  test("empty line", () => {
-    const tokens = tokenizeYamlLine("");
-    expect(tokens[0]?.text).toBe(" ");
-  });
-
-  test("whitespace line", () => {
-    const tokens = tokenizeYamlLine("   ");
-    expect(tokens[0]?.text).toBe("   ");
-  });
-
-  test("comment line", () => {
-    const tokens = tokenizeYamlLine("# this is a comment");
-    expect(tokens).toHaveLength(1);
-    expect(tokens[0]?.fg).toBe(YAML_COMMENT);
-  });
-
-  test("key: value line", () => {
-    const tokens = tokenizeYamlLine("name: nginx");
-    expect(tokens).toHaveLength(4);
-    expect(tokens[0]?.text).toBe("");
-    expect(tokens[1]?.text).toBe("name");
-    expect(tokens[1]?.fg).toBe(YAML_KEY);
-    expect(tokens[3]?.text).toBe("nginx");
-    expect(tokens[3]?.fg).toBe(YAML_VALUE);
-  });
-
-  test("indented key: value", () => {
-    const tokens = tokenizeYamlLine("  name: nginx");
-    expect(tokens[0]?.text).toBe("  ");
-    expect(tokens[1]?.text).toBe("name");
-    expect(tokens[1]?.fg).toBe(YAML_KEY);
-  });
-
-  test("list item with value", () => {
-    const tokens = tokenizeYamlLine("- name: nginx");
-    expect(tokens[0]?.text).toBe("- ");
-    expect(tokens[1]?.text).toBe("name");
-    expect(tokens[1]?.fg).toBe(YAML_KEY);
-  });
-
-  test("bare list marker", () => {
-    const tokens = tokenizeYamlLine("-");
-    expect(tokens).toHaveLength(1);
-    expect(tokens[0]?.fg).toBe(TEXT_SUBTLE);
-  });
-
-  test("key only (ends with colon)", () => {
-    const tokens = tokenizeYamlLine("metadata:");
-    expect(tokens).toHaveLength(3);
-    expect(tokens[1]?.text).toBe("metadata");
-    expect(tokens[1]?.fg).toBe(YAML_KEY);
-    expect(tokens[2]?.text).toBe(":");
-  });
-
-  test("plain text fallthrough", () => {
-    const tokens = tokenizeYamlLine("some random text");
-    expect(tokens).toHaveLength(1);
-    expect(tokens[0]?.fg).toBe(TEXT_SUBTLE);
-  });
-});
-
-describe("tokenizeDescribeLine", () => {
-  test("empty line", () => {
-    const tokens = tokenizeDescribeLine("");
-    expect(tokens[0]?.text).toBe(" ");
-  });
-
-  test("section header", () => {
-    const tokens = tokenizeDescribeLine("Name: test-pod");
-    expect(tokens).toHaveLength(3);
-    expect(tokens[0]?.text).toBe("Name");
-    expect(tokens[0]?.fg).toBe(YAML_KEY);
-    expect(tokens[2]?.fg).toBe(YAML_VALUE);
-  });
-
-  test("indented key:  value (double space after colon)", () => {
-    const tokens = tokenizeDescribeLine("  Namespace:  default");
-    expect(tokens).toHaveLength(2);
-    expect(tokens[0]?.fg).toBe(TEXT_SUBTLE);
-    expect(tokens[1]?.fg).toBe(YAML_VALUE);
-  });
-
-  test("key: single value", () => {
-    const tokens = tokenizeDescribeLine("key:value");
-    expect(tokens).toHaveLength(3);
-    expect(tokens[0]?.fg).toBe(TEXT_SUBTLE);
-    expect(tokens[1]?.text).toBe(":");
-    expect(tokens[2]?.text).toBe("value");
-  });
-
-  test("plain text", () => {
-    const tokens = tokenizeDescribeLine("Some plain description text");
-    expect(tokens).toHaveLength(1);
-    expect(tokens[0]?.fg).toBe(TEXT_SUBTLE);
-  });
-});

package/src/app/components/inspector-tokens.ts

@@ -1,93 +0,0 @@
-import { YAML_COMMENT, YAML_KEY, TEXT_SUBTLE, YAML_VALUE } from "../theme";
-
-export interface YamlToken {
-  text: string;
-  fg: string;
-}
-
-export function tokenizeDescribeLine(line: string): YamlToken[] {
-  if (!line.trim()) {
-    return [{ text: line || " ", fg: TEXT_SUBTLE }];
-  }
-
-  if (/^[A-Z][A-Za-z ]+:/.test(line.trimStart()) && !line.startsWith(" ")) {
-    const colonIdx = line.indexOf(":");
-    const key = line.slice(0, colonIdx);
-    const rest = line.slice(colonIdx + 1);
-    return [
-      { text: key, fg: YAML_KEY },
-      { text: ":", fg: TEXT_SUBTLE },
-      { text: rest, fg: YAML_VALUE },
-    ];
-  }
-
-  const colonSpaceIdx = line.indexOf(":  ");
-  if (colonSpaceIdx > 0) {
-    const key = line.slice(0, colonSpaceIdx);
-    const value = line.slice(colonSpaceIdx + 1);
-    return [
-      { text: key, fg: TEXT_SUBTLE },
-      { text: value, fg: YAML_VALUE },
-    ];
-  }
-
-  const colonIdx = line.indexOf(":");
-  if (colonIdx > 0 && colonIdx < line.length - 1) {
-    const key = line.slice(0, colonIdx);
-    const value = line.slice(colonIdx + 1);
-    return [
-      { text: key, fg: TEXT_SUBTLE },
-      { text: ":", fg: TEXT_SUBTLE },
-      { text: value, fg: YAML_VALUE },
-    ];
-  }
-
-  return [{ text: line, fg: TEXT_SUBTLE }];
-}
-
-export function tokenizeYamlLine(line: string): YamlToken[] {
-  if (!line.trim()) {
-    return [{ text: line || " ", fg: TEXT_SUBTLE }];
-  }
-
-  if (/^\s*#/.test(line)) {
-    return [{ text: line, fg: YAML_COMMENT }];
-  }
-
-  const indentLen = line.length - line.trimStart().length;
-  const indent = line.slice(0, indentLen);
-  let rest = line.trimStart();
-
-  let listMarker = "";
-  if (rest.startsWith("- ")) {
-    listMarker = "- ";
-    rest = rest.slice(2);
-  } else if (rest === "-") {
-    return [{ text: line, fg: TEXT_SUBTLE }];
-  }
-
-  const colonSpaceIdx = rest.indexOf(": ");
-  const isKeyOnly = rest === rest.trimEnd() && rest.endsWith(":");
-
-  if (colonSpaceIdx !== -1) {
-    const key = rest.slice(0, colonSpaceIdx);
-    const value = rest.slice(colonSpaceIdx + 2);
-    return [
-      { text: indent + listMarker, fg: TEXT_SUBTLE },
-      { text: key, fg: YAML_KEY },
-      { text: ": ", fg: TEXT_SUBTLE },
-      { text: value, fg: YAML_VALUE },
-    ];
-  }
-
-  if (isKeyOnly) {
-    const key = rest.slice(0, -1);
-    return [
-      { text: indent + listMarker, fg: TEXT_SUBTLE },
-      { text: key, fg: YAML_KEY },
-      { text: ":", fg: TEXT_SUBTLE },
-    ];
-  }
-
-  return [{ text: line, fg: TEXT_SUBTLE }];
-}

package/src/app/components/port-forwards-tray.tsx

@@ -1,57 +0,0 @@
-import { TextAttributes } from "@opentui/core";
-
-import { DANGER, GLYPHS, KEY_HINT, OVERLAY_SURFACE, PANEL_BORDER, TEXT_PRIMARY, TEXT_SUBTLE } from "../theme";
-import { activePortForwardLabel } from "../utils";
-import type { ActivePortForward } from "../../lib/k8s/types";
-
-export interface PortForwardsTrayProps {
-  forwards: ActivePortForward[];
-  onStop: (id: string) => void;
-}
-
-export function PortForwardsTray({ forwards, onStop }: PortForwardsTrayProps) {
-  if (forwards.length === 0) {
-    return undefined;
-  }
-
-  return (
-    <box
-      style={{
-        border: true,
-        borderColor: PANEL_BORDER,
-        borderStyle: "rounded",
-        backgroundColor: OVERLAY_SURFACE,
-        paddingLeft: 1,
-        paddingRight: 1,
-        flexDirection: "column",
-      }}
-    >
-      {/* Tray heading */}
-      <text fg={KEY_HINT}>
-        {GLYPHS.forward}
-        <span fg={TEXT_SUBTLE} attributes={TextAttributes.DIM}>{" Port Forwards"}</span>
-      </text>
-      <box style={{ flexDirection: "column", width: "100%" }}>
-        {forwards.map((forward) => {
-          const isReady = forward.status === "ready";
-          const statusDot = isReady ? GLYPHS.dot : GLYPHS.dotEmpty;
-          const statusFg = isReady ? KEY_HINT : TEXT_SUBTLE;
-
-          return (
-            <box key={forward.id} style={{ flexDirection: "row", justifyContent: "space-between", width: "100%" }}>
-              <text fg={isReady ? TEXT_PRIMARY : TEXT_SUBTLE}>
-                <span fg={statusFg}>{statusDot}</span>
-                {`  ${activePortForwardLabel(forward)}  `}
-                <span fg={TEXT_SUBTLE} attributes={TextAttributes.DIM}>{forward.status}</span>
-              </text>
-              <text fg={DANGER} onMouseDown={() => onStop(forward.id)}>
-                <span fg={DANGER}>{GLYPHS.stop}</span>
-                {" stop"}
-              </text>
-            </box>
-          );
-        })}
-      </box>
-    </box>
-  );
-}