magector 2.2.2 → 2.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magector",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "Semantic code search for Magento 2 — index, search, MCP server",
   "type": "module",
   "main": "src/mcp-server.js",
@@ -39,10 +39,10 @@
     "ruvector": "^0.1.96"
   },
   "optionalDependencies": {
-    "@magector/cli-darwin-arm64": "2.2.2",
-    "@magector/cli-linux-x64": "2.2.2",
-    "@magector/cli-linux-arm64": "2.2.2",
-    "@magector/cli-win32-x64": "2.2.2"
+    "@magector/cli-darwin-arm64": "2.2.4",
+    "@magector/cli-linux-x64": "2.2.4",
+    "@magector/cli-linux-arm64": "2.2.4",
+    "@magector/cli-win32-x64": "2.2.4"
   },
   "keywords": [
     "magento",

package/src/mcp-server.js

@@ -166,12 +166,19 @@ function tryAcquirePrimaryLock() {
         return false; // another instance is alive and primary
       }
     } catch { /* holder is dead, take over */ }
-    // Stale lock — reclaim
+    // Stale lock — reclaim. Use random jitter to avoid thundering herd
+    // when multiple instances detect stale lock simultaneously.
+    const jitterMs = Math.floor(Math.random() * 200) + 50;
+    const start = Date.now();
+    while (Date.now() - start < jitterMs) { /* busy-wait for sub-second jitter */ }
     try { unlinkSync(PRIMARY_LOCK_PATH); } catch {}
     try {
       const fd = openSync(PRIMARY_LOCK_PATH, fsConstants.O_WRONLY | fsConstants.O_CREAT | fsConstants.O_EXCL);
       writeFileSync(fd, String(process.pid));
       closeSync(fd);
+      // Double-check: re-read to confirm we actually own it (no TOCTOU race)
+      const check = readFileSync(PRIMARY_LOCK_PATH, 'utf-8').trim();
+      if (check !== String(process.pid)) return false;
       return true;
     } catch {
       return false; // another instance beat us
@@ -566,6 +573,14 @@ let serveReadyPromise = null;
 let serveReadyResolve = null;
 
 function startServeProcess() {
+  // Guard: if a live serve process already exists (e.g. started by another
+  // instance that won the lock race), reuse it instead of spawning a duplicate.
+  const existingPid = getExistingServePid();
+  if (existingPid) {
+    logToFile('INFO', `Reusing existing serve process (PID ${existingPid}) — skipping spawn`);
+    return;
+  }
+
   serveReadyPromise = new Promise((resolve) => { serveReadyResolve = resolve; });
   try {
     const args = [
@@ -699,15 +714,23 @@ function tryConnectSocket() {
         } catch {}
       });
 
-      conn.on('error', () => {
-        isSocketClient = false;
-        serveReady = false;
-        logToFile('WARN', 'Socket connection lost — falling back to cold-start');
-      });
-      conn.on('close', () => {
+      function handleSocketLoss(reason) {
+        if (!isSocketClient) return; // already handled
         isSocketClient = false;
         serveReady = false;
-      });
+        globalServeQuery = null;
+        logToFile('WARN', `Socket ${reason} — cleared globalServeQuery, will use cold-start fallback`);
+        // Try to reconnect after a delay (primary may have restarted)
+        setTimeout(async () => {
+          if (globalServeQuery) return; // already reconnected
+          const reconnected = await tryConnectSocket();
+          if (reconnected) {
+            logToFile('INFO', 'Reconnected to serve socket after loss');
+          }
+        }, 5000);
+      }
+      conn.on('error', () => handleSocketLoss('error'));
+      conn.on('close', () => handleSocketLoss('closed'));
 
       // Override serveQuery to route through socket
       const socketQueryQueue = [];