kibbutz-mcp 1.0.2 → 1.0.3

package/build/index.js

@@ -9,14 +9,14 @@ import { spawn } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 let mcpSocket = null;
-let socket = null;
+let pingSocket = null;
 let token = null;
 let port = null;
 let wsPromise = null;
 const map = new Map();
 const server = new McpServer({
     name: 'kibbutz-mcp',
-    version: '1.0.2',
+    version: '1.0.3',
 });
 function findChromeExecutable() {
     const platform = process.platform;
@@ -65,7 +65,7 @@ const sendAndWaitForReply = async (message, args) => {
                 const timeout = setTimeout(() => {
                     wsPromise = null;
                     reject(new Error('Timeout waiting for MCP extension WebSocket connection'));
-                }, 10000);
+                }, 2000);
                 wsPromise = () => {
                     clearTimeout(timeout);
                     resolve();
@@ -75,19 +75,15 @@ const sendAndWaitForReply = async (message, args) => {
         }
         catch (error) { }
     }
-    if (!mcpSocket || mcpSocket.readyState !== WebSocket.OPEN) {
+    if (!mcpSocket ||
+        !pingSocket ||
+        mcpSocket.readyState !== WebSocket.OPEN ||
+        pingSocket.readyState !== WebSocket.OPEN) {
         return Promise.resolve({
             content: [
                 {
                     type: 'text',
-                    text: `Connection failed: The MCP server cannot reach the Chrome extension.
-
-    Please check the following:
-    1. Is the browser open?
-    2. Is the MCP switch inside the extension popup turned ON?
-
-    If the issue persists, copy and paste this URL into your browser address bar:
-    chrome-extension://bpfjmggaaiigpfahhmpmacfhlemnhhip/KIBBUTZ-MCP.html`,
+                    text: `Connection failed: The MCP server cannot reach the Chrome extension. Open chrome-extension://bpfjmggaaiigpfahhmpmacfhlemnhhip/KIBBUTZ-MCP.html for troubleshooting.`,
                 },
             ],
             isError: true,
@@ -242,11 +238,19 @@ async function main() {
     const wss = new WebSocketServer({ noServer: true });
     const wssMcp = new WebSocketServer({ noServer: true });
     wss.on('connection', (ws) => {
-        socket = ws;
+        pingSocket = ws;
         ws.on('error', console.error);
         ws.on('close', () => {
-            if (socket === ws) {
-                socket = null;
+            if (pingSocket === ws) {
+                pingSocket = null;
+                if (mcpSocket) {
+                    wssMcp.clients.forEach((ws) => ws.terminate());
+                    mcpSocket = null;
+                }
+                for (const { reject } of map.values()) {
+                    reject(new Error('Extension WebSocket closed'));
+                }
+                map.clear();
             }
         });
     });
@@ -277,24 +281,32 @@ async function main() {
         });
     });
     httpServer.on('upgrade', (request, socket, head) => {
-        if (request.headers['sec-websocket-protocol'] !== token) {
-            socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
-            socket.destroy();
-            return;
-        }
         const { pathname } = new URL(request.url || '', `wss:127.0.0.1:${port}`);
         if (pathname === '/ping') {
+            if (request.headers['sec-websocket-protocol'] !== token) {
+                socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n');
+                socket.destroy();
+                return;
+            }
             wss.clients.forEach((ws) => ws.terminate());
             wss.handleUpgrade(request, socket, head, (ws) => {
                 wss.emit('connection', ws, request);
             });
         }
         else if (pathname === '/mcp') {
+            if (pingSocket?.readyState !== WebSocket.OPEN) {
+                socket.write('HTTP/1.1 403 Forbidden\r\n\r\n');
+                socket.destroy();
+                return;
+            }
             wssMcp.clients.forEach((ws) => ws.terminate());
             wssMcp.handleUpgrade(request, socket, head, (ws) => {
                 wssMcp.emit('connection', ws, request);
             });
         }
+        else {
+            socket.destroy();
+        }
     });
     httpServer.listen(0, () => {
         port = httpServer.address().port;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kibbutz-mcp",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "",
     "main": "build/index.js",
     "scripts": {