@daeda/mcp-pro 0.1.25 → 0.1.26

package/dist/index.js

@@ -2329,77 +2329,105 @@ var buildCappedSelectSql = (sql, maxRows) => {
 };
 
 // src/layers/MasterLockLive.ts
-import { createRequire } from "module";
 import path2 from "path";
-import { mkdir, open } from "fs/promises";
 import { Effect as Effect24, Layer as Layer2, Ref, pipe as pipe13 } from "effect";
-var PROMOTION_POLL_MS = 3e3;
-var lockFilePath = () => path2.join(PORTALS_DIR(), "master.lock");
-var loadOsLockModule = () => {
+
+// src/layers/MasterLockDependencies.ts
+import { createRequire } from "module";
+import { mkdir } from "fs/promises";
+var loadProperLockfileModule = () => {
   const requireFromHere = createRequire(import.meta.url);
-  return requireFromHere("os-lock");
+  return requireFromHere("proper-lockfile");
 };
-var resolveDependencies = (config = {}) => ({
+var resolveMasterLockDependencies = (config, defaults) => ({
   ensurePortalsDir: config.ensurePortalsDir ?? (async (dirPath) => {
     await mkdir(dirPath, { recursive: true });
   }),
-  openLockFile: config.openLockFile ?? ((filePath) => open(filePath, "a+")),
-  lock: config.lock ?? loadOsLockModule().lock,
-  unlock: config.unlock ?? loadOsLockModule().unlock,
+  acquireLock: config.acquireLock ?? (async (dirPath, options2) => {
+    const release = await loadProperLockfileModule().lock(dirPath, options2);
+    return { release };
+  }),
   setInterval: config.setInterval ?? ((callback, ms) => setInterval(callback, ms)),
   clearInterval: config.clearInterval ?? ((timer) => clearInterval(timer)),
   log: config.log ?? ((message) => console.error(message)),
-  promotionPollMs: config.promotionPollMs ?? PROMOTION_POLL_MS
+  promotionPollMs: config.promotionPollMs ?? defaults.promotionPollMs
 });
+
+// src/layers/MasterLockLive.ts
+var PROMOTION_POLL_MS = 3e3;
+var LOCK_STALE_MS = 5e3;
+var LOCK_UPDATE_MS = 2500;
+var lockFilePath = () => path2.join(PORTALS_DIR(), "master.lock");
 var logMessage = (runtime, message) => Effect24.sync(() => runtime.deps.log(message));
 var isLockConflictError = (error) => {
   const code = error?.code;
-  return code === "EACCES" || code === "EAGAIN" || code === "EBUSY";
+  return code === "ELOCKED";
 };
 var ensurePortalsDir = (runtime) => Effect24.tryPromise({
   try: () => runtime.deps.ensurePortalsDir(PORTALS_DIR()),
   catch: (cause) => new Error(`Failed to create portals directory: ${String(cause)}`)
 });
-var closeHandle = (runtime, handle) => Effect24.tryPromise({
+var releaseLease = (runtime, lease) => Effect24.tryPromise({
   try: async () => {
-    try {
-      await runtime.deps.unlock(handle.fd);
-    } catch {
-    }
-    try {
-      await handle.close();
-    } catch {
-    }
+    await lease.release();
   },
-  catch: (cause) => new Error(`Failed to close master lock handle: ${String(cause)}`)
+  catch: (cause) => new Error(`Failed to release master lock lease: ${String(cause)}`)
+});
+var acquireLockOptions = (runtime) => ({
+  lockfilePath: lockFilePath(),
+  retries: 0,
+  stale: LOCK_STALE_MS,
+  update: LOCK_UPDATE_MS,
+  realpath: true,
+  onCompromised: (error) => {
+    Effect24.runFork(
+      pipe13(
+        handleCompromisedLease(runtime, error),
+        Effect24.catchAll(() => Effect24.void)
+      )
+    );
+  }
 });
+var handleCompromisedLease = (runtime, error) => pipe13(
+  Ref.get(runtime.releasedRef),
+  Effect24.flatMap((released) => {
+    if (released) return Effect24.void;
+    return pipe13(
+      Ref.getAndSet(runtime.lockLeaseRef, null),
+      Effect24.flatMap((lease) => {
+        if (lease === null) return Effect24.void;
+        return pipe13(
+          logMessage(
+            runtime,
+            `[master-lock] master lease compromised: ${error.message}`
+          ),
+          Effect24.flatMap(() => Ref.set(runtime.connectionTypeRef, "READ_ONLY")),
+          Effect24.flatMap(() => startPromotionPolling(runtime))
+        );
+      })
+    );
+  })
+);
 var tryAcquireMasterLock = (runtime) => pipe13(
-  Ref.get(runtime.lockHandleRef),
-  Effect24.flatMap((existingHandle) => {
-    if (existingHandle !== null) {
+  Ref.get(runtime.lockLeaseRef),
+  Effect24.flatMap((existingLease) => {
+    if (existingLease !== null) {
       return Ref.get(runtime.connectionTypeRef);
     }
     return pipe13(
       ensurePortalsDir(runtime),
       Effect24.flatMap(
         () => Effect24.tryPromise({
-          try: () => runtime.deps.openLockFile(lockFilePath()),
-          catch: (cause) => new Error(`Failed to open master lock file: ${String(cause)}`)
-        })
-      ),
-      Effect24.flatMap(
-        (handle) => Effect24.tryPromise({
           try: async () => {
             try {
-              await runtime.deps.lock(handle.fd, {
-                exclusive: true,
-                immediate: true
-              });
-              return { connectionType: "MASTER", handle };
+              const lease = await runtime.deps.acquireLock(
+                PORTALS_DIR(),
+                acquireLockOptions(runtime)
+              );
+              return { connectionType: "MASTER", lease };
             } catch (error) {
-              await handle.close();
               if (isLockConflictError(error)) {
-                return { connectionType: "READ_ONLY", handle: null };
+                return { connectionType: "READ_ONLY", lease: null };
               }
               throw error;
             }
@@ -2408,10 +2436,21 @@ var tryAcquireMasterLock = (runtime) => pipe13(
         })
       ),
       Effect24.flatMap(
-        ({ connectionType, handle }) => pipe13(
-          Ref.set(runtime.connectionTypeRef, connectionType),
-          Effect24.flatMap(() => Ref.set(runtime.lockHandleRef, handle)),
-          Effect24.as(connectionType)
+        ({ connectionType, lease }) => pipe13(
+          Ref.get(runtime.releasedRef),
+          Effect24.flatMap((released) => {
+            if (!released || lease === null) {
+              return pipe13(
+                Ref.set(runtime.connectionTypeRef, connectionType),
+                Effect24.flatMap(() => Ref.set(runtime.lockLeaseRef, lease)),
+                Effect24.as(connectionType)
+              );
+            }
+            return pipe13(
+              releaseLease(runtime, lease),
+              Effect24.flatMap(() => Effect24.succeed("READ_ONLY"))
+            );
+          })
         )
       )
     );
@@ -2426,9 +2465,12 @@ var stopPromotionPolling = (runtime) => pipe13(
   )
 );
 var tryPromoteToMaster = (runtime) => pipe13(
-  Ref.get(runtime.promotingRef),
-  Effect24.flatMap((promoting) => {
-    if (promoting) return Effect24.void;
+  Effect24.all({
+    promoting: Ref.get(runtime.promotingRef),
+    released: Ref.get(runtime.releasedRef)
+  }),
+  Effect24.flatMap(({ promoting, released }) => {
+    if (promoting || released) return Effect24.void;
     return pipe13(
       Ref.set(runtime.promotingRef, true),
       Effect24.flatMap(
@@ -2478,20 +2520,26 @@ var startPromotionPolling = (runtime) => pipe13(
   })
 );
 var releaseRuntime = (runtime) => pipe13(
-  stopPromotionPolling(runtime),
-  Effect24.flatMap(() => Ref.getAndSet(runtime.lockHandleRef, null)),
+  Ref.set(runtime.releasedRef, true),
+  Effect24.flatMap(() => stopPromotionPolling(runtime)),
+  Effect24.flatMap(() => Ref.getAndSet(runtime.lockLeaseRef, null)),
   Effect24.flatMap(
-    (handle) => handle === null ? Effect24.void : closeHandle(runtime, handle)
+    (lease) => lease === null ? Effect24.void : releaseLease(runtime, lease)
   ),
   Effect24.flatMap(() => Ref.set(runtime.connectionTypeRef, "READ_ONLY"))
 );
 var makeRuntime = (config = {}) => pipe13(
   Effect24.all({
-    deps: Effect24.sync(() => resolveDependencies(config)),
+    deps: Effect24.sync(
+      () => resolveMasterLockDependencies(config, {
+        promotionPollMs: PROMOTION_POLL_MS
+      })
+    ),
     connectionTypeRef: Ref.make("READ_ONLY"),
-    lockHandleRef: Ref.make(null),
+    lockLeaseRef: Ref.make(null),
     promotionTimerRef: Ref.make(null),
-    promotingRef: Ref.make(false)
+    promotingRef: Ref.make(false),
+    releasedRef: Ref.make(false)
   }),
   Effect24.tap(
     (runtime) => pipe13(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daeda/mcp-pro",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "MCP server for HubSpot CRM — sync, query, and manage your portal data",
   "type": "module",
   "bin": {
@@ -35,8 +35,8 @@
     "@modelcontextprotocol/sdk": "^1.25.3",
     "effect": "3.19.15",
     "fflate": "^0.8.2",
-    "os-lock": "^2.0.0",
     "papaparse": "^5.5.3",
+    "proper-lockfile": "^4.1.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
@@ -49,6 +49,6 @@
   },
   "trustedDependencies": [
     "fs-ext",
-    "os-lock"
+    "proper-lockfile"
   ]
 }