feat(discovery): bonjour beacons + bridge presence

src/infra/bridge/server.test.ts

@@ -126,4 +126,131 @@ describe("node bridge server", () => {
 
     await server.close();
   });
+
+  it("calls onPairRequested for newly created pending requests", async () => {
+    let requested: { nodeId?: string; requestId?: string } | null = null;
+    const server = await startNodeBridgeServer({
+      host: "127.0.0.1",
+      port: 0,
+      pairingBaseDir: baseDir,
+      onPairRequested: async (req) => {
+        requested = req;
+      },
+    });
+
+    const socket = net.connect({ host: "127.0.0.1", port: server.port });
+    sendLine(socket, { type: "pair-request", nodeId: "n3", platform: "ios" });
+
+    for (let i = 0; i < 40; i += 1) {
+      if (requested) break;
+      await new Promise((r) => setTimeout(r, 25));
+    }
+
+    expect(requested?.nodeId).toBe("n3");
+    expect(typeof requested?.requestId).toBe("string");
+
+    socket.destroy();
+    await server.close();
+  });
+
+  it("passes node metadata to onAuthenticated and onDisconnected", async () => {
+    let lastAuthed: {
+      nodeId?: string;
+      displayName?: string;
+      platform?: string;
+      version?: string;
+      remoteIp?: string;
+    } | null = null;
+
+    let disconnected: {
+      nodeId?: string;
+      displayName?: string;
+      platform?: string;
+      version?: string;
+      remoteIp?: string;
+    } | null = null;
+
+    let resolveDisconnected: (() => void) | null = null;
+    const disconnectedP = new Promise<void>((resolve) => {
+      resolveDisconnected = resolve;
+    });
+
+    const server = await startNodeBridgeServer({
+      host: "127.0.0.1",
+      port: 0,
+      pairingBaseDir: baseDir,
+      onAuthenticated: async (node) => {
+        lastAuthed = node;
+      },
+      onDisconnected: async (node) => {
+        disconnected = node;
+        resolveDisconnected?.();
+      },
+    });
+
+    const socket = net.connect({ host: "127.0.0.1", port: server.port });
+    const readLine = createLineReader(socket);
+    sendLine(socket, {
+      type: "pair-request",
+      nodeId: "n4",
+      displayName: "Iris",
+      platform: "ios",
+      version: "1.0",
+    });
+
+    // Approve the pending request from the gateway side.
+    let reqId: string | undefined;
+    for (let i = 0; i < 40; i += 1) {
+      const list = await listNodePairing(baseDir);
+      const req = list.pending.find((p) => p.nodeId === "n4");
+      if (req) {
+        reqId = req.requestId;
+        break;
+      }
+      await new Promise((r) => setTimeout(r, 25));
+    }
+    expect(reqId).toBeTruthy();
+    if (!reqId) throw new Error("expected a pending requestId");
+    const approved = await approveNodePairing(reqId, baseDir);
+    const token = approved?.node?.token ?? "";
+    expect(token.length).toBeGreaterThan(0);
+
+    const line1 = JSON.parse(await readLine()) as { type: string };
+    expect(line1.type).toBe("pair-ok");
+    const line2 = JSON.parse(await readLine()) as { type: string };
+    expect(line2.type).toBe("hello-ok");
+    socket.destroy();
+
+    const socket2 = net.connect({ host: "127.0.0.1", port: server.port });
+    const readLine2 = createLineReader(socket2);
+    sendLine(socket2, {
+      type: "hello",
+      nodeId: "n4",
+      token,
+      displayName: "Different name",
+      platform: "ios",
+      version: "2.0",
+    });
+    const line3 = JSON.parse(await readLine2()) as { type: string };
+    expect(line3.type).toBe("hello-ok");
+
+    for (let i = 0; i < 40; i += 1) {
+      if (lastAuthed?.nodeId === "n4") break;
+      await new Promise((r) => setTimeout(r, 25));
+    }
+
+    expect(lastAuthed?.nodeId).toBe("n4");
+    // Prefer paired metadata over hello payload (token verifies the stored node record).
+    expect(lastAuthed?.displayName).toBe("Iris");
+    expect(lastAuthed?.platform).toBe("ios");
+    expect(lastAuthed?.version).toBe("1.0");
+    expect(lastAuthed?.remoteIp?.includes("127.0.0.1")).toBe(true);
+
+    socket2.destroy();
+    await disconnectedP;
+    expect(disconnected?.nodeId).toBe("n4");
+    expect(disconnected?.remoteIp?.includes("127.0.0.1")).toBe(true);
+
+    await server.close();
+  });
 });

src/infra/bridge/server.ts

@@ -4,6 +4,7 @@ import os from "node:os";
 import {
   getPairedNode,
   listNodePairing,
+  type NodePairingPendingRequest,
   requestNodePairing,
   verifyNodeToken,
 } from "../node-pairing.js";
@@ -64,13 +65,24 @@ export type NodeBridgeServer = {
   close: () => Promise<void>;
 };
 
+export type NodeBridgeClientInfo = {
+  nodeId: string;
+  displayName?: string;
+  platform?: string;
+  version?: string;
+  remoteIp?: string;
+};
+
 export type NodeBridgeServerOpts = {
   host: string;
   port: number; // 0 = ephemeral
   pairingBaseDir?: string;
   onEvent?: (nodeId: string, evt: BridgeEventFrame) => Promise<void> | void;
-  onAuthenticated?: (nodeId: string) => Promise<void> | void;
-  onDisconnected?: (nodeId: string) => Promise<void> | void;
+  onAuthenticated?: (node: NodeBridgeClientInfo) => Promise<void> | void;
+  onDisconnected?: (node: NodeBridgeClientInfo) => Promise<void> | void;
+  onPairRequested?: (
+    request: NodePairingPendingRequest,
+  ) => Promise<void> | void;
   serverName?: string;
 };
 
@@ -109,6 +121,7 @@ export async function startNodeBridgeServer(
     let buffer = "";
     let isAuthenticated = false;
     let nodeId: string | null = null;
+    let nodeInfo: NodeBridgeClientInfo | null = null;
     const invokeWaiters = new Map<
       string,
       {
@@ -163,15 +176,22 @@ export async function startNodeBridgeServer(
         token,
         opts.pairingBaseDir,
       );
-      if (!verified.ok) {
+      if (!verified.ok || !verified.node) {
         sendError("UNAUTHORIZED", "invalid token");
         return;
       }
 
       isAuthenticated = true;
       connections.set(nodeId, socket);
+      nodeInfo = {
+        nodeId,
+        displayName: verified.node.displayName ?? hello.displayName,
+        platform: verified.node.platform ?? hello.platform,
+        version: verified.node.version ?? hello.version,
+        remoteIp: remoteAddress,
+      };
       send({ type: "hello-ok", serverName } satisfies BridgeHelloOkFrame);
-      await opts.onAuthenticated?.(nodeId);
+      await opts.onAuthenticated?.(nodeInfo);
     };
 
     const waitForApproval = async (request: {
@@ -227,6 +247,9 @@ export async function startNodeBridgeServer(
         },
         opts.pairingBaseDir,
       );
+      if (result.created) {
+        await opts.onPairRequested?.(result.request);
+      }
 
       const wait = await waitForApproval(result.request);
       if (!wait.ok) {
@@ -236,9 +259,16 @@ export async function startNodeBridgeServer(
 
       isAuthenticated = true;
       connections.set(nodeId, socket);
+      nodeInfo = {
+        nodeId,
+        displayName: req.displayName,
+        platform: req.platform,
+        version: req.version,
+        remoteIp: remoteAddress,
+      };
       send({ type: "pair-ok", token: wait.token } satisfies BridgePairOkFrame);
       send({ type: "hello-ok", serverName } satisfies BridgeHelloOkFrame);
-      await opts.onAuthenticated?.(nodeId);
+      await opts.onAuthenticated?.(nodeInfo);
     };
 
     const handleEvent = async (evt: BridgeEventFrame) => {
@@ -319,9 +349,9 @@ export async function startNodeBridgeServer(
     });
 
     socket.on("close", () => {
-      const id = nodeId;
+      const info = nodeInfo;
       stop();
-      if (id && isAuthenticated) void opts.onDisconnected?.(id);
+      if (info && isAuthenticated) void opts.onDisconnected?.(info);
     });
     socket.on("error", () => {
       // close handler will run after close