@dxos/react-client 2.19.12-dev.aaf6c6df → 2.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "2.19.12-dev.aaf6c6df",
+  "version": "2.20.0",
   "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.12-dev.aaf6c6df",
-    "@dxos/bot-factory-client": "2.19.12-dev.aaf6c6df",
-    "@dxos/client": "2.19.12-dev.aaf6c6df",
-    "@dxos/config": "2.19.12-dev.aaf6c6df",
-    "@dxos/credentials": "2.19.12-dev.aaf6c6df",
-    "@dxos/crypto": "2.19.12-dev.aaf6c6df",
-    "@dxos/debug": "2.19.12-dev.aaf6c6df",
-    "@dxos/echo-db": "2.19.12-dev.aaf6c6df",
-    "@dxos/util": "2.19.12-dev.aaf6c6df",
+    "@dxos/async": "2.20.0",
+    "@dxos/bot-factory-client": "2.20.0",
+    "@dxos/client": "2.20.0",
+    "@dxos/config": "2.20.0",
+    "@dxos/credentials": "2.20.0",
+    "@dxos/crypto": "2.20.0",
+    "@dxos/debug": "2.20.0",
+    "@dxos/echo-db": "2.20.0",
+    "@dxos/util": "2.20.0",
     "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.12-dev.aaf6c6df",
+    "@dxos/esbuild-plugins": "2.20.0",
     "@dxos/esbuild-server": "~1.7.4",
-    "@dxos/toolchain-node-library": "2.19.11",
+    "@dxos/toolchain-node-library": "2.20.0",
     "@mui/material": "^5.0.1",
     "@testing-library/react": "^11.0.4",
     "@testing-library/react-hooks": "5.1.2",

package/react-client.build.log

@@ -3,10 +3,10 @@ Invoking: toolchain build:test
 ENOENT: no such file or directory, stat '/home/github/_work/protocols/protocols/packages/sdk/react-client/src/proto/gen'
 
 typescript
-OK in 4672 ms
+OK in 5389 ms
 
 eslint
-OK in 10387 ms
+OK in 7472 ms
 
 mocha
 This browser doesn't support requestAnimationFrame. Make sure that you load a polyfill in older browsers. https://reactjs.org/link/react-polyfills
@@ -14,7 +14,7 @@ This browser doesn't support cancelAnimationFrame. Make sure that you load a pol
 
 
   ClientProvider
-    ✓ Renders with children (38ms)
+    ✓ Renders with children (39ms)
     ✓ Provides the client
 
   Client hook
@@ -27,8 +27,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 (440ms)
+  7 passing (390ms)
 
-OK in 2869 ms
+OK in 2591 ms
 
-CHECK COMPLETE in 17935 ms
+CHECK COMPLETE in 15462 ms

package/src/hooks/invitations/index.ts

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

package/src/hooks/invitations/usePartyInvitations.ts

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

package/stories/halo-invitations.stories.tsx

@@ -146,7 +146,7 @@ const TestApp = () => {
         <ClientPanel client={client} profile={profile} parties={parties} />
         <Divider />
         <HaloInvitationContainer />
-        {!client.halo.isInitialized && (
+        {!profile && (
           <>
             <Divider />
             <HaloAuthenticationContainer />

package/stories/party-invitations.stories.tsx

@@ -10,7 +10,6 @@ import {
 
 import { decodeInvitation, encodeInvitation, Invitation } from '@dxos/client';
 import { PublicKey } from '@dxos/crypto';
-import { InvitationDescriptorType } from '@dxos/echo-db';
 
 import {
   ClientProvider,
@@ -73,8 +72,8 @@ const PartyInvitationContainer = () => {
     setImmediate(async () => {
       resetInvitations();
       if (contact) {
-        const invitation = await client.echo.createOfflineInvitation(partyKey!, PublicKey.fromHex(contact!));
-        setInvitationCode(encodeInvitation(invitation));
+        const invitation = await client.echo.getParty(partyKey!)!.createInvitation({ inviteeKey: PublicKey.fromHex(contact!) });
+        setInvitationCode(encodeInvitation(invitation.descriptor));
       } else {
         const invitation = await client.echo.createInvitation(partyKey!);
         invitation.connected.on(() => setPin(invitation.secret.toString()));
@@ -155,15 +154,11 @@ const PartyJoinContainer = () => {
     setStatus({});
 
     try {
-      const invitation = decodeInvitation(invitationCode);
-      if (invitation.type === InvitationDescriptorType.OFFLINE) {
-        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 });
-      }
+      const invitation = await client.echo.acceptInvitation(decodeInvitation(invitationCode));
+      setStatus({ invitation });
+
+      const party = await invitation.getParty();
+      setStatus({ party: party.key.toHex() });
     } catch (error: any) {
       setStatus({ error });
     }

package/dist/src/hooks/invitations/useSecretGenerator.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="node" />
-export declare const useSecretGenerator: () => [() => Promise<Buffer>, string | undefined, () => void];
-//# sourceMappingURL=useSecretGenerator.d.ts.map

package/dist/src/hooks/invitations/useSecretGenerator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useSecretGenerator.d.ts","sourceRoot":"","sources":["../../../../src/hooks/invitations/useSecretGenerator.ts"],"names":[],"mappings":";AAQA,eAAO,MAAM,kBAAkB,QAAO,CAAC,MAAM,QAAQ,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,IAAI,CAU3F,CAAC"}

package/dist/src/hooks/invitations/useSecretGenerator.js

@@ -1,19 +0,0 @@
-"use strict";
-//
-// Copyright 2021 DXOS.org
-//
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSecretGenerator = void 0;
-const react_1 = require("react");
-const credentials_1 = require("@dxos/credentials");
-const useSecretGenerator = () => {
-    const [pin, setPin] = (0, react_1.useState)();
-    const provider = () => {
-        const pin = (0, credentials_1.generatePasscode)();
-        setPin(pin);
-        return Promise.resolve(Buffer.from(pin));
-    };
-    return [provider, pin, () => setPin(undefined)];
-};
-exports.useSecretGenerator = useSecretGenerator;
-//# sourceMappingURL=useSecretGenerator.js.map

package/dist/src/hooks/invitations/useSecretGenerator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useSecretGenerator.js","sourceRoot":"","sources":["../../../../src/hooks/invitations/useSecretGenerator.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,iCAAiC;AAEjC,mDAAqD;AAE9C,MAAM,kBAAkB,GAAG,GAA4D,EAAE;IAC9F,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,IAAA,gBAAQ,GAAU,CAAC;IAEzC,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,MAAM,GAAG,GAAG,IAAA,8BAAgB,GAAE,CAAC;QAC/B,MAAM,CAAC,GAAG,CAAC,CAAC;QACZ,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC;IAEF,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;AAClD,CAAC,CAAC;AAVW,QAAA,kBAAkB,sBAU7B"}

package/src/hooks/invitations/useSecretGenerator.ts

@@ -1,19 +0,0 @@
-//
-// Copyright 2021 DXOS.org
-//
-
-import { useState } from 'react';
-
-import { generatePasscode } from '@dxos/credentials';
-
-export const useSecretGenerator = (): [() => Promise<Buffer>, string | undefined, () => void] => {
-  const [pin, setPin] = useState<string>();
-
-  const provider = () => {
-    const pin = generatePasscode();
-    setPin(pin);
-    return Promise.resolve(Buffer.from(pin));
-  };
-
-  return [provider, pin, () => setPin(undefined)];
-};