@dxos/client-services 0.7.5-main.ff8607b → 0.7.5-staging.b81e783

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

@@ -5,7 +5,7 @@
 import { onTestFinished, describe, expect, test } from 'vitest';
 
 import { Context } from '@dxos/context';
-import { CredentialGenerator, verifyCredential } from '@dxos/credentials';
+import { createDidFromIdentityKey, CredentialGenerator, verifyCredential } from '@dxos/credentials';
 import {
   createIdFromSpaceKey,
   MetadataStore,
@@ -206,6 +206,7 @@ describe('identity/identity', () => {
 
     const identity = new Identity({
       signer: keyring,
+      did: await createDidFromIdentityKey(identityKey),
       identityKey,
       deviceKey,
       space,

package/src/packlets/identity/identity.ts

@@ -17,7 +17,7 @@ import { type Space } from '@dxos/echo-pipeline';
 import { type EdgeConnection } from '@dxos/edge-client';
 import { writeMessages, type FeedWrapper } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
-import { PublicKey, type SpaceId } from '@dxos/keys';
+import { type IdentityDid, PublicKey, type SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { type Runtime } from '@dxos/protocols/proto/dxos/config';
 import { type FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
@@ -38,6 +38,7 @@ import { DefaultSpaceStateMachine } from './default-space-state-machine';
 import { EdgeFeedReplicator } from '../spaces';
 
 export type IdentityParams = {
+  did: IdentityDid;
   identityKey: PublicKey;
   deviceKey: PublicKey;
   signer: Signer;
@@ -63,6 +64,7 @@ export class Identity {
 
   public readonly authVerifier: TrustedKeySetAuthVerifier;
 
+  public readonly did: IdentityDid;
   public readonly identityKey: PublicKey;
   public readonly deviceKey: PublicKey;
 
@@ -73,6 +75,7 @@ export class Identity {
     this._signer = params.signer;
     this._presence = params.presence;
 
+    this.did = params.did;
     this.identityKey = params.identityKey;
     this.deviceKey = params.deviceKey;
 

package/src/packlets/spaces/data-space-manager.ts

@@ -503,7 +503,7 @@ export class DataSpaceManager extends Resource {
     });
     dataSpace.postOpen.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
-      if (setting === EdgeReplicationSetting.ENABLED) {
+      if (!setting || setting === EdgeReplicationSetting.ENABLED) {
         await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
       } else if (this._echoEdgeReplicator) {
         log('not connecting EchoEdgeReplicator because of EdgeReplicationSetting', { spaceId: dataSpace.id });
@@ -511,7 +511,7 @@ export class DataSpaceManager extends Resource {
     });
     dataSpace.preClose.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
-      if (setting === EdgeReplicationSetting.ENABLED) {
+      if (!setting || setting === EdgeReplicationSetting.ENABLED) {
         await this._echoEdgeReplicator?.disconnectFromSpace(dataSpace.id);
       }
     });

package/src/packlets/spaces/edge-feed-replicator.ts

@@ -117,7 +117,7 @@ export class EdgeFeedReplicator extends Resource {
   }
 
   async addFeed(feed: FeedWrapper<any>) {
-    log.info('addFeed', { key: feed.key, connected: this._connected, hasConnectionCtx: !!this._connectionCtx });
+    log('addFeed', { key: feed.key, connected: this._connected, hasConnectionCtx: !!this._connectionCtx });
     this._feeds.set(feed.key, feed);
 
     if (this._connected && this._connectionCtx) {
@@ -143,12 +143,12 @@ export class EdgeFeedReplicator extends Resource {
 
   private async _sendMessage(message: ProtocolMessage) {
     if (!this._connectionCtx) {
-      log.info('message dropped because connection was disposed');
+      log('message dropped because connection was disposed');
       return;
     }
 
     if (message.type === 'data') {
-      log.info('sending blocks', {
+      log('sending blocks', {
         feedKey: message.feedKey,
         blocks: message.blocks.map((b) => b.index),
       });
@@ -191,7 +191,7 @@ export class EdgeFeedReplicator extends Resource {
 
           const logMeta = { localLength: feed.length, remoteLength: message.length, feedKey };
           if (message.length > feed.length) {
-            log.info('requesting missing blocks', logMeta);
+            log('requesting missing blocks', logMeta);
 
             await this._sendMessage({
               type: 'request',
@@ -199,7 +199,7 @@ export class EdgeFeedReplicator extends Resource {
               range: { from: feed.length, to: message.length },
             });
           } else if (message.length < feed.length) {
-            log.info('pushing blocks to remote', logMeta);
+            log('pushing blocks to remote', logMeta);
 
             await this._pushBlocks(feed, message.length, feed.length);
           }
@@ -208,7 +208,7 @@ export class EdgeFeedReplicator extends Resource {
         }
 
         case 'data': {
-          log.info('received data', { feed: message.feedKey, blocks: message.blocks.map((b) => b.index) });
+          log('received data', { feed: message.feedKey, blocks: message.blocks.map((b) => b.index) });
 
           const feedKey = PublicKey.fromHex(message.feedKey);
           const feed = this._feeds.get(feedKey);
@@ -229,7 +229,7 @@ export class EdgeFeedReplicator extends Resource {
   }
 
   private async _pushBlocks(feed: FeedWrapper<any>, from: number, to: number) {
-    log.info('pushing blocks', { feed: feed.key.toHex(), from, to });
+    log('pushing blocks', { feed: feed.key.toHex(), from, to });
 
     const blocks: FeedBlock[] = await Promise.all(
       rangeFromTo(from, to).map(async (index) => {
@@ -255,7 +255,7 @@ export class EdgeFeedReplicator extends Resource {
   }
 
   private async _integrateBlocks(feed: FeedWrapper<any>, blocks: FeedBlock[]) {
-    log.info('integrating blocks', { feed: feed.key.toHex(), blocks: blocks.length });
+    log('integrating blocks', { feed: feed.key.toHex(), blocks: blocks.length });
 
     for (const block of blocks) {
       if (feed.has(block.index)) {

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

@@ -4,7 +4,12 @@
 
 import { EventSubscriptions, UpdateScheduler, scheduleTask } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf/stream';
-import { createAdmissionCredentials, type CredentialProcessor, getCredentialAssertion } from '@dxos/credentials';
+import {
+  createAdmissionCredentials,
+  createDidFromIdentityKey,
+  type CredentialProcessor,
+  getCredentialAssertion,
+} from '@dxos/credentials';
 import { raise } from '@dxos/debug';
 import { type SpaceManager } from '@dxos/echo-pipeline';
 import { writeMessages } from '@dxos/feed-store';
@@ -115,7 +120,9 @@ export class SpacesServiceImpl implements SpacesService {
         ctx,
         async () => {
           const dataSpaceManager = await this._getDataSpaceManager();
-          const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
+          const spaces = await Promise.all(
+            Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space)),
+          );
           log('update', () => ({ ids: spaces.map((space) => space.id) }));
           await this._updateMetrics();
           next({ spaces });
@@ -265,10 +272,10 @@ export class SpacesServiceImpl implements SpacesService {
       await myIdentity.controlPipeline.writer.write({ credential: { credential } });
     }
 
-    return { space: this._serializeSpace(dataSpace) };
+    return { space: await this._serializeSpace(dataSpace) };
   }
 
-  private _serializeSpace(space: DataSpace): Space {
+  private async _serializeSpace(space: DataSpace): Promise<Space> {
     return {
       id: space.id,
       spaceKey: space.key,
@@ -291,24 +298,27 @@ export class SpacesServiceImpl implements SpacesService {
 
         spaceRootUrl: space.databaseRoot?.url,
       },
-      members: Array.from(space.inner.spaceState.members.values()).map((member) => {
-        const peers = space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key));
-        const isMe = this._identityManager.identity?.identityKey.equals(member.key);
+      members: await Promise.all(
+        Array.from(space.inner.spaceState.members.values()).map(async (member) => {
+          const peers = space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key));
+          const isMe = this._identityManager.identity?.identityKey.equals(member.key);
 
-        if (isMe) {
-          peers.push(space.presence.getLocalState());
-        }
+          if (isMe) {
+            peers.push(space.presence.getLocalState());
+          }
 
-        return {
-          identity: {
-            identityKey: member.key,
-            profile: member.profile ?? {},
-          },
-          role: member.role,
-          presence: peers.length > 0 ? SpaceMember.PresenceState.ONLINE : SpaceMember.PresenceState.OFFLINE,
-          peerStates: peers,
-        };
-      }),
+          return {
+            identity: {
+              did: await createDidFromIdentityKey(member.key),
+              identityKey: member.key,
+              profile: member.profile ?? {},
+            },
+            role: member.role,
+            presence: peers.length > 0 ? SpaceMember.PresenceState.ONLINE : SpaceMember.PresenceState.OFFLINE,
+            peerStates: peers,
+          };
+        }),
+      ),
       creator: space.inner.spaceState.creator?.key,
       cache: space.cache,
       metrics: space.metrics,

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.7.5-main.ff8607b";
+export const DXOS_VERSION = "0.7.5-staging.b81e783";