@dxos/echo-db 2.33.5-dev.b9f5bea6 → 2.33.5-dev.cb045a79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-db",
-  "version": "2.33.5-dev.b9f5bea6",
+  "version": "2.33.5-dev.cb045a79",
   "description": "ECHO database.",
   "license": "MIT",
   "main": "dist/src/index.js",
@@ -10,22 +10,22 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "2.33.5-dev.b9f5bea6",
-    "@dxos/codec-protobuf": "2.33.5-dev.b9f5bea6",
-    "@dxos/credentials": "2.33.5-dev.b9f5bea6",
-    "@dxos/crypto": "2.33.5-dev.b9f5bea6",
-    "@dxos/debug": "2.33.5-dev.b9f5bea6",
-    "@dxos/echo-protocol": "2.33.5-dev.b9f5bea6",
-    "@dxos/feed-store": "2.33.5-dev.b9f5bea6",
-    "@dxos/mesh-protocol": "2.33.5-dev.b9f5bea6",
-    "@dxos/model-factory": "2.33.5-dev.b9f5bea6",
-    "@dxos/network-manager": "2.33.5-dev.b9f5bea6",
-    "@dxos/object-model": "2.33.5-dev.b9f5bea6",
-    "@dxos/protocol-plugin-presence": "2.33.5-dev.b9f5bea6",
-    "@dxos/protocol-plugin-replicator": "2.33.5-dev.b9f5bea6",
-    "@dxos/protocols": "2.33.5-dev.b9f5bea6",
-    "@dxos/random-access-multi-storage": "2.33.5-dev.b9f5bea6",
-    "@dxos/util": "2.33.5-dev.b9f5bea6",
+    "@dxos/async": "2.33.5-dev.cb045a79",
+    "@dxos/codec-protobuf": "2.33.5-dev.cb045a79",
+    "@dxos/credentials": "2.33.5-dev.cb045a79",
+    "@dxos/crypto": "2.33.5-dev.cb045a79",
+    "@dxos/debug": "2.33.5-dev.cb045a79",
+    "@dxos/echo-protocol": "2.33.5-dev.cb045a79",
+    "@dxos/feed-store": "2.33.5-dev.cb045a79",
+    "@dxos/mesh-protocol": "2.33.5-dev.cb045a79",
+    "@dxos/model-factory": "2.33.5-dev.cb045a79",
+    "@dxos/network-manager": "2.33.5-dev.cb045a79",
+    "@dxos/object-model": "2.33.5-dev.cb045a79",
+    "@dxos/protocol-plugin-presence": "2.33.5-dev.cb045a79",
+    "@dxos/protocol-plugin-replicator": "2.33.5-dev.cb045a79",
+    "@dxos/protocols": "2.33.5-dev.cb045a79",
+    "@dxos/random-access-multi-storage": "2.33.5-dev.cb045a79",
+    "@dxos/util": "2.33.5-dev.cb045a79",
     "base-x": "~3.0.9",
     "buffer-json-encoding": "^1.0.2",
     "debug": "^4.3.3",
@@ -56,7 +56,7 @@
     "faker": "^5.1.0",
     "memdown": "^5.1.0",
     "mocha": "~8.4.0",
-    "typescript": "^4.5.2"
+    "typescript": "^4.7.2"
   },
   "publishConfig": {
     "access": "public"

package/src/echo.test.ts

@@ -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);
 

package/src/echo.ts

@@ -143,6 +143,7 @@ export class ECHO {
       this._modelFactory,
       this._snapshotStore,
       feedProviderFactory,
+      this._metadataStore,
       options
     );
 

package/src/halo/halo-factory.ts

@@ -22,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 {
@@ -50,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 (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,
-      feedHints,
+      [...feedHints, writableFeed.key],
       undefined,
       this._options
     );

package/src/halo/halo-party.ts

@@ -14,7 +14,7 @@ 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;
 
@@ -56,9 +56,9 @@ export class HaloParty {
     private readonly _networkManager: NetworkManager,
     private readonly _feedHints: PublicKey[] = [],
     private readonly _initialTimeframe: Timeframe | undefined,
-    _options: PartyOptions
+    _options: PipelineOptions
   ) {
-    this._partyCore = new PartyCore(
+    this._partyCore = new PartyPipeline(
       _credentialsSigner.getIdentityKey().publicKey,
       _feedProvider,
       modelFactory,

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/packlets/database/data-mirror.test.ts

@@ -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/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/packlets/database/item-demuxer.test.ts

@@ -9,8 +9,7 @@ import { it as test } from 'mocha';
 import { latch } from '@dxos/async';
 import { createId, PublicKey } from '@dxos/crypto';
 import { checkType } from '@dxos/debug';
-import { createMockFeedWriterFromStream, EchoEnvelope, IEchoStream, MockFeedWriter, Timeframe } from '@dxos/echo-protocol';
-import { createTransform } from '@dxos/feed-store';
+import { EchoEnvelope, MockFeedWriter, Timeframe } from '@dxos/echo-protocol';
 import { ModelFactory, TestModel } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
 
@@ -32,7 +31,7 @@ describe('Item demuxer', () => {
     const itemDemuxer = new ItemDemuxer(itemManager, modelFactory);
 
     const inboundStream = itemDemuxer.open();
-    feedWriter.written.on(([msg, meta]) => inboundStream.write({
+    feedWriter.written.on(([msg, meta]) => inboundStream({
       data: msg,
       meta: { ...meta, memberKey }
     } as any));
@@ -96,28 +95,31 @@ describe('Item demuxer', () => {
     const modelFactory = new ModelFactory()
       .registerModel(ObjectModel);
 
-    const writeStream = createTransform<EchoEnvelope, IEchoStream>(
-      async (message: EchoEnvelope): Promise<IEchoStream> => ({
-        meta: {
-          feedKey: PublicKey.random(),
-          memberKey: PublicKey.random(),
-          seq: 0,
-          timeframe: new Timeframe()
-        },
-        data: message
-      })
-    );
-    const itemManager = new ItemManager(modelFactory, PublicKey.random(), createMockFeedWriterFromStream(writeStream));
+    const itemManager = new ItemManager(modelFactory, PublicKey.random(), {
+      write: async (message) => {
+        void processEchoMessage(message);
+        return { feedKey: PublicKey.random(), seq: 0 };
+      }
+    });
     const itemDemuxer = new ItemDemuxer(itemManager, modelFactory);
-    writeStream.pipe(itemDemuxer.open());
+    const processor = itemDemuxer.open();
+    const processEchoMessage = (message: EchoEnvelope) => processor({
+      meta: {
+        feedKey: PublicKey.random(),
+        memberKey: PublicKey.random(),
+        seq: 0,
+        timeframe: new Timeframe()
+      },
+      data: message
+    });
 
-    writeStream.write(checkType<EchoEnvelope>({
+    void processEchoMessage(checkType<EchoEnvelope>({
       itemId: 'foo',
       genesis: {
         modelType: TestModel.meta.type
       }
     }));
-    writeStream.write(checkType<EchoEnvelope>({
+    void processEchoMessage(checkType<EchoEnvelope>({
       itemId: 'bar',
       genesis: {
         modelType: ObjectModel.meta.type

package/src/packlets/database/item-demuxer.ts

@@ -8,7 +8,6 @@ import debug from 'debug';
 import { Event } from '@dxos/async';
 import { failUndefined } from '@dxos/debug';
 import { DatabaseSnapshot, IEchoStream, ItemID, ItemSnapshot, LinkSnapshot } from '@dxos/echo-protocol';
-import { createWritable } from '@dxos/feed-store';
 import { Model, ModelFactory, ModelMessage } from '@dxos/model-factory';
 
 import { Entity } from './entity';
@@ -22,6 +21,8 @@ export interface ItemDemuxerOptions {
   snapshots?: boolean
 }
 
+export type EchoProcessor = (message: IEchoStream) => Promise<void>
+
 /**
  * Creates a stream that consumes `IEchoStream` messages and routes them to the associated items.
  * @param itemManager
@@ -35,7 +36,7 @@ export class ItemDemuxer {
     private readonly _options: ItemDemuxerOptions = {}
   ) {}
 
-  open (): NodeJS.WritableStream {
+  open (): EchoProcessor {
     this._modelFactory.registered.on(async model => {
       for (const item of this._itemManager.getUninitializedEntities()) {
         if (item._stateManager.modelType === model.meta.type) {
@@ -46,7 +47,7 @@ export class ItemDemuxer {
 
     // TODO(burdon): Factor out.
     // TODO(burdon): Should this implement some "back-pressure" (hints) to the PartyProcessor?
-    return createWritable<IEchoStream>(async (message: IEchoStream) => {
+    return async (message: IEchoStream) => {
       const { data: { itemId, genesis, itemMutation, mutation, snapshot }, meta } = message;
       assert(itemId);
 
@@ -111,7 +112,7 @@ export class ItemDemuxer {
       }
 
       this.mutation.emit(message);
-    });
+    };
   }
 
   createSnapshot (): DatabaseSnapshot {

package/src/packlets/database/testing.ts

@@ -2,8 +2,6 @@
 // Copyright 2021 DXOS.org
 //
 
-import { Readable } from 'stream';
-
 import { PublicKey } from '@dxos/crypto';
 import { EchoEnvelope, MockFeedWriter, Timeframe } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
@@ -15,12 +13,11 @@ import { FeedDatabaseBackend, RemoteDatabaseBackend } from './database-backend';
 
 export const createInMemoryDatabase = async (modelFactory: ModelFactory) => {
   const feed = new MockFeedWriter<EchoEnvelope>();
-  const inboundStream = new Readable({ read: () => {}, objectMode: true });
-  feed.written.on(([data, meta]) => inboundStream.push({ data, meta: { ...meta, memberKey: PublicKey.random(), timeframe: new Timeframe([[meta.feedKey, meta.seq]]) } }));
-
+  const backend = new FeedDatabaseBackend(feed, undefined, { snapshots: true });
+  feed.written.on(([data, meta]) => backend.echoProcessor({ data, meta: { ...meta, memberKey: PublicKey.random(), timeframe: new Timeframe([[meta.feedKey, meta.seq]]) } }));
   const database = new Database(
     modelFactory,
-    new FeedDatabaseBackend(inboundStream, feed, undefined, { snapshots: true }),
+    backend,
     PublicKey.random()
   );
 

package/src/packlets/database/timeframe-clock.ts

@@ -28,4 +28,8 @@ export class TimeframeClock {
     const gaps = Timeframe.dependencies(timeframe, this._timeframe);
     return !gaps.isEmpty();
   }
+
+  async waitUntilReached (target: Timeframe) {
+    await this.update.waitForCondition(() => Timeframe.dependencies(target, this._timeframe).isEmpty());
+  }
 }

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

@@ -31,17 +31,20 @@ describe('DataParty', () => {
     const modelFactory = new ModelFactory().registerModel(ObjectModel);
     const networkManager = new NetworkManager();
     const partyFeedProvider = new PartyFeedProvider(metadataStore, identity.keyring, feedStore, partyKey);
+    const writableFeed = await partyFeedProvider.createOrOpenWritableFeed();
 
-    return new DataParty(
+    const party = new DataParty(
       partyKey,
       modelFactory,
       snapshotStore,
       partyFeedProvider,
+      metadataStore,
       identity.createCredentialsSigner(),
       identity.preferences,
-      networkManager,
-      feedHints
+      networkManager
     );
+    party._setFeedHints([...feedHints, writableFeed.key]);
+    return party;
   };
 
   test('open & close', async () => {
@@ -74,6 +77,33 @@ describe('DataParty', () => {
     await party.close();
   });
 
+  test('data is immediately available after re-opening', async () => {
+    const keyring = new Keyring();
+    const identity = await createTestIdentityCredentials(keyring);
+    const partyKey = await keyring.createKeyRecord({ type: KeyType.PARTY });
+    const party = await createParty(identity, partyKey.publicKey, []);
+    await party.open();
+
+    const feed = await party.getWriteFeed();
+    await party.credentialsWriter.write(createPartyGenesisMessage(
+      keyring,
+      partyKey,
+      feed.key,
+      partyKey
+    ));
+
+    for (let i = 0; i < 10; i++) {
+      await party.database.createItem({ type: 'test:item' });
+    }
+
+    await party.close();
+    await party.open();
+
+    expect(party.database.select({ type: 'test:item' }).exec().entities).toHaveLength(10);
+
+    await party.close();
+  });
+
   test('authenticates its own credentials', async () => {
     const keyring = new Keyring();
     const identity = await createTestIdentityCredentials(keyring);

package/src/parties/data-party.ts

@@ -17,7 +17,7 @@ import { ResultSet } from '../api';
 import { ActivationOptions, PartyPreferences, Preferences } from '../halo';
 import { InvitationFactory } from '../invitations';
 import { Database, Item } from '../packlets/database';
-import { PartyFeedProvider, PartyProtocolFactory, PartyCore, PartyOptions } from '../pipeline';
+import { PartyFeedProvider, PartyProtocolFactory, PartyPipeline, PipelineOptions, MetadataStore } from '../pipeline';
 import { createAuthPlugin, createOfflineInvitationPlugin, createAuthenticator, createCredentialsProvider } from '../protocol';
 import { CredentialsSigner } from '../protocol/credentials-signer';
 import { createReplicatorPlugin } from '../protocol/replicator-plugin';
@@ -42,25 +42,26 @@ export interface PartyMember {
 export class DataParty {
   public readonly update = new Event<void>();
 
-  private readonly _partyCore: PartyCore;
+  private readonly _partyCore: PartyPipeline;
   private readonly _preferences?: PartyPreferences;
   private _invitationManager?: InvitationFactory;
   private _protocol?: PartyProtocolFactory;
+  private _feedHints: PublicKey[] = []
 
   constructor (
     partyKey: PartyKey,
     modelFactory: ModelFactory,
     snapshotStore: SnapshotStore,
     private readonly _feedProvider: PartyFeedProvider,
+    private readonly _metadataStore: MetadataStore,
     private readonly _credentialsSigner: CredentialsSigner,
     // TODO(dmaretskyi): Pull this out to a higher level. Should preferences be part of client API instead?
     private readonly _profilePreferences: Preferences | undefined,
     private readonly _networkManager: NetworkManager,
-    private readonly _feedHints: PublicKey[] = [],
     private readonly _initialTimeframe?: Timeframe,
-    _options: PartyOptions = {}
+    _options: PipelineOptions = {}
   ) {
-    this._partyCore = new PartyCore(
+    this._partyCore = new PartyPipeline(
       partyKey,
       _feedProvider,
       modelFactory,
@@ -140,6 +141,13 @@ export class DataParty {
     await this._preferences?.setLastKnownTitle(title);
   }
 
+  /**
+   * @internal
+   */
+  _setFeedHints (feedHints: PublicKey[]) {
+    this._feedHints = feedHints;
+  }
+
   /**
    * Opens the pipeline and connects the streams.
    */
@@ -150,9 +158,19 @@ export class DataParty {
       return this;
     }
 
+    // TODO(dmaretskyi): May be undefined in some tests.
+    const party = this._metadataStore.getParty(this._partyCore.key);
+
     await this._partyCore.open({
       feedHints: this._feedHints,
-      initialTimeframe: this._initialTimeframe
+      initialTimeframe: this._initialTimeframe,
+      targetTimeframe: party?.latestTimeframe
+    });
+
+    // Keep updating latest reached timeframe in the metadata.
+    // This timeframe will be waited for when opening the party next time.
+    this._partyCore.timeframeUpdate.on(timeframe => {
+      void this._metadataStore.setTimeframe(this._partyCore.key, timeframe);
     });
 
     this._invitationManager = new InvitationFactory(
@@ -198,6 +216,9 @@ export class DataParty {
       return this;
     }
 
+    // Save the latest reached timeframe.
+    await this._metadataStore.setTimeframe(this._partyCore.key, this._partyCore.timeframe);
+
     await this._partyCore.close();
     await this._protocol?.stop();
 

package/src/parties/party-factory.ts

@@ -25,7 +25,7 @@ import {
   GreetingInitiator, InvitationDescriptor, InvitationDescriptorType, OfflineInvitationClaimer
 } from '../invitations';
 import { IdentityNotInitializedError } from '../packlets/errors';
-import { PartyFeedProvider, PartyOptions } from '../pipeline';
+import { MetadataStore, PartyFeedProvider, PipelineOptions } from '../pipeline';
 import { IdentityCredentialsProvider } from '../protocol/identity-credentials';
 import { SnapshotStore } from '../snapshots';
 import { DataParty, PARTY_ITEM_TYPE } from './data-party';
@@ -42,7 +42,8 @@ export class PartyFactory {
     private readonly _modelFactory: ModelFactory,
     private readonly _snapshotStore: SnapshotStore,
     private readonly _feedProviderFactory: (partyKey: PublicKey) => PartyFeedProvider,
-    private readonly _options: PartyOptions = {}
+    private readonly _metadataStore: MetadataStore,
+    private readonly _options: PipelineOptions = {}
   ) {}
 
   /**
@@ -56,11 +57,13 @@ export class PartyFactory {
     const partyKey = await identity.keyring.createKeyRecord({ type: KeyType.PARTY });
     const party = await this.constructParty(partyKey.publicKey);
 
+    const writableFeed = await party.getWriteFeed();
+    // Hint at the newly created writable feed so that we can start replicating from it.
+    party._setFeedHints([writableFeed.key]);
+
     // Connect the pipeline.
     await party.open();
 
-    const writableFeed = await party.getWriteFeed();
-
     // PartyGenesis (self-signed by Party).
     await party.credentialsWriter.write(createPartyGenesisMessage(
       identity.keyring,
@@ -110,12 +113,9 @@ export class PartyFactory {
    * @param partyKey
    * @param hints
    */
-  async constructParty (partyKey: PartyKey, feedHints: PublicKey[] = [], initialTimeframe?: Timeframe) {
+  async constructParty (partyKey: PartyKey, initialTimeframe?: Timeframe) {
     const identity = this._identityProvider() ?? raise(new IdentityNotInitializedError());
 
-    // TODO(marik-d): Support read-only parties if this feed doesn't exist?
-    const feedProvider = this._feedProviderFactory(partyKey);
-
     //
     // Create the party.
     //
@@ -123,11 +123,11 @@ export class PartyFactory {
       partyKey,
       this._modelFactory,
       this._snapshotStore,
-      feedProvider,
+      this._feedProviderFactory(partyKey),
+      this._metadataStore,
       identity.createCredentialsSigner(),
       identity.preferences,
       this._networkManager,
-      feedHints,
       initialTimeframe,
       this._options
     );
@@ -139,7 +139,7 @@ export class PartyFactory {
     assert(snapshot.partyKey);
     log(`Constructing ${humanize(snapshot.partyKey)} from snapshot at ${JSON.stringify(snapshot.timeframe)}.`);
 
-    const party = await this.constructParty(PublicKey.from(snapshot.partyKey), [], snapshot.timeframe);
+    const party = await this.constructParty(PublicKey.from(snapshot.partyKey), snapshot.timeframe);
     await party.restoreFromSnapshot(snapshot);
     return party;
   }
@@ -172,7 +172,8 @@ export class PartyFactory {
 
     await initiator.connect();
     const { partyKey, hints } = await initiator.redeemInvitation(secretProvider);
-    const party = await this.constructParty(partyKey, hints);
+    const party = await this.constructParty(partyKey);
+    party._setFeedHints(hints);
     await party.open();
     await initiator.destroy();
 
@@ -197,11 +198,13 @@ export class PartyFactory {
     const partyKey = await identity.keyring.createKeyRecord({ type: KeyType.PARTY });
     const party = await this.constructParty(partyKey.publicKey);
 
+    const writableFeed = await party.getWriteFeed();
+    // Hint at the newly created writable feed so that we can start replicating from it.
+    party._setFeedHints([writableFeed.key]);
+
     // Connect the pipeline.
     await party.open();
 
-    const writableFeed = await party.getWriteFeed();
-
     // PartyGenesis (self-signed by Party).
     await party.credentialsWriter.write(createPartyGenesisMessage(
       identity.keyring,

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

@@ -71,6 +71,7 @@ const setup = async () => {
     modelFactory,
     snapshotStore,
     feedProviderFactory,
+    metadataStore,
     {
       writeLogger: messageLogger('<<<'),
       readLogger: messageLogger('>>>')
@@ -161,7 +162,8 @@ describe('Party manager', () => {
       networkManager,
       modelFactory,
       snapshotStore,
-      feedProviderFactory
+      feedProviderFactory,
+      metadataStore
     );
     const partyManager = new PartyManager(metadataStore, snapshotStore, () => identity, partyFactory);
 

package/src/parties/party-manager.ts

@@ -9,7 +9,7 @@ import unionWith from 'lodash.unionwith';
 import { Event, synchronized } from '@dxos/async';
 import { KeyHint, KeyType, SecretProvider } from '@dxos/credentials';
 import { PublicKey } from '@dxos/crypto';
-import { timed } from '@dxos/debug';
+import { failUndefined, timed } from '@dxos/debug';
 import { PartyKey, PartySnapshot } from '@dxos/echo-protocol';
 import { ComplexMap, boolGuard } from '@dxos/util';
 
@@ -94,9 +94,13 @@ export class PartyManager {
       const partyKey = partyKeys[i];
       if (!this._parties.has(partyKey)) {
         const snapshot = await this._snapshotStore.load(partyKey);
+
+        const metadata = this._metadataStore.getParty(partyKey) ?? failUndefined();
+
         const party = snapshot
           ? await this._partyFactory.constructPartyFromSnapshot(snapshot)
           : await this._partyFactory.constructParty(partyKey);
+        party._setFeedHints(metadata.feedKeys ?? []);
 
         const isActive = identity?.preferences?.isPartyActive(partyKey) ?? true;
         if (isActive) {
@@ -173,7 +177,8 @@ export class PartyManager {
     }
 
     log(`Adding party partyKey=${partyKey.toHex()} hints=${feedHints.length}`);
-    const party = await this._partyFactory.constructParty(partyKey, feedHints);
+    const party = await this._partyFactory.constructParty(partyKey);
+    party._setFeedHints(feedHints);
     await party.open();
     await this._metadataStore.addParty(party.key);
     this._setParty(party);