@detergent-software/conductor 3.0.0-dev.9 → 3.1.0-dev.1

package/build/file-lock.js

@@ -1,19 +1,22 @@
-import { randomUUID } from 'node:crypto';
-import { linkSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from 'node:fs';
+import { createHash, randomUUID } from 'node:crypto';
+import * as nodeFs from 'node:fs';
 import { join } from 'node:path';
+import { setTimeout as delay } from 'node:timers/promises';
 import { lockVerdict } from "./broker.js";
-export async function fileLock(request, { now = Date.now, pollMs, sleep = (ms) => new Promise((done) => setTimeout(done, ms)), }) {
+import { hasCode, isMissing } from "./errors.js";
+export async function fileLock(request, { fs = nodeFs, now = Date.now, pollMs, refreshPatienceMs = REFRESH_PATIENCE_MS, sleep = (ms) => new Promise((done) => setTimeout(done, ms)), }) {
+    const { linkSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } = fs;
     const { name, owner } = request;
     const file = join(request.commonDir, `${request.project}-lock-${name}.json`);
-    const read = (path = file) => {
+    const read = () => {
         try {
-            return JSON.parse(readFileSync(path, 'utf8'));
+            return JSON.parse(readFileSync(file, 'utf8'));
         }
         catch (error) {
-            if (error.code === 'ENOENT')
+            if (isMissing(error))
                 return null;
             try {
-                return { at: statSync(path).mtime.toISOString(), owner: null };
+                return { at: statSync(file).mtime.toISOString(), owner: null };
             }
             catch {
                 return null;
@@ -22,9 +25,29 @@ export async function fileLock(request, { now = Date.now, pollMs, sleep = (ms) =
     };
     // The broker's rule, on the file's { owner, at }: an unreadable owner is nobody's.
     const verdict = (held) => lockVerdict(held && { holder: held.owner ?? '', name, since: held.at }, owner, new Date(now()));
+    // A lock's id, or for one with none (unreadable, or written before ids) its owner and time.
+    const identity = (held) => typeof held.id === 'string' && /^[\w-]+$/.test(held.id)
+        ? held.id
+        : createHash('sha256')
+            .update(JSON.stringify([held.owner, held.at]))
+            .digest('hex')
+            .slice(0, 16);
+    const same = (found, judged) => found !== null && identity(found) === identity(judged);
+    // Deletes a file of this session's (a claim, a temp, a moved-aside lock). One a scanner holds open
+    // on Windows stays, rather than failing a change that is done: a claim left so is abandoned after
+    // CLAIM_ABANDONED_MS.
+    const discard = (path) => {
+        try {
+            unlinkSync(path);
+        }
+        catch (error) {
+            if (!isMissing(error) && !heldOpen(error))
+                throw error;
+        }
+    };
     const temp = () => {
         const path = `${file}.${process.pid}.${randomUUID()}`;
-        writeFileSync(path, JSON.stringify({ at: new Date(now()).toISOString(), owner }));
+        writeFileSync(path, JSON.stringify({ at: new Date(now()).toISOString(), id: randomUUID(), owner }));
         return path;
     };
     const create = () => {
@@ -36,56 +59,137 @@ export async function fileLock(request, { now = Date.now, pollMs, sleep = (ms) =
             unlinkSync(path);
         }
     };
-    // Moves a stale lock aside. If what it moved isn't the lock it judged stale (a fresh one came in
-    // between), it goes back.
-    const clearStale = (judged) => {
-        const tomb = `${file}.stale.${randomUUID()}`;
-        try {
-            renameSync(file, tomb);
-        }
-        catch (error) {
-            if (error.code === 'ENOENT')
-                return;
-            throw error;
-        }
-        const moved = read(tomb);
-        if (moved?.owner !== judged.owner || moved?.at !== judged.at) {
+    // Claims the lock as read, so nobody else removes or replaces it until the returned function
+    // deletes the claim. Null while someone else holds the claim.
+    const claim = (held) => {
+        const path = `${file}.claim.${identity(held)}`;
+        for (let tries = 0; tries < 2; tries++) {
+            const made = `${path}.${process.pid}.${randomUUID()}`;
+            writeFileSync(made, '');
             try {
-                linkSync(tomb, file);
+                linkSync(made, path);
+                return () => discard(path);
             }
             catch (error) {
-                if (error.code !== 'EEXIST')
+                if (!hasCode(error, 'EEXIST'))
                     throw error;
             }
+            finally {
+                discard(made);
+            }
+            if (!abandoned(path))
+                return null;
+            discard(path);
+        }
+        return null;
+    };
+    // A claim lasts milliseconds, on the real clock (the caller's now is the lock's); one gone already
+    // is free to take.
+    const abandoned = (path) => {
+        try {
+            return Date.now() - statSync(path).mtimeMs > CLAIM_ABANDONED_MS;
         }
-        unlinkSync(tomb);
+        catch (error) {
+            if (isMissing(error))
+                return true;
+            throw error;
+        }
+    };
+    // Under the lock's claim: moved aside before it is deleted, as Windows keeps an open file's name
+    // until its last handle closes, and a reader may have it open.
+    const remove = () => {
+        const tomb = `${file}.gone.${randomUUID()}`;
+        renameSync(file, tomb);
+        discard(tomb);
     };
     if (request.action === 'status') {
         const held = read();
         return { file, lock: name, verdict: verdict(held), ...(held ? { heldBy: held.owner, since: held.at } : {}) };
     }
     if (request.action === 'release') {
-        const held = read();
-        const judged = verdict(held);
-        if (judged === 'mine')
-            unlinkSync(file);
-        return {
-            lock: name,
-            released: judged === 'mine',
-            ...((judged === 'held' || judged === 'stale') && held ? { heldBy: held.owner } : {}),
-        };
+        // Someone else's claim lasts milliseconds, or until it is abandoned.
+        const releaseUntil = Date.now() + CLAIM_ABANDONED_MS + refreshPatienceMs;
+        for (;;) {
+            const held = read();
+            const judged = verdict(held);
+            if (judged !== 'mine' || held === null) {
+                return {
+                    lock: name,
+                    released: false,
+                    ...((judged === 'held' || judged === 'stale') && held ? { heldBy: held.owner } : {}),
+                };
+            }
+            const unclaim = claim(held);
+            if (unclaim) {
+                try {
+                    if (same(read(), held)) {
+                        remove();
+                        return { lock: name, released: true };
+                    }
+                }
+                finally {
+                    unclaim();
+                }
+                continue; // it changed (taken over, or refreshed by its owner elsewhere): judge again
+            }
+            // A takeover of the stale lock, or its owner's refresh elsewhere, holds the claim.
+            if (Date.now() >= releaseUntil)
+                return { heldBy: held.owner, lock: name, released: false };
+            await delay(REFRESH_WAIT_MS);
+        }
     }
     const until = now() + request.waitMinutes * 60_000;
+    let refreshUntil = null;
     for (;;) {
         const held = read();
         const judged = verdict(held);
-        if (judged === 'mine') {
-            renameSync(temp(), file);
-            return { acquired: true, lock: name, owner, refreshed: true };
+        if (judged === 'mine' && held) {
+            const unclaim = claim(held);
+            if (unclaim) {
+                try {
+                    if (!same(read(), held))
+                        continue; // judge again: it was taken over meanwhile
+                    const path = temp();
+                    try {
+                        renameSync(path, file);
+                        return { acquired: true, lock: name, owner, refreshed: true };
+                    }
+                    catch (error) {
+                        try {
+                            unlinkSync(path);
+                        }
+                        catch {
+                            // the rename's error is the one to report
+                        }
+                        if (!heldOpen(error))
+                            throw error;
+                    }
+                }
+                finally {
+                    unclaim();
+                }
+            }
+            // A rename Windows refused, or a claim someone else holds: tried again for a while.
+            refreshUntil ??= Date.now() + refreshPatienceMs;
+            // Still ours, only not refreshed: it goes stale from its last acquire, `since`.
+            if (Date.now() >= refreshUntil)
+                return { acquired: true, lock: name, owner, refreshed: false, since: held.at };
+            await delay(REFRESH_WAIT_MS);
+            continue; // judge again: it may have gone stale and been taken over meanwhile
         }
         if (judged === 'stale' && held) {
-            clearStale(held);
-            continue; // free now, or someone else won it: judge again
+            const unclaim = claim(held);
+            if (unclaim) {
+                try {
+                    if (same(read(), held))
+                        remove();
+                }
+                finally {
+                    unclaim();
+                }
+                continue; // free now, or someone else won it: judge again
+            }
+            // Someone else is taking it over: wait as for a held lock.
         }
         if (judged === 'free') {
             try {
@@ -93,7 +197,7 @@ export async function fileLock(request, { now = Date.now, pollMs, sleep = (ms) =
                 return { acquired: true, lock: name, owner };
             }
             catch (error) {
-                if (error.code !== 'EEXIST')
+                if (!hasCode(error, 'EEXIST'))
                     throw error;
                 continue; // someone created it between the read and the create
             }
@@ -103,4 +207,15 @@ export async function fileLock(request, { now = Date.now, pollMs, sleep = (ms) =
         await sleep(pollMs);
     }
 }
+// A refresh renames over the lock file, which Windows refuses (EPERM) while any other handle has it
+// open, as a scanner of the lock just written or another worktree's read does (ATK-652). Most
+// holds end within a second, but under load one outlasted 10 s, so it tries again for a second,
+// on the real clock and timer (the caller's now and sleep are the lock's), then answers that the
+// lock is still the caller's but wasn't refreshed. The claim is let go between tries.
+const REFRESH_PATIENCE_MS = 1000;
+const REFRESH_WAIT_MS = 50;
+const CLAIM_ABANDONED_MS = 10_000;
+function heldOpen(error) {
+    return hasCode(error, 'EPERM') || hasCode(error, 'EBUSY');
+}
 //# sourceMappingURL=file-lock.js.map

package/build/file-lock.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-lock.js","sourceRoot":"","sources":["../src/file-lock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file-lock.js","sourceRoot":"","sources":["../src/file-lock.ts"],"names":[],"mappings":"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"}

package/build/follow-ups.js

@@ -1,6 +1,6 @@
 import { ConductorError } from "./errors.js";
 import { itemKey } from "./ownership.js";
-import { trackerKey } from "./profile.js";
+import { hasAreas, trackerKey } from "./profile.js";
 import { ACTIVE_STATUSES } from "./store.js";
 import { uniqueKeys } from "./tracker-writes.js";
 // The follow-up of `item` that the request asks for, refused when a key isn't one of the project's
@@ -17,7 +17,7 @@ export function followUpOf(request, item, profile) {
     const area = request.area.trim();
     if (title === '')
         throw new ConductorError('a follow-up needs a --title');
-    if (area === '')
+    if (area === '' && hasAreas(profile))
         throw new ConductorError("a follow-up needs an --area, one of the tracker's Areas");
     if (request.body.trim() === '')
         throw new ConductorError("a follow-up's --body-file is empty");

package/build/follow-ups.js.map

@@ -1 +1 @@
-{"version":3,"file":"follow-ups.js","sourceRoot":"","sources":["../src/follow-ups.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"follow-ups.js","sourceRoot":"","sources":["../src/follow-ups.ts"],"names":[],"mappings":"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"}