@dxos/react-client 2.22.1-dev.189b0bd9 → 2.22.1-dev.498d8efa

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "2.22.1-dev.189b0bd9",
+  "version": "2.22.1-dev.498d8efa",
   "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.22.1-dev.189b0bd9",
-    "@dxos/bot-factory-client": "2.22.1-dev.189b0bd9",
-    "@dxos/client": "2.22.1-dev.189b0bd9",
-    "@dxos/config": "2.22.1-dev.189b0bd9",
-    "@dxos/credentials": "2.22.1-dev.189b0bd9",
-    "@dxos/crypto": "2.22.1-dev.189b0bd9",
-    "@dxos/debug": "2.22.1-dev.189b0bd9",
-    "@dxos/echo-db": "2.22.1-dev.189b0bd9",
-    "@dxos/util": "2.22.1-dev.189b0bd9",
+    "@dxos/async": "2.22.1-dev.498d8efa",
+    "@dxos/bot-factory-client": "2.22.1-dev.498d8efa",
+    "@dxos/client": "2.22.1-dev.498d8efa",
+    "@dxos/config": "2.22.1-dev.498d8efa",
+    "@dxos/credentials": "2.22.1-dev.498d8efa",
+    "@dxos/crypto": "2.22.1-dev.498d8efa",
+    "@dxos/debug": "2.22.1-dev.498d8efa",
+    "@dxos/echo-db": "2.22.1-dev.498d8efa",
+    "@dxos/util": "2.22.1-dev.498d8efa",
     "assert": "^2.0.0",
     "debug": "^4.3.3",
     "react-display-name": "^0.2.5",
     "use-subscription": "^1.4.1"
   },
   "devDependencies": {
-    "@dxos/esbuild-plugins": "2.22.1-dev.189b0bd9",
+    "@dxos/esbuild-plugins": "2.22.1-dev.498d8efa",
     "@dxos/esbuild-server": "~1.7.4",
     "@dxos/toolchain-node-library": "2.22.0",
     "@mui/material": "^5.0.1",

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

@@ -5,7 +5,7 @@
 import { useEffect, useState } from 'react';
 
 import { PartyProxy } from '@dxos/client';
-import { PublicKey, PublicKeyLike } from '@dxos/crypto';
+import { PublicKeyLike } from '@dxos/crypto';
 
 import { useClient } from '../client';
 
@@ -14,9 +14,8 @@ import { useClient } from '../client';
  * Requires ClientContext to be set via ClientProvider.
  */
 export const useParty = (partyKey?: PublicKeyLike): PartyProxy | undefined => {
-  const client = useClient();
-  // TODO(wittjosiah): Not responsive to party updates?
-  return partyKey ? client.echo.getParty(PublicKey.from(partyKey)) : undefined;
+  const parties = useParties();
+  return parties.find(party => partyKey && party.key.equals(partyKey));
 };
 
 /**

package/stories/halo-invitations.stories.tsx

@@ -8,7 +8,8 @@ import {
   Box, Button, Divider, Paper, TextField, Toolbar
 } from '@mui/material';
 
-import { decodeInvitation, encodeInvitation, Invitation } from '@dxos/client';
+import { Invitation } from '@dxos/client';
+import { InvitationDescriptor } from '@dxos/echo-db';
 
 import {
   ClientProvider,
@@ -49,7 +50,7 @@ const HaloInvitationContainer = () => {
       setPin(invitation.secret.toString());
     });
 
-    setInvitationCode(encodeInvitation(invitation.descriptor));
+    setInvitationCode(invitation.descriptor.encode());
   };
 
   if (!client.halo.hasProfile()) {
@@ -106,7 +107,7 @@ const HaloAuthenticationContainer = () => {
 
   const handleSubmit = async (invitationCode: string) => {
     try {
-      const invitationDescriptor = decodeInvitation(invitationCode);
+      const invitationDescriptor = InvitationDescriptor.decode(invitationCode);
       const invitation = await client.halo.acceptInvitation(invitationDescriptor);
       setStatus({ identity: invitationDescriptor.identityKey?.toString(), invitation });
     } catch (err: any) {

package/stories/party-invitations.stories.tsx

@@ -8,8 +8,9 @@ import {
   Box, Button, Divider, Paper, TextField, Toolbar
 } from '@mui/material';
 
-import { decodeInvitation, encodeInvitation, PartyInvitation } from '@dxos/client';
+import { PartyInvitation } from '@dxos/client';
 import { PublicKey } from '@dxos/crypto';
+import { InvitationDescriptor } from '@dxos/echo-db';
 
 import {
   ClientProvider,
@@ -69,7 +70,7 @@ const PartyInvitationContainer = () => {
         invitation.connected.on(() => setPin(invitation.secret.toString()));
       }
 
-      setInvitationCode(encodeInvitation(invitation.descriptor));
+      setInvitationCode(invitation.descriptor.encode());
     });
   };
 
@@ -144,7 +145,7 @@ const PartyJoinContainer = () => {
     setStatus({});
 
     try {
-      const invitation = await client.echo.acceptInvitation(decodeInvitation(invitationCode));
+      const invitation = await client.echo.acceptInvitation(InvitationDescriptor.decode(invitationCode));
       setStatus({ invitation });
 
       const party = await invitation.getParty();