@dxos/echo-db 2.33.1-dev.83d113fe → 2.33.1-dev.eb88db79

package/src/parties/party-internal.ts

@@ -5,7 +5,7 @@
 import assert from 'assert';
 
 import { synchronized, Event } from '@dxos/async';
-import { KeyHint, createAuthMessage, Authenticator } from '@dxos/credentials';
+import { KeyHint, createAuthMessage, createFeedAdmitMessage, codec } from '@dxos/credentials';
 import { PublicKey } from '@dxos/crypto';
 import { failUndefined, raise, timed } from '@dxos/debug';
 import { PartyKey, PartySnapshot, Timeframe, FeedKey } from '@dxos/echo-protocol';
@@ -19,6 +19,7 @@ import { ActivationOptions, PartyPreferences, IdentityProvider } from '../halo';
 import { InvitationManager } from '../invitations';
 import { CredentialsProvider, PartyFeedProvider, PartyProtocolFactory } from '../pipeline';
 import { SnapshotStore } from '../snapshots';
+import { createAuthenticator } from './authenticator';
 import { PartyCore, PartyOptions } from './party-core';
 import { CONTACT_DEBOUNCE_INTERVAL } from './party-manager';
 
@@ -178,7 +179,7 @@ export class PartyInternal {
       this._identityProvider,
       this._createCredentialsProvider(this._partyCore.key, writeFeed.key),
       this._invitationManager,
-      this._partyCore.processor.authenticator,
+      createAuthenticator(this._partyCore.processor, this._identityProvider),
       this._partyCore.processor.getActiveFeedSet()
     );
 
@@ -274,12 +275,20 @@ export class PartyInternal {
     return {
       get: () => {
         const identity = this._identityProvider();
-        return Buffer.from(Authenticator.encodePayload(createAuthMessage(
+        const signingKey = identity.deviceKeyChain ?? identity.deviceKey ?? raise(new IdentityNotInitializedError());
+        return Buffer.from(codec.encode(createAuthMessage(
           identity.signer,
           partyKey,
           identity.identityKey ?? raise(new IdentityNotInitializedError()),
-          identity.deviceKeyChain ?? identity.deviceKey ?? raise(new IdentityNotInitializedError()),
-          identity.keyring.getKey(feedKey)
+          signingKey,
+          identity.keyring.getKey(feedKey),
+          undefined,
+          createFeedAdmitMessage(
+            identity.signer,
+            partyKey,
+            feedKey,
+            [identity.keyring.getKey(feedKey) ?? failUndefined(), signingKey]
+          )
         )));
       }
     };
@@ -292,15 +301,20 @@ export class PartyInternal {
     assert(this.isOpen, 'Party is not open.');
     return new ResultSet(
       this.processor.keyOrInfoAdded.debounce(CONTACT_DEBOUNCE_INTERVAL).discardParameter(),
-      () => this.processor.memberKeys
-        .filter(publicKey => !this.processor.partyKey.equals(publicKey))
-        .map((publicKey: PublicKey): PartyMember => {
-          const displayName = this.processor.getMemberInfo(publicKey)?.displayName;
-          return {
-            publicKey,
-            displayName
-          };
-        })
+      () => {
+        if (!this.isOpen) {
+          return [];
+        }
+        return this.processor.memberKeys
+          .filter(publicKey => !this.processor.partyKey.equals(publicKey))
+          .map((publicKey: PublicKey): PartyMember => {
+            const displayName = this.processor.getMemberInfo(publicKey)?.displayName;
+            return {
+              publicKey,
+              displayName
+            };
+          });
+      }
     );
   }
 }

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

@@ -29,7 +29,7 @@ import { createWritableFeedStream, FeedStore } from '@dxos/feed-store';
 import { ModelFactory } from '@dxos/model-factory';
 import { NetworkManager } from '@dxos/network-manager';
 import { ObjectModel } from '@dxos/object-model';
-import { createStorage, STORAGE_RAM } from '@dxos/random-access-multi-storage';
+import { createStorage, StorageType } from '@dxos/random-access-multi-storage';
 import { afterTest } from '@dxos/testutils';
 
 import { Item } from '../api';
@@ -58,7 +58,7 @@ const log = debug('dxos:echo:parties:party-manager:test');
 const setup = async (open = true, createIdentity = true) => {
   const keyring = new Keyring();
   const metadataStore = new MetadataStore(createRamStorage());
-  const feedStore = new FeedStore(createStorage('', STORAGE_RAM), { valueEncoding: codec });
+  const feedStore = new FeedStore(createStorage('', StorageType.RAM), { valueEncoding: codec });
 
   let seedPhrase;
   if (createIdentity) {
@@ -73,7 +73,7 @@ const setup = async (open = true, createIdentity = true) => {
     assert(keyring.keys.length === 1);
   }
 
-  const snapshotStore = new SnapshotStore(createStorage('', STORAGE_RAM));
+  const snapshotStore = new SnapshotStore(createStorage('', StorageType.RAM));
   const modelFactory = new ModelFactory().registerModel(ObjectModel);
   const networkManager = new NetworkManager();
   const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(metadataStore, keyring, feedStore, partyKey);
@@ -179,7 +179,7 @@ describe('Party manager', () => {
   });
 
   test('Create from cold start', async () => {
-    const storage = createStorage('', STORAGE_RAM);
+    const storage = createStorage('', StorageType.RAM);
     const feedStore = new FeedStore(storage, { valueEncoding: codec });
 
     const keyring = new Keyring();
@@ -189,7 +189,7 @@ describe('Party manager', () => {
     await keyring.createKeyRecord({ type: KeyType.DEVICE });
 
     const modelFactory = new ModelFactory().registerModel(ObjectModel);
-    const snapshotStore = new SnapshotStore(createStorage('', STORAGE_RAM));
+    const snapshotStore = new SnapshotStore(createStorage('', StorageType.RAM));
     const networkManager = new NetworkManager();
     const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(metadataStore, keyring, feedStore, partyKey);
     const partyFactory: PartyFactory = new PartyFactory(() => identityManager.identity, networkManager, modelFactory, snapshotStore, feedProviderFactory);

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

@@ -36,7 +36,7 @@ describe('party-processor', () => {
 
     const message: IHaloStream = {
       meta: {
-        feedKey: feedKey.publicKey.asUint8Array(),
+        feedKey: feedKey.publicKey,
         seq: 0
         // TODO(telackey): Should ownership data go here?
       },
@@ -67,7 +67,7 @@ describe('party-processor', () => {
 
     const genesisMessage: IHaloStream = {
       meta: {
-        feedKey: feedKey.publicKey.asUint8Array(),
+        feedKey: feedKey.publicKey,
         seq: 0
         // TODO(telackey): Should ownership data go here?
       },
@@ -78,7 +78,7 @@ describe('party-processor', () => {
     const feedKey2 = await keyring.createKeyRecord({ type: KeyType.FEED });
     const feedAdmit: IHaloStream = {
       meta: {
-        feedKey: feedKey.publicKey.asUint8Array(),
+        feedKey: feedKey.publicKey,
         seq: 0
         // TODO(telackey): Should ownership data go here?
       },
@@ -106,7 +106,7 @@ describe('party-processor', () => {
 
     const genesisMessage: IHaloStream = {
       meta: {
-        feedKey: feedKey.publicKey.asUint8Array(),
+        feedKey: feedKey.publicKey,
         seq: 0
         // TODO(telackey): Should ownership data go here?
       },
@@ -115,7 +115,7 @@ describe('party-processor', () => {
     await partyProcessor.processMessage(genesisMessage);
     const feedAdmit: IHaloStream = {
       meta: {
-        feedKey: feedKey.publicKey.asUint8Array(),
+        feedKey: feedKey.publicKey,
         seq: 0
         // TODO(telackey): Should ownership data go here?
       },
@@ -129,7 +129,7 @@ describe('party-processor', () => {
 
     const keyAdmit: IHaloStream = {
       meta: {
-        feedKey: feedKey.publicKey.asUint8Array(),
+        feedKey: feedKey.publicKey,
         seq: 1
       },
       data: createEnvelopeMessage(keyring, partyKey.publicKey,
@@ -141,7 +141,7 @@ describe('party-processor', () => {
 
     const feedAdmit2: IHaloStream = {
       meta: {
-        feedKey: feedKey.publicKey.asUint8Array(),
+        feedKey: feedKey.publicKey,
         seq: 1
         // TODO(telackey): Should ownership data go here?
       },
@@ -170,7 +170,7 @@ describe('party-processor', () => {
     const partyProcessor = new PartyProcessor(partyKey.publicKey);
     expect(partyProcessor.partyKey).toBeTruthy();
 
-    const meta = (seq: number) => ({ feedKey: feedKey.publicKey.asUint8Array(), seq });
+    const meta = (seq: number) => ({ feedKey: feedKey.publicKey, seq });
 
     await partyProcessor.processMessage({
       meta: meta(0),

package/src/pipeline/party-processor.ts

@@ -7,11 +7,9 @@ import debug from 'debug';
 
 import { Event } from '@dxos/async';
 import {
-  Authenticator,
   KeyHint,
   KeyRecord,
   PartyState,
-  PartyAuthenticator,
   Message as HaloMessage,
   IdentityEventType,
   PartyEventType
@@ -32,11 +30,10 @@ export interface FeedSetProvider {
  */
 export class PartyProcessor {
   private readonly _state: PartyState;
-  private readonly _authenticator: Authenticator;
 
   private _outboundHaloStream: FeedWriter<HaloMessage> | undefined;
 
-  protected readonly _feedAdded = new Event<FeedKey>()
+  readonly feedAdded = new Event<FeedKey>()
 
   public readonly keyOrInfoAdded = new Event<PublicKey>();
 
@@ -49,21 +46,14 @@ export class PartyProcessor {
     private readonly _partyKey: PartyKey
   ) {
     this._state = new PartyState(this._partyKey);
-    this._authenticator = new PartyAuthenticator(this._state);
-
-    /* TODO(telackey): `@dxos/credentials` was only half converted to TS. In its current state, the KeyRecord type
-     * is not exported, and the PartyStateMachine being used is not properly understood as an EventEmitter by TS.
-     * Casting to 'any' is a workaround for the compiler, but the fix is fully to convert @dxos/credentials to TS.
-     */
-    const state = this._state as any;
 
     // TODO(marik-d): Use `Event.wrap` here.
-    state.on(PartyEventType.ADMIT_FEED, (keyRecord: any) => {
+    this._state.on(PartyEventType.ADMIT_FEED, (keyRecord: any) => {
       log(`Feed key admitted ${keyRecord.publicKey.toHex()}`);
-      this._feedAdded.emit(keyRecord.publicKey);
+      this.feedAdded.emit(keyRecord.publicKey);
     });
-    state.on(PartyEventType.ADMIT_KEY, (keyRecord: KeyRecord) => this.keyOrInfoAdded.emit(keyRecord.publicKey));
-    state.on(IdentityEventType.UPDATE_IDENTITY, (publicKey: PublicKey) => this.keyOrInfoAdded.emit(publicKey));
+    this._state.on(PartyEventType.ADMIT_KEY, (keyRecord: KeyRecord) => this.keyOrInfoAdded.emit(keyRecord.publicKey));
+    this._state.on(IdentityEventType.UPDATE_IDENTITY, (publicKey: PublicKey) => this.keyOrInfoAdded.emit(publicKey));
   }
 
   get partyKey () {
@@ -90,8 +80,8 @@ export class PartyProcessor {
     return this._state.credentialMessages.size === 0;
   }
 
-  get authenticator () {
-    return this._authenticator;
+  get state () {
+    return this._state;
   }
 
   isFeedAdmitted (feedKey: FeedKey) {
@@ -122,7 +112,7 @@ export class PartyProcessor {
   getActiveFeedSet (): FeedSetProvider {
     return {
       get: () => this.feedKeys,
-      added: this._feedAdded
+      added: this.feedAdded
     };
   }
 

package/src/pipeline/party-protocol-factory.ts

@@ -144,7 +144,7 @@ export class PartyProtocolFactory {
 /**
  * Creates the protocol plugin for feed replication.
  */
-class ReplicatorProtocolPluginFactory {
+export class ReplicatorProtocolPluginFactory {
   constructor (
     private readonly _feedProvider: PartyFeedProvider,
     private readonly _activeFeeds: FeedSetProvider

package/src/pipeline/pipeline.test.ts

@@ -12,7 +12,7 @@ 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 { createSetPropertyMutation } from '@dxos/model-factory';
-import { createStorage, STORAGE_RAM } from '@dxos/random-access-multi-storage';
+import { createStorage, StorageType } from '@dxos/random-access-multi-storage';
 import { jsonReplacer } from '@dxos/util';
 
 import { TimeframeClock } from '../database';
@@ -24,7 +24,7 @@ const log = debug('dxos:echo:pipeline:test');
 // TODO(burdon): Test read-only.
 describe('pipeline', () => {
   test('streams', async () => {
-    const storage = createStorage('', STORAGE_RAM);
+    const storage = createStorage('', StorageType.RAM);
     const feedStore = new FeedStore(storage, { valueEncoding: codec });
     const feedKeys: Uint8Array[] = [];
     const feedSelector: FeedSelector = descriptor => !!feedKeys.find(key => descriptor.key.equals(key));
@@ -52,7 +52,7 @@ describe('pipeline', () => {
     await partyProcessor.processMessage({
       data: createPartyGenesisMessage(keyring, partyKey, feedKey.publicKey, identityKey),
       meta: {
-        feedKey: feedKey.publicKey.asBuffer(),
+        feedKey: feedKey.publicKey,
         seq: 0
       }
     });
@@ -86,7 +86,7 @@ describe('pipeline', () => {
   });
 
   test('writing', async () => {
-    const storage = createStorage('', STORAGE_RAM);
+    const storage = createStorage('', StorageType.RAM);
     const feedStore = new FeedStore(storage, { valueEncoding: codec });
     const feedReadStream = new FeedStoreIterator(() => true, () => 0, new Timeframe());
 

package/src/pipeline/pipeline.ts

@@ -141,7 +141,7 @@ export class Pipeline {
                 meta: {
                   seq: block.seq,
                   feedKey: block.key,
-                  memberKey: memberKey.asUint8Array(),
+                  memberKey,
                   timeframe: message.echo.timeframe ?? new Timeframe()
                 },
                 data: message.echo

package/src/util/persistant-ram-storage.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import { createStorage, IFile, IStorage } from '@dxos/random-access-multi-storage';
+import { StorageType, createStorage, File, IStorage } from '@dxos/random-access-multi-storage';
 
 /**
  * A wrapper around RAM storage that preserves file data when closing and re-opening files.
@@ -10,8 +10,8 @@ import { createStorage, IFile, IStorage } from '@dxos/random-access-multi-storag
 // TODO(burdon): Factor out?
 export function createRamStorage (): IStorage {
   const root = 'snapshots';
-  const storage = createStorage(root, 'ram');
-  const files = new Map<string, IFile>();
+  const storage = createStorage(root, StorageType.RAM);
+  const files = new Map<string, File>();
 
   const fn: any = {};