@dxos/react-client 2.19.7-dev.42eb65c2 → 2.19.8-dev.1dd2f6c4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "2.19.7-dev.42eb65c2",
+  "version": "2.19.8-dev.1dd2f6c4",
   "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.19.7-dev.42eb65c2",
-    "@dxos/bot-factory-client": "2.19.7-dev.42eb65c2",
-    "@dxos/client": "2.19.7-dev.42eb65c2",
-    "@dxos/config": "2.19.7-dev.42eb65c2",
-    "@dxos/credentials": "2.19.7-dev.42eb65c2",
-    "@dxos/crypto": "2.19.7-dev.42eb65c2",
-    "@dxos/debug": "2.19.7-dev.42eb65c2",
-    "@dxos/echo-db": "2.19.7-dev.42eb65c2",
-    "@dxos/util": "2.19.7-dev.42eb65c2",
+    "@dxos/async": "2.19.8-dev.1dd2f6c4",
+    "@dxos/bot-factory-client": "2.19.8-dev.1dd2f6c4",
+    "@dxos/client": "2.19.8-dev.1dd2f6c4",
+    "@dxos/config": "2.19.8-dev.1dd2f6c4",
+    "@dxos/credentials": "2.19.8-dev.1dd2f6c4",
+    "@dxos/crypto": "2.19.8-dev.1dd2f6c4",
+    "@dxos/debug": "2.19.8-dev.1dd2f6c4",
+    "@dxos/echo-db": "2.19.8-dev.1dd2f6c4",
+    "@dxos/util": "2.19.8-dev.1dd2f6c4",
     "assert": "^2.0.0",
     "debug": "^4.3.3",
     "react-display-name": "^0.2.5",
     "use-subscription": "^1.4.1"
   },
   "devDependencies": {
-    "@dxos/esbuild-plugins": "2.19.7-dev.42eb65c2",
-    "@dxos/esbuild-server": "~1.7.1",
-    "@dxos/toolchain-node-library": "2.19.6",
+    "@dxos/esbuild-plugins": "2.19.8-dev.1dd2f6c4",
+    "@dxos/esbuild-server": "~1.7.2",
+    "@dxos/toolchain-node-library": "2.19.7",
     "@mui/material": "^5.0.1",
     "@testing-library/react": "^11.0.4",
     "@testing-library/react-hooks": "5.1.2",

package/src/hooks/invitations/useSecretProvider.ts

@@ -6,7 +6,7 @@ import { useState } from 'react';
 
 import { trigger } from '@dxos/async';
 
-export const useSecretProvider = <T extends any> (): [() => Promise<T>, (value: T) => void] => {
+export const useSecretProvider = <T> (): [() => Promise<T>, (value: T) => void] => {
   const [[provider, resolver]] = useState(() => trigger<T>());
 
   return [provider, resolver];

package/stories/party-invitations.stories.tsx

@@ -8,7 +8,7 @@ import {
   Box, Button, Divider, Paper, TextField, Toolbar
 } from '@mui/material';
 
-import { encodeInvitation, decodeInvitation } from '@dxos/client';
+import { decodeInvitation, encodeInvitation, Invitation } from '@dxos/client';
 import { PublicKey } from '@dxos/crypto';
 import { InvitationDescriptorType } from '@dxos/echo-db';
 
@@ -18,9 +18,7 @@ import {
   useClient,
   useContacts,
   useParties,
-  useProfile,
-  useSecretGenerator,
-  useSecretProvider
+  useProfile
 } from '../src';
 import {
   ClientPanel,
@@ -42,31 +40,47 @@ const PartyInvitationContainer = () => {
   const client = useClient();
   const [partyKey, setPartyKey] = useState<PublicKey>();
   const [invitationCode, setInvitationCode] = useState<string>();
-  const [secretProvider, pin, resetPin] = useSecretGenerator();
   const [contact, setContact] = useState<string>();
   const [contacts] = useContacts();
+  const [pin, setPin] = useState('');
+
+  const resetInvitations = () => {
+    setInvitationCode('');
+    setPin('');
+  };
 
   const handleCreateParty = () => {
     setImmediate(async () => {
       const party = await client.echo.createParty();
       setPartyKey(party.key);
-      setInvitationCode('');
-      resetPin();
+      resetInvitations();
     });
   };
 
+  // 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 () => {
-      const invitation = (contact)
-        ? await client.echo.createOfflineInvitation(partyKey!, PublicKey.fromHex(contact!))
-        : await client.echo.createInvitation(partyKey!, { secretProvider }, {
-          onFinish: () => { // TODO(burdon): Normalize callbacks (error, etc.)
-            setInvitationCode(undefined);
-            resetPin();
-          }
-        });
-
-      setInvitationCode(encodeInvitation(invitation));
+      resetInvitations();
+      if (contact) {
+        const invitation = await client.echo.createOfflineInvitation(partyKey!, PublicKey.fromHex(contact!));
+        setInvitationCode(encodeInvitation(invitation));
+      } else {
+        const invitation = await client.echo.createInvitation(partyKey!);
+        invitation.connected.on(() => setPin(invitation.secret.toString()));
+        invitation.finshed.on(() => resetInvitations());
+        setInvitationCode(encodeInvitation(invitation.descriptor));
+      }
     });
   };
 
@@ -124,31 +138,39 @@ const PartyInvitationContainer = () => {
   );
 };
 
+interface Status {
+  error?: any,
+  party?: string,
+  invitation?: Invitation
+}
+
 /**
  * Processes party invitations.
  */
 const PartyJoinContainer = () => {
   const client = useClient();
-  const [status, setStatus] = useState({});
-  const [secretProvider, secretResolver] = useSecretProvider<Buffer>();
+  const [status, setStatus] = useState<Status>({});
 
   const handleSubmit = async (invitationCode: string) => {
     setStatus({});
 
     try {
       const invitation = decodeInvitation(invitationCode);
-      const offline = invitation.type === InvitationDescriptorType.OFFLINE_KEY;
-      const party = await client.echo.joinParty(invitation, offline ? undefined : secretProvider);
-      await party.open();
-
-      setStatus({ party: party.key.toHex() });
+      if (invitation.type === InvitationDescriptorType.OFFLINE_KEY) {
+        const party = await client.echo.joinParty(invitation);
+        await party.open();
+        setStatus({ party: party.key.toHex() });
+      } else {
+        const redeemingInvitation = client.echo.acceptInvitation(invitation);
+        setStatus({ invitation: redeemingInvitation });
+      }
     } catch (error: any) {
       setStatus({ error });
     }
   };
 
-  const handleAuthenticate = (pin: string) => {
-    secretResolver(Buffer.from(pin));
+  const handleAuthenticate = async (pin: string) => {
+    await status.invitation?.authenticate(Buffer.from(pin));
   };
 
   return (

package/tsconfig.json

@@ -21,6 +21,9 @@
     {
       "path": "../../common/async"
     },
+    {
+      "path": "../../bot/bot-factory-client"
+    },
     {
       "path": "../client"
     },