deepspace 0.2.6 → 0.2.8

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli/cli.ts
-import { defineCommand as defineCommand13, runMain } from "citty";
+import { defineCommand as defineCommand14, runMain } from "citty";
 import { execSync as execSync5 } from "child_process";
 import { readFileSync as readFileSync9, existsSync as existsSync11 } from "fs";
 import { dirname as dirname2, join as join12 } from "path";
@@ -392,13 +392,174 @@ function resolvePort(arg) {
   return n;
 }
 
-// src/cli/commands/test.ts
+// src/cli/commands/kill.ts
 import { defineCommand as defineCommand4 } from "citty";
+import { spawnSync } from "child_process";
+import { setTimeout as wait } from "timers/promises";
+var DEFAULT_PORT2 = 5173;
+var SIGTERM_GRACE_MS = 1500;
+var IS_WIN = process.platform === "win32";
+var kill_default = defineCommand4({
+  meta: {
+    name: "kill",
+    description: "Kill the local dev server and any orphaned workerd processes"
+  },
+  args: {
+    port: {
+      type: "string",
+      description: `Port the dev server is bound to (default ${DEFAULT_PORT2}, or $DEEPSPACE_PORT)`,
+      required: false
+    },
+    all: {
+      type: "boolean",
+      description: "Also kill stray workerd/wrangler processes across all ports",
+      default: false
+    }
+  },
+  async run({ args }) {
+    const port = resolvePort2(args.port);
+    const targets = /* @__PURE__ */ new Set();
+    for (const pid of listenerPids(port)) targets.add(pid);
+    for (const pid of [...targets]) {
+      for (const child of childPids(pid)) targets.add(child);
+    }
+    if (args.all) {
+      for (const pid of processPidsByName(["workerd", "wrangler", "vite"])) {
+        targets.add(pid);
+      }
+    }
+    if (targets.size === 0) {
+      console.log(
+        args.all ? `Nothing listening on :${port} and no stray workerd/wrangler/vite processes found.` : `Nothing listening on :${port}. (Pass --all to sweep stray workerd/wrangler.)`
+      );
+      return;
+    }
+    for (const pid of targets) {
+      if (sendSignal(pid, "SIGTERM")) {
+        console.log(`SIGTERM \u2192 pid ${pid}`);
+      }
+    }
+    await wait(SIGTERM_GRACE_MS);
+    const stillAlive = [];
+    for (const pid of targets) {
+      if (isAlive(pid)) stillAlive.push(pid);
+    }
+    for (const pid of stillAlive) {
+      if (sendSignal(pid, "SIGKILL")) {
+        console.log(`SIGKILL \u2192 pid ${pid} (did not exit on SIGTERM)`);
+      }
+    }
+    await wait(200);
+    const remaining = listenerPids(port);
+    if (remaining.length > 0) {
+      console.error(
+        `Port ${port} is still held by pid(s) ${remaining.join(", ")} \u2014 try \`deepspace kill --port ${port}\` again, or kill manually.`
+      );
+      process.exit(1);
+    }
+    console.log(`Port ${port} is free.`);
+  }
+});
+function resolvePort2(arg) {
+  const raw = arg ?? process.env.DEEPSPACE_PORT;
+  if (!raw) return DEFAULT_PORT2;
+  const n = Number(raw);
+  if (!Number.isInteger(n) || n < 1 || n > 65535) {
+    console.error(`Invalid port: ${raw}. Must be an integer between 1 and 65535.`);
+    process.exit(1);
+  }
+  return n;
+}
+function listenerPids(port) {
+  if (IS_WIN) {
+    return runPowershell(
+      `Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue | Select-Object -ExpandProperty OwningProcess`
+    );
+  }
+  return run(["lsof", "-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"]);
+}
+function childPids(parentPid) {
+  if (IS_WIN) {
+    return runPowershell(
+      `Get-CimInstance Win32_Process -Filter "ParentProcessId=${parentPid}" | Select-Object -ExpandProperty ProcessId`
+    );
+  }
+  return run(["pgrep", "-P", String(parentPid)]);
+}
+function processPidsByName(names) {
+  const all = /* @__PURE__ */ new Set();
+  if (IS_WIN) {
+    const orClauses = names.map((n) => `($_.Name -like '*${n}*') -or ($_.CommandLine -like '*${n}*')`).join(" -or ");
+    const script = `Get-CimInstance Win32_Process | Where-Object { ${orClauses} } | Select-Object -ExpandProperty ProcessId`;
+    for (const pid of runPowershell(script)) {
+      if (pid !== process.pid) all.add(pid);
+    }
+    return [...all];
+  }
+  for (const name of names) {
+    for (const pid of run(["pgrep", "-f", name])) {
+      if (pid !== process.pid) all.add(pid);
+    }
+  }
+  return [...all];
+}
+function run(cmd) {
+  try {
+    const r = spawnSync(cmd[0], cmd.slice(1), { encoding: "utf-8" });
+    if (r.status !== 0) return [];
+    return parsePidLines(r.stdout);
+  } catch {
+    return [];
+  }
+}
+function runPowershell(script) {
+  const exe = pwshOrPowershell();
+  try {
+    const r = spawnSync(
+      exe,
+      ["-NoProfile", "-NonInteractive", "-Command", script],
+      { encoding: "utf-8" }
+    );
+    if (r.status !== 0) return [];
+    return parsePidLines(r.stdout);
+  } catch {
+    return [];
+  }
+}
+function pwshOrPowershell() {
+  const probe = spawnSync("pwsh", ["-NoProfile", "-Command", "$PSVersionTable.PSVersion.Major"], {
+    encoding: "utf-8"
+  });
+  if (probe.status === 0) return "pwsh";
+  return "powershell.exe";
+}
+function parsePidLines(stdout) {
+  return stdout.split(/\s+/).map((s) => Number.parseInt(s, 10)).filter((n) => Number.isFinite(n) && n > 0);
+}
+function sendSignal(pid, signal) {
+  try {
+    process.kill(pid, signal);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// src/cli/commands/test.ts
+import { defineCommand as defineCommand5 } from "citty";
 import { existsSync as existsSync5 } from "fs";
 import { join as join6, resolve as resolve2 } from "path";
-import { execSync, spawnSync } from "child_process";
-var DEFAULT_PORT2 = 5173;
-var test_default = defineCommand4({
+import { execSync, spawnSync as spawnSync2 } from "child_process";
+var DEFAULT_PORT3 = 5173;
+var test_default = defineCommand5({
   meta: {
     name: "test",
     description: "Run tests for your DeepSpace app"
@@ -411,14 +572,14 @@ var test_default = defineCommand4({
     },
     port: {
       type: "string",
-      description: `Port for vite/webServer (default ${DEFAULT_PORT2}, or $DEEPSPACE_PORT)`,
+      description: `Port for vite/webServer (default ${DEFAULT_PORT3}, or $DEEPSPACE_PORT)`,
       required: false
     }
   },
   async run({ args }) {
     const appDir = resolve2(".");
     const suite = args.suite ?? "default";
-    const port = resolvePort2(args.port);
+    const port = resolvePort3(args.port);
     if (!existsSync5(join6(appDir, "wrangler.toml"))) {
       console.error("No wrangler.toml found. Are you in a DeepSpace app directory?");
       process.exit(1);
@@ -471,7 +632,7 @@ var test_default = defineCommand4({
   }
 });
 function runPlaywright(appDir, testFiles, port) {
-  const result = spawnSync("npx", [
+  const result = spawnSync2("npx", [
     "playwright",
     "test",
     "--config",
@@ -486,7 +647,7 @@ function runPlaywright(appDir, testFiles, port) {
   return result.status ?? 1;
 }
 function runVitest(appDir) {
-  const result = spawnSync("npx", ["vitest", "run", "--passWithNoTests"], {
+  const result = spawnSync2("npx", ["vitest", "run", "--passWithNoTests"], {
     cwd: appDir,
     stdio: "inherit",
     shell: process.platform === "win32"
@@ -503,16 +664,16 @@ function ensurePlaywright(appDir) {
   const isLinux = process.platform === "linux";
   const isRoot = isLinux && typeof process.getuid === "function" && process.getuid() === 0;
   const args = isRoot ? ["install", "--with-deps", "chromium"] : ["install", "chromium"];
-  const result = spawnSync("npx", ["playwright", ...args], { cwd: appDir, stdio: "inherit" });
+  const result = spawnSync2("npx", ["playwright", ...args], { cwd: appDir, stdio: "inherit" });
   if (result.status !== 0) {
     console.error("\nPlaywright install failed. On Linux, system libs may be missing \u2014 try:");
     console.error("  sudo npx playwright install --with-deps chromium");
     process.exit(1);
   }
 }
-function resolvePort2(arg) {
+function resolvePort3(arg) {
   const raw = arg ?? process.env.DEEPSPACE_PORT;
-  if (!raw) return DEFAULT_PORT2;
+  if (!raw) return DEFAULT_PORT3;
   const n = Number(raw);
   if (!Number.isInteger(n) || n < 1 || n > 65535) {
     console.error(`Invalid port: ${raw}. Must be an integer between 1 and 65535.`);
@@ -522,7 +683,7 @@ function resolvePort2(arg) {
 }
 
 // src/cli/commands/test-accounts.ts
-import { defineCommand as defineCommand5 } from "citty";
+import { defineCommand as defineCommand6 } from "citty";
 import * as p2 from "@clack/prompts";
 import { readFileSync as readFileSync4, writeFileSync as writeFileSync4, existsSync as existsSync6, mkdirSync as mkdirSync3 } from "fs";
 import { join as join7 } from "path";
@@ -567,7 +728,7 @@ async function deleteRemote(id) {
     throw new Error(data.error ?? `DELETE returned ${res.status}`);
   }
 }
-var create = defineCommand5({
+var create = defineCommand6({
   meta: {
     name: "create",
     description: "Create a test account"
@@ -637,7 +798,7 @@ var create = defineCommand5({
 Saved to ${ACCOUNTS_PATH}`);
   }
 });
-var list = defineCommand5({
+var list = defineCommand6({
   meta: {
     name: "list",
     description: "List your test accounts"
@@ -672,7 +833,7 @@ var list = defineCommand5({
     }
   }
 });
-var del = defineCommand5({
+var del = defineCommand6({
   meta: {
     name: "delete",
     description: "Delete a test account by --email or --id"
@@ -729,7 +890,7 @@ var del = defineCommand5({
     console.log(`Test account deleted${targetEmail ? `: ${targetEmail}` : `: ${targetId}`}`);
   }
 });
-var clear = defineCommand5({
+var clear = defineCommand6({
   meta: {
     name: "clear",
     description: "Delete all your test accounts (or those matching --label)"
@@ -795,7 +956,7 @@ Failed:`);
     }
   }
 });
-var test_accounts_default = defineCommand5({
+var test_accounts_default = defineCommand6({
   meta: {
     name: "test-accounts",
     description: "Manage test accounts for development"
@@ -809,14 +970,14 @@ var test_accounts_default = defineCommand5({
 });
 
 // src/cli/commands/deploy.ts
-import { defineCommand as defineCommand6 } from "citty";
+import { defineCommand as defineCommand7 } from "citty";
 import { execSync as execSync2 } from "child_process";
 import { readFileSync as readFileSync5, readdirSync, existsSync as existsSync7 } from "fs";
 import { parse as parseToml2 } from "smol-toml";
 import { join as join8, resolve as resolve3, dirname } from "path";
 import * as p3 from "@clack/prompts";
 var DEPLOY_URL = process.env.DEEPSPACE_DEPLOY_URL ?? ENVS.prod.deploy;
-var deploy_default = defineCommand6({
+var deploy_default = defineCommand7({
   meta: {
     name: "deploy",
     description: "Build and deploy your DeepSpace app"
@@ -944,13 +1105,13 @@ function collectAssets(dir) {
 }
 
 // src/cli/commands/undeploy.ts
-import { defineCommand as defineCommand7 } from "citty";
+import { defineCommand as defineCommand8 } from "citty";
 import { readFileSync as readFileSync6, existsSync as existsSync8 } from "fs";
 import { join as join9 } from "path";
 import { parse as parseToml3 } from "smol-toml";
 import * as p4 from "@clack/prompts";
 var DEPLOY_URL2 = process.env.DEEPSPACE_DEPLOY_URL ?? ENVS.prod.deploy;
-var undeploy_default = defineCommand7({
+var undeploy_default = defineCommand8({
   meta: {
     name: "undeploy",
     description: "Remove a deployed DeepSpace app"
@@ -1001,8 +1162,8 @@ var undeploy_default = defineCommand7({
 });
 
 // src/cli/commands/whoami.ts
-import { defineCommand as defineCommand8 } from "citty";
-var whoami_default = defineCommand8({
+import { defineCommand as defineCommand9 } from "citty";
+var whoami_default = defineCommand9({
   meta: {
     name: "whoami",
     description: "Show the currently logged-in user"
@@ -1056,7 +1217,7 @@ var whoami_default = defineCommand8({
 });
 
 // src/cli/commands/add.ts
-import { defineCommand as defineCommand9 } from "citty";
+import { defineCommand as defineCommand10 } from "citty";
 import { existsSync as existsSync9 } from "fs";
 import { resolve as resolve4, join as join10 } from "path";
 import { execSync as execSync3 } from "child_process";
@@ -1065,7 +1226,7 @@ function findScript(from) {
   if (existsSync9(candidate)) return candidate;
   return null;
 }
-var add_default = defineCommand9({
+var add_default = defineCommand10({
   meta: {
     name: "add",
     description: "Add a feature to your DeepSpace app"
@@ -1119,7 +1280,7 @@ var add_default = defineCommand9({
 });
 
 // src/cli/commands/domain.ts
-import { defineCommand as defineCommand10 } from "citty";
+import { defineCommand as defineCommand11 } from "citty";
 import { execSync as execSync4 } from "child_process";
 
 // src/cli/lib/app-context.ts
@@ -1188,7 +1349,7 @@ async function confirm2(message) {
     });
   });
 }
-var search = defineCommand10({
+var search = defineCommand11({
   meta: { name: "search", description: "Search for available domains" },
   args: {
     query: { type: "positional", description: "Domain or keyword", required: true },
@@ -1218,7 +1379,7 @@ var search = defineCommand10({
     }
   }
 });
-var buy = defineCommand10({
+var buy = defineCommand11({
   meta: { name: "buy", description: "Buy a domain and attach it to an app" },
   args: {
     domain: { type: "positional", description: "Domain to buy", required: true },
@@ -1307,7 +1468,7 @@ var buy = defineCommand10({
     process.exit(1);
   }
 });
-var list2 = defineCommand10({
+var list2 = defineCommand11({
   meta: { name: "list", description: "List your domains" },
   args: {
     json: { type: "boolean", description: "Emit JSON" }
@@ -1331,7 +1492,7 @@ var list2 = defineCommand10({
     }
   }
 });
-var status = defineCommand10({
+var status = defineCommand11({
   meta: { name: "status", description: "Show details for one domain" },
   args: {
     domain: { type: "positional", description: "Domain", required: true },
@@ -1359,7 +1520,7 @@ var status = defineCommand10({
     console.log(`Charged:       ${fmtCents(found.chargedCents)}/yr`);
   }
 });
-var attach = defineCommand10({
+var attach = defineCommand11({
   meta: { name: "attach", description: "Re-point a domain at a different app" },
   args: {
     domain: { type: "positional", description: "Domain to re-point", required: true },
@@ -1390,7 +1551,7 @@ var attach = defineCommand10({
     console.log(`\u2713 ${args.domain} now points at ${targetApp}`);
   }
 });
-var detach = defineCommand10({
+var detach = defineCommand11({
   meta: {
     name: "detach",
     description: "Stop routing the domain (keeps the registration; auto-renew unchanged)"
@@ -1420,7 +1581,7 @@ var detach = defineCommand10({
     console.log(`\u2713 ${args.domain} detached. Use \`deepspace domain attach\` to re-route, or \`renew --auto off\` to stop auto-renewal.`);
   }
 });
-var renew = defineCommand10({
+var renew = defineCommand11({
   meta: { name: "renew", description: "Toggle auto-renewal at the registrar" },
   args: {
     domain: { type: "positional", description: "Domain", required: true },
@@ -1454,13 +1615,13 @@ function openBrowser2(url) {
   } catch {
   }
 }
-var domain_default = defineCommand10({
+var domain_default = defineCommand11({
   meta: { name: "domain", description: "Buy and manage custom domains" },
   subCommands: { search, buy, list: list2, status, attach, detach, renew }
 });
 
 // src/cli/commands/integrations.ts
-import { defineCommand as defineCommand11 } from "citty";
+import { defineCommand as defineCommand12 } from "citty";
 
 // src/cli/commands/_invoke-impl.ts
 import { readFileSync as readFileSync8 } from "fs";
@@ -1634,7 +1795,7 @@ async function runInvoke(args) {
 }
 
 // src/cli/commands/integrations.ts
-var list3 = defineCommand11({
+var list3 = defineCommand12({
   meta: {
     name: "list",
     description: "List all available integrations"
@@ -1655,7 +1816,7 @@ var list3 = defineCommand11({
     }
   }
 });
-var info = defineCommand11({
+var info = defineCommand12({
   meta: {
     name: "info",
     description: "Print schema + example body for an integration endpoint"
@@ -1681,7 +1842,7 @@ var info = defineCommand11({
     }
   }
 });
-var invoke = defineCommand11({
+var invoke = defineCommand12({
   meta: {
     name: "invoke",
     description: "Invoke a platform integration as the logged-in user"
@@ -1734,7 +1895,7 @@ var invoke = defineCommand11({
     }
   }
 });
-var integrations_default = defineCommand11({
+var integrations_default = defineCommand12({
   meta: {
     name: "integrations",
     description: "List, inspect, and invoke platform integrations"
@@ -1747,8 +1908,8 @@ var integrations_default = defineCommand11({
 });
 
 // src/cli/commands/invoke.ts
-import { defineCommand as defineCommand12 } from "citty";
-var invoke_default = defineCommand12({
+import { defineCommand as defineCommand13 } from "citty";
+var invoke_default = defineCommand13({
   meta: {
     name: "invoke",
     description: "Invoke a platform integration as the logged-in user"
@@ -1826,7 +1987,7 @@ var pkg = JSON.parse(readFileSync9(join12(__dirname, "..", "package.json"), "utf
 if (process.platform === "linux" && !process.env.SSL_CERT_FILE && existsSync11("/etc/ssl/certs/ca-certificates.crt")) {
   process.env.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
 }
-var create2 = defineCommand13({
+var create2 = defineCommand14({
   meta: {
     name: "create",
     description: "Create a new DeepSpace app"
@@ -1845,7 +2006,7 @@ var create2 = defineCommand13({
     execSync5(`npm create deepspace@latest${name}`, { stdio: "inherit" });
   }
 });
-var main = defineCommand13({
+var main = defineCommand14({
   meta: {
     name: "deepspace",
     version: pkg.version,
@@ -1857,6 +2018,7 @@ var main = defineCommand13({
     logout: logout_default,
     whoami: whoami_default,
     dev: dev_default,
+    kill: kill_default,
     test: test_default,
     "test-accounts": test_accounts_default,
     add: add_default,