@lmzhen/dsh-evolution-core 0.3.28 → 0.3.29

package/lib/index.js

@@ -147,16 +147,18 @@ function nodeEvolutionIo() {
 	*/
 	const withWriteLock = async (path, task) => {
 		const lock = `${path}.lock`;
+		let myClaim = "";
 		for (let attempt = 0; attempt < 40; attempt += 1) {
 			try {
-				await writeFile(lock, String(process.pid), { flag: "wx" });
+				myClaim = `${process.pid}:${randomBytes(4).toString("hex")}`;
+				await writeFile(lock, myClaim, { flag: "wx" });
 			} catch (error) {
 				const code = error?.code;
 				if (code !== "EEXIST" && code !== "EPERM") throw error;
 				try {
 					const st = await stat(lock);
 					const holderContent = await readFile(lock, "utf8").catch(() => "");
-					const holder = Number(holderContent);
+					const holder = Number(holderContent.split(":")[0] ?? "");
 					const holderAlive = Number.isInteger(holder) && holder > 0 && isAlive(holder);
 					if (holder === process.pid && pendingSelfCleanup.has(lock)) {
 						if (await readFile(lock, "utf8").catch(() => "") === holderContent) {
@@ -167,15 +169,23 @@ function nodeEvolutionIo() {
 						}
 						continue;
 					}
-					if (Date.now() - st.mtimeMs > 1e3 && !holderAlive) {
+					if (Number.isInteger(holder) && holder > 0 && Date.now() - st.mtimeMs > 1e3 && !holderAlive) {
 						if (await readFile(lock, "utf8").catch(() => "") === holderContent) {
-							const takeover = `${lock}.takeover-${process.pid}-${randomBytes(6).toString("hex")}`;
+							const ticket = `${lock}.next`;
 							try {
-								await rename(lock, takeover);
-								await rm(takeover, { force: true }).catch(() => {});
+								const ticketBody = await readFile(ticket, "utf8").catch(() => "");
+								const ticketHolder = Number(ticketBody.split(":")[0] ?? "");
+								if ((!Number.isInteger(ticketHolder) || ticketHolder <= 0 || !isAlive(ticketHolder) || Date.now() - await stat(ticket).then((s) => s.mtimeMs, () => 0) > 1e3) && ticketBody !== "") await rm(ticket, { force: true }).catch(() => {});
 							} catch {}
+							try {
+								await writeFile(ticket, `${process.pid}:${randomBytes(4).toString("hex")}`, { flag: "wx" });
+							} catch {
+								continue;
+							}
+							if (await readFile(lock, "utf8").catch(() => "") === holderContent) await rm(lock, { force: true }).catch(() => {});
+							await rm(ticket, { force: true }).catch(() => {});
+							continue;
 						}
-						continue;
 					}
 				} catch {
 					continue;
@@ -186,7 +196,7 @@ function nodeEvolutionIo() {
 			try {
 				return await task();
 			} finally {
-				await rm(lock, { force: true }).catch(() => {
+				if (await readFile(lock, "utf8").catch(() => null) === myClaim) await rm(lock, { force: true }).catch(() => {
 					pendingSelfCleanup.add(lock);
 				});
 			}
@@ -252,6 +262,7 @@ function nodeEvolutionIo() {
 					await rm(path, { force: true });
 					return;
 				}
+				if (next === current) return;
 				const tmp = `${path}.${process.pid}.${randomBytes(6).toString("hex")}.tmp`;
 				await writeFile(tmp, next, "utf8");
 				await commitTmp(tmp, path);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-core",
   "description": "Shared stores, prompts, signals and lifecycle logic for the dsh-evolution plugin family (community build)",
-  "version": "0.3.28",
+  "version": "0.3.29",
   "publishConfig": {
     "access": "public"
   },