@zukhruf/mutex 0.3.16 → 0.3.17

package/README.md

@@ -98,7 +98,7 @@ await mutex.acquire('product:42', async (lease) => {
 });
 ```
 
-Sometimes the lock store sees the loss, for example after a failover of `SocketStore`. Then the signal of the lease aborts with `LockLostError`, and the task can stop before its next write. When the task ends, the call rejects with `LockLostError`:
+Sometimes the lock store sees the loss, for example after a failover of `SocketStore`. Then the signal of the lease aborts with `LeaseLostError`, and the task can stop before its next write. When the task ends, the call rejects with `LeaseLostError`:
 
 ```ts
 await mutex.acquire('product:42', async (lease) => {
@@ -111,6 +111,8 @@ await mutex.acquire('product:42', async (lease) => {
 
 The signal is a warning. A frozen holder can write before its lock store sees the loss, so the fencing token is still the protection.
 
+The lease is a `FencedLease` of [`@zukhruf/fencing`](../fencing/README.md). Import `FencingToken` and the token sources from `@zukhruf/fencing`. `LeaseLostError` is from [`@zukhruf/lease`](../lease/README.md), and this package also exports it, because its calls reject with it.
+
 See [Fencing tokens](./docs/concepts/fencing-tokens.md) and the recipe [Protect a database from stale holders](./docs/recipes/fence-a-database.md).
 
 ## Documentation
@@ -120,7 +122,7 @@ See [Fencing tokens](./docs/concepts/fencing-tokens.md) and the recipe [Protect
 - [Reach](./docs/concepts/reach.md): who can share a lock, and how to select it.
 - [Acquire modes](./docs/concepts/acquire-modes.md): wait or skip while a key is busy, and cancel a wait.
 - [Fencing tokens](./docs/concepts/fencing-tokens.md): how a resource refuses a stale holder.
-- [Leader election](./docs/concepts/leader-election.md): how `SocketStore` selects its coordinator.
+- [Leader election](../election/docs/concepts/leader-election.md): how `SocketStore` selects its coordinator, with `SqliteElection` of `@zukhruf/election`.
 - [Failure modes](./docs/concepts/failure-modes.md): what each lock store does when something stops.
 
 **Lock stores**: one page for each lock store, with What, Why, When, When not, How it works, Acquire modes, Failure modes, Options, and Evidence. See the table above.
@@ -133,7 +135,7 @@ See [Fencing tokens](./docs/concepts/fencing-tokens.md) and the recipe [Protect
 4. [Worker threads that share a lock](./docs/recipes/worker-threads.md)
 5. [Protect a database from stale holders](./docs/recipes/fence-a-database.md)
 6. [Survive a crashed holder](./docs/recipes/survive-a-crashed-holder.md)
-7. [Run a job in only one process](./docs/recipes/singleton-job-with-leader-election.md)
+7. [Run a job in only one process](../election/docs/recipes/singleton-job-with-leader-election.md), with `@zukhruf/election`
 8. [Write your own lock store](./docs/recipes/write-your-own-lock-store.md)
 9. [Skip a job that is already running](./docs/recipes/skip-a-job-that-is-already-running.md)
 10. [Compute a value once and share it](./docs/recipes/compute-once-and-share-it.md)
@@ -150,7 +152,6 @@ npm install @zukhruf/mutex
 
 ```ts
 import { Mutex, SqliteStore } from '@zukhruf/mutex';
-import { LeaderElection } from '@zukhruf/mutex/leader-election';
 ```
 
 ## Development
@@ -169,12 +170,10 @@ The tests run from `src/`, not from `dist/`: they start workers and child proces
 
 ```
 src/
-  mutex/             Mutex, Key, acquire modes, Lease, LockHandle, LockStore, LockLostError
-  fencing/           fencing tokens and token sources
+  mutex/             Mutex, Key, acquire modes, LockHandle, LockStore
   lock-stores/       one folder for each lock store
     remote/          the coordinator and client that ThreadStore, IpcStore and SocketStore share
-  leader-election/   leader election (separate entry point, not part of the mutex)
-  shared/            small file system and SQLite helpers
+  shared/            a record check (key file names, file writes and file locks are in @zukhruf/fs)
   testing/           test helpers and the matrix of lock stores (not published)
 docs/
   concepts/  stores/  recipes/  adr/

package/dist/index.d.ts

@@ -1,18 +1,12 @@
 export { Mutex } from './mutex/mutex.ts';
 export { Key } from './mutex/key.ts';
-export { leaseFor, type Lease, type LockHandle } from './mutex/lease.ts';
+export { leaseFor, type LockHandle } from './mutex/lease.ts';
 export type { AcquireOptions, LockStore } from './mutex/lock-store.ts';
-export { LockLostError } from './mutex/lock-lost-error.ts';
+export { LeaseLostError } from '@zukhruf/lease';
 export type { Acquired, AcquireMode, ModeResult, NotAcquired, Outcome, OutcomeResults, } from './mutex/acquire-mode.ts';
 export { Modes } from './mutex/acquire-modes/modes.ts';
 export { WaitMode } from './mutex/acquire-modes/wait-mode.ts';
 export { SkipIfBusyMode, type SkipIfBusyOptions, } from './mutex/acquire-modes/skip-if-busy-mode.ts';
-export { FencingToken } from './fencing/fencing-token.ts';
-export type { TokenSource } from './fencing/token-source.ts';
-export { CounterTokenSource } from './fencing/counter-token-source.ts';
-export { FileTokenSource } from './fencing/file-token-source.ts';
-export { MonotonicClockTokenSource } from './fencing/monotonic-clock-token-source.ts';
-export { EpochTokenSource } from './fencing/epoch-token-source.ts';
 export { MemoryStore, type MemoryStoreOptions, } from './lock-stores/memory/memory-store.ts';
 export { ThreadLockCoordinator, type ThreadLockCoordinatorOptions, } from './lock-stores/thread/thread-lock-coordinator.ts';
 export { ThreadStore } from './lock-stores/thread/thread-store.ts';
@@ -20,7 +14,7 @@ export { IpcLockCoordinator, type IpcLockCoordinatorOptions, } from './lock-stor
 export { IpcStore } from './lock-stores/ipc/ipc-store.ts';
 export { CoordinatorUnavailableError } from './lock-stores/remote/coordinator-unavailable-error.ts';
 export { UnsupportedRequestError } from './lock-stores/remote/unsupported-request-error.ts';
-export { NetworkDirectoryError } from './local-directory/network-directory-error.ts';
+export { NetworkDirectoryError } from '@zukhruf/fs';
 export { FileLockStore, type FileLockStoreOptions, } from './lock-stores/file-system/file-lock-store.ts';
 export { TicketQueueFileStore } from './lock-stores/file-system/ticket-queue-file-store.ts';
 export { LockFileStore } from './lock-stores/file-system/lock-file-store.ts';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,KAAK,KAAK,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACzE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,YAAY,EACV,QAAQ,EACR,WAAW,EACX,UAAU,EACV,WAAW,EACX,OAAO,EACP,cAAc,GACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EACL,cAAc,EACd,KAAK,iBAAiB,GACvB,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,YAAY,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EACL,WAAW,EACX,KAAK,kBAAkB,GACxB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,qBAAqB,EACrB,KAAK,4BAA4B,GAClC,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EACL,kBAAkB,EAClB,KAAK,yBAAyB,GAC/B,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EACL,aAAa,EACb,KAAK,oBAAoB,GAC1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EACL,WAAW,EACX,KAAK,UAAU,EACf,KAAK,kBAAkB,GACxB,MAAM,sCAAsC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,YAAY,EACV,QAAQ,EACR,WAAW,EACX,UAAU,EACV,WAAW,EACX,OAAO,EACP,cAAc,GACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EACL,cAAc,EACd,KAAK,iBAAiB,GACvB,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EACL,WAAW,EACX,KAAK,kBAAkB,GACxB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,qBAAqB,EACrB,KAAK,4BAA4B,GAClC,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EACL,kBAAkB,EAClB,KAAK,yBAAyB,GAC/B,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EACL,aAAa,EACb,KAAK,oBAAoB,GAC1B,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EACL,WAAW,EACX,KAAK,UAAU,EACf,KAAK,kBAAkB,GACxB,MAAM,sCAAsC,CAAC"}

package/dist/index.js

@@ -1,15 +1,10 @@
 export { Mutex } from "./mutex/mutex.js";
 export { Key } from "./mutex/key.js";
 export { leaseFor } from "./mutex/lease.js";
-export { LockLostError } from "./mutex/lock-lost-error.js";
+export { LeaseLostError } from '@zukhruf/lease';
 export { Modes } from "./mutex/acquire-modes/modes.js";
 export { WaitMode } from "./mutex/acquire-modes/wait-mode.js";
 export { SkipIfBusyMode, } from "./mutex/acquire-modes/skip-if-busy-mode.js";
-export { FencingToken } from "./fencing/fencing-token.js";
-export { CounterTokenSource } from "./fencing/counter-token-source.js";
-export { FileTokenSource } from "./fencing/file-token-source.js";
-export { MonotonicClockTokenSource } from "./fencing/monotonic-clock-token-source.js";
-export { EpochTokenSource } from "./fencing/epoch-token-source.js";
 export { MemoryStore, } from "./lock-stores/memory/memory-store.js";
 export { ThreadLockCoordinator, } from "./lock-stores/thread/thread-lock-coordinator.js";
 export { ThreadStore } from "./lock-stores/thread/thread-store.js";
@@ -17,7 +12,7 @@ export { IpcLockCoordinator, } from "./lock-stores/ipc/ipc-lock-coordinator.js";
 export { IpcStore } from "./lock-stores/ipc/ipc-store.js";
 export { CoordinatorUnavailableError } from "./lock-stores/remote/coordinator-unavailable-error.js";
 export { UnsupportedRequestError } from "./lock-stores/remote/unsupported-request-error.js";
-export { NetworkDirectoryError } from "./local-directory/network-directory-error.js";
+export { NetworkDirectoryError } from '@zukhruf/fs';
 export { FileLockStore, } from "./lock-stores/file-system/file-lock-store.js";
 export { TicketQueueFileStore } from "./lock-stores/file-system/ticket-queue-file-store.js";
 export { LockFileStore } from "./lock-stores/file-system/lock-file-store.js";

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAA+B,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAS3D,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EACL,cAAc,GAEf,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,EACL,WAAW,GAEZ,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,qBAAqB,GAEtB,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EACL,kBAAkB,GAEnB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EACL,aAAa,GAEd,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EACL,WAAW,GAGZ,MAAM,sCAAsC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAmB,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAShD,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EACL,cAAc,GAEf,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EACL,WAAW,GAEZ,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,qBAAqB,GAEtB,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EACL,kBAAkB,GAEnB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EACL,aAAa,GAEd,MAAM,8CAA8C,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EACL,WAAW,GAGZ,MAAM,sCAAsC,CAAC"}

package/dist/lock-stores/file-system/file-lock-store.d.ts

@@ -1,4 +1,4 @@
-import type { TokenSource } from '../../fencing/token-source.ts';
+import { type TokenSource } from '@zukhruf/fencing';
 import { type LockHandle } from '../../mutex/lease.ts';
 import type { AcquireOptions, LockStore } from '../../mutex/lock-store.ts';
 export interface FileLockStoreOptions {
@@ -7,10 +7,6 @@ export interface FileLockStoreOptions {
     /** Defaults to durable per-key counter files beside the locks. */
     tokens?: TokenSource;
 }
-export interface PollOptions {
-    /** Stops between attempts when it aborts; the poll then rejects with `signal.reason`. */
-    signal?: AbortSignal | undefined;
-}
 /** Shares one lock directory between processes: each key maps to `<directory>/<key>.lock`. */
 export declare abstract class FileLockStore implements LockStore {
     #private;
@@ -31,15 +27,14 @@ export declare abstract class FileLockStore implements LockStore {
     protected abstract tryLock(path: string): Promise<AsyncDisposable | undefined>;
     /** Whether the lock at `path` has a holder now, learned without a lock that a caller of `lock` or `tryLock` needs. */
     protected abstract isHeldAt(path: string): Promise<boolean>;
-    protected poll<T>(attempt: () => Promise<T | undefined>, { signal }?: PollOptions): Promise<T>;
+    /** Stops between attempts once `signal` aborts, and then rejects with `signal.reason`. */
+    protected poll<T>(attempt: () => Promise<T | undefined>, signal: AbortSignal | undefined): Promise<T>;
     /**
      * Serializes evicting a dead holder. Without it, two waiters that saw the
      * same dead holder could each remove a lock the other had just taken. The
      * kernel holds this lock, so a waiter that dies while it evicts frees it at
      * once. Its file stays for the next eviction: deleting it while waiters use
-     * it would let two of them lock two different files. Nothing may open that
-     * file except through SQLite: closing any other handle to it drops this
-     * process's lock without a word.
+     * it would let two of them lock two different files.
      */
     protected withReclaimLock(path: string, task: () => Promise<void>): Promise<void>;
 }

package/dist/lock-stores/file-system/file-lock-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-lock-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/file-lock-store.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,EAAE,KAAK,UAAU,EAAY,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAK3E,MAAM,WAAW,oBAAoB;IACnC,qDAAqD;IACrD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kEAAkE;IAClE,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,yFAAyF;IACzF,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CAClC;AAED,8FAA8F;AAC9F,8BAAsB,aAAc,YAAW,SAAS;;gBAMpD,SAAS,EAAE,MAAM,EACjB,EACE,YAAiB,EACjB,MAAuC,GACxC,GAAE,oBAAyB;IAOxB,OAAO,CACX,GAAG,EAAE,MAAM,EACX,EAAE,MAAM,EAAE,GAAE,cAAmB,GAC9B,OAAO,CAAC,UAAU,CAAC;IAMhB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAK9D,kFAAkF;IAC5E,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK3C;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAElD,kFAAkF;IAClF,SAAS,CAAC,QAAQ,CAAC,IAAI,CACrB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,GAAG,SAAS,GAC9B,OAAO,CAAC,eAAe,CAAC;IAE3B,mEAAmE;IACnE,SAAS,CAAC,QAAQ,CAAC,OAAO,CACxB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAEvC,sHAAsH;IACtH,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;cAE3C,IAAI,CAAC,CAAC,EACpB,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,EACrC,EAAE,MAAM,EAAE,GAAE,WAAgB,GAC3B,OAAO,CAAC,CAAC,CAAC;IAab;;;;;;;;OAQG;cACa,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;CAyBxE"}
+{"version":3,"file":"file-lock-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/file-lock-store.ts"],"names":[],"mappings":"AAKA,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EAAE,KAAK,UAAU,EAAY,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAE3E,MAAM,WAAW,oBAAoB;IACnC,qDAAqD;IACrD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kEAAkE;IAClE,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,8FAA8F;AAC9F,8BAAsB,aAAc,YAAW,SAAS;;gBAMpD,SAAS,EAAE,MAAM,EACjB,EACE,YAAiB,EACjB,MAAuC,GACxC,GAAE,oBAAyB;IAOxB,OAAO,CACX,GAAG,EAAE,MAAM,EACX,EAAE,MAAM,EAAE,GAAE,cAAmB,GAC9B,OAAO,CAAC,UAAU,CAAC;IAMhB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAK9D,kFAAkF;IAC5E,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK3C;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAElD,kFAAkF;IAClF,SAAS,CAAC,QAAQ,CAAC,IAAI,CACrB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,GAAG,SAAS,GAC9B,OAAO,CAAC,eAAe,CAAC;IAE3B,mEAAmE;IACnE,SAAS,CAAC,QAAQ,CAAC,OAAO,CACxB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAEvC,sHAAsH;IACtH,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAE3D,0FAA0F;cAC1E,IAAI,CAAC,CAAC,EACpB,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,EACrC,MAAM,EAAE,WAAW,GAAG,SAAS,GAC9B,OAAO,CAAC,CAAC,CAAC;IAWb;;;;;;OAMG;cACa,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;CAiBxE"}

package/dist/lock-stores/file-system/file-lock-store.js

@@ -1,13 +1,10 @@
 import { mkdir } from 'node:fs/promises';
 import { join } from 'node:path';
-import { DatabaseSync } from 'node:sqlite';
 import { setTimeout as delay } from 'node:timers/promises';
-import { FileTokenSource } from "../../fencing/file-token-source.js";
-import { assertLocalDirectory } from "../../local-directory/local-directory.js";
+import { untilAborted } from '@zukhruf/async';
+import { FileTokenSource } from '@zukhruf/fencing';
+import { FileLock, assertLocalDirectory, safeFileName } from '@zukhruf/fs';
 import { leaseFor } from "../../mutex/lease.js";
-import { safeFileName } from "../../shared/fs/safe-file-name.js";
-import { isBusy } from "../../shared/sqlite/is-busy.js";
-import { isNotADatabase } from "../../shared/sqlite/is-not-a-database.js";
 /** Shares one lock directory between processes: each key maps to `<directory>/<key>.lock`. */
 export class FileLockStore {
     #directory;
@@ -32,18 +29,13 @@ export class FileLockStore {
         await assertLocalDirectory(this.#directory);
         return this.isHeldAt(this.#pathFor(key));
     }
-    async poll(attempt, { signal } = {}) {
+    /** Stops between attempts once `signal` aborts, and then rejects with `signal.reason`. */
+    async poll(attempt, signal) {
         for (;;) {
             const result = await attempt();
             if (result !== undefined)
                 return result;
-            try {
-                await delay(this.#pollInterval, undefined, { signal });
-            }
-            catch (error) {
-                signal?.throwIfAborted();
-                throw error;
-            }
+            await untilAborted(delay(this.#pollInterval, undefined, { signal }), signal);
         }
     }
     /**
@@ -51,26 +43,14 @@ export class FileLockStore {
      * same dead holder could each remove a lock the other had just taken. The
      * kernel holds this lock, so a waiter that dies while it evicts frees it at
      * once. Its file stays for the next eviction: deleting it while waiters use
-     * it would let two of them lock two different files. Nothing may open that
-     * file except through SQLite: closing any other handle to it drops this
-     * process's lock without a word.
+     * it would let two of them lock two different files.
      */
     async withReclaimLock(path, task) {
         const reclaimPath = `${path}.reclaim`;
-        const reclaim = new DatabaseSync(reclaimPath, { timeout: 0 });
-        try {
-            if (!claim(reclaim, reclaimPath))
-                return;
-            try {
-                await task();
-            }
-            finally {
-                reclaim.exec('ROLLBACK');
-            }
-        }
-        finally {
-            reclaim.close();
-        }
+        using reclaim = FileLock.open(reclaimPath);
+        if (!claim(reclaim, reclaimPath))
+            return;
+        await task();
     }
     async #prepare(key) {
         await assertLocalDirectory(this.#directory);
@@ -82,21 +62,24 @@ export class FileLockStore {
         return join(this.#directory, `${name}.lock`);
     }
 }
-/** Whether this connection now holds the reclaim lock; another waiter is evicting if not. */
+/** Whether this handle now holds the reclaim lock; another waiter is evicting if not. */
 function claim(reclaim, path) {
     try {
-        // A journal on disk would outlive a waiter that dies while it holds the lock.
-        reclaim.exec('PRAGMA journal_mode = MEMORY');
-        reclaim.exec('BEGIN EXCLUSIVE');
-        return true;
+        return reclaim.tryLock();
     }
     catch (error) {
-        if (isBusy(error))
-            return false;
         if (isNotADatabase(error)) {
             throw new Error(`The reclaim file ${JSON.stringify(path)} was left by an older version of @zukhruf/mutex. Stop the processes that run that version, then delete the file.`, { cause: error });
         }
         throw error;
     }
 }
+const SQLITE_NOTADB = 26;
+/** Whether `error` means the file is not a SQLite database, for example a file that an older version wrote. */
+function isNotADatabase(error) {
+    return (error instanceof Error &&
+        'errcode' in error &&
+        typeof error.errcode === 'number' &&
+        (error.errcode & 0xff) === SQLITE_NOTADB);
+}
 //# sourceMappingURL=file-lock-store.js.map

package/dist/lock-stores/file-system/file-lock-store.js.map

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

package/dist/lock-stores/file-system/lock-file-store.d.ts

@@ -5,7 +5,7 @@ import { FileLockStore } from './file-lock-store.ts';
  */
 export declare class LockFileStore extends FileLockStore {
     #private;
-    /** A presence file has the longest name this store makes for a key. */
+    /** The longer of a presence file and the draft that `createExclusive` writes beside the record. */
     protected readonly longestSuffix: number;
     protected lock(path: string, signal: AbortSignal | undefined): Promise<AsyncDisposable>;
     protected tryLock(path: string): Promise<AsyncDisposable | undefined>;

package/dist/lock-stores/file-system/lock-file-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lock-file-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/lock-file-store.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD;;;GAGG;AACH,qBAAa,aAAc,SAAQ,aAAa;;IAC9C,uEAAuE;IACvE,SAAS,CAAC,QAAQ,CAAC,aAAa,SAAyB;IAEzD,SAAS,CAAC,IAAI,CACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,GAAG,SAAS,GAC9B,OAAO,CAAC,eAAe,CAAC;cAKX,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAkC3E,kEAAkE;IAClE,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAiBnD"}
+{"version":3,"file":"lock-file-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/lock-file-store.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAIrD;;;GAGG;AACH,qBAAa,aAAc,SAAQ,aAAa;;IAC9C,mGAAmG;IACnG,SAAS,CAAC,QAAQ,CAAC,aAAa,SAG9B;IAEF,SAAS,CAAC,IAAI,CACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,GAAG,SAAS,GAC9B,OAAO,CAAC,eAAe,CAAC;cAKX,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IA6B3E,kEAAkE;IAClE,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAanD"}

package/dist/lock-stores/file-system/lock-file-store.js

@@ -1,20 +1,19 @@
-import { readFile, unlink } from 'node:fs/promises';
-import { createExclusive } from "../../shared/fs/create-exclusive.js";
-import { isErrno } from "../../shared/fs/errno.js";
-import { patiently } from "../../shared/fs/patiently.js";
+import { unlink } from 'node:fs/promises';
+import { createExclusive, draftSuffixLength, patiently } from '@zukhruf/fs';
 import { Caller } from "./caller.js";
 import { FileLockStore } from "./file-lock-store.js";
 import { Presence } from "./presence.js";
+import { readRecord } from "./record-file.js";
 /**
  * Whoever creates the lock file holds the key; releasing deletes it. Waiters
  * retry in no particular order, so this store is not FIFO.
  */
 export class LockFileStore extends FileLockStore {
-    /** A presence file has the longest name this store makes for a key. */
-    longestSuffix = Presence.suffixLength;
+    /** The longer of a presence file and the draft that `createExclusive` writes beside the record. */
+    longestSuffix = Math.max(Presence.suffixLength, draftSuffixLength);
     lock(path, signal) {
         const me = Caller.current();
-        return this.poll(() => this.#attempt(path, me), { signal });
+        return this.poll(() => this.#attempt(path, me), signal);
     }
     async tryLock(path) {
         const me = Caller.current();
@@ -28,15 +27,11 @@ export class LockFileStore extends FileLockStore {
             await this.#evictIfGone(path, holder);
             return undefined;
         }
-        const presence = Presence.claim(Presence.pathOf(path, me));
-        const created = await createExclusive(path, me.serialize()).catch(async (error) => {
-            await presence.withdraw();
-            throw error;
-        });
-        if (!created) {
-            await presence.withdraw();
+        await using claiming = new AsyncDisposableStack();
+        const presence = claiming.adopt(Presence.claim(path, me), (claimed) => claimed.withdraw());
+        if (!(await createExclusive(path, me.serialize())))
             return undefined;
-        }
+        claiming.move();
         return {
             [Symbol.asyncDispose]: () => presence.releaseAfter(() => removeLockFile(path)),
         };
@@ -46,7 +41,7 @@ export class LockFileStore extends FileLockStore {
         return Presence.isNamedCallerPresent(path, () => readHolder(path));
     }
     async #evictIfGone(path, holder) {
-        const state = await Presence.judge(path, holder, async () => (await readHolder(path))?.id === holder.id);
+        const state = await Presence.judge(path, holder, () => readHolder(path));
         if (state !== 'gone')
             return;
         await this.withReclaimLock(path, async () => {
@@ -61,13 +56,9 @@ function removeLockFile(path) {
     return patiently(() => unlink(path));
 }
 async function readHolder(path) {
-    try {
-        return Caller.parse(await patiently(() => readFile(path, 'utf8')));
-    }
-    catch (error) {
-        if (isErrno(error, 'ENOENT'))
-            return undefined;
-        throw error;
-    }
+    const content = await readRecord(path);
+    if (content === undefined)
+        return undefined;
+    return Caller.parse(content);
 }
 //# sourceMappingURL=lock-file-store.js.map

package/dist/lock-stores/file-system/lock-file-store.js.map

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

package/dist/lock-stores/file-system/presence.d.ts

@@ -1,12 +1,10 @@
 import { Caller } from './caller.ts';
 /**
- * A caller's presence: an exclusive SQLite transaction on a file of its own,
- * held from before the caller's record (a lock file, a ticket, or the holder
- * record of `SqliteStore`) appears until after it is gone. The kernel ends it
- * when the caller's process or thread stops, however it stops, so a waiter
- * that can read the file knows the caller is gone. Nothing may open the file
- * except through SQLite: closing any other handle to it drops this process's
- * lock without a word.
+ * A caller's presence: the file lock of a file of its own, held from before
+ * the caller's record (a lock file, a ticket, or the holder record of
+ * `SqliteStore`) appears until after it is gone. The kernel ends it when the
+ * caller's process or thread stops, however it stops, so a waiter that can
+ * check the file knows the caller is gone.
  */
 export declare class Presence {
     #private;
@@ -15,20 +13,15 @@ export declare class Presence {
     static readonly suffixLength: number;
     /** The presence file of `caller`, whose record is at `record`. */
     static pathOf(record: string, caller: Caller): string;
-    static claim(path: string): Presence;
-    /**
-     * Whether the caller behind `path` still runs. Reading needs a lock that the
-     * caller's exclusive transaction refuses, and opening read-only never creates
-     * the file.
-     */
-    static check(path: string): 'present' | 'gone' | 'missing';
+    /** Claims the presence of `caller`, whose record is at `record`. */
+    static claim(record: string, caller: Caller): Presence;
     /**
      * Whether `caller`, whom the record at `record` named, still runs. A caller's
      * record goes before its presence file, so a missing presence file is a
-     * fault while `stillNamed` says the record names the caller, and means the
-     * caller `moved` on when it does not.
+     * fault while `readNamed` still reads the caller from the record, and means
+     * the caller `moved` on when it does not.
      */
-    static judge(record: string, caller: Caller, stillNamed: () => Promise<boolean>): Promise<'present' | 'gone' | 'moved'>;
+    static judge(record: string, caller: Caller, readNamed: () => Promise<Caller | undefined>): Promise<'present' | 'gone' | 'moved'>;
     /** Whether the caller that `readNamed` reads from the record at `record` still runs. Writes nothing. */
     static isNamedCallerPresent(record: string, readNamed: () => Promise<Caller | undefined>): Promise<boolean>;
     /** Deletes the file of a presence that has ended. */

package/dist/lock-stores/file-system/presence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"presence.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/presence.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAKrC;;;;;;;;GAQG;AACH,qBAAa,QAAQ;;IAInB,OAAO;IAKP,2DAA2D;IAC3D,MAAM,CAAC,QAAQ,CAAC,YAAY,SAAgD;IAE5E,kEAAkE;IAClE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAIrD,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;IAcpC;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IAoB1D;;;;;OAKG;WACU,KAAK,CAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GACjC,OAAO,CAAC,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;IAQxC,wGAAwG;WAC3F,oBAAoB,CAC/B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,GAC3C,OAAO,CAAC,OAAO,CAAC;IAanB,qDAAqD;WACxC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhD,sGAAsG;IACtG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK;IAMnD,uFAAuF;IACvF,GAAG,IAAI,IAAI;IAMX;;;;OAIG;IACG,YAAY,CAAC,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAWpE,uEAAuE;IACjE,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAIhC"}
+{"version":3,"file":"presence.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/presence.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;;;;GAMG;AACH,qBAAa,QAAQ;;IAInB,OAAO;IAKP,2DAA2D;IAC3D,MAAM,CAAC,QAAQ,CAAC,YAAY,SAAgD;IAE5E,kEAAkE;IAClE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAIrD,oEAAoE;IACpE,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ;IAatD;;;;;OAKG;WACU,KAAK,CAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,GAC3C,OAAO,CAAC,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;IAWxC,wGAAwG;WAC3F,oBAAoB,CAC/B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,GAC3C,OAAO,CAAC,OAAO,CAAC;IASnB,qDAAqD;WACxC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhD,sGAAsG;IACtG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK;IAMnD,uFAAuF;IACvF,GAAG,IAAI,IAAI;IAIX;;;;OAIG;IACG,YAAY,CAAC,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAWpE,uEAAuE;IACjE,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAIhC"}

package/dist/lock-stores/file-system/presence.js

@@ -1,27 +1,19 @@
-import { existsSync } from 'node:fs';
 import { unlink } from 'node:fs/promises';
-import { DatabaseSync } from 'node:sqlite';
-import { patiently } from "../../shared/fs/patiently.js";
-import { isBusy } from "../../shared/sqlite/is-busy.js";
-import { isCantOpen } from "../../shared/sqlite/is-cant-open.js";
+import { FileLock, patiently } from '@zukhruf/fs';
 import { Caller } from "./caller.js";
-/** Garbage collection closes a connection nobody references, which would end a presence its caller still holds. */
-const open = new Set();
 /**
- * A caller's presence: an exclusive SQLite transaction on a file of its own,
- * held from before the caller's record (a lock file, a ticket, or the holder
- * record of `SqliteStore`) appears until after it is gone. The kernel ends it
- * when the caller's process or thread stops, however it stops, so a waiter
- * that can read the file knows the caller is gone. Nothing may open the file
- * except through SQLite: closing any other handle to it drops this process's
- * lock without a word.
+ * A caller's presence: the file lock of a file of its own, held from before
+ * the caller's record (a lock file, a ticket, or the holder record of
+ * `SqliteStore`) appears until after it is gone. The kernel ends it when the
+ * caller's process or thread stops, however it stops, so a waiter that can
+ * check the file knows the caller is gone.
  */
 export class Presence {
     #path;
-    #database;
-    constructor(path, database) {
+    #lock;
+    constructor(path, lock) {
         this.#path = path;
-        this.#database = database;
+        this.#lock = lock;
     }
     /** The length of what `pathOf` adds to a record's path. */
     static suffixLength = Presence.pathOf('', Caller.current()).length;
@@ -29,62 +21,33 @@ export class Presence {
     static pathOf(record, caller) {
         return `${record}.${caller.id}.presence`;
     }
-    static claim(path) {
-        const database = new DatabaseSync(path, { timeout: 0 });
-        try {
-            // A journal on disk would outlive a caller that dies while present.
-            database.exec('PRAGMA journal_mode = MEMORY');
-            database.exec('BEGIN EXCLUSIVE');
-        }
-        catch (error) {
-            database.close();
-            throw error;
-        }
-        open.add(database);
-        return new Presence(path, database);
-    }
-    /**
-     * Whether the caller behind `path` still runs. Reading needs a lock that the
-     * caller's exclusive transaction refuses, and opening read-only never creates
-     * the file.
-     */
-    static check(path) {
-        let database;
-        try {
-            database = new DatabaseSync(path, { readOnly: true, timeout: 0 });
-        }
-        catch (error) {
-            // A file that exists but cannot be opened is a fault, not a missing presence.
-            if (isCantOpen(error) && !existsSync(path))
-                return 'missing';
-            throw error;
-        }
-        try {
-            database.prepare('SELECT count(*) FROM sqlite_schema').get();
-            return 'gone';
-        }
-        catch (error) {
-            if (isBusy(error))
-                return 'present';
-            throw error;
-        }
-        finally {
-            database.close();
+    /** Claims the presence of `caller`, whose record is at `record`. */
+    static claim(record, caller) {
+        const path = Presence.pathOf(record, caller);
+        using opened = new DisposableStack();
+        const lock = opened.use(FileLock.open(path));
+        if (!lock.tryLock()) {
+            throw new Error(`The presence file ${JSON.stringify(path)} is locked already, but it belongs to one caller only. Another program opened it.`);
         }
+        opened.move();
+        return new Presence(path, lock);
     }
     /**
      * Whether `caller`, whom the record at `record` named, still runs. A caller's
      * record goes before its presence file, so a missing presence file is a
-     * fault while `stillNamed` says the record names the caller, and means the
-     * caller `moved` on when it does not.
+     * fault while `readNamed` still reads the caller from the record, and means
+     * the caller `moved` on when it does not.
      */
-    static async judge(record, caller, stillNamed) {
+    static async judge(record, caller, readNamed) {
         const path = Presence.pathOf(record, caller);
-        const state = Presence.check(path);
-        if (state !== 'missing')
-            return state;
-        if (await stillNamed())
+        const state = FileLock.check(path);
+        if (state === 'locked')
+            return 'present';
+        if (state === 'unlocked')
+            return 'gone';
+        if ((await readNamed())?.id === caller.id) {
             throw Presence.missing(record, path);
+        }
         return 'moved';
     }
     /** Whether the caller that `readNamed` reads from the record at `record` still runs. Writes nothing. */
@@ -93,7 +56,7 @@ export class Presence {
             const caller = await readNamed();
             if (!caller)
                 return false;
-            const state = await Presence.judge(record, caller, async () => (await readNamed())?.id === caller.id);
+            const state = await Presence.judge(record, caller, readNamed);
             if (state !== 'moved')
                 return state === 'present';
         }
@@ -113,9 +76,7 @@ export class Presence {
     }
     /** Lets the kernel lock go. The file stays for whoever removes the caller's record. */
     end() {
-        open.delete(this.#database);
-        this.#database.exec('ROLLBACK');
-        this.#database.close();
+        this.#lock[Symbol.dispose]();
     }
     /**
      * Removes the caller's record, then ends this presence and deletes its file.