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

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

@@ -4,8 +4,18 @@
 
 import expect from 'expect';
 
+import { createDefaultModelFactory } from '@dxos/client-protocol';
 import { CredentialGenerator, verifyCredential } from '@dxos/credentials';
-import { MOCK_AUTH_PROVIDER, MOCK_AUTH_VERIFIER, Space, SpaceProtocol, valueEncoding } from '@dxos/echo-pipeline';
+import {
+  MetadataStore,
+  MOCK_AUTH_PROVIDER,
+  MOCK_AUTH_VERIFIER,
+  SnapshotManager,
+  SnapshotStore,
+  Space,
+  SpaceProtocol,
+  valueEncoding,
+} from '@dxos/echo-pipeline';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
@@ -30,9 +40,9 @@ describe('identity/identity', () => {
         root: createStorage({ type: StorageType.RAM }).createDirectory(),
         signer: keyring,
         hypercore: {
-          valueEncoding
-        }
-      })
+          valueEncoding,
+        },
+      }),
     });
 
     const createFeed = async () => {
@@ -48,19 +58,26 @@ describe('identity/identity', () => {
       swarmIdentity: {
         peerKey: deviceKey,
         credentialProvider: MOCK_AUTH_PROVIDER,
-        credentialAuthenticator: MOCK_AUTH_VERIFIER
+        credentialAuthenticator: MOCK_AUTH_VERIFIER,
       },
       networkManager: new NetworkManager({
         signalManager: new MemorySignalManager(new MemorySignalManagerContext()),
-        transportFactory: MemoryTransportFactory
-      })
+        transportFactory: MemoryTransportFactory,
+      }),
     });
 
     const space: Space = new Space({
       spaceKey,
       protocol,
       genesisFeed: controlFeed,
-      feedProvider: (feedKey) => feedStore.openFeed(feedKey)
+      feedProvider: (feedKey) => feedStore.openFeed(feedKey),
+      memberKey: identityKey,
+      modelFactory: createDefaultModelFactory(),
+      metadataStore: new MetadataStore(createStorage({ type: StorageType.RAM }).createDirectory()),
+      snapshotManager: new SnapshotManager(
+        new SnapshotStore(createStorage({ type: StorageType.RAM }).createDirectory()),
+      ),
+      snapshotId: undefined,
     })
       .setControlFeed(controlFeed)
       .setDataFeed(dataFeed);
@@ -69,7 +86,7 @@ describe('identity/identity', () => {
       signer: keyring,
       identityKey,
       deviceKey,
-      space
+      space,
     });
 
     await identity.open();
@@ -83,12 +100,12 @@ describe('identity/identity', () => {
       const credentials = [
         ...(await generator.createSpaceGenesis(spaceKey, controlFeed.key)),
         await generator.createDeviceAuthorization(deviceKey),
-        await generator.createFeedAdmission(spaceKey, dataFeed.key, AdmittedFeed.Designation.DATA)
+        await generator.createFeedAdmission(spaceKey, dataFeed.key, AdmittedFeed.Designation.DATA),
       ];
 
       for (const credential of credentials) {
         await identity.controlPipeline.writer.write({
-          credential: { credential }
+          credential: { credential },
         });
       }
     }
@@ -101,9 +118,9 @@ describe('identity/identity', () => {
       assertion: {
         '@type': 'dxos.halo.credentials.IdentityProfile',
         profile: {
-          displayName: 'Alice'
-        }
-      }
+          displayName: 'Alice',
+        },
+      },
     });
 
     expect(credential.issuer).toEqual(identityKey);
@@ -133,9 +150,9 @@ describe('identity/identity', () => {
           root: createStorage({ type: StorageType.RAM }).createDirectory(),
           signer: keyring,
           hypercore: {
-            valueEncoding
-          }
-        })
+            valueEncoding,
+          },
+        }),
       });
 
       const createFeed = async () => {
@@ -153,19 +170,25 @@ describe('identity/identity', () => {
         swarmIdentity: {
           peerKey: deviceKey,
           credentialProvider: MOCK_AUTH_PROVIDER, // createHaloAuthProvider(createCredentialSignerWithKey(keyring, device_key)),
-          credentialAuthenticator: MOCK_AUTH_VERIFIER // createHaloAuthVerifier(() => identity.authorizedDeviceKeys),
+          credentialAuthenticator: MOCK_AUTH_VERIFIER, // createHaloAuthVerifier(() => identity.authorizedDeviceKeys),
         },
         networkManager: new NetworkManager({
           signalManager: new MemorySignalManager(signalContext),
-          transportFactory: MemoryTransportFactory
-        })
+          transportFactory: MemoryTransportFactory,
+        }),
       });
 
       const space = new Space({
         spaceKey,
         protocol,
         genesisFeed: controlFeed,
-        feedProvider: (feedKey) => feedStore.openFeed(feedKey)
+        feedProvider: (feedKey) => feedStore.openFeed(feedKey),
+        memberKey: identityKey,
+        modelFactory: createDefaultModelFactory(),
+        metadataStore: new MetadataStore(createStorage({ type: StorageType.RAM }).createDirectory()),
+        snapshotManager: new SnapshotManager(
+          new SnapshotStore(createStorage({ type: StorageType.RAM }).createDirectory()),
+        ),
       })
         .setControlFeed(controlFeed)
         .setDataFeed(dataFeed);
@@ -174,7 +197,7 @@ describe('identity/identity', () => {
         signer: keyring,
         identityKey,
         deviceKey,
-        space
+        space,
       }));
 
       await identity.open();
@@ -188,12 +211,12 @@ describe('identity/identity', () => {
         const credentials = [
           ...(await generator.createSpaceGenesis(spaceKey, controlFeed.key)),
           await generator.createDeviceAuthorization(deviceKey),
-          await generator.createFeedAdmission(spaceKey, dataFeed.key, AdmittedFeed.Designation.DATA)
+          await generator.createFeedAdmission(spaceKey, dataFeed.key, AdmittedFeed.Designation.DATA),
         ];
 
         for (const credential of credentials) {
           await identity.controlPipeline.writer.write({
-            credential: { credential }
+            credential: { credential },
           });
         }
       }
@@ -214,9 +237,9 @@ describe('identity/identity', () => {
           root: createStorage({ type: StorageType.RAM }).createDirectory(),
           signer: keyring,
           hypercore: {
-            valueEncoding
-          }
-        })
+            valueEncoding,
+          },
+        }),
       });
 
       const createFeed = async () => {
@@ -232,19 +255,25 @@ describe('identity/identity', () => {
         swarmIdentity: {
           peerKey: deviceKey,
           credentialProvider: MOCK_AUTH_PROVIDER, // createHaloAuthProvider(createCredentialSignerWithKey(keyring, device_key)),
-          credentialAuthenticator: MOCK_AUTH_VERIFIER // createHaloAuthVerifier(() => identity.authorizedDeviceKeys),
+          credentialAuthenticator: MOCK_AUTH_VERIFIER, // createHaloAuthVerifier(() => identity.authorizedDeviceKeys),
         },
         networkManager: new NetworkManager({
           signalManager: new MemorySignalManager(signalContext),
-          transportFactory: MemoryTransportFactory
-        })
+          transportFactory: MemoryTransportFactory,
+        }),
       });
 
       const space = new Space({
         spaceKey,
         protocol,
         genesisFeed: await feedStore.openFeed(genesisFeedKey),
-        feedProvider: (feedKey) => feedStore.openFeed(feedKey)
+        feedProvider: (feedKey) => feedStore.openFeed(feedKey),
+        memberKey: identityKey,
+        modelFactory: createDefaultModelFactory(),
+        metadataStore: new MetadataStore(createStorage({ type: StorageType.RAM }).createDirectory()),
+        snapshotManager: new SnapshotManager(
+          new SnapshotStore(createStorage({ type: StorageType.RAM }).createDirectory()),
+        ),
       })
         .setControlFeed(controlFeed)
         .setDataFeed(dataFeed);
@@ -253,7 +282,7 @@ describe('identity/identity', () => {
         signer: keyring,
         identityKey: identity1.identityKey,
         deviceKey,
-        space
+        space,
       }));
 
       await identity.open();
@@ -272,10 +301,10 @@ describe('identity/identity', () => {
             assertion: {
               '@type': 'dxos.halo.credentials.AuthorizedDevice',
               identityKey: identity1.identityKey,
-              deviceKey: identity2.deviceKey
-            }
-          })
-        }
+              deviceKey: identity2.deviceKey,
+            },
+          }),
+        },
       });
 
       await identity2.ready();

package/src/packlets/identity/identity.ts

@@ -11,7 +11,7 @@ import {
   createCredentialSignerWithKey,
   createCredentialSignerWithChain,
   ProfileStateMachine,
-  CredentialConsumer
+  CredentialConsumer,
 } from '@dxos/credentials';
 import { Signer } from '@dxos/crypto';
 import { failUndefined } from '@dxos/debug';
@@ -64,20 +64,20 @@ export class Identity {
       new DeviceStateMachine({
         identityKey: this.identityKey,
         deviceKey: this.deviceKey,
-        onUpdate: () => this.stateUpdate.emit()
-      })
+        onUpdate: () => this.stateUpdate.emit(),
+      }),
     );
     this._profileStateMachine = this.space.spaceState.registerProcessor(
       new ProfileStateMachine({
         identityKey: this.identityKey,
-        onUpdate: () => this.stateUpdate.emit()
-      })
+        onUpdate: () => this.stateUpdate.emit(),
+      }),
     );
 
     this.authVerifier = new TrustedKeySetAuthVerifier({
       trustedKeysProvider: () => this.authorizedDeviceKeys,
       update: this.stateUpdate,
-      authTimeout: AUTH_TIMEOUT
+      authTimeout: AUTH_TIMEOUT,
     });
   }
 
@@ -132,7 +132,7 @@ export class Identity {
     return {
       deviceKey: this.deviceKey,
       controlFeedKey: this.space.controlFeedKey ?? failUndefined(),
-      dataFeedKey: this.space.dataFeedKey ?? failUndefined()
+      dataFeedKey: this.space.dataFeedKey ?? failUndefined(),
     };
   }
 
@@ -145,7 +145,7 @@ export class Identity {
     return createCredentialSignerWithChain(
       this._signer,
       this._deviceStateMachine.processor.deviceCredentialChain,
-      this.deviceKey
+      this.deviceKey,
     );
   }
 
@@ -162,7 +162,7 @@ export class Identity {
       hostDevice: this.deviceKey,
       deviceKey,
       controlFeedKey,
-      dataFeedKey
+      dataFeedKey,
     });
     const signer = this.getIdentityCredentialSigner();
     await writeMessages(
@@ -173,8 +173,8 @@ export class Identity {
           assertion: {
             '@type': 'dxos.halo.credentials.AuthorizedDevice',
             identityKey: this.identityKey,
-            deviceKey
-          }
+            deviceKey,
+          },
         }),
         await signer.createCredential({
           subject: controlFeedKey,
@@ -183,8 +183,8 @@ export class Identity {
             spaceKey: this.haloSpaceKey,
             deviceKey,
             identityKey: this.identityKey,
-            designation: AdmittedFeed.Designation.CONTROL
-          }
+            designation: AdmittedFeed.Designation.CONTROL,
+          },
         }),
         await signer.createCredential({
           subject: dataFeedKey,
@@ -193,10 +193,10 @@ export class Identity {
             spaceKey: this.haloSpaceKey,
             deviceKey,
             identityKey: this.identityKey,
-            designation: AdmittedFeed.Designation.DATA
-          }
-        })
-      ].map((credential): FeedMessage.Payload => ({ credential: { credential } }))
+            designation: AdmittedFeed.Designation.DATA,
+          },
+        }),
+      ].map((credential): FeedMessage.Payload => ({ credential: { credential } })),
     );
   }
 }

package/src/packlets/invitations/device-invitation-protocol.test.ts

@@ -5,7 +5,7 @@
 import { expect } from 'chai';
 
 import { asyncChain } from '@dxos/async';
-import { Invitation } from '@dxos/client';
+import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { describe, test, afterTest } from '@dxos/test';
 
 import { ServiceContext } from '../services';

package/src/packlets/invitations/device-invitation-protocol.ts

@@ -15,7 +15,7 @@ export class DeviceInvitationProtocol implements InvitationProtocol {
   constructor(
     private readonly _keyring: Keyring,
     private readonly _getIdentity: () => Identity,
-    private readonly _acceptIdentity: (identity: JoinIdentityParams) => Promise<Identity>
+    private readonly _acceptIdentity: (identity: JoinIdentityParams) => Promise<Identity>,
   ) {}
 
   toJSON(): object {
@@ -24,7 +24,7 @@ export class DeviceInvitationProtocol implements InvitationProtocol {
 
   getInvitationContext(): Partial<Invitation> & Pick<Invitation, 'kind'> {
     return {
-      kind: Invitation.Kind.DEVICE
+      kind: Invitation.Kind.DEVICE,
     };
   }
 
@@ -38,8 +38,8 @@ export class DeviceInvitationProtocol implements InvitationProtocol {
         identityKey: identity.identityKey,
         haloSpaceKey: identity.haloSpaceKey,
         genesisFeedKey: identity.haloGenesisFeedKey,
-        controlTimeframe: identity.controlPipeline.state.timeframe
-      }
+        controlTimeframe: identity.controlPipeline.state.timeframe,
+      },
     };
   }
 
@@ -56,8 +56,8 @@ export class DeviceInvitationProtocol implements InvitationProtocol {
       device: {
         deviceKey,
         controlFeedKey,
-        dataFeedKey
-      }
+        dataFeedKey,
+      },
     };
   }
 
@@ -75,7 +75,7 @@ export class DeviceInvitationProtocol implements InvitationProtocol {
       haloGenesisFeedKey: genesisFeedKey,
       controlFeedKey,
       dataFeedKey,
-      controlTimeframe
+      controlTimeframe,
     });
 
     return { identityKey };

package/src/packlets/invitations/invitation-extension.ts

@@ -18,7 +18,7 @@ import {
   IntroductionRequest,
   IntroductionResponse,
   InvitationHostService,
-  Options
+  Options,
 } from '@dxos/protocols/proto/dxos/halo/invitations';
 import { ExtensionContext, RpcExtension } from '@dxos/teleport';
 
@@ -45,8 +45,6 @@ export class InvitationHostExtension extends RpcExtension<
   /**
    * @internal
    */
-  public _traceParent?: string;
-
   private _ctx = new Context();
   private _remoteOptions?: Options;
   private _remoteOptionsTrigger = new Trigger();
@@ -54,11 +52,11 @@ export class InvitationHostExtension extends RpcExtension<
   constructor(private readonly _callbacks: InvitationHostExtensionCallbacks) {
     super({
       requested: {
-        InvitationHostService: schema.getService('dxos.halo.invitations.InvitationHostService')
+        InvitationHostService: schema.getService('dxos.halo.invitations.InvitationHostService'),
       },
       exposed: {
-        InvitationHostService: schema.getService('dxos.halo.invitations.InvitationHostService')
-      }
+        InvitationHostService: schema.getService('dxos.halo.invitations.InvitationHostService'),
+      },
     });
   }
 
@@ -75,10 +73,7 @@ export class InvitationHostExtension extends RpcExtension<
 
         introduce: async (request) => {
           const traceId = PublicKey.random().toHex();
-          log.trace(
-            'dxos.sdk.invitation-handler.host.introduce',
-            trace.begin({ id: traceId, parentId: this._traceParent })
-          );
+          log.trace('dxos.sdk.invitation-handler.host.introduce', trace.begin({ id: traceId }));
           const response = await this._callbacks.introduce(request);
           log.trace('dxos.sdk.invitation-handler.host.introduce', trace.end({ id: traceId }));
           return response;
@@ -86,10 +81,7 @@ export class InvitationHostExtension extends RpcExtension<
 
         authenticate: async (request) => {
           const traceId = PublicKey.random().toHex();
-          log.trace(
-            'dxos.sdk.invitation-handler.host.authenticate',
-            trace.begin({ id: traceId, parentId: this._traceParent })
-          );
+          log.trace('dxos.sdk.invitation-handler.host.authenticate', trace.begin({ id: traceId }));
           const response = await this._callbacks.authenticate(request);
           log.trace('dxos.sdk.invitation-handler.host.authenticate', trace.end({ id: traceId, data: { ...response } }));
           return response;
@@ -97,15 +89,12 @@ export class InvitationHostExtension extends RpcExtension<
 
         admit: async (request) => {
           const traceId = PublicKey.random().toHex();
-          log.trace(
-            'dxos.sdk.invitation-handler.host.admit',
-            trace.begin({ id: traceId, parentId: this._traceParent })
-          );
+          log.trace('dxos.sdk.invitation-handler.host.admit', trace.begin({ id: traceId }));
           const response = await this._callbacks.admit(request);
           log.trace('dxos.sdk.invitation-handler.host.admit', trace.end({ id: traceId }));
           return response;
-        }
-      }
+        },
+      },
     };
   }
 
@@ -118,7 +107,7 @@ export class InvitationHostExtension extends RpcExtension<
       if (this._remoteOptions?.role !== Options.Role.GUEST) {
         throw new InvalidInvitationExtensionRoleError(undefined, {
           expected: Options.Role.GUEST,
-          remoteOptions: this._remoteOptions
+          remoteOptions: this._remoteOptions,
         });
       }
 
@@ -153,11 +142,11 @@ export class InvitationGuestExtension extends RpcExtension<
   constructor(private readonly _callbacks: InvitationGuestExtensionCallbacks) {
     super({
       requested: {
-        InvitationHostService: schema.getService('dxos.halo.invitations.InvitationHostService')
+        InvitationHostService: schema.getService('dxos.halo.invitations.InvitationHostService'),
       },
       exposed: {
-        InvitationHostService: schema.getService('dxos.halo.invitations.InvitationHostService')
-      }
+        InvitationHostService: schema.getService('dxos.halo.invitations.InvitationHostService'),
+      },
     });
   }
 
@@ -177,8 +166,8 @@ export class InvitationGuestExtension extends RpcExtension<
         },
         admit: () => {
           throw new Error('Method not allowed.');
-        }
-      }
+        },
+      },
     };
   }
 
@@ -193,7 +182,7 @@ export class InvitationGuestExtension extends RpcExtension<
       if (this._remoteOptions?.role !== Options.Role.HOST) {
         throw new InvalidInvitationExtensionRoleError(undefined, {
           expected: Options.Role.HOST,
-          remoteOptions: this._remoteOptions
+          remoteOptions: this._remoteOptions,
         });
       }
 

package/src/packlets/invitations/invitations-handler.ts

@@ -10,8 +10,8 @@ import {
   AUTHENTICATION_CODE_LENGTH,
   CancellableInvitationObservable,
   INVITATION_TIMEOUT,
-  ON_CLOSE_DELAY
-} from '@dxos/client';
+  ON_CLOSE_DELAY,
+} from '@dxos/client-protocol';
 import { Context } from '@dxos/context';
 import { generatePasscode } from '@dxos/credentials';
 import { InvalidInvitationExtensionRoleError } from '@dxos/errors';
@@ -59,7 +59,6 @@ export class InvitationsHandler {
   /**
    * @internal
    */
-  public _traceParent?: string;
   constructor(private readonly _networkManager: NetworkManager) {}
 
   createInvitation(protocol: InvitationProtocol, options?: Partial<Invitation>): CancellableInvitationObservable {
@@ -69,7 +68,7 @@ export class InvitationsHandler {
       authMethod = Invitation.AuthMethod.SHARED_SECRET,
       state = Invitation.State.INIT,
       timeout = INVITATION_TIMEOUT,
-      swarmKey = PublicKey.random()
+      swarmKey = PublicKey.random(),
     } = options ?? {};
     const authCode =
       options?.authCode ??
@@ -84,7 +83,7 @@ export class InvitationsHandler {
       swarmKey,
       authCode,
       timeout,
-      ...protocol.getInvitationContext()
+      ...protocol.getInvitationContext(),
     };
 
     const stream = new PushStream<Invitation>();
@@ -92,7 +91,7 @@ export class InvitationsHandler {
       onError: (err) => {
         void ctx.dispose();
         stream.error(err);
-      }
+      },
     });
 
     ctx.onDispose(() => {
@@ -111,7 +110,7 @@ export class InvitationsHandler {
         introduce: async ({ profile }) => {
           log('guest introduced itself', {
             guestProfile: profile,
-            ...protocol.toJSON()
+            ...protocol.toJSON(),
           });
 
           guestProfile = profile;
@@ -123,7 +122,7 @@ export class InvitationsHandler {
           //   Spaces may want to have public details (name, member count, etc.) or hide that until guest is authed.
           return {
             spaceKey: authMethod === Invitation.AuthMethod.NONE ? protocol.getInvitationContext().spaceKey : undefined,
-            authMethod
+            authMethod,
           };
         },
 
@@ -186,10 +185,7 @@ export class InvitationsHandler {
           scheduleTask(ctx, async () => {
             const traceId = PublicKey.random().toHex();
             try {
-              log.trace(
-                'dxos.sdk.invitations-handler.host.onOpen',
-                trace.begin({ id: traceId, parentId: this._traceParent })
-              );
+              log.trace('dxos.sdk.invitations-handler.host.onOpen', trace.begin({ id: traceId }));
               log('connected', { ...protocol.toJSON() });
               stream.next({ ...invitation, state: Invitation.State.CONNECTED });
               const deviceKey = await success.wait({ timeout });
@@ -224,9 +220,8 @@ export class InvitationsHandler {
             log.error('failed', err);
             stream.error(err);
           }
-        }
+        },
       });
-      extension._traceParent = this._traceParent;
 
       return extension;
     };
@@ -239,7 +234,7 @@ export class InvitationsHandler {
         protocolProvider: createTeleportProtocolFactory(async (teleport) => {
           teleport.addExtension('dxos.halo.invitations', createExtension());
         }),
-        topology: new StarTopology(topic)
+        topology: new StarTopology(topic),
       });
       ctx.onDispose(() => swarmConnection.close());
 
@@ -253,7 +248,7 @@ export class InvitationsHandler {
       onCancel: async () => {
         stream.next({ ...invitation, state: Invitation.State.CANCELLED });
         await ctx.dispose();
-      }
+      },
     });
 
     return observable;
@@ -283,7 +278,7 @@ export class InvitationsHandler {
           stream.error(err);
         }
         void ctx.dispose();
-      }
+      },
     });
 
     ctx.onDispose(() => {
@@ -306,10 +301,7 @@ export class InvitationsHandler {
           scheduleTask(ctx, async () => {
             const traceId = PublicKey.random().toHex();
             try {
-              log.trace(
-                'dxos.sdk.invitations-handler.guest.onOpen',
-                trace.begin({ id: traceId, parentId: this._traceParent })
-              );
+              log.trace('dxos.sdk.invitations-handler.guest.onOpen', trace.begin({ id: traceId }));
               // TODO(burdon): Bug where guest may create multiple connections.
               if (++connectionCount > 1) {
                 throw new Error(`multiple connections detected: ${connectionCount}`);
@@ -323,7 +315,7 @@ export class InvitationsHandler {
               // 1. Introduce guest to host.
               log('introduce', { ...protocol.toJSON() });
               const introductionResponse = await extension.rpc.InvitationHostService.introduce(
-                protocol.createIntroduction()
+                protocol.createIntroduction(),
               );
               log('introduce response', { ...protocol.toJSON(), response: introductionResponse });
               invitation.authMethod = introductionResponse.authMethod;
@@ -396,7 +388,7 @@ export class InvitationsHandler {
             log('auth failed', err);
             stream.error(err);
           }
-        }
+        },
       });
 
       return extension;
@@ -411,7 +403,7 @@ export class InvitationsHandler {
         protocolProvider: createTeleportProtocolFactory(async (teleport) => {
           teleport.addExtension('dxos.halo.invitations', createExtension());
         }),
-        topology: new StarTopology(topic)
+        topology: new StarTopology(topic),
       });
       ctx.onDispose(() => swarmConnection.close());
 
@@ -428,7 +420,7 @@ export class InvitationsHandler {
       onAuthenticate: async (code: string) => {
         // TODO(burdon): Reset creates a race condition? Event?
         authenticated.wake(code);
-      }
+      },
     });
 
     return observable;