@dxos/client 2.25.0 → 2.25.1-dev.0ff9b5c9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client",
-  "version": "2.25.0",
+  "version": "2.25.1-dev.0ff9b5c9",
   "license": "AGPL-3.0",
   "author": "DXOS.org",
   "main": "dist/src/index.js",
@@ -10,21 +10,21 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "2.25.0",
-    "@dxos/codec-protobuf": "2.25.0",
-    "@dxos/config": "2.25.0",
-    "@dxos/credentials": "2.25.0",
-    "@dxos/crypto": "2.25.0",
-    "@dxos/debug": "2.25.0",
-    "@dxos/echo-db": "2.25.0",
-    "@dxos/echo-protocol": "2.25.0",
-    "@dxos/feed-store": "2.25.0",
-    "@dxos/model-factory": "2.25.0",
-    "@dxos/network-manager": "2.25.0",
-    "@dxos/object-model": "2.25.0",
-    "@dxos/proto": "2.25.0",
-    "@dxos/rpc": "2.25.0",
-    "@dxos/util": "2.25.0",
+    "@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",
@@ -41,7 +41,7 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@dxos/random-access-multi-storage": "2.25.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",

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

@@ -133,7 +133,10 @@ export class HaloProxy extends InvitationProxy {
    *
    * @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;
@@ -147,6 +150,8 @@ export class HaloProxy extends InvitationProxy {
       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

@@ -24,6 +24,11 @@ export class HaloService implements IHaloService {
       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 () => {

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();
           });