@dxos/react-client 2.22.1-dev.d95e6684 → 2.23.1-dev.16a90c25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "2.22.1-dev.d95e6684",
+  "version": "2.23.1-dev.16a90c25",
   "description": "React client API",
   "keywords": [],
   "license": "AGPL-3.0",
@@ -8,24 +8,24 @@
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "dependencies": {
-    "@dxos/async": "2.22.1-dev.d95e6684",
-    "@dxos/bot-factory-client": "2.22.1-dev.d95e6684",
-    "@dxos/client": "2.22.1-dev.d95e6684",
-    "@dxos/config": "2.22.1-dev.d95e6684",
-    "@dxos/credentials": "2.22.1-dev.d95e6684",
-    "@dxos/crypto": "2.22.1-dev.d95e6684",
-    "@dxos/debug": "2.22.1-dev.d95e6684",
-    "@dxos/echo-db": "2.22.1-dev.d95e6684",
-    "@dxos/util": "2.22.1-dev.d95e6684",
+    "@dxos/async": "2.23.1-dev.16a90c25",
+    "@dxos/bot-factory-client": "2.23.1-dev.16a90c25",
+    "@dxos/client": "2.23.1-dev.16a90c25",
+    "@dxos/config": "2.23.1-dev.16a90c25",
+    "@dxos/credentials": "2.23.1-dev.16a90c25",
+    "@dxos/crypto": "2.23.1-dev.16a90c25",
+    "@dxos/debug": "2.23.1-dev.16a90c25",
+    "@dxos/echo-db": "2.23.1-dev.16a90c25",
+    "@dxos/util": "2.23.1-dev.16a90c25",
     "assert": "^2.0.0",
     "debug": "^4.3.3",
     "react-display-name": "^0.2.5",
     "use-subscription": "^1.4.1"
   },
   "devDependencies": {
-    "@dxos/esbuild-plugins": "2.22.1-dev.d95e6684",
+    "@dxos/esbuild-plugins": "2.23.1-dev.16a90c25",
     "@dxos/esbuild-server": "~1.7.4",
-    "@dxos/toolchain-node-library": "2.22.0",
+    "@dxos/toolchain-node-library": "2.23.0",
     "@mui/material": "^5.0.1",
     "@testing-library/react": "^11.0.4",
     "@testing-library/react-hooks": "5.1.2",

package/react-client.build.log

@@ -2,10 +2,10 @@ Invoking: toolchain build:test
 
 
 typescript
-OK in 8243 ms
+OK in 10263 ms
 
 eslint
-OK in 7364 ms
+OK in 14006 ms
 
 mocha
 This browser doesn't support requestAnimationFrame. Make sure that you load a polyfill in older browsers. https://reactjs.org/link/react-polyfills
@@ -13,11 +13,11 @@ This browser doesn't support cancelAnimationFrame. Make sure that you load a pol
 
 
   ClientProvider
-    ✓ Renders with children
+    ✓ Renders with children (90ms)
     ✓ Provides the client
 
   Client hook
-    ✓ should throw when used outside a context
+    ✓ should throw when used outside a context (59ms)
     ✓ should return client when used properly in a context
 
   Config hook
@@ -26,8 +26,8 @@ This browser doesn't support cancelAnimationFrame. Make sure that you load a pol
     ✓ should return custom client config when used properly in a context
 
 
-  7 passing (275ms)
+  7 passing (1s)
 
-OK in 2953 ms
+OK in 6054 ms
 
-CHECK COMPLETE in 18583 ms
+CHECK COMPLETE in 30340 ms

package/src/containers/ClientProvider.tsx

@@ -6,7 +6,7 @@ import debug from 'debug';
 import React, { MutableRefObject, ReactNode, useEffect, useState } from 'react';
 
 import { Client, ClientOptions } from '@dxos/client';
-import { Config, ConfigObject } from '@dxos/config';
+import { Config, ConfigObject, ConfigV1Object } from '@dxos/config';
 import { MaybeFunction, MaybePromise, getAsyncValue } from '@dxos/util';
 
 import { printBanner } from '../banner';
@@ -17,7 +17,7 @@ const log = debug('dxos:react-client');
 export type ClientProvider = MaybeFunction<MaybePromise<Client>>
 
 // TODO(burdon): Why defs?
-export type ConfigProvider = MaybeFunction<MaybePromise<Config | ConfigObject>>
+export type ConfigProvider = MaybeFunction<MaybePromise<Config | ConfigObject | ConfigV1Object>>
 
 export interface ClientProviderProps {
   children?: ReactNode

package/src/hooks/bot-factory/useBotFactoryClient.ts

@@ -18,7 +18,7 @@ export const useBotFactoryClient = (): BotFactoryClient | undefined => {
 
   useEffect(() => {
     const botFactoryClient = new BotFactoryClient(client.echo.networkManager);
-    const topic = config.get('services.bot.topic') ??
+    const topic = config.get('runtime.services.bot.topic') ??
       raise(new Error('Bot factory topic is not provided'));
     setImmediate(async () => {
       await botFactoryClient.start(PublicKey.from(topic));

package/src/hooks/client/client.test.tsx

@@ -7,7 +7,7 @@ import expect from 'expect';
 import React from 'react';
 
 import { Client } from '@dxos/client';
-import { defs } from '@dxos/config';
+import { ConfigV1Object } from '@dxos/config';
 
 import { ClientProvider } from '../../containers';
 import { useClient } from './useClient';
@@ -21,10 +21,13 @@ describe('Client hook', () => {
   });
 
   it('should return client when used properly in a context', () => {
-    const config: defs.Config = {
-      system: {
-        storage: {
-          persistent: false
+    const config: ConfigV1Object = {
+      version: 1,
+      runtime: {
+        client: {
+          storage: {
+            persistent: false
+          }
         }
       }
     };

package/src/hooks/client/config.test.tsx

@@ -7,7 +7,7 @@ import expect from 'expect';
 import React from 'react';
 
 import { Client } from '@dxos/client';
-import { ConfigObject } from '@dxos/config';
+import { ConfigV1Object } from '@dxos/config';
 
 import { ClientProvider } from '../../containers';
 import { useConfig } from './useConfig';
@@ -29,10 +29,13 @@ describe('Config hook', () => {
   });
 
   it('should return custom client config when used properly in a context', () => {
-    const config: ConfigObject = {
-      system: {
-        storage: {
-          persistent: false
+    const config: ConfigV1Object = {
+      version: 1,
+      runtime: {
+        client: {
+          storage: {
+            persistent: false
+          }
         }
       }
     };
@@ -40,6 +43,6 @@ describe('Config hook', () => {
     const wrapper = ({ children }: any) => <ClientProvider client={client}>{children}</ClientProvider>;
     const { result } = renderHook(render, { wrapper });
     expect(result.error?.message).not.toBeDefined();
-    expect(result.current.get('system.storage')).toEqual(config.system?.storage);
+    expect(result.current.get('runtime.client.storage')).toEqual(config.runtime?.client?.storage);
   });
 });

package/src/hooks/echo-queries/useParties.ts

@@ -5,7 +5,7 @@
 import { useEffect, useState } from 'react';
 
 import { PartyProxy } from '@dxos/client';
-import { PublicKey, PublicKeyLike } from '@dxos/crypto';
+import { PublicKeyLike } from '@dxos/crypto';
 
 import { useClient } from '../client';
 
@@ -14,9 +14,8 @@ import { useClient } from '../client';
  * Requires ClientContext to be set via ClientProvider.
  */
 export const useParty = (partyKey?: PublicKeyLike): PartyProxy | undefined => {
-  const client = useClient();
-  // TODO(wittjosiah): Not responsive to party updates?
-  return partyKey ? client.echo.getParty(PublicKey.from(partyKey)) : undefined;
+  const parties = useParties();
+  return parties.find(party => partyKey && party.key.equals(partyKey));
 };
 
 /**

package/stories/halo-invitations.stories.tsx

@@ -8,7 +8,8 @@ import {
   Box, Button, Divider, Paper, TextField, Toolbar
 } from '@mui/material';
 
-import { decodeInvitation, encodeInvitation, Invitation } from '@dxos/client';
+import { Invitation } from '@dxos/client';
+import { InvitationDescriptor } from '@dxos/echo-db';
 
 import {
   ClientProvider,
@@ -49,10 +50,10 @@ const HaloInvitationContainer = () => {
       setPin(invitation.secret.toString());
     });
 
-    setInvitationCode(encodeInvitation(invitation.descriptor));
+    setInvitationCode(invitation.descriptor.encode());
   };
 
-  if (!client.halo.hasProfile()) {
+  if (!client.halo.profile) {
     return null;
   }
 
@@ -106,7 +107,7 @@ const HaloAuthenticationContainer = () => {
 
   const handleSubmit = async (invitationCode: string) => {
     try {
-      const invitationDescriptor = decodeInvitation(invitationCode);
+      const invitationDescriptor = InvitationDescriptor.decode(invitationCode);
       const invitation = await client.halo.acceptInvitation(invitationDescriptor);
       setStatus({ identity: invitationDescriptor.identityKey?.toString(), invitation });
     } catch (err: any) {

package/stories/party-invitations.stories.tsx

@@ -8,8 +8,9 @@ import {
   Box, Button, Divider, Paper, TextField, Toolbar
 } from '@mui/material';
 
-import { decodeInvitation, encodeInvitation, PartyInvitation } from '@dxos/client';
+import { PartyInvitation } from '@dxos/client';
 import { PublicKey } from '@dxos/crypto';
+import { InvitationDescriptor } from '@dxos/echo-db';
 
 import {
   ClientProvider,
@@ -69,7 +70,7 @@ const PartyInvitationContainer = () => {
         invitation.connected.on(() => setPin(invitation.secret.toString()));
       }
 
-      setInvitationCode(encodeInvitation(invitation.descriptor));
+      setInvitationCode(invitation.descriptor.encode());
     });
   };
 
@@ -144,7 +145,7 @@ const PartyJoinContainer = () => {
     setStatus({});
 
     try {
-      const invitation = await client.echo.acceptInvitation(decodeInvitation(invitationCode));
+      const invitation = await client.echo.acceptInvitation(InvitationDescriptor.decode(invitationCode));
       setStatus({ invitation });
 
       const party = await invitation.getParty();