@dxos/client 2.24.1-dev.656a99d5 → 2.25.1-dev.0ff9b5c9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client",
-  "version": "2.24.1-dev.656a99d5",
+  "version": "2.25.1-dev.0ff9b5c9",
   "license": "AGPL-3.0",
   "author": "DXOS.org",
   "main": "dist/src/index.js",
@@ -10,21 +10,24 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "2.24.1-dev.656a99d5",
-    "@dxos/codec-protobuf": "2.24.1-dev.656a99d5",
-    "@dxos/config": "2.24.1-dev.656a99d5",
-    "@dxos/credentials": "2.24.1-dev.656a99d5",
-    "@dxos/crypto": "2.24.1-dev.656a99d5",
-    "@dxos/debug": "2.24.1-dev.656a99d5",
-    "@dxos/echo-db": "2.24.1-dev.656a99d5",
-    "@dxos/echo-protocol": "2.24.1-dev.656a99d5",
-    "@dxos/feed-store": "2.24.1-dev.656a99d5",
-    "@dxos/model-factory": "2.24.1-dev.656a99d5",
-    "@dxos/network-manager": "2.24.1-dev.656a99d5",
-    "@dxos/object-model": "2.24.1-dev.656a99d5",
-    "@dxos/proto": "2.24.1-dev.656a99d5",
-    "@dxos/rpc": "2.24.1-dev.656a99d5",
-    "@dxos/util": "2.24.1-dev.656a99d5",
+    "@dxos/async": "2.25.1-dev.0ff9b5c9",
+    "@dxos/codec-protobuf": "2.25.1-dev.0ff9b5c9",
+    "@dxos/config": "2.25.1-dev.0ff9b5c9",
+    "@dxos/credentials": "2.25.1-dev.0ff9b5c9",
+    "@dxos/crypto": "2.25.1-dev.0ff9b5c9",
+    "@dxos/debug": "2.25.1-dev.0ff9b5c9",
+    "@dxos/echo-db": "2.25.1-dev.0ff9b5c9",
+    "@dxos/echo-protocol": "2.25.1-dev.0ff9b5c9",
+    "@dxos/feed-store": "2.25.1-dev.0ff9b5c9",
+    "@dxos/model-factory": "2.25.1-dev.0ff9b5c9",
+    "@dxos/network-manager": "2.25.1-dev.0ff9b5c9",
+    "@dxos/object-model": "2.25.1-dev.0ff9b5c9",
+    "@dxos/proto": "2.25.1-dev.0ff9b5c9",
+    "@dxos/rpc": "2.25.1-dev.0ff9b5c9",
+    "@dxos/util": "2.25.1-dev.0ff9b5c9",
+    "@polkadot/keyring": "6.11.1",
+    "@polkadot/util": "6.11.1",
+    "@polkadot/util-crypto": "6.11.1",
     "@wirelineio/registry-client": "~1.1.0-beta.3",
     "abstract-leveldown": "~7.0.0",
     "assert": "^2.0.0",
@@ -38,9 +41,9 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@dxos/random-access-multi-storage": "2.24.1-dev.656a99d5",
-    "@dxos/testutils": "2.24.0",
-    "@dxos/toolchain-node-library": "2.24.0",
+    "@dxos/random-access-multi-storage": "2.25.1-dev.0ff9b5c9",
+    "@dxos/testutils": "2.25.0",
+    "@dxos/toolchain-node-library": "2.25.0",
     "@types/debug": "^4.1.7",
     "@types/expect": "~24.3.0",
     "@types/jest": "^26.0.7",

package/src/api/echo-proxy.ts

@@ -63,7 +63,9 @@ export class EchoProxy {
   /**
    * @internal
    */
-  _open () {
+  async _open () {
+    const gotParties = this._partiesChanged.waitForCount(1);
+
     const partiesStream = this._serviceProvider.services.PartyService.SubscribeParties();
     partiesStream.subscribe(async data => {
       for (const party of data.parties ?? []) {
@@ -94,6 +96,8 @@ export class EchoProxy {
       this._partiesChanged.emit();
     }, () => {});
     this._subscriptions.push(() => partiesStream.close());
+
+    await gotParties;
   }
 
   /**

package/src/api/halo-proxy.ts

@@ -3,11 +3,12 @@
 //
 
 import { Event } from '@dxos/async';
+import { KeyRecord } from '@dxos/credentials';
 import { Contact, CreateProfileOptions, InvitationDescriptor, InvitationOptions, PartyMember, ResultSet } from '@dxos/echo-db';
 import { SubscriptionGroup } from '@dxos/util';
 
 import { ClientServiceProvider } from '../interfaces';
-import { Profile } from '../proto/gen/dxos/client';
+import { Profile, SignRequest } from '../proto/gen/dxos/client';
 import { Invitation, InvitationProxy, InvitationRequest } from './invitations';
 
 export interface CreateInvitationOptions extends InvitationOptions {
@@ -119,12 +120,23 @@ export class HaloProxy extends InvitationProxy {
     );
   }
 
+  async addKeyRecord (keyRecord: KeyRecord) {
+    await this._serviceProvider.services.HaloService.AddKeyRecord({ keyRecord });
+  }
+
+  async sign (request: SignRequest) {
+    return await this._serviceProvider.services.HaloService.Sign(request);
+  }
+
   /**
    * Allocate resources and set-up internal subscriptions.
    *
    * @internal
    */
-  _open () {
+  async _open () {
+    const gotProfile = this._profileChanged.waitForCount(1);
+    const gotContacts = this._contactsChanged.waitForCount(1);
+
     const profileStream = this._serviceProvider.services.ProfileService.SubscribeProfile();
     profileStream.subscribe(data => {
       this._profile = data.profile;
@@ -132,12 +144,14 @@ export class HaloProxy extends InvitationProxy {
     }, () => {});
     this._subscriptions.push(() => profileStream.close());
 
-    const contactsStream = this._serviceProvider.services.ProfileService.SubscribeContacts();
+    const contactsStream = this._serviceProvider.services.HaloService.SubscribeContacts();
     contactsStream.subscribe(data => {
       this._contacts = data.contacts as PartyMember[];
       this._contactsChanged.emit();
     }, () => {});
     this._subscriptions.push(() => contactsStream.close());
+
+    await Promise.all([gotProfile, gotContacts]);
   }
 
   /**

package/src/api/party-proxy.ts

@@ -5,7 +5,7 @@
 import { PublicKey } from '@dxos/crypto';
 import { failUndefined } from '@dxos/debug';
 import {
-  ActivationOptions, Database, PARTY_ITEM_TYPE, PARTY_TITLE_PROPERTY, RemoteDatabaseBackend
+  ActivationOptions, Database, PARTY_ITEM_TYPE, PARTY_TITLE_PROPERTY, RemoteDatabaseBackend, RootSelector
 } from '@dxos/echo-db';
 import { PartyKey } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
@@ -125,6 +125,13 @@ export class Party extends InvitationProxy {
     });
   }
 
+  /**
+   * Returns a selection context, which can be used to traverse the object graph.
+   */
+  get select (): RootSelector {
+    return this.database.select.bind(this.database);
+  }
+
   /**
    * Creates an invitation to a given party.
    * The Invitation flow requires the inviter and invitee to be online at the same time.
@@ -164,7 +171,7 @@ export class Party extends InvitationProxy {
   }
 
   private getPropertiesItem () {
-    const items = this.database.select(s => s.filter({ type: PARTY_ITEM_TYPE }).items).getValue();
+    const items = this.database.select({ type: PARTY_ITEM_TYPE }).query().result;
     return items[0];
   }
 

package/src/client/client.test.ts

@@ -309,8 +309,8 @@ describe('Client', () => {
       client.registerModel(TestModel);
 
       const party = client.echo.queryParties().first;
-      const selection = party.database.select(s => s.filter({ type: 'test' }).items);
-      await selection.update.waitForCondition(() => selection.getValue().length > 0);
+      const selection = party.database.select({ type: 'test' }).query();
+      await selection.update.waitForCondition(() => selection.result.length > 0);
 
       const item = selection.expectOne();
 

package/src/client/client.ts

@@ -169,8 +169,8 @@ export class Client {
     this._halo = new HaloProxy(this._serviceProvider);
     this._echo = new EchoProxy(this._serviceProvider);
 
-    this._halo._open();
-    this._echo._open();
+    await this._halo._open();
+    await this._echo._open();
 
     this._initialized = true; // TODO(burdon): Initialized === halo.initialized?
     clearInterval(timeout);

package/src/client/service-host/services/halo.ts

@@ -0,0 +1,80 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+import PolkadotKeyring from '@polkadot/keyring';
+import { hexToU8a, u8aToHex } from '@polkadot/util';
+import { cryptoWaitReady } from '@polkadot/util-crypto';
+import assert from 'assert';
+
+import { Stream } from '@dxos/codec-protobuf';
+import { KeyRecord, KeyType } from '@dxos/credentials';
+import { ECHO } from '@dxos/echo-db';
+import { SubscriptionGroup } from '@dxos/util';
+
+import { AddKeyRecordRequest, Contacts, HaloService as IHaloService, SignRequest, SignResponse } from '../../../proto/gen/dxos/client';
+import { resultSetToStream } from '../../../util';
+import { CreateServicesOpts } from './interfaces';
+
+export class HaloService implements IHaloService {
+  constructor (private echo: ECHO) {}
+
+  SubscribeContacts (): Stream<Contacts> {
+    if (this.echo.halo.isInitialized) {
+      return resultSetToStream(this.echo.halo.queryContacts(), (contacts): Contacts => ({ contacts }));
+    } else {
+      return new Stream(({ next }) => {
+        // If profile does not exist, send an empty array.
+        if (!this.echo.halo.isInitialized) {
+          next({ contacts: [] });
+        }
+
+        const subGroup = new SubscriptionGroup();
+
+        setImmediate(async () => {
+          await this.echo.halo.identityReady.waitForCondition(() => this.echo.halo.isInitialized);
+
+          const resultSet = this.echo.halo.queryContacts();
+          next({ contacts: resultSet.value });
+          subGroup.push(resultSet.update.on(() => next({ contacts: resultSet.value })));
+        });
+
+        return () => subGroup.unsubscribe();
+      });
+    }
+  }
+
+  async AddKeyRecord (request: AddKeyRecordRequest): Promise<void> {
+    assert(request.keyRecord && request.keyRecord.publicKey, 'Missing key record.');
+    await this.echo.halo.keyring.addKeyRecord(request.keyRecord);
+    assert(await this.echo.halo.keyring.getKey(request.keyRecord.publicKey), 'Key not inserted correctly.');
+  }
+
+  private async polkadotSign (key: KeyRecord, payload: SignRequest['payload']): Promise<SignResponse> {
+    await cryptoWaitReady();
+
+    assert(key.secretKey, 'Secret key is missing.');
+
+    const keyring = new PolkadotKeyring({ type: 'sr25519' });
+    const keypair = keyring.addFromUri(key.secretKey.toString());
+
+    const signature = u8aToHex(keypair.sign(hexToU8a(payload), { withType: true }));
+    return {
+      signed: signature
+    };
+  }
+
+  async Sign (request: SignRequest): Promise<SignResponse> {
+    assert(request.publicKey, 'Provide a publicKey of the key that should be used for signing.');
+    const key = await this.echo.halo.keyring.getFullKey(request.publicKey);
+    assert(key, 'Key not found.');
+    if (key.type === KeyType.DXNS) {
+      return this.polkadotSign(key, request.payload);
+    }
+    throw new Error('Only DXNS key signing is supported.');
+  }
+}
+
+export const createHaloService = ({ echo }: CreateServicesOpts): HaloService => {
+  return new HaloService(echo);
+};

package/src/client/service-host/services/profile.ts

@@ -9,22 +9,11 @@ import { latch } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
 import { defaultSecretValidator, generatePasscode, SecretProvider } from '@dxos/credentials';
 import { ECHO, InvitationDescriptor } from '@dxos/echo-db';
-import { SubscriptionGroup } from '@dxos/util';
 
 import {
-  InvitationState,
-  ProfileService as IProfileService,
-  AuthenticateInvitationRequest,
-  SubscribeProfileResponse,
-  InvitationRequest,
-  CreateProfileRequest,
-  Contacts,
-  RedeemedInvitation,
-  Profile
-  , RecoverProfileRequest
+  AuthenticateInvitationRequest, CreateProfileRequest, InvitationRequest, InvitationState, Profile, ProfileService as IProfileService, RecoverProfileRequest, RedeemedInvitation, SubscribeProfileResponse
 } from '../../../proto/gen/dxos/client';
 import { InvitationDescriptor as InvitationDescriptorProto } from '../../../proto/gen/dxos/echo/invitation';
-import { resultSetToStream } from '../../../util';
 import { CreateServicesOpts, InviteeInvitation, InviteeInvitations } from './interfaces';
 
 export class ProfileService implements IProfileService {
@@ -122,26 +111,6 @@ export class ProfileService implements IProfileService {
     invitation.secret = request.secret;
     invitation.secretTrigger?.();
   }
-
-  SubscribeContacts (): Stream<Contacts> {
-    if (this.echo.halo.isInitialized) {
-      return resultSetToStream(this.echo.halo.queryContacts(), (contacts): Contacts => ({ contacts }));
-    } else {
-      return new Stream(({ next }) => {
-        const subGroup = new SubscriptionGroup();
-
-        setImmediate(async () => {
-          await this.echo.halo.identityReady.waitForCondition(() => this.echo.halo.isInitialized);
-
-          const resultSet = this.echo.halo.queryContacts();
-          next({ contacts: resultSet.value });
-          subGroup.push(resultSet.update.on(() => next({ contacts: resultSet.value })));
-        });
-
-        return () => subGroup.unsubscribe();
-      });
-    }
-  }
 }
 
 export const createProfileService = ({ echo }: CreateServicesOpts): ProfileService => {

package/src/client/service-host/services/services.ts

@@ -3,6 +3,7 @@
 //
 
 import { ClientServices } from '../../../interfaces';
+import { createHaloService } from './halo';
 import { CreateServicesOpts } from './interfaces';
 import { createPartyService } from './party';
 import { createProfileService } from './profile';
@@ -12,6 +13,7 @@ export const createServices = (opts: CreateServicesOpts): Omit<ClientServices, '
   return {
     SystemService: createSystemService(opts),
     ProfileService: createProfileService(opts),
+    HaloService: createHaloService(opts),
     PartyService: createPartyService(opts),
     DataService: opts.echo.dataService,
     TracingService: {

package/src/devtools/items.ts

@@ -19,7 +19,7 @@ const getData = (echo: DevtoolsServiceDependencies['echo']): SubscribeToItemsRes
       items: []
     };
 
-    const items = party.database.select(selection => selection.items).getValue();
+    const { result: items } = party.database.select().query();
     for (const item of items) {
       partyInfo.items.push({
         id: item.id,
@@ -48,7 +48,7 @@ export const subscribeToItems = ({ echo }: DevtoolsServiceDependencies) => {
     const unsubscribe = echo.queryParties().subscribe((parties) => {
       parties.forEach(party => {
         if (!partySubscriptions[party.key.toHex()]) {
-          const sub = party.database.select(selection => selection.items).update.on(() => {
+          const sub = party.database.select().query().update.on(() => {
             // Send updates on items changes.
             update();
           });

package/src/interfaces/client-service-provider.ts

@@ -7,13 +7,14 @@ import { DataService, schema as schemaProtocol } from '@dxos/echo-protocol';
 import { createServiceBundle } from '@dxos/rpc';
 
 import { schema } from '../proto/gen';
-import { PartyService, ProfileService, SystemService } from '../proto/gen/dxos/client';
+import { PartyService, ProfileService, SystemService, HaloService } from '../proto/gen/dxos/client';
 import { DevtoolsHost, TracingService } from '../proto/gen/dxos/devtools';
 
 // TODO(burdon): Is there a way to mark TS (generics) so cast isn't required for result of stream?
 export interface ClientServices {
   SystemService: SystemService;
   ProfileService: ProfileService;
+  HaloService: HaloService;
   PartyService: PartyService;
   DataService: DataService;
   DevtoolsHost: DevtoolsHost;
@@ -24,6 +25,7 @@ export const clientServiceBundle = createServiceBundle<ClientServices>({
   SystemService: schema.getService('dxos.client.SystemService'),
   ProfileService: schema.getService('dxos.client.ProfileService'),
   PartyService: schema.getService('dxos.client.PartyService'),
+  HaloService: schema.getService('dxos.client.HaloService'),
   // DataService is provided and implemented internally in ECHO so we import it from there.
   DataService: schemaProtocol.getService('dxos.echo.service.DataService'),
   DevtoolsHost: schema.getService('dxos.devtools.DevtoolsHost'),

package/src/proto/gen/dxos/client.ts

@@ -14,21 +14,6 @@ export interface SystemService {
     GetConfig: (request: void) => Promise<dxos_config.Config>;
     Reset: (request: void) => Promise<void>;
 }
-export interface Profile {
-    publicKey: ReturnType<typeof substitutions["dxos.halo.keys.PubKey"]["decode"]>;
-    username?: string;
-}
-export interface SubscribeProfileResponse {
-    profile?: Profile;
-}
-export interface CreateProfileRequest {
-    username?: string;
-    publicKey?: Uint8Array;
-    secretKey?: Uint8Array;
-}
-export interface RecoverProfileRequest {
-    seedPhrase?: string;
-}
 export enum InvitationState {
     WAITING_FOR_CONNECTION = 1,
     CONNECTED = 2,
@@ -68,6 +53,21 @@ export interface AuthenticateInvitationRequest {
     processId?: string;
     secret?: Uint8Array;
 }
+export interface Profile {
+    publicKey: ReturnType<typeof substitutions["dxos.halo.keys.PubKey"]["decode"]>;
+    username?: string;
+}
+export interface SubscribeProfileResponse {
+    profile?: Profile;
+}
+export interface CreateProfileRequest {
+    username?: string;
+    publicKey?: Uint8Array;
+    secretKey?: Uint8Array;
+}
+export interface RecoverProfileRequest {
+    seedPhrase?: string;
+}
 export interface Contact {
     publicKey?: ReturnType<typeof substitutions["dxos.halo.keys.PubKey"]["decode"]>;
     displayName?: string;
@@ -82,7 +82,24 @@ export interface ProfileService {
     CreateInvitation: (request: void) => Stream<InvitationRequest>;
     AcceptInvitation: (request: dxos_echo_invitation.InvitationDescriptor) => Stream<RedeemedInvitation>;
     AuthenticateInvitation: (request: AuthenticateInvitationRequest) => Promise<void>;
+}
+export interface AddKeyRecordRequest {
+    keyRecord?: dxos_halo_keys.KeyRecord;
+}
+export interface SignRequest {
+    /**
+     * - The public key of the key that is supposed to be used for signing.
+     */
+    publicKey?: ReturnType<typeof substitutions["dxos.halo.keys.PubKey"]["decode"]>;
+    payload?: ReturnType<typeof substitutions["google.protobuf.Any"]["decode"]>;
+}
+export interface SignResponse {
+    signed?: ReturnType<typeof substitutions["google.protobuf.Any"]["decode"]>;
+}
+export interface HaloService {
     SubscribeContacts: (request: void) => Stream<Contacts>;
+    AddKeyRecord: (request: AddKeyRecordRequest) => Promise<void>;
+    Sign: (request: SignRequest) => Promise<SignResponse>;
 }
 export interface Party {
     publicKey: ReturnType<typeof substitutions["dxos.halo.keys.PubKey"]["decode"]>;