@agentshouse/mdruntime 0.1.0-cb1f56e16291b → 0.1.0-cb3bb3b233fa1

package/dist/model.js

@@ -1,9 +1,4 @@
 export const NO_MODEL = { status: 'unavailable', reason: 'not-acquired' };
-export function definitionOf(state, type) {
-    if (state.status === 'unavailable' || type === undefined)
-        return undefined;
-    return Object.hasOwn(state.types, type) ? state.types[type] : undefined;
-}
 export function modelTypes(state) {
     return state.status === 'unavailable'
         ? { ...state, types: null }
@@ -23,12 +18,3 @@ export function storedModel(state) {
     const { types: _types, ...stored } = state;
     return stored;
 }
-export function cached(state) {
-    return state.status === 'unavailable' ? state : { ...state, status: 'cached' };
-}
-export function sameModel(left, right) {
-    return left.identity === right.identity && left.version === right.version;
-}
-export function referenceField(facts) {
-    return facts?.reference !== undefined || facts?.items?.reference !== undefined;
-}

package/dist/models.d.ts

@@ -0,0 +1,10 @@
+import type { RoomDeclaration, ScopedRefusal } from './adapter.js';
+import { type ModelState } from './model.js';
+import type { Runtime } from './runtime.js';
+import type { RuntimeStore } from './store.js';
+export declare function revoked(model: ModelState | undefined): boolean;
+export declare function retainModel(runtime: Runtime, locator: string, declaration: RoomDeclaration, given: ModelState | null, refused?: true): Promise<void>;
+export declare function scoped(runtime: Runtime, result: ScopedRefusal, locator: string, declaration: RoomDeclaration): Promise<void>;
+export declare function settleModels(runtime: Runtime, held: ReadonlyMap<string, RoomDeclaration>, status: 'current' | 'cached', local: RuntimeStore): Promise<void>;
+export declare function cachedModels(runtime: Runtime, local: RuntimeStore): Promise<void>;
+//# sourceMappingURL=models.d.ts.map

package/dist/models.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAOnE,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAGvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,KAAK,EAAc,YAAY,EAAS,MAAM,YAAY,CAAC;AAMlE,wBAAgB,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,OAAO,CAE9D;AA0DD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,eAAe,EAC5B,KAAK,EAAE,UAAU,GAAG,IAAI,EACxB,OAAO,CAAC,EAAE,IAAI,iBA2Bf;AAED,wBAAsB,MAAM,CAC1B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,eAAe,iBAkB7B;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,EAC1C,MAAM,EAAE,SAAS,GAAG,QAAQ,EAC5B,KAAK,EAAE,YAAY,iBAkDpB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBvF"}

package/dist/models.js

@@ -0,0 +1,153 @@
+import { equalValue } from '@agentshouse/mdmodel';
+import { changeSet } from './change-set.js';
+import { composedOf } from './collection.js';
+import { declared, sameDeclaration } from './declaration.js';
+import { uncaught } from './failure.js';
+import { declarationOf, listedLocators } from './listing.js';
+import { loseRooms } from './lost.js';
+import { NO_MODEL } from './model.js';
+import { settle } from './queue.js';
+import { storedRecord } from './replica.js';
+import { emitRooms } from './shown.js';
+function declaredAsHeld(held, declaration) {
+    return held === undefined || sameDeclaration(held.declaration, declaration);
+}
+export function revoked(model) {
+    return model?.status === 'unavailable' && model.reason === 'revoked';
+}
+function unheldModelOf({ presence }, locator) {
+    return presence.unheldModel(locator) ?? NO_MODEL;
+}
+async function modelNow(runtime, locator) {
+    return (await runtime.store.record(locator))?.model ?? unheldModelOf(runtime, locator);
+}
+function restands(held, model, declaration) {
+    return (JSON.stringify(held.model) !== JSON.stringify(model) ||
+        !equalValue(held.declaration.typedSelection, declaration.typedSelection));
+}
+function recordAlone(store, record) {
+    return {
+        locator: record.locator,
+        key: record.key,
+        record: storedRecord(record),
+        composed: composedOf(store.composed(record)),
+    };
+}
+function unheld(runtime, locator, model) {
+    runtime.presence.modelled(locator, model);
+    emitRooms(runtime, [locator]);
+}
+function recorded(runtime, locator, declaration, model) {
+    const { store, socket } = runtime;
+    return store.exclusive(async () => {
+        if (!socket.continuing())
+            return;
+        const current = await store.record(locator);
+        if (current === undefined) {
+            unheld(runtime, locator, model);
+            return;
+        }
+        const answer = await (await store.open()).commit({ rooms: [recordAlone(store, { ...current, declaration, model })] });
+        void store.changed(changeSet(locator, {
+            documents: answer.changed[locator] ?? [],
+            room: true,
+            unindexed: answer.indexed[locator] === false,
+        }));
+    });
+}
+export async function retainModel(runtime, locator, declaration, given, refused) {
+    const { store, socket } = runtime;
+    const held = await store.record(locator);
+    const previous = held?.model ?? unheldModelOf(runtime, locator);
+    const next = given ?? previous;
+    if (JSON.stringify(previous) === JSON.stringify(next) && declaredAsHeld(held, declaration))
+        return;
+    if (held !== undefined && !restands(held, next, declaration)) {
+        await recorded(runtime, locator, declaration, next);
+        return;
+    }
+    await settle(runtime, [locator], async (works) => {
+        if (!socket.continuing())
+            return [];
+        const current = works.get(locator)?.replica;
+        if (current === undefined) {
+            unheld(runtime, locator, next);
+            return [];
+        }
+        return [
+            {
+                locator,
+                record: { ...current.record, declaration, model: next },
+                ...(refused === undefined ? {} : { refused }),
+            },
+        ];
+    });
+}
+export async function scoped(runtime, result, locator, declaration) {
+    const { socket, presence } = runtime;
+    if (result.scope === 'content' && !result.retryable) {
+        await loseRooms(runtime, [locator]);
+        return;
+    }
+    presence.refused(locator, result);
+    if (result.scope === 'model')
+        await retainModel(runtime, locator, declaration, { status: 'unavailable', reason: 'not-readable' }, true);
+    if (!socket.continuing())
+        return;
+    emitRooms(runtime, [locator]);
+}
+export async function settleModels(runtime, held, status, local) {
+    const { store, socket, presence } = runtime;
+    const owed = (model) => model.status !== 'unavailable' && model.status !== status;
+    const declaredAnew = await store.exclusive(async () => {
+        if (!socket.continuing())
+            return [];
+        const stored = await store.rooms([...held.keys()]);
+        const unchanged = [...held].filter(([locator, declaration]) => {
+            const record = stored.get(locator)?.record;
+            return (owed(record?.model ?? unheldModelOf(runtime, locator)) &&
+                declaredAsHeld(record, declaration));
+        });
+        const records = unchanged.flatMap(([locator]) => {
+            const record = stored.get(locator)?.record;
+            return record === undefined
+                ? []
+                : [{ ...record, model: { ...record.model, status } }];
+        });
+        if (records.length > 0) {
+            try {
+                await local.commit({ rooms: records.map((record) => recordAlone(store, record)) });
+            }
+            catch (error) {
+                uncaught(error);
+            }
+        }
+        for (const [locator] of unchanged) {
+            const unheldModel = presence.unheldModel(locator);
+            if (!stored.has(locator) && unheldModel !== null) {
+                presence.modelled(locator, { ...unheldModel, status });
+            }
+        }
+        if (unchanged.length > 0)
+            emitRooms(runtime, unchanged.map(([locator]) => locator));
+        const kept = new Set(unchanged.map(([locator]) => locator));
+        return [...held].filter(([locator]) => !kept.has(locator) &&
+            owed(stored.get(locator)?.record.model ?? unheldModelOf(runtime, locator)));
+    });
+    for (const [locator, declaration] of declaredAnew) {
+        const model = await modelNow(runtime, locator);
+        if (owed(model))
+            await retainModel(runtime, locator, declaration, { ...model, status });
+    }
+}
+export async function cachedModels(runtime, local) {
+    const { store, presence } = runtime;
+    const held = await store.rooms();
+    await settleModels(runtime, new Map(listedLocators(runtime, held).flatMap((locator) => {
+        const discovered = presence.room(locator);
+        const declaration = discovered === undefined
+            ? declarationOf(runtime, locator, held.get(locator))?.room
+            : declared(discovered);
+        return declaration === undefined ? [] : [[locator, declaration]];
+    })), 'cached', local);
+}

package/dist/observation.d.ts

@@ -1,4 +1,5 @@
-import type { QueryCoverage, QueryDocument, QueryGroup, QueryResult } from './query.js';
+import type { PendingRoom, QueryCoverage, QueryDocument, QueryGroup, QueryResult } from './query.js';
+import type { ReadinessShown, RoomCoverage } from './readiness.js';
 export type Observation<T> = {
     current(): T;
     subscribe(listener: (value: T) => void): () => void;
@@ -9,15 +10,24 @@ export type KeyedResult = {
     result: QueryResult;
     keys: readonly RowKey[];
 };
-export type QueryChange = {
-    changed: readonly (readonly [RowKey, QueryDocument | QueryGroup])[];
-    removed: readonly RowKey[];
-    order: readonly RowKey[] | null;
+export type KeyedChange<K, T> = {
+    readonly changed: readonly (readonly [K, T])[];
+    readonly removed: readonly K[];
+    readonly order: readonly K[] | null;
+};
+export type QueryChange = KeyedChange<RowKey, QueryDocument | QueryGroup> & {
     coverage?: QueryCoverage;
     next?: string | null;
     total?: number;
 };
-export type QueryMessage = KeyedResult | QueryChange;
+export type ReadinessChange = {
+    readonly shown: ReadinessShown;
+    readonly rooms: KeyedChange<string, RoomCoverage>;
+};
+export type PendingChange = {
+    readonly pending: KeyedChange<string, PendingRoom>;
+};
+export type QueryMessage = KeyedResult | QueryChange | PendingChange;
 export type Observed = {
     observation: Observation<unknown>;
     receive(message: unknown): void;
@@ -25,15 +35,20 @@ export type Observed = {
 };
 export declare function rowsOf(result: QueryResult): readonly (QueryDocument | QueryGroup)[];
 export declare function whole(message: QueryMessage): message is KeyedResult;
-export declare function applied(keyed: KeyedResult, message: QueryMessage): KeyedResult;
-export declare function observed(first: unknown, stop: () => void, keyed: boolean): Observed;
-export declare function opened(watch: (deliver: (message: unknown) => void, fail: (error: unknown) => void) => () => void, keyed: boolean): Promise<Observation<unknown>>;
+export declare function pendingChange(message: QueryMessage): message is PendingChange;
+export declare function unchanged(change: KeyedChange<unknown, unknown>): boolean;
+export declare function keyedChange<K, H, T>(held: ReadonlyMap<K, H>, keys: readonly K[], rows: readonly T[], same: (was: H, now: T) => boolean): KeyedChange<K, T>;
+export declare function keyedAt<K, H, T>(held: ReadonlyMap<K, H>, at: ReadonlyMap<K, T | null>, same: (was: H, now: T) => boolean): KeyedChange<K, T> | null;
+export declare function keyedInto<K, T>(held: Map<K, T>, change: KeyedChange<K, T>): void;
+export declare function samePending(was: PendingRoom, now: PendingRoom): boolean;
+export declare function replaces(topic: string, message: unknown): boolean;
+export declare function observed(first: unknown, stop: () => void, topic: string): Observed;
+export declare function opened(watch: (deliver: (message: unknown) => void, fail: (error: unknown) => void) => () => void, topic: string): Promise<Observation<unknown>>;
 export declare function observing<Topic extends string>(watch: (topic: Topic, input: readonly unknown[], deliver: (message: unknown) => void, fail: (error: unknown) => void) => () => void): (topic: Topic, ...input: unknown[]) => Promise<Observation<unknown>>;
 export type Digest = {
-    readonly pending: string;
+    readonly pending: Map<string, PendingRoom>;
 } | {
-    readonly keys: readonly RowKey[];
-    readonly rows: ReadonlyMap<RowKey, number>;
+    readonly rows: Map<RowKey, number>;
     readonly coverage: string;
     readonly next: string | undefined;
     readonly total: number | undefined;

package/dist/observation.d.ts.map

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

package/dist/observation.js

@@ -6,49 +6,165 @@ export function rowsOf(result) {
 export function whole(message) {
     return 'result' in message;
 }
-export function applied(keyed, message) {
-    if (whole(message))
-        return message;
-    const result = keyed.result;
-    if ('pending' in result)
-        return keyed;
-    const rows = rowsOf(result);
-    const byKey = new Map(keyed.keys.map((key, index) => [key, rows[index]]));
-    for (const key of message.removed)
-        byKey.delete(key);
-    for (const [key, row] of message.changed)
-        byKey.set(key, row);
-    const keys = message.order ?? keyed.keys.filter((key) => byKey.has(key));
-    const kept = keys.map((key) => byKey.get(key));
-    const coverage = message.coverage ?? result.coverage;
-    const next = message.next === undefined ? result.next : (message.next ?? undefined);
-    const total = message.total ?? result.total;
-    const window = {
-        ...(next === undefined ? {} : { next }),
-        ...(total === undefined ? {} : { total }),
+export function pendingChange(message) {
+    return 'pending' in message;
+}
+export function unchanged(change) {
+    return change.changed.length === 0 && change.removed.length === 0 && change.order === null;
+}
+export function keyedChange(held, keys, rows, same) {
+    const present = new Set(keys);
+    const changed = keys.flatMap((key, at) => {
+        const was = held.get(key);
+        return was !== undefined && same(was, rows[at]) ? [] : [[key, rows[at]]];
+    });
+    const removed = [];
+    const kept = [];
+    for (const key of held.keys())
+        (present.has(key) ? kept : removed).push(key);
+    const moved = kept.length !== keys.length || kept.some((key, at) => keys[at] !== key);
+    return { changed, removed, order: moved ? keys : null };
+}
+export function keyedAt(held, at, same) {
+    const changed = [];
+    const removed = [];
+    for (const [key, now] of at) {
+        const was = held.get(key);
+        if (was === undefined) {
+            if (now !== null)
+                return null;
+        }
+        else if (now === null)
+            removed.push(key);
+        else if (!same(was, now))
+            changed.push([key, now]);
+    }
+    return { changed, removed, order: null };
+}
+export function keyedInto(held, change) {
+    for (const key of change.removed)
+        held.delete(key);
+    for (const [key, row] of change.changed)
+        held.set(key, row);
+    if (change.order === null)
+        return;
+    const placed = change.order.map((key) => [key, held.get(key)]);
+    held.clear();
+    for (const [key, row] of placed)
+        held.set(key, row);
+}
+export function samePending(was, now) {
+    return was.awaits === now.awaits;
+}
+function keyedRows(keys, rows) {
+    const held = new Map(keys.map((key, at) => [key, rows[at]]));
+    let shown = rows;
+    return {
+        rows: () => shown,
+        apply(change) {
+            if (unchanged(change))
+                return shown;
+            keyedInto(held, change);
+            shown = [...held.values()];
+            return shown;
+        },
     };
+}
+function located(rooms) {
+    return keyedRows(rooms.map(({ locator }) => locator), rooms);
+}
+function keyedRooms(first) {
+    let held = located(first);
+    return {
+        value: first,
+        next(message) {
+            if (!Array.isArray(message))
+                return held.apply(message);
+            held = located(message);
+            return held.rows();
+        },
+    };
+}
+function covered(readiness) {
+    return keyedRows(readiness.coverage.rooms.map(({ room }) => room), readiness.coverage.rooms);
+}
+function keyedReadiness(first) {
+    let held = covered(first);
     return {
-        result: 'groups' in result
-            ? { groups: kept, coverage, ...window }
-            : { documents: kept, coverage, ...window },
-        keys,
+        value: first,
+        next(message) {
+            if (!('shown' in message)) {
+                held = covered(message);
+                return message;
+            }
+            const { shown, rooms } = message;
+            return { ...shown, coverage: { ...shown.coverage, rooms: held.apply(rooms) } };
+        },
     };
 }
+function awaiting(pending) {
+    return keyedRows(pending.map(({ room }) => room), pending);
+}
 function keyedResult(first) {
-    let keyed = first;
+    let result = first.result;
+    let rows = keyedRows([], []);
+    let pending = awaiting([]);
+    const take = ({ result: next, keys }) => {
+        result = next;
+        if ('pending' in next)
+            pending = awaiting(next.pending);
+        else
+            rows = keyedRows(keys, rowsOf(next));
+        return result;
+    };
+    take(first);
     return {
         value: first.result,
         next(message) {
-            keyed = applied(keyed, message);
-            return keyed.result;
+            const asked = message;
+            if (whole(asked))
+                return take(asked);
+            if (pendingChange(asked)) {
+                if ('pending' in result)
+                    result = { pending: pending.apply(asked.pending) };
+                return result;
+            }
+            if ('pending' in result)
+                return result;
+            const kept = rows.apply(asked);
+            const coverage = asked.coverage ?? result.coverage;
+            const next = asked.next === undefined ? result.next : (asked.next ?? undefined);
+            const total = asked.total ?? result.total;
+            const window = {
+                ...(next === undefined ? {} : { next }),
+                ...(total === undefined ? {} : { total }),
+            };
+            result =
+                'groups' in result
+                    ? { groups: kept, coverage, ...window }
+                    : { documents: kept, coverage, ...window };
+            return result;
         },
     };
 }
+const FOLDS = {
+    query: (first) => keyedResult(first),
+    rooms: (first) => keyedRooms(first),
+    readiness: (first) => keyedReadiness(first),
+};
+const WHOLE = {
+    query: (message) => whole(message),
+    rooms: (message) => Array.isArray(message),
+    readiness: (message) => !('shown' in message),
+};
+export function replaces(topic, message) {
+    return WHOLE[topic]?.(message) ?? true;
+}
 function replaced(first) {
     return { value: first, next: (message) => message };
 }
-export function observed(first, stop, keyed) {
-    const reducer = keyed ? keyedResult(first) : replaced(first);
+export function observed(first, stop, topic) {
+    const reducer = (FOLDS[topic] ?? replaced)(first);
     let value = reducer.value;
     let open = true;
     const listeners = new Set();
@@ -86,34 +202,29 @@ export function observed(first, stop, keyed) {
         end,
     };
 }
-export function opened(watch, keyed) {
+export function opened(watch, topic) {
     return new Promise((resolve, reject) => {
         let handle;
         let stop = () => { };
-        try {
-            stop = watch((message) => {
-                if (handle !== undefined) {
-                    handle.receive(message);
-                    return;
-                }
-                handle = observed(message, () => stop(), keyed);
-                resolve(handle.observation);
-            }, (error) => {
-                if (handle !== undefined)
-                    return;
-                stop();
-                reject(error);
-            });
-        }
-        catch (error) {
+        stop = watch((message) => {
+            if (handle !== undefined) {
+                handle.receive(message);
+                return;
+            }
+            handle = observed(message, () => stop(), topic);
+            resolve(handle.observation);
+        }, (error) => {
+            if (handle !== undefined)
+                return;
+            stop();
             reject(error);
-        }
+        });
     });
 }
 export function observing(watch) {
     return (topic, ...input) => opened((deliver, fail) => watch(topic, input, (message) => {
         deliver(structuredClone(message));
-    }, fail), topic === 'query');
+    }, fail), topic);
 }
 export function hashed(text) {
     let first = 0xdeadbeef;
@@ -134,10 +245,9 @@ function rowDigest(row) {
 }
 export function digestOf({ result, keys }) {
     if ('pending' in result)
-        return { pending: JSON.stringify(result) };
+        return { pending: new Map(result.pending.map((room) => [room.room, room])) };
     const rows = rowsOf(result);
     return {
-        keys,
         rows: new Map(keys.map((key, index) => [key, rowDigest(rows[index])])),
         coverage: JSON.stringify(result.coverage),
         next: result.next,
@@ -145,16 +255,22 @@ export function digestOf({ result, keys }) {
     };
 }
 export function digestApplied(digest, message) {
-    if (whole(message) || 'pending' in digest)
-        return whole(message) ? digestOf(message) : digest;
-    const rows = new Map(digest.rows);
-    for (const key of message.removed)
-        rows.delete(key);
-    for (const [key, row] of message.changed)
-        rows.set(key, rowDigest(row));
+    if (whole(message))
+        return digestOf(message);
+    if (pendingChange(message)) {
+        if ('pending' in digest)
+            keyedInto(digest.pending, message.pending);
+        return digest;
+    }
+    if ('pending' in digest)
+        return digest;
+    keyedInto(digest.rows, {
+        changed: message.changed.map(([key, row]) => [key, rowDigest(row)]),
+        removed: message.removed,
+        order: message.order,
+    });
     return {
-        keys: message.order ?? digest.keys.filter((key) => rows.has(key)),
-        rows,
+        rows: digest.rows,
         coverage: message.coverage === undefined ? digest.coverage : JSON.stringify(message.coverage),
         next: message.next === undefined ? digest.next : (message.next ?? undefined),
         total: message.total ?? digest.total,
@@ -162,35 +278,18 @@ export function digestApplied(digest, message) {
 }
 export function changeOf(previous, next) {
     const after = next.result;
-    if ('pending' in previous || 'pending' in after) {
-        return 'pending' in previous && 'pending' in after && previous.pending === JSON.stringify(after)
-            ? null
-            : next;
+    if ('pending' in previous && 'pending' in after) {
+        const pending = keyedChange(previous.pending, after.pending.map(({ room }) => room), after.pending, samePending);
+        return unchanged(pending) ? null : { pending };
     }
-    const later = rowsOf(after);
-    const present = new Set(next.keys);
-    const changed = [];
-    next.keys.forEach((key, index) => {
-        const row = later[index];
-        if (previous.rows.get(key) !== rowDigest(row))
-            changed.push([key, row]);
-    });
-    const removed = previous.keys.filter((key) => !present.has(key));
-    const kept = previous.keys.filter((key) => present.has(key));
-    const moved = kept.length !== next.keys.length || kept.some((key, index) => next.keys[index] !== key);
-    const coverage = JSON.stringify(after.coverage);
-    const covered = previous.coverage !== coverage;
+    if ('pending' in previous || 'pending' in after)
+        return next;
+    const rows = keyedChange(previous.rows, next.keys, rowsOf(after), (was, row) => was === rowDigest(row));
+    const covered = previous.coverage !== JSON.stringify(after.coverage);
     const framing = reframed(previous, after);
-    if (changed.length === 0 && removed.length === 0 && !moved && !covered && framing === null) {
+    if (unchanged(rows) && !covered && framing === null)
         return null;
-    }
-    return {
-        changed,
-        removed,
-        order: moved ? next.keys : null,
-        ...(covered ? { coverage: after.coverage } : {}),
-        ...framing,
-    };
+    return { ...rows, ...(covered ? { coverage: after.coverage } : {}), ...framing };
 }
 function reframed(before, after) {
     const next = before.next === after.next ? {} : { next: after.next ?? null };

package/dist/opened.d.ts

@@ -18,5 +18,5 @@ export type OpenedFiles = {
     find(name: OpenedName): Promise<KeptBinary | null>;
     fetch(name: OpenedName, read: () => Promise<BinaryResult>): Promise<KeptResult>;
 };
-export declare function openedFiles(database: RuntimeDatabase, fenced: (locator: string) => boolean): OpenedFiles;
+export declare function openedFiles(database: RuntimeDatabase, lost: (locator: string) => boolean): OpenedFiles;
 //# sourceMappingURL=opened.d.ts.map

package/dist/opened.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opened.d.ts","sourceRoot":"","sources":["../src/opened.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAErF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAEhF,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACnD,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CACjF,CAAC;AAsBF,wBAAgB,WAAW,CACzB,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,GACnC,WAAW,CAsFb"}
+{"version":3,"file":"opened.d.ts","sourceRoot":"","sources":["../src/opened.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,OAAO,EAAoC,KAAK,eAAe,EAAE,MAAM,aAAa,CAAC;AAErF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC,YAAY,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAAC;AAEhF,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACnD,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CACjF,CAAC;AAsBF,wBAAgB,WAAW,CACzB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,GACjC,WAAW,CAsFb"}

package/dist/opened.js

@@ -20,7 +20,7 @@ function taken(chunks, size) {
     }
     return part;
 }
-export function openedFiles(database, fenced) {
+export function openedFiles(database, lost) {
     const fetching = new Map();
     async function find(name) {
         const held = await database.ask({ kind: 'opened.find', ...name });
@@ -36,14 +36,14 @@ export function openedFiles(database, fenced) {
         let part = 0;
         const write = async (bytes) => {
             if (!(await database.ask({ kind: 'opened.part', key, part, bytes }))) {
-                throw new Error('the device no longer keeps this download');
+                throw new Error();
             }
             part += 1;
         };
         try {
-            if (fenced(name.locator) ||
+            if (lost(name.locator) ||
                 !(await database.ask({ kind: 'opened.begin', key, ...name, mediaType }))) {
-                throw new Error('the device no longer reads this Room');
+                throw new Error();
             }
             for (;;) {
                 const read = await reader.read();
@@ -61,7 +61,7 @@ export function openedFiles(database, fenced) {
                 await write(taken(chunks, held));
             const received = hashed.hex();
             if (sha256 !== undefined && sha256 !== received) {
-                throw new Error('the bytes are not the file the device asked for');
+                throw new Error();
             }
             const whole = await database.ask({
                 kind: 'opened.keep',