@dxos/react-client 2.23.1-dev.a5468396 → 2.23.1-dev.edbbc2b5

package/package.json

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

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/stories/halo-invitations.stories.tsx

@@ -53,7 +53,7 @@ const HaloInvitationContainer = () => {
     setInvitationCode(invitation.descriptor.encode());
   };
 
-  if (!client.halo.hasProfile()) {
+  if (!client.halo.profile) {
     return null;
   }