@zukhruf/mutex 0.1.0 → 0.3.0

package/dist/lock-stores/remote/lock-coordinator.js

@@ -1,5 +1,5 @@
-import { setTimeout as delay } from 'node:timers/promises';
 import { FencingToken } from "../../fencing/fencing-token.js";
+import { Latch } from "../../shared/latch.js";
 import { untilAborted } from "../../shared/until-aborted.js";
 import { MemoryStore } from "../memory/memory-store.js";
 /**
@@ -7,29 +7,29 @@ import { MemoryStore } from "../memory/memory-store.js";
  * connections. A peer that disconnects releases everything it held or waited for.
  */
 export class LockCoordinator {
-    #store;
-    #graceOver;
-    #reassertions = new Map();
-    #inGrace;
+    #phase;
     constructor({ tokens, graceWindow = 0 }) {
-        this.#store = new MemoryStore({ tokens });
-        this.#inGrace = graceWindow > 0;
-        this.#graceOver = this.#inGrace
-            ? delay(graceWindow, undefined, { ref: false }).then(() => {
-                this.#inGrace = false;
-                this.#reassertions.clear();
-            })
-            : Promise.resolve();
-    }
-    async acquire(key, { signal } = {}) {
-        await untilAborted(this.#graceOver, signal);
-        return this.#store.acquire(key, { signal });
+        const store = new MemoryStore({ tokens });
+        const granting = new Granting(store);
+        if (graceWindow > 0) {
+            const over = new Latch();
+            this.#phase = new GraceWindow(store, over, granting);
+            setTimeout(() => {
+                // Granting is current before the latch lets the waiters resume.
+                this.#phase = granting;
+                over.open();
+            }, graceWindow).unref();
+        }
+        else {
+            this.#phase = granting;
+        }
+    }
+    async acquire(key, options = {}) {
+        return this.#phase.acquire(key, options);
     }
     /** Nothing is granted during the grace window, so a key counts as busy then. */
     async tryAcquire(key) {
-        if (this.#inGrace)
-            return undefined;
-        return this.#store.tryAcquire(key);
+        return this.#phase.tryAcquire(key);
     }
     serve(connection) {
         new Session(this, connection);
@@ -37,39 +37,70 @@ export class LockCoordinator {
     /**
      * Re-registers a holder from before a failover. Accepted only during the
      * grace window; for two claims on one key the newer token wins and the older
-     * claim's `lose` is called. Resolves `undefined` when the claim is refused.
+     * claim's `lose` is called. Returns `undefined` when the claim is refused.
      */
     reassert(key, token, lose) {
-        if (!this.#inGrace)
-            return undefined;
+        return this.#phase.reassert(key, token, lose);
+    }
+}
+/** The only phase that grants. A holder that reasserts now is too late. */
+class Granting {
+    #store;
+    constructor(store) {
+        this.#store = store;
+    }
+    acquire(key, { signal }) {
+        return this.#store.acquire(key, { signal });
+    }
+    tryAcquire(key) {
+        return this.#store.tryAcquire(key);
+    }
+    reassert() {
+        return undefined;
+    }
+}
+/** Grants nothing, so holders from a previous coordinator can reassert their keys first. */
+class GraceWindow {
+    #store;
+    #over;
+    #next;
+    #reassertions = new Map();
+    constructor(store, over, next) {
+        this.#store = store;
+        this.#over = over;
+        this.#next = next;
+    }
+    async acquire(key, { signal }) {
+        await untilAborted(this.#over.wait(), signal);
+        return this.#next.acquire(key, { signal });
+    }
+    async tryAcquire() {
+        return undefined;
+    }
+    reassert(key, token, lose) {
         const existing = this.#reassertions.get(key);
         if (existing && !token.isNewerThan(existing.token))
             return undefined;
+        // Waiters join the line only after grace, so this claim is next once the
+        // claim it outranks gives the key back, even if that claim already let it go.
+        const lease = this.#store.acquire(key);
         existing?.lose();
-        // Nothing is granted during grace, so the first claim gets the key at once
-        // and a newer claim takes over that same lease.
-        const lease = existing?.lease ?? this.#store.acquire(key);
-        this.#reassertions.set(key, { token, lease, lose });
+        this.#reassertions.set(key, { token, lose });
         return lease;
     }
 }
 class Session {
     #coordinator;
-    #connection;
-    #leases = new Map();
     #requested = new Set();
-    #lost = new Set();
-    #closed = false;
+    #phase;
     constructor(coordinator, connection) {
         this.#coordinator = coordinator;
-        this.#connection = connection;
-        connection.listen({
-            message: (request) => {
-                this.#handle(request).catch(() => connection.close());
-            },
-            close: () => {
-                void this.#close();
-            },
+        this.#phase = new Serving(connection);
+        connection.on('message', (request) => {
+            this.#handle(request).catch(() => connection.close());
+        });
+        connection.once('close', () => {
+            void this.#end();
         });
     }
     async #handle(request) {
@@ -80,7 +111,7 @@ class Session {
                     return;
                 this.#requested.add(request.id);
                 const lease = await this.#coordinator.acquire(request.key);
-                return this.#grant(request.id, lease);
+                return this.#grant(lease, request.id);
             }
             case 'try': {
                 if (this.#requested.has(request.id))
@@ -89,62 +120,102 @@ class Session {
                 const lease = await this.#coordinator.tryAcquire(request.key);
                 if (!lease) {
                     this.#requested.delete(request.id);
-                    return this.#reply({ op: 'busy', id: request.id });
+                    return this.#phase.reply({ op: 'busy', id: request.id });
                 }
-                return this.#grant(request.id, lease);
+                return this.#grant(lease, request.id);
             }
             case 'cancel': {
                 // A request still in line is released by #grant when its turn comes.
                 this.#requested.delete(request.id);
-                return this.#releaseLease(request.id);
+                return this.#phase.release(request.id);
             }
             case 'release': {
                 this.#requested.delete(request.id);
-                return this.#releaseLease(request.id);
+                return this.#phase.release(request.id);
             }
             case 'reassert': {
+                // Registered like any request, so a release that arrives before the claim resolves gives the key back.
+                if (this.#requested.has(request.id))
+                    return;
+                this.#requested.add(request.id);
                 const claim = this.#coordinator.reassert(request.key, new FencingToken(BigInt(request.token)), () => this.#lose(request.id));
-                if (!claim)
-                    return this.#reply({ op: 'rejected', id: request.id });
+                if (!claim) {
+                    this.#requested.delete(request.id);
+                    return this.#phase.reply({ op: 'rejected', id: request.id });
+                }
                 const lease = await claim;
-                if (this.#lost.has(request.id))
-                    return;
-                if (this.#closed)
+                if (!this.#requested.has(request.id)) {
                     return lease[Symbol.asyncDispose]();
-                this.#leases.set(request.id, lease);
-                return;
+                }
+                return this.#phase.keep(lease, request.id);
             }
         }
     }
-    /** A request cancelled or a peer gone while the grant was on its way releases the key at once. */
-    #grant(id, lease) {
-        if (this.#closed || !this.#requested.has(id)) {
+    /** A request cancelled while the grant was on its way releases the key at once. */
+    #grant(lease, id) {
+        if (!this.#requested.has(id))
             return lease[Symbol.asyncDispose]();
-        }
-        this.#leases.set(id, lease);
-        return this.#reply({ op: 'granted', id, token: lease.token.toString() });
+        return this.#phase.grant(lease, id);
     }
-    #releaseLease(id) {
-        const lease = this.#leases.get(id);
-        this.#leases.delete(id);
-        return lease?.[Symbol.asyncDispose]();
-    }
-    /** A newer claim took this session's reasserted lease over, so it must not release it. */
+    /** A newer claim outranked this session's reassertion, so the key goes to that claim next. */
     #lose(id) {
-        this.#lost.add(id);
-        this.#leases.delete(id);
-        void this.#reply({ op: 'rejected', id });
+        // A holder that already released has nothing to give back and nothing to learn.
+        if (!this.#requested.delete(id))
+            return;
+        this.#phase.lose(id);
     }
-    async #reply(response) {
+    /** Ends Serving before its leases are released, so a grant that arrives meanwhile is given back too. */
+    async #end() {
+        const serving = this.#phase;
+        this.#phase = new Ended();
+        await serving.end();
+    }
+}
+/** The peer is connected: the session keeps its leases and answers it. */
+class Serving {
+    #connection;
+    #leases = new Map();
+    constructor(connection) {
+        this.#connection = connection;
+    }
+    async reply(response) {
         // A failed send means the peer is gone; `close` then releases its leases.
         await this.#connection.send(response).catch(() => { });
     }
-    async #close() {
-        this.#closed = true;
+    async grant(lease, id) {
+        this.#leases.set(id, lease);
+        await this.reply({ op: 'granted', id, token: lease.token.toString() });
+    }
+    async keep(lease, id) {
+        this.#leases.set(id, lease);
+    }
+    async release(id) {
+        const lease = this.#leases.get(id);
+        this.#leases.delete(id);
+        await lease?.[Symbol.asyncDispose]();
+    }
+    lose(id) {
+        void this.release(id);
+        void this.reply({ op: 'rejected', id });
+    }
+    async end() {
         const leases = [...this.#leases.values()];
         this.#leases.clear();
         for (const lease of leases)
             await lease[Symbol.asyncDispose]();
     }
 }
+/** The peer is gone: a lease that still arrives is given back at once, and nothing is answered. */
+class Ended {
+    async reply() { }
+    async grant(lease) {
+        await lease[Symbol.asyncDispose]();
+    }
+    async keep(lease) {
+        await lease[Symbol.asyncDispose]();
+    }
+    async release() { }
+    lose() { }
+    async end() { }
+}
 //# sourceMappingURL=lock-coordinator.js.map

package/dist/lock-stores/remote/lock-coordinator.js.map

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

package/dist/lock-stores/remote/remote-lock-client.d.ts

@@ -1,17 +1,18 @@
 import type { Lease } from '../../mutex/lease.ts';
 import type { AcquireOptions, LockStore } from '../../mutex/lock-store.ts';
-import type { Connector } from './connector.ts';
+import type { ConnectionSupervisor } from './connection-supervisor.ts';
+import type { LockRequest, LockResponse } from './protocol.ts';
 /**
- * Asks a coordinator for keys over a connection. When the connection drops, it
- * asks its connector for another, reasserts the keys it holds and re-requests
- * the ones it waits for. A held key whose reassertion is refused is lost.
+ * Asks a coordinator for keys over a supervised connection. When the
+ * connection is replaced, it reasserts the keys it holds and asks again for the
+ * ones it waits for. A held key whose reassertion is refused is lost.
  */
 export declare class RemoteLockClient implements LockStore {
     #private;
-    constructor(connector: Connector);
+    constructor(link: ConnectionSupervisor<LockRequest, LockResponse>);
     acquire(key: string, { signal }?: AcquireOptions): Promise<Lease>;
     tryAcquire(key: string): Promise<Lease | undefined>;
-    /** Disconnects for good; the coordinator releases whatever this client still holds. */
-    close(): void;
+    /** Disconnects for good. Over a socket, the coordinator then releases whatever this client still holds. */
+    close(): Promise<void>;
 }
 //# sourceMappingURL=remote-lock-client.d.ts.map

package/dist/lock-stores/remote/remote-lock-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-lock-client.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/remote/remote-lock-client.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAE3E,OAAO,KAAK,EAAoB,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAgBlE;;;;GAIG;AACH,qBAAa,gBAAiB,YAAW,SAAS;;gBASpC,SAAS,EAAE,SAAS;IAI1B,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,GAAE,cAAmB,GAAG,OAAO,CAAC,KAAK,CAAC;IA0BrE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAqFzD,uFAAuF;IACvF,KAAK;CA0CN"}
+{"version":3,"file":"remote-lock-client.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/remote/remote-lock-client.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAE3E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEvE,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAmB/D;;;;GAIG;AACH,qBAAa,gBAAiB,YAAW,SAAS;;gBAMpC,IAAI,EAAE,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC;IAY3D,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,GAAE,cAAmB,GAAG,OAAO,CAAC,KAAK,CAAC;IAmBrE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAMzD,2GAA2G;IACrG,KAAK;CA0HZ"}

package/dist/lock-stores/remote/remote-lock-client.js

@@ -4,26 +4,30 @@ import { LockLostError } from "../../mutex/lock-lost-error.js";
 import { untilAborted } from "../../shared/until-aborted.js";
 import { CoordinatorUnavailableError } from "./coordinator-unavailable-error.js";
 /**
- * Asks a coordinator for keys over a connection. When the connection drops, it
- * asks its connector for another, reasserts the keys it holds and re-requests
- * the ones it waits for. A held key whose reassertion is refused is lost.
+ * Asks a coordinator for keys over a supervised connection. When the
+ * connection is replaced, it reasserts the keys it holds and asks again for the
+ * ones it waits for. A held key whose reassertion is refused is lost.
  */
 export class RemoteLockClient {
-    #connector;
+    #link;
     #pending = new Map();
     #held = new Map();
     #lost = new Set();
-    #connection;
-    #current;
-    #closed = false;
-    constructor(connector) {
-        this.#connector = connector;
+    constructor(link) {
+        this.#link = link;
+        link.on('connected', () => this.#resume());
+        link.on('message', (response) => this.#receive(response));
+        link.on('disconnected', () => this.#interrupt());
+        // Held keys stay exclusive: no coordinator is left to grant them to anyone else.
+        link.on('unavailable', () => this.#rejectAll((key) => new CoordinatorUnavailableError(key)));
+        link.on('failed', (error) => this.#fail(error));
     }
     async acquire(key, { signal } = {}) {
         signal?.throwIfAborted();
         const id = randomUUID();
+        const { answer } = this.#request(id, key, 'acquire');
         try {
-            const token = await untilAborted(this.#request(id, key, 'acquire'), signal);
+            const token = await untilAborted(answer.promise, signal);
             // The coordinator answers 'busy' only to a try; an acquire waits for its grant.
             if (!token) {
                 throw new Error(`The lock coordinator answered 'busy' to an acquire of key "${key}".`);
@@ -31,39 +35,52 @@ export class RemoteLockClient {
             return this.#hold(id, key, token);
         }
         catch (error) {
-            if (signal?.aborted && this.#current) {
-                void this.#send(this.#current, { op: 'cancel', id });
-            }
+            if (signal?.aborted)
+                this.#withdraw(id);
             throw error;
         }
-        finally {
-            this.#pending.delete(id);
-            this.#updateRef();
-        }
     }
     async tryAcquire(key) {
         const id = randomUUID();
-        try {
-            const token = await this.#request(id, key, 'try');
-            return token && this.#hold(id, key, token);
-        }
-        finally {
-            this.#pending.delete(id);
-            this.#updateRef();
-        }
+        const token = await this.#request(id, key, 'try').answer.promise;
+        return token && this.#hold(id, key, token);
     }
-    async #request(id, key, attempt) {
-        if (this.#closed)
+    /** Disconnects for good. Over a socket, the coordinator then releases whatever this client still holds. */
+    async close() {
+        const closing = this.#link.close();
+        this.#rejectAll(() => new Error('This lock client is closed.'));
+        await closing;
+    }
+    #request(id, key, attempt) {
+        if (this.#link.status === 'closed') {
             throw new Error('This lock client is closed.');
-        const answer = Promise.withResolvers();
-        this.#pending.set(id, { key, attempt, answer });
-        this.#updateRef();
-        this.#connection ??= this.#open();
-        const connection = await this.#connection;
-        if (!connection)
+        }
+        if (this.#link.status === 'unavailable') {
             throw new CoordinatorUnavailableError(key);
-        void this.#send(connection, { op: attempt, id, key });
-        return answer.promise;
+        }
+        const pending = {
+            key,
+            attempt,
+            delivery: 'queued',
+            answer: Promise.withResolvers(),
+        };
+        this.#pending.set(id, pending);
+        this.#updateRef();
+        this.#link.open();
+        this.#dispatch(id, pending);
+        return pending;
+    }
+    #dispatch(id, pending) {
+        const { key, attempt } = pending;
+        if (this.#link.send({ op: attempt, id, key }))
+            pending.delivery = 'sent';
+    }
+    /** The caller gave up. A grant already on its way is given back by the coordinator on `cancel`. */
+    #withdraw(id) {
+        const pending = this.#take(id);
+        if (!pending || pending.delivery === 'sent') {
+            this.#link.send({ op: 'cancel', id });
+        }
     }
     #hold(id, key, token) {
         this.#held.set(id, { key, token });
@@ -74,40 +91,27 @@ export class RemoteLockClient {
                 const wasHeld = this.#held.delete(id);
                 if (this.#lost.delete(id))
                     throw new LockLostError(key);
-                if (wasHeld && this.#current) {
-                    await this.#send(this.#current, { op: 'release', id });
-                }
+                // Without an open connection there is nothing to tell: the coordinator that granted the key is gone.
+                if (wasHeld)
+                    this.#link.send({ op: 'release', id });
             },
         };
     }
-    async #open() {
-        const connection = await this.#connector.connect();
-        if (!connection) {
-            this.#connection = undefined;
-            return undefined;
-        }
-        this.#current = connection;
-        connection.listen({
-            message: (response) => this.#receive(connection, response),
-            close: () => this.#reconnect(connection),
-        });
-        this.#updateRef();
-        return connection;
-    }
-    #receive(connection, response) {
-        const pending = this.#pending.get(response.id);
+    #receive(response) {
         switch (response.op) {
-            case 'granted':
+            case 'granted': {
+                const pending = this.#take(response.id);
                 if (pending) {
                     pending.answer.resolve(new FencingToken(BigInt(response.token)));
                 }
                 else {
                     // Nobody waits for this grant any more (the request was cancelled), so give the key back.
-                    void this.#send(connection, { op: 'release', id: response.id });
+                    this.#link.send({ op: 'release', id: response.id });
                 }
                 return;
+            }
             case 'busy':
-                pending?.answer.resolve(undefined);
+                this.#take(response.id)?.answer.resolve(undefined);
                 return;
             case 'rejected':
                 if (this.#held.delete(response.id))
@@ -115,58 +119,54 @@ export class RemoteLockClient {
                 return;
         }
     }
-    async #send(connection, request) {
-        try {
-            await connection.send(request);
+    /** A new connection: reassert held keys first, then send what waits. */
+    #resume() {
+        // A new connection starts with its adapter's default, which may not match whether this client waits.
+        this.#updateRef();
+        for (const [id, { key, token }] of this.#held) {
+            this.#link.send({ op: 'reassert', id, key, token: token.toString() });
         }
-        catch {
-            this.#reconnect(connection);
+        for (const [id, pending] of this.#pending) {
+            // A try is one attempt; the coordinator that would have answered it is gone.
+            if (pending.delivery === 'stranded')
+                this.#take(id)?.answer.resolve(undefined);
+            else if (pending.delivery === 'queued')
+                this.#dispatch(id, pending);
         }
     }
-    /** Disconnects for good; the coordinator releases whatever this client still holds. */
-    close() {
-        this.#closed = true;
-        const current = this.#current;
-        this.#current = undefined;
-        current?.close();
+    #interrupt() {
+        for (const pending of this.#pending.values()) {
+            if (pending.delivery !== 'sent')
+                continue;
+            pending.delivery = pending.attempt === 'try' ? 'stranded' : 'queued';
+        }
     }
-    #reconnect(lost) {
-        if (this.#closed || this.#current !== lost)
-            return;
-        this.#current = undefined;
-        lost.close();
-        this.#connection = this.#open();
-        void this.#connection.then((connection) => this.#resume(connection));
+    /** No coordinator heard the reassertions, so another holder may be granted the held keys. */
+    #fail(error) {
+        for (const id of this.#held.keys())
+            this.#lost.add(id);
+        this.#held.clear();
+        this.#rejectAll(() => error);
     }
-    async #resume(connection) {
-        if (!connection) {
-            // Held keys stay exclusive: no coordinator is left to grant them to anyone else.
-            for (const { key, answer } of this.#pending.values()) {
-                answer.reject(new CoordinatorUnavailableError(key));
-            }
-            return;
-        }
-        for (const [id, { key, token }] of this.#held) {
-            await this.#send(connection, {
-                op: 'reassert',
-                id,
-                key,
-                token: token.toString(),
-            });
-        }
-        for (const [id, { key, attempt, answer }] of this.#pending) {
-            // A try is one attempt; the coordinator that would have answered it is gone.
-            if (attempt === 'try')
-                answer.resolve(undefined);
-            else
-                await this.#send(connection, { op: 'acquire', id, key });
+    #rejectAll(reason) {
+        for (const [id, { key }] of this.#pending) {
+            this.#take(id)?.answer.reject(reason(key));
         }
     }
+    /** Removes a request that is about to be answered, so a late grant for it is given back. */
+    #take(id) {
+        const pending = this.#pending.get(id);
+        if (!pending)
+            return undefined;
+        this.#pending.delete(id);
+        this.#updateRef();
+        return pending;
+    }
     #updateRef() {
         if (this.#pending.size > 0)
-            this.#current?.ref();
+            this.#link.ref();
         else
-            this.#current?.unref();
+            this.#link.unref();
     }
 }
 //# sourceMappingURL=remote-lock-client.js.map