@dxos/echo-db 2.33.5-dev.22471d71 → 2.33.5-dev.33d2877e

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';
@@ -87,6 +87,7 @@ export class ECHO {
   private readonly _halo: HALO;
   private readonly _keyring: Keyring;
 
+  private readonly _storage: Storage;
   private readonly _feedStore: FeedStore;
   private readonly _modelFactory: ModelFactory;
   private readonly _networkManager: NetworkManager;
@@ -114,11 +115,12 @@ export class ECHO {
     this._modelFactory = new ModelFactory()
       .registerModel(ObjectModel);
 
+    this._storage = storage;
     this._networkManager = new NetworkManager(networkManagerOptions);
-    this._snapshotStore = new SnapshotStore(storage.subDir('snapshots'));
-    this._metadataStore = new MetadataStore(storage.subDir('metadata'));
+    this._snapshotStore = new SnapshotStore(storage.directory('snapshots'));
+    this._metadataStore = new MetadataStore(storage.directory('metadata'));
     this._keyring = new Keyring(new KeyStore(keyStorage));
-    this._feedStore = new FeedStore(storage.subDir('feeds'), { valueEncoding: codec });
+    this._feedStore = new FeedStore(storage.directory('feeds'), { valueEncoding: codec });
 
     const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(
       this._metadataStore,
@@ -275,26 +277,14 @@ export class ECHO {
     await this.close();
 
     try {
-      if (this._feedStore.storage.destroy) {
-        await this._feedStore.storage.destroy();
+      if (this._storage.destroy) {
+        await this._storage.destroy();
       }
     } catch (err: any) {
-      error('Error clearing feed storage:', err);
+      error('Error clearing storage:', err);
     }
 
     await this.halo.reset();
-
-    try {
-      await this._snapshotStore.clear();
-    } catch (err: any) {
-      error('Error clearing snapshot storage:', err);
-    }
-
-    try {
-      await this._metadataStore.clear();
-    } catch (err: any) {
-      error('Error clearing metadata storage:', err);
-    }
   }
 
   //

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,9 +13,7 @@ import {
   Keyring,
   KeyType,
   Filter,
-  SecretProvider,
-  KeyHint,
-  createFeedAdmitMessage
+  SecretProvider
 } from '@dxos/credentials';
 import { keyToString, PublicKey, keyPairFromSeedPhrase } from '@dxos/crypto';
 import { ModelFactory } from '@dxos/model-factory';
@@ -55,7 +53,7 @@ export class HaloFactory {
     private readonly _options: PartyOptions = {}
   ) {}
 
-  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 halo = new HaloParty(
@@ -64,7 +62,7 @@ export class HaloFactory {
       feedProvider,
       credentialsSigner,
       this._networkManager,
-      hints,
+      feedHints,
       undefined,
       this._options
     );
@@ -94,21 +92,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.processor.writeHaloMessage(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.processor.writeHaloMessage(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.processor.writeHaloMessage(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.processor.writeHaloMessage(createDeviceInfoMessage(this._keyring, options.deviceDisplayName, deviceKey));
+      await halo.credentialsWriter.write(createDeviceInfoMessage(this._keyring, options.deviceDisplayName, deviceKey));
     }
 
     // Create special properties item.
@@ -193,22 +191,11 @@ export class HaloFactory {
     );
 
     await initiator.connect();
-    const { partyKey, hints } = await initiator.redeemInvitation(secretProvider);
+    const { hints } = await initiator.redeemInvitation(secretProvider);
 
-    /*
-     * TODO(telackey): We shouldn't have to add our key here, it should be in the hints, but our hint
-     * mechanism is broken by not waiting on the messages to be processed before returning.
-     */
     const halo = await this.constructParty(hints);
     await halo.open();
 
-    // Write the Feed genesis message.
-    await halo.processor.writeHaloMessage(createFeedAdmitMessage(
-      credentialsSigner.signer,
-      partyKey,
-      await halo.getWriteFeedKey(),
-      [credentialsSigner.getDeviceKey()]
-    ));
     await initiator.destroy();
 
     await halo.database.createItem({

package/src/halo/halo-party.ts

@@ -54,8 +54,8 @@ export class HaloParty {
     private readonly _feedProvider: PartyFeedProvider,
     private readonly _credentialsSigner: CredentialsSigner,
     private readonly _networkManager: NetworkManager,
-    private readonly _hints: KeyHint[] = [],
-    _initialTimeframe: Timeframe | undefined,
+    private readonly _feedHints: PublicKey[] = [],
+    private readonly _initialTimeframe: Timeframe | undefined,
     _options: PartyOptions
   ) {
     this._partyCore = new PartyCore(
@@ -64,7 +64,6 @@ export class HaloParty {
       modelFactory,
       snapshotStore,
       _credentialsSigner.getIdentityKey().publicKey,
-      _initialTimeframe,
       _options
     );
 
@@ -114,10 +113,6 @@ export class HaloParty {
     return this._partyCore.processor.credentialMessages.get(this._credentialsSigner.getIdentityKey().publicKey.toHex());
   }
 
-  get memberKeys () {
-    return this._partyCore.processor.memberKeys;
-  }
-
   get credentialMessages () {
     return this._partyCore.processor.credentialMessages;
   }
@@ -126,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;
@@ -145,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
     );
 
@@ -169,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)
     ]);
 

package/src/halo/halo.test.ts

@@ -26,10 +26,11 @@ describe('HALO', () => {
       .registerModel(ObjectModel);
 
     const networkManager = new NetworkManager();
-    const snapshotStore = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
-    const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
+    const storage = createStorage('', StorageType.RAM);
+    const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
+    const metadataStore = new MetadataStore(storage.directory('metadata'));
     const keyring = new Keyring();
-    const feedStore = new FeedStore(createStorage('feed', StorageType.RAM), { valueEncoding: codec });
+    const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
 
     const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(
       metadataStore,

package/src/halo/identity.ts

@@ -102,7 +102,7 @@ export class Identity implements IdentityCredentials {
 
 export type IdentityProvider = () => Identity | undefined;
 
-function getDeviceKeyChainFromHalo (halo: HaloParty, deviceKey: KeyRecord) {
+const getDeviceKeyChainFromHalo = (halo: HaloParty, deviceKey: KeyRecord) => {
   try {
     return Keyring.buildKeyChain(
       deviceKey.publicKey,
@@ -113,4 +113,4 @@ function getDeviceKeyChainFromHalo (halo: HaloParty, deviceKey: KeyRecord) {
     log('Unable to locate device KeyChain:', err);
     throw err;
   }
-}
+};

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';
@@ -14,7 +15,7 @@ const log = debug('dxos:echo-db:party-opener');
 /**
  * Automatically adds, opens, and clothes parties from HALO preferences.
  */
-export function autoPartyOpener (preferences: Preferences, partyManager: PartyManager): Unsubscribe {
+export const autoPartyOpener = (preferences: Preferences, partyManager: PartyManager): Unsubscribe => {
   const subs = new SubscriptionGroup();
 
   subs.push(preferences.subscribeToJoinedPartyList(async values => {
@@ -25,7 +26,8 @@ export function autoPartyOpener (preferences: Preferences, partyManager: PartyMa
     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);
       }
     }
   }));
@@ -46,4 +48,4 @@ export function autoPartyOpener (preferences: Preferences, partyManager: PartyMa
   }));
 
   return () => subs.unsubscribe();
-}
+};

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
@@ -159,16 +160,13 @@ export class Preferences {
   subscribeToJoinedPartyList (callback: (parties: JoinedParty[]) => void): () => void {
     const database = this._getDatabase() ?? raise(new IdentityNotInitializedError());
 
-    const converter = (partyDesc: Item<any>) => {
-      // TODO(burdon): Define type.
-      return {
-        partyKey: PublicKey.from(partyDesc.model.get('publicKey')),
-        keyHints: Object.values(partyDesc.model.get('hints')).map((hint: any) => ({
-          ...hint,
-          publicKey: PublicKey.from(hint.publicKey)
-        } as KeyHint))
-      };
-    };
+    const converter = (partyDesc: Item<any>) => ({
+      partyKey: PublicKey.from(partyDesc.model.get('publicKey')),
+      keyHints: Object.values(partyDesc.model.get('hints')).map((hint: any) => ({
+        ...hint,
+        publicKey: PublicKey.from(hint.publicKey)
+      } as KeyHint))
+    });
 
     const result = database.select({ type: HALO_PARTY_DESCRIPTOR_TYPE }).exec();
 

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

@@ -20,7 +20,8 @@ import {
   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';
@@ -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-protocol-provider.ts

@@ -14,12 +14,8 @@ import { protocolFactory } from '@dxos/network-manager';
  */
 // TODO(burdon): When closed?
 // TODO(dboreham): Write a test to check resources are released (no resource leaks).
-export const greetingProtocolProvider = (rendezvousKey: any, peerId: Buffer | Uint8Array, protocolPlugins: any[]) => {
-  return protocolFactory({
-    getTopics: () => {
-      return [rendezvousKey];
-    },
-    session: { peerId: keyToString(peerId) },
-    plugins: protocolPlugins
-  });
-};
+export const greetingProtocolProvider = (rendezvousKey: any, peerId: Buffer | Uint8Array, protocolPlugins: any[]) => protocolFactory({
+  getTopics: () => [rendezvousKey],
+  session: { peerId: keyToString(peerId) },
+  plugins: protocolPlugins
+});

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 { PartyProcessor } 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: PartyProcessor,
-    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));
@@ -243,19 +245,15 @@ export class GreetingResponder {
   _gatherHints (): KeyHint[] {
     assert(this._state === GreetingState.SUCCEEDED);
 
-    const memberKeys = this._partyProcessor.memberKeys.map(publicKey => {
-      return {
-        publicKey,
-        type: KeyType.UNKNOWN
-      };
-    });
+    const memberKeys = this._partyProcessor.memberKeys.map((publicKey) => ({
+      publicKey,
+      type: KeyType.UNKNOWN
+    }));
 
-    const memberFeeds = this._partyProcessor.feedKeys.map(publicKey => {
-      return {
-        publicKey,
-        type: KeyType.FEED
-      };
-    });
+    const memberFeeds = this._partyProcessor.feedKeys.map((publicKey) => ({
+      publicKey,
+      type: KeyType.FEED
+    }));
 
     return [...memberKeys, ...memberFeeds];
   }

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

@@ -22,7 +22,7 @@ import {
 import { keyToBuffer, keyToString, PublicKey, randomBytes, verify } from '@dxos/crypto';
 import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
 
-import { InvalidInvitationError } from '../errors';
+import { InvalidInvitationError } from '../packlets/errors';
 import { CredentialsSigner } from '../protocol/credentials-signer';
 import { greetingProtocolProvider } from './greeting-protocol-provider';
 import { GreetingState } from './greeting-responder';

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 { PartyProcessor } 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: PartyProcessor,
+    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';
@@ -170,19 +170,17 @@ export class OfflineInvitationClaimer {
 
   // The secretProvider should provide an `Auth` message signed directly by the Identity key.
   static createSecretProvider (credentials: CredentialsSigner): SecretProvider {
-    return async (info?: SecretInfo) => {
-      return Buffer.from(codec.encode(
-        /* The signed portion of the Auth message includes the ID and authNonce provided
+    return async (info?: SecretInfo) => Buffer.from(codec.encode(
+      /* The signed portion of the Auth message includes the ID and authNonce provided
          * by the `info` object. These values will be validated on the other end.
          */
-        createAuthMessage(
-          credentials.signer,
+      createAuthMessage(
+        credentials.signer,
           info!.id.value,
           credentials.getIdentityKey(),
           credentials.getDeviceSigningKeys(),
           undefined,
           info!.authNonce.value)
-      ));
-    };
+    ));
   }
 }

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';
 

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/{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';

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

@@ -10,9 +10,11 @@ import { ItemID, ItemType } from '@dxos/echo-protocol';
 import { Model, ModelConstructor, ModelFactory, validateModelClass } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
 
-import { DatabaseBackend, DataServiceHost, ItemManager } from '../database';
+import { DataServiceHost } from './data-service-host';
+import { DatabaseBackend } from './database-backend';
 import { Entity } from './entity';
 import { Item } from './item';
+import { ItemManager } from './item-manager';
 import { Link } from './link';
 import { RootFilter, Selection, createSelection } from './selection';
 

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

@@ -7,7 +7,7 @@ import { ItemID, ItemType } from '@dxos/echo-protocol';
 import { Model, ModelMeta, StateManager } from '@dxos/model-factory';
 import { SubscriptionGroup } from '@dxos/util';
 
-import { ItemManager } from '../database';
+import { ItemManager } from './item-manager';
 
 /**
  * Base class for all ECHO entitities.