@dxos/react-client 2.21.2-dev.2c52f4b6 → 2.21.3-dev.33d9f475

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "2.21.2-dev.2c52f4b6",
+  "version": "2.21.3-dev.33d9f475",
   "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.21.2-dev.2c52f4b6",
-    "@dxos/bot-factory-client": "2.21.2-dev.2c52f4b6",
-    "@dxos/client": "2.21.2-dev.2c52f4b6",
-    "@dxos/config": "2.21.2-dev.2c52f4b6",
-    "@dxos/credentials": "2.21.2-dev.2c52f4b6",
-    "@dxos/crypto": "2.21.2-dev.2c52f4b6",
-    "@dxos/debug": "2.21.2-dev.2c52f4b6",
-    "@dxos/echo-db": "2.21.2-dev.2c52f4b6",
-    "@dxos/util": "2.21.2-dev.2c52f4b6",
+    "@dxos/async": "2.21.3-dev.33d9f475",
+    "@dxos/bot-factory-client": "2.21.3-dev.33d9f475",
+    "@dxos/client": "2.21.3-dev.33d9f475",
+    "@dxos/config": "2.21.3-dev.33d9f475",
+    "@dxos/credentials": "2.21.3-dev.33d9f475",
+    "@dxos/crypto": "2.21.3-dev.33d9f475",
+    "@dxos/debug": "2.21.3-dev.33d9f475",
+    "@dxos/echo-db": "2.21.3-dev.33d9f475",
+    "@dxos/util": "2.21.3-dev.33d9f475",
     "assert": "^2.0.0",
     "debug": "^4.3.3",
     "react-display-name": "^0.2.5",
     "use-subscription": "^1.4.1"
   },
   "devDependencies": {
-    "@dxos/esbuild-plugins": "2.21.2-dev.2c52f4b6",
+    "@dxos/esbuild-plugins": "2.21.3-dev.33d9f475",
     "@dxos/esbuild-server": "~1.7.4",
-    "@dxos/toolchain-node-library": "2.21.1",
+    "@dxos/toolchain-node-library": "2.21.2",
     "@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 5758 ms
+OK in 8026 ms
 
 eslint
-OK in 6339 ms
+OK in 7807 ms
 
 mocha
 This browser doesn't support requestAnimationFrame. Make sure that you load a polyfill in older browsers. https://reactjs.org/link/react-polyfills
@@ -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 (256ms)
+  7 passing (305ms)
 
-OK in 2209 ms
+OK in 2518 ms
 
-CHECK COMPLETE in 14328 ms
+CHECK COMPLETE in 18387 ms

package/src/hooks/invitations/index.ts

@@ -2,5 +2,6 @@
 // Copyright 2020 DXOS.org
 //
 
+export * from './useHaloInvitations';
 export * from './usePartyInvitations';
 export * from './useSecretProvider';

package/src/hooks/invitations/useHaloInvitations.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+import { Client } from '@dxos/client';
+
+import { useInvitations } from './useInvitations';
+
+export const useHaloInvitations = (client: Client) => {
+  return useInvitations(client.halo);
+};

package/src/hooks/invitations/useInvitations.ts

@@ -0,0 +1,21 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+import { useEffect, useState } from 'react';
+
+import { InvitationProxy, InvitationRequest } from '@dxos/client';
+
+export const useInvitations = (invitationProxy: InvitationProxy | undefined) => {
+  const [invitations, setInvitations] = useState<InvitationRequest[]>(invitationProxy?.activeInvitations ?? []);
+
+  useEffect(() => {
+    setInvitations(invitationProxy?.activeInvitations ?? []);
+
+    return invitationProxy?.invitationsUpdate.on(() => {
+      setInvitations([...invitationProxy.activeInvitations]);
+    });
+  }, [invitationProxy]);
+
+  return invitations;
+};

package/src/hooks/invitations/usePartyInvitations.ts

@@ -2,24 +2,12 @@
 // Copyright 2022 DXOS.org
 //
 
-import { useEffect, useState } from 'react';
-
-import { InvitationRequest } from '@dxos/client';
 import { PublicKey } from '@dxos/crypto';
 
 import { useParty } from '../echo-queries';
+import { useInvitations } from './useInvitations';
 
 export const usePartyInvitations = (partyKey?: PublicKey) => {
   const party = useParty(partyKey);
-  const [invitations, setInvitations] = useState<InvitationRequest[]>(party?.activeInvitations ?? []);
-
-  useEffect(() => {
-    setInvitations(party?.activeInvitations ?? []);
-
-    return party?.invitationsUpdate.on(() => {
-      setInvitations([...party.activeInvitations]);
-    });
-  }, [party]);
-
-  return invitations;
+  return useInvitations(party);
 };

package/src/hooks/invitations/useSecretProvider.ts

@@ -6,8 +6,14 @@ import { useState } from 'react';
 
 import { trigger } from '@dxos/async';
 
-export const useSecretProvider = <T> (): [() => Promise<T>, (value: T) => void] => {
-  const [[provider, resolver]] = useState(() => trigger<T>());
+type Provider<T> = () => Promise<T>;
+type Resolver<T> = (value: T) => void;
+type Reset = () => void;
 
-  return [provider, resolver];
+export const useSecretProvider = <T> (): [Provider<T>, Resolver<T>, Reset] => {
+  const [[provider, resolver], setState] = useState(() => trigger<T>());
+
+  const reset = () => setState(() => trigger<T>());
+
+  return [provider, resolver, reset];
 };

package/stories/halo-invitations.stories.tsx

@@ -8,8 +8,7 @@ import {
   Box, Button, Divider, Paper, TextField, Toolbar
 } from '@mui/material';
 
-import { Awaited } from '@dxos/async';
-import { Client, decodeInvitation, PendingInvitation } from '@dxos/client';
+import { decodeInvitation, encodeInvitation, Invitation } from '@dxos/client';
 
 import {
   ClientProvider,
@@ -33,19 +32,24 @@ export default {
  */
 const HaloInvitationContainer = () => {
   const client = useClient();
-  const [invitation, setInvitation] = useState<PendingInvitation | undefined>();
+  const [invitationCode, setInvitationCode] = useState<string>();
   const [pin, setPin] = useState('');
 
+  const resetInvitations = () => {
+    setInvitationCode('');
+    setPin('');
+  };
+
   const handleCreateInvitation = async () => {
-    const invitation = await client.createHaloInvitation({
-      onFinish: () => { // TODO(burdon): Normalize callbacks (error, etc.)
-        setInvitation(undefined);
-        setPin('');
-      },
-      onPinGenerated: setPin
+    resetInvitations();
+
+    const invitation = await client.halo.createInvitation();
+    invitation.finished.on(() => resetInvitations());
+    invitation.connected.on(() => {
+      setPin(invitation.secret.toString());
     });
 
-    setInvitation(invitation);
+    setInvitationCode(encodeInvitation(invitation.descriptor));
   };
 
   if (!client.halo.hasProfile()) {
@@ -62,13 +66,13 @@ const HaloInvitationContainer = () => {
         </Button>
       </Toolbar>
 
-      {invitation && (
+      {invitationCode && (
         <Box sx={{ marginTop: 1 }}>
           <TextField
             disabled
             multiline
             fullWidth
-            value={invitation.invitationCode}
+            value={invitationCode}
             maxRows={3}
           />
         </Box>
@@ -90,7 +94,7 @@ const HaloInvitationContainer = () => {
 interface Status {
   error?: any,
   identity?: string,
-  finishAuthentication?: Awaited<ReturnType<Client['joinHaloInvitation']>>
+  invitation?: Invitation
 }
 
 /**
@@ -102,13 +106,9 @@ const HaloAuthenticationContainer = () => {
 
   const handleSubmit = async (invitationCode: string) => {
     try {
-      const invitation = decodeInvitation(invitationCode);
-
-      // Claim an invitation for this device to join an existing Halo.
-      if (invitation.identityKey) {
-        const finishAuthentication = await client.joinHaloInvitation(invitation);
-        setStatus({ identity: invitation.identityKey.toString(), finishAuthentication });
-      }
+      const invitationDescriptor = decodeInvitation(invitationCode);
+      const invitation = await client.halo.acceptInvitation(invitationDescriptor);
+      setStatus({ identity: invitationDescriptor.identityKey?.toString(), invitation });
     } catch (err: any) {
       // TODO(burdon): Doesn't support retry. Provide hint (eg, should retry/cancel).
       setStatus({ error: err });
@@ -116,7 +116,7 @@ const HaloAuthenticationContainer = () => {
   };
 
   const handleAuthenticate = async (pin: string) => {
-    await status.finishAuthentication?.(pin);
+    await status.invitation?.authenticate(Buffer.from(pin));
   };
 
   return (

package/stories/party-invitations.stories.tsx

@@ -8,7 +8,7 @@ import {
   Box, Button, Divider, Paper, TextField, Toolbar
 } from '@mui/material';
 
-import { decodeInvitation, encodeInvitation, Invitation } from '@dxos/client';
+import { decodeInvitation, encodeInvitation, PartyInvitation } from '@dxos/client';
 import { PublicKey } from '@dxos/crypto';
 
 import {
@@ -56,30 +56,20 @@ const PartyInvitationContainer = () => {
     });
   };
 
-  // const handleCreateInvitation = async () => {
-  //   const invitation = await client.createHaloInvitation({
-  //     onFinish: () => { // TODO(burdon): Normalize callbacks (error, etc.)
-  //       setInvitation(undefined);
-  //       setPin('');
-  //     },
-  //     onPinGenerated: setPin
-  //   });
-
-  //   setInvitation(invitation);
-  // };
-
   const handleCreateInvitation = () => {
     setImmediate(async () => {
       resetInvitations();
-      if (contact) {
-        const invitation = await client.echo.getParty(partyKey!)!.createInvitation({ inviteeKey: PublicKey.fromHex(contact!) });
-        setInvitationCode(encodeInvitation(invitation.descriptor));
-      } else {
-        const invitation = await client.echo.createInvitation(partyKey!);
+
+      const invitation = await client.echo.getParty(partyKey!)!.createInvitation({
+        inviteeKey: contact ? PublicKey.fromHex(contact!) : undefined
+      });
+      invitation.finished.on(() => resetInvitations());
+
+      if (!contact) {
         invitation.connected.on(() => setPin(invitation.secret.toString()));
-        invitation.finished.on(() => resetInvitations());
-        setInvitationCode(encodeInvitation(invitation.descriptor));
       }
+
+      setInvitationCode(encodeInvitation(invitation.descriptor));
     });
   };
 
@@ -140,7 +130,7 @@ const PartyInvitationContainer = () => {
 interface Status {
   error?: any,
   party?: string,
-  invitation?: Invitation
+  invitation?: PartyInvitation
 }
 
 /**