@dxos/echo-pipeline 0.8.2 → 0.8.3-main.672df60

package/src/automerge/automerge-repo.test.ts

@@ -430,7 +430,7 @@ describe('AutomergeRepo', () => {
       let clientDoc = A.from<{ field?: string }>({});
       const { documentId } = parseAutomergeUrl(generateAutomergeUrl());
       // Sync handshake.
-      let sentHeads = getHeads(clientDoc);
+      let sentHeads: Heads = [];
 
       // Sync protocol.
       const sendDoc = async (doc: A.Doc<any>) => {
@@ -451,6 +451,50 @@ describe('AutomergeRepo', () => {
       }
     });
 
+    test('client creates doc and Repo persists it to disk', async () => {
+      const storage = await createLevelAdapter();
+
+      const repo = new Repo({ network: [], storage });
+      const receiveByServer = async (blob: Uint8Array, docId: DocumentId) => {
+        const serverHandle = await repo.find(docId, FIND_PARAMS);
+        serverHandle.update((doc) => {
+          return A.loadIncremental(doc, blob);
+        });
+      };
+
+      let clientDoc = A.from<{ field?: string }>({ field: 'foo' });
+      const { documentId } = parseAutomergeUrl(generateAutomergeUrl());
+      // Sync handshake.
+      let sentHeads: Heads = [];
+
+      // Sync protocol.
+      const sendDoc = async (doc: A.Doc<any>) => {
+        await receiveByServer(saveSince(doc, sentHeads), documentId);
+        sentHeads = getHeads(doc);
+      };
+
+      // Change doc and send changes to server.
+      const value = 'text to test if sync works';
+      {
+        clientDoc = A.change(clientDoc, (doc: any) => {
+          doc.field = value;
+        });
+        await sendDoc(clientDoc);
+
+        const serverHandle = await repo.find<any>(documentId);
+        expect(serverHandle.doc()!.field).to.deep.equal(value);
+      }
+
+      await sleep(100);
+
+      // Re-open repo.
+      {
+        const repo = new Repo({ network: [], storage });
+        const serverHandle = await repo.find<any>(documentId);
+        expect(serverHandle.doc()!.field).to.deep.equal(value);
+      }
+    });
+
     test('two repo sync docs on `update` call', async () => {
       const { repos, adapters } = await createHostClientRepoTopology();
       const [repoA, repoB] = repos;

package/src/db-host/data-service.ts

@@ -92,7 +92,7 @@ export class DataServiceImpl implements DataService {
     const synchronizer = this._subscriptions.get(request.subscriptionId);
     invariant(synchronizer, 'Subscription not found');
 
-    synchronizer.update(request.updates);
+    await synchronizer.update(request.updates);
   }
 
   async flush(request: FlushRequest): Promise<void> {

package/src/db-host/documents-synchronizer.test.ts

@@ -23,7 +23,7 @@ describe('DocumentsSynchronizer', () => {
     });
     await openAndClose(synchronizer);
 
-    synchronizer.update([
+    await synchronizer.update([
       {
         documentId: parseAutomergeUrl(generateAutomergeUrl()).documentId,
         mutation: A.save(A.from({ text: 'hello' })),

package/src/db-host/documents-synchronizer.ts

@@ -12,6 +12,8 @@ import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { type BatchedDocumentUpdates, type DocumentUpdate } from '@dxos/protocols/proto/dxos/echo/service';
 
+import { FIND_PARAMS } from '../automerge';
+
 const MAX_UPDATE_FREQ = 10; // [updates/sec]
 
 export type DocumentsSynchronizerParams = {
@@ -86,10 +88,10 @@ export class DocumentsSynchronizer extends Resource {
     this._syncStates.clear();
   }
 
-  update(updates: DocumentUpdate[]): void {
+  async update(updates: DocumentUpdate[]): Promise<void> {
     for (const { documentId, mutation, isNew } of updates) {
       if (isNew) {
-        const { handle: doc } = this._params.repo.findWithProgress<DatabaseDirectory>(documentId as DocumentId);
+        const doc = await this._params.repo.find<DatabaseDirectory>(documentId as DocumentId, FIND_PARAMS);
         doc.update((doc) => A.loadIncremental(doc, mutation));
         this._startSync(doc);
       } else {

package/src/query/query-executor.ts

@@ -97,6 +97,8 @@ type StepExecutionResult = {
   trace: ExecutionTrace;
 };
 
+const TRACE_QUERY_EXECUTION = false;
+
 /**
  * Executes query plans against the Indexer and AutomergeHost.
  *
@@ -186,12 +188,10 @@ export class QueryExecutor extends Resource {
           workingSet[index].documentId !== item.documentId,
       );
 
-    // log.info('Query execution result', {
-    //   changed,
-    //   trace: ExecutionTrace.format(trace),
-    // });
-    // eslint-disable-next-line no-console
-    // console.log(ExecutionTrace.format(trace));
+    if (TRACE_QUERY_EXECUTION) {
+      // eslint-disable-next-line no-console
+      console.log(ExecutionTrace.format(trace));
+    }
 
     return {
       changed,