@threadbase-sh/streamer 1.31.2 → 1.31.3

package/dist/cli.cjs

@@ -147757,7 +147757,81 @@ async function stopService(opts = {}) {
   const { stdout: stdout2, stderr } = await execFileP("schtasks.exe", ["/End", "/TN", label]).catch(
     (err) => ({ stdout: "", stderr: String(err) })
   );
-  return { method: "schtasks-end", stdout: stdout2, stderr };
+  const listenerResult = await stopWindowsListener(opts.port ?? 8766);
+  return {
+    method: "schtasks-end",
+    stdout: `${stdout2}
+${listenerResult.stdout}`,
+    stderr: `${stderr}
+${listenerResult.stderr}`
+  };
+}
+async function stopWindowsListener(port) {
+  let netstat;
+  try {
+    netstat = await execFileP("netstat.exe", ["-ano", "-p", "tcp"]);
+  } catch (err) {
+    return { stdout: "", stderr: `Could not inspect port ${port}: ${String(err)}` };
+  }
+  const pids = /* @__PURE__ */ new Set();
+  for (const line of netstat.stdout.split(/\r?\n/)) {
+    const columns = line.trim().split(/\s+/);
+    if (columns.length < 5 || columns[0]?.toUpperCase() !== "TCP") continue;
+    const [localAddress, state, pid] = [columns[1], columns[3], columns[4]];
+    if (state?.toUpperCase() !== "LISTENING" || !pid || pid === "0") continue;
+    if (localAddress?.endsWith(`:${port}`)) pids.add(pid);
+  }
+  const output = [];
+  const errors = [];
+  for (const pid of pids) {
+    try {
+      const result = await execFileP("taskkill.exe", ["/PID", pid, "/T", "/F"]);
+      output.push(result.stdout);
+      if (result.stderr) errors.push(result.stderr);
+    } catch (err) {
+      errors.push(`Could not stop PID ${pid} on port ${port}: ${String(err)}`);
+    }
+  }
+  return { stdout: output.join("\n"), stderr: errors.join("\n") };
+}
+
+// src/updater/restart-health.ts
+function isExpectedVersion(actual, expected) {
+  return actual === expected || actual.startsWith(`${expected}+`);
+}
+async function waitForRestartHealth(opts) {
+  const timeoutMs = opts.timeoutMs ?? 15e3;
+  const pollIntervalMs = opts.pollIntervalMs ?? 250;
+  const deadline = Date.now() + timeoutMs;
+  let lastFailure = "server did not respond";
+  while (Date.now() <= deadline) {
+    const controller = new AbortController();
+    const requestTimer = setTimeout(() => controller.abort(), Math.min(2e3, timeoutMs));
+    try {
+      const response = await fetch(`http://127.0.0.1:${opts.port}/healthz`, {
+        signal: controller.signal
+      });
+      if (response.ok) {
+        const body = await response.json();
+        if (body.ok === true && typeof body.version === "string") {
+          if (isExpectedVersion(body.version, opts.expectedVersion)) return;
+          lastFailure = `running version is ${body.version}, expected ${opts.expectedVersion}`;
+        } else {
+          lastFailure = "health response is missing ok/version";
+        }
+      } else {
+        lastFailure = `health endpoint returned ${response.status}`;
+      }
+    } catch (err) {
+      lastFailure = err instanceof Error ? err.message : String(err);
+    } finally {
+      clearTimeout(requestTimer);
+    }
+    const remaining = deadline - Date.now();
+    if (remaining <= 0) break;
+    await new Promise((resolve6) => setTimeout(resolve6, Math.min(pollIntervalMs, remaining)));
+  }
+  throw new Error(`restart verification failed: ${lastFailure}`);
 }
 
 // src/updater/stamp-version.ts
@@ -150899,7 +150973,7 @@ async function runInstall(opts) {
   await unpackTarball({ tarballPath, destDir });
   stampVersionTxt(destDir, targetVersion);
   if (process.platform === "win32") {
-    await stopService().catch(() => {
+    await stopService({ port: opts.runningServer?.port }).catch(() => {
     });
   }
   swapCurrent(targetVersion);
@@ -150908,6 +150982,12 @@ async function runInstall(opts) {
   try {
     const r = await restartService();
     restartMethod = r.method;
+    if (opts.runningServer && r.method !== "none") {
+      await waitForRestartHealth({
+        port: opts.runningServer.port,
+        expectedVersion: targetVersion
+      });
+    }
   } catch (err) {
     restartMethod = `failed: ${err instanceof Error ? err.message : String(err)}`;
   }
@@ -150918,8 +150998,9 @@ async function runInstall(opts) {
     pruned,
     restart: { method: restartMethod }
   };
+  const outcome = restartMethod.startsWith("failed:") ? "failed" : "installed";
   appendUpdateLog(
-    `[installed] ${installed.previous} \u2192 ${installed.installed} restart=${installed.restart.method}${pruned.length > 0 ? ` pruned=${pruned.length}` : ""}`
+    `[${outcome}] ${installed.previous} \u2192 ${installed.installed} restart=${installed.restart.method}${pruned.length > 0 ? ` pruned=${pruned.length}` : ""}`
   );
   return installed;
 }
@@ -151378,11 +151459,20 @@ program2.command("update").description("Check for streamer updates from GitHub R
         );
         break;
       case "installed":
-        log7.info(
-          `Installed ${result.installed} (was ${result.previous}). Restart: ${result.restart.method}.`,
-          void 0,
-          "console"
-        );
+        if (result.restart.method.startsWith("failed:")) {
+          log7.error(
+            `Installed ${result.installed} on disk, but the running service was not updated. Restart: ${result.restart.method}.`,
+            void 0,
+            "console"
+          );
+          process.exitCode = 1;
+        } else {
+          log7.info(
+            `Installed ${result.installed} (was ${result.previous}). Restart: ${result.restart.method}.`,
+            void 0,
+            "console"
+          );
+        }
         if (result.pruned.length > 0) {
           log7.info(`Pruned old releases: ${result.pruned.join(", ")}`, void 0, "console");
         }