@dxos/react-client 2.17.3 → 2.18.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dxos/react-client",
-	"version": "2.17.3",
+	"version": "2.18.2",
 	"description": "React client API",
 	"keywords": [],
 	"license": "AGPL-3.0",
@@ -14,14 +14,14 @@
 		"test": "toolchain test"
 	},
 	"dependencies": {
-		"@dxos/async": "2.17.3",
-		"@dxos/client": "2.17.3",
-		"@dxos/config": "2.17.3",
-		"@dxos/credentials": "2.17.3",
-		"@dxos/crypto": "2.17.3",
-		"@dxos/debug": "2.17.3",
-		"@dxos/echo-db": "2.17.3",
-		"@dxos/util": "2.17.3",
+		"@dxos/async": "2.18.2",
+		"@dxos/client": "2.18.2",
+		"@dxos/config": "2.18.2",
+		"@dxos/credentials": "2.18.2",
+		"@dxos/crypto": "2.18.2",
+		"@dxos/debug": "2.18.2",
+		"@dxos/echo-db": "2.18.2",
+		"@dxos/util": "2.18.2",
 		"@types/debug": "^4.1.1",
 		"assert": "^2.0.0",
 		"debug": "^4.1.1",
@@ -29,7 +29,7 @@
 		"use-subscription": "^1.4.1"
 	},
 	"devDependencies": {
-		"@dxos/toolchain-node-library": "2.10.10",
+		"@dxos/toolchain-node-library": "2.18.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 5662 ms
+OK in 5520 ms
 
 eslint
-OK in 5244 ms
+OK in 6202 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 (203ms)
+  7 passing (329ms)
 
-OK in 7076 ms
+OK in 10276 ms
 
-CHECK COMPLETE in 17987 ms
+CHECK COMPLETE in 22004 ms

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

@@ -5,3 +5,4 @@
 export * from './useContacts';
 export * from './useMembers';
 export * from './useParties';
+export * from './useRemoteParties';

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

@@ -0,0 +1,25 @@
+//
+// Copyright 2020 DXOS.org
+//
+
+import { useEffect, useState } from 'react';
+
+import { useClient } from '../client';
+
+/**
+ * Get all Parties available to current user.
+ * To be used with `ClientProvider` or `ClientInitializer` component wrapper.
+ */
+export const useRemoteParties = () => {
+  const client = useClient();
+  const [parties, setParties] = useState<{key?: Uint8Array}[]>([]);
+
+  useEffect(() => {
+    const stream = client.services.PartyService.SubscribeParties();
+    stream.subscribe(result => setParties(result.parties ?? []), console.error);
+
+    return () => stream.close();
+  }, []);
+
+  return parties;
+};

package/src/index.ts

@@ -5,3 +5,4 @@
 export * from './components';
 export * from './containers';
 export * from './hooks';
+export * from './config';

package/stories/halo-invitations.stories.tsx

@@ -8,21 +8,18 @@ import {
   Box, Button, Divider, Paper, TextField, Toolbar
 } from '@mui/material';
 
-import { encodeInvitation, decodeInvitation } from '@dxos/client';
+import { Awaited } from '@dxos/async';
+import { Client, decodeInvitation, PendingInvitation } from '@dxos/client';
 
 import {
   ClientInitializer,
   ProfileInitializer,
   useClient,
   useParties,
-  useProfile,
-  useSecretGenerator,
-  useSecretProvider
+  useProfile
 } from '../src';
 import {
-  ClientPanel,
-  PartyJoinPanel,
-  Container
+  ClientPanel, Container, PartyJoinPanel
 } from './helpers';
 
 export default {
@@ -36,18 +33,19 @@ export default {
  */
 const HaloInvitationContainer = () => {
   const client = useClient();
-  const [invitationCode, setInvitationCode] = useState<string>();
-  const [secretProvider, pin, resetPin] = useSecretGenerator();
+  const [invitation, setInvitation] = useState<PendingInvitation | undefined>();
+  const [pin, setPin] = useState('');
 
   const handleCreateInvitation = async () => {
-    const invitation = await client.createHaloInvitation(secretProvider, {
+    const invitation = await client.createHaloInvitation({
       onFinish: () => { // TODO(burdon): Normalize callbacks (error, etc.)
-        setInvitationCode(undefined);
-        resetPin();
-      }
+        setInvitation(undefined);
+        setPin('');
+      },
+      onPinGenerated: setPin
     });
 
-    setInvitationCode(encodeInvitation(invitation));
+    setInvitation(invitation);
   };
 
   if (!client.halo.hasProfile()) {
@@ -64,13 +62,13 @@ const HaloInvitationContainer = () => {
         </Button>
       </Toolbar>
 
-      {invitationCode && (
+      {invitation && (
         <Box sx={{ marginTop: 1 }}>
           <TextField
             disabled
             multiline
             fullWidth
-            value={invitationCode}
+            value={invitation.invitationCode}
             maxRows={3}
           />
         </Box>
@@ -89,22 +87,27 @@ const HaloInvitationContainer = () => {
   );
 };
 
+interface Status {
+  error?: any,
+  identity?: string,
+  finishAuthentication?: Awaited<ReturnType<Client['joinHaloInvitation']>>
+}
+
 /**
  * Processes device invitations/authentication.
  */
 const HaloAuthenticationContainer = () => {
   const client = useClient();
-  const [status, setStatus] = useState<any>({});
-  const [secretProvider, secretResolver] = useSecretProvider<Buffer>();
+  const [status, setStatus] = useState<Status>({});
 
   const handleSubmit = async (invitationCode: string) => {
     try {
       const invitation = decodeInvitation(invitationCode);
 
-      // Create an invitation for this device to join an existing Halo.
+      // Claim an invitation for this device to join an existing Halo.
       if (invitation.identityKey) {
-        await client.echo.halo.join(invitation, secretProvider);
-        setStatus({ identity: invitation.identityKey.toString() });
+        const finishAuthentication = await client.joinHaloInvitation(invitation);
+        setStatus({ identity: invitation.identityKey.toString(), finishAuthentication });
       }
     } catch (err: any) {
       // TODO(burdon): Doesn't support retry. Provide hint (eg, should retry/cancel).
@@ -112,8 +115,8 @@ const HaloAuthenticationContainer = () => {
     }
   };
 
-  const handleAuthenticate = (pin: string) => {
-    secretResolver(Buffer.from(pin));
+  const handleAuthenticate = async (pin: string) => {
+    await status.finishAuthentication?.(pin);
   };
 
   return (