@dxos/client-services 0.1.41 → 0.1.45-next.45667d4

package/src/packlets/devtools/feeds.ts

@@ -10,20 +10,16 @@ import {
   SubscribeToFeedsRequest,
   SubscribeToFeedsResponse,
   SubscribeToFeedBlocksRequest,
-  SubscribeToFeedBlocksResponse
+  SubscribeToFeedBlocksResponse,
 } from '@dxos/protocols/proto/dxos/devtools/host';
 import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { ComplexMap } from '@dxos/util';
 
 export const subscribeToFeeds = (
   { feedStore }: { feedStore: FeedStore<FeedMessage> },
-  { feedKeys }: SubscribeToFeedsRequest
+  { feedKeys }: SubscribeToFeedsRequest,
 ) => {
   return new Stream<SubscribeToFeedsResponse>(({ next }) => {
-    if (feedKeys?.length === 0) {
-      return;
-    }
-
     const subscriptions = new EventSubscriptions();
     const feedMap = new ComplexMap<PublicKey, FeedWrapper<FeedMessage>>(PublicKey.hash);
 
@@ -35,12 +31,16 @@ export const subscribeToFeeds = (
           if (!feedMap.has(feed.key)) {
             feedMap.set(feed.key, feed);
             feed.on('close', update);
-            subscriptions.add(feed.off('close', update));
+            subscriptions.add(() => feed.off('close', update));
           }
         });
 
       next({
-        feeds: Array.from(feedMap.values()).map((feed) => ({ feedKey: feed.key, length: feed.properties.length }))
+        feeds: Array.from(feedMap.values()).map((feed) => ({
+          feedKey: feed.key,
+          length: feed.properties.length,
+          diskUsage: feed.core.byteLength,
+        })),
       });
     };
 
@@ -55,7 +55,7 @@ export const subscribeToFeeds = (
 
 export const subscribeToFeedBlocks = (
   { feedStore }: { feedStore: FeedStore<FeedMessage> },
-  { feedKey, maxBlocks = 10 }: SubscribeToFeedBlocksRequest
+  { feedKey, maxBlocks = 10 }: SubscribeToFeedBlocksRequest,
 ) => {
   return new Stream<SubscribeToFeedBlocksResponse>(({ next }) => {
     if (!feedKey) {
@@ -81,7 +81,7 @@ export const subscribeToFeedBlocks = (
         }
 
         next({
-          blocks: blocks.slice(-maxBlocks)
+          blocks: blocks.slice(-maxBlocks),
         });
 
         await iterator.close();

package/src/packlets/devtools/keys.ts

@@ -2,18 +2,18 @@
 // Copyright 2020 DXOS.org
 //
 
+import { scheduleTask } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
 import { Keyring } from '@dxos/keyring';
 import { SubscribeToKeyringKeysResponse } from '@dxos/protocols/proto/dxos/devtools/host';
 
 export const subscribeToKeyringKeys = ({ keyring }: { keyring: Keyring }) =>
-  new Stream<SubscribeToKeyringKeysResponse>(({ next }) => {
-    const update = () => {
+  new Stream<SubscribeToKeyringKeysResponse>(({ next, ctx }) => {
+    const update = async () => {
       next({
-        keys: keyring.list()
+        keys: await keyring.list(),
       });
     };
-    const unsubscribe = keyring.keysUpdate.on(update);
-    update();
-    return unsubscribe;
+    keyring.keysUpdate.on(ctx, update);
+    scheduleTask(ctx, update);
   });

package/src/packlets/devtools/network.ts

@@ -5,6 +5,7 @@
 import { Stream } from '@dxos/codec-protobuf';
 import { Context } from '@dxos/context';
 import { PublicKey } from '@dxos/keys';
+import { SignalManager } from '@dxos/messaging';
 import { NetworkManager } from '@dxos/network-manager';
 import {
   GetNetworkPeersRequest,
@@ -12,38 +13,38 @@ import {
   SubscribeToNetworkTopicsResponse,
   SubscribeToSignalStatusResponse,
   SignalResponse,
-  SubscribeToSwarmInfoResponse
+  SubscribeToSwarmInfoResponse,
 } from '@dxos/protocols/proto/dxos/devtools/host';
 
-export const subscribeToNetworkStatus = ({ networkManager }: { networkManager: NetworkManager }) =>
+export const subscribeToNetworkStatus = ({ signalManager }: { signalManager: SignalManager }) =>
   new Stream<SubscribeToSignalStatusResponse>(({ next, close }) => {
     const update = () => {
       try {
-        const status = networkManager.signalManager.getStatus();
+        const status = signalManager.getStatus();
         next({ servers: status });
       } catch (err: any) {
         close(err);
       }
     };
 
-    networkManager.signalManager.statusChanged.on(update);
+    signalManager.statusChanged.on(() => update());
     update();
   });
 
-export const subscribeToSignal = ({ networkManager }: { networkManager: NetworkManager }) =>
+export const subscribeToSignal = ({ signalManager }: { signalManager: SignalManager }) =>
   new Stream<SignalResponse>(({ next }) => {
     const ctx = new Context();
-    networkManager.signalManager.onMessage.on(ctx, (message) => {
+    signalManager.onMessage.on(ctx, (message) => {
       next({
         message: {
           author: message.author.asUint8Array(),
           recipient: message.recipient.asUint8Array(),
-          payload: message.payload
+          payload: message.payload,
         },
-        receivedAt: new Date()
+        receivedAt: new Date(),
       });
     });
-    networkManager.signalManager.swarmEvent.on(ctx, (swarmEvent) => {
+    signalManager.swarmEvent.on(ctx, (swarmEvent) => {
       next({ swarmEvent: swarmEvent.swarmEvent, receivedAt: new Date() });
     });
     return () => {
@@ -58,7 +59,7 @@ export const subscribeToNetworkTopics = ({ networkManager }: { networkManager: N
         const topics = networkManager.topics;
         const labeledTopics = topics.map((topic) => ({
           topic,
-          label: networkManager.getSwarm(topic)?.label ?? topic.toHex()
+          label: networkManager.getSwarm(topic)?.label ?? topic.toHex(),
         }));
         next({ topics: labeledTopics });
       } catch (err: any) {
@@ -84,7 +85,7 @@ export const subscribeToSwarmInfo = ({ networkManager }: { networkManager: Netwo
 
 export const getNetworkPeers = (
   { networkManager }: { networkManager: NetworkManager },
-  request: GetNetworkPeersRequest
+  request: GetNetworkPeersRequest,
 ): GetNetworkPeersResponse => {
   if (!request.topic) {
     throw new Error('Expected a network topic');
@@ -94,7 +95,7 @@ export const getNetworkPeers = (
   return {
     peers: map?.peers.map((peer) => ({
       ...peer,
-      connections: peer.connections.map((connection) => connection.asUint8Array())
-    }))
+      connections: peer.connections.map((connection) => connection.asUint8Array()),
+    })),
   };
 };

package/src/packlets/devtools/spaces.ts

@@ -16,13 +16,13 @@ export const subscribeToSpaces = (context: ServiceContext, { spaceKeys = [] }: S
     const update = async () => {
       const spaces: Space[] = [...context.spaceManager!.spaces.values()];
       const filteredSpaces = spaces.filter(
-        (space) => !spaceKeys?.length || spaceKeys.some((spaceKey) => spaceKey.equals(space.key))
+        (space) => !spaceKeys?.length || spaceKeys.some((spaceKey) => spaceKey.equals(space.key)),
       );
 
       next({
         spaces: filteredSpaces.map((space): SubscribeToSpacesResponse.SpaceInfo => {
           const spaceMetadata = context.metadataStore.spaces.find((spaceMetadata: SpaceMetadata) =>
-            spaceMetadata.key.equals(space.key)
+            spaceMetadata.key.equals(space.key),
           );
 
           return {
@@ -31,9 +31,9 @@ export const subscribeToSpaces = (context: ServiceContext, { spaceKeys = [] }: S
             timeframe: spaceMetadata?.dataTimeframe,
             genesisFeed: space.genesisFeedKey,
             controlFeed: space.controlFeedKey!, // TODO(dmaretskyi): Those keys may be missing.
-            dataFeed: space.dataFeedKey!
+            dataFeed: space.dataFeedKey!,
           };
-        })
+        }),
       });
     };
 

package/src/packlets/identity/authenticator.test.ts

@@ -23,7 +23,7 @@ describe('identity/authenticator', () => {
     const authVerifier = new TrustedKeySetAuthVerifier({
       trustedKeysProvider: () => new ComplexSet(PublicKey.hash, [deviceKey]),
       update: new Event(),
-      authTimeout: 10
+      authTimeout: 10,
     });
 
     const nonce = new Uint8Array([2, 1, 3, 7]);

package/src/packlets/identity/authenticator.ts

@@ -16,10 +16,10 @@ export const createAuthProvider =
   async (nonce) => {
     const credential = await signer.createCredential({
       assertion: {
-        '@type': 'dxos.halo.credentials.Auth'
+        '@type': 'dxos.halo.credentials.Auth',
       },
       subject: signer.getIssuer(),
-      nonce
+      nonce,
     });
 
     return schema.getCodecForType('dxos.halo.credentials.Credential').encode(credential);

package/src/packlets/identity/identity-manager.test.ts

@@ -4,7 +4,8 @@
 
 import { expect } from 'chai';
 
-import { valueEncoding, MetadataStore, SpaceManager, AuthStatus } from '@dxos/echo-pipeline';
+import { createDefaultModelFactory } from '@dxos/client-protocol';
+import { valueEncoding, MetadataStore, SpaceManager, AuthStatus, SnapshotStore } from '@dxos/echo-pipeline';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
@@ -18,7 +19,7 @@ import { IdentityManager } from './identity-manager';
 describe('identity/identity-manager', () => {
   const setupPeer = async ({
     signalContext = new MemorySignalManagerContext(),
-    storage = createStorage({ type: StorageType.RAM })
+    storage = createStorage({ type: StorageType.RAM }),
   }: {
     signalContext?: MemorySignalManagerContext;
     storage?: Storage;
@@ -31,27 +32,30 @@ describe('identity/identity-manager', () => {
         root: storage.createDirectory('feeds'),
         signer: keyring,
         hypercore: {
-          valueEncoding
-        }
-      })
+          valueEncoding,
+        },
+      }),
     });
 
     afterTest(() => feedStore.close());
 
     const networkManager = new NetworkManager({
       signalManager: new MemorySignalManager(signalContext),
-      transportFactory: MemoryTransportFactory
+      transportFactory: MemoryTransportFactory,
     });
     const spaceManager = new SpaceManager({
       feedStore,
-      networkManager
+      networkManager,
+      modelFactory: createDefaultModelFactory(),
+      metadataStore: new MetadataStore(storage.createDirectory('metadata')),
+      snapshotStore: new SnapshotStore(storage.createDirectory('snapshots')),
     });
     const identityManager = new IdentityManager(metadataStore, keyring, feedStore, spaceManager);
 
     return {
       identityManager,
       feedStore,
-      keyring
+      keyring,
     };
   };
 
@@ -102,10 +106,10 @@ describe('identity/identity-manager', () => {
           assertion: {
             '@type': 'dxos.halo.credentials.AuthorizedDevice',
             identityKey: identity1.identityKey,
-            deviceKey
-          }
-        })
-      }
+            deviceKey,
+          },
+        }),
+      },
     });
 
     // Identity2 is not yet ready at this point. Peer1 needs to admit peer2 device key and feed keys.
@@ -115,7 +119,7 @@ describe('identity/identity-manager', () => {
       haloSpaceKey: identity1.haloSpaceKey,
       haloGenesisFeedKey: identity1.haloGenesisFeedKey,
       controlFeedKey,
-      dataFeedKey
+      dataFeedKey,
     });
 
     // TODO(dmaretskyi): We'd also need to admit device2's feeds otherwise messages from them won't be processed by the pipeline.

package/src/packlets/identity/identity-manager.ts

@@ -52,16 +52,13 @@ export class IdentityManager {
 
   private _identity?: Identity;
 
-  private readonly _instanceId = PublicKey.random().toHex();
-  public _traceParent?: string;
-
   // TODO(burdon): IdentityManagerParams.
   // TODO(dmaretskyi): Perhaps this should take/generate the peerKey outside of an initialized identity.
   constructor(
     private readonly _metadataStore: MetadataStore,
     private readonly _keyring: Keyring,
     private readonly _feedStore: FeedStore<FeedMessage>,
-    private readonly _spaceManager: SpaceManager
+    private readonly _spaceManager: SpaceManager,
   ) {}
 
   get identity() {
@@ -69,7 +66,8 @@ export class IdentityManager {
   }
 
   async open() {
-    log.trace('dxos.halo.identity-manager', trace.begin({ id: this._instanceId, parentId: this._traceParent }));
+    const traceId = PublicKey.random().toHex();
+    log.trace('dxos.halo.identity-manager.open', trace.begin({ id: traceId }));
     await this._metadataStore.load();
 
     const identityRecord = this._metadataStore.getIdentityRecord();
@@ -80,15 +78,15 @@ export class IdentityManager {
       await this._identity.ready();
       log.trace('dxos.halo.identity', {
         identityKey: identityRecord.identityKey,
-        displayName: this._identity.profileDocument?.displayName
+        displayName: this._identity.profileDocument?.displayName,
       });
       this.stateUpdate.emit();
     }
+    log.trace('dxos.halo.identity-manager.open', trace.end({ id: traceId }));
   }
 
   async close() {
     await this._identity?.close();
-    log.trace('dxos.halo.identity-manager', trace.end({ id: this._instanceId }));
   }
 
   async createIdentity({ displayName }: CreateIdentityOptions = {}) {
@@ -103,8 +101,8 @@ export class IdentityManager {
         key: await this._keyring.createKey(),
         genesisFeedKey: controlFeedKey,
         controlFeedKey,
-        dataFeedKey: await this._keyring.createKey()
-      }
+        dataFeedKey: await this._keyring.createKey(),
+      },
     };
 
     const identity = await this._constructIdentity(identityRecord);
@@ -122,8 +120,8 @@ export class IdentityManager {
         await generator.createFeedAdmission(
           identityRecord.haloSpace.key,
           identityRecord.haloSpace.dataFeedKey,
-          AdmittedFeed.Designation.DATA
-        )
+          AdmittedFeed.Designation.DATA,
+        ),
       ];
 
       if (displayName) {
@@ -136,7 +134,7 @@ export class IdentityManager {
 
       for (const credential of credentials) {
         await identity.controlPipeline.writer.write({
-          credential: { credential }
+          credential: { credential },
         });
       }
     }
@@ -150,7 +148,7 @@ export class IdentityManager {
     await this._identity.ready();
     log.trace('dxos.halo.identity', {
       identityKey: identityRecord.identityKey,
-      displayName: this._identity.profileDocument?.displayName
+      displayName: this._identity.profileDocument?.displayName,
     });
     this.stateUpdate.emit();
 
@@ -173,8 +171,8 @@ export class IdentityManager {
         genesisFeedKey: params.haloGenesisFeedKey,
         controlFeedKey: params.controlFeedKey,
         dataFeedKey: params.dataFeedKey,
-        controlTimeframe: params.controlTimeframe
-      }
+        controlTimeframe: params.controlTimeframe,
+      },
     };
     const identity = await this._constructIdentity(identityRecord);
 
@@ -184,7 +182,7 @@ export class IdentityManager {
     await this._identity.ready();
     log.trace('dxos.halo.identity', {
       identityKey: identityRecord.identityKey,
-      displayName: this._identity.profileDocument?.displayName
+      displayName: this._identity.profileDocument?.displayName,
     });
 
     this.stateUpdate.emit();
@@ -199,7 +197,7 @@ export class IdentityManager {
     // Must be created before the space so the feeds are writable.
     assert(identityRecord.haloSpace.controlFeedKey);
     const controlFeed = await this._feedStore.openFeed(identityRecord.haloSpace.controlFeedKey, {
-      writable: true
+      writable: true,
     });
     assert(identityRecord.haloSpace.dataFeedKey);
     const dataFeed = await this._feedStore.openFeed(identityRecord.haloSpace.dataFeedKey, { writable: true });
@@ -209,9 +207,9 @@ export class IdentityManager {
       swarmIdentity: {
         peerKey: identityRecord.deviceKey,
         credentialProvider: createAuthProvider(createCredentialSignerWithKey(this._keyring, identityRecord.deviceKey)),
-        credentialAuthenticator: deferFunction(() => identity.authVerifier.verifier)
+        credentialAuthenticator: deferFunction(() => identity.authVerifier.verifier),
       },
-      identityKey: identityRecord.identityKey
+      identityKey: identityRecord.identityKey,
     });
     space.setControlFeed(controlFeed);
     space.setDataFeed(dataFeed);
@@ -220,7 +218,7 @@ export class IdentityManager {
       space,
       signer: this._keyring,
       identityKey: identityRecord.identityKey,
-      deviceKey: identityRecord.deviceKey
+      deviceKey: identityRecord.deviceKey,
     });
     log('done', { identityKey: identityRecord.identityKey });
 
@@ -236,10 +234,11 @@ export class IdentityManager {
     return this._spaceManager.constructSpace({
       metadata: {
         key: spaceRecord.key,
-        genesisFeedKey: spaceRecord.genesisFeedKey
+        genesisFeedKey: spaceRecord.genesisFeedKey,
       },
       swarmIdentity,
-      onNetworkConnection: () => {}
+      onNetworkConnection: () => {},
+      memberKey: identityKey,
     });
   }
 }

package/src/packlets/identity/identity-service.ts

@@ -12,7 +12,7 @@ import {
   IdentityService,
   QueryIdentityResponse,
   RecoverIdentityRequest,
-  SignPresentationRequest
+  SignPresentationRequest,
 } from '@dxos/protocols/proto/dxos/client/services';
 import { Presentation, ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 
@@ -49,7 +49,7 @@ export class IdentityServiceImpl implements IdentityService {
     return {
       identityKey: this._serviceContext.identityManager.identity.identityKey,
       spaceKey: this._serviceContext.identityManager.identity.space.key,
-      profile: this._serviceContext.identityManager.identity.profileDocument
+      profile: this._serviceContext.identityManager.identity.profileDocument,
     };
   }
 
@@ -61,7 +61,7 @@ export class IdentityServiceImpl implements IdentityService {
       signer: this._serviceContext.keyring,
       signerKey: this._serviceContext.identityManager.identity.deviceKey,
       chain: this._serviceContext.identityManager.identity.deviceCredentialChain,
-      nonce
+      nonce,
     });
   }
 }