@xiaohhhh1/canvas-agent 0.4.8 → 0.4.9

package/dist/server/supervisor.d.ts

@@ -1,4 +1,5 @@
 export declare const AGENT_REPLACED_EXIT_CODE = 75;
 export declare function shouldRestartAgent(code: number | null, stopping: boolean): boolean;
+export declare function shouldReplaceSupervisorLock(ownerPid: number, ageMs: number, ownerAlive: boolean): boolean;
 /** Keep the local HTTP worker alive, but step aside when a newer package replaces it. */
 export declare function startHttpSupervisor(): void;

package/dist/server/supervisor.js

@@ -1,17 +1,112 @@
 import { spawn } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import { CONFIG_DIR } from "../config.js";
 export const AGENT_REPLACED_EXIT_CODE = 75;
 const RESTART_DELAY_MS = 1000;
+const SUPERVISOR_LOCK_FILE = path.join(CONFIG_DIR, "canvas-agent-watch.lock");
+const SUPERVISOR_HEARTBEAT_MS = 5000;
+const SUPERVISOR_LOCK_STALE_MS = 15000;
+const SUPERVISOR_TAKEOVER_WAIT_MS = 6000;
+const SUPERVISOR_TAKEOVER_RETRY_MS = 100;
 export function shouldRestartAgent(code, stopping) {
     return !stopping && code !== AGENT_REPLACED_EXIT_CODE;
 }
+export function shouldReplaceSupervisorLock(ownerPid, ageMs, ownerAlive) {
+    return !Number.isInteger(ownerPid) || ownerPid <= 0 || !ownerAlive || ageMs > SUPERVISOR_LOCK_STALE_MS;
+}
+function processIsAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function sleepSync(delayMs) {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, delayMs);
+}
+function acquireSupervisorLock() {
+    fs.mkdirSync(CONFIG_DIR, { recursive: true });
+    const deadline = Date.now() + SUPERVISOR_TAKEOVER_WAIT_MS;
+    while (Date.now() <= deadline) {
+        let descriptor;
+        try {
+            descriptor = fs.openSync(SUPERVISOR_LOCK_FILE, "wx");
+            fs.writeFileSync(descriptor, String(process.pid));
+            return descriptor;
+        }
+        catch (error) {
+            if (descriptor !== undefined) {
+                try {
+                    fs.closeSync(descriptor);
+                }
+                catch { }
+                try {
+                    fs.unlinkSync(SUPERVISOR_LOCK_FILE);
+                }
+                catch { }
+            }
+            if (error.code !== "EEXIST")
+                throw error;
+            try {
+                const ownerPid = Number(fs.readFileSync(SUPERVISOR_LOCK_FILE, "utf8").trim());
+                const ageMs = Date.now() - fs.statSync(SUPERVISOR_LOCK_FILE).mtimeMs;
+                if (shouldReplaceSupervisorLock(ownerPid, ageMs, processIsAlive(ownerPid))) {
+                    fs.unlinkSync(SUPERVISOR_LOCK_FILE);
+                    continue;
+                }
+            }
+            catch (readError) {
+                if (readError.code !== "ENOENT") {
+                    try {
+                        fs.unlinkSync(SUPERVISOR_LOCK_FILE);
+                    }
+                    catch { }
+                }
+                continue;
+            }
+            sleepSync(SUPERVISOR_TAKEOVER_RETRY_MS);
+        }
+    }
+    return undefined;
+}
+function releaseSupervisorLock(descriptor) {
+    try {
+        fs.closeSync(descriptor);
+    }
+    catch { }
+    try {
+        if (fs.readFileSync(SUPERVISOR_LOCK_FILE, "utf8").trim() === String(process.pid)) {
+            fs.unlinkSync(SUPERVISOR_LOCK_FILE);
+        }
+    }
+    catch { }
+}
 /** Keep the local HTTP worker alive, but step aside when a newer package replaces it. */
 export function startHttpSupervisor() {
     const entry = process.argv[1];
     if (!entry)
         throw new Error("无法定位 Canvas Agent 启动文件");
+    const lockDescriptor = acquireSupervisorLock();
+    if (lockDescriptor === undefined)
+        return;
     let child;
     let stopping = false;
     let restartTimer;
+    const lockHeartbeat = setInterval(() => {
+        try {
+            fs.utimesSync(SUPERVISOR_LOCK_FILE, new Date(), new Date());
+        }
+        catch { }
+    }, SUPERVISOR_HEARTBEAT_MS);
+    lockHeartbeat.unref();
+    const exit = () => {
+        clearInterval(lockHeartbeat);
+        releaseSupervisorLock(lockDescriptor);
+        process.exit(0);
+    };
     const launch = () => {
         if (stopping)
             return;
@@ -19,7 +114,7 @@ export function startHttpSupervisor() {
         child.once("exit", (code) => {
             child = undefined;
             if (!shouldRestartAgent(code, stopping))
-                return void process.exit(0);
+                return exit();
             restartTimer = setTimeout(launch, RESTART_DELAY_MS);
         });
     };
@@ -30,7 +125,7 @@ export function startHttpSupervisor() {
         if (restartTimer)
             clearTimeout(restartTimer);
         child?.kill();
-        setTimeout(() => process.exit(0), 2000).unref();
+        setTimeout(exit, 2000).unref();
     };
     process.once("SIGINT", stop);
     process.once("SIGTERM", stop);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaohhhh1/canvas-agent",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",