@agentshouse/mdruntime 0.1.0-alpha.24 → 0.1.0-alpha.25

package/dist/connection.js

@@ -1,11 +1,12 @@
-import { rawQuery } from './query.js';
 import { verify } from '@agentshouse/mdmodel';
 import { cached, modelTypes, NO_MODEL, sameModel } from './model.js';
+import { identityOf, planOf } from './query.js';
+import { createReadSide } from './read-side.js';
 import { ROOM_CONTRACT_VERSION, VERSION_1_CAPABILITIES } from './adapter.js';
 import { bootstrapRoom } from './bootstrap.js';
 import { changeSet, mergeChangeSets } from './change-set.js';
 import { createConversationStore } from './conversation.js';
-import { MD_MODEL, PRESENTED, validRoot } from './collection.js';
+import { MD_MODEL, validRoot } from './collection.js';
 import { createLog } from './log.js';
 import { refreshRoom } from './refresh.js';
 import { buildBatch } from './save.js';
@@ -58,6 +59,7 @@ export function createMdRuntime(options) {
     const invalidModels = new Set();
     const modelEpoch = new Map();
     const discovered = new Map();
+    let roomsListed = false;
     const scopedRefusals = new Map();
     function modelKey(locator, attached) {
         return `${attached} ${locator}`;
@@ -97,15 +99,20 @@ export function createMdRuntime(options) {
     const refusalListeners = new Set();
     const storageLossListeners = new Set();
     const statusListeners = new Set();
-    const querySubscriptions = new Set();
     const queueSubscriptions = new Set();
     const roomDraftListeners = new Set();
     const presentationListeners = new Set();
+    const readSide = createReadSide();
     let withdrawConversations;
     let currencyQueued = false;
     const conversations = createConversationStore({
         cards: declaredCards,
-        documents: ()=>visible({}).documents,
+        documents: (locator)=>readSide.query(planOf({
+                rooms: [
+                    locator
+                ],
+                select: 'all'
+            }, roomFacts())),
         call: (name, input)=>invokeAction(name, input),
         durably,
         stream: ()=>options.adapter.conversations,
@@ -223,16 +230,26 @@ export function createMdRuntime(options) {
                 })
             })));
     }
-    function queryRooms() {
-        return [
-            ...replicas.values()
-        ].map((replica)=>({
-                room: replica.confirmed.record.locator,
-                roomVersion: replica.confirmed.record.roomVersion,
-                documents: replica.visible.collection.documents,
-                model: modelTypes(modelOf(replica.confirmed.record.locator)),
-                typedSelection: replica.confirmed.record.typedSelection === null ? null : modelTypes(modelOf(replica.confirmed.record.locator, 'typed-selection'))
-            }));
+    function roomFacts() {
+        const held = [
+            ...rooms.values()
+        ].map((room)=>{
+            const attached = [
+                modelOf(room.locator),
+                ...room.typedSelection === null ? [] : [
+                    modelOf(room.locator, 'typed-selection')
+                ]
+            ];
+            return {
+                locator: room.locator,
+                available: attached.every((model)=>model.status !== 'unavailable'),
+                types: attached.flatMap((model)=>model.status === 'unavailable' ? [] : Object.values(model.types))
+            };
+        });
+        return {
+            listed: roomsListed,
+            rooms: held
+        };
     }
     function emitRooms() {
         const value = listed();
@@ -259,26 +276,6 @@ export function createMdRuntime(options) {
         shown = next;
         for (const listener of statusListeners)listener(shown);
     }
-    function visible(request) {
-        if (options.queryBinding === null) {
-            if (Object.keys(request).length > 0) throw new Error('query-binding-unavailable');
-            return rawQuery(queryRooms());
-        }
-        return options.queryBinding(queryRooms(), {
-            ...request,
-            selector: {
-                $and: [
-                    PRESENTED,
-                    request.selector ?? {}
-                ]
-            }
-        });
-    }
-    function emitVisible() {
-        for (const subscription of querySubscriptions){
-            subscription.notify(visible(subscription.query));
-        }
-    }
     function submissionOf(batch) {
         return pendings.get(batch.id)?.submission ?? {
             state: 'waiting'
@@ -299,8 +296,8 @@ export function createMdRuntime(options) {
         }
     }
     function publishChangeSet(set) {
+        readSide.apply(set);
         if (set.rooms.length > 0) emitRooms();
-        if (set.documents.length > 0 || set.query) emitVisible();
         for (const locator of set.queues)emitQueue(locator);
         if (set.drafts.length > 0 || set.documents.some((change)=>roomDrafts.get(change.locator)?.has(change.path) === true)) {
             publishRoomDrafts(false);
@@ -377,8 +374,7 @@ export function createMdRuntime(options) {
                             }
                         });
                         changed.push(changeSet(locator, before, replicas.get(locator) ?? null, {
-                            room: true,
-                            query: true
+                            room: true
                         }));
                     }
                     publishChangeSet(mergeChangeSets(changed));
@@ -429,6 +425,7 @@ export function createMdRuntime(options) {
             }
             list(room, room.replica.admission === 'admitted' && !unreadable.has(room.locator));
         }
+        roomsListed = true;
         emitRooms();
     }
     function unlistedHeld(listed) {
@@ -452,7 +449,6 @@ export function createMdRuntime(options) {
             const removed = unlisted.map((locator)=>changeSet(locator, replicas.get(locator) ?? null, null, {
                     room: true,
                     queue: true,
-                    query: true,
                     drafts: [
                         ...roomDrafts.get(locator)?.keys() ?? []
                     ]
@@ -569,15 +565,19 @@ export function createMdRuntime(options) {
             locators: new Set([
                 ...queuedBatches.keys(),
                 ...replicas.keys()
-            ])
+            ]),
+            read: mergeChangeSets([
+                ...new Set([
+                    ...previousReplicas.keys(),
+                    ...replicas.keys()
+                ])
+            ].map((locator)=>changeSet(locator, previousReplicas.get(locator) ?? null, replicas.get(locator) ?? null)))
         };
     }
     async function readState(opened) {
-        const { lastCompleted, locators } = await hydrate(opened);
-        if (replicas.size > 0) {
-            emitRooms();
-            emitVisible();
-        }
+        const { lastCompleted, locators, read } = await hydrate(opened);
+        readSide.apply(read);
+        if (replicas.size > 0) emitRooms();
         for (const locator of locators)emitQueue(locator);
         publishRoomDrafts(false);
         return lastCompleted;
@@ -689,7 +689,6 @@ export function createMdRuntime(options) {
         replicas.set(locator, replicaOf(confirmed, kept, rewriting(), before));
         return changeSet(locator, before ?? null, replicas.get(locator) ?? null, {
             room: settling.room,
-            query: settling.query,
             queue: kept.length !== (before?.queue.length ?? 0),
             drafts: [
                 ...written.keys()
@@ -707,14 +706,12 @@ export function createMdRuntime(options) {
             if (retained === null) {
                 list(room, true);
                 publishChangeSet(changeSet(room.locator, prior ?? null, prior ?? null, {
-                    room: true,
-                    query: true
+                    room: true
                 }));
                 return;
             }
             const set = await settle(local, room.locator, prior, retained, prior?.queue ?? [], {
-                room: true,
-                query: true
+                room: true
             });
             unreadable.delete(room.locator);
             list(room, true);
@@ -1082,8 +1079,7 @@ export function createMdRuntime(options) {
                 id: submitted.id,
                 outcome: acceptedOutcome
             },
-            room: true,
-            query: true
+            room: true
         });
         unreadable.delete(room.locator);
         list(room, true);
@@ -1261,7 +1257,6 @@ export function createMdRuntime(options) {
         const previous = modelOf(room.locator, attached);
         const heldBefore = replicas.get(room.locator)?.confirmed.record;
         if (JSON.stringify(previous) === JSON.stringify(next) && (heldBefore === undefined || JSON.stringify(heldBefore.operations) === JSON.stringify(room.operations) && JSON.stringify(heldBefore.replica) === JSON.stringify(room.replica) && JSON.stringify(heldBefore.attachedModel) === JSON.stringify(room.attachedModel) && JSON.stringify(heldBefore.typedSelection) === JSON.stringify(room.typedSelection ?? null))) return;
-        const queryChanged = previous.status === 'unavailable' || next.status === 'unavailable' ? previous.status !== next.status : JSON.stringify(previous.types) !== JSON.stringify(next.types);
         if (next.status === 'unavailable') {
             invalidModels.add(key);
             liveModels.delete(key);
@@ -1300,8 +1295,7 @@ export function createMdRuntime(options) {
             list(room, room.replica.admission === 'admitted' && !unreadable.has(room.locator));
             if (held === undefined) emitRooms();
             else publishChangeSet(changeSet(room.locator, held, replicas.get(room.locator) ?? null, {
-                room: true,
-                query: queryChanged
+                room: true
             }));
         });
     }
@@ -1751,7 +1745,7 @@ export function createMdRuntime(options) {
         refusalListeners.clear();
         storageLossListeners.clear();
         statusListeners.clear();
-        querySubscriptions.clear();
+        readSide.close();
         queueSubscriptions.clear();
         roomDraftListeners.clear();
         presentationListeners.clear();
@@ -1774,9 +1768,7 @@ export function createMdRuntime(options) {
         slots () {
             return slotted();
         },
-        query (request = {}) {
-            return visible(request);
-        },
+        query: (input)=>readSide.query(planOf(input, roomFacts())),
         types (locator) {
             return {
                 collection: modelTypes(modelOf(locator)),
@@ -1989,16 +1981,8 @@ export function createMdRuntime(options) {
                     queueSubscriptions.delete(queue);
                 };
             }
-            const subscription = {
-                query: second,
-                notify: third
-            };
-            const first = visible(subscription.query);
-            querySubscriptions.add(subscription);
-            subscription.notify(first);
-            return ()=>{
-                querySubscriptions.delete(subscription);
-            };
+            const plan = planOf(second, roomFacts());
+            return readSide.observe(plan, identityOf(plan), third);
         },
         async reauthorize () {
             if (refusal === null || !refusal.reauthorizationOffered) return;