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

package/dist/connection.js

@@ -1,7 +1,9 @@
 import { verify } from '@agentshouse/mdmodel';
 import { cached, modelTypes, NO_MODEL, sameModel } from './model.js';
-import { identityOf, planOf } from './query.js';
+import { opened } from './observation.js';
+import { filterOf, identityOf, planOf } from './query.js';
 import { createReadSide } from './read-side.js';
+import { createSearchIndex, searchPlanOf } from './search.js';
 import { ROOM_CONTRACT_VERSION, VERSION_1_CAPABILITIES } from './adapter.js';
 import { bootstrapRoom } from './bootstrap.js';
 import { changeSet, mergeChangeSets } from './change-set.js';
@@ -36,6 +38,9 @@ function declaredSelection(room) {
     return selection.roots.every((root, index)=>validRoot(root) && root !== '' && !within(room.collectionRoot, root) && selection.roots.every((other, at)=>at === index || !within(other, root)));
 }
 export function createMdRuntime(options) {
+    return composeRuntime(options).md;
+}
+export function composeRuntime(options) {
     const period = options.discoveryIntervalMs ?? DEFAULT_DISCOVERY_INTERVAL_MS;
     let authorization = options.authorization;
     let opening;
@@ -119,6 +124,12 @@ export function createMdRuntime(options) {
         publish: publishChangeSet,
         closed: ()=>closed
     });
+    const searchIndex = createSearchIndex({
+        documents: ()=>readSide.documents(),
+        document: (room, path)=>readSide.document(room, path),
+        messages: ()=>conversations.messages(),
+        message: (conversation, identity)=>conversations.message(conversation, identity)
+    });
     const journal = createLog();
     let notifyReady = ()=>{};
     const ready = new Promise((resolve)=>{
@@ -295,8 +306,12 @@ export function createMdRuntime(options) {
             if (subscription.locator === locator) subscription.notify(entries);
         }
     }
-    function publishChangeSet(set) {
+    function applyChangeSet(set) {
         readSide.apply(set);
+        searchIndex.changed(set);
+    }
+    function publishChangeSet(set) {
+        applyChangeSet(set);
         if (set.rooms.length > 0) emitRooms();
         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)) {
@@ -576,7 +591,7 @@ export function createMdRuntime(options) {
     }
     async function readState(opened) {
         const { lastCompleted, locators, read } = await hydrate(opened);
-        readSide.apply(read);
+        applyChangeSet(read);
         if (replicas.size > 0) emitRooms();
         for (const locator of locators)emitQueue(locator);
         publishRoomDrafts(false);
@@ -1758,7 +1773,89 @@ export function createMdRuntime(options) {
         notifyReady();
     });
     void enqueue();
-    return {
+    function watch(topic, input, deliver) {
+        if (topic === 'room-drafts') {
+            const listener = {
+                notify: deliver,
+                ready: false
+            };
+            roomDraftListeners.add(listener);
+            void exclusive(async ()=>{
+                await openLocal();
+                if (closed || !roomDraftListeners.has(listener)) return;
+                listener.ready = true;
+            }).then(()=>{
+                if (closed || !listener.ready || !roomDraftListeners.has(listener)) return;
+                listener.notify(snapshotRoomDrafts());
+            }, ()=>{});
+            return ()=>{
+                roomDraftListeners.delete(listener);
+            };
+        }
+        if (topic === 'conversation') {
+            return conversations.watch(input[0], input[1], deliver);
+        }
+        if (topic === 'presentation') {
+            const listener = {
+                app: input[0],
+                notify: deliver,
+                ready: false
+            };
+            presentationListeners.add(listener);
+            void exclusive(async ()=>{
+                await openLocal();
+            }).then(()=>{
+                if (closed || !presentationListeners.has(listener)) return;
+                listener.ready = true;
+                listener.notify(presentationOf(listener.app));
+            }, ()=>{});
+            return ()=>{
+                presentationListeners.delete(listener);
+            };
+        }
+        if (topic === 'rooms') {
+            roomListeners.add(deliver);
+            deliver(listed());
+            return ()=>{
+                roomListeners.delete(deliver);
+            };
+        }
+        if (topic === 'connection-refusal') {
+            refusalListeners.add(deliver);
+            deliver(refusal);
+            return ()=>{
+                refusalListeners.delete(deliver);
+            };
+        }
+        if (topic === 'storage-loss') {
+            storageLossListeners.add(deliver);
+            deliver(storageLoss);
+            return ()=>{
+                storageLossListeners.delete(deliver);
+            };
+        }
+        if (topic === 'sync-status') {
+            statusListeners.add(deliver);
+            deliver(shown);
+            return ()=>{
+                statusListeners.delete(deliver);
+            };
+        }
+        if (topic === 'queue') {
+            const queue = {
+                locator: input[0],
+                notify: deliver
+            };
+            queueSubscriptions.add(queue);
+            queue.notify(entriesOf(queue.locator));
+            return ()=>{
+                queueSubscriptions.delete(queue);
+            };
+        }
+        const plan = planOf(input[0], roomFacts());
+        return readSide.watch(plan, identityOf(plan), deliver);
+    }
+    const md = {
         loaded () {
             return openLocal().then(()=>undefined);
         },
@@ -1769,6 +1866,11 @@ export function createMdRuntime(options) {
             return slotted();
         },
         query: (input)=>readSide.query(planOf(input, roomFacts())),
+        async search (input) {
+            const plan = searchPlanOf(input);
+            const selected = plan.documents === undefined ? null : (await readSide.query(filterOf(plan.documents, roomFacts()))).documents;
+            return searchIndex.search(plan, selected);
+        },
         types (locator) {
             return {
                 collection: modelTypes(modelOf(locator)),
@@ -1897,93 +1999,9 @@ export function createMdRuntime(options) {
         persistence () {
             return options.shell.persistentStorage;
         },
-        observe (topic, second, third, fourth) {
-            if (topic === 'room-drafts') {
-                const notify = second;
-                const listener = {
-                    notify,
-                    ready: false
-                };
-                roomDraftListeners.add(listener);
-                void exclusive(async ()=>{
-                    await openLocal();
-                    if (closed || !roomDraftListeners.has(listener)) return;
-                    listener.ready = true;
-                }).then(()=>{
-                    if (closed || !listener.ready || !roomDraftListeners.has(listener)) return;
-                    listener.notify(snapshotRoomDrafts());
-                }, ()=>{});
-                return ()=>{
-                    roomDraftListeners.delete(listener);
-                };
-            }
-            if (topic === 'conversation') {
-                return conversations.observe(second, third, fourth);
-            }
-            if (topic === 'presentation') {
-                const listener = {
-                    app: second,
-                    notify: third,
-                    ready: false
-                };
-                presentationListeners.add(listener);
-                void exclusive(async ()=>{
-                    await openLocal();
-                }).then(()=>{
-                    if (closed || !presentationListeners.has(listener)) return;
-                    listener.ready = true;
-                    listener.notify(presentationOf(listener.app));
-                }, ()=>{});
-                return ()=>{
-                    presentationListeners.delete(listener);
-                };
-            }
-            if (topic === 'rooms') {
-                const notify = second;
-                roomListeners.add(notify);
-                notify(listed());
-                return ()=>{
-                    roomListeners.delete(notify);
-                };
-            }
-            if (topic === 'connection-refusal') {
-                const notify = second;
-                refusalListeners.add(notify);
-                notify(refusal);
-                return ()=>{
-                    refusalListeners.delete(notify);
-                };
-            }
-            if (topic === 'storage-loss') {
-                const notify = second;
-                storageLossListeners.add(notify);
-                notify(storageLoss);
-                return ()=>{
-                    storageLossListeners.delete(notify);
-                };
-            }
-            if (topic === 'sync-status') {
-                const notify = second;
-                statusListeners.add(notify);
-                notify(shown);
-                return ()=>{
-                    statusListeners.delete(notify);
-                };
-            }
-            if (topic === 'queue') {
-                const queue = {
-                    locator: second,
-                    notify: third
-                };
-                queueSubscriptions.add(queue);
-                queue.notify(entriesOf(queue.locator));
-                return ()=>{
-                    queueSubscriptions.delete(queue);
-                };
-            }
-            const plan = planOf(second, roomFacts());
-            return readSide.observe(plan, identityOf(plan), third);
-        },
+        observe: (topic, ...input)=>opened((deliver)=>watch(topic, input, (message)=>{
+                    deliver(structuredClone(message));
+                }), topic === 'query'),
         async reauthorize () {
             if (refusal === null || !refusal.reauthorizationOffered) return;
             journal.record('connection reauthorize');
@@ -1993,6 +2011,10 @@ export function createMdRuntime(options) {
             await enqueue();
         }
     };
+    return {
+        md,
+        watch
+    };
 }
 
 //# sourceMappingURL=connection.js.map