@shipers-dev/multi 0.24.4 → 0.24.6

package/dist/index.js

@@ -272877,7 +272877,7 @@ import { parseArgs } from "util";
 // package.json
 var package_default = {
   name: "@shipers-dev/multi",
-  version: "0.24.4",
+  version: "0.24.6",
   type: "module",
   bin: {
     "multi-agent": "./dist/index.js"
@@ -294306,7 +294306,7 @@ var connect2 = (wsUrl) => exports_Effect2.gen(function* () {
       yield* send2({ _tag: "WSMessage.Ping", requestId: "ping" });
       yield* exports_Queue.take(pongMessages).pipe(exports_Effect2.timeout(5000));
       yield* exports_Effect2.sleep(25000);
-    }).pipe(exports_Effect2.withSpan("@livestore/sync-cf:connect:checkPingPong"), exports_Effect2.ignore);
+    }).pipe(exports_Effect2.withSpan("@livestore/sync-cf:connect:checkPingPong"));
     yield* waitUntilOnline.pipe(exports_Effect2.andThen(checkPingPong.pipe(exports_Effect2.forever)), exports_Effect2.tapErrorCause(() => exports_Deferred.succeed(connectionClosed, undefined)), exports_Effect2.forkScoped);
     yield* connectionClosed;
   }).pipe(exports_Effect2.scoped, exports_Effect2.withSpan("@livestore/sync-cf:connect"));
@@ -294715,7 +294715,7 @@ import { join as join17, dirname as dirname15 } from "path";
 // package.json
 var package_default2 = {
   name: "@shipers-dev/multi",
-  version: "0.24.4",
+  version: "0.24.6",
   type: "module",
   bin: {
     "multi-agent": "./dist/index.js"
@@ -296011,7 +296011,9 @@ async function livestoreMain({ cfg, projectIds }) {
   await new Promise((resolve11) => {
     const stop3 = () => {
       log6("[livestore] shutdown");
-      Promise.allSettled(stores.map(({ store }) => store.shutdown?.())).finally(() => resolve11());
+      const settle = Promise.allSettled(stores.map(({ store }) => store.shutdown?.()));
+      const fuse = new Promise((r9) => setTimeout(r9, 2000));
+      Promise.race([settle, fuse]).finally(() => resolve11());
     };
     process.on("SIGINT", stop3);
     process.on("SIGTERM", stop3);
@@ -296103,6 +296105,81 @@ async function assembleTask(opts) {
   };
 }
 
+// src/_impl/pid-lock.ts
+import { closeSync as closeSync2, existsSync as existsSync13, mkdirSync as mkdirSync7, openSync as openSync2, readFileSync as readFileSync11, unlinkSync as unlinkSync6, writeSync as writeSync2 } from "fs";
+import { dirname as dirname16 } from "path";
+var isAlive = (pid) => {
+  if (!Number.isFinite(pid) || pid <= 0)
+    return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (e3) {
+    return e3?.code === "EPERM";
+  }
+};
+var writeExclusive = (path12, pid) => {
+  mkdirSync7(dirname16(path12), { recursive: true });
+  const fd2 = openSync2(path12, "wx");
+  try {
+    writeSync2(fd2, String(pid));
+  } finally {
+    closeSync2(fd2);
+  }
+};
+var acquirePidLock = (path12) => {
+  const ourPid = process.pid;
+  try {
+    writeExclusive(path12, ourPid);
+    return { ok: true };
+  } catch (e3) {
+    if (e3?.code !== "EEXIST")
+      throw e3;
+  }
+  const raw4 = (() => {
+    try {
+      return readFileSync11(path12, "utf8").trim();
+    } catch {
+      return "";
+    }
+  })();
+  const existingPid = Number(raw4);
+  if (existingPid === ourPid)
+    return { ok: true };
+  if (Number.isFinite(existingPid) && existingPid > 0 && isAlive(existingPid)) {
+    return { ok: false, existingPid };
+  }
+  try {
+    unlinkSync6(path12);
+  } catch {}
+  try {
+    writeExclusive(path12, ourPid);
+    return { ok: true };
+  } catch (e3) {
+    if (e3?.code !== "EEXIST")
+      throw e3;
+    const racingRaw = (() => {
+      try {
+        return readFileSync11(path12, "utf8").trim();
+      } catch {
+        return "";
+      }
+    })();
+    const racingPid = Number(racingRaw);
+    return { ok: false, existingPid: Number.isFinite(racingPid) ? racingPid : 0 };
+  }
+};
+var releasePidLock = (path12) => {
+  try {
+    if (!existsSync13(path12))
+      return;
+    const raw4 = readFileSync11(path12, "utf8").trim();
+    if (Number(raw4) !== process.pid)
+      return;
+    unlinkSync6(path12);
+  } catch {}
+};
+
 // src/commands/connect.ts
 var connectCmd = exports_Effect.fn("connectCmd")(function* () {
   const config5 = yield* Config4;
@@ -296125,6 +296202,15 @@ var connectCmd = exports_Effect.fn("connectCmd")(function* () {
       message: "no projects to subscribe to — link this device to a project first or set MULTI_LIVESTORE_PROJECTS=p1,p2"
     }));
   }
+  if (process.env.MULTI_FORCE_CONNECT !== "1") {
+    const lock = acquirePidLock(PID_PATH);
+    if (!lock.ok) {
+      return yield* exports_Effect.fail(new UsageError({
+        message: `Another multi-agent daemon is already running (pid ${lock.existingPid}). ` + `Stop it with 'multi-agent stop' or set MULTI_FORCE_CONNECT=1 to override.`
+      }));
+    }
+    process.on("exit", () => releasePidLock(PID_PATH));
+  }
   yield* logger3.log(`connect: device=${cfg.deviceId} projects=${projectIds.join(",")}`);
   yield* exports_Effect.tryPromise({
     try: () => livestoreMain({ cfg, projectIds }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipers-dev/multi",
-  "version": "0.24.4",
+  "version": "0.24.6",
   "type": "module",
   "bin": {
     "multi-agent": "./dist/index.js"