adhdev 0.9.13 → 0.9.14

package/dist/cli/index.js

@@ -38719,10 +38719,14 @@ var init_router = __esm({
                 currentInstalled = parsed?.dependencies?.[pkgName]?.version || null;
               } catch {
               }
-              if (currentInstalled === latest) {
+              const runningVersion = typeof this.deps.statusVersion === "string" ? this.deps.statusVersion.trim().replace(/^v/, "") : null;
+              if (currentInstalled === latest && runningVersion === latest) {
                 LOG.info("Upgrade", `Already on latest version v${latest}; skipping install`);
                 return { success: true, upgraded: false, alreadyLatest: true, version: latest };
               }
+              if (currentInstalled === latest && runningVersion && runningVersion !== latest) {
+                LOG.info("Upgrade", `Installed package is v${latest}, but running daemon is v${runningVersion}; scheduling restart`);
+              }
               spawnDetachedDaemonUpgradeHelper({
                 packageName: pkgName,
                 targetVersion: latest,
@@ -87136,21 +87140,65 @@ function isAdhdevProcess(pid) {
     return true;
   }
 }
-function getDaemonPid(ref = {}) {
-  const pidFile = getDaemonPidFile(ref);
+function getDaemonHealthPid(ref = {}) {
+  const port = resolveDaemonPort(ref);
   try {
-    if (!fs23.existsSync(pidFile)) return null;
-    const pid = parseInt(fs23.readFileSync(pidFile, "utf-8").trim(), 10);
+    const { execFileSync: execFileSync5 } = require("child_process");
+    const probe = `
+            const http = require('http');
+            const req = http.get('http://127.0.0.1:${port}/health', { timeout: 1500 }, (res) => {
+                let body = '';
+                res.setEncoding('utf8');
+                res.on('data', (chunk) => { body += chunk; });
+                res.on('end', () => {
+                    if (res.statusCode !== 200) return;
+                    try {
+                        const json = JSON.parse(body || '{}');
+                        if (Number.isFinite(json.pid)) process.stdout.write(String(json.pid));
+                    } catch {}
+                });
+            });
+            req.on('error', () => {});
+            req.on('timeout', () => { req.destroy(); });
+        `;
+    const result = execFileSync5(process.execPath, ["-e", probe], {
+      encoding: "utf-8",
+      timeout: 3e3,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).trim();
+    const pid = parseInt(result, 10);
     return Number.isFinite(pid) ? pid : null;
   } catch {
     return null;
   }
 }
+function getDaemonPid(ref = {}) {
+  const pidFile = getDaemonPidFile(ref);
+  try {
+    if (fs23.existsSync(pidFile)) {
+      const pid = parseInt(fs23.readFileSync(pidFile, "utf-8").trim(), 10);
+      if (Number.isFinite(pid)) return pid;
+    }
+  } catch {
+  }
+  return getDaemonHealthPid(ref);
+}
 function stopDaemon(ref = {}) {
   const pidFile = getDaemonPidFile(ref);
+  let pid = null;
+  try {
+    if (fs23.existsSync(pidFile)) {
+      const pidFromFile = parseInt(fs23.readFileSync(pidFile, "utf-8").trim(), 10);
+      if (Number.isFinite(pidFromFile)) pid = pidFromFile;
+    }
+  } catch {
+    removeDaemonPid(ref);
+  }
+  if (pid === null) {
+    pid = getDaemonHealthPid(ref);
+  }
+  if (pid === null) return false;
   try {
-    if (!fs23.existsSync(pidFile)) return false;
-    const pid = parseInt(fs23.readFileSync(pidFile, "utf-8").trim());
     process.kill(pid, "SIGTERM");
     removeDaemonPid(ref);
     return true;
@@ -87180,7 +87228,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.13" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.14" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;