@dxos/react-client 2.31.8-dev.65575f28 → 2.31.8-dev.9afc174f

package/package.json

@@ -1,22 +1,23 @@
 {
   "name": "@dxos/react-client",
-  "version": "2.31.8-dev.65575f28",
+  "version": "2.31.8-dev.9afc174f",
   "description": "React client API",
   "license": "MIT",
   "author": "DXOS.org",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "dependencies": {
-    "@dxos/async": "2.31.8-dev.65575f28",
-    "@dxos/bot-factory-client": "2.31.8-dev.65575f28",
-    "@dxos/client": "2.31.8-dev.65575f28",
-    "@dxos/config": "2.31.8-dev.65575f28",
-    "@dxos/credentials": "2.31.8-dev.65575f28",
-    "@dxos/crypto": "2.31.8-dev.65575f28",
-    "@dxos/debug": "2.31.8-dev.65575f28",
-    "@dxos/echo-db": "2.31.8-dev.65575f28",
-    "@dxos/network-manager": "2.31.8-dev.65575f28",
-    "@dxos/util": "2.31.8-dev.65575f28",
+    "@dxos/async": "2.31.8-dev.9afc174f",
+    "@dxos/bot-factory-client": "2.31.8-dev.9afc174f",
+    "@dxos/client": "2.31.8-dev.9afc174f",
+    "@dxos/config": "2.31.8-dev.9afc174f",
+    "@dxos/credentials": "2.31.8-dev.9afc174f",
+    "@dxos/crypto": "2.31.8-dev.9afc174f",
+    "@dxos/debug": "2.31.8-dev.9afc174f",
+    "@dxos/echo-db": "2.31.8-dev.9afc174f",
+    "@dxos/network-manager": "2.31.8-dev.9afc174f",
+    "@dxos/react-async": "2.31.8-dev.9afc174f",
+    "@dxos/util": "2.31.8-dev.9afc174f",
     "assert": "^2.0.0",
     "debug": "^4.3.3",
     "use-subscription": "^1.4.1"

package/src/containers/BotFactoryClientProvider.tsx

@@ -2,11 +2,12 @@
 // Copyright 2022 DXOS.org
 //
 
-import React, { ReactNode, useEffect, useState } from 'react';
+import React, { ReactNode, useState } from 'react';
 
 import { BotFactoryClient } from '@dxos/bot-factory-client';
 import { PublicKey } from '@dxos/crypto';
 import { raise } from '@dxos/debug';
+import { useAsyncEffect } from '@dxos/react-async';
 
 import { BotFactoryClientContext, createBotFactoryClient, useConfig } from '../hooks';
 
@@ -23,15 +24,13 @@ export const BotFactoryClientProvider = ({
   const config = useConfig();
   const [botFactoryClient, setBotFactoryClient] = useState<BotFactoryClient>();
 
-  useEffect(() => {
-    setImmediate(async () => {
-      const botFactoryClient = await createBotFactoryClient(config);
-      setBotFactoryClient(botFactoryClient);
+  useAsyncEffect(async () => {
+    const botFactoryClient = await createBotFactoryClient(config);
+    setBotFactoryClient(botFactoryClient);
 
-      // TODO(burdon): Rename property: 'runtime.services.bot-factory.topic'
-      const topic = config.get('runtime.services.bot.topic') ?? raise(new Error('Missing Bot factory topic.'));
-      await botFactoryClient.start(PublicKey.from(topic));
-    });
+    // TODO(burdon): Rename property: 'runtime.services.bot-factory.topic'
+    const topic = config.get('runtime.services.bot.topic') ?? raise(new Error('Missing Bot factory topic.'));
+    await botFactoryClient.start(PublicKey.from(topic));
 
     return () => {
       void botFactoryClient?.stop();

package/src/containers/ClientProvider.tsx

@@ -7,6 +7,7 @@ import React, { MutableRefObject, ReactNode, useEffect, useState } from 'react';
 
 import { Client, ClientOptions } from '@dxos/client';
 import { ConfigProvider } from '@dxos/config';
+import { useAsyncEffect } from '@dxos/react-async';
 import { MaybeFunction, MaybePromise, getAsyncValue } from '@dxos/util';
 
 import { printBanner } from '../banner';
@@ -63,8 +64,7 @@ export const ClientProvider = ({
 }: ClientProviderProps) => {
   const [client, setClient] = useState<Client | undefined>(clientProvider instanceof Client ? clientProvider : undefined);
 
-  // Async helpers.
-  useEffect(() => {
+  useAsyncEffect(async () => {
     if (!client) {
       const done = async (client: Client) => {
         log(`Created client: ${client}`);
@@ -76,19 +76,17 @@ export const ClientProvider = ({
         printBanner(client);
       };
 
-      setImmediate(async () => {
-        if (clientProvider) {
-          // Asynchornously request client.
-          const client = await getAsyncValue(clientProvider);
-          await done(client);
-        } else {
-          // Asynchronously construct client (config may be undefined).
-          const config = await getAsyncValue(configProvider);
-          const client = new Client(config, options);
-          await client.initialize();
-          await done(client);
-        }
-      });
+      if (clientProvider) {
+        // Asynchornously request client.
+        const client = await getAsyncValue(clientProvider);
+        await done(client);
+      } else {
+        // Asynchronously construct client (config may be undefined).
+        const config = await getAsyncValue(configProvider);
+        const client = new Client(config, options);
+        await client.initialize();
+        await done(client);
+      }
     }
   }, []);
 

package/src/index.ts

@@ -4,4 +4,3 @@
 
 export * from './containers';
 export * from './hooks';
-export * from './testing';

package/stories/halo-invitations.stories.tsx

@@ -7,10 +7,10 @@ import React, { useState } from 'react';
 import { Box, Button, Divider, Paper, TextField, Toolbar } from '@mui/material';
 
 import { Invitation, InvitationDescriptor } from '@dxos/client';
+import { useAsyncEffect } from '@dxos/react-async';
 
 import {
   ClientProvider,
-  ProfileInitializer,
   useClient,
   useParties,
   useProfile
@@ -131,6 +131,16 @@ const TestApp = () => {
   const parties = useParties();
   const profile = useProfile();
 
+  useAsyncEffect(async () => {
+    if (!profile) {
+      await client.halo.createProfile();
+    }
+  }, []);
+
+  if (!profile) {
+    return null;
+  }
+
   return (
     <Box sx={{
       display: 'flex',
@@ -163,9 +173,7 @@ export const Primary = () => {
       <Box sx={{ display: 'flex', flex: 1, padding: 1, justifyContent: 'space-around' }}>
         {/* Instantiated Client. */}
         <ClientProvider>
-          <ProfileInitializer>
-            <TestApp />
-          </ProfileInitializer>
+          <TestApp />
         </ClientProvider>
 
         {/* Joiners. */}

package/stories/party-invitations.stories.tsx

@@ -10,10 +10,10 @@ import {
 
 import { PartyInvitation, InvitationDescriptor } from '@dxos/client';
 import { PublicKey } from '@dxos/crypto';
+import { useAsyncEffect } from '@dxos/react-async';
 
 import {
   ClientProvider,
-  ProfileInitializer,
   useClient,
   useContacts,
   useParties,
@@ -172,6 +172,16 @@ const TestApp = () => {
   const parties = useParties();
   const profile = useProfile();
 
+  useAsyncEffect(async () => {
+    if (!profile) {
+      await client.halo.createProfile();
+    }
+  }, []);
+
+  if (!profile) {
+    return null;
+  }
+
   return (
     <Box sx={{
       display: 'flex',
@@ -200,9 +210,7 @@ export const Primary = () => {
       <Box sx={{ display: 'flex', flex: 1, padding: 1, justifyContent: 'space-around' }}>
         {[...new Array(peers)].map((_, i) => (
           <ClientProvider key={i}>
-            <ProfileInitializer>
-              <TestApp />
-            </ProfileInitializer>
+            <TestApp />
           </ClientProvider>
         ))}
       </Box>

package/tsconfig.json

@@ -14,35 +14,38 @@
     "tests"
   ],
   "references": [
-    {
-      "path": "../../common/async"
-    },
     {
       "path": "../../bot/bot-factory-client"
     },
     {
-      "path": "../client"
+      "path": "../../common/async"
     },
     {
-      "path": "../config"
+      "path": "../../common/crypto"
     },
     {
-      "path": "../../halo/credentials"
+      "path": "../../common/debug"
     },
     {
-      "path": "../../common/crypto"
+      "path": "../../common/react-async"
     },
     {
-      "path": "../../common/debug"
+      "path": "../../common/util"
     },
     {
       "path": "../../echo/echo-db"
     },
+    {
+      "path": "../../halo/credentials"
+    },
     {
       "path": "../../mesh/network-manager"
     },
     {
-      "path": "../../common/util"
+      "path": "../client"
+    },
+    {
+      "path": "../config"
     }
   ]
 }

package/dist/src/testing/ProfileInitializer.d.ts

@@ -1,9 +0,0 @@
-import { ReactNode } from 'react';
-/**
- * Automatically creates a random DXOS profile.
- * @deprecated
- */
-export declare const ProfileInitializer: ({ children }: {
-    children: ReactNode;
-}) => JSX.Element | null;
-//# sourceMappingURL=ProfileInitializer.d.ts.map

package/dist/src/testing/ProfileInitializer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ProfileInitializer.d.ts","sourceRoot":"","sources":["../../../src/testing/ProfileInitializer.tsx"],"names":[],"mappings":"AAIA,OAAc,EAAE,SAAS,EAAa,MAAM,OAAO,CAAC;AAIpD;;;GAGG;AAEH,eAAO,MAAM,kBAAkB;cAA8B,SAAS;wBAiBrE,CAAC"}

package/dist/src/testing/ProfileInitializer.js

@@ -1,49 +0,0 @@
-"use strict";
-//
-// Copyright 2020 DXOS.org
-//
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProfileInitializer = void 0;
-const react_1 = __importStar(require("react"));
-const hooks_1 = require("../hooks");
-/**
- * Automatically creates a random DXOS profile.
- * @deprecated
- */
-// TODO(burdon): Testing-only; replace with useTestProfile();
-const ProfileInitializer = ({ children }) => {
-    const client = (0, hooks_1.useClient)();
-    const profile = (0, hooks_1.useProfile)();
-    (0, react_1.useEffect)(() => {
-        if (!profile) {
-            setImmediate(async () => {
-                await client.halo.createProfile();
-            });
-        }
-    }, []);
-    if (!profile) {
-        return null;
-    }
-    return react_1.default.createElement(react_1.default.Fragment, null, children);
-};
-exports.ProfileInitializer = ProfileInitializer;
-//# sourceMappingURL=ProfileInitializer.js.map

package/dist/src/testing/ProfileInitializer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ProfileInitializer.js","sourceRoot":"","sources":["../../../src/testing/ProfileInitializer.tsx"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;AAEF,+CAAoD;AAEpD,oCAAiD;AAEjD;;;GAGG;AACH,6DAA6D;AACtD,MAAM,kBAAkB,GAAG,CAAC,EAAE,QAAQ,EAA2B,EAAE,EAAE;IAC1E,MAAM,MAAM,GAAG,IAAA,iBAAS,GAAE,CAAC;IAC3B,MAAM,OAAO,GAAG,IAAA,kBAAU,GAAE,CAAC;IAE7B,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,CAAC,OAAO,EAAE;YACZ,YAAY,CAAC,KAAK,IAAI,EAAE;gBACtB,MAAM,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACpC,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,IAAI,CAAC;KACb;IAED,OAAO,8DAAG,QAAQ,CAAI,CAAC;AACzB,CAAC,CAAC;AAjBW,QAAA,kBAAkB,sBAiB7B"}

package/dist/src/testing/index.d.ts

@@ -1,3 +0,0 @@
-export * from './ProfileInitializer';
-export * from './useTestPartyBootstrap';
-//# sourceMappingURL=index.d.ts.map

package/dist/src/testing/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":"AAIA,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC"}

package/dist/src/testing/index.js

@@ -1,18 +0,0 @@
-"use strict";
-//
-// Copyright 2020 DXOS.org
-//
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./ProfileInitializer"), exports);
-__exportStar(require("./useTestPartyBootstrap"), exports);
-//# sourceMappingURL=index.js.map

package/dist/src/testing/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,uDAAqC;AACrC,0DAAwC"}

package/dist/src/testing/useTestPartyBootstrap.d.ts

@@ -1,11 +0,0 @@
-import { Client, Party } from '@dxos/client';
-/**
- * Hook which returns a set of peers joined in a shared party.
- *
- * Useful for setting up examples or tests which display multiple peers in a single view.
- */
-export declare const useTestPartyBootstrap: (peerCount?: number) => {
-    client: Client;
-    party: Party;
-}[];
-//# sourceMappingURL=useTestPartyBootstrap.d.ts.map

package/dist/src/testing/useTestPartyBootstrap.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useTestPartyBootstrap.d.ts","sourceRoot":"","sources":["../../../src/testing/useTestPartyBootstrap.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE7C;;;;GAIG;AACH,eAAO,MAAM,qBAAqB;YACa,MAAM;WAAS,KAAK;GAyBlE,CAAC"}

package/dist/src/testing/useTestPartyBootstrap.js

@@ -1,38 +0,0 @@
-"use strict";
-//
-// Copyright 2022 DXOS.org
-//
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useTestPartyBootstrap = void 0;
-const react_1 = require("react");
-const client_1 = require("@dxos/client");
-/**
- * Hook which returns a set of peers joined in a shared party.
- *
- * Useful for setting up examples or tests which display multiple peers in a single view.
- */
-const useTestPartyBootstrap = (peerCount = 2) => {
-    const [peers, setPeers] = (0, react_1.useState)([]);
-    (0, react_1.useEffect)(() => {
-        setImmediate(async () => {
-            const peers = [];
-            const inviter = new client_1.Client();
-            await inviter.initialize();
-            await inviter.halo.createProfile({ username: 'peer-0' });
-            const inviterParty = await inviter.echo.createParty();
-            peers.push({ client: inviter, party: inviterParty });
-            for (let i = 1; i < peerCount; i++) {
-                const joiner = new client_1.Client();
-                await joiner.initialize();
-                await joiner.halo.createProfile({ username: `peer-${i}` });
-                const invitation = await inviterParty.createInvitation();
-                const joinerParty = await joiner.echo.acceptInvitation(invitation.descriptor).getParty();
-                peers.push({ client: joiner, party: joinerParty });
-            }
-            setPeers(peers);
-        });
-    }, []);
-    return peers;
-};
-exports.useTestPartyBootstrap = useTestPartyBootstrap;
-//# sourceMappingURL=useTestPartyBootstrap.js.map

package/dist/src/testing/useTestPartyBootstrap.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useTestPartyBootstrap.js","sourceRoot":"","sources":["../../../src/testing/useTestPartyBootstrap.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,iCAA4C;AAE5C,yCAA6C;AAE7C;;;;GAIG;AACI,MAAM,qBAAqB,GAAG,CAAC,SAAS,GAAG,CAAC,EAAE,EAAE;IACrD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAqC,EAAE,CAAC,CAAC;IAE3E,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,YAAY,CAAC,KAAK,IAAI,EAAE;YACtB,MAAM,KAAK,GAAG,EAAE,CAAC;YACjB,MAAM,OAAO,GAAG,IAAI,eAAM,EAAE,CAAC;YAC7B,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;YAC3B,MAAM,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;YACzD,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtD,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;YAErD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;gBAClC,MAAM,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC;gBAC5B,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;gBAC1B,MAAM,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC3D,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,gBAAgB,EAAE,CAAC;gBACzD,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACzF,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;aACpD;YAED,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AA1BW,QAAA,qBAAqB,yBA0BhC"}