obsbot-mcp 0.6.3 → 0.8.0

package/dist/ipc/client.js

@@ -1,11 +1,16 @@
 import net from "node:net";
-import { encodeFrame, FrameDecoder } from "./protocol.js";
+import { isBuildId } from "./build-id.js";
+import { encodeFrame, FrameDecoder, NOTICE_ID, isSteppingDown } from "./protocol.js";
+class ReplyTimeout extends Error {
+}
 export class OwnerClient {
     socket;
-    nextId = 1;
+    nextId = NOTICE_ID + 1;
     pending = new Map();
     dec = new FrameDecoder();
+    closeListeners = [];
     closedErr;
+    gotNotice = false;
     constructor(socket) {
         this.socket = socket;
         this.socket.on("data", (chunk) => this.onData(chunk));
@@ -34,19 +39,109 @@ export class OwnerClient {
             return reply.result;
         throw new Error(reply.error);
     }
+    /**
+     * Exchange identities with the owner.
+     *
+     * Anything other than a well-formed hello back means the owner cannot take
+     * part in a handover: an error reply (a legacy owner rejecting what it takes
+     * for a tool call), a reply that is not a hello, or no reply in `timeoutMs`.
+     * Throws only if the connection itself closes first.
+     */
+    async hello(build, pid, timeoutMs) {
+        let reply;
+        try {
+            reply = await this.send({ ipc: "hello", build, pid }, timeoutMs);
+        }
+        catch (e) {
+            if (e instanceof ReplyTimeout)
+                return { kind: "legacy" };
+            throw e;
+        }
+        if (!reply.ok)
+            return { kind: "legacy" };
+        const r = reply.result;
+        if (typeof r === "object" &&
+            r !== null &&
+            r.ipc === "hello" &&
+            isBuildId(r.build) &&
+            typeof r.pid === "number" &&
+            Number.isInteger(r.pid) &&
+            r.pid > 0) {
+            return { kind: "peer", build: r.build, pid: r.pid };
+        }
+        return { kind: "legacy" };
+    }
+    /**
+     * Ask the owner for the endpoint. True if it agreed to step down.
+     *
+     * No answer in `timeoutMs` is a no: an owner that stalls between the hello
+     * and the takeover must not leave the asker waiting for ever. Throws only if
+     * the connection itself closes first.
+     */
+    async takeover(build, pid, timeoutMs) {
+        let reply;
+        try {
+            reply = await this.send({ ipc: "takeover", build, pid }, timeoutMs);
+        }
+        catch (e) {
+            if (e instanceof ReplyTimeout)
+                return false;
+            throw e;
+        }
+        if (!reply.ok)
+            return false;
+        const r = reply.result;
+        return typeof r === "object" && r !== null && r.ipc === "takeover" && r.granted === true;
+    }
     get closed() {
         return this.closedErr !== undefined;
     }
+    /** True once the owner has said it is stepping down for a newer build. */
+    get noticed() {
+        return this.gotNotice;
+    }
+    /** Call `fn` once, when the connection closes for any reason. */
+    onClose(fn) {
+        if (this.closedErr)
+            queueMicrotask(fn);
+        else
+            this.closeListeners.push(fn);
+    }
+    /** Resolve true when the connection closes, or false if it is still open after `timeoutMs`. */
+    waitClosed(timeoutMs) {
+        if (this.closedErr)
+            return Promise.resolve(true);
+        return new Promise((resolve) => {
+            const timer = setTimeout(() => resolve(false), timeoutMs);
+            this.closeListeners.push(() => {
+                clearTimeout(timer);
+                resolve(true);
+            });
+        });
+    }
     close() {
         this.socket.destroy();
         this.failAll(new Error("owner connection closed by client"));
     }
-    send(body) {
+    send(body, timeoutMs) {
         if (this.closedErr)
             return Promise.reject(this.closedErr);
         const id = this.nextId++;
         return new Promise((resolve, reject) => {
-            this.pending.set(id, { resolve, reject });
+            let timer;
+            const settle = (fn) => (v) => {
+                if (timer)
+                    clearTimeout(timer);
+                fn(v);
+            };
+            this.pending.set(id, { resolve: settle(resolve), reject: settle(reject) });
+            if (timeoutMs !== undefined) {
+                timer = setTimeout(() => {
+                    // Forget the request: a reply that turns up later matches no waiter.
+                    this.pending.delete(id);
+                    reject(new ReplyTimeout(`no reply within ${timeoutMs} ms`));
+                }, timeoutMs);
+            }
             this.socket.write(encodeFrame({ id, body }));
         });
     }
@@ -61,6 +156,11 @@ export class OwnerClient {
             return;
         }
         for (const m of msgs) {
+            if (m.id === NOTICE_ID) {
+                if (isSteppingDown(m.body))
+                    this.gotNotice = true;
+                continue;
+            }
             const w = this.pending.get(m.id);
             if (w) {
                 this.pending.delete(m.id);
@@ -76,6 +176,8 @@ export class OwnerClient {
         for (const w of this.pending.values())
             w.reject(err);
         this.pending.clear();
+        for (const fn of this.closeListeners.splice(0))
+            fn();
     }
 }
 //# sourceMappingURL=client.js.map

package/dist/ipc/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/ipc/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/ipc/client.ts"],"names":[],"mappings":"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"}

package/dist/ipc/coordinator.d.ts

@@ -1,29 +1,108 @@
+import { type Role } from "./rendezvous.js";
+import { type BuildId } from "./build-id.js";
 export type RunLocal = (tool: string, args: Record<string, unknown>) => Promise<unknown>;
-/**
- * Wrap a tool runner so calls execute strictly one-at-a-time. This is THE
- * single-camera lock: it must guard both the owner's own MCP calls AND the
- * calls forwarded from clients, because the owner's local path does not pass
- * through OwnerServer's queue. Errors don't break the chain.
- */
-export declare function serialize(fn: RunLocal): RunLocal;
+export interface Timing {
+    /** How long a client waits for its hello to be answered. */
+    helloTimeoutMs: number;
+    /** How long everyone but the successor waits before re-electing after a step-down. */
+    stepDownGraceMs: number;
+    /** Upper bound of the random delay that spreads simultaneous re-elections. */
+    electionJitterMs: number;
+    /** Longest a successor waits for the owner's running call and release. */
+    stepDownTimeoutMs: number;
+    /** Longest a stepping-down owner waits for its own release. Must be under stepDownTimeoutMs. */
+    releaseTimeoutMs: number;
+    /** How many owners one election will take the endpoint from before settling. */
+    maxTakeoverRounds: number;
+}
+export declare const DEFAULT_TIMING: Timing;
+export interface CoordinatorOptions {
+    /** Rendezvous endpoint. Default: the one OBSBOT_IPC_NAME selects. */
+    path?: string;
+    /** What this process loaded. Default: an unstamped build. */
+    build?: BuildId;
+    /** Reported to peers in the hello. Default: process.pid. */
+    pid?: number;
+    /** Drop everything that holds the camera. Runs when this instance steps down. */
+    release?: () => Promise<void>;
+    /** Receives the `obsbot-mcp: ipc …` lines. Default: discard. */
+    log?: (line: string) => void;
+    timing?: Partial<Timing>;
+    /** The election primitive. Injectable so a test can decide who binds first. */
+    elect?: (path: string) => Promise<Role>;
+}
 type RoleName = "none" | "owner" | "client";
 export declare class Coordinator {
     private readonly runLocal;
-    private readonly path;
     private role;
     private client?;
     private ownerServer?;
-    private electing?;
-    /** `runLocal` should already be serialize()-wrapped by the caller. */
-    constructor(runLocal: RunLocal, path?: string);
+    private steppingDown;
+    /** Client of an owner that is older than us and could not be made to hand over. */
+    private blocked;
+    /** Counts the owners this instance has been a client of. Tells one connection from the next. */
+    private connection;
+    private closing;
+    /** A role change in progress — an election, or stepping down. Never rejects. */
+    private pending?;
+    /** THE single-camera lock: the owner's own calls and the ones forwarded to it. */
+    private readonly gate;
+    private readonly path;
+    private readonly build;
+    private readonly pid;
+    private readonly release;
+    private readonly log;
+    private readonly t;
+    private readonly elect;
+    constructor(runLocal: RunLocal, opts?: CoordinatorOptions);
     /** Establish the initial role eagerly at startup. */
     start(): Promise<void>;
     get roleName(): RoleName;
     dispatch(tool: string, args: Record<string, unknown>): Promise<unknown>;
-    private runByRole;
+    /**
+     * Wait until this instance has a role it may use, and say where a call goes:
+     * run here, or forward over this connection.
+     *
+     * The answer is taken in the same tick the decision is made and handed to the
+     * caller. Calls arrive in parallel, and one of them may be reconnecting while
+     * another resumes: a caller that re-read `this.client` after an await could
+     * find it gone, or pointing at an owner nobody has checked yet.
+     */
+    private settle;
     close(): Promise<void>;
     private reset;
+    private jitter;
+    /** Queue a role change behind any already under way. The result never rejects. */
+    private begin;
     private ensureRole;
+    /**
+     * Settle on a role: bind the endpoint, or connect to whoever holds it and
+     * compare builds. If ours is newer, ask for the endpoint and go round again.
+     */
     private doElect;
+    private becomeOwner;
+    private becomeClient;
+    /**
+     * The owner is older and still there. Try once more: a fresh connection,
+     * hello, takeover.
+     *
+     * Queued like any other role change, so calls that arrive together wait for
+     * it instead of finding the role half torn down. `seen` is the connection the
+     * caller was looking at: if that is no longer the current one, someone has
+     * asked again since, and asking a second time would tell us nothing new.
+     */
+    private tryAgain;
+    private blockedMessage;
+    /**
+     * The owner has gone. Re-elect — after the grace period if it stepped down
+     * for someone, so the successor binds first; after jitter alone if it simply
+     * went, so clients that all lost it at once do not stampede.
+     */
+    private ownerLost;
+    /** A client asks for the endpoint. Both sides run the same comparison, so this cannot disagree with it. */
+    private onTakeover;
+    private stepDown;
+    /** A release that throws or never settles must not stop the handover. */
+    private releaseBounded;
 }
 export {};