@dxos/react-client 0.6.11-staging.e6894a4 → 0.6.12-main.5cc132e

package/dist/lib/node/{chunk-E3S6YHNJ.cjs → chunk-N474KOAU.cjs}

@@ -26,37 +26,40 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_E3S6YHNJ_exports = {};
-__export(chunk_E3S6YHNJ_exports, {
+var chunk_N474KOAU_exports = {};
+__export(chunk_N474KOAU_exports, {
   AgentHostingContext: () => AgentHostingContext,
   AgentHostingProvider: () => AgentHostingProvider,
   ClientContext: () => ClientContext,
   ClientProvider: () => ClientProvider,
   useAgentHostingClient: () => useAgentHostingClient,
   useClient: () => useClient,
-  useClientServices: () => useClientServices,
+  useClientStatus: () => useClientStatus,
   useConfig: () => useConfig,
   useShell: () => useShell,
   useShellDisplay: () => useShellDisplay,
   useStatus: () => useStatus
 });
-module.exports = __toCommonJS(chunk_E3S6YHNJ_exports);
+module.exports = __toCommonJS(chunk_N474KOAU_exports);
 var import_react = __toESM(require("react"));
 var import_client = require("@dxos/client");
 var import_log = require("@dxos/log");
 var import_react2 = __toESM(require("react"));
 var import_client2 = require("@dxos/client");
-var import_debug = require("@dxos/debug");
 var import_react3 = require("@dxos/echo-signals/react");
 var import_log2 = require("@dxos/log");
+var import_react_hooks = require("@dxos/react-hooks");
 var import_util = require("@dxos/util");
 var import_react4 = require("react");
-var import_debug2 = require("@dxos/debug");
 var import_react5 = require("react");
-var import_debug3 = require("@dxos/debug");
+var import_debug = require("@dxos/debug");
 var import_react6 = require("react");
 var import_react7 = require("react");
-var import_debug4 = require("@dxos/debug");
+var import_debug2 = require("@dxos/debug");
+var import_react8 = require("react");
+var import_react9 = require("react");
+var import_debug3 = require("@dxos/debug");
+var ClientContext = (0, import_react4.createContext)(void 0);
 var BANNER = (client) => {
   const commitHash = client.config.get("runtime.app.build.commitHash");
   const hash = commitHash ? ` App Commit ${commitHash} 
@@ -79,22 +82,22 @@ var printBanner = (client) => {
   bannerPrinted = true;
   console.log(`%c${BANNER(client)}`, "font-family: monospace;");
 };
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/react-client/src/client/ClientContext.tsx";
-var ClientContext = /* @__PURE__ */ (0, import_react2.createContext)(void 0);
-var useClient = () => {
-  const { client } = (0, import_react2.useContext)(ClientContext) ?? (0, import_debug.raise)(new Error("Missing ClientContext."));
-  return client;
-};
-var ClientProvider = ({ children, config: configProvider, services: createServices, client: clientProvider, fallback: Fallback = () => null, registerSignalFactory: register = true, onInitialized, ...options }) => {
-  (0, import_react2.useMemo)(() => {
-    register && (0, import_react3.registerSignalFactory)();
-  }, []);
-  const [client, setClient] = (0, import_react2.useState)(clientProvider instanceof import_client2.Client ? clientProvider : void 0);
-  const [status, setStatus] = (0, import_react2.useState)(null);
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/react-client/src/client/ClientProvider.tsx";
+var ClientProvider = /* @__PURE__ */ (0, import_react2.forwardRef)(({ children, config: configProvider, client: clientProvider, services: servicesProvider, types, status: controlledStatus, fallback: Fallback = () => null, registerSignalRuntime: _registerSignalRuntime = true, disableBanner, onInitialized, ...options }, forwardedRef) => {
+  (0, import_react2.useEffect)(() => {
+    _registerSignalRuntime && (0, import_react3.registerSignalRuntime)();
+  }, [
+    _registerSignalRuntime
+  ]);
   const [error, setError] = (0, import_react2.useState)();
   if (error) {
     throw error;
   }
+  const [client, setClient] = (0, import_react2.useState)(clientProvider instanceof import_client2.Client ? clientProvider : void 0);
+  (0, import_react2.useImperativeHandle)(forwardedRef, () => client, [
+    client
+  ]);
+  const [status, setStatus] = (0, import_react_hooks.useControlledValue)(controlledStatus);
   (0, import_react2.useEffect)(() => {
     if (!client) {
       return;
@@ -102,87 +105,103 @@ var ClientProvider = ({ children, config: configProvider, services: createServic
     const subscription = client.status.subscribe((status2) => setStatus(status2));
     return () => subscription.unsubscribe();
   }, [
-    client,
-    setStatus
+    client
   ]);
   (0, import_react2.useEffect)(() => {
-    const done = async (client2) => {
-      await client2.initialize().catch(setError);
-      (0, import_log2.log)("client ready", void 0, {
-        F: __dxlog_file,
-        L: 140,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      await onInitialized?.(client2);
-      (0, import_log2.log)("initialization complete", void 0, {
-        F: __dxlog_file,
-        L: 142,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      setClient(client2);
-      setStatus(client2.status.get() ?? import_client2.SystemStatus.ACTIVE);
-      printBanner(client2);
+    const initialize = async (client3) => {
+      if (!client3.initialized) {
+        await client3.initialize().catch(setError);
+        (0, import_log2.log)("client ready", void 0, {
+          F: __dxlog_file,
+          L: 143,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
+        if (types) {
+          client3.addTypes(types);
+        }
+        await onInitialized?.(client3);
+        (0, import_log2.log)("initialization complete", void 0, {
+          F: __dxlog_file,
+          L: 148,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
+      } else if (types) {
+        client3.addTypes(types);
+      }
+      setClient(client3);
+      if (!disableBanner) {
+        printBanner(client3);
+      }
     };
-    const timeout = setTimeout(async () => {
+    let client2;
+    const t = setTimeout(async () => {
       if (clientProvider) {
-        const client2 = await (0, import_util.getAsyncValue)(clientProvider);
-        await done(client2);
+        client2 = await (0, import_util.getAsyncProviderValue)(clientProvider);
+        await initialize(client2);
       } else {
-        const config = await (0, import_util.getAsyncValue)(configProvider);
+        const config = await (0, import_util.getAsyncProviderValue)(configProvider);
         (0, import_log2.log)("resolved config", {
           config
         }, {
           F: __dxlog_file,
-          L: 156,
+          L: 169,
           S: void 0,
           C: (f, a) => f(...a)
         });
-        const services = await createServices?.(config);
+        const services = await (0, import_util.getAsyncProviderValue)(servicesProvider, config);
         (0, import_log2.log)("created services", {
           services
         }, {
           F: __dxlog_file,
-          L: 158,
+          L: 171,
           S: void 0,
           C: (f, a) => f(...a)
         });
-        const client2 = new import_client2.Client({
+        client2 = new import_client2.Client({
           config,
           services,
           ...options
         });
         (0, import_log2.log)("created client", void 0, {
           F: __dxlog_file,
-          L: 160,
+          L: 173,
           S: void 0,
           C: (f, a) => f(...a)
         });
-        await done(client2);
+        await initialize(client2);
       }
     });
     return () => {
       (0, import_log2.log)("clean up", void 0, {
         F: __dxlog_file,
-        L: 166,
+        L: 179,
         S: void 0,
         C: (f, a) => f(...a)
       });
-      clearTimeout(timeout);
-      void client?.destroy().catch((err) => import_log2.log.catch(err, void 0, {
+      clearTimeout(t);
+      void client2?.destroy().then(() => {
+        (0, import_log2.log)("destroyed", void 0, {
+          F: __dxlog_file,
+          L: 184,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
+      }).catch((err) => import_log2.log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 168,
+        L: 186,
         S: void 0,
         C: (f, a) => f(...a)
       }));
     };
   }, [
-    clientProvider,
     configProvider,
-    createServices
+    clientProvider,
+    servicesProvider,
+    disableBanner
   ]);
-  if (!client || status !== import_client2.SystemStatus.ACTIVE) {
+  if (!client?.initialized || status !== import_client2.SystemStatus.ACTIVE) {
     return /* @__PURE__ */ import_react2.default.createElement(Fallback, {
       client,
       status
@@ -194,13 +213,27 @@ var ClientProvider = ({ children, config: configProvider, services: createServic
       status
     }
   }, children);
+});
+var useClient = () => {
+  const { client } = (0, import_react5.useContext)(ClientContext) ?? (0, import_debug.raise)(new Error("Missing ClientContext."));
+  return client;
 };
-var useClientServices = () => {
-  const { services } = (0, import_react4.useContext)(ClientContext) ?? (0, import_debug2.raise)(new Error("Missing ClientContext."));
-  return services;
+var useClientStatus = (client) => {
+  const [status, setStatus] = (0, import_react6.useState)();
+  (0, import_react6.useEffect)(() => {
+    if (!client) {
+      return;
+    }
+    const subscription = client.status.subscribe((status2) => setStatus(status2));
+    return () => subscription.unsubscribe();
+  }, [
+    client,
+    setStatus
+  ]);
+  return status;
 };
 var useConfig = () => {
-  const { client } = (0, import_react5.useContext)(ClientContext) ?? (0, import_debug3.raise)(new Error("Missing ClientContext."));
+  const { client } = (0, import_react7.useContext)(ClientContext) ?? (0, import_debug2.raise)(new Error("Missing ClientContext."));
   return client.config;
 };
 var useShell = () => {
@@ -209,14 +242,14 @@ var useShell = () => {
 };
 var useShellDisplay = () => {
   const client = useClient();
-  const [display, setDisplay] = (0, import_react6.useState)(client.shell.display);
-  (0, import_react6.useEffect)(() => client.shell.onDisplayChange(setDisplay), [
+  const [display, setDisplay] = (0, import_react8.useState)(client.shell.display);
+  (0, import_react8.useEffect)(() => client.shell.onDisplayChange(setDisplay), [
     client
   ]);
   return display;
 };
 var useStatus = () => {
-  const { status } = (0, import_react7.useContext)(ClientContext) ?? (0, import_debug4.raise)(new Error("Missing ClientContext."));
+  const { status } = (0, import_react9.useContext)(ClientContext) ?? (0, import_debug3.raise)(new Error("Missing ClientContext."));
   return status;
 };
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/react-client/src/client/AgentHostingProvider.tsx";
@@ -236,7 +269,7 @@ var makeClient = ({ config, halo }) => {
   if (!agentHostingConfig) {
     (0, import_log.log)("no agent hosting configured", void 0, {
       F: __dxlog_file2,
-      L: 38,
+      L: 39,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -247,7 +280,7 @@ var makeClient = ({ config, halo }) => {
     case "LOCAL_TESTING": {
       (0, import_log.log)("using FakeAgentHostingProvider", void 0, {
         F: __dxlog_file2,
-        L: 46,
+        L: 47,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -264,7 +297,7 @@ var makeClient = ({ config, halo }) => {
     default: {
       import_log.log.error("Unknown agent hosting provider type: " + agentHostingConfig.type, void 0, {
         F: __dxlog_file2,
-        L: 61,
+        L: 62,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -280,10 +313,10 @@ var makeClient = ({ config, halo }) => {
   ClientProvider,
   useAgentHostingClient,
   useClient,
-  useClientServices,
+  useClientStatus,
   useConfig,
   useShell,
   useShellDisplay,
   useStatus
 });
-//# sourceMappingURL=chunk-E3S6YHNJ.cjs.map
+//# sourceMappingURL=chunk-N474KOAU.cjs.map

package/dist/lib/node/chunk-N474KOAU.cjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/client/AgentHostingProvider.tsx", "../../../src/client/ClientProvider.tsx", "../../../src/client/context.ts", "../../../src/banner.ts", "../../../src/client/useClient.ts", "../../../src/client/useClientStatus.ts", "../../../src/client/useConfig.ts", "../../../src/client/useShell.ts", "../../../src/client/useStatus.ts"],
+  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport React, { createContext, type PropsWithChildren, useContext, useState } from 'react';\n\nimport { type AgentHostingProviderClient, AgentManagerClient, FakeAgentHostingProvider } from '@dxos/client';\nimport { type Halo } from '@dxos/client/halo';\nimport { type Config } from '@dxos/config';\nimport { log } from '@dxos/log';\n\nimport { useClient } from '../client';\n\nexport type AgentHostingProviderProps = { config: Config; halo: Halo };\n\nexport const AgentHostingContext = createContext<AgentHostingProviderClient | null>(null);\n\n/**\n * Experimental agent hosting provider.\n * @param props\n * @constructor\n * @deprecated\n */\nexport const AgentHostingProvider = (props: PropsWithChildren<{}>) => {\n  const client = useClient();\n  const [agentHostingProviderClient] = useState(makeClient(client));\n  return (\n    <AgentHostingContext.Provider value={agentHostingProviderClient}> {props.children}</AgentHostingContext.Provider>\n  );\n};\n\nexport const useAgentHostingClient = () => {\n  return useContext(AgentHostingContext);\n};\n\nconst makeClient = ({ config, halo }: AgentHostingProviderProps) => {\n  const agentHostingConfig = config.get('runtime.services.agentHosting');\n  if (!agentHostingConfig) {\n    log('no agent hosting configured');\n    return null;\n  }\n\n  // TODO(nf): Dynamically discover based on runtime config.\n  let agentHostingProviderClient: AgentHostingProviderClient | null = null;\n  switch (agentHostingConfig.type) {\n    case 'LOCAL_TESTING': {\n      log('using FakeAgentHostingProvider');\n      return new FakeAgentHostingProvider();\n    }\n\n    case 'AGENTHOSTING_API': {\n      agentHostingProviderClient = new AgentManagerClient(config, halo);\n      if (agentHostingProviderClient.init()) {\n        return agentHostingProviderClient;\n      } else {\n        // Not authorized or error initializing.\n        return null;\n      }\n    }\n\n    default: {\n      log.error('Unknown agent hosting provider type: ' + agentHostingConfig.type);\n      return null;\n    }\n  }\n};\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport React, {\n  forwardRef,\n  type FunctionComponent,\n  type ReactNode,\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 { type S } from '@dxos/echo-schema';\nimport { registerSignalRuntime } from '@dxos/echo-signals/react';\nimport { log } from '@dxos/log';\nimport { useControlledValue } from '@dxos/react-hooks';\nimport { getAsyncProviderValue, type MaybePromise, type Provider } from '@dxos/util';\n\nimport { ClientContext, type ClientContextProps } from './context';\nimport { printBanner } from '../banner';\n\n/**\n * Properties for the ClientProvider.\n */\nexport type ClientProviderProps = Pick<ClientContextProps, 'status'> &\n  Omit<ClientOptions, 'config' | 'services'> & {\n    children?: ReactNode;\n\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    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    services?: ClientServicesProvider | ((config?: Config) => MaybePromise<ClientServicesProvider>);\n\n    /**\n     * List of schema to register.\n     *\n     * NOTE: If a `client` is provided then `types` will not be added until after the children are first rendered.\n     */\n    types?: S.Schema<any>[];\n\n    /**\n     * ReactNode to display until the client is available.\n     */\n    fallback?: FunctionComponent<Partial<ClientContextProps>>;\n\n    /**\n     * Set to false to stop default signal runtime from being registered.\n     *\n     * The signals runtime is used to provide reactive updates to ECHO objects.\n     */\n    registerSignalRuntime?: boolean;\n\n    /**\n     * Skip the DXOS banner print.\n     */\n    disableBanner?: boolean;\n\n    /**\n     * Post initialization hook to enable to caller to do custom initialization.\n     *\n     * @param Client\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: configProvider,\n      client: clientProvider,\n      services: servicesProvider,\n      types,\n      status: controlledStatus,\n      fallback: Fallback = () => null,\n      registerSignalRuntime: _registerSignalRuntime = true,\n      disableBanner,\n      onInitialized,\n      ...options\n    },\n    forwardedRef,\n  ) => {\n    useEffect(() => {\n      // TODO(wittjosiah): Ideally this should be imported asynchronously because it is optional.\n      //   Unfortunately, async import seemed to break signals React instrumentation.\n      _registerSignalRuntime && registerSignalRuntime();\n    }, [_registerSignalRuntime]);\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(clientProvider instanceof Client ? clientProvider : undefined);\n\n    // Provide external access.\n    useImperativeHandle(forwardedRef, () => client, [client]);\n\n    // Client status subscription.\n    const [status, setStatus] = useControlledValue(controlledStatus);\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    useEffect(() => {\n      const initialize = async (client: Client) => {\n        if (!client.initialized) {\n          await client.initialize().catch(setError);\n          log('client ready');\n          if (types) {\n            client.addTypes(types);\n          }\n          await onInitialized?.(client);\n          log('initialization complete');\n        } else if (types) {\n          client.addTypes(types);\n        }\n\n        setClient(client);\n\n        if (!disableBanner) {\n          printBanner(client);\n        }\n      };\n\n      let client: Client;\n      const t = setTimeout(async () => {\n        if (clientProvider) {\n          // Asynchronously request client.\n          client = await getAsyncProviderValue(clientProvider);\n          await initialize(client);\n        } else {\n          // Asynchronously construct client (config may be undefined).\n          const config = await getAsyncProviderValue(configProvider);\n          log('resolved config', { config });\n          const services = await getAsyncProviderValue(servicesProvider, config);\n          log('created services', { services });\n          client = new Client({ config, services, ...options });\n          log('created client');\n          await initialize(client);\n        }\n      });\n\n      return () => {\n        log('clean up');\n        clearTimeout(t);\n        void client\n          ?.destroy()\n          .then(() => {\n            log('destroyed');\n          })\n          .catch((err) => log.catch(err));\n      };\n    }, [configProvider, clientProvider, servicesProvider, disableBanner]);\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 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\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", "//\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) {\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", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { useContext } from 'react';\n\nimport { raise } from '@dxos/debug';\n\nimport { ClientContext } from '../client/context';\n\n/**\n * Hook returning instance of DXOS client.\n * Requires ClientContext to be set via ClientProvider.\n */\nexport const useClient = () => {\n  const { client } = useContext(ClientContext) ?? raise(new Error('Missing ClientContext.'));\n  return client;\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { useEffect, useState } from 'react';\n\nimport { type Client, type SystemStatus } from '@dxos/client';\n\nexport const useClientStatus = (client: Client) => {\n  const [status, setStatus] = useState<SystemStatus | null>();\n  useEffect(() => {\n    if (!client) {\n      return;\n    }\n\n    const subscription = client.status.subscribe((status) => setStatus(status));\n    return () => subscription.unsubscribe();\n  }, [client, setStatus]);\n\n  return status;\n};\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport { useContext } from 'react';\n\nimport { raise } from '@dxos/debug';\n\nimport { ClientContext } from './context';\n\n/**\n * Hook returning config object used to initialize the DXOS client instance.\n * Requires ClientContext to be set via ClientProvider.\n */\nexport const useConfig = () => {\n  const { client } = useContext(ClientContext) ?? raise(new Error('Missing ClientContext.'));\n  return client.config;\n};\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { useEffect, useState } from 'react';\n\nimport { type Shell, type ShellDisplay } from '@dxos/client';\n\nimport { useClient } from './useClient';\n\n/**\n * Helper hook to access the shell.\n */\nexport const useShell = (): Shell => {\n  const client = useClient();\n  return client.shell;\n};\n\n/**\n * Hook to access the shell’s display state.\n */\nexport const useShellDisplay = (): ShellDisplay => {\n  const client = useClient();\n  const [display, setDisplay] = useState(client.shell.display);\n  useEffect(() => client.shell.onDisplayChange(setDisplay), [client]);\n  return display;\n};\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { useContext } from 'react';\n\nimport { type SystemStatus } from '@dxos/client';\nimport { raise } from '@dxos/debug';\n\nimport { ClientContext } from './context';\n\nexport const useStatus = (): SystemStatus | null | undefined => {\n  const { status } = useContext(ClientContext) ?? raise(new Error('Missing ClientContext.'));\n  return status;\n};\n"],
+  "mappings": "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",
+  "names": ["import_react", "import_client", "import_log", "import_debug", "ClientContext", "createContext", "undefined", "BANNER", "client", "commitHash", "config", "get", "hash", "version", "bannerPrinted", "printBanner", "console", "log", "ClientProvider", "forwardRef", "children", "configProvider", "clientProvider", "services", "servicesProvider", "types", "status", "controlledStatus", "fallback", "Fallback", "registerSignalRuntime", "_registerSignalRuntime", "disableBanner", "onInitialized", "options", "forwardedRef", "useEffect", "error", "setError", "useState", "setClient", "Client", "useImperativeHandle", "setStatus", "useControlledValue", "subscription", "subscribe", "unsubscribe", "initialize", "initialized", "catch", "addTypes", "t", "setTimeout", "getAsyncProviderValue", "clearTimeout", "destroy", "then", "err", "SystemStatus", "ACTIVE", "React", "Provider", "value", "useClient", "useContext", "raise", "Error", "useClientStatus", "useConfig", "useShell", "shell", "useShellDisplay", "display", "setDisplay", "onDisplayChange", "useStatus", "AgentHostingContext", "AgentHostingProvider", "props", "agentHostingProviderClient", "makeClient", "useAgentHostingClient", "halo", "agentHostingConfig", "type", "FakeAgentHostingProvider", "AgentManagerClient", "init"]
+}

package/dist/lib/node/devtools/index.cjs

@@ -23,36 +23,24 @@ __export(devtools_exports, {
   useStream: () => useStream
 });
 module.exports = __toCommonJS(devtools_exports);
-var import_chunk_E3S6YHNJ = require("../chunk-E3S6YHNJ.cjs");
+var import_chunk_N474KOAU = require("../chunk-N474KOAU.cjs");
 __reExport(devtools_exports, require("@dxos/client/devtools"), module.exports);
-var import_react = require("react");
 var import_debug = require("@dxos/debug");
-var import_invariant = require("@dxos/invariant");
-var import_react2 = require("react");
+var import_react = require("react");
 var import_log = require("@dxos/log");
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/react-client/src/devtools/useDevtools.ts";
 var useDevtools = () => {
-  const { services } = (0, import_react.useContext)(import_chunk_E3S6YHNJ.ClientContext) ?? (0, import_debug.raise)(new Error("Missing ClientContext."));
-  (0, import_invariant.invariant)(services, void 0, {
-    F: __dxlog_file,
-    L: 15,
-    S: void 0,
-    A: [
-      "services",
-      ""
-    ]
-  });
-  return services.DevtoolsHost;
+  const client = (0, import_chunk_N474KOAU.useClient)();
+  return client.services.services.DevtoolsHost ?? (0, import_debug.raise)(new Error("DevtoolsHost not available."));
 };
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/react-client/src/devtools/useStream.ts";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/react-client/src/devtools/useStream.ts";
 var useStream = (streamFactory, defaultValue, deps = []) => {
-  const [value, setValue] = (0, import_react2.useState)(defaultValue);
-  (0, import_react2.useEffect)(() => {
+  const [value, setValue] = (0, import_react.useState)(defaultValue);
+  (0, import_react.useEffect)(() => {
     const stream = streamFactory();
     stream.subscribe((response) => setValue(response), (err) => {
       if (err) {
         import_log.log.catch(err, void 0, {
-          F: __dxlog_file2,
+          F: __dxlog_file,
           L: 21,
           S: void 0,
           C: (f, a) => f(...a)

package/dist/lib/node/devtools/index.cjs.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 { useContext } from 'react';\n\nimport { type DevtoolsHost } from '@dxos/client/devtools';\nimport { raise } from '@dxos/debug';\nimport { invariant } from '@dxos/invariant';\n\nimport { ClientContext } from '../client';\n\nexport const useDevtools = (): DevtoolsHost => {\n  const { services } = useContext(ClientContext) ?? raise(new Error('Missing ClientContext.'));\n  invariant(services);\n  return services.DevtoolsHost;\n};\n", "//\n// Copyright 2021 DXOS.org\n//\n\nimport { type DependencyList, useState, useEffect } from 'react';\n\nimport { type Stream } from '@dxos/codec-protobuf';\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,6BAAc;ACAd,mBAA2B;AAG3B,mBAAsB;AACtB,uBAA0B;ACJ1B,IAAAA,gBAAyD;AAGzD,iBAAoB;;ADKb,IAAMC,cAAc,MAAA;AACzB,QAAM,EAAEC,SAAQ,QAAKC,yBAAWC,mCAAAA,SAAkBC,oBAAM,IAAIC,MAAM,wBAAA,CAAA;AAClEC,kCAAUL,UAAAA,QAAAA;;;;;;;;;AACV,SAAOA,SAASM;AAClB;;ACJO,IAAMC,YAAY,CAAIC,eAAgCC,cAAiBC,OAAuB,CAAA,MAAE;AACrG,QAAM,CAACC,OAAOC,QAAAA,QAAYC,wBAAwBJ,YAAAA;AAClDK,+BAAU,MAAA;AACR,UAAMC,SAASP,cAAAA;AACfO,WAAOC,UACL,CAACC,aAAgBL,SAASK,QAAAA,GAC1B,CAACC,QAAAA;AACC,UAAIA,KAAK;AACPC,uBAAIC,MAAMF,KAAAA,QAAAA;;;;;;MACZ;IACF,CAAA;AAGF,WAAO,MAAA;AACL,WAAKH,OAAOM,MAAK;IACnB;EACF,GAAGX,IAAAA;AAEH,SAAOC,SAASF;AAClB;",
-  "names": ["import_react", "useDevtools", "services", "useContext", "ClientContext", "raise", "Error", "invariant", "DevtoolsHost", "useStream", "streamFactory", "defaultValue", "deps", "value", "setValue", "useState", "useEffect", "stream", "subscribe", "response", "err", "log", "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, useState, useEffect } from 'react';\n\nimport { type Stream } from '@dxos/codec-protobuf';\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,6BAAc;ACCd,mBAAsB;ACDtB,mBAAyD;AAGzD,iBAAoB;ADEb,IAAMA,cAAc,MAAA;AACzB,QAAMC,aAASC,iCAAAA;AACf,SAAOD,OAAOE,SAASA,SAASC,oBAAgBC,oBAAM,IAAIC,MAAM,6BAAA,CAAA;AAClE;;ACAO,IAAMC,YAAY,CAAIC,eAAgCC,cAAiBC,OAAuB,CAAA,MAAE;AACrG,QAAM,CAACC,OAAOC,QAAAA,QAAYC,uBAAwBJ,YAAAA;AAClDK,8BAAU,MAAA;AACR,UAAMC,SAASP,cAAAA;AACfO,WAAOC,UACL,CAACC,aAAgBL,SAASK,QAAAA,GAC1B,CAACC,QAAAA;AACC,UAAIA,KAAK;AACPC,uBAAIC,MAAMF,KAAAA,QAAAA;;;;;;MACZ;IACF,CAAA;AAGF,WAAO,MAAA;AACL,WAAKH,OAAOM,MAAK;IACnB;EACF,GAAGX,IAAAA;AAEH,SAAOC,SAASF;AAClB;",
+  "names": ["useDevtools", "client", "useClient", "services", "DevtoolsHost", "raise", "Error", "useStream", "streamFactory", "defaultValue", "deps", "value", "setValue", "useState", "useEffect", "stream", "subscribe", "response", "err", "log", "catch", "close"]
 }

package/dist/lib/node/echo/index.cjs

@@ -29,24 +29,24 @@ __export(echo_exports, {
 });
 module.exports = __toCommonJS(echo_exports);
 var import_chunk_FYOAVV65 = require("../chunk-FYOAVV65.cjs");
-var import_chunk_E3S6YHNJ = require("../chunk-E3S6YHNJ.cjs");
+var import_chunk_N474KOAU = require("../chunk-N474KOAU.cjs");
 __reExport(echo_exports, require("@dxos/client/echo"), module.exports);
 var import_async = require("@dxos/async");
 var import_echo = require("@dxos/client/echo");
-var import_react_async = require("@dxos/react-async");
+var import_react_hooks = require("@dxos/react-hooks");
 var import_react = require("react");
 var import_echo2 = require("@dxos/client/echo");
-var import_react_async2 = require("@dxos/react-async");
+var import_react_hooks2 = require("@dxos/react-hooks");
 var import_react2 = require("react");
 var import_echo3 = require("@dxos/client/echo");
 var import_react3 = require("react");
 var import_async2 = require("@dxos/async");
-var import_react_async3 = require("@dxos/react-async");
+var import_react_hooks3 = require("@dxos/react-hooks");
 var import_react4 = require("react");
 var import_echo4 = require("@dxos/client/echo");
 var useSpace = (spaceKeyLike) => {
-  const client = (0, import_chunk_E3S6YHNJ.useClient)();
-  const spaces = (0, import_react_async2.useMulticastObservable)(client.spaces);
+  const client = (0, import_chunk_N474KOAU.useClient)();
+  const spaces = (0, import_react_hooks2.useMulticastObservable)(client.spaces);
   const [ready, setReady] = (0, import_react.useState)(false);
   (0, import_react.useEffect)(() => {
     if (spaceKeyLike) {
@@ -69,8 +69,8 @@ var useSpace = (spaceKeyLike) => {
   }
 };
 var useSpaces = ({ all = false } = {}) => {
-  const client = (0, import_chunk_E3S6YHNJ.useClient)();
-  const spaces = (0, import_react_async2.useMulticastObservable)(client.spaces);
+  const client = (0, import_chunk_N474KOAU.useClient)();
+  const spaces = (0, import_react_hooks2.useMulticastObservable)(client.spaces);
   return spaces.filter((space) => all || space.state.get() === import_echo2.SpaceState.SPACE_READY);
 };
 var useMembers = (spaceKey) => {
@@ -78,7 +78,7 @@ var useMembers = (spaceKey) => {
     all: true
   });
   const space = spaceKey ? spaces.find((space2) => space2.key.equals(spaceKey)) : void 0;
-  const members = (0, import_react_async.useMulticastObservable)(space?.members ?? import_async.MulticastObservable.empty()) ?? [];
+  const members = (0, import_react_hooks.useMulticastObservable)(space?.members ?? import_async.MulticastObservable.empty()) ?? [];
   return members.filter((member) => member.role !== import_echo.HaloSpaceMember.Role.REMOVED);
 };
 var useQuery = (spaceOrEcho, filter, options, deps) => {
@@ -109,7 +109,7 @@ var noop = () => {
 var EMPTY_ARRAY = [];
 var useSpaceInvitations = (spaceKey) => {
   const space = useSpace(spaceKey);
-  return (0, import_react_async3.useMulticastObservable)(space?.invitations ?? import_async2.MulticastObservable.empty()) ?? [];
+  return (0, import_react_hooks3.useMulticastObservable)(space?.invitations ?? import_async2.MulticastObservable.empty()) ?? [];
 };
 var useSpaceInvitation = (spaceKey, invitationId) => {
   const invitations = useSpaceInvitations(spaceKey);

package/dist/lib/node/echo/index.cjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/echo/index.ts", "../../../../src/echo/useMembers.ts", "../../../../src/echo/useSpaces.ts", "../../../../src/echo/useQuery.ts", "../../../../src/echo/useSpaceInvitations.ts", "../../../../src/echo/useSubscription.ts"],
-  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nexport * from '@dxos/client/echo';\n\nexport * from './useMembers';\nexport * from './useQuery';\nexport * from './useSpaces';\nexport * from './useSpaceInvitations';\nexport * from './useSubscription';\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { MulticastObservable } from '@dxos/async';\nimport { type PublicKey } from '@dxos/client';\nimport { HaloSpaceMember, type SpaceMember } from '@dxos/client/echo';\nimport { useMulticastObservable } from '@dxos/react-async';\n\nimport { useSpaces } from './useSpaces';\n\nexport const useMembers = (spaceKey: PublicKey | undefined): SpaceMember[] => {\n  // TODO(dmaretskyi): useSpace hook for spaces that are not ready.\n  const spaces = useSpaces({ all: true });\n  const space = spaceKey ? spaces.find((space) => space.key.equals(spaceKey)) : undefined;\n\n  // EMPTY_OBSERVABLE needs to be a stable reference to avoid re-subscribing on every render.\n  const members = useMulticastObservable(space?.members ?? MulticastObservable.empty()) ?? [];\n  return members.filter((member) => member.role !== HaloSpaceMember.Role.REMOVED);\n};\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport { useEffect, useState } from 'react';\n\nimport { type PublicKeyLike } from '@dxos/client';\nimport { type Space, SpaceState } from '@dxos/client/echo';\nimport { useMulticastObservable } from '@dxos/react-async';\n\nimport { useClient } from '../client';\n\n/**\n * Get a specific Space using its key.\n * The space is not guaranteed to be in the ready state.\n * Returns the default space if no key is provided.\n * Requires a ClientProvider somewhere in the parent tree.\n *\n * @param spaceKeyLike the key of the space to look for\n */\nexport const useSpace = (spaceKeyLike?: PublicKeyLike): Space | undefined => {\n  const client = useClient();\n  const spaces = useMulticastObservable<Space[]>(client.spaces);\n  const [ready, setReady] = useState(false);\n\n  useEffect(() => {\n    // Only wait for ready if looking for the default space.\n    if (spaceKeyLike) {\n      return;\n    }\n\n    const timeout = setTimeout(async () => {\n      await client.spaces.isReady.wait();\n      setReady(true);\n    });\n\n    return () => clearTimeout(timeout);\n  }, [client, spaceKeyLike]);\n\n  if (spaceKeyLike) {\n    return spaces.find((space) => space.key.equals(spaceKeyLike) || space.id === spaceKeyLike);\n  }\n\n  if (ready && client.halo.identity.get()) {\n    return client.spaces.default;\n  }\n};\n\nexport type UseSpacesParams = {\n  /**\n   * Return uninitialized spaces as well.\n   */\n  all?: boolean;\n};\n\n/**\n * Get all Spaces available to current user.\n * Requires a ClientProvider somewhere in the parent tree.\n * By default, only ready spaces are returned.\n * @returns an array of Spaces\n */\nexport const useSpaces = ({ all = false }: UseSpacesParams = {}): Space[] => {\n  const client = useClient();\n  const spaces = useMulticastObservable<Space[]>(client.spaces);\n\n  // TODO(dmaretskyi): Array reference equality.\n  return spaces.filter((space) => all || space.state.get() === SpaceState.SPACE_READY);\n};\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { useMemo, useSyncExternalStore } from 'react';\n\nimport {\n  isSpace,\n  type Echo,\n  type EchoReactiveObject,\n  type FilterSource,\n  type Query,\n  type QueryOptions,\n  type Space,\n} from '@dxos/client/echo';\n\n/**\n * Create subscription.\n */\n// TODO(burdon): Support typed operator filters (e.g., Note.filter(note => ...)).\nexport const useQuery = <T extends EchoReactiveObject<any>>(\n  spaceOrEcho?: Space | Echo,\n  filter?: FilterSource<T>,\n  options?: QueryOptions,\n  deps?: any[],\n): T[] => {\n  const { subscribe, getObjects } = useMemo(() => {\n    const query = isSpace(spaceOrEcho)\n      ? spaceOrEcho.db.query(filter, options)\n      : (spaceOrEcho?.query(filter, options) as Query<T> | undefined);\n    let subscribed = false;\n\n    return {\n      subscribe: (cb: () => void) => {\n        subscribed = true;\n        const unsubscribe = query?.subscribe(cb) ?? noop;\n        return () => {\n          unsubscribe?.();\n          subscribed = false;\n        };\n      },\n      getObjects: () => (subscribed && query ? query.objects : EMPTY_ARRAY),\n    };\n  }, [spaceOrEcho, ...(typeof filter === 'function' ? [] : filterToDepsArray(filter)), ...(deps ?? [])]);\n\n  // https://beta.reactjs.org/reference/react/useSyncExternalStore\n  // NOTE: This hook will resubscribe whenever the callback passed to the first argument changes -- make sure it is stable.\n  return useSyncExternalStore<T[] | undefined>(subscribe, getObjects) ?? [];\n};\n\n// TODO(dmaretskyi): Serialize the filter here instead.\nconst filterToDepsArray = (filter?: FilterSource<any>) =>\n  Object.entries(filter ?? {})\n    .flat(10)\n    .map((x) => (typeof x === 'function' || typeof x === 'object' ? null : x));\n\nconst noop = () => {};\n\nconst EMPTY_ARRAY: never[] = [];\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { useMemo } from 'react';\n\nimport { MulticastObservable } from '@dxos/async';\nimport { type PublicKey } from '@dxos/client';\nimport { useMulticastObservable } from '@dxos/react-async';\n\nimport { useSpace } from './useSpaces';\nimport { type CancellableInvitationObservable, useInvitationStatus } from '../invitations';\n\nexport const useSpaceInvitations = (spaceKey?: PublicKey): CancellableInvitationObservable[] => {\n  const space = useSpace(spaceKey);\n  return useMulticastObservable(space?.invitations ?? MulticastObservable.empty()) ?? [];\n};\n\nexport const useSpaceInvitation = (spaceKey?: PublicKey, invitationId?: string) => {\n  const invitations = useSpaceInvitations(spaceKey);\n  const invitation = useMemo(\n    () => invitations.find((invitation) => invitation.get().invitationId === invitationId),\n    [invitations],\n  );\n  return useInvitationStatus(invitation);\n};\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { useEffect, useRef } from 'react';\n\nimport { type Selection, type SubscriptionHandle, createSubscription } from '@dxos/client/echo';\n\n/**\n * Create reactive selection.\n * Calls the callback when the selection changes and during the first render.\n */\n// TODO(wittjosiah): Is this still needed with signals reactivity? If not, remove or update jsdoc with usage info.\nexport const useSubscription = (cb: () => void, selection: Selection) => {\n  // Make sure that the callback is always the one from the latest render.\n  // Without this, we would always call the callback from the initial render,\n  // which might contain stale data.\n  const callbackRef = useRef(cb);\n  callbackRef.current = cb;\n\n  const subscriptionRef = useRef<SubscriptionHandle>();\n\n  useEffect(() => {\n    subscriptionRef.current = createSubscription(() => {\n      callbackRef.current();\n    });\n\n    return () => subscriptionRef.current?.unsubscribe();\n  }, []);\n\n  subscriptionRef.current?.update(selection);\n  return subscriptionRef.current;\n};\n"],
+  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nexport * from '@dxos/client/echo';\n\nexport * from './useMembers';\nexport * from './useQuery';\nexport * from './useSpaces';\nexport * from './useSpaceInvitations';\nexport * from './useSubscription';\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { MulticastObservable } from '@dxos/async';\nimport { type PublicKey } from '@dxos/client';\nimport { HaloSpaceMember, type SpaceMember } from '@dxos/client/echo';\nimport { useMulticastObservable } from '@dxos/react-hooks';\n\nimport { useSpaces } from './useSpaces';\n\nexport const useMembers = (spaceKey: PublicKey | undefined): SpaceMember[] => {\n  // TODO(dmaretskyi): useSpace hook for spaces that are not ready.\n  const spaces = useSpaces({ all: true });\n  const space = spaceKey ? spaces.find((space) => space.key.equals(spaceKey)) : undefined;\n\n  // EMPTY_OBSERVABLE needs to be a stable reference to avoid re-subscribing on every render.\n  const members = useMulticastObservable(space?.members ?? MulticastObservable.empty()) ?? [];\n  return members.filter((member) => member.role !== HaloSpaceMember.Role.REMOVED);\n};\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport { useEffect, useState } from 'react';\n\nimport { type PublicKeyLike } from '@dxos/client';\nimport { type Space, SpaceState } from '@dxos/client/echo';\nimport { useMulticastObservable } from '@dxos/react-hooks';\n\nimport { useClient } from '../client';\n\n/**\n * Get a specific Space using its key.\n * The space is not guaranteed to be in the ready state.\n * Returns the default space if no key is provided.\n * Requires a ClientProvider somewhere in the parent tree.\n *\n * @param spaceKeyLike the key of the space to look for\n */\nexport const useSpace = (spaceKeyLike?: PublicKeyLike): Space | undefined => {\n  const client = useClient();\n  const spaces = useMulticastObservable<Space[]>(client.spaces);\n  const [ready, setReady] = useState(false);\n\n  useEffect(() => {\n    // Only wait for ready if looking for the default space.\n    if (spaceKeyLike) {\n      return;\n    }\n\n    const timeout = setTimeout(async () => {\n      await client.spaces.isReady.wait();\n      setReady(true);\n    });\n\n    return () => clearTimeout(timeout);\n  }, [client, spaceKeyLike]);\n\n  if (spaceKeyLike) {\n    return spaces.find((space) => space.key.equals(spaceKeyLike) || space.id === spaceKeyLike);\n  }\n\n  if (ready && client.halo.identity.get()) {\n    return client.spaces.default;\n  }\n};\n\nexport type UseSpacesParams = {\n  /**\n   * Return uninitialized spaces as well.\n   */\n  all?: boolean;\n};\n\n/**\n * Get all Spaces available to current user.\n * Requires a ClientProvider somewhere in the parent tree.\n * By default, only ready spaces are returned.\n * @returns an array of Spaces\n */\nexport const useSpaces = ({ all = false }: UseSpacesParams = {}): Space[] => {\n  const client = useClient();\n  const spaces = useMulticastObservable<Space[]>(client.spaces);\n\n  // TODO(dmaretskyi): Array reference equality.\n  return spaces.filter((space) => all || space.state.get() === SpaceState.SPACE_READY);\n};\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { useMemo, useSyncExternalStore } from 'react';\n\nimport {\n  isSpace,\n  type Echo,\n  type EchoReactiveObject,\n  type FilterSource,\n  type Query,\n  type QueryOptions,\n  type Space,\n} from '@dxos/client/echo';\n\n/**\n * Create subscription.\n */\n// TODO(burdon): Support typed operator filters (e.g., Note.filter(note => ...)).\nexport const useQuery = <T extends EchoReactiveObject<any>>(\n  spaceOrEcho?: Space | Echo,\n  filter?: FilterSource<T>,\n  options?: QueryOptions,\n  deps?: any[],\n): T[] => {\n  const { subscribe, getObjects } = useMemo(() => {\n    const query = isSpace(spaceOrEcho)\n      ? spaceOrEcho.db.query(filter, options)\n      : (spaceOrEcho?.query(filter, options) as Query<T> | undefined);\n    let subscribed = false;\n\n    return {\n      subscribe: (cb: () => void) => {\n        subscribed = true;\n        const unsubscribe = query?.subscribe(cb) ?? noop;\n        return () => {\n          unsubscribe?.();\n          subscribed = false;\n        };\n      },\n      getObjects: () => (subscribed && query ? query.objects : EMPTY_ARRAY),\n    };\n  }, [spaceOrEcho, ...(typeof filter === 'function' ? [] : filterToDepsArray(filter)), ...(deps ?? [])]);\n\n  // https://beta.reactjs.org/reference/react/useSyncExternalStore\n  // NOTE: This hook will resubscribe whenever the callback passed to the first argument changes -- make sure it is stable.\n  return useSyncExternalStore<T[] | undefined>(subscribe, getObjects) ?? [];\n};\n\n// TODO(dmaretskyi): Serialize the filter here instead.\nconst filterToDepsArray = (filter?: FilterSource<any>) =>\n  Object.entries(filter ?? {})\n    .flat(10)\n    .map((x) => (typeof x === 'function' || typeof x === 'object' ? null : x));\n\nconst noop = () => {};\n\nconst EMPTY_ARRAY: never[] = [];\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { useMemo } from 'react';\n\nimport { MulticastObservable } from '@dxos/async';\nimport { type PublicKey } from '@dxos/client';\nimport { useMulticastObservable } from '@dxos/react-hooks';\n\nimport { useSpace } from './useSpaces';\nimport { type CancellableInvitationObservable, useInvitationStatus } from '../invitations';\n\nexport const useSpaceInvitations = (spaceKey?: PublicKey): CancellableInvitationObservable[] => {\n  const space = useSpace(spaceKey);\n  return useMulticastObservable(space?.invitations ?? MulticastObservable.empty()) ?? [];\n};\n\nexport const useSpaceInvitation = (spaceKey?: PublicKey, invitationId?: string) => {\n  const invitations = useSpaceInvitations(spaceKey);\n  const invitation = useMemo(\n    () => invitations.find((invitation) => invitation.get().invitationId === invitationId),\n    [invitations],\n  );\n  return useInvitationStatus(invitation);\n};\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { useEffect, useRef } from 'react';\n\nimport { type Selection, type SubscriptionHandle, createSubscription } from '@dxos/client/echo';\n\n/**\n * Create reactive selection.\n * Calls the callback when the selection changes and during the first render.\n */\n// TODO(wittjosiah): Is this still needed with signals reactivity? If not, remove or update jsdoc with usage info.\nexport const useSubscription = (cb: () => void, selection: Selection) => {\n  // Make sure that the callback is always the one from the latest render.\n  // Without this, we would always call the callback from the initial render,\n  // which might contain stale data.\n  const callbackRef = useRef(cb);\n  callbackRef.current = cb;\n\n  const subscriptionRef = useRef<SubscriptionHandle>();\n\n  useEffect(() => {\n    subscriptionRef.current = createSubscription(() => {\n      callbackRef.current();\n    });\n\n    return () => subscriptionRef.current?.unsubscribe();\n  }, []);\n\n  subscriptionRef.current?.update(selection);\n  return subscriptionRef.current;\n};\n"],
   "mappings": "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",
-  "names": ["import_echo", "import_react_async", "import_react", "import_async", "useSpace", "spaceKeyLike", "client", "useClient", "spaces", "useMulticastObservable", "ready", "setReady", "useState", "useEffect", "timeout", "setTimeout", "isReady", "wait", "clearTimeout", "find", "space", "key", "equals", "id", "halo", "identity", "get", "default", "useSpaces", "all", "filter", "state", "SpaceState", "SPACE_READY", "useMembers", "spaceKey", "undefined", "members", "MulticastObservable", "empty", "member", "role", "HaloSpaceMember", "Role", "REMOVED", "useQuery", "spaceOrEcho", "options", "deps", "subscribe", "getObjects", "useMemo", "query", "isSpace", "db", "subscribed", "cb", "unsubscribe", "noop", "objects", "EMPTY_ARRAY", "filterToDepsArray", "useSyncExternalStore", "Object", "entries", "flat", "map", "x", "useSpaceInvitations", "invitations", "useSpaceInvitation", "invitationId", "invitation", "useInvitationStatus", "useSubscription", "selection", "callbackRef", "useRef", "current", "subscriptionRef", "createSubscription", "update"]
+  "names": ["import_echo", "import_react_hooks", "import_react", "import_async", "useSpace", "spaceKeyLike", "client", "useClient", "spaces", "useMulticastObservable", "ready", "setReady", "useState", "useEffect", "timeout", "setTimeout", "isReady", "wait", "clearTimeout", "find", "space", "key", "equals", "id", "halo", "identity", "get", "default", "useSpaces", "all", "filter", "state", "SpaceState", "SPACE_READY", "useMembers", "spaceKey", "undefined", "members", "MulticastObservable", "empty", "member", "role", "HaloSpaceMember", "Role", "REMOVED", "useQuery", "spaceOrEcho", "options", "deps", "subscribe", "getObjects", "useMemo", "query", "isSpace", "db", "subscribed", "cb", "unsubscribe", "noop", "objects", "EMPTY_ARRAY", "filterToDepsArray", "useSyncExternalStore", "Object", "entries", "flat", "map", "x", "useSpaceInvitations", "invitations", "useSpaceInvitation", "invitationId", "invitation", "useInvitationStatus", "useSubscription", "selection", "callbackRef", "useRef", "current", "subscriptionRef", "createSubscription", "update"]
 }

package/dist/lib/node/halo/index.cjs

@@ -31,25 +31,25 @@ __export(halo_exports, {
 });
 module.exports = __toCommonJS(halo_exports);
 var import_chunk_FYOAVV65 = require("../chunk-FYOAVV65.cjs");
-var import_chunk_E3S6YHNJ = require("../chunk-E3S6YHNJ.cjs");
+var import_chunk_N474KOAU = require("../chunk-N474KOAU.cjs");
 var import_halo = require("@dxos/client/halo");
-var import_react_async = require("@dxos/react-async");
-var import_react_async2 = require("@dxos/react-async");
+var import_react_hooks = require("@dxos/react-hooks");
+var import_react_hooks2 = require("@dxos/react-hooks");
 var import_react = require("react");
-var import_react_async3 = require("@dxos/react-async");
-var import_react_async4 = require("@dxos/react-async");
+var import_react_hooks3 = require("@dxos/react-hooks");
+var import_react_hooks4 = require("@dxos/react-hooks");
 var import_react2 = require("react");
 var useContacts = () => {
-  const client = (0, import_chunk_E3S6YHNJ.useClient)();
-  return (0, import_react_async.useMulticastObservable)(client.halo.contacts);
+  const client = (0, import_chunk_N474KOAU.useClient)();
+  return (0, import_react_hooks.useMulticastObservable)(client.halo.contacts);
 };
 var useDevices = () => {
-  const client = (0, import_chunk_E3S6YHNJ.useClient)();
-  return (0, import_react_async2.useMulticastObservable)(client.halo.devices);
+  const client = (0, import_chunk_N474KOAU.useClient)();
+  return (0, import_react_hooks2.useMulticastObservable)(client.halo.devices);
 };
 var useHaloInvitations = () => {
-  const client = (0, import_chunk_E3S6YHNJ.useClient)();
-  return (0, import_react_async3.useMulticastObservable)(client.halo.invitations);
+  const client = (0, import_chunk_N474KOAU.useClient)();
+  return (0, import_react_hooks3.useMulticastObservable)(client.halo.invitations);
 };
 var useHaloInvitation = (invitationId) => {
   const invitations = useHaloInvitations();
@@ -59,8 +59,8 @@ var useHaloInvitation = (invitationId) => {
   return (0, import_chunk_FYOAVV65.useInvitationStatus)(invitation);
 };
 var useIdentity = () => {
-  const client = (0, import_chunk_E3S6YHNJ.useClient)();
-  return (0, import_react_async4.useMulticastObservable)(client.halo.identity);
+  const client = (0, import_chunk_N474KOAU.useClient)();
+  return (0, import_react_hooks4.useMulticastObservable)(client.halo.identity);
 };
 var KeyStore = class {
   constructor(_defaultKeys = []) {