@dxos/echo-pipeline 0.6.12 → 0.6.13-main.548ca8d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-pipeline",
-  "version": "0.6.12",
+  "version": "0.6.13-main.548ca8d",
   "description": "ECHO database.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,21 +10,16 @@
     ".": {
       "browser": "./dist/lib/browser/index.mjs",
       "node": {
-        "default": "./dist/lib/node/index.cjs"
+        "require": "./dist/lib/node/index.cjs",
+        "default": "./dist/lib/node-esm/index.mjs"
       },
       "types": "./dist/types/src/index.d.ts"
     },
-    "./light": {
-      "browser": "./dist/lib/browser/light.mjs",
-      "node": {
-        "default": "./dist/lib/node/light.cjs"
-      },
-      "types": "./dist/types/src/light.d.ts"
-    },
     "./testing": {
       "browser": "./dist/lib/browser/testing/index.mjs",
       "node": {
-        "default": "./dist/lib/node/testing/index.cjs"
+        "require": "./dist/lib/node/testing/index.cjs",
+        "default": "./dist/lib/node-esm/testing/index.mjs"
       },
       "types": "./dist/types/src/testing/index.d.ts"
     }
@@ -32,9 +27,6 @@
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
-      "light": [
-        "dist/types/src/light.d.ts"
-      ],
       "testing": [
         "dist/types/src/testing/index.d.ts"
       ]
@@ -47,48 +39,46 @@
     "src"
   ],
   "dependencies": {
-    "abstract-level": "^1.0.2",
     "crc-32": "^1.2.2",
-    "level": "^8.0.1",
     "level-transcoder": "^1.0.1",
-    "@dxos/async": "0.6.12",
-    "@dxos/automerge": "0.6.12",
-    "@dxos/codec-protobuf": "0.6.12",
-    "@dxos/credentials": "0.6.12",
-    "@dxos/context": "0.6.12",
-    "@dxos/debug": "0.6.12",
-    "@dxos/crypto": "0.6.12",
-    "@dxos/echo-protocol": "0.6.12",
-    "@dxos/feed-store": "0.6.12",
-    "@dxos/echo-schema": "0.6.12",
-    "@dxos/hypercore": "0.6.12",
-    "@dxos/indexing": "0.6.12",
-    "@dxos/invariant": "0.6.12",
-    "@dxos/keyring": "0.6.12",
-    "@dxos/keys": "0.6.12",
-    "@dxos/log": "0.6.12",
-    "@dxos/kv-store": "0.6.12",
-    "@dxos/messaging": "0.6.12",
-    "@dxos/network-manager": "0.6.12",
-    "@dxos/node-std": "0.6.12",
-    "@dxos/protocols": "0.6.12",
-    "@dxos/random-access-storage": "0.6.12",
-    "@dxos/rpc": "0.6.12",
-    "@dxos/teleport": "0.6.12",
-    "@dxos/teleport-extension-gossip": "0.6.12",
-    "@dxos/teleport-extension-object-sync": "0.6.12",
-    "@dxos/teleport-extension-automerge-replicator": "0.6.12",
-    "@dxos/teleport-extension-replicator": "0.6.12",
-    "@dxos/timeframe": "0.6.12",
-    "@dxos/tracing": "0.6.12",
-    "@dxos/typings": "0.6.12",
-    "@dxos/util": "0.6.12"
+    "lodash.isequal": "^4.5.0",
+    "@dxos/async": "0.6.13-main.548ca8d",
+    "@dxos/codec-protobuf": "0.6.13-main.548ca8d",
+    "@dxos/credentials": "0.6.13-main.548ca8d",
+    "@dxos/context": "0.6.13-main.548ca8d",
+    "@dxos/automerge": "0.6.13-main.548ca8d",
+    "@dxos/crypto": "0.6.13-main.548ca8d",
+    "@dxos/debug": "0.6.13-main.548ca8d",
+    "@dxos/echo-protocol": "0.6.13-main.548ca8d",
+    "@dxos/echo-schema": "0.6.13-main.548ca8d",
+    "@dxos/edge-client": "0.6.13-main.548ca8d",
+    "@dxos/feed-store": "0.6.13-main.548ca8d",
+    "@dxos/hypercore": "0.6.13-main.548ca8d",
+    "@dxos/indexing": "0.6.13-main.548ca8d",
+    "@dxos/keyring": "0.6.13-main.548ca8d",
+    "@dxos/keys": "0.6.13-main.548ca8d",
+    "@dxos/invariant": "0.6.13-main.548ca8d",
+    "@dxos/kv-store": "0.6.13-main.548ca8d",
+    "@dxos/log": "0.6.13-main.548ca8d",
+    "@dxos/messaging": "0.6.13-main.548ca8d",
+    "@dxos/network-manager": "0.6.13-main.548ca8d",
+    "@dxos/protocols": "0.6.13-main.548ca8d",
+    "@dxos/random-access-storage": "0.6.13-main.548ca8d",
+    "@dxos/teleport": "0.6.13-main.548ca8d",
+    "@dxos/node-std": "0.6.13-main.548ca8d",
+    "@dxos/teleport-extension-gossip": "0.6.13-main.548ca8d",
+    "@dxos/teleport-extension-automerge-replicator": "0.6.13-main.548ca8d",
+    "@dxos/teleport-extension-object-sync": "0.6.13-main.548ca8d",
+    "@dxos/teleport-extension-replicator": "0.6.13-main.548ca8d",
+    "@dxos/timeframe": "0.6.13-main.548ca8d",
+    "@dxos/util": "0.6.13-main.548ca8d",
+    "@dxos/typings": "0.6.13-main.548ca8d",
+    "@dxos/tracing": "0.6.13-main.548ca8d"
   },
   "devDependencies": {
+    "@types/lodash.isequal": "^4.5.0",
     "fast-check": "^3.19.0",
-    "hypercore-protocol": "^8.0.7",
-    "source-map-support": "^0.5.12",
-    "wait-for-expect": "^3.0.2"
+    "@dxos/test-utils": "0.6.13-main.548ca8d"
   },
   "publishConfig": {
     "access": "public"

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

@@ -2,15 +2,14 @@
 // Copyright 2023 DXOS.org
 //
 
-import expect from 'expect';
-import waitForExpect from 'wait-for-expect';
+import { onTestFinished, describe, expect, test } from 'vitest';
 
 import { getHeads } from '@dxos/automerge/automerge';
 import type { DocumentId, Heads } from '@dxos/automerge/automerge-repo';
 import { IndexMetadataStore } from '@dxos/indexing';
 import type { LevelDB } from '@dxos/kv-store';
 import { createTestLevel } from '@dxos/kv-store/testing';
-import { afterTest, describe, openAndClose, test } from '@dxos/test';
+import { openAndClose } from '@dxos/test-utils';
 import { range } from '@dxos/util';
 
 import { AutomergeHost } from './automerge-host';
@@ -114,11 +113,9 @@ describe('AutomergeHost', () => {
     await host1.addReplicator(await network.createReplicator());
     await host2.addReplicator(await network.createReplicator());
 
-    await waitForExpect(async () => {
-      for (const documentId of documentIds) {
-        expect(await host1.getHeads([documentId])).toEqual(await host2.getHeads([documentId]));
-      }
-    });
+    for (const documentId of documentIds) {
+      await expect.poll(() => host1.getHeads([documentId])).toEqual(await host2.getHeads([documentId]));
+    }
 
     await host1.close();
     await host2.close();
@@ -137,6 +134,8 @@ const setupAutomergeHost = async ({ level }: { level: LevelDB }) => {
     indexMetadataStore: new IndexMetadataStore({ db: level.sublevel('index-metadata') }),
   });
   await host.open();
-  afterTest(() => host.close());
+  onTestFinished(async () => {
+    await host.close();
+  });
   return host;
 };

package/src/automerge/automerge-host.ts

@@ -25,7 +25,7 @@ import {
   type StorageKey,
 } from '@dxos/automerge/automerge-repo';
 import { Context, Resource, cancelWithContext, type Lifecycle } from '@dxos/context';
-import { type SpaceDoc } from '@dxos/echo-protocol';
+import { type CollectionId, type SpaceDoc } from '@dxos/echo-protocol';
 import { type IndexMetadataStore } from '@dxos/indexing';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
@@ -82,6 +82,8 @@ export class AutomergeHost extends Resource {
   @trace.info()
   private _peerId!: PeerId;
 
+  public readonly collectionStateUpdated = new Event<{ collectionId: CollectionId }>();
+
   constructor({ db, indexMetadataStore, dataMonitor }: AutomergeHostParams) {
     super();
     this._db = db;
@@ -128,6 +130,7 @@ export class AutomergeHost extends Resource {
 
     this._collectionSynchronizer.remoteStateUpdated.on(this._ctx, ({ collectionId, peerId }) => {
       this._onRemoteCollectionStateUpdated(collectionId, peerId);
+      this.collectionStateUpdated.emit({ collectionId: collectionId as CollectionId });
     });
 
     await this._echoNetworkAdapter.open();
@@ -358,7 +361,10 @@ export class AutomergeHost extends Resource {
   async flush({ documentIds }: FlushRequest = {}): Promise<void> {
     // Note: Sync protocol for client and services ensures that all handles should have all changes.
 
-    await this._repo.flush(documentIds as DocumentId[] | undefined);
+    const loadedDocuments = documentIds?.filter(
+      (documentId): documentId is DocumentId => !!this._repo.handles[documentId as DocumentId],
+    );
+    await this._repo.flush(loadedDocuments);
   }
 
   async getHeads(documentIds: DocumentId[]): Promise<(Heads | undefined)[]> {
@@ -416,7 +422,11 @@ export class AutomergeHost extends Resource {
       const diff = diffCollectionState(localState, state);
       result.peers.push({
         peerId,
+        missingOnRemote: diff.missingOnRemote.length,
+        missingOnLocal: diff.missingOnLocal.length,
         differentDocuments: diff.different.length,
+        localDocumentCount: Object.keys(localState.documents).length,
+        remoteDocumentCount: Object.keys(state.documents).length,
       });
     }
 
@@ -466,31 +476,37 @@ export class AutomergeHost extends Resource {
       return;
     }
 
-    const { different } = diffCollectionState(localState, remoteState);
+    const { different, missingOnLocal, missingOnRemote } = diffCollectionState(localState, remoteState);
+    const toReplicate = [...missingOnLocal, ...missingOnRemote, ...different];
 
-    if (different.length === 0) {
+    if (toReplicate.length === 0) {
       return;
     }
 
     log.info('replication documents after collection sync', {
-      count: different.length,
+      count: toReplicate.length,
     });
 
-    // Load the documents that are different.
-    for (const documentId of different) {
+    // Load the documents so they will start syncing.
+    for (const documentId of toReplicate) {
       this._repo.find(documentId);
     }
   }
 
   private _onHeadsChanged(documentId: DocumentId, heads: Heads) {
+    const collectionsChanged = new Set<CollectionId>();
     for (const collectionId of this._collectionSynchronizer.getRegisteredCollectionIds()) {
       const state = this._collectionSynchronizer.getLocalCollectionState(collectionId);
       if (state?.documents[documentId]) {
         const newState = structuredClone(state);
         newState.documents[documentId] = heads;
         this._collectionSynchronizer.setLocalCollectionState(collectionId, newState);
+        collectionsChanged.add(collectionId as CollectionId);
       }
     }
+    for (const collectionId of collectionsChanged) {
+      this.collectionStateUpdated.emit({ collectionId });
+    }
   }
 }
 
@@ -540,5 +556,28 @@ export type CollectionSyncState = {
 
 export type PeerSyncState = {
   peerId: PeerId;
+  /**
+   * Documents that are present locally but not on the remote peer.
+   */
+  missingOnRemote: number;
+
+  /**
+   * Documents that are present on the remote peer but not locally.
+   */
+  missingOnLocal: number;
+
+  /**
+   * Documents that are present on both peers but have different heads.
+   */
   differentDocuments: number;
+
+  /**
+   * Total number of documents locally.
+   */
+  localDocumentCount: number;
+
+  /**
+   * Total number of documents on the remote peer.
+   */
+  remoteDocumentCount: number;
 };

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

@@ -2,8 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { expect } from 'chai';
-import waitForExpect from 'wait-for-expect';
+import { onTestFinished, describe, expect, test } from 'vitest';
 
 import { asyncTimeout, sleep } from '@dxos/async';
 import {
@@ -34,7 +33,7 @@ import { randomBytes } from '@dxos/crypto';
 import { PublicKey } from '@dxos/keys';
 import { createTestLevel } from '@dxos/kv-store/testing';
 import { TestBuilder as TeleportBuilder, TestPeer as TeleportPeer } from '@dxos/teleport/testing';
-import { afterTest, describe, openAndClose, test } from '@dxos/test';
+import { openAndClose } from '@dxos/test-utils';
 import { nonNullable, range } from '@dxos/util';
 
 import { EchoNetworkAdapter } from './echo-network-adapter';
@@ -377,10 +376,8 @@ describe('AutomergeRepo', () => {
       const hostHandle = peer1.find(url as AutomergeUrl);
 
       // Doc should be pushed to peer2
-      await waitForExpect(() => {
-        expect(hostHandle.docSync().text).not.to.be.undefined;
-        expect(peer2.handles[hostHandle.documentId].docSync()).to.deep.eq(hostHandle.docSync());
-      });
+      await expect.poll(() => hostHandle.docSync().text).not.toBeUndefined();
+      await expect.poll(() => peer2.handles[hostHandle.documentId].docSync()).toEqual(hostHandle.docSync());
     });
 
     test('client cold-starts and syncs doc from a Repo', async () => {
@@ -480,7 +477,7 @@ describe('AutomergeRepo', () => {
       const [spaceKey] = PublicKey.randomSequence();
 
       const teleportBuilder = new TeleportBuilder();
-      afterTest(() => teleportBuilder.destroy());
+      onTestFinished(() => teleportBuilder.destroy());
 
       const peer1 = await createTeleportTestPeer(teleportBuilder, spaceKey);
       const peer2 = await createTeleportTestPeer(teleportBuilder, spaceKey);
@@ -493,11 +490,16 @@ describe('AutomergeRepo', () => {
         handle.change((doc: any) => {
           doc.text = text;
         });
-        await waitForExpect(async () => {
-          const docOnPeer2 = peer2.repo.find(handle.url);
-          const doc = await asyncTimeout(docOnPeer2.doc(), 1000);
-          expect(doc.text).to.eq(text);
-        }, 1000);
+        await expect
+          .poll(
+            async () => {
+              const docOnPeer2 = peer2.repo.find(handle.url);
+              const doc = await asyncTimeout(docOnPeer2.doc(), 1000);
+              return doc.text;
+            },
+            { timeout: 1_000 },
+          )
+          .toEqual(text);
       }
 
       const offlineText = 'This has been written while the connection was off';
@@ -536,7 +538,7 @@ describe('AutomergeRepo', () => {
       const [spaceKey] = PublicKey.randomSequence();
 
       const teleportBuilder = new TeleportBuilder();
-      afterTest(() => teleportBuilder.destroy());
+      onTestFinished(() => teleportBuilder.destroy());
 
       const peerWithDocs = await createTeleportPeerWithStoredDocs(teleportBuilder, spaceKey, async (repo) => {
         return range(2, (idx) => {
@@ -569,7 +571,7 @@ describe('AutomergeRepo', () => {
       const [spaceKey, anotherSpaceKey] = PublicKey.randomSequence();
 
       const teleportBuilder = new TeleportBuilder();
-      afterTest(() => teleportBuilder.destroy());
+      onTestFinished(() => teleportBuilder.destroy());
 
       const peerWithDocs = await createTeleportPeerWithStoredDocs(teleportBuilder, spaceKey, async (repo) => {
         const document = repo.create();
@@ -600,7 +602,7 @@ describe('AutomergeRepo', () => {
       const [spaceKey] = PublicKey.randomSequence();
 
       const teleportBuilder = new TeleportBuilder();
-      afterTest(() => teleportBuilder.destroy());
+      onTestFinished(() => teleportBuilder.destroy());
 
       const peerWithDocs = await createTeleportPeerWithStoredDocs(teleportBuilder, spaceKey, async (repo) => {
         const document = repo.create();

package/src/automerge/collection-synchronizer.test.ts

@@ -2,11 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { expect } from 'chai';
+import { onTestFinished, describe, expect, test } from 'vitest';
 
 import { sleep } from '@dxos/async';
 import type { PeerId } from '@dxos/automerge/automerge-repo';
-import { afterTest, describe, test } from '@dxos/test';
 
 import { CollectionSynchronizer, diffCollectionState, type CollectionState } from './collection-synchronizer';
 
@@ -31,7 +30,9 @@ describe('CollectionSynchronizer', () => {
         }),
       shouldSyncCollection: () => true,
     }).open();
-    afterTest(() => peer1.close());
+    onTestFinished(async () => {
+      await peer1.close();
+    });
     const peer2 = await new CollectionSynchronizer({
       queryCollectionState: (collectionId, peerId) =>
         queueMicrotask(async () => {
@@ -45,7 +46,9 @@ describe('CollectionSynchronizer', () => {
         }),
       shouldSyncCollection: () => true,
     }).open();
-    afterTest(() => peer2.close());
+    onTestFinished(async () => {
+      await peer2.close();
+    });
 
     peer1.onConnectionOpen(peerId2);
     peer2.onConnectionOpen(peerId1);
@@ -69,7 +72,9 @@ describe('CollectionSynchronizer', () => {
     const diff = diffCollectionState(STATE_1, STATE_2);
 
     expect(diff).to.deep.equal({
-      different: ['b', 'c', 'd'],
+      missingOnLocal: ['d'],
+      missingOnRemote: ['c'],
+      different: ['b'],
     });
   });
 });

package/src/automerge/collection-synchronizer.ts

@@ -6,6 +6,7 @@ import { asyncReturn, Event, scheduleTask, scheduleTaskInterval } from '@dxos/as
 import { next as am } from '@dxos/automerge/automerge';
 import type { DocumentId, PeerId } from '@dxos/automerge/automerge-repo';
 import { Resource, type Context } from '@dxos/context';
+import { log } from '@dxos/log';
 import { defaultMap } from '@dxos/util';
 
 const MIN_QUERY_INTERVAL = 5_000;
@@ -64,6 +65,7 @@ export class CollectionSynchronizer extends Resource {
   }
 
   setLocalCollectionState(collectionId: string, state: CollectionState) {
+    log('setLocalCollectionState', { collectionId, state });
     this._getPerCollectionState(collectionId).localState = state;
 
     queueMicrotask(async () => {
@@ -143,6 +145,7 @@ export class CollectionSynchronizer extends Resource {
    * Callback when a peer sends the state of a collection.
    */
   onRemoteStateReceived(collectionId: string, peerId: PeerId, state: CollectionState) {
+    log('onRemoteStateReceived', { collectionId, peerId, state });
     validateCollectionState(state);
     const perCollectionState = this._getPerCollectionState(collectionId);
     perCollectionState.remoteStates.set(peerId, state);
@@ -184,24 +187,32 @@ export type CollectionState = {
 };
 
 export type CollectionStateDiff = {
+  missingOnRemote: DocumentId[];
+  missingOnLocal: DocumentId[];
   different: DocumentId[];
 };
 
 export const diffCollectionState = (local: CollectionState, remote: CollectionState): CollectionStateDiff => {
   const allDocuments = new Set<DocumentId>([...Object.keys(local.documents), ...Object.keys(remote.documents)] as any);
 
+  const missingOnRemote: DocumentId[] = [];
+  const missingOnLocal: DocumentId[] = [];
   const different: DocumentId[] = [];
   for (const documentId of allDocuments) {
-    if (
-      !local.documents[documentId] ||
-      !remote.documents[documentId] ||
-      !am.equals(local.documents[documentId], remote.documents[documentId])
-    ) {
+    if (!local.documents[documentId]) {
+      missingOnLocal.push(documentId as DocumentId);
+    } else if (!remote.documents[documentId]) {
+      missingOnRemote.push(documentId as DocumentId);
+    } else if (!am.equals(local.documents[documentId], remote.documents[documentId])) {
       different.push(documentId as DocumentId);
     }
   }
 
-  return { different };
+  return {
+    missingOnRemote,
+    missingOnLocal,
+    different,
+  };
 };
 
 const validateCollectionState = (state: CollectionState) => {

package/src/automerge/echo-data-monitor.test.ts

@@ -2,9 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { expect } from 'chai';
-
-import { describe, test } from '@dxos/test';
+import { describe, expect, test } from 'vitest';
 
 import { EchoDataMonitor } from './echo-data-monitor';
 

package/src/automerge/echo-network-adapter.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { expect } from 'chai';
+import { onTestFinished, describe, expect, test } from 'vitest';
 
 import { sleep, Trigger, waitForCondition } from '@dxos/async';
 import { cbor, type PeerId } from '@dxos/automerge/automerge-repo';
@@ -14,7 +14,6 @@ import {
   type AutomergeReplicatorCallbacks,
   type AutomergeReplicatorFactory,
 } from '@dxos/teleport-extension-automerge-replicator';
-import { afterTest, describe, test } from '@dxos/test';
 
 import { EchoNetworkAdapter } from './echo-network-adapter';
 import { MeshEchoReplicator } from './mesh-echo-replicator';
@@ -111,7 +110,9 @@ describe('EchoNetworkAdapter', () => {
     });
     adapter.connect(PEER_ID);
     await adapter.open();
-    afterTest(() => adapter.close());
+    onTestFinished(async () => {
+      await adapter.close();
+    });
     await adapter.addReplicator(replicator);
     return adapter;
   };

package/src/automerge/echo-network-adapter.ts

@@ -8,6 +8,7 @@ import { LifecycleState } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
 import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import type { AutomergeProtocolMessage } from '@dxos/protocols';
 import { nonNullable } from '@dxos/util';
 
 import {
@@ -179,7 +180,7 @@ export class EchoNetworkAdapter extends NetworkAdapter {
     const writeStart = Date.now();
     // TODO(dmaretskyi): Find a way to enforce backpressure on AM-repo.
     connectionEntry.writer
-      .write(message)
+      .write(message as AutomergeProtocolMessage)
       .then(() => {
         const durationMs = Date.now() - writeStart;
         this._params.monitor?.recordMessageSent(message, durationMs);
@@ -220,7 +221,7 @@ export class EchoNetworkAdapter extends NetworkAdapter {
             break;
           }
 
-          this._onMessage(value);
+          this._onMessage(value as Message);
         }
       } catch (err) {
         if (connectionEntry.isOpen) {
@@ -282,8 +283,8 @@ export class EchoNetworkAdapter extends NetworkAdapter {
 
 type ConnectionEntry = {
   connection: ReplicatorConnection;
-  reader: ReadableStreamDefaultReader<Message>;
-  writer: WritableStreamDefaultWriter<Message>;
+  reader: ReadableStreamDefaultReader<AutomergeProtocolMessage>;
+  writer: WritableStreamDefaultWriter<AutomergeProtocolMessage>;
   isOpen: boolean;
 };
 

package/src/automerge/echo-replicator.ts

@@ -2,8 +2,8 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type Message } from '@dxos/automerge/automerge-repo';
 import { type PublicKey, type SpaceId } from '@dxos/keys';
+import type { AutomergeProtocolMessage } from '@dxos/protocols';
 
 export interface EchoReplicator {
   /**
@@ -44,12 +44,12 @@ export interface ReplicatorConnection {
   /**
    * Stream to read messages coming from the remote peer.
    */
-  readable: ReadableStream<Message>;
+  readable: ReadableStream<AutomergeProtocolMessage>;
 
   /**
    * Stream to write messages to the remote peer.
    */
-  writable: WritableStream<Message>;
+  writable: WritableStream<AutomergeProtocolMessage>;
 
   /**
    * @returns true if the document should be advertised to this peer.

package/src/automerge/mesh-echo-replicator-connection.ts

@@ -3,11 +3,12 @@
 //
 
 import * as A from '@dxos/automerge/automerge';
-import { cbor, type Message } from '@dxos/automerge/automerge-repo';
+import { cbor } from '@dxos/automerge/automerge-repo';
 import { Resource } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
 import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import type { AutomergeProtocolMessage } from '@dxos/protocols';
 import { AutomergeReplicator, type AutomergeReplicatorFactory } from '@dxos/teleport-extension-automerge-replicator';
 
 import type { ReplicatorConnection, ShouldAdvertiseParams, ShouldSyncCollectionParams } from './echo-replicator';
@@ -24,8 +25,8 @@ export type MeshReplicatorConnectionParams = {
 };
 
 export class MeshReplicatorConnection extends Resource implements ReplicatorConnection {
-  public readable: ReadableStream<Message>;
-  public writable: WritableStream<Message>;
+  public readable: ReadableStream<AutomergeProtocolMessage>;
+  public writable: WritableStream<AutomergeProtocolMessage>;
   public remoteDeviceKey: PublicKey | null = null;
 
   public readonly replicatorExtension: AutomergeReplicator;
@@ -36,16 +37,16 @@ export class MeshReplicatorConnection extends Resource implements ReplicatorConn
   constructor(private readonly _params: MeshReplicatorConnectionParams) {
     super();
 
-    let readableStreamController!: ReadableStreamDefaultController<Message>;
-    this.readable = new ReadableStream<Message>({
+    let readableStreamController!: ReadableStreamDefaultController<AutomergeProtocolMessage>;
+    this.readable = new ReadableStream<AutomergeProtocolMessage>({
       start: (controller) => {
         readableStreamController = controller;
         this._ctx.onDispose(() => controller.close());
       },
     });
 
-    this.writable = new WritableStream<Message>({
-      write: async (message: Message, controller) => {
+    this.writable = new WritableStream<AutomergeProtocolMessage>({
+      write: async (message: AutomergeProtocolMessage, controller) => {
         invariant(this._isEnabled, 'Writing to a disabled connection');
         try {
           logSendSync(message);
@@ -89,7 +90,7 @@ export class MeshReplicatorConnection extends Resource implements ReplicatorConn
           if (!this._isEnabled) {
             return;
           }
-          const message = cbor.decode(payload) as Message;
+          const message = cbor.decode(payload) as AutomergeProtocolMessage;
           // Note: automerge Repo dedup messages.
           readableStreamController.enqueue(message);
         },
@@ -136,7 +137,7 @@ export class MeshReplicatorConnection extends Resource implements ReplicatorConn
   }
 }
 
-const logSendSync = (message: Message) => {
+const logSendSync = (message: AutomergeProtocolMessage) => {
   log('sendSyncMessage', () => {
     const decodedSyncMessage = message.type === 'sync' && message.data ? A.decodeSyncMessage(message.data) : undefined;
     return {