ingresseflow-bridge 1.0.1 → 1.0.2

package/dist/index.js

@@ -14,10 +14,40 @@ import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 import { WebSocketServer, WebSocket } from 'ws';
 import { createServer } from 'http';
 import { z } from 'zod';
-// ── WebSocket bridge ──────────────────────────────────────────────────────────
+const HTTP_PORT = 9242;
+function log(msg) {
+    process.stderr.write(`[IngresseFlow] ${msg}\n`);
+}
+// ── Bridge state ──────────────────────────────────────────────────────────────
+// Two boot modes:
+//   - 'server': this process owns the WebSocket bridge and HTTP command server.
+//   - 'client': another bridge already owns :9242 (typically the LaunchAgent).
+//               This process is just an MCP front-end and forwards calls via HTTP.
+// The client mode prevents EADDRINUSE crashes when Claude Code spawns a stdio
+// MCP child while the persistent bridge is already running.
+let mode = 'server';
 let pluginSocket = null;
 const pending = new Map();
+async function detectExistingBridge() {
+    // If :9242 is occupied, another bridge owns it — go into client mode.
+    // tryPort returns false when listen fails (EADDRINUSE), which is exactly
+    // the signal we need; works even against older bridges without /health.
+    return !(await tryPort(HTTP_PORT));
+}
+async function forwardViaHttp(type, payload) {
+    const r = await fetch(`http://localhost:${HTTP_PORT}/command`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ type, payload }),
+    });
+    const json = await r.json();
+    if (!json.success)
+        throw new Error(json.error ?? 'Erro desconhecido');
+    return json.data;
+}
 function sendToPlugin(type, payload) {
+    if (mode === 'client')
+        return forwardViaHttp(type, payload);
     return new Promise((resolve, reject) => {
         if (!pluginSocket || pluginSocket.readyState !== WebSocket.OPEN) {
             return reject(new Error('Plugin não conectado. Abra o IngresseFlow no Figma Desktop (FigJam).'));
@@ -35,14 +65,14 @@ function sendToPlugin(type, payload) {
         pluginSocket.send(JSON.stringify({ id, type, payload }));
     });
 }
-async function tryPort(port) {
+async function tryPort(port, host = '127.0.0.1') {
     return new Promise(resolve => {
         const srv = createServer();
         srv.once('error', () => resolve(false));
-        srv.listen(port, () => srv.close(() => resolve(true)));
+        srv.listen(port, host, () => srv.close(() => resolve(true)));
     });
 }
-async function startBridge() {
+async function startWebSocketBridge() {
     const BASE_PORT = 9243;
     const MAX_PORT = 9250;
     let port = BASE_PORT;
@@ -54,6 +84,9 @@ async function startBridge() {
     if (port > MAX_PORT)
         throw new Error('Nenhuma porta livre em 9243–9250');
     const wss = new WebSocketServer({ port, host: '127.0.0.1' });
+    wss.on('error', (err) => {
+        log(`Erro no WebSocketServer: ${err.message}`);
+    });
     wss.on('connection', (ws) => {
         pluginSocket = ws;
         log(`Plugin conectado`);
@@ -82,6 +115,44 @@ async function startBridge() {
     log(`Abra o plugin IngresseFlow no Figma Desktop para conectar`);
     return port;
 }
+// ── HTTP command server ──────────────────────────────────────────────────────
+// Exposes:
+//   GET  /health   — used by other bridge instances to detect us and switch
+//                    to client mode instead of crashing on EADDRINUSE.
+//   POST /command  — { type, payload } forwarded to the plugin via WebSocket.
+function startCommandServer() {
+    const http = createServer(async (req, res) => {
+        if (req.method === 'GET' && req.url === '/health') {
+            res.writeHead(200, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify({ status: 'ok', plugin: !!pluginSocket }));
+            return;
+        }
+        if (req.method !== 'POST' || req.url !== '/command') {
+            res.writeHead(404).end();
+            return;
+        }
+        let body = '';
+        req.on('data', (c) => { body += c; });
+        req.on('end', async () => {
+            try {
+                const { type, payload } = JSON.parse(body);
+                const result = await sendToPlugin(type, payload);
+                res.writeHead(200, { 'Content-Type': 'application/json' });
+                res.end(JSON.stringify({ success: true, data: result }));
+            }
+            catch (err) {
+                res.writeHead(200, { 'Content-Type': 'application/json' });
+                res.end(JSON.stringify({ success: false, error: err.message }));
+            }
+        });
+    });
+    http.on('error', (err) => {
+        log(`Erro no HTTP server: ${err.message}`);
+    });
+    http.listen(HTTP_PORT, '127.0.0.1', () => {
+        log(`Comando HTTP em http://localhost:${HTTP_PORT}/command`);
+    });
+}
 // ── MCP tools ─────────────────────────────────────────────────────────────────
 const ColorEnum = z.enum([
     'YELLOW', 'BLUE', 'GREEN', 'PINK', 'ORANGE',
@@ -126,37 +197,16 @@ server.tool('figjam_create_section', 'Cria uma seção nomeada no FigJam para ag
     const result = await sendToPlugin('CREATE_SECTION', { name, x, y, width, height });
     return { content: [{ type: 'text', text: JSON.stringify(result) }] };
 });
-// ── HTTP command server (port 9242) ───────────────────────────────────────────
-// Accepts POST /command { type, payload } — lets any local client send operations
-// without needing an MCP session. Used by scripts and tests.
-function startCommandServer() {
-    const http = createServer(async (req, res) => {
-        if (req.method !== 'POST' || req.url !== '/command') {
-            res.writeHead(404).end();
-            return;
-        }
-        let body = '';
-        req.on('data', (c) => { body += c; });
-        req.on('end', async () => {
-            try {
-                const { type, payload } = JSON.parse(body);
-                const result = await sendToPlugin(type, payload);
-                res.writeHead(200, { 'Content-Type': 'application/json' });
-                res.end(JSON.stringify({ success: true, data: result }));
-            }
-            catch (err) {
-                res.writeHead(200, { 'Content-Type': 'application/json' });
-                res.end(JSON.stringify({ success: false, error: err.message }));
-            }
-        });
-    });
-    http.listen(9242, '127.0.0.1', () => log('Comando HTTP em http://localhost:9242/command'));
-}
 // ── Boot ──────────────────────────────────────────────────────────────────────
-function log(msg) {
-    process.stderr.write(`[IngresseFlow] ${msg}\n`);
+const existing = await detectExistingBridge();
+if (existing) {
+    mode = 'client';
+    log(`Bridge persistente detectada em :${HTTP_PORT} — operando em modo cliente.`);
+}
+else {
+    mode = 'server';
+    await startWebSocketBridge();
+    startCommandServer();
 }
-await startBridge();
-startCommandServer();
 const transport = new StdioServerTransport();
 await server.connect(transport);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ingresseflow-bridge",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Bridge MCP server for IngresseFlow — connects Claude Code to FigJam via Figma Desktop plugin",
   "type": "module",
   "bin": {

package/src/index.ts

@@ -11,8 +11,21 @@ import { WebSocketServer, WebSocket } from 'ws';
 import { createServer } from 'http';
 import { z } from 'zod';
 
-// ── WebSocket bridge ──────────────────────────────────────────────────────────
+const HTTP_PORT = 9242;
 
+function log(msg: string) {
+  process.stderr.write(`[IngresseFlow] ${msg}\n`);
+}
+
+// ── Bridge state ──────────────────────────────────────────────────────────────
+// Two boot modes:
+//   - 'server': this process owns the WebSocket bridge and HTTP command server.
+//   - 'client': another bridge already owns :9242 (typically the LaunchAgent).
+//               This process is just an MCP front-end and forwards calls via HTTP.
+// The client mode prevents EADDRINUSE crashes when Claude Code spawns a stdio
+// MCP child while the persistent bridge is already running.
+
+let mode: 'server' | 'client' = 'server';
 let pluginSocket: WebSocket | null = null;
 
 const pending = new Map<string, {
@@ -21,7 +34,27 @@ const pending = new Map<string, {
   timer: ReturnType<typeof setTimeout>;
 }>();
 
+async function detectExistingBridge(): Promise<boolean> {
+  // If :9242 is occupied, another bridge owns it — go into client mode.
+  // tryPort returns false when listen fails (EADDRINUSE), which is exactly
+  // the signal we need; works even against older bridges without /health.
+  return !(await tryPort(HTTP_PORT));
+}
+
+async function forwardViaHttp<T>(type: string, payload: unknown): Promise<T> {
+  const r = await fetch(`http://localhost:${HTTP_PORT}/command`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ type, payload }),
+  });
+  const json = await r.json() as { success: boolean; data?: T; error?: string };
+  if (!json.success) throw new Error(json.error ?? 'Erro desconhecido');
+  return json.data as T;
+}
+
 function sendToPlugin<T>(type: string, payload: unknown): Promise<T> {
+  if (mode === 'client') return forwardViaHttp<T>(type, payload);
+
   return new Promise((resolve, reject) => {
     if (!pluginSocket || pluginSocket.readyState !== WebSocket.OPEN) {
       return reject(new Error(
@@ -44,15 +77,15 @@ function sendToPlugin<T>(type: string, payload: unknown): Promise<T> {
   });
 }
 
-async function tryPort(port: number): Promise<boolean> {
+async function tryPort(port: number, host = '127.0.0.1'): Promise<boolean> {
   return new Promise(resolve => {
     const srv = createServer();
     srv.once('error', () => resolve(false));
-    srv.listen(port, () => srv.close(() => resolve(true)));
+    srv.listen(port, host, () => srv.close(() => resolve(true)));
   });
 }
 
-async function startBridge(): Promise<number> {
+async function startWebSocketBridge(): Promise<number> {
   const BASE_PORT = 9243;
   const MAX_PORT  = 9250;
   let port = BASE_PORT;
@@ -65,6 +98,10 @@ async function startBridge(): Promise<number> {
 
   const wss = new WebSocketServer({ port, host: '127.0.0.1' });
 
+  wss.on('error', (err) => {
+    log(`Erro no WebSocketServer: ${(err as Error).message}`);
+  });
+
   wss.on('connection', (ws) => {
     pluginSocket = ws;
     log(`Plugin conectado`);
@@ -95,6 +132,47 @@ async function startBridge(): Promise<number> {
   return port;
 }
 
+// ── HTTP command server ──────────────────────────────────────────────────────
+// Exposes:
+//   GET  /health   — used by other bridge instances to detect us and switch
+//                    to client mode instead of crashing on EADDRINUSE.
+//   POST /command  — { type, payload } forwarded to the plugin via WebSocket.
+
+function startCommandServer() {
+  const http = createServer(async (req, res) => {
+    if (req.method === 'GET' && req.url === '/health') {
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ status: 'ok', plugin: !!pluginSocket }));
+      return;
+    }
+    if (req.method !== 'POST' || req.url !== '/command') {
+      res.writeHead(404).end();
+      return;
+    }
+    let body = '';
+    req.on('data', (c: Buffer) => { body += c; });
+    req.on('end', async () => {
+      try {
+        const { type, payload } = JSON.parse(body) as { type: string; payload: unknown };
+        const result = await sendToPlugin(type, payload);
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ success: true, data: result }));
+      } catch (err) {
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ success: false, error: (err as Error).message }));
+      }
+    });
+  });
+
+  http.on('error', (err) => {
+    log(`Erro no HTTP server: ${(err as Error).message}`);
+  });
+
+  http.listen(HTTP_PORT, '127.0.0.1', () => {
+    log(`Comando HTTP em http://localhost:${HTTP_PORT}/command`);
+  });
+}
+
 // ── MCP tools ─────────────────────────────────────────────────────────────────
 
 const ColorEnum = z.enum([
@@ -172,41 +250,17 @@ server.tool(
   }
 );
 
-// ── HTTP command server (port 9242) ───────────────────────────────────────────
-// Accepts POST /command { type, payload } — lets any local client send operations
-// without needing an MCP session. Used by scripts and tests.
-
-function startCommandServer() {
-  const http = createServer(async (req, res) => {
-    if (req.method !== 'POST' || req.url !== '/command') {
-      res.writeHead(404).end();
-      return;
-    }
-    let body = '';
-    req.on('data', (c: Buffer) => { body += c; });
-    req.on('end', async () => {
-      try {
-        const { type, payload } = JSON.parse(body) as { type: string; payload: unknown };
-        const result = await sendToPlugin(type, payload);
-        res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ success: true, data: result }));
-      } catch (err) {
-        res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ success: false, error: (err as Error).message }));
-      }
-    });
-  });
-  http.listen(9242, '127.0.0.1', () => log('Comando HTTP em http://localhost:9242/command'));
-}
-
 // ── Boot ──────────────────────────────────────────────────────────────────────
 
-function log(msg: string) {
-  process.stderr.write(`[IngresseFlow] ${msg}\n`);
+const existing = await detectExistingBridge();
+if (existing) {
+  mode = 'client';
+  log(`Bridge persistente detectada em :${HTTP_PORT} — operando em modo cliente.`);
+} else {
+  mode = 'server';
+  await startWebSocketBridge();
+  startCommandServer();
 }
 
-await startBridge();
-startCommandServer();
-
 const transport = new StdioServerTransport();
 await server.connect(transport);