@gachlab/devup 0.9.2 → 0.10.0

package/CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to `@gachlab/devup` are documented here.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.9.3] — 2026-05-22
+
+Critical hotfix for `devup down` against the VS Code extension.
+
+### Fixed
+- **`devup down` no longer gets SIGKILL'd because the control-plane socket hangs on streaming clients.** The control-plane server's `close()` awaited every client to disconnect on its own, but long-lived streaming subscriptions (`status.follow`, `logs.follow` — exactly what the VS Code extension uses) never close until the daemon tells them to. Result: `devup down` waited the full 10 s grace, then SIGKILL'd the daemon. SIGKILL skips the cleanup handler → all spawned services orphaned to init, ports left busy, next `devup up -d` hits EADDRINUSE on every port. Fix: track every active client socket and `destroy()` them before awaiting `server.close()`. Clean shutdowns now complete in milliseconds even with the extension connected.
+- **Pre-boot port-conflict scan now covers web services too.** They were skipped on the assumption that dev servers handle retry themselves, but in daemon mode the user wants devup to own the configured ports — same as APIs. If a web port is held by a stray Vite/ng-serve from a previous run, the scan now flags it and offers to take it over.
+
+### Added
+- New unit test asserts `socket.close()` completes in under 2 s with an active `logs.follow` subscription.
+
 ## [0.9.2] — 2026-05-22
 
 Critical hotfix. **All 0.9.x users should upgrade immediately.**

package/dist/control-plane/socket-server.d.ts

@@ -9,6 +9,25 @@ import type { ProcessState } from '../process/types.js';
  *  to the socket file already has the same uid as the devup process — no
  *  additional auth needed. Strictly local; TCP exposure is intentionally
  *  out of scope. */
+export interface ServiceStatEntry {
+    cpu: number;
+    memMB: number;
+}
+export interface StatsResult {
+    services: Record<string, ServiceStatEntry>;
+    system: {
+        totalMemMB: number;
+        freeMemMB: number;
+        cpuCores: number;
+    };
+}
+export interface ProxyInfo {
+    active: boolean;
+    provider: string;
+    domain: string;
+    tls: boolean;
+    routes: Record<string, string>;
+}
 export interface RpcContext {
     /** State of every service (read-only snapshot). */
     states(): Map<string, ProcessState>;
@@ -23,6 +42,10 @@ export interface RpcContext {
     watchLogs(svcName: string | null, onLine: (svc: string, line: string) => void): () => void;
     /** Subscribe to service-state changes. Returns an unsubscribe function. */
     watchStatus(onUpdate: (name: string, state: ProcessState) => void): () => void;
+    /** Per-service CPU/mem stats + system totals. */
+    getStats(): Promise<StatsResult>;
+    /** Active proxy configuration, or null when no proxy is running. */
+    getProxyInfo(): ProxyInfo | null;
 }
 export interface SocketServerHandle {
     server: Server;

package/dist/control-plane/socket-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket-server.d.ts","sourceRoot":"","sources":["../../src/control-plane/socket-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,MAAM,EAAe,MAAM,UAAU,CAAC;AAMlE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD;;;;;;;;oBAQoB;AAEpB,MAAM,WAAW,UAAU;IACzB,mDAAmD;IACnD,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACpC,iCAAiC;IACjC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,8BAA8B;IAC9B,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,yFAAyF;IACzF,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D;2CACuC;IACvC,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IAC3F,2EAA2E;IAC3E,WAAW,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;CAChF;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAG7D;AAED,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,UAAU,EACf,IAAI,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CAAO,GAC1D,OAAO,CAAC,kBAAkB,CAAC,CAiC7B"}
+{"version":3,"file":"socket-server.d.ts","sourceRoot":"","sources":["../../src/control-plane/socket-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,MAAM,EAAe,MAAM,UAAU,CAAC;AAMlE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD;;;;;;;;oBAQoB;AAEpB,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC3C,MAAM,EAAE;QACN,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,mDAAmD;IACnD,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACpC,iCAAiC;IACjC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,8BAA8B;IAC9B,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,yFAAyF;IACzF,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D;2CACuC;IACvC,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IAC3F,2EAA2E;IAC3E,WAAW,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;IAC/E,iDAAiD;IACjD,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;IACjC,oEAAoE;IACpE,YAAY,IAAI,SAAS,GAAG,IAAI,CAAC;CAClC;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAG7D;AAED,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,UAAU,EACf,IAAI,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;CAAO,GAC1D,OAAO,CAAC,kBAAkB,CAAC,CA+C7B"}

package/dist/index.js

@@ -720,7 +720,12 @@ async function startSocketServer(projectName, ctx, opts = {}) {
     } catch {
     }
   }
-  const server = createServer((socket) => handleClient(socket, ctx));
+  const activeClients = /* @__PURE__ */ new Set();
+  const server = createServer((socket) => {
+    activeClients.add(socket);
+    socket.once("close", () => activeClients.delete(socket));
+    handleClient(socket, ctx);
+  });
   await new Promise((resolve4, reject) => {
     server.once("error", reject);
     server.listen(path, () => {
@@ -737,6 +742,8 @@ async function startSocketServer(projectName, ctx, opts = {}) {
     server,
     path,
     async close() {
+      for (const sock of activeClients) sock.destroy();
+      activeClients.clear();
       await new Promise((resolve4) => server.close(() => resolve4()));
       if (existsSync5(path)) {
         try {
@@ -840,8 +847,10 @@ async function dispatch(method, params, ctx) {
       for (const [name, st] of ctx.states()) {
         out.push(serializeState(name, st));
       }
-      return { services: out };
+      return { services: out, proxy: ctx.getProxyInfo() };
     }
+    case "stats":
+      return await ctx.getStats();
     case "restart": {
       const svc = stringOrThrow(params["svc"] ?? params["service"], "svc");
       await ctx.restart(svc);
@@ -944,7 +953,7 @@ function openStream(socketPath, method, params, onFrame, onError) {
 import { spawn as spawn4 } from "child_process";
 import { writeFileSync as writeFileSync2, readFileSync as readFileSync3, existsSync as existsSync10, unlinkSync as unlinkSync2, mkdirSync as mkdirSync3, createReadStream } from "fs";
 import { join as join8 } from "path";
-import { homedir as homedir3 } from "os";
+import { homedir as homedir3, totalmem, freemem, cpus } from "os";
 import { setTimeout as sleep } from "timers/promises";
 import { createInterface as createInterface3 } from "readline";
 
@@ -1867,6 +1876,7 @@ async function daemonBody(opts) {
   const logBus = new Broadcaster();
   const stateBus = new Broadcaster();
   const lazyProxies = /* @__PURE__ */ new Map();
+  const prevCpuMap = /* @__PURE__ */ new Map();
   let externals = [];
   let socket = null;
   let healthTimer = null;
@@ -1976,7 +1986,48 @@ async function daemonBody(opts) {
       watchLogs: (svcName, onLine) => logBus.subscribe(({ svc, text }) => {
         if (svcName === null || svc === svcName) onLine(svc, text);
       }),
-      watchStatus: (onUpdate) => stateBus.subscribe(({ name, state }) => onUpdate(name, state))
+      watchStatus: (onUpdate) => stateBus.subscribe(({ name, state }) => onUpdate(name, state)),
+      async getStats() {
+        const pids = [];
+        const pidToName = /* @__PURE__ */ new Map();
+        for (const [name, st] of mgr.state) {
+          if (st.pid) {
+            pids.push(st.pid);
+            pidToName.set(st.pid, name);
+          }
+        }
+        const raw = pids.length ? await platform.getProcessStats(pids) : /* @__PURE__ */ new Map();
+        const services2 = {};
+        for (const [name] of mgr.state) {
+          services2[name] = { cpu: 0, memMB: 0 };
+        }
+        for (const [pid, data] of raw) {
+          const name = pidToName.get(pid);
+          if (!name) continue;
+          const prev = prevCpuMap.get(name) ?? { time: Date.now(), cpu: 0 };
+          const cpu = calcCpuPercent(data.cpuSeconds, prev.cpu, prev.time);
+          prevCpuMap.set(name, { time: Date.now(), cpu: data.cpuSeconds });
+          services2[name] = { cpu: Math.round(cpu * 10) / 10, memMB: Math.round(data.rss / 1024 * 10) / 10 };
+        }
+        return {
+          services: services2,
+          system: {
+            totalMemMB: Math.round(totalmem() / 1024 / 1024),
+            freeMemMB: Math.round(freemem() / 1024 / 1024),
+            cpuCores: cpus().length
+          }
+        };
+      },
+      getProxyInfo() {
+        if (!proxyProvider || !proxyOpts || !cliArgs.proxy) return null;
+        return {
+          active: true,
+          provider: proxyProvider.name,
+          domain: proxyOpts.domain,
+          tls: proxyOpts.tls,
+          routes: proxyOpts.routes
+        };
+      }
     }, { onLog: (msg) => writeDevupLog(msg) });
     healthTimer = setInterval(() => {
       void mgr.checkAllHealth();
@@ -2583,9 +2634,8 @@ function parseLsof(stdout) {
   return null;
 }
 async function scanPortConflicts(services) {
-  const apis = services.filter((s) => s.type === "api");
   const conflicts = [];
-  for (const svc of apis) {
+  for (const svc of services) {
     const bindable = await isPortBindable(svc.port);
     if (bindable) continue;
     const holder = await findPortHolder(svc.port);
@@ -3096,8 +3146,10 @@ function useLogsPause(setPaused, logsPaused, logsScrollOffset) {
 import { useEffect as useEffect5, useRef as useRef3 } from "react";
 import { createInterface as createInterface5 } from "readline";
 import { createReadStream as createReadStream3, existsSync as existsSync15 } from "fs";
-function useControlPlane(manager, projectName, logSink, pushLog, logBus, stateBus) {
+import { totalmem as totalmem2, freemem as freemem2, cpus as cpus2 } from "os";
+function useControlPlane(manager, projectName, logSink, pushLog, logBus, stateBus, platform, proxy) {
   const handleRef = useRef3(null);
+  const prevCpuMap = useRef3(/* @__PURE__ */ new Map());
   useEffect5(() => {
     if (!manager) return;
     let handle = null;
@@ -3129,6 +3181,47 @@ function useControlPlane(manager, projectName, logSink, pushLog, logBus, stateBu
           },
           watchStatus: (onUpdate) => {
             return stateBus.subscribe(({ name, state }) => onUpdate(name, state));
+          },
+          async getStats() {
+            const pids = [];
+            const pidToName = /* @__PURE__ */ new Map();
+            for (const [name, st] of manager.state) {
+              if (st.pid) {
+                pids.push(st.pid);
+                pidToName.set(st.pid, name);
+              }
+            }
+            const raw = pids.length ? await platform.getProcessStats(pids) : /* @__PURE__ */ new Map();
+            const services = {};
+            for (const [name] of manager.state) {
+              services[name] = { cpu: 0, memMB: 0 };
+            }
+            for (const [pid, data] of raw) {
+              const name = pidToName.get(pid);
+              if (!name) continue;
+              const prev = prevCpuMap.current.get(name) ?? { time: Date.now(), cpu: 0 };
+              const cpu = calcCpuPercent(data.cpuSeconds, prev.cpu, prev.time);
+              prevCpuMap.current.set(name, { time: Date.now(), cpu: data.cpuSeconds });
+              services[name] = { cpu: Math.round(cpu * 10) / 10, memMB: Math.round(data.rss / 1024 * 10) / 10 };
+            }
+            return {
+              services,
+              system: {
+                totalMemMB: Math.round(totalmem2() / 1024 / 1024),
+                freeMemMB: Math.round(freemem2() / 1024 / 1024),
+                cpuCores: cpus2().length
+              }
+            };
+          },
+          getProxyInfo() {
+            if (!proxy) return null;
+            return {
+              active: true,
+              provider: proxy.provider.name,
+              domain: proxy.opts.domain,
+              tls: proxy.opts.tls,
+              routes: proxy.opts.routes
+            };
           }
         }, { onLog: (msg) => pushLog("devup", msg, 12) });
         handleRef.current = handle;
@@ -3140,7 +3233,7 @@ function useControlPlane(manager, projectName, logSink, pushLog, logBus, stateBu
       void handle?.close();
       handleRef.current = null;
     };
-  }, [manager, projectName, logSink, pushLog, logBus, stateBus]);
+  }, [manager, projectName, logSink, pushLog, logBus, stateBus, platform, proxy]);
   return handleRef;
 }
 
@@ -3283,7 +3376,7 @@ function StatsPanel({ states, stats, sortMode, maxNameLen, height, focused, scro
   const statsObj = Object.fromEntries([...stats].map(([k, v]) => [k, v]));
   const apis = sortServiceNames(names.filter((n) => states.get(n).svc.type === "api"), sortMode, statsObj, stObj);
   const webs = sortServiceNames(names.filter((n) => states.get(n).svc.type === "web"), sortMode, statsObj, stObj);
-  const cpus = os.cpus().length;
+  const cpus3 = os.cpus().length;
   const totalGB = (os.totalmem() / 1024 / 1024 / 1024).toFixed(1);
   const usedGB = (parseFloat(totalGB) - os.freemem() / 1024 / 1024 / 1024).toFixed(1);
   const load = os.loadavg()[0].toFixed(2);
@@ -3336,7 +3429,7 @@ function StatsPanel({ states, stats, sortMode, maxNameLen, height, focused, scro
       ] }),
       /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
         " System: ",
-        cpus,
+        cpus3,
         "c Load ",
         load,
         " RAM ",
@@ -3748,7 +3841,8 @@ function App({ config, services, cliArgs, platform, env, baseCwd, proxyProvider,
     onToggleProxy: () => {
     }
   });
-  const socketServer = useControlPlane(pm.manager, config.name, logSink, pm.pushLog, pm.logBus, pm.stateBus);
+  const proxyCtx = proxyProvider && proxyOpts ? { provider: proxyProvider, opts: proxyOpts } : null;
+  const socketServer = useControlPlane(pm.manager, config.name, logSink, pm.pushLog, pm.logBus, pm.stateBus, platform, proxyCtx);
   const shutdown = useCallback3(async () => {
     lazyProxies.current.forEach((p) => p.destroy());
     await socketServer.current?.close();