@dxos/react-client 0.8.3 → 0.8.4-main.05e74ebcff

package/dist/lib/node-esm/chunk-WL3Z5HOH.mjs

@@ -0,0 +1,135 @@
+import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
+import {
+  ClientContext
+} from "./chunk-WUTK2IJF.mjs";
+
+// src/client/ClientProvider.tsx
+import React, { forwardRef, useEffect, useImperativeHandle, useState } from "react";
+import { Client, SystemStatus } from "@dxos/client";
+import { log } from "@dxos/log";
+import { useAsyncEffect, useControlledState } from "@dxos/react-hooks";
+import { getAsyncProviderValue } from "@dxos/util";
+
+// src/banner.ts
+var BANNER = (client) => {
+  const commitHash = client.config.get("runtime.app.build.commitHash");
+  const hash = commitHash ? ` App Commit ${commitHash} 
+` : "";
+  return `
+_/\\/\\/\\/\\/\\____/\\/\\____/\\/\\____/\\/\\/\\/\\______/\\/\\/\\/\\/\\_
+_/\\/\\____/\\/\\____/\\/\\/\\/\\____/\\/\\____/\\/\\__/\\/\\_________
+_/\\/\\____/\\/\\______/\\/\\______/\\/\\____/\\/\\____/\\/\\/\\/\\___
+_/\\/\\____/\\/\\____/\\/\\/\\/\\____/\\/\\____/\\/\\__________/\\/\\_
+_/\\/\\/\\/\\/\\____/\\/\\____/\\/\\____/\\/\\/\\/\\____/\\/\\/\\/\\/\\___
+
+ DXOS Client ${client.version} 
+${hash}`;
+};
+var bannerPrinted = false;
+var printBanner = (client) => {
+  if (bannerPrinted || window.location.hostname === "localhost") {
+    return;
+  }
+  bannerPrinted = true;
+  console.log(`%c${BANNER(client)}`, "font-family: monospace;");
+};
+
+// src/client/ClientProvider.tsx
+var __dxlog_file = "/__w/dxos/dxos/packages/sdk/react-client/src/client/ClientProvider.tsx";
+var ClientProvider = /* @__PURE__ */ forwardRef(({ children, config: configProp, client: clientProp, services: servicesProp, status: statusProp, fallback: Fallback = () => null, noBanner, onInitialized, ...options }, forwardedRef) => {
+  const [error, setError] = useState();
+  if (error) {
+    throw error;
+  }
+  const [client, setClient] = useState(clientProp instanceof Client ? clientProp : void 0);
+  useImperativeHandle(forwardedRef, () => client, [
+    client
+  ]);
+  const [status, setStatus] = useControlledState(statusProp);
+  useEffect(() => {
+    if (!client) {
+      return;
+    }
+    const subscription = client.status.subscribe((status2) => setStatus(status2));
+    return () => subscription.unsubscribe();
+  }, [
+    client
+  ]);
+  useAsyncEffect(async () => {
+    let disposed = false;
+    const initialize = async (client3) => {
+      if (!client3.initialized) {
+        await client3.initialize().catch((err) => {
+          if (!disposed) {
+            setError(err);
+          }
+        });
+        log("client ready", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 50, S: void 0 });
+        await onInitialized?.(client3);
+        log("initialization complete", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 52, S: void 0 });
+      }
+      setClient(client3);
+      if (!noBanner) {
+        printBanner(client3);
+      }
+    };
+    let client2;
+    try {
+      if (clientProp) {
+        client2 = await getAsyncProviderValue(clientProp);
+        await initialize(client2);
+      } else {
+        const config = await getAsyncProviderValue(configProp);
+        log("resolved config", {
+          config
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 68, S: void 0 });
+        const services = await getAsyncProviderValue(servicesProp, config);
+        log("created services", {
+          services
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 72, S: void 0 });
+        client2 = new Client({
+          config,
+          services,
+          ...options
+        });
+        log("created client", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 80, S: void 0 });
+        await initialize(client2);
+      }
+    } catch (err) {
+      if (!disposed) {
+        log.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 85, S: void 0 });
+      }
+    }
+    return () => {
+      log("clean up", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 89, S: void 0 });
+      disposed = true;
+      if (!clientProp) {
+        void client2?.destroy().then(() => {
+          log("destroyed", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 94, S: void 0 });
+        }).catch((err) => log.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 95, S: void 0 }));
+      }
+    };
+  }, [
+    configProp,
+    clientProp,
+    servicesProp,
+    noBanner
+  ]);
+  if (!client?.initialized || status !== SystemStatus.ACTIVE) {
+    return /* @__PURE__ */ React.createElement(Fallback, {
+      client,
+      status
+    });
+  }
+  return /* @__PURE__ */ React.createElement(ClientContext.Provider, {
+    value: {
+      client,
+      status
+    }
+  }, children);
+});
+
+export {
+  ClientProvider
+};
+//# sourceMappingURL=chunk-WL3Z5HOH.mjs.map

package/dist/lib/node-esm/chunk-WL3Z5HOH.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/client/ClientProvider.tsx", "../../../src/banner.ts"],
+  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nimport React, {\n  type FunctionComponent,\n  type PropsWithChildren,\n  forwardRef,\n  useEffect,\n  useImperativeHandle,\n  useState,\n} from 'react';\n\nimport { Client, type ClientOptions, type ClientServicesProvider, SystemStatus } from '@dxos/client';\nimport { type Config } from '@dxos/config';\nimport { log } from '@dxos/log';\nimport { useAsyncEffect, useControlledState } from '@dxos/react-hooks';\nimport { type MaybePromise, type Provider, getAsyncProviderValue } from '@dxos/util';\n\nimport { printBanner } from '../banner';\nimport { ClientContext, type ClientContextProps } from './context';\n\n/**\n * Properties for the ClientProvider.\n */\nexport type ClientProviderProps = Omit<ClientOptions, 'config' | 'services'> &\n  Pick<ClientContextProps, 'status'> &\n  PropsWithChildren<{\n    /**\n     * Client object or async provider to enable to caller to do custom initialization.\n     *\n     * NOTE: For advanced use cases only.\n     */\n    client?: Client | Provider<Promise<Client>>;\n\n    /**\n     * Config object or async provider.\n     *\n     * NOTE: If a `client` is provided then `config` is ignored.\n     */\n    // TODO(burdon): Reconcile with ClientOptions.\n    config?: Config | Provider<Promise<Config>>;\n\n    /**\n     * Callback to enable the caller to create a custom ClientServicesProvider.\n     *\n     * NOTE: If a `client` is provided then `services` is ignored.\n     */\n    // TODO(burdon): Reconcile with ClientOptions.\n    services?: ClientServicesProvider | ((config?: Config) => MaybePromise<ClientServicesProvider>);\n\n    /**\n     * ReactNode to display until the client is available.\n     */\n    fallback?: FunctionComponent<Partial<ClientContextProps>>;\n\n    /**\n     * Skip the DXOS banner.\n     */\n    noBanner?: boolean;\n\n    /**\n     * Post initialization hook to enable to caller to do custom initialization.\n     */\n    onInitialized?: (client: Client) => MaybePromise<void>;\n  }>;\n\n/**\n * Root component that provides the DXOS client instance to child components.\n * To be used with the `useClient` hook.\n */\nexport const ClientProvider = forwardRef<Client | undefined, ClientProviderProps>(\n  (\n    {\n      children,\n      config: configProp,\n      client: clientProp,\n      services: servicesProp,\n      status: statusProp,\n      fallback: Fallback = () => null,\n      noBanner,\n      onInitialized,\n      ...options\n    },\n    forwardedRef,\n  ) => {\n    // The client is initialized asynchronously.\n    // If an error occurs during initialization, it is caught and the state is set.\n    // This allows the error to be thrown in the render method.\n    // The assumption is that a client initialization error is fatal to the app.\n    // This error will be caught by the nearest error boundary.\n    const [error, setError] = useState();\n    if (error) {\n      throw error;\n    }\n\n    const [client, setClient] = useState(clientProp instanceof Client ? clientProp : undefined);\n\n    // Provide external access.\n    useImperativeHandle(forwardedRef, () => client, [client]);\n\n    // Client status subscription.\n    const [status, setStatus] = useControlledState(statusProp);\n    useEffect(() => {\n      if (!client) {\n        return;\n      }\n\n      const subscription = client.status.subscribe((status) => setStatus(status));\n      return () => subscription.unsubscribe();\n    }, [client]);\n\n    // Create and/or initialize client.\n    useAsyncEffect(async () => {\n      let disposed = false;\n      const initialize = async (client: Client) => {\n        if (!client.initialized) {\n          await client.initialize().catch((err) => {\n            if (!disposed) {\n              setError(err);\n            }\n          });\n          log('client ready');\n          await onInitialized?.(client);\n          log('initialization complete');\n        }\n\n        setClient(client);\n        if (!noBanner) {\n          printBanner(client);\n        }\n      };\n\n      let client: Client;\n      try {\n        if (clientProp) {\n          // Asynchronously request client.\n          client = await getAsyncProviderValue(clientProp);\n          await initialize(client);\n        } else {\n          // Asynchronously construct client (config may be undefined).\n          const config = await getAsyncProviderValue(configProp);\n          log('resolved config', { config });\n          const services = await getAsyncProviderValue(servicesProp, config);\n          log('created services', { services });\n          client = new Client({ config, services, ...options });\n          log('created client');\n          await initialize(client);\n        }\n      } catch (err) {\n        if (!disposed) {\n          log.catch(err);\n        }\n      }\n\n      return () => {\n        log('clean up');\n        disposed = true;\n        // Only destroy if the client is not provided by the parent.\n        if (!clientProp) {\n          void client\n            ?.destroy()\n            .then(() => {\n              log('destroyed');\n            })\n            .catch((err) => log.catch(err));\n        }\n      };\n    }, [configProp, clientProp, servicesProp, noBanner]);\n\n    if (!client?.initialized || status !== SystemStatus.ACTIVE) {\n      return <Fallback client={client} status={status} />;\n    }\n\n    return <ClientContext.Provider value={{ client, status }}>{children}</ClientContext.Provider>;\n  },\n);\n", "//\n// Copyright 2021 DXOS.org\n//\n\nimport { type Client } from '@dxos/client';\n\n// http://patorjk.com/software/taag/#p=testall&f=Patorjk-HeX&t=DXOS\nconst BANNER = (client: Client) => {\n  const commitHash = client.config.get('runtime.app.build.commitHash');\n  const hash = commitHash ? ` App Commit ${commitHash} \\n` : '';\n\n  return (\n    '\\n' +\n    '_/\\\\/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\______/\\\\/\\\\/\\\\/\\\\/\\\\_\\n' +\n    '_/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\__/\\\\/\\\\_________\\n' +\n    '_/\\\\/\\\\____/\\\\/\\\\______/\\\\/\\\\______/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\___\\n' +\n    '_/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\__________/\\\\/\\\\_\\n' +\n    '_/\\\\/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\/\\\\___\\n' +\n    `\\n DXOS Client ${client.version} \\n${hash}`\n  );\n};\n\nlet bannerPrinted = false;\n\nexport const printBanner = (client: Client) => {\n  if (bannerPrinted || window.location.hostname === 'localhost') {\n    return;\n  }\n\n  bannerPrinted = true;\n  // eslint-disable-next-line no-console\n  console.log(`%c${BANNER(client)}`, 'font-family: monospace;');\n};\n"],
+  "mappings": "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",
+  "names": ["React", "forwardRef", "useEffect", "useImperativeHandle", "useState", "Client", "SystemStatus", "log", "useAsyncEffect", "useControlledState", "getAsyncProviderValue", "BANNER", "client", "commitHash", "config", "get", "hash", "version", "bannerPrinted", "printBanner", "window", "location", "hostname", "console", "log", "error", "client", "useImperativeHandle", "forwardedRef", "status", "useAsyncEffect", "initialize", "catch", "setError", "err", "log", "setClient", "printBanner", "config", "services", "disposed", "clientProp", "configProp", "servicesProp", "noBanner", "children"]
+}

package/dist/lib/node-esm/chunk-WUTK2IJF.mjs

@@ -0,0 +1,10 @@
+import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
+
+// src/client/context.ts
+import { createContext } from "react";
+var ClientContext = createContext(void 0);
+
+export {
+  ClientContext
+};
+//# sourceMappingURL=chunk-WUTK2IJF.mjs.map

package/dist/lib/node-esm/chunk-WUTK2IJF.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/client/context.ts"],
+  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nimport { type Context, createContext } from 'react';\n\nimport { type Client, type SystemStatus } from '@dxos/client';\n\nexport type ClientContextProps = {\n  client: Client;\n  status?: SystemStatus | null;\n};\n\n/**\n * @internal Use ClientProvider to create or initialize the Client.\n */\nexport const ClientContext: Context<ClientContextProps | undefined> = createContext<ClientContextProps | undefined>(\n  undefined,\n);\n"],
+  "mappings": ";;;AAIA,SAAuBA,qBAAqB;AAYrC,IAAMC,gBAAyDD,cACpEE,MAAAA;",
+  "names": ["createContext", "ClientContext", "undefined"]
+}

package/dist/lib/node-esm/devtools/index.mjs

@@ -1,34 +1,30 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
   useClient
-} from "../chunk-NBTZZNQ5.mjs";
+} from "../chunk-CUDKNAMV.mjs";
+import "../chunk-WUTK2IJF.mjs";
 
-// packages/sdk/react-client/src/devtools/index.ts
+// src/devtools/index.ts
 export * from "@dxos/client/devtools";
 
-// packages/sdk/react-client/src/devtools/useDevtools.ts
+// src/devtools/useDevtools.ts
 import { raise } from "@dxos/debug";
 var useDevtools = () => {
   const client = useClient();
   return client.services.services.DevtoolsHost ?? raise(new Error("DevtoolsHost not available."));
 };
 
-// packages/sdk/react-client/src/devtools/useStream.ts
-import { useState, useEffect } from "react";
+// src/devtools/useStream.ts
+import { useEffect, useState } from "react";
 import { log } from "@dxos/log";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/react-client/src/devtools/useStream.ts";
+var __dxlog_file = "/__w/dxos/dxos/packages/sdk/react-client/src/devtools/useStream.ts";
 var useStream = (streamFactory, defaultValue, deps = []) => {
   const [value, setValue] = useState(defaultValue);
   useEffect(() => {
     const stream = streamFactory();
     stream.subscribe((response) => setValue(response), (err) => {
       if (err) {
-        log.catch(err, void 0, {
-          F: __dxlog_file,
-          L: 21,
-          S: void 0,
-          C: (f, a) => f(...a)
-        });
+        log.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 14, S: void 0 });
       }
     });
     return () => {

package/dist/lib/node-esm/devtools/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/devtools/index.ts", "../../../../src/devtools/useDevtools.ts", "../../../../src/devtools/useStream.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nexport * from '@dxos/client/devtools';\n\nexport * from './useDevtools';\nexport * from './useStream';\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { type DevtoolsHost } from '@dxos/client/devtools';\nimport { raise } from '@dxos/debug';\n\nimport { useClient } from '../client';\n\nexport const useDevtools = (): DevtoolsHost => {\n  const client = useClient();\n  return client.services.services.DevtoolsHost ?? raise(new Error('DevtoolsHost not available.'));\n};\n", "//\n// Copyright 2021 DXOS.org\n//\n\nimport { type DependencyList, useState, useEffect } from 'react';\n\nimport { type Stream } from '@dxos/codec-protobuf/stream';\nimport { log } from '@dxos/log';\n\n/**\n * Subscribe to service API streams.\n */\nexport const useStream = <T>(streamFactory: () => Stream<T>, defaultValue: T, deps: DependencyList = []): T => {\n  const [value, setValue] = useState<T | undefined>(defaultValue);\n  useEffect(() => {\n    const stream = streamFactory();\n    stream.subscribe(\n      (response: T) => setValue(response),\n      (err) => {\n        if (err) {\n          log.catch(err);\n        }\n      },\n    );\n\n    return () => {\n      void stream.close();\n    };\n  }, deps);\n\n  return value ?? defaultValue;\n};\n"],
-  "mappings": ";;;;;;AAIA,cAAc;;;ACCd,SAASA,aAAa;AAIf,IAAMC,cAAc,MAAA;AACzB,QAAMC,SAASC,UAAAA;AACf,SAAOD,OAAOE,SAASA,SAASC,gBAAgBC,MAAM,IAAIC,MAAM,6BAAA,CAAA;AAClE;;;ACRA,SAA8BC,UAAUC,iBAAiB;AAGzD,SAASC,WAAW;;AAKb,IAAMC,YAAY,CAAIC,eAAgCC,cAAiBC,OAAuB,CAAA,MAAE;AACrG,QAAM,CAACC,OAAOC,QAAAA,IAAYR,SAAwBK,YAAAA;AAClDJ,YAAU,MAAA;AACR,UAAMQ,SAASL,cAAAA;AACfK,WAAOC,UACL,CAACC,aAAgBH,SAASG,QAAAA,GAC1B,CAACC,QAAAA;AACC,UAAIA,KAAK;AACPV,YAAIW,MAAMD,KAAAA,QAAAA;;;;;;MACZ;IACF,CAAA;AAGF,WAAO,MAAA;AACL,WAAKH,OAAOK,MAAK;IACnB;EACF,GAAGR,IAAAA;AAEH,SAAOC,SAASF;AAClB;",
-  "names": ["raise", "useDevtools", "client", "useClient", "services", "DevtoolsHost", "raise", "Error", "useState", "useEffect", "log", "useStream", "streamFactory", "defaultValue", "deps", "value", "setValue", "stream", "subscribe", "response", "err", "catch", "close"]
+  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nexport * from '@dxos/client/devtools';\n\nexport * from './useDevtools';\nexport * from './useStream';\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { type DevtoolsHost } from '@dxos/client/devtools';\nimport { raise } from '@dxos/debug';\n\nimport { useClient } from '../client';\n\nexport const useDevtools = (): DevtoolsHost => {\n  const client = useClient();\n  return client.services.services.DevtoolsHost ?? raise(new Error('DevtoolsHost not available.'));\n};\n", "//\n// Copyright 2021 DXOS.org\n//\n\nimport { type DependencyList, useEffect, useState } from 'react';\n\nimport { type Stream } from '@dxos/codec-protobuf/stream';\nimport { log } from '@dxos/log';\n\n/**\n * Subscribe to service API streams.\n */\nexport const useStream = <T>(streamFactory: () => Stream<T>, defaultValue: T, deps: DependencyList = []): T => {\n  const [value, setValue] = useState<T | undefined>(defaultValue);\n  useEffect(() => {\n    const stream = streamFactory();\n    stream.subscribe(\n      (response: T) => setValue(response),\n      (err) => {\n        if (err) {\n          log.catch(err);\n        }\n      },\n    );\n\n    return () => {\n      void stream.close();\n    };\n  }, deps);\n\n  return value ?? defaultValue;\n};\n"],
+  "mappings": ";;;;;;;AAIA,cAAc;;;ACCd,SAASA,aAAa;AAIf,IAAMC,cAAc,MAAA;AACzB,QAAMC,SAASC,UAAAA;AACf,SAAOD,OAAOE,SAASA,SAASC,gBAAgBC,MAAM,IAAIC,MAAM,6BAAA,CAAA;AAClE;;;ACRA,SAA8BC,WAAWC,gBAAgB;AAGzD,SAASC,WAAW;AAEpB,IAAA,eAAA;AAKEF,IAAU,YAAA,CAAA,eAAA,cAAA,OAAA,CAAA,MAAA;QACR,CAAA,OAAMG,QAASC,IAAAA,SAAAA,YAAAA;YACfD,MAAOE;UAGH,SAAS,cAAA;qBACE,CAACC,aAAAA,SAAAA,QAAAA,GAAAA,CAAAA,QAAAA;AACZ,UAAA,KAAA;AACF,YAAA,MAAA,KAAA,QAAA,EAAA,YAAA,YAAA,GAAA,cAAA,GAAA,IAAA,GAAA,OAAA,CAAA;MAGF;;AAEA,WAAA,MAAA;AACCC,WAAAA,OAAAA,MAAAA;IAEH;EACA,GAAA,IAAA;;;",
+  "names": ["raise", "useDevtools", "client", "useClient", "services", "DevtoolsHost", "raise", "Error", "useEffect", "useState", "log", "stream", "streamFactory", "subscribe", "err", "deps"]
 }

package/dist/lib/node-esm/echo/index.mjs

@@ -1,46 +1,42 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
   useInvitationStatus
-} from "../chunk-UYJUBYMU.mjs";
+} from "../chunk-RQJPEHDY.mjs";
 import {
   useClient
-} from "../chunk-NBTZZNQ5.mjs";
+} from "../chunk-CUDKNAMV.mjs";
+import "../chunk-WUTK2IJF.mjs";
 
-// packages/sdk/react-client/src/echo/index.ts
+// src/echo/index.ts
 export * from "@dxos/client/echo";
+export * from "@dxos/echo-react";
 
-// packages/sdk/react-client/src/echo/useMembers.ts
+// src/echo/useMembers.ts
 import { MulticastObservable } from "@dxos/async";
+import { PublicKey as PublicKey2 } from "@dxos/client";
 import { HaloSpaceMember } from "@dxos/client/echo";
 import { useMulticastObservable as useMulticastObservable2 } from "@dxos/react-hooks";
 
-// packages/sdk/react-client/src/echo/useSpaces.ts
-import { useEffect, useState } from "react";
+// src/echo/useSpaces.ts
+import { PublicKey } from "@dxos/client";
 import { SpaceState } from "@dxos/client/echo";
 import { useMulticastObservable } from "@dxos/react-hooks";
-var useSpace = (spaceKeyLike) => {
+var useSpace = (spaceId) => {
   const client = useClient();
   const spaces = useMulticastObservable(client.spaces);
-  const [ready, setReady] = useState(false);
-  useEffect(() => {
-    if (spaceKeyLike) {
-      return;
-    }
-    const timeout = setTimeout(async () => {
-      await client.spaces.waitUntilReady();
-      setReady(true);
-    });
-    return () => clearTimeout(timeout);
-  }, [
-    client,
-    spaceKeyLike
-  ]);
-  if (spaceKeyLike) {
-    return spaces.find((space) => space.key.equals(spaceKeyLike) || space.id === spaceKeyLike);
-  }
-  if (ready && client.halo.identity.get()) {
-    return client.spaces.default;
+  if (!spaceId) {
+    return void 0;
   }
+  return spaces.find((space) => {
+    if (spaceId instanceof PublicKey) {
+      return space.key.equals(spaceId);
+    }
+    return space.id === spaceId;
+  });
+};
+var useDatabase = (spaceId) => {
+  const space = useSpace(spaceId);
+  return space?.db;
 };
 var useSpaces = ({ all = false } = {}) => {
   const client = useClient();
@@ -48,161 +44,52 @@ var useSpaces = ({ all = false } = {}) => {
   return spaces.filter((space) => all || space.state.get() === SpaceState.SPACE_READY);
 };
 
-// packages/sdk/react-client/src/echo/useMembers.ts
+// src/echo/useMembers.ts
 var useMembers = (spaceKey) => {
   const spaces = useSpaces({
     all: true
   });
-  const space = spaceKey ? spaces.find((space2) => space2.key.equals(spaceKey)) : void 0;
+  const space = spaceKey ? spaces.find((space2) => spaceKey instanceof PublicKey2 ? space2.key.equals(spaceKey) : space2.id === spaceKey) : void 0;
   const members = useMulticastObservable2(space?.members ?? MulticastObservable.empty()) ?? [];
   return members.filter((member) => member.role !== HaloSpaceMember.Role.REMOVED);
 };
 
-// packages/sdk/react-client/src/echo/useQuery.ts
-import { useMemo, useSyncExternalStore } from "react";
-import { Filter, Query, isSpace } from "@dxos/client/echo";
-var EMPTY_ARRAY = [];
-var noop = () => {
-};
-var useQuery = (spaceOrEcho, queryOrFilter, deps) => {
-  const query = Filter.is(queryOrFilter) ? Query.select(queryOrFilter) : queryOrFilter;
-  const { getObjects, subscribe } = useMemo(() => {
-    let subscribed = false;
-    const queryResult = spaceOrEcho === void 0 ? void 0 : isSpace(spaceOrEcho) ? spaceOrEcho.db.query(query) : spaceOrEcho.query(query);
-    return {
-      getObjects: () => subscribed && queryResult ? queryResult.objects : EMPTY_ARRAY,
-      subscribe: (cb) => {
-        subscribed = true;
-        const unsubscribe = queryResult?.subscribe(cb) ?? noop;
-        return () => {
-          unsubscribe?.();
-          subscribed = false;
-        };
-      }
-    };
-  }, [
-    spaceOrEcho,
-    JSON.stringify(query.ast),
-    ...deps ?? []
-  ]);
-  const objects = useSyncExternalStore(subscribe, getObjects);
-  return objects ?? [];
-};
-
-// packages/sdk/react-client/src/echo/useQueue.ts
-import { useEffect as useEffect2, useMemo as useMemo2, useRef } from "react";
-import { raise } from "@dxos/debug";
-var MIN_POLL_INTERVAL = 1e3;
-var useQueue = (queueDxn, options = {}) => {
-  const client = useClient();
-  const mountedRef = useRef(true);
-  const queue = useMemo2(() => {
-    if (!queueDxn) {
-      return void 0;
-    }
-    const { spaceId } = queueDxn.asQueueDXN() ?? raise(new TypeError("Invalid queue DXN"));
-    return client.spaces.get(spaceId)?.queues.get(queueDxn);
-  }, [
-    client,
-    queueDxn?.toString()
-  ]);
-  useEffect2(() => {
-    void queue?.refresh();
-  }, [
-    queue
-  ]);
-  useEffect2(() => {
-    let timeout;
-    mountedRef.current = true;
-    const poll = () => {
-      if (!mountedRef.current) {
-        return;
-      }
-      void queue?.refresh().finally(() => {
-        if (mountedRef.current && options.pollInterval) {
-          timeout = setTimeout(poll, Math.max(options.pollInterval ?? 0, MIN_POLL_INTERVAL));
-        }
-      });
-    };
-    if (options.pollInterval) {
-      poll();
-    }
-    return () => {
-      mountedRef.current = false;
-      clearTimeout(timeout);
-    };
-  }, [
-    queue,
-    options.pollInterval
-  ]);
-  return queue;
-};
-
-// packages/sdk/react-client/src/echo/useSchema.ts
-import { useMemo as useMemo3, useSyncExternalStore as useSyncExternalStore2 } from "react";
-var useSchema = (client, space, typename) => {
-  const { subscribe, getSchema } = useMemo3(() => {
-    if (!typename || !space) {
-      return {
-        subscribe: () => () => {
-        },
-        getSchema: () => void 0
-      };
-    }
-    const staticSchema = client.graph.schemaRegistry.getSchema(typename);
-    if (staticSchema) {
-      return {
-        subscribe: () => () => {
-        },
-        getSchema: () => staticSchema
-      };
-    }
-    const query = space.db.schemaRegistry.query({
-      typename
-    });
-    const initialResult = query.runSync()[0];
-    let currentSchema = initialResult;
-    return {
-      subscribe: (onStoreChange) => {
-        const unsubscribe = query.subscribe(() => {
-          currentSchema = query.results[0];
-          onStoreChange();
-        });
-        return unsubscribe;
-      },
-      getSchema: () => currentSchema
-    };
-  }, [
-    typename,
-    space
-  ]);
-  return useSyncExternalStore2(subscribe, getSchema);
-};
-
-// packages/sdk/react-client/src/echo/useSpaceInvitations.ts
-import { useMemo as useMemo4 } from "react";
+// src/echo/useSpaceInvitations.ts
+import { useMemo } from "react";
 import { MulticastObservable as MulticastObservable2 } from "@dxos/async";
 import { useMulticastObservable as useMulticastObservable3 } from "@dxos/react-hooks";
-var useSpaceInvitations = (spaceKey) => {
-  const space = useSpace(spaceKey);
+var useSpaceInvitations = (spaceId) => {
+  const space = useSpace(spaceId);
   return useMulticastObservable3(space?.invitations ?? MulticastObservable2.empty()) ?? [];
 };
-var useSpaceInvitation = (spaceKey, invitationId) => {
-  const invitations = useSpaceInvitations(spaceKey);
-  const invitation = useMemo4(() => invitations.find((invitation2) => invitation2.get().invitationId === invitationId), [
+var useSpaceInvitation = (spaceId, invitationId) => {
+  const invitations = useSpaceInvitations(spaceId);
+  const invitation = useMemo(() => invitations.find((invitation2) => invitation2.get().invitationId === invitationId), [
     invitations
   ]);
   return useInvitationStatus(invitation);
 };
 
-// packages/sdk/react-client/src/echo/useSubscription.ts
-import { useEffect as useEffect3, useRef as useRef2 } from "react";
+// src/echo/useSpaceProperties.ts
+import { MulticastObservable as MulticastObservable3 } from "@dxos/async";
+import { SpaceState as SpaceState2 } from "@dxos/client/echo";
+import { useObject } from "@dxos/echo-react";
+import { useMulticastObservable as useMulticastObservable4 } from "@dxos/react-hooks";
+var useSpaceProperties = (spaceId) => {
+  const space = useSpace(spaceId);
+  const spaceState = useMulticastObservable4(space?.state ?? MulticastObservable3.empty());
+  const properties = spaceState === SpaceState2.SPACE_READY ? space?.properties : void 0;
+  return useObject(properties);
+};
+
+// src/echo/useSubscription.ts
+import { useEffect, useRef } from "react";
 import { createSubscription } from "@dxos/client/echo";
 var useSubscription = (cb, selection) => {
-  const callbackRef = useRef2(cb);
+  const callbackRef = useRef(cb);
   callbackRef.current = cb;
-  const subscriptionRef = useRef2();
-  useEffect3(() => {
+  const subscriptionRef = useRef(null);
+  useEffect(() => {
     subscriptionRef.current = createSubscription(() => {
       callbackRef.current();
     });
@@ -212,26 +99,24 @@ var useSubscription = (cb, selection) => {
   return subscriptionRef.current;
 };
 
-// packages/sdk/react-client/src/echo/useSyncState.ts
-import { useEffect as useEffect4, useState as useState2 } from "react";
+// src/echo/useSyncState.ts
+import { useEffect as useEffect2, useState } from "react";
 import { Context } from "@dxos/context";
 import { EdgeService } from "@dxos/protocols";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/react-client/src/echo/useSyncState.ts";
-var isEdgePeerId = (peerId, spaceId) => peerId.startsWith(`${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}`);
+import { compositeKey } from "@dxos/util";
+var __dxlog_file = "/__w/dxos/dxos/packages/sdk/react-client/src/echo/useSyncState.ts";
+var isEdgePeerId = (peerId, spaceId) => peerId.startsWith(compositeKey(EdgeService.AUTOMERGE_REPLICATOR, spaceId));
 var useSyncState = () => {
   const client = useClient();
-  const [spaceState, setSpaceState] = useState2({});
-  useEffect4(() => {
-    const ctx = new Context(void 0, {
-      F: __dxlog_file,
-      L: 25
-    });
+  const [spaceState, setSpaceState] = useState({});
+  useEffect2(() => {
+    const ctx = new Context(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 16 });
     const createSubscriptions = (spaces) => {
       for (const space of spaces) {
         if (spaceState[space.id]) {
           continue;
         }
-        ctx.onDispose(space.crud.subscribeToSyncState(ctx, ({ peers = [] }) => {
+        ctx.onDispose(space.internal.db.subscribeToSyncState(ctx, ({ peers = [] }) => {
           const syncState = peers.find((state) => isEdgePeerId(state.peerId, space.id));
           if (syncState) {
             setSpaceState((spaceState2) => ({
@@ -255,13 +140,10 @@ var useSyncState = () => {
   return spaceState;
 };
 var useSpaceSyncState = (space) => {
-  const [spaceState, setSpaceState] = useState2();
-  useEffect4(() => {
-    const ctx = new Context(void 0, {
-      F: __dxlog_file,
-      L: 64
-    });
-    space.crud.subscribeToSyncState(ctx, ({ peers = [] }) => {
+  const [spaceState, setSpaceState] = useState();
+  useEffect2(() => {
+    const ctx = new Context(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 51 });
+    space.internal.db.subscribeToSyncState(ctx, ({ peers = [] }) => {
       const syncState = peers.find((state) => isEdgePeerId(state.peerId, space.id));
       if (syncState) {
         setSpaceState(syncState);
@@ -276,13 +158,12 @@ var useSpaceSyncState = (space) => {
   return spaceState;
 };
 export {
+  useDatabase,
   useMembers,
-  useQuery,
-  useQueue,
-  useSchema,
   useSpace,
   useSpaceInvitation,
   useSpaceInvitations,
+  useSpaceProperties,
   useSpaceSyncState,
   useSpaces,
   useSubscription,