@dxos/echo-db 2.33.4-dev.faf06c70 → 2.33.5-dev.0d84e06f

package/src/parties/party-manager.test.ts

@@ -32,13 +32,12 @@ import { ObjectModel } from '@dxos/object-model';
 import { createStorage, StorageType } from '@dxos/random-access-multi-storage';
 import { afterTest, testTimeout } from '@dxos/testutils';
 
-import { Item } from '../api';
 import { defaultInvitationAuthenticator, OfflineInvitationClaimer } from '../invitations';
+import { Item } from '../packlets/database';
 import { MetadataStore, PartyFeedProvider } from '../pipeline';
 import { createTestIdentityCredentials } from '../protocol/identity-credentials';
 import { SnapshotStore } from '../snapshots';
 import { messageLogger } from '../testing';
-import { createRamStorage } from '../util';
 import { PARTY_ITEM_TYPE } from './data-party';
 import { PartyFactory } from './party-factory';
 import { PartyManager } from './party-manager';
@@ -56,9 +55,11 @@ const log = debug('dxos:echo:parties:party-manager:test');
  */
 const setup = async () => {
   const keyring = new Keyring();
-  const metadataStore = new MetadataStore(createRamStorage());
-  const feedStore = new FeedStore(createStorage('', StorageType.RAM), { valueEncoding: codec });
-  const snapshotStore = new SnapshotStore(createStorage('', StorageType.RAM));
+
+  const storage = createStorage('', StorageType.RAM);
+  const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
+  const metadataStore = new MetadataStore(storage.directory('metadata'));
+  const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
   const modelFactory = new ModelFactory().registerModel(ObjectModel);
   const networkManager = new NetworkManager();
   const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(metadataStore, keyring, feedStore, partyKey);
@@ -149,11 +150,11 @@ describe('Party manager', () => {
 
   test('Create from cold start', async () => {
     const storage = createStorage('', StorageType.RAM);
-    const feedStore = new FeedStore(storage, { valueEncoding: codec });
+    const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
     const keyring = new Keyring();
-    const metadataStore = new MetadataStore(createRamStorage());
+    const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
+    const metadataStore = new MetadataStore(storage.directory('metadata'));
     const modelFactory = new ModelFactory().registerModel(ObjectModel);
-    const snapshotStore = new SnapshotStore(createStorage('', StorageType.RAM));
     const networkManager = new NetworkManager();
     const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(metadataStore, keyring, feedStore, partyKey);
 
@@ -189,15 +190,23 @@ describe('Party manager', () => {
       assert(feedKey);
 
       const feedStream = createWritableFeedStream(feed);
-      feedStream.write({ halo: createPartyGenesisMessage(keyring, partyKey, feedKey.publicKey, identity.identityKey) });
       feedStream.write({
+        timeframe: new Timeframe(),
+        halo: createPartyGenesisMessage(
+          keyring,
+          partyKey,
+          feedKey.publicKey,
+          identity.identityKey
+        )
+      });
+      feedStream.write({
+        timeframe: new Timeframe(),
         echo: checkType<EchoEnvelope>({
           itemId: 'foo',
           genesis: {
             itemType: PARTY_ITEM_TYPE,
             modelType: ObjectModel.meta.type
-          },
-          timeframe: new Timeframe()
+          }
         })
       });
     }

package/src/parties/party-manager.ts

@@ -175,7 +175,8 @@ export class PartyManager {
     }
 
     log(`Adding party partyKey=${partyKey.toHex()} hints=${hints.length}`);
-    const party = await this._partyFactory.addParty(partyKey, hints);
+    const party = await this._partyFactory.constructParty(partyKey, hints);
+    await party.open();
     await this._metadataStore.addParty(party.key);
     this._setParty(party);
     return party;

package/src/pipeline/message-selector.ts

@@ -5,12 +5,12 @@
 import assert from 'assert';
 import debug from 'debug';
 
-import { Keyring, getPartyCredentialMessageType, PartyCredential, admitsKeys } from '@dxos/credentials';
+import { getPartyCredentialMessageType, PartyCredential } from '@dxos/credentials';
 import { PublicKey } from '@dxos/crypto';
 import { MessageSelector } from '@dxos/echo-protocol';
 
-import { TimeframeClock } from '../database';
-import { PartyProcessor } from './party-processor';
+import { TimeframeClock } from '../packlets/database';
+import { PartyStateProvider } from './party-processor';
 
 const log = debug('dxos:echo-db:message-selector');
 
@@ -23,56 +23,44 @@ const log = debug('dxos:echo-db:message-selector');
  * @param partyProcessor
  * @param timeframeClock
  */
-export function createMessageSelector (
-  partyProcessor: PartyProcessor,
-  timeframeClock: TimeframeClock
-): MessageSelector {
-  // TODO(telackey): Add KeyAdmit checks.
-  return candidates => {
-    // Check ECHO message candidates first since they are less expensive than HALO cancidates.
-    for (let i = 0; i < candidates.length; i++) {
-      const { data: { echo } } = candidates[i];
-      const feedKey = PublicKey.from(candidates[i].key);
-      if (!echo) {
-        continue;
-      }
+export const createMessageSelector = (partyProcessor: PartyStateProvider, timeframeClock: TimeframeClock): MessageSelector => candidates => {
+  // Check ECHO message candidates first since they are less expensive than HALO cancidates.
+  for (let i = 0; i < candidates.length; i++) {
+    const { data: { timeframe, echo } } = candidates[i];
+    const feedKey = PublicKey.from(candidates[i].key);
+    if (!echo) {
+      continue;
+    }
 
-      assert(echo.timeframe);
-      if (partyProcessor.isFeedAdmitted(feedKey) && !timeframeClock.hasGaps(echo.timeframe)) {
-        return i;
-      }
+    assert(timeframe);
+    if (partyProcessor.isFeedAdmitted(feedKey) && !timeframeClock.hasGaps(timeframe)) {
+      return i;
     }
+  }
 
-    // Check HALO message candidates.
-    for (let i = 0; i < candidates.length; i++) {
-      const { data: { halo } } = candidates[i];
-      const feedKey = PublicKey.from(candidates[i].key);
-      if (!halo) {
-        continue;
-      }
+  // Check HALO message candidates.
+  for (let i = 0; i < candidates.length; i++) {
+    const { data: { timeframe, halo } } = candidates[i];
+    const feedKey = PublicKey.from(candidates[i].key);
+    if (!halo) {
+      continue;
+    }
 
-      if (partyProcessor.isFeedAdmitted(feedKey)) {
-        return i;
-      }
+    assert(timeframe);
+    if (partyProcessor.isFeedAdmitted(feedKey) && !timeframeClock.hasGaps(timeframe)) {
+      return i;
+    }
 
-      if (partyProcessor.genesisRequired) {
+    if (partyProcessor.genesisRequired) {
+      try { // TODO(dmaretskyi): Get getPartyCredentialMessageType crashes for some reason.
         // TODO(telackey): Add check that this is for the right Party.
         if (getPartyCredentialMessageType(halo) === PartyCredential.Type.PARTY_GENESIS) {
           return i;
         }
-      } else if (getPartyCredentialMessageType(halo) === PartyCredential.Type.FEED_ADMIT) {
-        if (admitsKeys(halo).find(key => key.equals(feedKey))) {
-          // TODO(marik-d): Calling `Keyring.signingKeys` is expensive. Is there any way to optimize/cache this?
-          for (const signedBy of Keyring.signingKeys(halo)) {
-            if (partyProcessor.isMemberKey(signedBy) || signedBy.equals(partyProcessor.partyKey)) {
-              return i;
-            }
-          }
-        }
-      }
+      } catch { }
     }
+  }
 
-    // Not ready for this message yet.
-    log('Skipping...');
-  };
-}
+  // Not ready for this message yet.
+  log('Skipping...');
+};

package/src/pipeline/metadata-store.test.ts

@@ -5,13 +5,14 @@
 import expect from 'expect';
 
 import { PublicKey } from '@dxos/crypto';
+import { createStorage, StorageType } from '@dxos/random-access-multi-storage';
 
-import { createRamStorage } from '../util';
 import { MetadataStore } from './metadata-store';
 
 describe('MetadataStore in-memory', () => {
   it('Creates party and adds feeds to it', async () => {
-    const store = new MetadataStore(createRamStorage());
+    const storage = createStorage('', StorageType.RAM);
+    const store = new MetadataStore(storage.directory('metadata'));
     await store.load();
     expect(store.parties?.length).toBe(0);
 
@@ -33,7 +34,8 @@ describe('MetadataStore in-memory', () => {
   });
 
   it('Creates party when adding feed', async () => {
-    const store = new MetadataStore(createRamStorage());
+    const storage = createStorage('', StorageType.RAM);
+    const store = new MetadataStore(storage.directory('metadata'));
     await store.load();
 
     const partyKey = PublicKey.random();
@@ -45,7 +47,8 @@ describe('MetadataStore in-memory', () => {
   });
 
   it('Doesn\'t add same feed twice', async () => {
-    const store = new MetadataStore(createRamStorage());
+    const storage = createStorage('', StorageType.RAM);
+    const store = new MetadataStore(storage.directory('metadata'));
     await store.load();
 
     const partyKey = PublicKey.random();
@@ -60,7 +63,8 @@ describe('MetadataStore in-memory', () => {
 
   // TODO(yivlad): Doesn't work for now.
   it.skip('Resets storage', async () => {
-    const store = new MetadataStore(createRamStorage());
+    const storage = createStorage('snapshots', StorageType.RAM);
+    const store = new MetadataStore(storage.directory(''));
 
     const partyKey = PublicKey.random();
     const feedKey = PublicKey.random();

package/src/pipeline/metadata-store.ts

@@ -8,7 +8,7 @@ import debug from 'debug';
 import { PublicKey } from '@dxos/crypto';
 import { failUndefined } from '@dxos/debug';
 import { EchoMetadata, PartyMetadata, schema } from '@dxos/echo-protocol';
-import { IStorage } from '@dxos/random-access-multi-storage';
+import { Directory } from '@dxos/random-access-multi-storage';
 
 /**
  * Version for the schema of the stored data as defined in dxos.echo.metadata.EchoMetadata.
@@ -28,7 +28,7 @@ export class MetadataStore {
   };
 
   constructor (
-    private readonly _storage: IStorage
+    private readonly _directory: Directory
   ) {}
 
   get version (): number {
@@ -47,7 +47,7 @@ export class MetadataStore {
    * Loads metadata from persistent storage.
    */
   async load (): Promise<void> {
-    const file = this._storage.createOrOpen('EchoMetadata');
+    const file = this._directory.createOrOpen('EchoMetadata');
     try {
       const { size } = await file.stat();
       if (size === 0) {
@@ -75,7 +75,7 @@ export class MetadataStore {
       updated: new Date()
     };
 
-    const file = this._storage.createOrOpen('EchoMetadata');
+    const file = this._directory.createOrOpen('EchoMetadata');
 
     try {
       const encoded = Buffer.from(schema.getCodecForType('dxos.echo.metadata.EchoMetadata').encode(data));
@@ -90,7 +90,7 @@ export class MetadataStore {
    */
   async clear (): Promise<void> {
     log('Clearing all echo metadata...');
-    await this._storage.destroy();
+    await this._directory.destroy();
   }
 
   /**

package/src/pipeline/party-core.test.ts

@@ -8,7 +8,8 @@ import { it as test } from 'mocha';
 import { promiseTimeout } from '@dxos/async';
 import { createFeedAdmitMessage, createPartyGenesisMessage, Keyring, KeyType } from '@dxos/credentials';
 import { createId, PublicKey } from '@dxos/crypto';
-import { codec, Timeframe } from '@dxos/echo-protocol';
+import { checkType } from '@dxos/debug';
+import { codec, FeedMessage, Timeframe } from '@dxos/echo-protocol';
 import { FeedStore } from '@dxos/feed-store';
 import { createTestProtocolPair } from '@dxos/mesh-protocol';
 import { ModelFactory } from '@dxos/model-factory';
@@ -16,23 +17,23 @@ import { ObjectModel } from '@dxos/object-model';
 import { createStorage, StorageType } from '@dxos/random-access-multi-storage';
 import { afterTest } from '@dxos/testutils';
 
-import { MetadataStore, PartyFeedProvider, ReplicatorProtocolPluginFactory } from '../pipeline';
+import { MetadataStore, PartyFeedProvider } from '../pipeline';
+import { createReplicatorPlugin } from '../protocol/replicator-plugin';
 import { SnapshotStore } from '../snapshots';
-import { createRamStorage } from '../util';
 import { PartyCore } from './party-core';
 
 describe('PartyCore', () => {
   const setup = async () => {
     const storage = createStorage('', StorageType.RAM);
-    const feedStore = new FeedStore(storage, { valueEncoding: codec });
+    const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
     afterTest(async () => feedStore.close());
 
     const keyring = new Keyring();
 
-    const metadataStore = new MetadataStore(createRamStorage());
+    const metadataStore = new MetadataStore(storage.directory('metadata'));
 
     const modelFactory = new ModelFactory().registerModel(ObjectModel);
-    const snapshotStore = new SnapshotStore(createStorage('', StorageType.RAM));
+    const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
 
     const partyKey = await keyring.createKeyRecord({ type: KeyType.PARTY });
 
@@ -51,7 +52,7 @@ describe('PartyCore', () => {
     afterTest(async () => party.close());
 
     // PartyGenesis (self-signed by Party).
-    await party.processor.writeHaloMessage(createPartyGenesisMessage(
+    await party.credentialsWriter.write(createPartyGenesisMessage(
       keyring,
       partyKey,
       feed.key,
@@ -59,7 +60,7 @@ describe('PartyCore', () => {
     );
 
     // FeedAdmit (signed by the Device KeyChain).
-    await party.processor.writeHaloMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       keyring,
       partyKey.publicKey,
       feed.key,
@@ -120,7 +121,7 @@ describe('PartyCore', () => {
     const feedKey = await keyring.createKeyRecord({ type: KeyType.FEED });
 
     const eventFired = feedStore.feedOpenedEvent.waitForCount(1);
-    await party.processor.writeHaloMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       keyring,
       party.key,
       feedKey.publicKey,
@@ -132,15 +133,15 @@ describe('PartyCore', () => {
 
   test('opens feed from hints', async () => {
     const storage = createStorage('', StorageType.RAM);
-    const feedStore = new FeedStore(storage, { valueEncoding: codec });
+    const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
     afterTest(async () => feedStore.close());
 
     const keyring = new Keyring();
 
-    const metadataStore = new MetadataStore(createRamStorage());
+    const metadataStore = new MetadataStore(storage.directory('metadata'));
 
     const modelFactory = new ModelFactory().registerModel(ObjectModel);
-    const snapshotStore = new SnapshotStore(createStorage('', StorageType.RAM));
+    const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
 
     const partyKey = await keyring.createKeyRecord({ type: KeyType.PARTY });
 
@@ -175,16 +176,16 @@ describe('PartyCore', () => {
     const feed = await partyFeedProvider.createOrOpenWritableFeed();
 
     const itemId = createId();
-    await feed.feed.append({
+    await feed.feed.append(checkType<FeedMessage>({
+      timeframe: new Timeframe(),
       echo: {
         itemId,
         genesis: {
           itemType: 'dxos:example',
           modelType: ObjectModel.meta.type
-        },
-        timeframe: new Timeframe()
+        }
       }
-    });
+    }));
 
     await promiseTimeout(party.database.waitForItem({ id: itemId }), 1000, new Error('timeout'));
   });
@@ -197,7 +198,7 @@ describe('PartyCore', () => {
     const fullKey = keyring.getFullKey(feedKey.publicKey);
     const feed2 = await feedStore.openReadWriteFeed(fullKey!.publicKey, fullKey!.secretKey!);
 
-    await party.processor.writeHaloMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       keyring,
       party.key,
       feed2.key,
@@ -205,16 +206,16 @@ describe('PartyCore', () => {
     ));
 
     const itemId = createId();
-    await feed2.append({
+    await feed2.append(checkType<FeedMessage>({
+      timeframe: new Timeframe(),
       echo: {
         itemId,
         genesis: {
           itemType: 'dxos:example',
           modelType: ObjectModel.meta.type
-        },
-        timeframe: new Timeframe()
+        }
       }
-    });
+    }));
 
     await promiseTimeout(party.database.waitForItem({ id: itemId }), 1000, new Error('timeout'));
   });
@@ -226,7 +227,7 @@ describe('PartyCore', () => {
     const feedKey = await keyring.createKeyRecord({ type: KeyType.FEED });
     const fullKey = keyring.getFullKey(feedKey.publicKey);
 
-    await party.processor.writeHaloMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       keyring,
       party.key,
       feedKey.publicKey,
@@ -235,53 +236,16 @@ describe('PartyCore', () => {
 
     const feed2 = await feedStore.openReadWriteFeed(fullKey!.publicKey, fullKey!.secretKey!);
     const itemId = createId();
-    await feed2.append({
+    await feed2.append(checkType<FeedMessage>({
+      timeframe: new Timeframe(),
       echo: {
         itemId,
         genesis: {
           itemType: 'dxos:example',
           modelType: ObjectModel.meta.type
-        },
-        timeframe: new Timeframe()
+        }
       }
-    });
-
-    await promiseTimeout(party.database.waitForItem({ id: itemId }), 1000, new Error('timeout'));
-  });
-
-  test('self-admitting feed with a hint', async () => {
-    const { party, keyring, partyKey, feedStore } = await setup();
-    await party.open();
-
-    const feedKey = await keyring.createKeyRecord({ type: KeyType.FEED });
-    const fullKey = keyring.getFullKey(feedKey.publicKey);
-    const feed2 = await feedStore.openReadWriteFeed(fullKey!.publicKey, fullKey!.secretKey!);
-
-    await party.processor.takeHints([{
-      type: KeyType.FEED,
-      publicKey: feedKey.publicKey
-    }]);
-
-    await feed2.append({
-      halo: createFeedAdmitMessage(
-        keyring,
-        party.key,
-        feedKey.publicKey,
-        [partyKey]
-      )
-    });
-
-    const itemId = createId();
-    await feed2.append({
-      echo: {
-        itemId,
-        genesis: {
-          itemType: 'dxos:example',
-          modelType: ObjectModel.meta.type
-        },
-        timeframe: new Timeframe()
-      }
-    });
+    }));
 
     await promiseTimeout(party.database.waitForItem({ id: itemId }), 1000, new Error('timeout'));
   });
@@ -290,13 +254,13 @@ describe('PartyCore', () => {
     const peer1 = await setup();
 
     const storage = createStorage('', StorageType.RAM);
-    const feedStore = new FeedStore(storage, { valueEncoding: codec });
+    const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
     afterTest(async () => feedStore.close());
 
-    const metadataStore = new MetadataStore(createRamStorage());
+    const metadataStore = new MetadataStore(storage.directory('metadata'));
 
     const modelFactory = new ModelFactory().registerModel(ObjectModel);
-    const snapshotStore = new SnapshotStore(createStorage('', StorageType.RAM));
+    const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
 
     const partyFeedProvider = new PartyFeedProvider(metadataStore, peer1.keyring, feedStore, peer1.party.key);
 
@@ -310,7 +274,7 @@ describe('PartyCore', () => {
 
     const feed2 = await partyFeedProvider.createOrOpenWritableFeed();
 
-    await peer1.party.processor.writeHaloMessage(createFeedAdmitMessage(
+    await peer1.party.credentialsWriter.write(createFeedAdmitMessage(
       peer1.keyring,
       peer1.party.key,
       feed2.key,
@@ -324,12 +288,8 @@ describe('PartyCore', () => {
     afterTest(async () => party2.close());
 
     createTestProtocolPair(
-      new ReplicatorProtocolPluginFactory(
-        peer1.partyFeedProvider
-      ).createPlugins().map(r => r.createExtension()),
-      new ReplicatorProtocolPluginFactory(
-        partyFeedProvider
-      ).createPlugins().map(r => r.createExtension())
+      [createReplicatorPlugin(peer1.partyFeedProvider).createExtension()],
+      [createReplicatorPlugin(partyFeedProvider).createExtension()]
     );
 
     const item1 = await peer1.party.database.createItem();

package/src/pipeline/party-core.ts

@@ -5,15 +5,14 @@
 import assert from 'assert';
 
 import { synchronized } from '@dxos/async';
-import { KeyHint, KeyType } from '@dxos/credentials';
+import { KeyHint, KeyType, Message as HaloMessage } from '@dxos/credentials';
 import { PublicKey } from '@dxos/crypto';
 import { timed } from '@dxos/debug';
-import { createFeedWriter, DatabaseSnapshot, PartyKey, PartySnapshot, Timeframe } from '@dxos/echo-protocol';
+import { createFeedWriter, DatabaseSnapshot, FeedWriter, PartyKey, PartySnapshot, Timeframe } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
 import { SubscriptionGroup } from '@dxos/util';
 
-import { Database } from '../api';
-import { FeedDatabaseBackend, TimeframeClock } from '../database';
+import { Database, FeedDatabaseBackend, TimeframeClock } from '../packlets/database';
 import { createMessageSelector, PartyProcessor, PartyFeedProvider, Pipeline } from '../pipeline';
 import { createAutomaticSnapshots, SnapshotStore } from '../snapshots';
 
@@ -99,6 +98,11 @@ export class PartyCore {
     return feed;
   }
 
+  get credentialsWriter (): FeedWriter<HaloMessage> {
+    assert(this._pipeline?.outboundHaloStream, 'Party not open');
+    return this._pipeline?.outboundHaloStream;
+  }
+
   /**
    * Opens the pipeline and connects the streams.
    */
@@ -147,11 +151,6 @@ export class PartyCore {
     // TODO(burdon): Support read-only parties.
     const [readStream, writeStream] = await this._pipeline.open();
 
-    // Must happen after open.
-    if (this._pipeline.outboundHaloStream) {
-      this._partyProcessor.setOutboundStream(this._pipeline.outboundHaloStream);
-    }
-
     //
     // Database
     //

package/src/pipeline/party-processor.ts

@@ -12,22 +12,40 @@ import {
   PartyState,
   Message as HaloMessage,
   IdentityEventType,
-  PartyEventType
+  PartyEventType,
+  SignedMessage
 } from '@dxos/credentials';
 import { PublicKey } from '@dxos/crypto';
-import { FeedKey, FeedWriter, IHaloStream, PartyKey, HaloStateSnapshot, WriteReceipt } from '@dxos/echo-protocol';
+import { FeedKey, IHaloStream, PartyKey, HaloStateSnapshot } from '@dxos/echo-protocol';
 import { jsonReplacer } from '@dxos/util';
 
 const log = debug('dxos:echo-db:party-processor');
 
+export interface CredentialProcessor {
+  processMessage (message: IHaloStream): Promise<void>
+}
+
+export interface PartyStateProvider {
+  partyKey: PublicKey
+
+  /**
+   * Whether PartyGenesis was already processed.
+   */
+  genesisRequired: boolean
+  memberKeys: PublicKey[]
+  feedKeys: PublicKey[]
+  getFeedOwningMember (feedKey: FeedKey): PublicKey | undefined
+  isFeedAdmitted (feedKey: FeedKey): boolean
+
+  getOfflineInvitation (invitationID: Buffer): SignedMessage | undefined
+}
+
 /**
  * TODO(burdon): Wrapper/Bridge between HALO APIs.
  */
-export class PartyProcessor {
+export class PartyProcessor implements CredentialProcessor, PartyStateProvider {
   private readonly _state: PartyState;
 
-  private _outboundHaloStream: FeedWriter<HaloMessage> | undefined;
-
   readonly feedAdded = new Event<FeedKey>()
 
   public readonly keyOrInfoAdded = new Event<PublicKey>();
@@ -124,16 +142,6 @@ export class PartyProcessor {
     await this._state.processMessages([data]);
   }
 
-  setOutboundStream (stream: FeedWriter<HaloMessage>) {
-    this._outboundHaloStream = stream;
-  }
-
-  async writeHaloMessage (message: HaloMessage): Promise<WriteReceipt> {
-    assert(this._outboundHaloStream, 'Party is closed or read-only');
-    // TODO(marik-d): Wait for the message to be processed?
-    return this._outboundHaloStream.write(message);
-  }
-
   makeSnapshot (): HaloStateSnapshot {
     return {
       messages: this._haloMessages

package/src/pipeline/pipeline.test.ts

@@ -15,7 +15,7 @@ import { createSetPropertyMutation } from '@dxos/model-factory';
 import { createStorage, StorageType } from '@dxos/random-access-multi-storage';
 import { jsonReplacer } from '@dxos/util';
 
-import { TimeframeClock } from '../database';
+import { TimeframeClock } from '../packlets/database';
 import { PartyProcessor } from './party-processor';
 import { Pipeline } from './pipeline';
 
@@ -25,7 +25,7 @@ const log = debug('dxos:echo:pipeline:test');
 describe('pipeline', () => {
   test('streams', async () => {
     const storage = createStorage('', StorageType.RAM);
-    const feedStore = new FeedStore(storage, { valueEncoding: codec });
+    const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
     const feedKeys: Uint8Array[] = [];
     const feedSelector: FeedSelector = descriptor => !!feedKeys.find(key => descriptor.key.equals(key));
     const feedReadStream = new FeedStoreIterator(feedSelector, () => 0, new Timeframe());
@@ -87,7 +87,7 @@ describe('pipeline', () => {
 
   test('writing', async () => {
     const storage = createStorage('', StorageType.RAM);
-    const feedStore = new FeedStore(storage, { valueEncoding: codec });
+    const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
     const feedReadStream = new FeedStoreIterator(() => true, () => 0, new Timeframe());
 
     const { publicKey, secretKey } = createKeyPair();
@@ -133,8 +133,7 @@ describe('pipeline', () => {
       itemId: '123',
       genesis: {
         itemType: 'foo'
-      },
-      timeframe: expect.any(Timeframe)
+      }
     });
   });
 });