@zukhruf/single-flight 0.3.20 → 0.3.21

package/dist/coordinator/flight-coordinator.js

@@ -1,186 +1,135 @@
-import { Latch } from '@zukhruf/async';
 import { Flight } from "./flight.js";
+import { ParkedRuns } from "./parked-runs.js";
 import { Session } from "./session.js";
 /**
  * Coordinates the flights of one term. A run leads a new flight of its key, or
  * joins the flight of that key in progress, in one step, so two runs never
  * both lead. The outcome is pushed to every joiner as soon as it lands.
+ *
+ * A key whose lock another process holds, while no flight of it is known
+ * here, runs the work of a leader that has not reasserted its flight yet, so
+ * its runs and rejoins wait for that flight or for the lock to free. A leader
+ * keeps its flight while its process lives.
  */
 export class FlightCoordinator {
-    #phase;
-    constructor({ tokens, graceWindow }) {
-        const flights = new Map();
-        const coordinating = new Coordinating(flights, tokens);
-        if (graceWindow > 0) {
-            const over = new Latch();
-            this.#phase = new GraceWindow(flights, over, coordinating);
-            setTimeout(() => {
-                // Coordinating is current before the latch lets the waiting runs resume.
-                this.#phase = coordinating;
-                over.open();
-            }, graceWindow).unref();
-        }
-        else {
-            this.#phase = coordinating;
-        }
-    }
-    /**
-     * Whether the next coordinator would find nothing to recover: no flight is
-     * in progress, and the grace window is over or there was none.
-     */
-    get leavesNothingToRecover() {
-        return this.#phase.leavesNothingToRecover;
+    #flights = new Map();
+    /** The latest ending of a reasserted flight, per key. */
+    #endings = new Map();
+    #tokens;
+    #locks;
+    #parked;
+    #closing = new AbortController();
+    constructor({ tokens, locks }) {
+        this.#tokens = tokens;
+        this.#locks = locks;
+        this.#parked = new ParkedRuns(locks, this.#closing.signal);
     }
     serve(connection) {
         new Session(this, connection);
     }
-    run(party, key) {
-        return this.#phase.run(party, key);
-    }
-    /** A joiner that lost its connection, back for the flight it joined: it never leads, so its work never runs twice. */
-    rejoin(party, key, flight) {
-        return this.#phase.rejoin(party, key, flight);
-    }
-    reassert(party, key, token) {
-        this.#phase.reassert(party, key, token);
-    }
-    land(flight, outcome) {
-        this.#phase.land(flight, outcome);
-    }
-    /** The leader withdrew or its connection is gone. */
-    interrupt(flight) {
-        this.#phase.interrupt(flight);
-    }
-}
-/** The only phase that starts flights. A leader that reasserts now is too late. */
-class Coordinating {
-    #flights;
-    #tokens;
-    constructor(flights, tokens) {
-        this.#flights = flights;
-        this.#tokens = tokens;
-    }
-    get leavesNothingToRecover() {
-        return this.#flights.size === 0;
+    /** Stops watching the locks of the keys whose runs wait. */
+    close() {
+        this.#closing.abort();
     }
+    /** Rejects only when no token can be minted. */
     async run(party, key) {
         // A token that goes unused is harmless: tokens only need to grow.
-        const token = await this.#tokens.next(key);
-        // The client may have withdrawn the run while the token was minted.
-        if (!party.waiting)
-            return;
-        const inProgress = this.#flights.get(key);
-        if (inProgress)
-            return inProgress.add(party);
-        const flight = new Flight(key, token, party);
-        this.#flights.set(key, flight);
-        party.lead(flight);
+        this.#decide(party, key, await this.#tokens.next(key));
     }
-    /** A rejoin joins only its own flight; any other answer could be a second run of the work. */
-    async rejoin(party, key, flight) {
+    /**
+     * A joiner that lost its connection, back for the flight it joined: it never
+     * leads, so its work never runs twice. A rejoin joins only its own flight;
+     * any other answer could be a second run of the work.
+     */
+    rejoin(party, key, flight) {
         if (!party.waiting)
             return;
         const inProgress = this.#flights.get(key);
         if (inProgress?.is(flight))
             return inProgress.add(party);
+        const ending = this.#endings.get(key);
+        if (ending?.flight.is(flight))
+            return party.end(ending.answer);
+        // Its leader may still run the work, and not have reasserted it yet.
+        if (!inProgress && this.#held(key)) {
+            return this.#parked.park(key, party, () => this.rejoin(party, key, flight));
+        }
         party.end({ op: 'interrupted' });
     }
-    reassert(party) {
-        party.end({ op: 'rejected' });
+    /**
+     * A leader claims its flight again after its connection was lost. The same
+     * flight, through a new connection, stays one flight with its joiners. For
+     * two flights of one key, the newer token wins, and the older flight is lost.
+     */
+    reassert(party, key, token) {
+        const claimed = this.#flights.get(key);
+        if (claimed?.token.value === token.value)
+            return claimed.handOver(party);
+        if (claimed && !token.isNewerThan(claimed.token)) {
+            return party.end({ op: 'rejected' });
+        }
+        if (claimed) {
+            claimed.leader.end({ op: 'rejected' });
+            this.interrupt(claimed);
+        }
+        this.#start(new Flight(key, token, party, { reasserted: true }), (flight) => party.resume(flight));
     }
     land(flight, outcome) {
-        this.#forget(flight);
+        this.#end(flight, { op: 'landed', outcome });
         flight.land(outcome);
     }
+    /** The leader withdrew or its connection is gone. */
     interrupt(flight) {
-        this.#forget(flight);
+        this.#end(flight, { op: 'interrupted' });
         flight.interrupt();
     }
-    #forget(flight) {
+    /** Every new flight takes the runs parked on its key, in the step that starts it. */
+    #start(flight, tell) {
+        this.#flights.set(flight.key, flight);
+        tell(flight);
+        this.#parked.wake(flight.key);
+    }
+    #end(flight, answer) {
         if (this.#flights.get(flight.key) === flight) {
             this.#flights.delete(flight.key);
         }
-    }
-}
-/** Starts no flight, so leaders from a previous coordinator can reassert theirs first. */
-class GraceWindow {
-    #flights;
-    #over;
-    #next;
-    #endings = new Map();
-    /** Wakes the rejoins that wait for a reassertion of their key. */
-    #wakers = new Map();
-    constructor(flights, over, next) {
-        this.#flights = flights;
-        this.#over = over;
-        this.#next = next;
-    }
-    /** A leader of the previous term may not have reasserted its flight yet, so this coordinator cannot know. */
-    get leavesNothingToRecover() {
-        return false;
-    }
-    /** A fresh run leads or joins only once every leader had its chance to reassert. */
-    async run(party, key) {
-        await this.#over.wait();
-        return this.#next.run(party, key);
+        if (flight.reasserted)
+            this.#endings.set(flight.key, { flight, answer });
     }
     /**
-     * A rejoin gets its flight's outcome when the flight's leader reasserted it
-     * and it ends during the window, and joins it while it is in progress. Once
-     * the window ends, it is answered as in any other phase.
+     * Joins the flight of `key` in progress, waits while another process holds
+     * the key, or leads. A flight of the key that starts while the run waits
+     * takes it in the step that starts it, so a landing read right behind a
+     * reassertion reaches it.
      */
-    async rejoin(party, key, flight) {
-        const over = this.#over.wait().then(() => 'over');
-        for (;;) {
-            if (!party.waiting)
-                return;
-            const inProgress = this.#flights.get(key);
-            if (inProgress?.is(flight))
-                return inProgress.add(party);
-            const ending = this.#endings.get(key);
-            if (ending?.flight.is(flight)) {
-                return party.end('landed' in ending
-                    ? { op: 'landed', outcome: ending.landed }
-                    : { op: 'interrupted' });
-            }
-            const woken = await Promise.race([over, this.#reassertionOf(key)]);
-            if (woken === 'over')
-                return this.#next.rejoin(party, key, flight);
+    #decide(party, key, token) {
+        // The client may have withdrawn the run while the token was minted or while it waited.
+        if (!party.waiting || this.#join(party, key))
+            return;
+        if (this.#held(key)) {
+            return this.#parked.park(key, party, () => this.#decide(party, key, token));
         }
+        // No flight of the key started while the run waited, so its token is still newer than every flight of the key.
+        this.#start(new Flight(key, token, party), (flight) => party.lead(flight));
     }
-    /** For two claims on one key, the newer token wins, and the older flight is lost. */
-    reassert(party, key, token) {
-        const claimed = this.#flights.get(key);
-        if (claimed && !token.isNewerThan(claimed.token)) {
-            return party.end({ op: 'rejected' });
+    /** Joins `party` to the flight of `key` in progress, if there is one. */
+    #join(party, key) {
+        const inProgress = this.#flights.get(key);
+        inProgress?.add(party);
+        return inProgress !== undefined;
+    }
+    /**
+     * The lock check is advice only (F5). A fault answers "not held", so the
+     * run leads and its leader's own lock decides; a fault never rejects a run
+     * or a rejoin, which would close its connection.
+     */
+    #held(key) {
+        try {
+            return this.#locks.isHeld(key);
         }
-        if (claimed) {
-            claimed.leader.end({ op: 'rejected' });
-            this.interrupt(claimed);
+        catch {
+            return false;
         }
-        const flight = new Flight(key, token, party);
-        this.#flights.set(key, flight);
-        party.resume(flight);
-        const wakers = this.#wakers.get(key);
-        this.#wakers.delete(key);
-        for (const wake of wakers ?? [])
-            wake();
-    }
-    land(flight, outcome) {
-        this.#endings.set(flight.key, { flight, landed: outcome });
-        this.#next.land(flight, outcome);
-    }
-    interrupt(flight) {
-        this.#endings.set(flight.key, { flight, interrupted: true });
-        this.#next.interrupt(flight);
-    }
-    #reassertionOf(key) {
-        const { promise, resolve } = Promise.withResolvers();
-        let wakers = this.#wakers.get(key);
-        if (!wakers)
-            this.#wakers.set(key, (wakers = new Set()));
-        wakers.add(() => resolve('reasserted'));
-        return promise;
     }
 }
 //# sourceMappingURL=flight-coordinator.js.map

package/dist/coordinator/flight-coordinator.js.map

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

package/dist/coordinator/flight-server.d.ts

@@ -1,7 +1,8 @@
 import type { Term } from '@zukhruf/election';
+import type { KeyLocks } from '../key-lock/key-locks.ts';
 export interface FlightServerOptions {
-    /** Milliseconds the new term starts no flight, so leaders from the last term can reassert theirs. */
-    graceWindow: number;
+    /** The kernel locks on the keys, which the coordinator checks before a run leads. */
+    locks: KeyLocks;
 }
 /**
  * Serves a `FlightCoordinator` on a Unix socket for one term. Lease tokens
@@ -12,18 +13,17 @@ export interface FlightServerOptions {
 export declare class FlightServer {
     #private;
     private constructor();
-    static start(socketPath: string, term: Term, { graceWindow }: FlightServerOptions): Promise<FlightServer>;
+    static start(socketPath: string, term: Term, { locks }: FlightServerOptions): Promise<FlightServer>;
     /**
      * Hands the term over. Ending every connection tells the other processes to
-     * elect a successor and reassert their flights during its grace window;
-     * `close` alone would wait for clients that never disconnect on their own.
+     * elect a successor and reassert their flights to it; `close` alone would
+     * wait for clients that never disconnect on their own.
      * Each connection ends only after what was written to it, such as an
      * outcome for a joiner, is sent. The term ends only after the socket is
      * gone: in the other order, this close could remove a successor's socket file.
-     * The term resigns clean when the coordinator leaves nothing to recover, so
-     * the successor skips its grace window; a lost term records nothing.
      * The first call removes the file at once, so a second caller finds it gone,
      * and it too resolves only once the term ended as the first call ended it.
+     * The coordinator stops watching the locks of the keys whose runs wait.
      */
     close(): Promise<void>;
 }

package/dist/coordinator/flight-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flight-server.d.ts","sourceRoot":"","sources":["../../src/coordinator/flight-server.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAQ9C,MAAM,WAAW,mBAAmB;IAClC,qGAAqG;IACrG,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;GAKG;AACH,qBAAa,YAAY;;IAOvB,OAAO;WAaM,KAAK,CAChB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,IAAI,EACV,EAAE,WAAW,EAAE,EAAE,mBAAmB,GACnC,OAAO,CAAC,YAAY,CAAC;IAkCxB;;;;;;;;;;;OAWG;IACG,KAAK;CAaZ"}
+{"version":3,"file":"flight-server.d.ts","sourceRoot":"","sources":["../../src/coordinator/flight-server.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAK9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAIzD,MAAM,WAAW,mBAAmB;IAClC,qFAAqF;IACrF,KAAK,EAAE,QAAQ,CAAC;CACjB;AAED;;;;;GAKG;AACH,qBAAa,YAAY;;IAOvB,OAAO;WAaM,KAAK,CAChB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,IAAI,EACV,EAAE,KAAK,EAAE,EAAE,mBAAmB,GAC7B,OAAO,CAAC,YAAY,CAAC;IAkCxB;;;;;;;;;;OAUG;IACG,KAAK;CAQZ"}

package/dist/coordinator/flight-server.js

@@ -24,7 +24,7 @@ export class FlightServer {
         this.#term = term;
         this.#closeOnLoss = addAbortListener(term.signal, () => void this.close());
     }
-    static async start(socketPath, term, { graceWindow }) {
+    static async start(socketPath, term, { locks }) {
         // Only the coordinator gets here, so removing a dead coordinator's socket file cannot race another server.
         // Windows removes a named pipe when its process stops, so there is no file to remove.
         if (process.platform !== 'win32') {
@@ -32,7 +32,7 @@ export class FlightServer {
         }
         const coordinator = new FlightCoordinator({
             tokens: new EpochTokenSource(term.epoch),
-            graceWindow,
+            locks,
         });
         const connections = new Set();
         // Serving others never keeps the coordinator alive: when its own work ends, it exits and another process takes over.
@@ -60,29 +60,23 @@ export class FlightServer {
     }
     /**
      * Hands the term over. Ending every connection tells the other processes to
-     * elect a successor and reassert their flights during its grace window;
-     * `close` alone would wait for clients that never disconnect on their own.
+     * elect a successor and reassert their flights to it; `close` alone would
+     * wait for clients that never disconnect on their own.
      * Each connection ends only after what was written to it, such as an
      * outcome for a joiner, is sent. The term ends only after the socket is
      * gone: in the other order, this close could remove a successor's socket file.
-     * The term resigns clean when the coordinator leaves nothing to recover, so
-     * the successor skips its grace window; a lost term records nothing.
      * The first call removes the file at once, so a second caller finds it gone,
      * and it too resolves only once the term ended as the first call ended it.
+     * The coordinator stops watching the locks of the keys whose runs wait.
      */
     async close() {
         this.#closeOnLoss[Symbol.dispose]();
+        this.#coordinator.close();
         const closed = this.#server[Symbol.asyncDispose]();
-        // Read in the step that ends the connections: each session that ends
-        // withdraws its flights, so later there is never a flight in progress.
-        // An answer written after this step, such as the `lead` of a run whose
-        // token is being minted, never reaches its client, which sends the run
-        // again to the successor. So no client knows of a flight this read missed.
-        const clean = this.#coordinator.leavesNothingToRecover;
         for (const socket of this.#connections)
             socket.destroySoon();
         await closed;
-        await this.#term.resign({ clean });
+        await this.#term.resign();
     }
 }
 //# sourceMappingURL=flight-server.js.map

package/dist/coordinator/flight-server.js.map

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

package/dist/coordinator/flight.d.ts

@@ -1,17 +1,28 @@
 import type { FencingToken } from '@zukhruf/fencing';
 import type { Outcome } from '../protocol/flight-protocol.ts';
 import type { Party } from './party.ts';
+export interface FlightOptions {
+    /** A leader claimed this flight again after its connection was lost, so a rejoin may come after its end. */
+    reasserted?: boolean;
+}
 /** A flight in progress: the key, the leader that runs the work, its lease token, and the parties that joined. */
 export declare class Flight {
     #private;
     readonly key: string;
     readonly token: FencingToken;
-    readonly leader: Party;
-    constructor(key: string, token: FencingToken, leader: Party);
+    readonly reasserted: boolean;
+    constructor(key: string, token: FencingToken, leader: Party, { reasserted }?: FlightOptions);
+    get leader(): Party;
     /** The flight's name on the wire: its token as decimal text, which a joined answer and a rejoin carry. */
     get id(): string;
     /** Whether this is the flight with the id `flight`, which a rejoin names. */
     is(flight: string): boolean;
+    /**
+     * The leader claimed this flight again through a new connection. The new
+     * party leads it, and the old one ends without an answer, so the close of
+     * the old connection interrupts nothing.
+     */
+    handOver(leader: Party): void;
     add(joiner: Party): void;
     remove(joiner: Party): void;
     /** Pushes the outcome to every joiner, then tells the leader that it was handed over. */

package/dist/coordinator/flight.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flight.d.ts","sourceRoot":"","sources":["../../src/coordinator/flight.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,kHAAkH;AAClH,qBAAa,MAAM;;IACjB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;gBAGX,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK;IAM3D,0GAA0G;IAC1G,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,6EAA6E;IAC7E,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAI3B,GAAG,CAAC,MAAM,EAAE,KAAK;IAKjB,MAAM,CAAC,MAAM,EAAE,KAAK;IAIpB,yFAAyF;IACzF,IAAI,CAAC,OAAO,EAAE,OAAO;IAQrB,0GAA0G;IAC1G,SAAS;CAMV"}
+{"version":3,"file":"flight.d.ts","sourceRoot":"","sources":["../../src/coordinator/flight.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,WAAW,aAAa;IAC5B,4GAA4G;IAC5G,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,kHAAkH;AAClH,qBAAa,MAAM;;IACjB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;gBAK3B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,KAAK,EACb,EAAE,UAAkB,EAAE,GAAE,aAAkB;IAQ5C,IAAI,MAAM,IAAI,KAAK,CAElB;IAED,0GAA0G;IAC1G,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,6EAA6E;IAC7E,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAI3B;;;;OAIG;IACH,QAAQ,CAAC,MAAM,EAAE,KAAK;IAOtB,GAAG,CAAC,MAAM,EAAE,KAAK;IAKjB,MAAM,CAAC,MAAM,EAAE,KAAK;IAIpB,yFAAyF;IACzF,IAAI,CAAC,OAAO,EAAE,OAAO;IAQrB,0GAA0G;IAC1G,SAAS;CAMV"}

package/dist/coordinator/flight.js

@@ -2,12 +2,17 @@
 export class Flight {
     key;
     token;
-    leader;
+    reasserted;
     #joiners = new Set();
-    constructor(key, token, leader) {
+    #leader;
+    constructor(key, token, leader, { reasserted = false } = {}) {
         this.key = key;
         this.token = token;
-        this.leader = leader;
+        this.reasserted = reasserted;
+        this.#leader = leader;
+    }
+    get leader() {
+        return this.#leader;
     }
     /** The flight's name on the wire: its token as decimal text, which a joined answer and a rejoin carry. */
     get id() {
@@ -17,6 +22,17 @@ export class Flight {
     is(flight) {
         return flight === this.id;
     }
+    /**
+     * The leader claimed this flight again through a new connection. The new
+     * party leads it, and the old one ends without an answer, so the close of
+     * the old connection interrupts nothing.
+     */
+    handOver(leader) {
+        const previous = this.#leader;
+        this.#leader = leader;
+        previous.end();
+        leader.resume(this);
+    }
     add(joiner) {
         this.#joiners.add(joiner);
         joiner.join(this);
@@ -30,7 +46,7 @@ export class Flight {
             joiner.end({ op: 'landed', outcome });
         }
         this.#joiners.clear();
-        this.leader.end({ op: 'ack' });
+        this.#leader.end({ op: 'ack' });
     }
     /** Ends without an outcome: every joiner learns that its flight is lost, and none runs the work again. */
     interrupt() {

package/dist/coordinator/flight.js.map

@@ -1 +1 @@
-{"version":3,"file":"flight.js","sourceRoot":"","sources":["../../src/coordinator/flight.ts"],"names":[],"mappings":"AAKA,kHAAkH;AAClH,MAAM,OAAO,MAAM;IACR,GAAG,CAAS;IACZ,KAAK,CAAe;IACpB,MAAM,CAAQ;IACd,QAAQ,GAAG,IAAI,GAAG,EAAS,CAAC;IAErC,YAAY,GAAW,EAAE,KAAmB,EAAE,MAAa;QACzD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,0GAA0G;IAC1G,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAED,6EAA6E;IAC7E,EAAE,CAAC,MAAc;QACf,OAAO,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC;IAC5B,CAAC;IAED,GAAG,CAAC,MAAa;QACf,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,MAAa;QAClB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,yFAAyF;IACzF,IAAI,CAAC,OAAgB;QACnB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,0GAA0G;IAC1G,SAAS;QACP,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACF"}
+{"version":3,"file":"flight.js","sourceRoot":"","sources":["../../src/coordinator/flight.ts"],"names":[],"mappings":"AAUA,kHAAkH;AAClH,MAAM,OAAO,MAAM;IACR,GAAG,CAAS;IACZ,KAAK,CAAe;IACpB,UAAU,CAAU;IACpB,QAAQ,GAAG,IAAI,GAAG,EAAS,CAAC;IACrC,OAAO,CAAQ;IAEf,YACE,GAAW,EACX,KAAmB,EACnB,MAAa,EACb,EAAE,UAAU,GAAG,KAAK,KAAoB,EAAE;QAE1C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,0GAA0G;IAC1G,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAED,6EAA6E;IAC7E,EAAE,CAAC,MAAc;QACf,OAAO,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACH,QAAQ,CAAC,MAAa;QACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,QAAQ,CAAC,GAAG,EAAE,CAAC;QACf,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,GAAG,CAAC,MAAa;QACf,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,MAAa;QAClB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,yFAAyF;IACzF,IAAI,CAAC,OAAgB;QACnB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAClC,CAAC;IAED,0GAA0G;IAC1G,SAAS;QACP,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACF"}

package/dist/coordinator/parked-runs.d.ts

@@ -0,0 +1,26 @@
+import type { KeyLocks } from '../key-lock/key-locks.ts';
+import type { Party } from './party.ts';
+/**
+ * The runs and rejoins of keys that another process holds while this
+ * coordinator knows no flight of them: a leader of an earlier term that has
+ * not reasserted its flight yet, or a leader whose flight ended and that
+ * still lets its key go. They wait until a flight of the key starts or the
+ * key's lock frees.
+ *
+ * Each key with parked runs has one watch of its lock. It stops when the lock
+ * frees, when the key's runs were woken, when none of them waits any more, or
+ * when the coordinator closes. It never keeps the process alive.
+ */
+export declare class ParkedRuns {
+    #private;
+    constructor(locks: KeyLocks, closed: AbortSignal);
+    /** Parks `party` on `key`; `retry` runs once the key's runs are woken. */
+    park(key: string, party: Party, retry: () => void): void;
+    /**
+     * Decides every parked run of `key` again, now, in this step. A flight of
+     * the key that just started takes them before anything else is read, such
+     * as a landing that arrived right behind its reassertion.
+     */
+    wake(key: string): void;
+}
+//# sourceMappingURL=parked-runs.d.ts.map

package/dist/coordinator/parked-runs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parked-runs.d.ts","sourceRoot":"","sources":["../../src/coordinator/parked-runs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAQxC;;;;;;;;;;GAUG;AACH,qBAAa,UAAU;;gBAKT,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW;IAKhD,0EAA0E;IAC1E,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,IAAI,GAAG,IAAI;IAWxD;;;;OAIG;IACH,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CA0BxB"}

package/dist/coordinator/parked-runs.js

@@ -0,0 +1,65 @@
+/**
+ * The runs and rejoins of keys that another process holds while this
+ * coordinator knows no flight of them: a leader of an earlier term that has
+ * not reasserted its flight yet, or a leader whose flight ended and that
+ * still lets its key go. They wait until a flight of the key starts or the
+ * key's lock frees.
+ *
+ * Each key with parked runs has one watch of its lock. It stops when the lock
+ * frees, when the key's runs were woken, when none of them waits any more, or
+ * when the coordinator closes. It never keeps the process alive.
+ */
+export class ParkedRuns {
+    #locks;
+    #closed;
+    #parked = new Map();
+    constructor(locks, closed) {
+        this.#locks = locks;
+        this.#closed = closed;
+    }
+    /** Parks `party` on `key`; `retry` runs once the key's runs are woken. */
+    park(key, party, retry) {
+        const parked = this.#parked.get(key);
+        if (parked) {
+            parked.add({ party, retry });
+            return;
+        }
+        const first = new Set([{ party, retry }]);
+        this.#parked.set(key, first);
+        void this.#watch(key, first);
+    }
+    /**
+     * Decides every parked run of `key` again, now, in this step. A flight of
+     * the key that just started takes them before anything else is read, such
+     * as a landing that arrived right behind its reassertion.
+     */
+    wake(key) {
+        const parked = this.#parked.get(key);
+        if (!parked)
+            return;
+        this.#parked.delete(key);
+        for (const { retry } of parked)
+            retry();
+    }
+    async #watch(key, parked) {
+        const current = () => this.#parked.get(key) === parked;
+        let free;
+        try {
+            free = await this.#locks.whenFree(key, () => current() && [...parked].some(({ party }) => party.waiting), this.#closed);
+        }
+        catch {
+            if (this.#closed.aborted)
+                return;
+            // The check is advice only (F5), so a fault counts as free: each run is
+            // decided again, and a leader's own lock is the truth.
+            free = true;
+        }
+        if (!current())
+            return;
+        if (free)
+            this.wake(key);
+        else
+            this.#parked.delete(key);
+    }
+}
+//# sourceMappingURL=parked-runs.js.map

package/dist/coordinator/parked-runs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parked-runs.js","sourceRoot":"","sources":["../../src/coordinator/parked-runs.ts"],"names":[],"mappings":"AASA;;;;;;;;;;GAUG;AACH,MAAM,OAAO,UAAU;IACZ,MAAM,CAAW;IACjB,OAAO,CAAc;IACrB,OAAO,GAAG,IAAI,GAAG,EAA0B,CAAC;IAErD,YAAY,KAAe,EAAE,MAAmB;QAC9C,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,0EAA0E;IAC1E,IAAI,CAAC,GAAW,EAAE,KAAY,EAAE,KAAiB;QAC/C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7B,KAAK,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,GAAW;QACd,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzB,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,MAAM;YAAE,KAAK,EAAE,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,MAAsB;QAC9C,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC;QACvD,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAC/B,GAAG,EACH,GAAG,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,EACjE,IAAI,CAAC,OAAO,CACb,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO;gBAAE,OAAO;YACjC,wEAAwE;YACxE,uDAAuD;YACvD,IAAI,GAAG,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,OAAO,EAAE;YAAE,OAAO;QACvB,IAAI,IAAI;YAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;;YACpB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;CACF"}

package/dist/coordinator/party.d.ts

@@ -14,7 +14,7 @@ export interface Inbox {
 }
 /** What a party is to the coordinator now. */
 export type Role = 
-/** A run that waits for the grace window, a token, or the reassertion of its flight. */
+/** A run that waits for a token, or for its key's lock: for a flight of the key or for the lock to free. */
 {
     kind: 'waiting';
 } | {