@dxos/react-client 0.7.5-staging.b81e783 → 0.8.0

package/dist/types/src/testing/ClientRepeater.stories.d.ts

@@ -1,7 +1,7 @@
 import '@dxos-theme';
 declare const _default: {
     title: string;
-    decorators: import("@storybook/react/*").Decorator[];
+    decorators: import("@storybook/react").Decorator[];
 };
 export default _default;
 export declare const Default: {

package/dist/types/src/testing/withClientProvider.stories.d.ts

@@ -5,9 +5,9 @@ declare const _default: {
 };
 export default _default;
 export declare const Default: {
-    decorators: import("@storybook/react/*").Decorator[];
+    decorators: import("@storybook/react").Decorator[];
 };
 export declare const Multiple: {
-    decorators: import("@storybook/react/*").Decorator[];
+    decorators: import("@storybook/react").Decorator[];
 };
 //# sourceMappingURL=withClientProvider.stories.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-client",
-  "version": "0.7.5-staging.b81e783",
+  "version": "0.8.0",
   "description": "React client API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -78,40 +78,40 @@
   },
   "dependencies": {
     "react-error-boundary": "^4.0.13",
-    "@dxos/async": "0.7.5-staging.b81e783",
-    "@dxos/client": "0.7.5-staging.b81e783",
-    "@dxos/config": "0.7.5-staging.b81e783",
-    "@dxos/debug": "0.7.5-staging.b81e783",
-    "@dxos/codec-protobuf": "0.7.5-staging.b81e783",
-    "@dxos/invariant": "0.7.5-staging.b81e783",
-    "@dxos/echo-schema": "0.7.5-staging.b81e783",
-    "@dxos/echo-signals": "0.7.5-staging.b81e783",
-    "@dxos/log": "0.7.5-staging.b81e783",
-    "@dxos/protocols": "0.7.5-staging.b81e783",
-    "@dxos/node-std": "0.7.5-staging.b81e783",
-    "@dxos/react-hooks": "0.7.5-staging.b81e783",
-    "@dxos/util": "0.7.5-staging.b81e783"
+    "@dxos/async": "0.8.0",
+    "@dxos/codec-protobuf": "0.8.0",
+    "@dxos/config": "0.8.0",
+    "@dxos/client": "0.8.0",
+    "@dxos/debug": "0.8.0",
+    "@dxos/echo-schema": "0.8.0",
+    "@dxos/echo-signals": "0.8.0",
+    "@dxos/invariant": "0.8.0",
+    "@dxos/log": "0.8.0",
+    "@dxos/node-std": "0.8.0",
+    "@dxos/react-hooks": "0.8.0",
+    "@dxos/util": "0.8.0",
+    "@dxos/protocols": "0.8.0"
   },
   "devDependencies": {
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/random": "0.7.5-staging.b81e783",
-    "@dxos/react-ui": "0.7.5-staging.b81e783",
-    "@dxos/react-ui-syntax-highlighter": "0.7.5-staging.b81e783",
-    "@dxos/react-ui-theme": "0.7.5-staging.b81e783",
-    "@dxos/storybook-utils": "0.7.5-staging.b81e783",
-    "@dxos/test-utils": "0.7.5-staging.b81e783"
+    "@dxos/react-ui": "0.8.0",
+    "@dxos/react-ui-syntax-highlighter": "0.8.0",
+    "@dxos/random": "0.8.0",
+    "@dxos/react-ui-theme": "0.8.0",
+    "@dxos/storybook-utils": "0.8.0",
+    "@dxos/test-utils": "0.8.0"
   },
   "peerDependencies": {
     "react": "~18.2.0",
     "react-dom": "~18.2.0"
   },
   "optionalDependencies": {
-    "@dxos/random": "0.7.5-staging.b81e783",
-    "@dxos/react-ui": "0.7.5-staging.b81e783",
-    "@dxos/react-ui-theme": "0.7.5-staging.b81e783"
+    "@dxos/random": "0.8.0",
+    "@dxos/react-ui": "0.8.0",
+    "@dxos/react-ui-theme": "0.8.0"
   },
   "publishConfig": {
     "access": "public"

package/src/echo/useQuery.ts

@@ -5,11 +5,11 @@
 import { useMemo, useSyncExternalStore } from 'react';
 
 import {
-  Filter,
   isSpace,
   type Echo,
-  type ReactiveEchoObject,
   type FilterSource,
+  Filter,
+  type ReactiveEchoObject,
   type Query,
   type QueryOptions,
   type Space,
@@ -25,13 +25,14 @@ export const useQuery = <T extends ReactiveEchoObject<any>>(
   options?: QueryOptions,
   deps?: any[],
 ): T[] => {
-  const { subscribe, getObjects } = useMemo(() => {
+  const { getObjects, subscribe } = useMemo(() => {
+    let subscribed = false;
     const query = isSpace(spaceOrEcho)
       ? spaceOrEcho.db.query(filter, options)
       : (spaceOrEcho?.query(filter, options) as Query<T> | undefined);
-    let subscribed = false;
 
     return {
+      getObjects: () => (subscribed && query ? query.objects : EMPTY_ARRAY),
       subscribe: (cb: () => void) => {
         subscribed = true;
         const unsubscribe = query?.subscribe(cb) ?? noop;
@@ -40,13 +41,13 @@ export const useQuery = <T extends ReactiveEchoObject<any>>(
           subscribed = false;
         };
       },
-      getObjects: () => (subscribed && query ? query.objects : EMPTY_ARRAY),
     };
   }, [spaceOrEcho, ...filterToDepsArray(filter), ...(deps ?? [])]);
 
   // https://beta.reactjs.org/reference/react/useSyncExternalStore
-  // NOTE: This hook will resubscribe whenever the callback passed to the first argument changes -- make sure it is stable.
-  return useSyncExternalStore<T[] | undefined>(subscribe, getObjects) ?? [];
+  // NOTE: This hook will resubscribe whenever the callback passed to the first argument changes; make sure it is stable.
+  const objects = useSyncExternalStore<T[] | undefined>(subscribe, getObjects);
+  return objects ?? [];
 };
 
 const filterToDepsArray = (filter?: FilterSource<any>) => [JSON.stringify(Filter.from(filter).toProto())];

package/src/halo/Passkey.stories.tsx

@@ -35,6 +35,7 @@ const Test = () => {
   const handleCreatePassKey = useCallback(async () => {
     invariant(identity, 'Identity not available');
     const challenge = getNewChallenge();
+    const lookupKey = PublicKey.random();
     // https://developer.mozilla.org/en-US/docs/Web/API/PublicKeyCredentialCreationOptions
     const credential = await navigator.credentials
       .create({
@@ -42,7 +43,7 @@ const Test = () => {
           challenge: new TextEncoder().encode(challenge),
           rp: { id: location.hostname, name: 'Test' },
           user: {
-            id: new TextEncoder().encode(identity.did),
+            id: lookupKey.asUint8Array(),
             name: identity.did,
             displayName: identity.profile?.displayName ?? '',
           },
@@ -66,8 +67,11 @@ const Test = () => {
     invariant(client.services.services.IdentityService, 'IdentityService not available');
     // TODO(wittjosiah): This needs a proper api.
     await client.services.services.IdentityService.createRecoveryCredential({
-      recoveryKey,
-      algorithm,
+      data: {
+        recoveryKey,
+        algorithm,
+        lookupKey,
+      },
     });
   }, [client, identity]);
 
@@ -86,10 +90,10 @@ const Test = () => {
         },
       })
       .catch(log.error);
-    const identityDid = new TextDecoder().decode((credential as any).response.userHandle);
+    const lookupKey = PublicKey.from(new Uint8Array((credential as any).response.userHandle));
     await client.services.services.IdentityService.recoverIdentity({
       external: {
-        identityDid,
+        lookupKey,
         deviceKey,
         controlFeedKey,
         signature: Buffer.from((credential as any).response.signature),
@@ -138,8 +142,8 @@ const config = new Config({
     },
     services: {
       edge: {
-        // url: 'wss://edge.dxos.workers.dev/',
-        url: 'ws://localhost:8787',
+        url: 'wss://edge-main.dxos.workers.dev/',
+        // url: 'ws://localhost:8787',
       },
       iceProviders: [{ urls: 'https://edge-production.dxos.workers.dev/ice' }],
     },

package/tsconfig.json

@@ -1,12 +1,7 @@
 {
   "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
-    "lib": [
-      "DOM",
-      "ESNext"
-    ],
-    "module": "ESNext",
-    "outDir": "./dist/types"
+    "module": "ESNext"
   },
   "include": [
     "playwright",