@dxos/echo-pipeline 0.5.9-main.ea1d25b → 0.5.9-main.eacfffa

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-pipeline",
-  "version": "0.5.9-main.ea1d25b",
+  "version": "0.5.9-main.eacfffa",
   "description": "ECHO database.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -39,38 +39,38 @@
     "crc-32": "^1.2.2",
     "level": "^8.0.1",
     "level-transcoder": "^1.0.1",
-    "@dxos/async": "0.5.9-main.ea1d25b",
-    "@dxos/codec-protobuf": "0.5.9-main.ea1d25b",
-    "@dxos/automerge": "0.5.9-main.ea1d25b",
-    "@dxos/context": "0.5.9-main.ea1d25b",
-    "@dxos/credentials": "0.5.9-main.ea1d25b",
-    "@dxos/crypto": "0.5.9-main.ea1d25b",
-    "@dxos/debug": "0.5.9-main.ea1d25b",
-    "@dxos/echo-protocol": "0.5.9-main.ea1d25b",
-    "@dxos/feed-store": "0.5.9-main.ea1d25b",
-    "@dxos/echo-schema": "0.5.9-main.ea1d25b",
-    "@dxos/hypercore": "0.5.9-main.ea1d25b",
-    "@dxos/indexing": "0.5.9-main.ea1d25b",
-    "@dxos/invariant": "0.5.9-main.ea1d25b",
-    "@dxos/keyring": "0.5.9-main.ea1d25b",
-    "@dxos/kv-store": "0.5.9-main.ea1d25b",
-    "@dxos/keys": "0.5.9-main.ea1d25b",
-    "@dxos/log": "0.5.9-main.ea1d25b",
-    "@dxos/messaging": "0.5.9-main.ea1d25b",
-    "@dxos/network-manager": "0.5.9-main.ea1d25b",
-    "@dxos/node-std": "0.5.9-main.ea1d25b",
-    "@dxos/random-access-storage": "0.5.9-main.ea1d25b",
-    "@dxos/protocols": "0.5.9-main.ea1d25b",
-    "@dxos/rpc": "0.5.9-main.ea1d25b",
-    "@dxos/teleport": "0.5.9-main.ea1d25b",
-    "@dxos/teleport-extension-automerge-replicator": "0.5.9-main.ea1d25b",
-    "@dxos/teleport-extension-gossip": "0.5.9-main.ea1d25b",
-    "@dxos/teleport-extension-replicator": "0.5.9-main.ea1d25b",
-    "@dxos/teleport-extension-object-sync": "0.5.9-main.ea1d25b",
-    "@dxos/tracing": "0.5.9-main.ea1d25b",
-    "@dxos/typings": "0.5.9-main.ea1d25b",
-    "@dxos/timeframe": "0.5.9-main.ea1d25b",
-    "@dxos/util": "0.5.9-main.ea1d25b"
+    "@dxos/codec-protobuf": "0.5.9-main.eacfffa",
+    "@dxos/async": "0.5.9-main.eacfffa",
+    "@dxos/automerge": "0.5.9-main.eacfffa",
+    "@dxos/context": "0.5.9-main.eacfffa",
+    "@dxos/debug": "0.5.9-main.eacfffa",
+    "@dxos/crypto": "0.5.9-main.eacfffa",
+    "@dxos/credentials": "0.5.9-main.eacfffa",
+    "@dxos/echo-protocol": "0.5.9-main.eacfffa",
+    "@dxos/echo-schema": "0.5.9-main.eacfffa",
+    "@dxos/hypercore": "0.5.9-main.eacfffa",
+    "@dxos/feed-store": "0.5.9-main.eacfffa",
+    "@dxos/invariant": "0.5.9-main.eacfffa",
+    "@dxos/keys": "0.5.9-main.eacfffa",
+    "@dxos/indexing": "0.5.9-main.eacfffa",
+    "@dxos/keyring": "0.5.9-main.eacfffa",
+    "@dxos/kv-store": "0.5.9-main.eacfffa",
+    "@dxos/log": "0.5.9-main.eacfffa",
+    "@dxos/messaging": "0.5.9-main.eacfffa",
+    "@dxos/network-manager": "0.5.9-main.eacfffa",
+    "@dxos/protocols": "0.5.9-main.eacfffa",
+    "@dxos/node-std": "0.5.9-main.eacfffa",
+    "@dxos/random-access-storage": "0.5.9-main.eacfffa",
+    "@dxos/rpc": "0.5.9-main.eacfffa",
+    "@dxos/teleport": "0.5.9-main.eacfffa",
+    "@dxos/teleport-extension-automerge-replicator": "0.5.9-main.eacfffa",
+    "@dxos/teleport-extension-gossip": "0.5.9-main.eacfffa",
+    "@dxos/teleport-extension-object-sync": "0.5.9-main.eacfffa",
+    "@dxos/timeframe": "0.5.9-main.eacfffa",
+    "@dxos/teleport-extension-replicator": "0.5.9-main.eacfffa",
+    "@dxos/tracing": "0.5.9-main.eacfffa",
+    "@dxos/util": "0.5.9-main.eacfffa",
+    "@dxos/typings": "0.5.9-main.eacfffa"
   },
   "devDependencies": {
     "fast-check": "^3.19.0",

package/src/automerge/automerge-doc-loader.test.ts

@@ -22,6 +22,7 @@ import { createIdFromSpaceKey } from '../space';
 const ctx = new Context();
 const SPACE_KEY = PublicKey.random();
 const randomId = () => generateEchoId();
+
 describe('AutomergeDocumentLoader', () => {
   test('space access is set on root doc handle and it is accessible', async () => {
     const { loader, spaceRootDocHandle } = await setupTest();
@@ -77,9 +78,7 @@ describe('AutomergeDocumentLoader', () => {
     const repo = new Repo({ network: [] });
     const loader = new AutomergeDocumentLoaderImpl(spaceId, repo, SPACE_KEY);
     const spaceRootDocHandle = repo.create<SpaceDoc>();
-    await loader.loadSpaceRootDocHandle(ctx, {
-      rootUrl: spaceRootDocHandle.url,
-    });
+    await loader.loadSpaceRootDocHandle(ctx, { rootUrl: spaceRootDocHandle.url });
     return { loader, spaceRootDocHandle, repo };
   };
 

package/src/automerge/automerge-doc-loader.ts

@@ -6,7 +6,7 @@ import { Event } from '@dxos/async';
 import { type DocHandle, type AutomergeUrl, type DocumentId, type Repo } from '@dxos/automerge/automerge-repo';
 import { cancelWithContext, type Context } from '@dxos/context';
 import { warnAfterTimeout } from '@dxos/debug';
-import { type SpaceState, type SpaceDoc } from '@dxos/echo-protocol';
+import { type SpaceState, type SpaceDoc, SpaceDocVersion } from '@dxos/echo-protocol';
 import { invariant } from '@dxos/invariant';
 import { type PublicKey, type SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -125,7 +125,9 @@ export class AutomergeDocumentLoaderImpl implements AutomergeDocumentLoader {
 
   public createDocumentForObject(objectId: string): DocHandle<SpaceDoc> {
     invariant(this._spaceRootDocHandle);
-    const spaceDocHandle = this._repo.create<SpaceDoc>();
+    const spaceDocHandle = this._repo.create<SpaceDoc>({
+      version: SpaceDocVersion.CURRENT,
+    });
     this._initDocAccess(spaceDocHandle);
     this.onObjectBoundToDocument(spaceDocHandle, objectId);
     this._spaceRootDocHandle.change((newDoc: SpaceDoc) => {

package/src/automerge/automerge-host.ts

@@ -19,7 +19,6 @@ import { type IndexMetadataStore } from '@dxos/indexing';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { type SublevelDB } from '@dxos/kv-store';
-import { log } from '@dxos/log';
 import { objectPointerCodec } from '@dxos/protocols';
 import {
   type FlushRequest,
@@ -27,7 +26,6 @@ import {
   type SyncRepoRequest,
   type SyncRepoResponse,
 } from '@dxos/protocols/proto/dxos/echo/service';
-import { type Directory } from '@dxos/random-access-storage';
 import { trace } from '@dxos/tracing';
 import { mapValues } from '@dxos/util';
 
@@ -35,17 +33,12 @@ import { EchoNetworkAdapter } from './echo-network-adapter';
 import { type EchoReplicator } from './echo-replicator';
 import { LevelDBStorageAdapter, type BeforeSaveParams } from './leveldb-storage-adapter';
 import { LocalHostNetworkAdapter } from './local-host-network-adapter';
-import { levelMigration } from './migrations';
 
 // TODO: Remove
 export type { DocumentId };
 
 export type AutomergeHostParams = {
   db: SublevelDB;
-  /**
-   * For migration purposes.
-   */
-  directory?: Directory;
 
   indexMetadataStore: IndexMetadataStore;
 };
@@ -54,8 +47,6 @@ export type AutomergeHostParams = {
 export class AutomergeHost {
   private readonly _indexMetadataStore: IndexMetadataStore;
   private readonly _ctx = new Context();
-  private readonly _directory?: Directory;
-  private readonly _db: SublevelDB;
   private readonly _echoNetworkAdapter = new EchoNetworkAdapter({
     getContainingSpaceForDocument: this._getContainingSpaceForDocument.bind(this),
   });
@@ -67,11 +58,14 @@ export class AutomergeHost {
   @trace.info()
   private _peerId!: string;
 
-  public _requestedDocs = new Set<string>();
-
-  constructor({ directory, db, indexMetadataStore }: AutomergeHostParams) {
-    this._directory = directory;
-    this._db = db;
+  constructor({ db, indexMetadataStore }: AutomergeHostParams) {
+    this._storage = new LevelDBStorageAdapter({
+      db,
+      callbacks: {
+        beforeSave: async (params) => this._beforeSave(params),
+        afterSave: async () => this._afterSave(),
+      },
+    });
     this._indexMetadataStore = indexMetadataStore;
   }
 
@@ -79,17 +73,7 @@ export class AutomergeHost {
     // TODO(burdon): Should this be stable?
     this._peerId = `host-${PublicKey.random().toHex()}` as PeerId;
 
-    // TODO(mykola): remove this before 0.6 release.
-    this._directory && (await levelMigration({ db: this._db, directory: this._directory }));
-    this._storage = new LevelDBStorageAdapter({
-      db: this._db,
-      callbacks: {
-        beforeSave: async (params) => this._beforeSave(params),
-        afterSave: async () => this._afterSave(),
-      },
-    });
     await this._storage.open?.();
-
     this._clientNetwork = new LocalHostNetworkAdapter();
 
     // Construct the automerge repo.
@@ -146,17 +130,6 @@ export class AutomergeHost {
       return false;
     }
 
-    // Workaround for https://github.com/automerge/automerge-repo/pull/292
-    // NOTE: This must override the per-connection policy.
-    const doc = this._repo.handles[documentId]?.docSync();
-    if (!doc) {
-      // TODO(dmaretskyi): Verify that this works as intended.
-      // TODO(dmaretskyi): Move to MESH replicator?
-      const isRequested = this._requestedDocs.has(`automerge:${documentId}`);
-      log('doc share policy check', { peerId, documentId, isRequested });
-      return isRequested;
-    }
-
     const peerMetadata = this.repo.peerMetadataByPeerId[peerId];
     if ((peerMetadata as any)?.dxos_peerSource === 'EchoNetworkAdapter') {
       return this._echoNetworkAdapter.shouldAdvertize(peerId, { documentId });

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

@@ -93,6 +93,7 @@ export class EchoNetworkAdapter extends NetworkAdapter {
       peerId: this.peerId,
       onConnectionOpen: this._onConnectionOpen.bind(this),
       onConnectionClosed: this._onConnectionClosed.bind(this),
+      onConnectionAuthScopeChanged: this._onConnectionAuthScopeChanged.bind(this),
       getContainingSpaceForDocument: this._params.getContainingSpaceForDocument,
     });
   }
@@ -101,7 +102,6 @@ export class EchoNetworkAdapter extends NetworkAdapter {
   async removeReplicator(replicator: EchoReplicator) {
     invariant(this._lifecycleState === LifecycleState.OPEN);
     invariant(this._replicators.has(replicator));
-    ('');
     await replicator.disconnect();
     this._replicators.delete(replicator);
   }
@@ -142,13 +142,19 @@ export class EchoNetworkAdapter extends NetworkAdapter {
     });
 
     log('emit peer-candidate', { peerId: connection.peerId });
-    this.emit('peer-candidate', {
-      peerId: connection.peerId as PeerId,
-      peerMetadata: {
-        // TODO(dmaretskyi): Refactor this.
-        dxos_peerSource: 'EchoNetworkAdapter',
-      } as any,
-    });
+    this._emitPeerCandidate(connection);
+  }
+
+  /**
+   * Trigger doc-synchronizer shared documents set recalculation. Happens on peer-candidate.
+   * TODO(y): replace with a proper API call when sharePolicy update becomes supported by automerge-repo
+   */
+  private _onConnectionAuthScopeChanged(connection: ReplicatorConnection) {
+    log('Connection auth scope changed', { peerId: connection.peerId });
+    const entry = this._connections.get(connection.peerId as PeerId);
+    invariant(entry);
+    this.emit('peer-disconnected', { peerId: connection.peerId as PeerId });
+    this._emitPeerCandidate(connection);
   }
 
   private _onConnectionClosed(connection: ReplicatorConnection) {
@@ -164,6 +170,16 @@ export class EchoNetworkAdapter extends NetworkAdapter {
 
     this._connections.delete(connection.peerId as PeerId);
   }
+
+  private _emitPeerCandidate(connection: ReplicatorConnection) {
+    this.emit('peer-candidate', {
+      peerId: connection.peerId as PeerId,
+      peerMetadata: {
+        // TODO(dmaretskyi): Refactor this.
+        dxos_peerSource: 'EchoNetworkAdapter',
+      } as any,
+    });
+  }
 }
 
 type ConnectionEntry = {

package/src/automerge/echo-replicator.ts

@@ -27,6 +27,8 @@ export interface EchoReplicatorContext {
 
   onConnectionClosed(connection: ReplicatorConnection): void;
 
+  onConnectionAuthScopeChanged(connection: ReplicatorConnection): void;
+
   getContainingSpaceForDocument(documentId: string): Promise<PublicKey | null>;
 }
 

package/src/automerge/index.ts

@@ -3,7 +3,6 @@
 //
 
 export * from './automerge-host';
-export * from './automerge-storage-adapter';
 export * from './automerge-doc-loader';
 export * from './leveldb-storage-adapter';
 export * from './local-host-network-adapter';

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

@@ -59,7 +59,9 @@ export class MeshEchoReplicator implements EchoReplicator {
         log('onRemoteConnected', { peerId: connection.peerId });
         invariant(this._context);
 
-        if (!this._connectionsPerPeer.has(connection.peerId)) {
+        if (this._connectionsPerPeer.has(connection.peerId)) {
+          this._context.onConnectionAuthScopeChanged(connection);
+        } else {
           this._connectionsPerPeer.set(connection.peerId, connection);
           await connection.enable();
           this._context.onConnectionOpen(connection);
@@ -119,6 +121,11 @@ export class MeshEchoReplicator implements EchoReplicator {
   authorizeDevice(spaceKey: PublicKey, deviceKey: PublicKey) {
     log('authorizeDevice', { spaceKey, deviceKey });
     defaultMap(this._authorizedDevices, spaceKey, () => new ComplexSet(PublicKey.hash)).add(deviceKey);
+    for (const connection of this._connections) {
+      if (connection.remoteDeviceKey && connection.remoteDeviceKey.equals(deviceKey)) {
+        this._context?.onConnectionAuthScopeChanged(connection);
+      }
+    }
   }
 }
 

package/src/automerge/storage-adapter.test.ts

@@ -4,153 +4,117 @@
 
 import { expect } from 'chai';
 
-import { type StorageAdapterInterface } from '@dxos/automerge/automerge-repo';
 import { randomBytes } from '@dxos/crypto';
 import { PublicKey } from '@dxos/keys';
 import { createTestLevel } from '@dxos/kv-store/testing';
-import { StorageType, createStorage } from '@dxos/random-access-storage';
 import { afterTest, describe, test } from '@dxos/test';
-import { arrayToBuffer, bufferToArray, type MaybePromise } from '@dxos/util';
+import { arrayToBuffer, bufferToArray } from '@dxos/util';
 
-import { AutomergeStorageAdapter } from './automerge-storage-adapter';
 import { LevelDBStorageAdapter } from './leveldb-storage-adapter';
 
-const runTests = (
-  testNamespace: string,
-  /** Run per test. Expects automatic clean-up with `afterTest`. */
-  createAdapter: (root?: string) => MaybePromise<{
-    adapter: StorageAdapterInterface;
-    /** Would be called automatically with `afterTest`. Exposed for mid-test clean-up. */
-    close: () => MaybePromise<void>;
-  }>,
-) => {
-  describe(testNamespace, () => {
-    const chunks = [
-      { key: ['a', 'b', 'c', '1'], data: PublicKey.random().asUint8Array() },
-      { key: ['a', 'b', 'c', '2'], data: PublicKey.random().asUint8Array() },
-      { key: ['a', 'b', 'd', '3'], data: PublicKey.random().asUint8Array() },
-      { key: ['a', 'b', 'd', '4'], data: PublicKey.random().asUint8Array() },
-    ];
-
-    test('should store and retrieve data', async () => {
-      const { adapter } = await createAdapter();
-
-      await adapter.save(chunks[0].key, chunks[0].data);
-      expect(await adapter.load(chunks[0].key)).to.deep.equal(chunks[0].data);
-    });
-
-    test('loadRange return inputs with correct prefixes', async () => {
-      const { adapter } = await createAdapter();
-
-      for (const chunk of chunks) {
-        await adapter.save(chunk.key, chunk.data);
-      }
-
-      expect((await adapter.loadRange(['a', 'b'])).length).to.equal(4);
-      expect((await adapter.loadRange(['a', 'b', 'c']))[0]).to.deep.equal(chunks[0]);
-      expect((await adapter.loadRange(['a', 'b', 'c'])).length).to.equal(2);
-    });
-
-    test('deletion works', async () => {
-      const { adapter } = await createAdapter();
-
-      for (const chunk of chunks) {
-        await adapter.save(chunk.key, chunk.data);
-      }
-
-      await adapter.remove(['a', 'b', 'c', '1']);
-
-      expect((await adapter.loadRange(['a', 'b'])).length).to.equal(3);
-      expect((await adapter.loadRange(['a', 'b', 'c'])).length).to.equal(1);
-
-      await adapter.removeRange(['a', 'b', 'd']);
-
-      expect((await adapter.loadRange(['a', 'b'])).length).to.equal(1);
-      expect((await adapter.loadRange(['a', 'b']))[0]).to.deep.equal(chunks[1]);
-      expect(await adapter.load(['a', 'b', 'c', '2'])).to.deep.equal(chunks[1].data);
-      expect(await adapter.load(['a', 'b', 'd', '3'])).to.be.undefined;
-    });
-
-    test('loadRange', async () => {
-      const root = `/tmp/${randomBytes(16).toString('hex')}`;
-      {
-        const { adapter, close } = await createAdapter(root);
-        await adapter.save(['test', '1'], bufferToArray(Buffer.from('one')));
-        await adapter.save(['test', '2'], bufferToArray(Buffer.from('two')));
-        await adapter.save(['bar', '1'], bufferToArray(Buffer.from('bar')));
-        await close();
-      }
-
-      {
-        const { adapter } = await createAdapter(root);
-        const range = await adapter.loadRange(['test']);
-        expect(range.map((chunk) => arrayToBuffer(chunk.data!).toString())).to.deep.eq(['one', 'two']);
-        expect(range.map((chunk) => chunk.key)).to.deep.eq([
-          ['test', '1'],
-          ['test', '2'],
-        ]);
-      }
-    });
-
-    test('removeRange', async () => {
-      const root = `/tmp/${randomBytes(16).toString('hex')}`;
-      {
-        const { adapter, close } = await createAdapter(root);
-        await adapter.save(['test', '1'], bufferToArray(Buffer.from('one')));
-        await adapter.save(['test', '2'], bufferToArray(Buffer.from('two')));
-        await adapter.save(['bar', '1'], bufferToArray(Buffer.from('bar')));
-        await close();
-      }
-
-      {
-        const { adapter } = await createAdapter(root);
-        await adapter.removeRange(['test']);
-        const range = await adapter.loadRange(['test']);
-        expect(range.map((chunk) => arrayToBuffer(chunk.data!).toString())).to.deep.eq([]);
-        const range2 = await adapter.loadRange(['bar']);
-        expect(range2.map((chunk) => arrayToBuffer(chunk.data!).toString())).to.deep.eq(['bar']);
-        expect(range2.map((chunk) => chunk.key)).to.deep.eq([['bar', '1']]);
-      }
-    });
-  });
-};
-
-/**
- * Run tests for AutomergeStorageAdapter.
- */
-runTests('AutomergeStorageAdapter', (root?: string) => {
-  const storage = createStorage({ type: root ? StorageType.NODE : StorageType.RAM, root });
-  const dir = storage.createDirectory('automerge');
-  const adapter = new AutomergeStorageAdapter(dir);
-
-  const close = async () => {
-    await adapter.close();
-    await storage.close();
+describe('LevelDBStorageAdapter', () => {
+  const createAdapter = async (root?: string) => {
+    const level = createTestLevel(root);
+    await level.open();
+    const adapter = new LevelDBStorageAdapter({ db: level.sublevel('automerge') });
+    await adapter.open?.();
+
+    const close = async () => {
+      await adapter.close();
+      await level.close();
+    };
+    afterTest(close);
+    return {
+      adapter,
+      close,
+    };
   };
-  afterTest(close);
 
-  return {
-    adapter,
-    close,
-  };
-});
+  const chunks = [
+    { key: ['a', 'b', 'c', '1'], data: PublicKey.random().asUint8Array() },
+    { key: ['a', 'b', 'c', '2'], data: PublicKey.random().asUint8Array() },
+    { key: ['a', 'b', 'd', '3'], data: PublicKey.random().asUint8Array() },
+    { key: ['a', 'b', 'd', '4'], data: PublicKey.random().asUint8Array() },
+  ];
 
-/**
- * Run tests for LevelDBStorageAdapter.
- */
-runTests('LevelDBStorageAdapter', async (root?: string) => {
-  const level = createTestLevel(root);
-  await level.open();
-  const adapter = new LevelDBStorageAdapter({ db: level.sublevel('automerge') });
-  await adapter.open?.();
-
-  const close = async () => {
-    await adapter.close();
-    await level.close();
-  };
-  afterTest(close);
-  return {
-    adapter,
-    close,
-  };
+  test('should store and retrieve data', async () => {
+    const { adapter } = await createAdapter();
+
+    await adapter.save(chunks[0].key, chunks[0].data);
+    expect(await adapter.load(chunks[0].key)).to.deep.equal(chunks[0].data);
+  });
+
+  test('loadRange return inputs with correct prefixes', async () => {
+    const { adapter } = await createAdapter();
+
+    for (const chunk of chunks) {
+      await adapter.save(chunk.key, chunk.data);
+    }
+
+    expect((await adapter.loadRange(['a', 'b'])).length).to.equal(4);
+    expect((await adapter.loadRange(['a', 'b', 'c']))[0]).to.deep.equal(chunks[0]);
+    expect((await adapter.loadRange(['a', 'b', 'c'])).length).to.equal(2);
+  });
+
+  test('deletion works', async () => {
+    const { adapter } = await createAdapter();
+
+    for (const chunk of chunks) {
+      await adapter.save(chunk.key, chunk.data);
+    }
+
+    await adapter.remove(['a', 'b', 'c', '1']);
+
+    expect((await adapter.loadRange(['a', 'b'])).length).to.equal(3);
+    expect((await adapter.loadRange(['a', 'b', 'c'])).length).to.equal(1);
+
+    await adapter.removeRange(['a', 'b', 'd']);
+
+    expect((await adapter.loadRange(['a', 'b'])).length).to.equal(1);
+    expect((await adapter.loadRange(['a', 'b']))[0]).to.deep.equal(chunks[1]);
+    expect(await adapter.load(['a', 'b', 'c', '2'])).to.deep.equal(chunks[1].data);
+    expect(await adapter.load(['a', 'b', 'd', '3'])).to.be.undefined;
+  });
+
+  test('loadRange', async () => {
+    const root = `/tmp/${randomBytes(16).toString('hex')}`;
+    {
+      const { adapter, close } = await createAdapter(root);
+      await adapter.save(['test', '1'], bufferToArray(Buffer.from('one')));
+      await adapter.save(['test', '2'], bufferToArray(Buffer.from('two')));
+      await adapter.save(['bar', '1'], bufferToArray(Buffer.from('bar')));
+      await close();
+    }
+
+    {
+      const { adapter } = await createAdapter(root);
+      const range = await adapter.loadRange(['test']);
+      expect(range.map((chunk) => arrayToBuffer(chunk.data!).toString())).to.deep.eq(['one', 'two']);
+      expect(range.map((chunk) => chunk.key)).to.deep.eq([
+        ['test', '1'],
+        ['test', '2'],
+      ]);
+    }
+  });
+
+  test('removeRange', async () => {
+    const root = `/tmp/${randomBytes(16).toString('hex')}`;
+    {
+      const { adapter, close } = await createAdapter(root);
+      await adapter.save(['test', '1'], bufferToArray(Buffer.from('one')));
+      await adapter.save(['test', '2'], bufferToArray(Buffer.from('two')));
+      await adapter.save(['bar', '1'], bufferToArray(Buffer.from('bar')));
+      await close();
+    }
+
+    {
+      const { adapter } = await createAdapter(root);
+      await adapter.removeRange(['test']);
+      const range = await adapter.loadRange(['test']);
+      expect(range.map((chunk) => arrayToBuffer(chunk.data!).toString())).to.deep.eq([]);
+      const range2 = await adapter.loadRange(['bar']);
+      expect(range2.map((chunk) => arrayToBuffer(chunk.data!).toString())).to.deep.eq(['bar']);
+      expect(range2.map((chunk) => chunk.key)).to.deep.eq([['bar', '1']]);
+    }
+  });
 });

package/src/space/space-protocol.test.ts

@@ -25,11 +25,13 @@ describe('space/space-protocol', () => {
     const peer1 = await builder.createPeer();
     const gossip1 = peer1.createGossip();
     const presence1 = peer1.createPresence(gossip1);
+    await presence1.open();
     const protocol1 = peer1.createSpaceProtocol(topic, gossip1);
 
     const peer2 = await builder.createPeer();
     const gossip2 = peer2.createGossip();
     const presence2 = peer2.createPresence(gossip2);
+    await presence2.open();
     const protocol2 = peer2.createSpaceProtocol(topic, gossip2);
 
     await protocol1.start();

package/dist/types/src/automerge/automerge-storage-adapter.d.ts

@@ -1,16 +0,0 @@
-import { type Chunk, type StorageKey, type StorageAdapterInterface } from '@dxos/automerge/automerge-repo';
-import { type Directory } from '@dxos/random-access-storage';
-export declare class AutomergeStorageAdapter implements StorageAdapterInterface {
-    private readonly _directory;
-    private _state;
-    constructor(_directory: Directory);
-    load(key: StorageKey): Promise<Uint8Array | undefined>;
-    save(key: StorageKey, data: Uint8Array): Promise<void>;
-    remove(key: StorageKey): Promise<void>;
-    loadRange(keyPrefix: StorageKey): Promise<Chunk[]>;
-    removeRange(keyPrefix: StorageKey): Promise<void>;
-    close(): Promise<void>;
-    private _getFilename;
-    private _getKeyFromFilename;
-}
-//# sourceMappingURL=automerge-storage-adapter.d.ts.map

package/dist/types/src/automerge/automerge-storage-adapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"automerge-storage-adapter.d.ts","sourceRoot":"","sources":["../../../../src/automerge/automerge-storage-adapter.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,UAAU,EAAE,KAAK,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC3G,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAG7D,qBAAa,uBAAwB,YAAW,uBAAuB;IAKzD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAFvC,OAAO,CAAC,MAAM,CAAiC;gBAElB,UAAU,EAAE,SAAS;IAE5C,IAAI,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IActD,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAYtD,MAAM,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAUtC,SAAS,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAqBlD,WAAW,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBjD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,mBAAmB;CAG5B"}

package/dist/types/src/automerge/automerge-storage/342/200/223wrapper.d.ts

@@ -1,25 +0,0 @@
-import { type StorageKey, type Chunk, type StorageAdapterInterface } from '@dxos/automerge/automerge-repo';
-import { type MaybePromise } from '@dxos/util';
-export type StorageCallbacks = {
-    beforeSave?: (path: string[]) => MaybePromise<void>;
-    afterSave?: (path: string[]) => MaybePromise<void>;
-};
-export type AutomergeStorageWrapperParams = {
-    storage: StorageAdapterInterface;
-    callbacks: StorageCallbacks;
-};
-/**
- * Wrapper for automerge storage that adds callback on save.
- */
-export declare class AutomergeStorageWrapper implements StorageAdapterInterface {
-    private readonly _storage;
-    private readonly _callbacks;
-    constructor({ storage, callbacks }: AutomergeStorageWrapperParams);
-    load(key: StorageKey): Promise<Uint8Array | undefined>;
-    save(key: StorageKey, value: Uint8Array): Promise<void>;
-    remove(key: StorageKey): Promise<void>;
-    loadRange(keyPrefix: StorageKey): Promise<Chunk[]>;
-    removeRange(keyPrefix: StorageKey): Promise<void>;
-    close(): Promise<void>;
-}
-//# sourceMappingURL=automerge-storage%E2%80%93wrapper.d.ts.map

package/dist/types/src/automerge/automerge-storage/342/200/223wrapper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"automerge-storage–wrapper.d.ts","sourceRoot":"","sources":["../../../../src/automerge/automerge-storage–wrapper.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,KAAK,EAAE,KAAK,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC3G,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAI/C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IACpD,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,OAAO,EAAE,uBAAuB,CAAC;IACjC,SAAS,EAAE,gBAAgB,CAAC;CAC7B,CAAC;AAEF;;GAEG;AACH,qBAAa,uBAAwB,YAAW,uBAAuB;IACrE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0B;IACnD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmB;gBAElC,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,6BAA6B;IAK3D,IAAI,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAItD,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvD,MAAM,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAItC,SAAS,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIlD,WAAW,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjD,KAAK;CAKZ"}

package/dist/types/src/automerge/migrations.d.ts

@@ -1,7 +0,0 @@
-import { type SublevelDB } from '@dxos/kv-store';
-import { type Directory } from '@dxos/random-access-storage';
-export declare const levelMigration: ({ db, directory }: {
-    db: SublevelDB;
-    directory: Directory;
-}) => Promise<void>;
-//# sourceMappingURL=migrations.d.ts.map