@dxos/react-client 2.19.12-dev.15870405 → 2.19.12-dev.65b9deba

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "2.19.12-dev.15870405",
+  "version": "2.19.12-dev.65b9deba",
   "description": "React client API",
   "keywords": [],
   "license": "AGPL-3.0",
@@ -8,23 +8,23 @@
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "dependencies": {
-    "@dxos/async": "2.19.12-dev.15870405",
-    "@dxos/bot-factory-client": "2.19.12-dev.15870405",
-    "@dxos/client": "2.19.12-dev.15870405",
-    "@dxos/config": "2.19.12-dev.15870405",
-    "@dxos/credentials": "2.19.12-dev.15870405",
-    "@dxos/crypto": "2.19.12-dev.15870405",
-    "@dxos/debug": "2.19.12-dev.15870405",
-    "@dxos/echo-db": "2.19.12-dev.15870405",
-    "@dxos/util": "2.19.12-dev.15870405",
+    "@dxos/async": "2.19.12-dev.65b9deba",
+    "@dxos/bot-factory-client": "2.19.12-dev.65b9deba",
+    "@dxos/client": "2.19.12-dev.65b9deba",
+    "@dxos/config": "2.19.12-dev.65b9deba",
+    "@dxos/credentials": "2.19.12-dev.65b9deba",
+    "@dxos/crypto": "2.19.12-dev.65b9deba",
+    "@dxos/debug": "2.19.12-dev.65b9deba",
+    "@dxos/echo-db": "2.19.12-dev.65b9deba",
+    "@dxos/util": "2.19.12-dev.65b9deba",
     "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.15870405",
-    "@dxos/esbuild-server": "~1.7.2",
+    "@dxos/esbuild-plugins": "2.19.12-dev.65b9deba",
+    "@dxos/esbuild-server": "~1.7.4",
     "@dxos/toolchain-node-library": "2.19.11",
     "@mui/material": "^5.0.1",
     "@testing-library/react": "^11.0.4",

package/react-client.build.log

@@ -1,34 +0,0 @@
-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 15862 ms
-
-eslint
-OK in 13928 ms
-
-mocha
-This browser doesn't support requestAnimationFrame. Make sure that you load a polyfill in older browsers. https://reactjs.org/link/react-polyfills
-This browser doesn't support cancelAnimationFrame. Make sure that you load a polyfill in older browsers. https://reactjs.org/link/react-polyfills
-
-
-  ClientProvider
-    ✓ Renders with children
-    ✓ Provides the client
-
-  Client hook
-    ✓ should throw when used outside a context
-    ✓ should return client when used properly in a context
-
-  Config hook
-    ✓ should throw when used outside a context
-    ✓ should return default client config when no config is passed in a context
-    ✓ should return custom client config when used properly in a context
-
-
-  7 passing (469ms)
-
-OK in 3324 ms
-
-CHECK COMPLETE in 33123 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/.rush/temp/package-deps_build.json

@@ -1,56 +0,0 @@
-{
-  "files": {
-    "packages/sdk/react-client/.rush/temp/shrinkwrap-deps.json": "e7b3b7a723a0dc1ec8289b9d3c5ffe2d1e4d5a0d",
-    "packages/sdk/react-client/README.md": "f781dc2b0cf91ac94e4ee57e8c2e9c24d371e575",
-    "packages/sdk/react-client/esbuild-server.config.js": "4cd7d0e6cd307de23b075d64c07ad4e0cf715ff4",
-    "packages/sdk/react-client/package.json": "5959f8cad88bd13a1c17d0ca8b1f31543cb7ea76",
-    "packages/sdk/react-client/src/banner.ts": "0c7616c09c6acb9abfdc09ebb8074ee06277cf11",
-    "packages/sdk/react-client/src/containers/ClientProvider.test.tsx": "dc7ff4b7baf181522f3ab4210aed35361fd30939",
-    "packages/sdk/react-client/src/containers/ClientProvider.tsx": "34f684a1698cc1f5bc3235175ab34a508f3c2856",
-    "packages/sdk/react-client/src/containers/index.ts": "b7c76473fa7b17166837ffe492f78cd2bfaf42fc",
-    "packages/sdk/react-client/src/hooks/bot-factory/index.ts": "970b504d70018209eed44806152b76a612e5853c",
-    "packages/sdk/react-client/src/hooks/bot-factory/useBotFactoryClient.ts": "bb7e3f3bf0819ea74cb840c56583dea230030446",
-    "packages/sdk/react-client/src/hooks/client/client.test.tsx": "315161751b8ac1d9d5f47accc69fff4b33dea0f0",
-    "packages/sdk/react-client/src/hooks/client/config.test.tsx": "34b094a3d1e10aa7003e0ddf31d7790333be91a4",
-    "packages/sdk/react-client/src/hooks/client/context.ts": "8214e48537ec5f1f5dd63531147047f238b131d7",
-    "packages/sdk/react-client/src/hooks/client/index.ts": "ae7c3dd1bb38ba7f622073fb6850d08ce70ecc52",
-    "packages/sdk/react-client/src/hooks/client/useClient.ts": "a57cc8ce9cd54e0f20c10923b7d70e9029b57665",
-    "packages/sdk/react-client/src/hooks/client/useConfig.ts": "6ad945c8d378e560c24640b87036415b9bc0f811",
-    "packages/sdk/react-client/src/hooks/client/useProfile.ts": "f46262917bf0fc6e6b025368380cf6d5d67634c6",
-    "packages/sdk/react-client/src/hooks/echo-queries/index.ts": "3eb29bc51f3b511a86adc34047138f80b20e0d25",
-    "packages/sdk/react-client/src/hooks/echo-queries/useContacts.ts": "4c7df3e75a448535b8f96631038e6810fe840ac8",
-    "packages/sdk/react-client/src/hooks/echo-queries/useMembers.tsx": "a7253e5bd50524ccd8e7c8a1b46ebaa0bfec53a8",
-    "packages/sdk/react-client/src/hooks/echo-queries/useParties.ts": "2a81acfc6b36e8dfca26f7d8b4e4c51cebd7d2fc",
-    "packages/sdk/react-client/src/hooks/echo-queries/useRemoteParties.ts": "4657d62c7c37b5736d85c1cf4d636287268ce1ed",
-    "packages/sdk/react-client/src/hooks/echo-selections/index.ts": "bd7c992f3c4355158dcb3698d4d93d919b8325fa",
-    "packages/sdk/react-client/src/hooks/echo-selections/search.ts": "d78a5b3b688dc5535e5fff2953bf911bf22dd2e8",
-    "packages/sdk/react-client/src/hooks/echo-selections/useSelection.ts": "386aea0d2f27eb4fed65eb4b63b92492567c95e5",
-    "packages/sdk/react-client/src/hooks/index.ts": "45dcdd5e8712652c72c57ca7e66c4a0369cad45b",
-    "packages/sdk/react-client/src/hooks/invitations/index.ts": "94fe8cbc9872da7a1edc9201f9545978a7e4d1da",
-    "packages/sdk/react-client/src/hooks/invitations/useSecretGenerator.ts": "904b220863be410825eaec9c31c9ee9b9c88c08f",
-    "packages/sdk/react-client/src/hooks/invitations/useSecretProvider.ts": "ac932b9964b1cb21011aefa89c09849897c25fca",
-    "packages/sdk/react-client/src/hooks/util/index.ts": "f0419f072260d9cc907aba489590791d2ccf0f5b",
-    "packages/sdk/react-client/src/hooks/util/useResultSet.ts": "11b1d68c81930e82f5d39b00b4e6381e3249371e",
-    "packages/sdk/react-client/src/hooks/wns/index.ts": "42b9a65f575eca413d37d3576d0dc0fb70585758",
-    "packages/sdk/react-client/src/hooks/wns/registry.ts": "1fa723dbddac0bef5051d2c81748aab2096d6957",
-    "packages/sdk/react-client/src/hooks/wns/registryBotFactories.ts": "a765b94908c14fe83a4d61fa19ac24b383772bd3",
-    "packages/sdk/react-client/src/hooks/wns/registryBots.ts": "5430bbff71bc12b59eff67d19b00e87f5924f814",
-    "packages/sdk/react-client/src/hooks/wns/types.ts": "42fb64aaafbe4648d8f817bbb278b5cce197dd95",
-    "packages/sdk/react-client/src/index.ts": "e5e79dc66b7ed5e0e010e0d56fafbc96365c6d5e",
-    "packages/sdk/react-client/src/testing/ProfileInitializer.tsx": "fec239c7b218f6a138c89c16b57ef701a18c04ff",
-    "packages/sdk/react-client/src/testing/index.ts": "9e023b0470159958d7a538130199b576a408a5df",
-    "packages/sdk/react-client/stories/client.stories.tsx": "48003a0ef5a1e729091a7f2999bf5e3a6762c81d",
-    "packages/sdk/react-client/stories/halo-invitations.stories.tsx": "52242778cb6bcc0092d545620dbc613b4d9d242d",
-    "packages/sdk/react-client/stories/helpers/ClientPanel.tsx": "1eafdb3a2666a7f56034cb06319154e40301c866",
-    "packages/sdk/react-client/stories/helpers/ContactsSelector.tsx": "702919f8031ab1c923b0ef829ee10ec3527dbba4",
-    "packages/sdk/react-client/stories/helpers/Container.tsx": "ab90a46770f01c94687f182627ef132f108a63b7",
-    "packages/sdk/react-client/stories/helpers/JsonPanel.tsx": "55a9f3e1452c553a63970bc022b56ee86290e837",
-    "packages/sdk/react-client/stories/helpers/PartyJoinPanel.tsx": "1b3798a43d67ec6224bdef5d6bbbf8e54f8d20f1",
-    "packages/sdk/react-client/stories/helpers/ThemeProvider.tsx": "b4023674d5ec66910481f5e37fc507d46a0e9437",
-    "packages/sdk/react-client/stories/helpers/index.ts": "3f5c4425b7ebd5a702f4159eebfaff695c0b2a1c",
-    "packages/sdk/react-client/stories/party-invitations.stories.tsx": "7fdb4ba72444127d7a91e73a6b5bbf18fb5ef2f6",
-    "packages/sdk/react-client/tests/config.test.ts": "7bf77786817c03c0b4a9fbe8bd38a629a15869e5",
-    "packages/sdk/react-client/tsconfig.json": "0105c4a7888e237dce4ef5bde51e3224ffa05983"
-  },
-  "arguments": "toolchain build "
-}

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)];
-};