@dylanpiercey/work 0.0.11 → 0.0.13

package/bin/work.mjs

@@ -208,7 +208,114 @@ function serviceEnv() {
   return env;
 }
 
+/** True when `cmd` is a work *server* (not `work setup` / `work update`). */
+function isWorkServerCmd(cmd) {
+  if (/\bwork(\.mjs)?\s+(setup|update|version)\b/.test(cmd)) return false;
+  return (
+    /\bwork\.mjs\s+start\b/.test(cmd) ||
+    /\bwork\s+start\b/.test(cmd) ||
+    /run-prod\.sh/.test(cmd) ||
+    /work server is running/.test(cmd) ||
+    (/@dylanpiercey\/work\//.test(cmd) && !/\bnpm\b/.test(cmd)) ||
+    /\/work\/\S*\/dist\/index\.mjs/.test(cmd)
+  );
+}
+
+function pidsListening(port) {
+  const lsof = spawnSync(
+    "lsof",
+    ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"],
+    { encoding: "utf8" },
+  );
+  if (lsof.stdout) {
+    return [
+      ...new Set(
+        lsof.stdout
+          .trim()
+          .split(/\s+/)
+          .map(Number)
+          .filter((n) => n > 1 && n !== process.pid),
+      ),
+    ];
+  }
+  const ss = spawnSync("ss", ["-ltnp", `sport = :${port}`], { encoding: "utf8" });
+  const pids = [];
+  for (const m of (ss.stdout || "").matchAll(/pid=(\d+)/g)) {
+    const pid = Number(m[1]);
+    if (pid > 1 && pid !== process.pid) pids.push(pid);
+  }
+  return [...new Set(pids)];
+}
+
+function workServerPids() {
+  const out = spawnSync("ps", ["-ax", "-o", "pid=,command="], {
+    encoding: "utf8",
+  });
+  const pids = [];
+  for (const line of (out.stdout || "").split("\n")) {
+    const m = line.trim().match(/^(\d+)\s+(.*)$/);
+    if (!m) continue;
+    const pid = Number(m[1]);
+    if (pid === process.pid || pid === process.ppid) continue;
+    if (isWorkServerCmd(m[2])) pids.push(pid);
+  }
+  return pids;
+}
+
+function killPids(pids, signal) {
+  for (const pid of pids) {
+    try {
+      process.kill(pid, signal);
+    } catch {}
+  }
+}
+
+/** Stop the managed service *and* any leftover checkout / `work start`
+ * process still bound to the port. A pre-npm install often wasn't the
+ * current unit (or was a bare node), so restarting work.service left it
+ * sitting in front of the new one. */
+function stopOldCopies(port) {
+  log("stopping any previous work server");
+  if (process.platform === "darwin") {
+    const uid = process.getuid();
+    spawnSync("launchctl", ["bootout", `gui/${uid}/dev.work.app`], {
+      stdio: "ignore",
+    });
+    const agents = path.join(os.homedir(), "Library/LaunchAgents");
+    try {
+      for (const name of fs.readdirSync(agents)) {
+        if (!name.endsWith(".plist")) continue;
+        const file = path.join(agents, name);
+        const text = fs.readFileSync(file, "utf8");
+        if (!/dev\.work\.app|work\.mjs|run-prod\.sh|@dylanpiercey\/work/.test(text))
+          continue;
+        const label = text.match(
+          /<key>Label<\/key>\s*<string>([^<]+)<\/string>/,
+        )?.[1];
+        if (label) {
+          spawnSync("launchctl", ["bootout", `gui/${uid}/${label}`], {
+            stdio: "ignore",
+          });
+        }
+      }
+    } catch {}
+  } else if (have("systemctl")) {
+    spawnSync("systemctl", ["--user", "stop", "work.service"], {
+      stdio: "ignore",
+    });
+  }
+  const seen = new Set([...pidsListening(port), ...workServerPids()]);
+  if (seen.size) {
+    log(`stopping ${seen.size} leftover work process(es)`);
+    killPids(seen, "SIGTERM");
+    spawnSync("sleep", ["0.4"], { stdio: "ignore" });
+  }
+  killPids(pidsListening(port), "SIGKILL");
+}
+
 function installService() {
+  const port = serviceEnv().PORT;
+  stopOldCopies(port);
   const cliPath = fileURLToPath(import.meta.url);
   if (process.platform === "darwin") {
     const plist = serviceFile();

package/dist/index.mjs

@@ -6660,8 +6660,8 @@ var term_default = _template("o", (input) => {
 		af: startHold,
 		ag: stopHold,
 		ah: uploadAsset,
-		ak: handlePasted,
-		al: pasteClipboard,
+		aj: handlePasted,
+		ak: pasteClipboard,
 		ar: $si__input_sessionId && $input_sessionId__closures,
 		as: $si__input_onRenameSession && $input_onRenameSession__closures,
 		at: $si__input_onCloseSession && $input_onCloseSession__closures,
@@ -21697,4 +21697,4 @@ server.listen(port, () => {
 //#endregion
 export {};
 
-;var __MARKO_MANIFEST__={"esfPH6H":{"block":[2,"stylesheet#/assets/index-CExZozP4.css",6,"<link",0," rel=\"stylesheet\" crossorigin href=\"",1,"assets/index-CExZozP4.css\"",">"],"defer":[2,"/assets/index-DW02FbhG.js",6,"<script",0," async type=\"module\" crossorigin src=\"",1,"assets/index-DW02FbhG.js\"","></script>"]}};
+;var __MARKO_MANIFEST__={"esfPH6H":{"block":[2,"stylesheet#/assets/index-CExZozP4.css",6,"<link",0," rel=\"stylesheet\" crossorigin href=\"",1,"assets/index-CExZozP4.css\"",">"],"defer":[2,"/assets/index-DMpI1yWM.js",6,"<script",0," async type=\"module\" crossorigin src=\"",1,"assets/index-DMpI1yWM.js\"","></script>"]}};