@dxos/echo-db 2.33.5-dev.1fc05a51 → 2.33.5-dev.39ec2a53

package/src/api/schema.test.ts

@@ -9,8 +9,7 @@ import { ModelFactory } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
 import { afterTest } from '@dxos/testutils';
 
-import { createInMemoryDatabase } from '../database';
-import { Database } from './database';
+import { createInMemoryDatabase, Database } from '../packlets/database';
 import { Schema, TYPE_SCHEMA } from './schema';
 
 const SCHEMA = 'example:type/schema/organization';

package/src/echo.test.ts

@@ -13,10 +13,10 @@ import { generateSeedPhrase, keyPairFromSeedPhrase } from '@dxos/crypto';
 import { ObjectModel } from '@dxos/object-model';
 import { afterTest } from '@dxos/testutils';
 
-import { Item } from './api';
 import { ECHO } from './echo';
 import { Contact } from './halo';
 import { defaultInvitationAuthenticator } from './invitations';
+import { Item } from './packlets/database';
 import { inviteTestPeer } from './testing';
 
 const log = debug('dxos:echo:test');
@@ -707,10 +707,6 @@ describe('ECHO', () => {
     expect(partyA.isOpen).toBe(true);
     expect(partyA.isActive).toBe(true);
 
-    await partyA.database
-      .select({ type: 'example:item/test' })
-      .exec()
-      .update.waitFor(result => result.entities.length > 0);
     expect(partyA.database.select({ type: 'example:item/test' }).exec().entities.length).toEqual(1);
   }).timeout(10_000);
 
@@ -834,6 +830,21 @@ describe('ECHO', () => {
     expect(members[1].displayName).toBe('B');
   });
 
+  test('optimistic mutations on ObjectModel', async () => {
+    const echo = await setup({ createProfile: true, displayName: 'A' });
+    const party = await echo.createParty();
+    const item = await party.database.createItem({ model: ObjectModel });
+
+    const committed = item.model
+      .builder()
+      .set('key', 'value')
+      .commit();
+    expect(item.model.get('key')).toEqual('value');
+
+    await committed;
+    expect(item.model.get('key')).toEqual('value');
+  });
+
   // TODO(burdon): Fix.
   // Note: The reason I wrote this test is because it does not seem to be working properly in Teamwork.
   // I don't seem to be receiving an update after which `party.title` holds correct value.

package/src/echo.ts

@@ -19,11 +19,11 @@ import { Storage, createStorage, StorageType } from '@dxos/random-access-multi-s
 import { SubscriptionGroup } from '@dxos/util';
 
 import { ResultSet } from './api';
-import { DataServiceRouter } from './database';
-import { IdentityNotInitializedError, InvalidStorageVersionError } from './errors';
 import { HALO } from './halo';
 import { autoPartyOpener } from './halo/party-opener';
 import { InvitationDescriptor, OfflineInvitationClaimer } from './invitations';
+import { DataServiceRouter } from './packlets/database';
+import { IdentityNotInitializedError, InvalidStorageVersionError } from './packlets/errors';
 import { OpenProgress, PartyFactory, DataParty, PartyManager } from './parties';
 import { MetadataStore, STORAGE_VERSION, PartyFeedProvider } from './pipeline';
 import { SnapshotStore } from './snapshots';
@@ -143,6 +143,7 @@ export class ECHO {
       this._modelFactory,
       this._snapshotStore,
       feedProviderFactory,
+      this._metadataStore,
       options
     );
 

package/src/halo/contact-manager.ts

@@ -7,8 +7,9 @@ import { PublicKey } from '@dxos/crypto';
 import { raise } from '@dxos/debug';
 import { ObjectModel } from '@dxos/object-model';
 
-import { Database, Item, ResultSet } from '../api';
-import { IdentityNotInitializedError } from '../errors';
+import { ResultSet } from '../api';
+import { Database, Item } from '../packlets/database';
+import { IdentityNotInitializedError } from '../packlets/errors';
 import { PartyMember } from '../parties';
 import { HALO_PARTY_CONTACT_LIST_TYPE } from './halo-party';
 

package/src/halo/halo-factory.ts

@@ -13,8 +13,7 @@ import {
   Keyring,
   KeyType,
   Filter,
-  SecretProvider,
-  KeyHint
+  SecretProvider
 } from '@dxos/credentials';
 import { keyToString, PublicKey, keyPairFromSeedPhrase } from '@dxos/crypto';
 import { ModelFactory } from '@dxos/model-factory';
@@ -23,7 +22,7 @@ import { ObjectModel } from '@dxos/object-model';
 
 import { createHaloPartyAdmissionMessage, GreetingInitiator, HaloRecoveryInitiator, InvitationDescriptor, InvitationDescriptorType, OfflineInvitationClaimer } from '../invitations';
 import { PARTY_ITEM_TYPE } from '../parties';
-import { PartyFeedProvider, PartyOptions } from '../pipeline';
+import { PartyFeedProvider, PipelineOptions } from '../pipeline';
 import { CredentialsSigner } from '../protocol/credentials-signer';
 import { SnapshotStore } from '../snapshots';
 import {
@@ -51,19 +50,20 @@ export class HaloFactory {
     private readonly _snapshotStore: SnapshotStore,
     private readonly _feedProviderFactory: (partyKey: PublicKey) => PartyFeedProvider,
     private readonly _keyring: Keyring,
-    private readonly _options: PartyOptions = {}
+    private readonly _options: PipelineOptions = {}
   ) {}
 
-  async constructParty (hints: KeyHint[]): Promise<HaloParty> {
+  async constructParty (feedHints: PublicKey[]): Promise<HaloParty> {
     const credentialsSigner = CredentialsSigner.createDirectDeviceSigner(this._keyring);
     const feedProvider = this._feedProviderFactory(credentialsSigner.getIdentityKey().publicKey);
+    const writableFeed = await feedProvider.createOrOpenWritableFeed();
     const halo = new HaloParty(
       this._modelFactory,
       this._snapshotStore,
       feedProvider,
       credentialsSigner,
       this._networkManager,
-      hints,
+      [...feedHints, writableFeed.key],
       undefined,
       this._options
     );
@@ -93,21 +93,21 @@ export class HaloFactory {
      *    B. Device key (the first "member" of the Identity's HALO).
      *    C. Feed key (the feed owned by the Device).
      */
-    await halo.writeCredentialsMessage(createPartyGenesisMessage(this._keyring, identityKey, feedKeyPair.publicKey, deviceKey));
+    await halo.credentialsWriter.write(createPartyGenesisMessage(this._keyring, identityKey, feedKeyPair.publicKey, deviceKey));
 
     /* 3. Make a special self-signed KeyAdmit message which will serve as an "IdentityGenesis" message. This
      *    message will be copied into other Parties which we create or join.
      */
-    await halo.writeCredentialsMessage(createKeyAdmitMessage(this._keyring, identityKey.publicKey, identityKey));
+    await halo.credentialsWriter.write(createKeyAdmitMessage(this._keyring, identityKey.publicKey, identityKey));
 
     if (options.identityDisplayName) {
       // 4. Write the IdentityInfo message with descriptive details (eg, display name).
-      await halo.writeCredentialsMessage(createIdentityInfoMessage(this._keyring, options.identityDisplayName, identityKey));
+      await halo.credentialsWriter.write(createIdentityInfoMessage(this._keyring, options.identityDisplayName, identityKey));
     }
 
     if (options.deviceDisplayName) {
       // 5. Write the DeviceInfo message with descriptive details (eg, display name).
-      await halo.writeCredentialsMessage(createDeviceInfoMessage(this._keyring, options.deviceDisplayName, deviceKey));
+      await halo.credentialsWriter.write(createDeviceInfoMessage(this._keyring, options.deviceDisplayName, deviceKey));
     }
 
     // Create special properties item.

package/src/halo/halo-party.ts

@@ -5,16 +5,16 @@
 import assert from 'assert';
 
 import { Event, synchronized } from '@dxos/async';
-import { KeyHint, Message as HaloMessage } from '@dxos/credentials';
+import { KeyHint } from '@dxos/credentials';
 import { PublicKey } from '@dxos/crypto';
 import { timed } from '@dxos/debug';
-import { Timeframe, WriteReceipt } from '@dxos/echo-protocol';
+import { Timeframe } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
 import { NetworkManager } from '@dxos/network-manager';
 
 import { InvitationAuthenticator, InvitationDescriptor, InvitationFactory, InvitationOptions } from '../invitations';
 import { PARTY_ITEM_TYPE } from '../parties';
-import { PartyFeedProvider, PartyProtocolFactory, PartyCore, PartyOptions } from '../pipeline';
+import { PartyFeedProvider, PartyProtocolFactory, PartyPipeline, PipelineOptions } from '../pipeline';
 import { createAuthenticator, createAuthPlugin, createCredentialsProvider, createHaloRecoveryPlugin } from '../protocol';
 import { CredentialsSigner } from '../protocol/credentials-signer';
 import { createReplicatorPlugin } from '../protocol/replicator-plugin';
@@ -41,7 +41,7 @@ export interface JoinedParty {
 export class HaloParty {
   public readonly update = new Event<void>();
 
-  private readonly _partyCore: PartyCore;
+  private readonly _partyCore: PartyPipeline;
   private _invitationManager?: InvitationFactory;
   private _protocol?: PartyProtocolFactory;
 
@@ -54,17 +54,16 @@ export class HaloParty {
     private readonly _feedProvider: PartyFeedProvider,
     private readonly _credentialsSigner: CredentialsSigner,
     private readonly _networkManager: NetworkManager,
-    private readonly _hints: KeyHint[] = [],
-    _initialTimeframe: Timeframe | undefined,
-    _options: PartyOptions
+    private readonly _feedHints: PublicKey[] = [],
+    private readonly _initialTimeframe: Timeframe | undefined,
+    _options: PipelineOptions
   ) {
-    this._partyCore = new PartyCore(
+    this._partyCore = new PartyPipeline(
       _credentialsSigner.getIdentityKey().publicKey,
       _feedProvider,
       modelFactory,
       snapshotStore,
       _credentialsSigner.getIdentityKey().publicKey,
-      _initialTimeframe,
       _options
     );
 
@@ -122,6 +121,10 @@ export class HaloParty {
     return this._partyCore.processor.feedKeys;
   }
 
+  get credentialsWriter () {
+    return this._partyCore.credentialsWriter;
+  }
+
   async getWriteFeedKey () {
     const feed = await this._feedProvider.createOrOpenWritableFeed();
     return feed.key;
@@ -141,11 +144,15 @@ export class HaloParty {
       return this;
     }
 
-    await this._partyCore.open(this._hints);
+    await this._partyCore.open({
+      feedHints: this._feedHints,
+      initialTimeframe: this._initialTimeframe
+    });
 
     this._invitationManager = new InvitationFactory(
       this._partyCore.processor,
       this._credentialsSigner,
+      this._partyCore.credentialsWriter,
       this._networkManager
     );
 
@@ -165,7 +172,11 @@ export class HaloParty {
     // Replication.
     await this._protocol.start([
       createReplicatorPlugin(this._feedProvider),
-      createAuthPlugin(createAuthenticator(this._partyCore.processor, this._credentialsSigner), peerId),
+      createAuthPlugin(createAuthenticator(
+        this._partyCore.processor,
+        this._credentialsSigner,
+        this._partyCore.credentialsWriter
+      ), peerId),
       createHaloRecoveryPlugin(this._credentialsSigner.getIdentityKey().publicKey, this._invitationManager, peerId)
     ]);
 
@@ -196,10 +207,6 @@ export class HaloParty {
     return this;
   }
 
-  writeCredentialsMessage (message: HaloMessage): Promise<WriteReceipt> {
-    return this._partyCore.writeCredentialsMessage(message);
-  }
-
   async createInvitation (authenticationDetails: InvitationAuthenticator, options?: InvitationOptions): Promise<InvitationDescriptor> {
     assert(this._invitationManager, 'HALO party not open.');
     return this._invitationManager.createInvitation(authenticationDetails, options);

package/src/halo/halo.ts

@@ -15,7 +15,7 @@ import { NetworkManager } from '@dxos/network-manager';
 import { ResultSet } from '../api';
 import { InvitationAuthenticator, InvitationDescriptor, InvitationOptions } from '../invitations';
 import { OpenProgress } from '../parties';
-import { MetadataStore, PartyOptions, PartyFeedProvider } from '../pipeline';
+import { MetadataStore, PipelineOptions, PartyFeedProvider } from '../pipeline';
 import { SnapshotStore } from '../snapshots';
 import { Contact } from './contact-manager';
 import { HaloFactory } from './halo-factory';
@@ -36,7 +36,7 @@ export interface HaloConfiguration {
   modelFactory: ModelFactory,
   snapshotStore: SnapshotStore,
   feedProviderFactory: (partyKey: PublicKey) => PartyFeedProvider,
-  options: PartyOptions
+  options: PipelineOptions
 }
 
 /**

package/src/halo/party-opener.ts

@@ -4,6 +4,7 @@
 
 import debug from 'debug';
 
+import { KeyType } from '@dxos/credentials';
 import { SubscriptionGroup, Unsubscribe } from '@dxos/util';
 
 import { PartyManager } from '../parties';
@@ -25,7 +26,8 @@ export const autoPartyOpener = (preferences: Preferences, partyManager: PartyMan
     for (const partyDesc of values) {
       if (!partyManager.parties.some(x => x.key === partyDesc.partyKey)) {
         log(`Auto-opening new Party from HALO: ${partyDesc.partyKey.toHex()} hints=${JSON.stringify(partyDesc.keyHints)}`);
-        await partyManager.addParty(partyDesc.partyKey, partyDesc.keyHints);
+        const feedHints = partyDesc.keyHints.filter(hint => hint.type === KeyType.FEED).map(hint => hint.publicKey!);
+        await partyManager.addParty(partyDesc.partyKey, feedHints);
       }
     }
   }));

package/src/halo/preferences.ts

@@ -12,8 +12,9 @@ import { PublicKey } from '@dxos/crypto';
 import { raise } from '@dxos/debug';
 import { ObjectModel } from '@dxos/object-model';
 
-import { Database, Item, ResultSet } from '../api';
-import { IdentityNotInitializedError } from '../errors';
+import { ResultSet } from '../api';
+import { Database, Item } from '../packlets/database';
+import { IdentityNotInitializedError } from '../packlets/errors';
 import { DataParty } from '../parties';
 import {
   HALO_PARTY_DESCRIPTOR_TYPE, HALO_PARTY_DEVICE_PREFERENCES_TYPE, HALO_PARTY_PREFERENCES_TYPE, JoinedParty

package/src/index.ts

@@ -4,10 +4,11 @@
 
 export { codec } from '@dxos/echo-protocol';
 
+export * from './packlets/database';
+export * from './packlets/errors';
+
 export * from './api';
-export * from './database';
 export * from './echo';
-export * from './errors';
 export * from './halo';
 export * from './invitations';
 export * from './protocol';

package/src/invitations/greeting-initiator.ts

@@ -7,6 +7,7 @@ import debug from 'debug';
 
 import { waitForEvent } from '@dxos/async';
 import {
+  ERR_GREET_CONNECTED_TO_SWARM_TIMEOUT,
   createEnvelopeMessage,
   createGreetingBeginMessage,
   createGreetingFinishMessage,
@@ -19,8 +20,8 @@ import {
   Message,
   SecretProvider,
   WithTypeUrl,
-  ERR_GREET_CONNECTED_TO_SWARM_TIMEOUT,
-  SignedMessage
+  SignedMessage,
+  NotarizeResponse
 } from '@dxos/credentials';
 import { keyToString, PublicKey } from '@dxos/crypto';
 import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
@@ -46,10 +47,9 @@ export class GreetingInitiator {
 
   /**
    * @param _networkManager
-   * @param _identity
    * @param _invitationDescriptor
-   * @param _feedInitializer Callback to open or create a write feed for this party and return it's keypair.
-   * @param _getMessagesToNotarize Returns a list of credential messages that the inviter will be asked to write into the control feed.
+   * @param _getMessagesToNotarize
+   *  Returns a list of credential messages that the inviter will be asked to write into the control feed.
    */
   constructor (
     private readonly _networkManager: NetworkManager,
@@ -93,7 +93,8 @@ export class GreetingInitiator {
     log(keyToString(localPeerId), 'connecting to', keyToString(swarmKey));
 
     const peerJoinedWaiter = waitForEvent(this._greeterPlugin, 'peer:joined',
-      (remotePeerId: any) => remotePeerId && Buffer.from(responderPeerId).equals(remotePeerId), timeout, ERR_GREET_CONNECTED_TO_SWARM_TIMEOUT);
+      (remotePeerId: any) => remotePeerId && Buffer.from(responderPeerId).equals(remotePeerId),
+      timeout, ERR_GREET_CONNECTED_TO_SWARM_TIMEOUT);
 
     await this._networkManager.joinProtocolSwarm({
       topic: PublicKey.from(swarmKey),
@@ -111,7 +112,7 @@ export class GreetingInitiator {
   /**
    * Called after connecting to initiate greeting protocol exchange.
    */
-  async redeemInvitation (secretProvider: SecretProvider) {
+  async redeemInvitation (secretProvider: SecretProvider): Promise<{ partyKey: PublicKey, hints: PublicKey[] }> {
     assert(this._state === GreetingState.CONNECTED);
     const { swarmKey } = this._invitationDescriptor;
 
@@ -150,7 +151,7 @@ export class GreetingInitiator {
     const credentialMessages = await this._getMessagesToNotarize(PublicKey.from(partyKey), nonce);
 
     // Send the signed payload to the greeting responder.
-    const notarizeResponse = await this._greeterPlugin.send(responderPeerId,
+    const notarizeResponse: NotarizeResponse = await this._greeterPlugin.send(responderPeerId,
       createGreetingNotarizeMessage(secret, credentialMessages as WithTypeUrl<Message>[]));
 
     //
@@ -171,7 +172,7 @@ export class GreetingInitiator {
     this._state = GreetingState.SUCCEEDED;
     return {
       partyKey,
-      hints: notarizeResponse.hints
+      hints: notarizeResponse.feedHints ?? []
     };
   }
 

package/src/invitations/greeting-responder.ts

@@ -14,12 +14,13 @@ import {
   KeyType,
   SecretProvider,
   SecretValidator
+  , Message as HaloMessage
 } from '@dxos/credentials';
 import { keyToString, randomBytes, PublicKey } from '@dxos/crypto';
-import { SwarmKey } from '@dxos/echo-protocol';
+import { FeedWriter, SwarmKey } from '@dxos/echo-protocol';
 import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
 
-import { CredentialWriter, PartyStateProvider } from '../pipeline';
+import { PartyStateProvider } from '../pipeline';
 import { CredentialsSigner } from '../protocol/credentials-signer';
 import { InvitationOptions } from './common';
 import { greetingProtocolProvider } from './greeting-protocol-provider';
@@ -57,8 +58,9 @@ export class GreetingResponder {
 
   constructor (
     private readonly _networkManager: NetworkManager,
-    private readonly _partyProcessor: CredentialWriter & PartyStateProvider,
-    private readonly _credentialsSigner: CredentialsSigner
+    private readonly _partyProcessor: PartyStateProvider,
+    private readonly _credentialsSigner: CredentialsSigner,
+    private readonly _credentialsWriter: FeedWriter<HaloMessage>
   ) {
     this._greeter = new Greeter(
       this._partyProcessor.partyKey,
@@ -222,7 +224,7 @@ export class GreetingResponder {
         [this._credentialsSigner.getDeviceSigningKeys()]
       );
 
-      await this._partyProcessor.writeHaloMessage(envelope);
+      await this._credentialsWriter.write(envelope);
 
       // Wait for keys to be admitted.
       await waitForCondition(() => admittedKeys.every(hasKey));

package/src/invitations/halo-recovery-initiator.ts

@@ -22,8 +22,8 @@ import {
 import { keyToBuffer, keyToString, PublicKey, randomBytes, verify } from '@dxos/crypto';
 import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
 
-import { InvalidInvitationError } from '../errors';
-import { CredentialsSigner } from '../protocol/credentials-signer';
+import { InvalidInvitationError } from '../packlets/errors';
+import { CredentialsSigner } from '../protocol';
 import { greetingProtocolProvider } from './greeting-protocol-provider';
 import { GreetingState } from './greeting-responder';
 import { InvitationDescriptor, InvitationDescriptorType } from './invitation-descriptor';
@@ -72,8 +72,8 @@ export class HaloRecoveryInitiator {
     this._greeterPlugin = new GreetingCommandPlugin(this._peerId, async () => false);
 
     log('Connecting');
-    const peerJoinedWaiter = waitForEvent(this._greeterPlugin, 'peer:joined',
-      () => this._greeterPlugin?.peers.length, timeout);
+    const peerJoinedWaiter = waitForEvent(
+      this._greeterPlugin, 'peer:joined', () => !!this._greeterPlugin?.peers.length, timeout);
 
     await this._networkManager.joinProtocolSwarm({
       topic: PublicKey.from(swarmKey),

package/src/invitations/invitation-descriptor.ts

@@ -10,7 +10,7 @@ import { keyToBuffer, keyToString, ripemd160, PublicKey } from '@dxos/crypto';
 import { SwarmKey } from '@dxos/echo-protocol';
 import * as proto from '@dxos/echo-protocol';
 
-import { InvalidInvitationError } from '../errors';
+import { InvalidInvitationError } from '../packlets/errors';
 
 // Re-exporting type enum from protobuf definitions.
 export import InvitationDescriptorType = proto.InvitationDescriptor.Type;

package/src/invitations/invitation-factory.ts

@@ -4,11 +4,12 @@
 
 import assert from 'assert';
 
-import { createPartyInvitationMessage } from '@dxos/credentials';
+import { createPartyInvitationMessage, Message as HaloMessage } from '@dxos/credentials';
 import { PublicKey } from '@dxos/crypto';
+import { FeedWriter } from '@dxos/echo-protocol';
 import { NetworkManager } from '@dxos/network-manager';
 
-import { CredentialWriter, PartyStateProvider } from '../pipeline';
+import { PartyStateProvider } from '../pipeline';
 import { CredentialsSigner } from '../protocol/credentials-signer';
 import { defaultInvitationAuthenticator, InvitationAuthenticator, InvitationOptions } from './common';
 import { GreetingResponder } from './greeting-responder';
@@ -19,10 +20,11 @@ import { InvitationDescriptor, InvitationDescriptorType } from './invitation-des
  */
 export class InvitationFactory {
   constructor (
-    private readonly _partyProcessor: CredentialWriter & PartyStateProvider,
+    private readonly _partyProcessor: PartyStateProvider,
     // This needs to be a provider in case this is a backend for the HALO party.
     // Then the identity would be changed after this is instantiated.
     private readonly _credentialsSigner: CredentialsSigner,
+    private readonly _credentialsWriter: FeedWriter<HaloMessage>,
     private readonly _networkManager: NetworkManager
   ) {}
 
@@ -42,7 +44,7 @@ export class InvitationFactory {
       this._credentialsSigner.getDeviceSigningKeys()
     );
 
-    await this._partyProcessor.writeHaloMessage(invitationMessage);
+    await this._credentialsWriter.write(invitationMessage);
 
     return new InvitationDescriptor(
       InvitationDescriptorType.OFFLINE,
@@ -60,7 +62,8 @@ export class InvitationFactory {
     const responder = new GreetingResponder(
       this._networkManager,
       this._partyProcessor,
-      this._credentialsSigner
+      this._credentialsSigner,
+      this._credentialsWriter
     );
 
     const { secretValidator, secretProvider } = authenticationDetails;

package/src/invitations/offline-invitation-claimer.ts

@@ -23,7 +23,7 @@ import {
 import { keyToBuffer, keyToString, PublicKey, randomBytes } from '@dxos/crypto';
 import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
 
-import { InvalidInvitationError } from '../errors';
+import { InvalidInvitationError } from '../packlets/errors';
 import { CredentialsSigner } from '../protocol';
 import { greetingProtocolProvider } from './greeting-protocol-provider';
 import { GreetingState } from './greeting-responder';
@@ -70,8 +70,8 @@ export class OfflineInvitationClaimer {
     this._greeterPlugin = new GreetingCommandPlugin(localPeerId, async () => false);
 
     log('Connecting');
-    const peerJoinedWaiter = waitForEvent(this._greeterPlugin, 'peer:joined',
-      () => this._greeterPlugin?.peers.length, timeout);
+    const peerJoinedWaiter = waitForEvent(
+      this._greeterPlugin, 'peer:joined', () => !!this._greeterPlugin?.peers.length, timeout);
 
     await this._networkManager.joinProtocolSwarm({
       topic: PublicKey.from(swarmKey),

package/src/{database → packlets/database}/data-mirror.test.ts

@@ -11,10 +11,10 @@ import { EchoEnvelope, MockFeedWriter, Timeframe } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
 
-import { Item } from '../api';
 import { DataMirror } from './data-mirror';
 import { DataServiceHost } from './data-service-host';
 import { DataServiceRouter } from './data-service-router';
+import { Item } from './item';
 import { ItemDemuxer } from './item-demuxer';
 import { ItemManager } from './item-manager';
 
@@ -26,8 +26,8 @@ describe('DataMirror', () => {
     const itemManager = new ItemManager(modelFactory, PublicKey.random(), feed);
     const itemDemuxer = new ItemDemuxer(itemManager, modelFactory, { snapshots: true });
 
-    const stream = itemDemuxer.open();
-    feed.written.on(([msg, meta]) => stream.write({
+    const process = itemDemuxer.open();
+    feed.written.on(([msg, meta]) => process({
       data: msg,
       meta: { ...meta, memberKey: PublicKey.random(), timeframe: new Timeframe() }
     } as any));

package/src/{database → packlets/database}/data-mirror.ts

@@ -10,7 +10,7 @@ import { failUndefined } from '@dxos/debug';
 import { DataService } from '@dxos/echo-protocol';
 import { Model } from '@dxos/model-factory';
 
-import { Entity } from '../api';
+import { Entity } from './entity';
 import { ItemManager } from './item-manager';
 
 const log = debug('dxos:echo-db:data-mirror');

package/src/{database → packlets/database}/data-service-host.ts

@@ -18,10 +18,11 @@ import {
   SubscribeEntityStreamResponse
 } from '@dxos/echo-protocol';
 
-import { Item, Link } from '../api';
 import { EntityNotFoundError } from '../errors';
+import { Item } from './item';
 import { ItemDemuxer } from './item-demuxer';
 import { ItemManager } from './item-manager';
+import { Link } from './link';
 
 const log = debug('dxos:echo-db:data-service-host');
 

package/src/{database → packlets/database}/database-backend.ts

@@ -10,7 +10,7 @@ import { ModelFactory } from '@dxos/model-factory';
 
 import { DataMirror } from './data-mirror';
 import { DataServiceHost } from './data-service-host';
-import { ItemDemuxer, ItemDemuxerOptions } from './item-demuxer';
+import { EchoProcessor, ItemDemuxer, ItemDemuxerOptions } from './item-demuxer';
 import { ItemManager } from './item-manager';
 
 const log = debug('dxos:echo-db:database-backend');
@@ -42,12 +42,11 @@ export interface DatabaseBackend {
  * Write operations result in mutations being written to the outgoing stream.
  */
 export class FeedDatabaseBackend implements DatabaseBackend {
-  private _itemDemuxerInboundStream!: NodeJS.WritableStream
+  private _echoProcessor!: EchoProcessor;
   private _itemManager!: ItemManager;
   private _itemDemuxer!: ItemDemuxer;
 
   constructor (
-    private readonly _inboundStream: NodeJS.ReadableStream,
     private readonly _outboundStream: FeedWriter<EchoEnvelope> | undefined,
     private readonly _snapshot?: DatabaseSnapshot,
     private readonly _options: ItemDemuxerOptions = {}
@@ -56,16 +55,18 @@ export class FeedDatabaseBackend implements DatabaseBackend {
   async open (itemManager: ItemManager, modelFactory: ModelFactory) {
     this._itemManager = itemManager;
     this._itemDemuxer = new ItemDemuxer(itemManager, modelFactory, this._options);
-    this._itemDemuxerInboundStream = this._itemDemuxer.open();
-    this._inboundStream.pipe(this._itemDemuxerInboundStream);
+    this._echoProcessor = this._itemDemuxer.open();
 
     if (this._snapshot) {
       await this._itemDemuxer.restoreFromSnapshot(this._snapshot);
     }
   }
 
+  get echoProcessor () {
+    return this._echoProcessor;
+  }
+
   async close () {
-    this._inboundStream?.unpipe(this._itemDemuxerInboundStream);
   }
 
   get isReadOnly (): boolean {

package/src/{api → packlets/database}/database.test.ts

@@ -10,9 +10,10 @@ import { ModelFactory, TestListModel } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
 import { afterTest } from '@dxos/testutils';
 
-import { createInMemoryDatabase, createRemoteDatabaseFromDataServiceHost, DataServiceHost } from '../database';
+import { DataServiceHost } from './data-service-host';
 import { Item } from './item';
 import { ItemFilterDeleted } from './selection';
+import { createInMemoryDatabase, createRemoteDatabaseFromDataServiceHost } from './testing';
 
 const OBJECT_ORG = 'example:object/org';
 const OBJECT_PERSON = 'example:object/person';