@dxos/echo-db 2.33.5-dev.ea3876ba → 2.33.5-dev.fee8f5fe

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

@@ -32,8 +32,8 @@ 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';
@@ -55,9 +55,11 @@ const log = debug('dxos:echo:parties:party-manager:test');
  */
 const setup = async () => {
   const keyring = new Keyring();
-  const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
-  const feedStore = new FeedStore(createStorage('feed', StorageType.RAM), { valueEncoding: codec });
-  const snapshotStore = new SnapshotStore(createStorage('snapshots', 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);
@@ -69,6 +71,7 @@ const setup = async () => {
     modelFactory,
     snapshotStore,
     feedProviderFactory,
+    metadataStore,
     {
       writeLogger: messageLogger('<<<'),
       readLogger: messageLogger('>>>')
@@ -138,21 +141,18 @@ describe('Party manager', () => {
     const feedStream = createWritableFeedStream(feed);
     feedStream.write(createPartyGenesisMessage(keyring, partyKey, feedKey.publicKey, identityKey));
 
-    await partyManager.addParty(partyKey.publicKey, [{
-      type: KeyType.FEED,
-      publicKey: PublicKey.from(feed.key)
-    }]);
+    await partyManager.addParty(partyKey.publicKey, [PublicKey.from(feed.key)]);
 
     await update;
   });
 
   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(createStorage('metadata', StorageType.RAM));
+    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('snapshots', StorageType.RAM));
     const networkManager = new NetworkManager();
     const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(metadataStore, keyring, feedStore, partyKey);
 
@@ -162,7 +162,8 @@ describe('Party manager', () => {
       networkManager,
       modelFactory,
       snapshotStore,
-      feedProviderFactory
+      feedProviderFactory,
+      metadataStore
     );
     const partyManager = new PartyManager(metadataStore, snapshotStore, () => identity, partyFactory);
 
@@ -188,15 +189,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

@@ -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) {
@@ -157,11 +161,9 @@ export class PartyManager {
 
   /**
    * Construct a party object and start replicating with the remote peer that created that party.
-   * @param partyKey
-   * @param hints
    */
   @synchronized
-  async addParty (partyKey: PartyKey, hints: KeyHint[] = []) {
+  async addParty (partyKey: PartyKey, feedHints: PublicKey[] = []) {
     assert(this._open, 'PartyManager is not open.');
 
     /*
@@ -174,8 +176,10 @@ export class PartyManager {
       return this._parties.get(partyKey);
     }
 
-    log(`Adding party partyKey=${partyKey.toHex()} hints=${hints.length}`);
-    const party = await this._partyFactory.addParty(partyKey, hints);
+    log(`Adding party partyKey=${partyKey.toHex()} hints=${feedHints.length}`);
+    const party = await this._partyFactory.constructParty(partyKey);
+    party._setFeedHints(feedHints);
+    await party.open();
     await this._metadataStore.addParty(party.key);
     this._setParty(party);
     return party;

package/src/pipeline/{pipeline.test.ts → feed-muxer.test.ts}

@@ -10,22 +10,22 @@ import { waitForCondition, latch } from '@dxos/async';
 import { createPartyGenesisMessage, Keyring, KeyType } from '@dxos/credentials';
 import { createId, createKeyPair, PublicKey } from '@dxos/crypto';
 import { codec, createFeedWriter, FeedSelector, FeedStoreIterator, IEchoStream, Timeframe } from '@dxos/echo-protocol';
-import { FeedStore, createWritableFeedStream, createWritable, WritableArray } from '@dxos/feed-store';
+import { FeedStore, createWritableFeedStream } from '@dxos/feed-store';
 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 { FeedMuxer } from './feed-muxer';
 import { PartyProcessor } from './party-processor';
-import { Pipeline } from './pipeline';
 
 const log = debug('dxos:echo:pipeline:test');
 
 // TODO(burdon): Test read-only.
-describe('pipeline', () => {
+describe('FeedMuxer', () => {
   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());
@@ -56,9 +56,6 @@ describe('pipeline', () => {
         seq: 0
       }
     });
-    const pipeline = new Pipeline(partyProcessor, feedReadStream, new TimeframeClock());
-    const [readStream] = await pipeline.open();
-    expect(readStream).toBeTruthy();
 
     //
     // Pipeline consumer.
@@ -66,10 +63,14 @@ describe('pipeline', () => {
     //
     const numMessages = 5;
     const [counter, updateCounter] = latch(numMessages);
-    readStream.pipe(createWritable<IEchoStream>(async message => {
+    const echoProcessor = async (message: IEchoStream) => {
       log('Processed:', JSON.stringify(message, jsonReplacer, 2));
       updateCounter();
-    }));
+    };
+
+    const pipeline = new FeedMuxer(partyProcessor, feedReadStream, new TimeframeClock());
+    pipeline.setEchoProcessor(echoProcessor);
+    await pipeline.open();
 
     //
     // Write directly to feed store.
@@ -87,7 +88,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();
@@ -105,17 +106,21 @@ describe('pipeline', () => {
     });
 
     const partyProcessor = new PartyProcessor(partyKey.publicKey);
-    const pipeline = new Pipeline(
+
+    const echoMessages: IEchoStream[] = [];
+    const echoProcessor = async (msg: IEchoStream) => {
+      echoMessages.push(msg);
+    };
+
+    const pipeline = new FeedMuxer(
       partyProcessor,
       feedReadStream,
       new TimeframeClock(),
       createFeedWriter(feed)
     );
+    pipeline.setEchoProcessor(echoProcessor);
     await pipeline.open();
 
-    const writable = new WritableArray();
-    pipeline.inboundEchoStream!.pipe(writable);
-
     await pipeline.outboundHaloStream!.write(createPartyGenesisMessage(keyring, partyKey, feedKey.publicKey, identityKey));
     await waitForCondition(() => !partyProcessor.genesisRequired);
 
@@ -126,15 +131,14 @@ describe('pipeline', () => {
       }
     });
 
-    await waitForCondition(() => writable.objects.length === 1);
+    await waitForCondition(() => echoMessages.length === 1);
 
     expect(partyProcessor.genesisRequired).toEqual(false);
-    expect((writable.objects[0] as any).data).toEqual({
+    expect((echoMessages[0] as any).data).toEqual({
       itemId: '123',
       genesis: {
         itemType: 'foo'
-      },
-      timeframe: expect.any(Timeframe)
+      }
     });
   });
 });

package/src/pipeline/{pipeline.ts → feed-muxer.ts}

@@ -4,7 +4,6 @@
 
 import assert from 'assert';
 import debug from 'debug';
-import { Readable } from 'stream';
 
 import { Event } from '@dxos/async';
 import { Message as HaloMessage } from '@dxos/credentials';
@@ -13,11 +12,10 @@ import { checkType } from '@dxos/debug';
 import {
   createFeedMeta, EchoEnvelope, FeedMessage, FeedStoreIterator, FeedWriter, IEchoStream, mapFeedWriter, Timeframe
 } from '@dxos/echo-protocol';
-import { createReadable } from '@dxos/feed-store';
 import { jsonReplacer } from '@dxos/util';
 
-import { TimeframeClock } from '../database';
-import { PartyProcessor } from './party-processor';
+import { EchoProcessor, TimeframeClock } from '../packlets/database';
+import { CredentialProcessor, PartyStateProvider } from './party-processor';
 
 interface Options {
   readLogger?: (msg: any) => void
@@ -28,14 +26,12 @@ const log = debug('dxos:echo-db:pipeline');
 
 /**
  * Manages the inbound and outbound message streams for an individual party.
+ * Reads messages from individual feeds and splits them into ECHO and HALO streams.
  */
-export class Pipeline {
+export class FeedMuxer {
   private readonly _errors = new Event<Error>();
 
-  /**
-   * Messages to be consumed from the pipeline (e.g., mutations to model).
-   */
-  private _inboundEchoStream: Readable | undefined;
+  private _isOpen = false;
 
   /**
    * Messages to write into pipeline (e.g., mutations from model).
@@ -47,6 +43,8 @@ export class Pipeline {
    */
   private _outboundHaloStream: FeedWriter<HaloMessage> | undefined;
 
+  private _echoProcessor: EchoProcessor | undefined
+
   /**
    * @param _partyProcessor Processes HALO messages to update party state.
    * @param _feedStorIterator Inbound messages from the feed store.
@@ -55,29 +53,37 @@ export class Pipeline {
    * @param _options
    */
   constructor (
-    private readonly _partyProcessor: PartyProcessor,
+    private readonly _partyProcessor: CredentialProcessor & PartyStateProvider,
     private readonly _feedStorIterator: FeedStoreIterator,
     private readonly _timeframeClock: TimeframeClock,
     private readonly _feedWriter?: FeedWriter<FeedMessage>,
     private readonly _options: Options = {}
-  ) {}
+  ) {
+    if (this._feedWriter) {
+      const loggingWriter = mapFeedWriter<FeedMessage, FeedMessage>(async msg => {
+        this._options.writeLogger?.(msg);
+        return msg;
+      }, this._feedWriter);
 
-  get partyKey () {
-    return this._partyProcessor.partyKey;
+      this._outboundEchoStream = mapFeedWriter<EchoEnvelope, FeedMessage>(async message => ({
+        timeframe: this._timeframeClock.timeframe,
+        echo: message
+      }), loggingWriter);
+      this._outboundHaloStream = mapFeedWriter<HaloMessage, FeedMessage>(async message => ({
+        timeframe: this._timeframeClock.timeframe,
+        halo: message
+      }), loggingWriter);
+    }
   }
 
   get isOpen () {
-    return this._inboundEchoStream !== undefined;
+    return this._isOpen;
   }
 
   get readOnly () {
     return this._outboundEchoStream === undefined;
   }
 
-  get inboundEchoStream () {
-    return this._inboundEchoStream;
-  }
-
   get outboundEchoStream () {
     return this._outboundEchoStream;
   }
@@ -90,6 +96,10 @@ export class Pipeline {
     return this._errors;
   }
 
+  setEchoProcessor (processor: EchoProcessor) {
+    this._echoProcessor = processor;
+  }
+
   /**
    * Create inbound and outbound pipielines.
    * https://nodejs.org/api/stream.html#stream_stream_pipeline_source_transforms_destination_callback
@@ -100,10 +110,8 @@ export class Pipeline {
    *       Transform(dxos.echo.IEchoEnvelope => dxos.IFeedMessage): update clock
    *         Feed
    */
-  async open (): Promise<[NodeJS.ReadableStream, FeedWriter<EchoEnvelope>?]> {
-    const { readLogger, writeLogger } = this._options;
-
-    this._inboundEchoStream = createReadable();
+  async open (): Promise<FeedWriter<EchoEnvelope> | undefined> {
+    const { readLogger } = this._options;
 
     // This will exit cleanly once FeedStoreIterator is closed.
     setImmediate(async () => {
@@ -129,20 +137,19 @@ export class Pipeline {
           //
 
           if (message.echo) {
-            this._timeframeClock.updateTimeframe(PublicKey.from(block.key), block.seq);
             const memberKey = this._partyProcessor.getFeedOwningMember(PublicKey.from(block.key));
             assert(memberKey, `Ownership of feed ${keyToString(block.key)} could not be determined.`);
 
             // Validate messge.
             const { itemId } = message.echo;
             if (itemId) {
-              assert(this._inboundEchoStream);
-              this._inboundEchoStream.push(checkType<IEchoStream>({
+              assert(this._echoProcessor);
+              await this._echoProcessor(checkType<IEchoStream>({
                 meta: {
                   seq: block.seq,
                   feedKey: block.key,
                   memberKey,
-                  timeframe: message.echo.timeframe ?? new Timeframe()
+                  timeframe: message.timeframe ?? new Timeframe()
                 },
                 data: message.echo
               }));
@@ -153,6 +160,8 @@ export class Pipeline {
             // TODO(burdon): Can we throw and have the pipeline log (without breaking the stream)?
             log(`Skipping invalid message: ${JSON.stringify(message, jsonReplacer)}`);
           }
+
+          this._timeframeClock.updateTimeframe(PublicKey.from(block.key), block.seq);
         } catch (err: any) {
           console.error('Error in message processing.');
           console.error(err);
@@ -160,30 +169,7 @@ export class Pipeline {
       }
     });
 
-    //
-    // Processes outbound messages (piped to the feed).
-    // Sets the current timeframe.
-    //
-    if (this._feedWriter) {
-      const loggingWriter = mapFeedWriter<FeedMessage, FeedMessage>(async msg => {
-        writeLogger?.(msg);
-        return msg;
-      }, this._feedWriter);
-
-      this._outboundEchoStream = mapFeedWriter<EchoEnvelope, FeedMessage>(async message => ({
-        echo: {
-          ...message,
-          timeframe: this._timeframeClock.timeframe
-        }
-      }), loggingWriter);
-      this._outboundHaloStream =
-        mapFeedWriter<HaloMessage, FeedMessage>(async message => ({ halo: message }), loggingWriter);
-    }
-
-    return [
-      this._inboundEchoStream,
-      this._outboundEchoStream
-    ];
+    return this._outboundEchoStream;
   }
 
   /**
@@ -193,11 +179,9 @@ export class Pipeline {
   async close () {
     await this._feedStorIterator.close();
 
-    if (this._inboundEchoStream) {
-      this._inboundEchoStream.destroy();
-      this._inboundEchoStream = undefined;
-    }
-
     this._outboundEchoStream = undefined;
+    this._outboundHaloStream = undefined;
+    this._echoProcessor = undefined;
+    this._isOpen = false;
   }
 }

package/src/pipeline/index.ts

@@ -6,6 +6,6 @@ export * from './message-selector';
 export * from './party-feed-provider';
 export * from './party-processor';
 export * from '../protocol/party-protocol-factory';
-export * from './pipeline';
-export * from './party-core';
+export * from './feed-muxer';
+export * from './party-pipeline';
 export * from './metadata-store';

package/src/pipeline/message-selector.ts

@@ -9,8 +9,8 @@ import { getPartyCredentialMessageType, PartyCredential } from '@dxos/credential
 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,47 +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;
         }
-      }
+      } catch { }
     }
+  }
 
-    // Not ready for this message yet.
-    log('Skipping...');
-  };
-}
+  // Not ready for this message yet.
+  log('Skipping...');
+};

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

@@ -11,7 +11,8 @@ import { MetadataStore } from './metadata-store';
 
 describe('MetadataStore in-memory', () => {
   it('Creates party and adds feeds to it', async () => {
-    const store = new MetadataStore(createStorage('metadata', StorageType.RAM));
+    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(createStorage('metadata', StorageType.RAM));
+    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(createStorage('metadata', StorageType.RAM));
+    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(createStorage('snapshots', StorageType.RAM));
+    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

@@ -7,8 +7,8 @@ import debug from 'debug';
 
 import { PublicKey } from '@dxos/crypto';
 import { failUndefined } from '@dxos/debug';
-import { EchoMetadata, PartyMetadata, schema } from '@dxos/echo-protocol';
-import { Storage } from '@dxos/random-access-multi-storage';
+import { EchoMetadata, PartyMetadata, schema, Timeframe } from '@dxos/echo-protocol';
+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: Storage
+    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.delete();
   }
 
   /**
@@ -158,4 +158,10 @@ export class MetadataStore {
     }
     return !!party.feedKeys?.find(fk => feedKey.equals(fk));
   }
+
+  async setTimeframe (partyKey: PublicKey, timeframe: Timeframe) {
+    const party = this.getParty(partyKey) ?? failUndefined();
+    party.latestTimeframe = timeframe;
+    await this._save();
+  }
 }