@dxos/react-client 0.6.11 → 0.6.12-main.2d19bf1

package/dist/lib/browser/{chunk-CL7JDETM.mjs → chunk-RJRDB4LF.mjs}

@@ -1,12 +1,12 @@
 // packages/sdk/react-client/src/client/AgentHostingProvider.tsx
-import React2, { createContext as createContext2, useContext as useContext5, useState as useState4 } from "react";
+import React2, { createContext as createContext2, useContext as useContext4, useState as useState4 } from "react";
 import { AgentManagerClient, FakeAgentHostingProvider } from "@dxos/client";
 import { log as log2 } from "@dxos/log";
 
 // packages/sdk/react-client/src/client/ClientProvider.tsx
-import React, { useEffect, useMemo, useState } from "react";
+import React, { forwardRef, useEffect, useImperativeHandle, useState } from "react";
 import { Client, SystemStatus } from "@dxos/client";
-import { registerSignalFactory } from "@dxos/echo-signals/react";
+import { registerSignalsRuntime } from "@dxos/echo-signals/react";
 import { log } from "@dxos/log";
 import { useControlledValue } from "@dxos/react-hooks";
 import { getAsyncProviderValue } from "@dxos/util";
@@ -41,15 +41,18 @@ var printBanner = (client) => {
 
 // packages/sdk/react-client/src/client/ClientProvider.tsx
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/react-client/src/client/ClientProvider.tsx";
-var ClientProvider = ({ children, config: configProvider, client: clientProvider, services: servicesProvider, types, status: controlledStatus, fallback: Fallback = () => null, registerSignalFactory: _registerSignalFactory = true, onInitialized, ...options }) => {
-  useMemo(() => {
-    _registerSignalFactory && registerSignalFactory();
+var ClientProvider = /* @__PURE__ */ forwardRef(({ children, config: configProvider, client: clientProvider, services: servicesProvider, status: controlledStatus, fallback: Fallback = () => null, signalsRuntime = true, noBanner, onInitialized, ...options }, forwardedRef) => {
+  useEffect(() => {
+    signalsRuntime && registerSignalsRuntime();
   }, []);
-  const [client, setClient] = useState(clientProvider instanceof Client ? clientProvider : void 0);
   const [error, setError] = useState();
   if (error) {
     throw error;
   }
+  const [client, setClient] = useState(clientProvider instanceof Client ? clientProvider : void 0);
+  useImperativeHandle(forwardedRef, () => client, [
+    client
+  ]);
   const [status, setStatus] = useControlledValue(controlledStatus);
   useEffect(() => {
     if (!client) {
@@ -58,43 +61,43 @@ var ClientProvider = ({ children, config: configProvider, client: clientProvider
     const subscription = client.status.subscribe((status2) => setStatus(status2));
     return () => subscription.unsubscribe();
   }, [
-    client,
-    setStatus
+    client
   ]);
   useEffect(() => {
-    const done = async (client2) => {
-      await client2.initialize().catch(setError);
-      log("client ready", void 0, {
-        F: __dxlog_file,
-        L: 115,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      await onInitialized?.(client2);
-      log("initialization complete", void 0, {
-        F: __dxlog_file,
-        L: 117,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      if (types) {
-        client2.addTypes(types);
+    const initialize = async (client3) => {
+      if (!client3.initialized) {
+        await client3.initialize().catch(setError);
+        log("client ready", void 0, {
+          F: __dxlog_file,
+          L: 134,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
+        await onInitialized?.(client3);
+        log("initialization complete", void 0, {
+          F: __dxlog_file,
+          L: 136,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
+      }
+      setClient(client3);
+      if (!noBanner) {
+        printBanner(client3);
       }
-      setClient(client2);
-      setStatus(client2.status.get() ?? SystemStatus.ACTIVE);
-      printBanner(client2);
     };
+    let client2;
     const t = setTimeout(async () => {
       if (clientProvider) {
-        const client2 = await getAsyncProviderValue(clientProvider);
-        await done(client2);
+        client2 = await getAsyncProviderValue(clientProvider);
+        await initialize(client2);
       } else {
         const config = await getAsyncProviderValue(configProvider);
         log("resolved config", {
           config
         }, {
           F: __dxlog_file,
-          L: 135,
+          L: 155,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -103,45 +106,53 @@ var ClientProvider = ({ children, config: configProvider, client: clientProvider
           services
         }, {
           F: __dxlog_file,
-          L: 137,
+          L: 157,
           S: void 0,
           C: (f, a) => f(...a)
         });
-        const client2 = new Client({
+        client2 = new Client({
           config,
           services,
           ...options
         });
         log("created client", void 0, {
           F: __dxlog_file,
-          L: 139,
+          L: 159,
           S: void 0,
           C: (f, a) => f(...a)
         });
-        await done(client2);
+        await initialize(client2);
       }
     });
     return () => {
       log("clean up", void 0, {
         F: __dxlog_file,
-        L: 145,
+        L: 165,
         S: void 0,
         C: (f, a) => f(...a)
       });
       clearTimeout(t);
-      void client?.destroy().catch((err) => log.catch(err, void 0, {
+      void client2?.destroy().then(() => {
+        log("destroyed", void 0, {
+          F: __dxlog_file,
+          L: 170,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
+      }).catch((err) => log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 147,
+        L: 172,
         S: void 0,
         C: (f, a) => f(...a)
       }));
     };
   }, [
-    clientProvider,
     configProvider,
-    servicesProvider
+    clientProvider,
+    servicesProvider,
+    noBanner
   ]);
-  if (!client || status !== SystemStatus.ACTIVE) {
+  if (!client?.initialized || status !== SystemStatus.ACTIVE) {
     return /* @__PURE__ */ React.createElement(Fallback, {
       client,
       status
@@ -153,7 +164,7 @@ var ClientProvider = ({ children, config: configProvider, client: clientProvider
       status
     }
   }, children);
-};
+});
 
 // packages/sdk/react-client/src/client/useClient.ts
 import { useContext } from "react";
@@ -163,14 +174,6 @@ var useClient = () => {
   return client;
 };
 
-// packages/sdk/react-client/src/client/useClientServices.ts
-import { useContext as useContext2 } from "react";
-import { raise as raise2 } from "@dxos/debug";
-var useClientServices = () => {
-  const { services } = useContext2(ClientContext) ?? raise2(new Error("Missing ClientContext."));
-  return services;
-};
-
 // packages/sdk/react-client/src/client/useClientStatus.ts
 import { useEffect as useEffect2, useState as useState2 } from "react";
 var useClientStatus = (client) => {
@@ -189,10 +192,10 @@ var useClientStatus = (client) => {
 };
 
 // packages/sdk/react-client/src/client/useConfig.ts
-import { useContext as useContext3 } from "react";
-import { raise as raise3 } from "@dxos/debug";
+import { useContext as useContext2 } from "react";
+import { raise as raise2 } from "@dxos/debug";
 var useConfig = () => {
-  const { client } = useContext3(ClientContext) ?? raise3(new Error("Missing ClientContext."));
+  const { client } = useContext2(ClientContext) ?? raise2(new Error("Missing ClientContext."));
   return client.config;
 };
 
@@ -212,10 +215,10 @@ var useShellDisplay = () => {
 };
 
 // packages/sdk/react-client/src/client/useStatus.ts
-import { useContext as useContext4 } from "react";
-import { raise as raise4 } from "@dxos/debug";
+import { useContext as useContext3 } from "react";
+import { raise as raise3 } from "@dxos/debug";
 var useStatus = () => {
-  const { status } = useContext4(ClientContext) ?? raise4(new Error("Missing ClientContext."));
+  const { status } = useContext3(ClientContext) ?? raise3(new Error("Missing ClientContext."));
   return status;
 };
 
@@ -230,7 +233,7 @@ var AgentHostingProvider = (props) => {
   }, " ", props.children);
 };
 var useAgentHostingClient = () => {
-  return useContext5(AgentHostingContext);
+  return useContext4(AgentHostingContext);
 };
 var makeClient = ({ config, halo }) => {
   const agentHostingConfig = config.get("runtime.services.agentHosting");
@@ -281,11 +284,10 @@ export {
   ClientContext,
   ClientProvider,
   useClient,
-  useClientServices,
   useClientStatus,
   useConfig,
   useShell,
   useShellDisplay,
   useStatus
 };
-//# sourceMappingURL=chunk-CL7JDETM.mjs.map
+//# sourceMappingURL=chunk-RJRDB4LF.mjs.map

package/dist/lib/browser/chunk-RJRDB4LF.mjs.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  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 { registerSignalsRuntime } 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 = 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     * Enable (by default) registration of Preact signals runtime for reactive ECHO objects.\n     * @see https://www.npmjs.com/package/@preact/signals-react\n     */\n    signalsRuntime?: boolean;\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     * @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      status: controlledStatus,\n      fallback: Fallback = () => null,\n      signalsRuntime = true,\n      noBanner,\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      signalsRuntime && registerSignalsRuntime();\n    }, []);\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          await onInitialized?.(client);\n          log('initialization complete');\n        }\n\n        setClient(client);\n\n        if (!noBanner) {\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, 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 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", "//\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": ["React", "createContext", "useContext", "useState", "AgentManagerClient", "FakeAgentHostingProvider", "log", "React", "forwardRef", "useEffect", "useImperativeHandle", "useState", "Client", "SystemStatus", "registerSignalsRuntime", "log", "useControlledValue", "getAsyncProviderValue", "createContext", "ClientContext", "createContext", "undefined", "BANNER", "client", "commitHash", "config", "get", "hash", "version", "bannerPrinted", "printBanner", "console", "log", "ClientProvider", "forwardRef", "children", "config", "configProvider", "client", "clientProvider", "services", "servicesProvider", "status", "controlledStatus", "fallback", "Fallback", "signalsRuntime", "noBanner", "onInitialized", "options", "forwardedRef", "useEffect", "registerSignalsRuntime", "error", "setError", "useState", "setClient", "Client", "undefined", "useImperativeHandle", "setStatus", "useControlledValue", "subscription", "subscribe", "unsubscribe", "initialize", "initialized", "catch", "log", "printBanner", "t", "setTimeout", "getAsyncProviderValue", "clearTimeout", "destroy", "then", "err", "SystemStatus", "ACTIVE", "ClientContext", "Provider", "value", "useContext", "raise", "useClient", "client", "useContext", "ClientContext", "raise", "Error", "useEffect", "useState", "useClientStatus", "client", "status", "setStatus", "useState", "useEffect", "subscription", "subscribe", "unsubscribe", "useContext", "raise", "useConfig", "client", "useContext", "ClientContext", "raise", "Error", "config", "useEffect", "useState", "useShell", "client", "useClient", "shell", "useShellDisplay", "display", "setDisplay", "useState", "useEffect", "onDisplayChange", "useContext", "raise", "useStatus", "status", "useContext", "ClientContext", "raise", "Error", "AgentHostingContext", "createContext", "AgentHostingProvider", "props", "client", "useClient", "agentHostingProviderClient", "useState", "makeClient", "React", "Provider", "value", "children", "useAgentHostingClient", "useContext", "config", "halo", "agentHostingConfig", "get", "log", "type", "FakeAgentHostingProvider", "AgentManagerClient", "init", "error"]
+}

package/dist/lib/browser/devtools/index.mjs

@@ -1,6 +1,6 @@
 import {
   useClient
-} from "../chunk-CL7JDETM.mjs";
+} from "../chunk-RJRDB4LF.mjs";
 
 // packages/sdk/react-client/src/devtools/index.ts
 export * from "@dxos/client/devtools";

package/dist/lib/browser/echo/index.mjs

@@ -3,7 +3,7 @@ import {
 } from "../chunk-AL2CUQ46.mjs";
 import {
   useClient
-} from "../chunk-CL7JDETM.mjs";
+} from "../chunk-RJRDB4LF.mjs";
 
 // packages/sdk/react-client/src/echo/index.ts
 export * from "@dxos/client/echo";
@@ -59,7 +59,7 @@ var useMembers = (spaceKey) => {
 
 // packages/sdk/react-client/src/echo/useQuery.ts
 import { useMemo, useSyncExternalStore } from "react";
-import { isSpace } from "@dxos/client/echo";
+import { Filter, isSpace } from "@dxos/client/echo";
 var useQuery = (spaceOrEcho, filter, options, deps) => {
   const { subscribe, getObjects } = useMemo(() => {
     const query = isSpace(spaceOrEcho) ? spaceOrEcho.db.query(filter, options) : spaceOrEcho?.query(filter, options);
@@ -77,12 +77,14 @@ var useQuery = (spaceOrEcho, filter, options, deps) => {
     };
   }, [
     spaceOrEcho,
-    ...typeof filter === "function" ? [] : filterToDepsArray(filter),
+    ...filterToDepsArray(filter),
     ...deps ?? []
   ]);
   return useSyncExternalStore(subscribe, getObjects) ?? [];
 };
-var filterToDepsArray = (filter) => Object.entries(filter ?? {}).flat(10).map((x) => typeof x === "function" || typeof x === "object" ? null : x);
+var filterToDepsArray = (filter) => [
+  JSON.stringify(Filter.from(filter).toProto())
+];
 var noop = () => {
 };
 var EMPTY_ARRAY = [];

package/dist/lib/browser/echo/index.mjs.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-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": ["MulticastObservable", "HaloSpaceMember", "useMulticastObservable", "useEffect", "useState", "SpaceState", "useMulticastObservable", "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", "spaces", "useSpaces", "all", "space", "find", "key", "equals", "undefined", "members", "useMulticastObservable", "MulticastObservable", "empty", "filter", "member", "role", "HaloSpaceMember", "Role", "REMOVED", "useMemo", "useSyncExternalStore", "isSpace", "useQuery", "spaceOrEcho", "filter", "options", "deps", "subscribe", "getObjects", "useMemo", "query", "isSpace", "db", "subscribed", "cb", "unsubscribe", "noop", "objects", "EMPTY_ARRAY", "filterToDepsArray", "useSyncExternalStore", "Object", "entries", "flat", "map", "x", "useMemo", "MulticastObservable", "useMulticastObservable", "useSpaceInvitations", "spaceKey", "space", "useSpace", "useMulticastObservable", "invitations", "MulticastObservable", "empty", "useSpaceInvitation", "invitationId", "invitation", "useMemo", "find", "get", "useInvitationStatus", "useEffect", "useRef", "createSubscription", "useSubscription", "cb", "selection", "callbackRef", "useRef", "current", "subscriptionRef", "useEffect", "createSubscription", "unsubscribe", "update"]
+  "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  Filter,\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, ...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\nconst filterToDepsArray = (filter?: FilterSource<any>) => [JSON.stringify(Filter.from(filter).toProto())];\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": ["MulticastObservable", "HaloSpaceMember", "useMulticastObservable", "useEffect", "useState", "SpaceState", "useMulticastObservable", "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", "spaces", "useSpaces", "all", "space", "find", "key", "equals", "undefined", "members", "useMulticastObservable", "MulticastObservable", "empty", "filter", "member", "role", "HaloSpaceMember", "Role", "REMOVED", "useMemo", "useSyncExternalStore", "Filter", "isSpace", "useQuery", "spaceOrEcho", "filter", "options", "deps", "subscribe", "getObjects", "useMemo", "query", "isSpace", "db", "subscribed", "cb", "unsubscribe", "noop", "objects", "EMPTY_ARRAY", "filterToDepsArray", "useSyncExternalStore", "JSON", "stringify", "Filter", "from", "toProto", "useMemo", "MulticastObservable", "useMulticastObservable", "useSpaceInvitations", "spaceKey", "space", "useSpace", "useMulticastObservable", "invitations", "MulticastObservable", "empty", "useSpaceInvitation", "invitationId", "invitation", "useMemo", "find", "get", "useInvitationStatus", "useEffect", "useRef", "createSubscription", "useSubscription", "cb", "selection", "callbackRef", "useRef", "current", "subscriptionRef", "useEffect", "createSubscription", "unsubscribe", "update"]
 }

package/dist/lib/browser/halo/index.mjs

@@ -3,7 +3,7 @@ import {
 } from "../chunk-AL2CUQ46.mjs";
 import {
   useClient
-} from "../chunk-CL7JDETM.mjs";
+} from "../chunk-RJRDB4LF.mjs";
 
 // packages/sdk/react-client/src/halo/index.ts
 import { Device, DeviceKind, DeviceType } from "@dxos/client/halo";

package/dist/lib/browser/index.mjs

@@ -5,13 +5,12 @@ import {
   ClientProvider,
   useAgentHostingClient,
   useClient,
-  useClientServices,
   useClientStatus,
   useConfig,
   useShell,
   useShellDisplay,
   useStatus
-} from "./chunk-CL7JDETM.mjs";
+} from "./chunk-RJRDB4LF.mjs";
 
 // packages/sdk/react-client/src/index.ts
 export * from "@dxos/client";
@@ -23,7 +22,6 @@ export {
   ClientProvider,
   useAgentHostingClient,
   useClient,
-  useClientServices,
   useClientStatus,
   useConfig,
   useMulticastObservable,

package/dist/lib/browser/index.mjs.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/index.ts"],
   "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nexport * from '@dxos/client';\nexport { useMulticastObservable } from '@dxos/react-hooks';\n\nexport * from './client';\n"],
-  "mappings": ";;;;;;;;;;;;;;;;AAIA,cAAc;AACd,SAASA,8BAA8B;",
+  "mappings": ";;;;;;;;;;;;;;;AAIA,cAAc;AACd,SAASA,8BAA8B;",
   "names": ["useMulticastObservable"]
 }

package/dist/lib/browser/mesh/index.mjs

@@ -1,6 +1,6 @@
 import {
   useClient
-} from "../chunk-CL7JDETM.mjs";
+} from "../chunk-RJRDB4LF.mjs";
 
 // packages/sdk/react-client/src/mesh/index.ts
 export * from "@dxos/client/mesh";