@dxos/echo-db 2.33.5-dev.97a81dd0 → 2.33.5-dev.bbe0c471

package/src/pipeline/party-core.ts

@@ -8,7 +8,7 @@ import { synchronized } from '@dxos/async';
 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, WriteReceipt } 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';
 
@@ -99,6 +99,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 +152,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
     //
@@ -202,11 +202,6 @@ export class PartyCore {
     return this;
   }
 
-  writeCredentialsMessage (message: HaloMessage): Promise<WriteReceipt> {
-    assert(this._partyProcessor, 'Party not open');
-    return this._partyProcessor?.writeHaloMessage(message);
-  }
-
   /**
    * Create a snapshot of the current state.
    */

package/src/pipeline/party-processor.ts

@@ -16,15 +16,11 @@ import {
   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 CredentialWriter {
-  writeHaloMessage (message: HaloMessage): Promise<WriteReceipt>
-}
-
 export interface CredentialProcessor {
   processMessage (message: IHaloStream): Promise<void>
 }
@@ -47,11 +43,9 @@ export interface PartyStateProvider {
 /**
  * TODO(burdon): Wrapper/Bridge between HALO APIs.
  */
-export class PartyProcessor implements CredentialWriter, CredentialProcessor, PartyStateProvider {
+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>();
@@ -148,16 +142,6 @@ export class PartyProcessor implements CredentialWriter, CredentialProcessor, Pa
     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

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

package/src/protocol/authenticator.test.ts

@@ -6,7 +6,6 @@ import expect from 'expect';
 import { it as test } from 'mocha';
 
 import { createAuthMessage, createKeyAdmitMessage, createPartyGenesisMessage, Keyring, KeyType } from '@dxos/credentials';
-import { MockFeedWriter } from '@dxos/echo-protocol';
 
 import { PartyProcessor } from '../pipeline';
 import { createAuthenticator } from './authenticator';
@@ -23,8 +22,6 @@ describe('authenticator', () => {
     const signer = CredentialsSigner.createDirectDeviceSigner(keyring);
 
     const partyProcessor = new PartyProcessor(partyKey.publicKey);
-    const feed = new MockFeedWriter();
-    partyProcessor.setOutboundStream(feed);
     await partyProcessor.processMessage({
       data: createPartyGenesisMessage(
         keyring,
@@ -53,7 +50,7 @@ describe('authenticator', () => {
       meta: {} as any
     });
 
-    const authenticator = createAuthenticator(partyProcessor, signer);
+    const authenticator = createAuthenticator(partyProcessor, signer, null as any);
     const credential = createAuthMessage(
       keyring,
       partyKey.publicKey,

package/src/protocol/authenticator.ts

@@ -4,18 +4,22 @@
 
 import debug from 'debug';
 
-import { Authenticator, codec, createAuthMessage, createEnvelopeMessage, createFeedAdmitMessage, PartyAuthenticator } from '@dxos/credentials';
-import { FeedKey, PartyKey } from '@dxos/echo-protocol';
+import { Message as HaloMessage, Authenticator, codec, createAuthMessage, createEnvelopeMessage, createFeedAdmitMessage, PartyAuthenticator } from '@dxos/credentials';
+import { FeedKey, FeedWriter, PartyKey } from '@dxos/echo-protocol';
 
 import { PartyProcessor } from '../pipeline';
 import { CredentialsSigner } from './credentials-signer';
 
 const log = debug('dxos:echo-db:authenticator');
 
-export const createAuthenticator = (partyProcessor: PartyProcessor, credentialsSigner: CredentialsSigner): Authenticator => new PartyAuthenticator(partyProcessor.state, async auth => {
+export const createAuthenticator = (
+  partyProcessor: PartyProcessor,
+  credentialsSigner: CredentialsSigner,
+  credentialsWriter: FeedWriter<HaloMessage>
+): Authenticator => new PartyAuthenticator(partyProcessor.state, async auth => {
   if (auth.feedAdmit && auth.feedKey && !partyProcessor.isFeedAdmitted(auth.feedKey)) {
     log(`Admitting feed of authenticated member: ${auth.feedKey}`);
-    await partyProcessor.writeHaloMessage(createEnvelopeMessage(
+    await credentialsWriter.write(createEnvelopeMessage(
       credentialsSigner.signer,
       partyProcessor.partyKey,
       auth.feedAdmit,

package/src/snapshots/snapshot-store.test.ts

@@ -15,7 +15,7 @@ const createPublicKey = () => PublicKey.from(createKeyPair().publicKey);
 
 describe('SnapshotStore', () => {
   test('in-memory', async () => {
-    const store = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
+    const store = new SnapshotStore(createStorage('', StorageType.RAM).directory('snapshots'));
 
     const key1 = createPublicKey();
     const key2 = createPublicKey();

package/src/snapshots/snapshot-store.ts

@@ -7,10 +7,9 @@ import debug from 'debug';
 
 import { keyToString } from '@dxos/crypto';
 import { schema, PartyKey, PartySnapshot } from '@dxos/echo-protocol';
-import { Storage } from '@dxos/random-access-multi-storage';
+import { Directory } from '@dxos/random-access-multi-storage';
 
 const log = debug('dxos:snapshot-store');
-
 /**
  * Stores party snapshots. Takes any `random-access-storage` compatible backend.
  *
@@ -18,11 +17,11 @@ const log = debug('dxos:snapshot-store');
  */
 export class SnapshotStore {
   constructor (
-    private readonly _storage: Storage
+    private readonly _directory: Directory
   ) {}
 
   async load (partyKey: PartyKey): Promise<PartySnapshot | undefined> {
-    const file = this._storage.createOrOpen(partyKey.toHex());
+    const file = this._directory.createOrOpen(partyKey.toHex());
 
     try {
       const { size } = await file.stat();
@@ -45,7 +44,7 @@ export class SnapshotStore {
 
   async save (snapshot: PartySnapshot) {
     assert(snapshot.partyKey);
-    const file = this._storage.createOrOpen(keyToString(snapshot.partyKey), { truncate: true, size: 0 });
+    const file = this._directory.createOrOpen(keyToString(snapshot.partyKey), { truncate: true, size: 0 });
 
     try {
       const data = schema.getCodecForType('dxos.echo.snapshot.PartySnapshot').encode(snapshot);
@@ -60,6 +59,6 @@ export class SnapshotStore {
    */
   async clear () {
     log('Clearing all snapshots..');
-    await this._storage.destroy();
+    await this._directory.destroy();
   }
 }