@agentshouse/mdruntime 0.1.0-ce131cb435f8b → 0.1.0-ce41fec66d91b

package/dist/reach.js

@@ -1,10 +1,9 @@
 import { unheldView } from './conversation.js';
 import { modelTypes, NO_MODEL } from './model.js';
-import { applied, observing } from './observation.js';
+import { changeOf, digestApplied, digestOf, observing, } from './observation.js';
 import { runtimeError } from './failure.js';
-import { failure, undeclared, } from './outcome.js';
+import { failure, lockedRoom, ROOM_LOCKED, undeclared, UNREADABLE, } from './outcome.js';
 import { beneath } from './paths.js';
-import { reconciled } from './read-side.js';
 import { moveTarget, readParts, staleWrite, } from './room-draft.js';
 import { documentKey } from './rows.js';
 import { undeclaredSearch } from './search.js';
@@ -15,19 +14,26 @@ function unconversed(name) {
 const NO_CONVERSATION = {
     list: () => Promise.resolve([]),
     read: (conversation) => Promise.resolve(unheldView(conversation)),
-    create: unconversed('conversation.create'),
-    send: unconversed('conversation.send'),
-    answer: unconversed('conversation.answer'),
-    interrupt: unconversed('conversation.interrupt'),
-    kill: unconversed('conversation.kill'),
-    cancel: unconversed('conversation.cancel'),
-    delete: unconversed('conversation.delete'),
+    create: unconversed('conversations/create'),
+    send: unconversed('conversations/send'),
+    answer: unconversed('conversations/interaction/answer'),
+    interrupt: unconversed('conversations/interrupt'),
+    kill: unconversed('conversations/kill'),
+    delete: unconversed('conversations/delete'),
 };
 const NO_CHAT_DRAFT = {
     write: () => Promise.resolve(),
     prepend: () => Promise.resolve(),
     discard: () => Promise.resolve(),
 };
+function areasOf(reach) {
+    return reach.areas ?? [];
+}
+function fenced(reach, room, path) {
+    return areasOf(reach).some((area) => area.room === room &&
+        beneath(area.path, path) &&
+        !area.open.some((open) => beneath(open, path)));
+}
 export function holds(reach, room) {
     return (reach === null ||
         reach.rooms.includes(room) ||
@@ -48,26 +54,13 @@ export function governs(reach, room) {
 }
 function covers(reach, room, path) {
     return (reach === null ||
-        reach.rooms.includes(room) ||
-        reach.documents.some((document) => document.room === room && document.path === path));
+        (!fenced(reach, room, path) &&
+            (reach.rooms.includes(room) ||
+                reach.documents.some((document) => document.room === room && document.path === path))));
 }
 function conversing(reach) {
     return reach === null || reach.conversations;
 }
-function refers(reach, scope) {
-    if (reach === null)
-        return true;
-    if (scope === null)
-        return false;
-    if (scope.kind === 'conversations')
-        return reach.conversations;
-    return scope.path === undefined
-        ? wholly(reach, scope.locator)
-        : covers(reach, scope.locator, scope.path);
-}
-function unreachedReference(fileRef) {
-    return { kind: 'absent', code: 'binary-file-absent', fields: { fileRef }, retryable: false };
-}
 export function planReach(reach) {
     return reach === null
         ? null
@@ -76,6 +69,9 @@ export function planReach(reach) {
             documents: [
                 ...new Set(reach.documents.map(({ room, path }) => documentKey(room, path))),
             ].sort(),
+            areas: areasOf(reach)
+                .map(({ room, path, open }) => ({ room, path, open: [...new Set(open)].sort() }))
+                .sort((left, right) => documentKey(left.room, left.path) < documentKey(right.room, right.path) ? -1 : 1),
         };
 }
 function roomsWithin(reach, rooms) {
@@ -91,7 +87,7 @@ function typesWithin(reach, room, types) {
     };
 }
 function moves(reach, room, move) {
-    return move === undefined || covers(reach, room, moveTarget(move));
+    return move === undefined || covers(reach, move.room ?? room, moveTarget(move));
 }
 function draftWithin(reach, draft) {
     return covers(reach, draft.room, draft.path) && moves(reach, draft.room, draft.parts.move);
@@ -124,33 +120,66 @@ function savedWithin(reach, room, result) {
 function statusWithin(reach, status) {
     return {
         ...status,
-        attentionRequired: status.attentionRequired.filter((entry) => 'refusal' in entry ? wholly(reach, entry.room) : covers(reach, entry.room, entry.path)),
+        attentionRequired: status.attentionRequired.filter((entry) => covers(reach, entry.room, entry.path)),
+        unsent: status.unsent.filter((change) => covers(reach, change.room, change.path)),
     };
 }
 function queueWithin(reach, room, entries) {
-    return entries.filter(({ batch }) => batch.changes.every((change) => covers(reach, room, change.path) &&
-        (change.kind !== 'move' || covers(reach, room, change.to))));
+    return entries
+        .filter(({ batch }) => batch.changes.every((change) => covers(reach, room, change.path) &&
+        (change.kind !== 'move' || covers(reach, room, change.to))))
+        .map((entry) => {
+        const { between, ...batch } = entry.batch;
+        if (between === undefined)
+            return entry;
+        return wholly(reach, between.source.room) && wholly(reach, between.destination.room)
+            ? entry
+            : { ...entry, batch };
+    });
 }
 function unreached(room) {
-    return runtimeError('room-not-held', `No Local Replica for ${room}`);
+    return runtimeError('unknown-room', `Unknown Room ${room}`);
+}
+function lockedError(room) {
+    return runtimeError(ROOM_LOCKED, `${room} is locked until House confirms its access`, true);
+}
+function deviceUnreached() {
+    return runtimeError('device-unreached', 'Only the panel cleans up this device');
+}
+const ATTACH_REQUIRED = 'attach-required';
+function attachRequired() {
+    return runtimeError(ATTACH_REQUIRED, 'App code takes a file in with binaryFile.attach');
+}
+function carriesFile(parts) {
+    return parts !== null && typeof parts === 'object' && Object.hasOwn(parts, 'file');
 }
 export function narrowed(runtime, given, told) {
     const { md, watch } = runtime;
     let reach = given;
     let port = told;
     const open = new Set();
-    function following(begin) {
+    function following(begin, locking = false) {
         let stop = begin();
         const restart = () => {
             stop();
             stop = begin();
         };
         open.add(restart);
+        const unwatch = locking ? runtime.watchLocks(restart) : () => { };
         return () => {
             open.delete(restart);
+            unwatch();
             stop();
         };
     }
+    const unlocking = (rooms) => {
+        const locked = (rooms ?? []).filter((room) => runtime.locked(room));
+        return locked.length === 0
+            ? null
+            : { pending: locked.map((room) => ({ room, awaits: 'unlock' })) };
+    };
+    const unlocked = (entries) => entries.filter((entry) => !runtime.locked(entry.room));
+    const intoLocked = (held) => held.some((move) => move?.room !== undefined && runtime.locked(move.room));
     const within = (topic, input, deliver) => {
         if (topic === 'rooms') {
             return following(() => watch(topic, input, (rooms) => deliver(roomsWithin(reach, rooms))));
@@ -159,45 +188,60 @@ export function narrowed(runtime, given, told) {
             return following(() => runtime.watchReadiness(port, reach, deliver));
         }
         if (topic === 'sync-status') {
-            return following(() => watch(topic, input, (status) => deliver(statusWithin(reach, status))));
+            return following(() => watch(topic, input, (status) => {
+                const within = statusWithin(reach, status);
+                deliver({ ...within, attentionRequired: unlocked(within.attentionRequired) });
+            }), true);
         }
         if (topic === 'room-drafts') {
-            return following(() => watch(topic, input, (drafts) => deliver(draftsWithin(reach, drafts))));
+            return following(() => watch(topic, input, (drafts) => deliver(unlocked(draftsWithin(reach, drafts)))), true);
         }
         if (topic === 'queue') {
             const room = input[0];
             return following(() => {
-                if (!holds(reach, room)) {
+                if (!holds(reach, room) || runtime.locked(room)) {
                     deliver([]);
                     return () => { };
                 }
                 return watch(topic, input, (entries) => deliver(queueWithin(reach, room, entries)));
-            });
+            }, true);
         }
         if (topic === 'query') {
             const plan = runtime.plan(input[0], reach);
             let held = null;
             return following(() => {
+                const locked = unlocking(plan.rooms);
+                if (locked !== null) {
+                    const answer = { result: locked, keys: [] };
+                    if (held === null || changeOf(held, answer) !== null)
+                        deliver(answer);
+                    held = digestOf(answer);
+                    return () => { };
+                }
                 let first = true;
-                return runtime.watchPlan({ ...plan, reach: planReach(reach) }, (message) => {
+                let open = true;
+                const heard = (message) => {
                     if (!first) {
-                        held = applied(held, message);
+                        held = digestApplied(held, message);
                         deliver(message);
                         return;
                     }
                     first = false;
-                    if (held === null) {
-                        held = message;
-                        deliver(message);
-                        return;
-                    }
-                    const next = reconciled(held, message);
-                    if (next === null)
-                        return;
-                    held = next.keyed;
-                    deliver(next.message);
+                    const change = held === null ? message : changeOf(held, message);
+                    held = digestOf(message);
+                    if (change !== null)
+                        deliver(change);
+                };
+                const current = { ...plan, reach: planReach(reach), locked: runtime.lockedRooms() };
+                const stop = runtime.watchPlan(current, (message) => {
+                    if (open)
+                        heard(message);
                 });
-            });
+                return () => {
+                    open = false;
+                    stop();
+                };
+            }, true);
         }
         if (topic === 'conversation') {
             return following(() => {
@@ -217,70 +261,149 @@ export function narrowed(runtime, given, told) {
         }
         return watch(topic, input, deliver);
     };
+    const files = new Map();
+    let handed = 0;
+    async function hand(reading) {
+        const answer = await reading;
+        if (answer.kind !== 'binary')
+            return answer;
+        handed += 1;
+        const file = String(handed);
+        files.set(file, answer.file);
+        return { ...answer, file };
+    }
     const conversation = () => (conversing(reach) ? md.conversation : NO_CONVERSATION);
     const chatDraft = () => (conversing(reach) ? md.chatDraft : NO_CHAT_DRAFT);
     const view = {
         ...md,
-        rooms: () => roomsWithin(reach, md.rooms()),
-        query: ((input) => runtime.query(runtime.plan(input, reach))),
+        rooms: () => md.rooms().then((rooms) => roomsWithin(reach, rooms)),
+        query: ((input) => {
+            const plan = runtime.plan(input, reach);
+            return Promise.resolve(unlocking(plan.rooms) ?? runtime.query({ ...plan, locked: runtime.lockedRooms() }));
+        }),
         search: (input) => port.search === 'required'
-            ? runtime.search(input, reach)
+            ? runtime.search(input, reach, runtime.lockedRooms())
             : Promise.resolve(undeclaredSearch()),
         types(room) {
+            if (holds(reach, room) && runtime.locked(room))
+                throw lockedError(room);
             if (wholly(reach, room))
                 return md.types(room);
             if (!holds(reach, room))
                 return structuredClone(UNHELD_TYPES);
-            const listed = md.rooms().find(({ locator }) => locator === room);
-            return typesWithin(reach, listed, md.types(room));
+            return typesWithin(reach, runtime.room(room), md.types(room));
         },
         async save(room, roomDrafts, writtenBy) {
             if (!holds(reach, room))
                 throw unreached(room);
-            const outside = roomDrafts.find(({ path }) => !covers(reach, room, path) ||
-                !moves(reach, room, md.roomDraft.read(room, path)?.parts.move));
+            if (runtime.locked(room))
+                return { outcome: 'refused', code: ROOM_LOCKED, retryable: true };
+            const held = (await Promise.all(roomDrafts.map(({ path }) => md.roomDraft.read(room, path)))).map((draft) => draft?.parts.move);
+            const outside = roomDrafts.find(({ path }, at) => !covers(reach, room, path) || !moves(reach, room, held[at]));
             if (outside !== undefined) {
                 return { outcome: 'refused', code: 'stale', retryable: false, file: outside.path };
             }
+            if (intoLocked(held))
+                return { outcome: 'refused', code: ROOM_LOCKED, retryable: true };
             return savedWithin(reach, room, await md.save(room, roomDrafts, writtenBy));
         },
         async saveParts(room, parts, writtenBy) {
             if (!holds(reach, room))
                 throw unreached(room);
-            if (parts.some(({ path, parts: one }) => !covers(reach, room, path) || !moves(reach, room, readParts(one).move))) {
+            const filed = reach === null ? undefined : parts.find(({ parts: one }) => carriesFile(one));
+            if (filed !== undefined) {
+                return { outcome: 'refused', code: ATTACH_REQUIRED, retryable: false, file: filed.path };
+            }
+            if (runtime.locked(room))
+                return { outcome: 'refused', code: ROOM_LOCKED, retryable: true };
+            const held = parts.map(({ parts: one }) => readParts(one).move);
+            if (parts.some(({ path }, at) => !covers(reach, room, path) || !moves(reach, room, held[at]))) {
                 throw unreached(room);
             }
+            if (intoLocked(held))
+                return { outcome: 'refused', code: ROOM_LOCKED, retryable: true };
             return savedWithin(reach, room, await md.saveParts(room, parts, writtenBy));
         },
-        history: (room, path, query) => covers(reach, room, path)
-            ? md.history(room, path, query)
-            : Promise.resolve(failure({ kind: 'room-not-readable', locator: room })),
+        resolve(room, path, destination) {
+            const at = runtime.located(room, path, destination);
+            return at !== null && !covers(reach, at.room, at.path)
+                ? Promise.resolve(UNREADABLE)
+                : md.resolve(room, path, destination);
+        },
+        history: (room, path, query) => !covers(reach, room, path)
+            ? Promise.resolve(failure({ kind: 'room-not-readable', locator: room }))
+            : runtime.locked(room)
+                ? Promise.resolve(lockedRoom(room))
+                : md.history(room, path, query),
         binaryFile: {
-            read: (room, path, revision) => covers(reach, room, path)
-                ? md.binaryFile.read(room, path, revision)
-                : Promise.resolve(failure({ kind: 'room-not-readable', locator: room })),
-            link: (room, path, revision) => covers(reach, room, path)
-                ? md.binaryFile.link(room, path, revision)
-                : Promise.resolve(failure({ kind: 'room-not-readable', locator: room })),
-            readReference: (reference) => refers(reach, runtime.referrerScope(reference.referrer))
-                ? md.binaryFile.readReference(reference)
-                : Promise.resolve(unreachedReference(reference.fileRef)),
+            read: (room, path, revision) => !covers(reach, room, path)
+                ? Promise.resolve(failure({ kind: 'room-not-readable', locator: room }))
+                : runtime.locked(room)
+                    ? Promise.resolve(lockedRoom(room))
+                    : hand(md.binaryFile.read(room, path, revision)),
+            link: (room, path, revision) => !covers(reach, room, path)
+                ? Promise.resolve(failure({ kind: 'room-not-readable', locator: room }))
+                : runtime.locked(room)
+                    ? Promise.resolve(lockedRoom(room))
+                    : md.binaryFile.link(room, path, revision),
+            show: (room, path, revision) => !covers(reach, room, path)
+                ? Promise.resolve(failure({ kind: 'room-not-readable', locator: room }))
+                : runtime.locked(room)
+                    ? Promise.resolve(lockedRoom(room))
+                    : hand(md.binaryFile.show(room, path, revision)),
+            attach: (room, file) => !wholly(reach, room)
+                ? Promise.resolve(failure({ kind: 'room-not-readable', locator: room }))
+                : runtime.locked(room)
+                    ? Promise.resolve(lockedRoom(room))
+                    : md.binaryFile.attach(room, file),
+            async part(file, part) {
+                const key = files.get(file);
+                if (key === undefined)
+                    return null;
+                const bytes = await md.binaryFile.part(key, part);
+                if (bytes === null)
+                    files.delete(file);
+                return bytes;
+            },
         },
-        reached: (room, roomVersion, path) => (path === undefined ? wholly(reach, room) : covers(reach, room, path)) &&
-            md.reached(room, roomVersion, path),
+        reached: async (room, roomVersion, path) => (path === undefined ? wholly(reach, room) : covers(reach, room, path)) &&
+            !runtime.locked(room) &&
+            (await md.reached(room, roomVersion, path)),
         log: () => (reach === null ? md.log() : ''),
+        cleanUp: () => (reach === null ? md.cleanUp() : Promise.reject(deviceUnreached())),
         roomDraft: {
-            list: () => md.roomDraft.list().then((drafts) => draftsWithin(reach, drafts)),
-            read: (room, path) => covers(reach, room, path) ? shownDraft(reach, md.roomDraft.read(room, path)) : null,
-            async write(room, path, revision, parts) {
-                if (!covers(reach, room, path) || !moves(reach, room, readParts(parts).move)) {
-                    throw unreached(room);
+            list: () => md.roomDraft.list().then((drafts) => unlocked(draftsWithin(reach, drafts))),
+            async read(room, path) {
+                if (!covers(reach, room, path))
+                    return null;
+                if (runtime.locked(room))
+                    throw lockedError(room);
+                return shownDraft(reach, await md.roomDraft.read(room, path));
+            },
+            write(room, path, revision, parts, next) {
+                try {
+                    if (reach !== null && carriesFile(parts))
+                        throw attachRequired();
+                    const move = readParts(parts).move;
+                    if (!covers(reach, room, path) || !moves(reach, room, move))
+                        throw unreached(room);
+                    if (runtime.locked(room))
+                        throw lockedError(room);
+                    if (intoLocked([move]))
+                        throw lockedError(move.room);
+                }
+                catch (error) {
+                    return Promise.reject(error);
                 }
-                return writeWithin(reach, await md.roomDraft.write(room, path, revision, parts));
+                return md.roomDraft
+                    .write(room, path, revision, parts, next)
+                    .then((written) => writeWithin(reach, written));
             },
             async discard(room, path, revision) {
                 if (!covers(reach, room, path))
                     return staleWrite(null);
+                if (runtime.locked(room))
+                    throw lockedError(room);
                 return writeWithin(reach, await md.roomDraft.discard(room, path, revision));
             },
         },
@@ -292,7 +415,6 @@ export function narrowed(runtime, given, told) {
             answer: (id, answer) => conversation().answer(id, answer),
             interrupt: (id) => conversation().interrupt(id),
             kill: (id) => conversation().kill(id),
-            cancel: (id, turn) => conversation().cancel(id, turn),
             delete: (id) => conversation().delete(id),
         },
         chatDraft: {

package/dist/readiness.d.ts

@@ -1,11 +1,11 @@
 import type { Open } from './open.js';
 export type CodeAvailability = Open<'stored' | 'absent'>;
-export type RoomPreparation = Open<'complete' | 'acquiring' | 'preparing' | 'indexing' | 'refused' | 'unadmitted'>;
+export type RoomPreparation = Open<'complete' | 'acquiring' | 'preparing' | 'unadmitted'>;
 export type RoomCoverage = {
     readonly room: string;
     readonly state: RoomPreparation;
 };
-export type ConversationCoverage = Open<'complete' | 'acquiring' | 'indexing' | 'undeclared'>;
+export type ConversationCoverage = Open<'complete' | 'acquiring' | 'undeclared'>;
 export type SearchObligation = Open<'required' | 'unused'>;
 export type TargetCoverage = {
     readonly complete: boolean;
@@ -18,18 +18,18 @@ export type Persistence = Open<'granted' | 'denied' | 'unavailable'>;
 export type Durability = Open<'persistent' | 'best-effort'>;
 export type ConnectionAvailability = Open<'connected' | 'connecting' | 'unreachable'>;
 export type HouseOutcome = Open<'open' | 'write-halted' | 'refused'>;
-export type CapacityCause = {
-    readonly cause: Open<'insufficient-space' | 'quota-exceeded'>;
-    readonly needed: number | null;
-    readonly available: number | null;
+export type Space = Open<'full'>;
+export type InstallationStep = Open<'downloading' | 'writing' | 'replaying'>;
+export type InstallationAmount = {
+    readonly done: number;
+    readonly total: number;
 };
-export type RefusedRoom = {
-    readonly room: string;
-    readonly file: string;
-    readonly rule: string;
-    readonly location: string | null;
+export type Installation = {
+    readonly step: InstallationStep | null;
+    readonly rooms: InstallationAmount;
+    readonly bytes: InstallationAmount;
 };
-export type ReadinessStatus = Open<'preparing' | 'paused' | 'refused' | 'ready' | 'lost'>;
+export type ReadinessStatus = Open<'preparing' | 'paused' | 'ready' | 'lost'>;
 export type Readiness = {
     readonly status: ReadinessStatus;
     readonly ready: boolean;
@@ -40,14 +40,13 @@ export type Readiness = {
     readonly persistence: Persistence;
     readonly connection: ConnectionAvailability;
     readonly house: HouseOutcome;
-    readonly capacity: CapacityCause | null;
-    readonly refused: readonly RefusedRoom[];
+    readonly space: Space | null;
+    readonly installation: Installation;
     readonly lost: boolean;
 };
 export type ReadinessFacts = Omit<Readiness, 'status' | 'ready' | 'usable' | 'durability' | 'coverage'> & {
     readonly coverage: Omit<TargetCoverage, 'complete'>;
     readonly established: boolean;
 };
-export declare const SETTLED_ROOMS: ReadonlySet<string>;
 export declare function readinessOf(facts: ReadinessFacts): Readiness;
 //# sourceMappingURL=readiness.d.ts.map

package/dist/readiness.d.ts.map

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

package/dist/readiness.js

@@ -1,27 +1,21 @@
 const COMPLETE_ROOMS = new Set(['complete', 'unadmitted']);
-export const SETTLED_ROOMS = new Set([...COMPLETE_ROOMS, 'refused']);
 export function readinessOf(facts) {
     const { established, coverage: held, ...reported } = facts;
     const settledConversations = held.conversations === 'complete' || held.conversations === 'undeclared';
     const complete = held.listed &&
         settledConversations &&
         held.rooms.every((room) => COMPLETE_ROOMS.has(room.state));
-    const settled = held.listed &&
-        settledConversations &&
-        held.rooms.every((room) => SETTLED_ROOMS.has(room.state));
     const coverage = { ...held, complete };
     const stored = facts.code === 'stored';
     const ready = stored && complete;
     const usable = stored && (ready || established);
     const status = ready
         ? 'ready'
-        : facts.capacity !== null
+        : facts.space !== null
             ? 'paused'
             : facts.lost && !established
                 ? 'lost'
-                : settled && !complete
-                    ? 'refused'
-                    : 'preparing';
+                : 'preparing';
     return {
         ...reported,
         coverage,

package/dist/recovery.d.ts

@@ -8,7 +8,7 @@ export type AttemptOptions = {
 };
 export type RecoveryOptions = {
     readonly firstMs?: number;
-    readonly ceilingMs?: number;
+    readonly maxMs?: number;
     readonly attempts?: number;
     readonly inFlight?: number;
 };
@@ -20,6 +20,7 @@ export type Recovery = {
     scope(inFlight?: number): Recovery;
     retire(): Promise<void>;
 };
-export declare function retryDelay(tries: number, firstMs?: number, ceilingMs?: number): number;
+export declare function retryDelay(tries: number, firstMs?: number, maxMs?: number): number;
+export declare function untilAnswered<T>(ask: () => Promise<T>, signal: AbortSignal, answered?: (answer: T) => boolean): Promise<T>;
 export declare function createRecovery(options?: RecoveryOptions): Recovery;
 //# sourceMappingURL=recovery.d.ts.map

package/dist/recovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../src/recovery.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnE,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEhF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,MAAM,IAAI,IAAI,CAAC;IACf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IACnC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB,CAAC;AAsBF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,SAAW,EAAE,SAAS,SAAa,GAAG,MAAM,CAG5F;AAuKD,wBAAgB,cAAc,CAAC,OAAO,GAAE,eAAoB,GAAG,QAAQ,CAStE"}
+{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../src/recovery.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnE,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG;IAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEhF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClF,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,MAAM,IAAI,IAAI,CAAC;IACf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IACnC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB,CAAC;AAsBF,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,SAAW,EAAE,KAAK,SAAS,GAAG,MAAM,CAGpF;AAED,wBAAsB,aAAa,CAAC,CAAC,EACnC,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACrB,MAAM,EAAE,WAAW,EACnB,QAAQ,GAAE,CAAC,MAAM,EAAE,CAAC,KAAK,OAAoB,GAC5C,OAAO,CAAC,CAAC,CAAC,CAsBZ;AAwKD,wBAAgB,cAAc,CAAC,OAAO,GAAE,eAAoB,GAAG,QAAQ,CAStE"}

package/dist/recovery.js

@@ -1,11 +1,37 @@
 // A first retry waits about a second, so a passing failure clears before the next attempt.
 const FIRST_MS = 1_000;
 // Waits stop doubling at half a minute, so work resumes soon after a long failure ends.
-const CEILING_MS = 30_000;
+const MAX_MS = 30_000;
 const ATTEMPTS = 8;
-export function retryDelay(tries, firstMs = FIRST_MS, ceilingMs = CEILING_MS) {
-    const ceiling = Math.min(ceilingMs, firstMs * 2 ** tries);
-    return ceiling / 2 + (Math.random() * ceiling) / 2;
+export function retryDelay(tries, firstMs = FIRST_MS, maxMs = MAX_MS) {
+    const longest = Math.min(maxMs, firstMs * 2 ** tries);
+    return longest / 2 + (Math.random() * longest) / 2;
+}
+export async function untilAnswered(ask, signal, answered = () => true) {
+    for (let tries = 0;; tries += 1) {
+        try {
+            const answer = await ask();
+            if (answered(answer) || signal.aborted)
+                return answer;
+        }
+        catch (error) {
+            if (signal.aborted)
+                throw error;
+        }
+        await new Promise((resume) => {
+            const stop = () => {
+                clearTimeout(again);
+                resume();
+            };
+            // A read that failed is asked again on the doubling backoff, so its asker is answered once the failure clears.
+            const again = setTimeout(() => {
+                signal.removeEventListener('abort', stop);
+                resume();
+            }, retryDelay(tries));
+            signal.addEventListener('abort', stop, { once: true });
+        });
+        signal.throwIfAborted();
+    }
 }
 function owner(backoff, inFlight, release = () => { }) {
     const intents = new Map();
@@ -84,7 +110,8 @@ function owner(backoff, inFlight, release = () => { }) {
             return;
         }
         if (result === 'again') {
-            const delay = retryDelay(intent.tries - 1, backoff.firstMs, backoff.ceilingMs);
+            // The next attempt waits the doubling backoff, up to its maximum.
+            const delay = retryDelay(intent.tries - 1, backoff.firstMs, backoff.maxMs);
             wait(key, intent, Date.now() + delay, false);
         }
         else
@@ -135,7 +162,7 @@ function owner(backoff, inFlight, release = () => { }) {
                 wait(key, intent, options.at, true);
             else if (options.again === true) {
                 intent.tries = 1;
-                wait(key, intent, Date.now() + retryDelay(0, backoff.firstMs, backoff.ceilingMs), false);
+                wait(key, intent, Date.now() + retryDelay(0, backoff.firstMs, backoff.maxMs), false);
             }
             else
                 launch(key, intent);
@@ -191,7 +218,7 @@ function owner(backoff, inFlight, release = () => { }) {
 export function createRecovery(options = {}) {
     return owner({
         firstMs: options.firstMs ?? FIRST_MS,
-        ceilingMs: options.ceilingMs ?? CEILING_MS,
+        maxMs: options.maxMs ?? MAX_MS,
         attempts: options.attempts ?? ATTEMPTS,
     }, options.inFlight ?? Infinity);
 }