@dxos/react-client 0.4.9 → 0.4.10-main.05b9ab6

package/dist/lib/browser/{chunk-Y64VSVTU.mjs → chunk-BQ4BAP42.mjs}

@@ -12,7 +12,7 @@ var useInvitationStatus = (initialObservable) => {
       action
     }, {
       F: __dxlog_file,
-      L: 79,
+      L: 81,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -104,7 +104,7 @@ var useInvitationStatus = (initialObservable) => {
       authCode
     }, {
       F: __dxlog_file,
-      L: 163,
+      L: 165,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -126,6 +126,7 @@ var useInvitationStatus = (initialObservable) => {
       connect,
       authenticate,
       id: invitation?.invitationId,
+      multiUse: invitation?.multiUse,
       invitationCode: invitation ? InvitationEncoder.encode(invitation) : void 0,
       authCode: invitation?.authCode,
       authMethod: invitation?.authMethod,
@@ -148,4 +149,4 @@ export {
   Invitation2 as Invitation,
   InvitationsProxy
 };
-//# sourceMappingURL=chunk-Y64VSVTU.mjs.map
+//# sourceMappingURL=chunk-BQ4BAP42.mjs.map

package/dist/lib/browser/chunk-BQ4BAP42.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/invitations/index.ts", "../../../src/invitations/useInvitationStatus.ts"],
+  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\n// NOTE: Export * fails here.\nexport {\n  AuthenticatingInvitationObservable,\n  CancellableInvitationObservable,\n  InvitationEncoder,\n  Invitation,\n  type Invitations,\n  InvitationsProxy,\n} from '@dxos/client/invitations';\n\nexport * from './useInvitationStatus';\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { useReducer, type Reducer, useMemo, useCallback, useEffect } from 'react';\n\nimport { type PublicKey } from '@dxos/client';\nimport {\n  type AuthenticatingInvitationObservable,\n  type CancellableInvitationObservable,\n  Invitation,\n  InvitationEncoder,\n} from '@dxos/client/invitations';\nimport { log } from '@dxos/log';\n\nexport type InvitationResult = {\n  spaceKey: PublicKey | null;\n  identityKey: PublicKey | null;\n  swarmKey: PublicKey | null;\n  target: string | null;\n};\n\ninterface InvitationReducerState {\n  status: Invitation.State; // TODO(burdon): Rename state.\n  haltedAt?: Invitation.State;\n  result: InvitationResult;\n  error?: number;\n  observable?: CancellableInvitationObservable | AuthenticatingInvitationObservable;\n  id?: string;\n  invitationCode?: string;\n  authCode?: string;\n  multiUse?: boolean;\n}\n\nexport type InvitationAction =\n  | {\n      status:\n        | Invitation.State.INIT\n        | Invitation.State.CONNECTED\n        | Invitation.State.READY_FOR_AUTHENTICATION\n        | Invitation.State.AUTHENTICATING;\n    }\n  | {\n      status: Invitation.State.CONNECTING;\n      observable: CancellableInvitationObservable;\n    }\n  | {\n      status: Invitation.State.SUCCESS;\n      result: InvitationResult;\n    }\n  | {\n      status: Invitation.State.CANCELLED | Invitation.State.TIMEOUT;\n      haltedAt: Invitation.State;\n    }\n  | {\n      status: Invitation.State.ERROR;\n      error?: Error;\n      haltedAt: Invitation.State;\n    };\n\nexport type InvitationStatus = {\n  id?: string;\n  invitationCode?: string;\n  authCode?: string;\n  authMethod?: Invitation.AuthMethod;\n  type?: Invitation.Type;\n  status: Invitation.State;\n  haltedAt?: Invitation.State;\n  multiUse?: boolean;\n  result: InvitationResult;\n  error?: number;\n  cancel(): void;\n  // TODO(wittjosiah): Remove?\n  connect(observable: CancellableInvitationObservable): void;\n  authenticate(authCode: string): Promise<void>;\n};\n\nexport const useInvitationStatus = (initialObservable?: CancellableInvitationObservable): InvitationStatus => {\n  const [state, dispatch] = useReducer<Reducer<InvitationReducerState, InvitationAction>, null>(\n    (prev, action) => {\n      log('useInvitationStatus', { action });\n      return {\n        ...prev,\n        // TODO(burdon): State.\n        status: action.status,\n        // `invitationObservable`, `secret`, and `result` is persisted between the status-actions that set them.\n        result: action.status === Invitation.State.SUCCESS ? action.result : prev.result,\n        // `error` gets set each time we enter the error state\n        ...(action.status === Invitation.State.ERROR && { error: action.error }),\n        // `haltedAt` gets set on only the first error/cancelled/timeout action and reset on any others.\n        ...((action.status === Invitation.State.ERROR ||\n          action.status === Invitation.State.CANCELLED ||\n          action.status === Invitation.State.TIMEOUT) && {\n          haltedAt: typeof prev.haltedAt === 'undefined' ? action.haltedAt : prev.haltedAt,\n        }),\n        observable:\n          action.status === Invitation.State.CONNECTING ? action.observable ?? prev.observable : prev.observable,\n      } as InvitationReducerState;\n    },\n    null,\n    (_arg: null) => {\n      return {\n        status: Invitation.State.INIT,\n        result: { spaceKey: null, identityKey: null, swarmKey: null, target: null },\n        observable: initialObservable,\n      };\n    },\n  );\n\n  // Handle unmount.\n\n  useEffect(() => {\n    const update = (invitation: Invitation) => {\n      switch (invitation.state) {\n        case Invitation.State.CONNECTED:\n        case Invitation.State.READY_FOR_AUTHENTICATION:\n        case Invitation.State.AUTHENTICATING: {\n          dispatch({\n            status: invitation.state,\n          });\n          break;\n        }\n\n        case Invitation.State.SUCCESS: {\n          dispatch({\n            status: invitation.state,\n            result: {\n              spaceKey: invitation.spaceKey || null,\n              identityKey: invitation.identityKey || null,\n              swarmKey: invitation.swarmKey || null,\n              target: invitation.target || null,\n            },\n          });\n          break;\n        }\n\n        case Invitation.State.CANCELLED:\n        case Invitation.State.TIMEOUT: {\n          dispatch({ status: invitation.state, haltedAt: state.status });\n          break;\n        }\n      }\n    };\n\n    const subscription = state.observable?.subscribe(update, (err: Error) => {\n      dispatch({ status: Invitation.State.ERROR, error: err, haltedAt: state.status });\n    });\n\n    const currentState = state.observable?.get();\n    if (currentState) {\n      update(currentState);\n    }\n\n    return () => subscription?.unsubscribe();\n  }, [state.observable, state.status]);\n\n  // Return memoized callbacks & values.\n\n  const connect = useCallback((observable: CancellableInvitationObservable) => {\n    dispatch({ status: Invitation.State.CONNECTING, observable });\n  }, []);\n\n  const authenticate = useCallback(\n    (authCode: string) => {\n      log('authenticating...', { authCode });\n      return (state.observable as AuthenticatingInvitationObservable).authenticate(authCode);\n    },\n    [state.observable],\n  );\n\n  const cancel = useCallback(async () => state.observable?.cancel(), [state.observable]);\n\n  return useMemo(() => {\n    const invitation = state.observable?.get();\n    const result = {\n      status: state.status,\n      haltedAt: state.haltedAt,\n      result: state.result,\n      error: state.error,\n      cancel,\n      connect,\n      authenticate,\n      id: invitation?.invitationId,\n      multiUse: invitation?.multiUse,\n      invitationCode: invitation ? InvitationEncoder.encode(invitation) : undefined,\n      authCode: invitation?.authCode,\n      authMethod: invitation?.authMethod,\n      type: invitation?.type,\n    };\n\n    return result;\n  }, [state, cancel, connect, authenticate]);\n};\n"],
+  "mappings": "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",
+  "names": ["AuthenticatingInvitationObservable", "CancellableInvitationObservable", "InvitationEncoder", "Invitation", "InvitationsProxy", "useReducer", "useMemo", "useCallback", "useEffect", "Invitation", "InvitationEncoder", "log", "useInvitationStatus", "initialObservable", "state", "dispatch", "prev", "action", "status", "result", "State", "SUCCESS", "ERROR", "error", "CANCELLED", "TIMEOUT", "haltedAt", "observable", "CONNECTING", "_arg", "INIT", "spaceKey", "identityKey", "swarmKey", "target", "update", "invitation", "CONNECTED", "READY_FOR_AUTHENTICATION", "AUTHENTICATING", "subscription", "subscribe", "err", "currentState", "get", "unsubscribe", "connect", "authenticate", "authCode", "cancel", "id", "invitationId", "multiUse", "invitationCode", "encode", "undefined", "authMethod", "type"]
+}

package/dist/lib/browser/{chunk-6SW7V4VI.mjs → chunk-HJDLXXEZ.mjs}

@@ -180,7 +180,7 @@ var useStatus = () => {
 };
 
 // packages/sdk/react-client/src/client/useAgentHostingProvider.ts
-import { EldonAgentHostingProviderClient, FakeAgentHostingProvider } from "@dxos/client/services";
+import { DXOSAgentHostingProviderClient, FakeAgentHostingProvider } from "@dxos/client/services";
 import { log as log2 } from "@dxos/log";
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/react-client/src/client/useAgentHostingProvider.ts";
 var useAgentHostingProviderClient = (config) => {
@@ -200,7 +200,7 @@ var useAgentHostingProviderClient = (config) => {
   if (agentHostingConfig.type === "LOCAL_TESTING") {
     return new FakeAgentHostingProvider(config);
   }
-  return new EldonAgentHostingProviderClient(config);
+  return new DXOSAgentHostingProviderClient(config);
 };
 
 export {
@@ -213,4 +213,4 @@ export {
   useStatus,
   useAgentHostingProviderClient
 };
-//# sourceMappingURL=chunk-6SW7V4VI.mjs.map
+//# sourceMappingURL=chunk-HJDLXXEZ.mjs.map

package/dist/lib/browser/{chunk-6SW7V4VI.mjs.map → chunk-HJDLXXEZ.mjs.map}

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/client/ClientContext.tsx", "../../../src/banner.ts", "../../../src/client/useClientServices.ts", "../../../src/client/useConfig.ts", "../../../src/client/useShell.ts", "../../../src/client/useStatus.ts", "../../../src/client/useAgentHostingProvider.ts"],
-  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nimport React, {\n  type ReactNode,\n  useState,\n  type Context,\n  createContext,\n  useContext,\n  useEffect,\n  type FunctionComponent,\n  useMemo,\n} from 'react';\n\nimport { Client, type ClientOptions } from '@dxos/client';\nimport { SystemStatus, type ClientServices, type ClientServicesProvider } from '@dxos/client/services';\nimport { type Config } from '@dxos/config';\nimport { raise } from '@dxos/debug';\nimport { registerSignalFactory } from '@dxos/echo-signals/react';\nimport { log } from '@dxos/log';\nimport { getAsyncValue, type MaybePromise, type Provider } from '@dxos/util'; // TODO(burdon): Deprecate \"util\"?\n\nimport { printBanner } from '../banner';\n\n// TODO(burdon): Reconcile with ClientOptions.\nexport type ClientContextProps = {\n  client: Client;\n\n  // Optionally expose services (e.g., for devtools).\n  // TODO(burdon): Can't this just be accessed via `client.services`?\n  services?: ClientServices;\n\n  status?: SystemStatus | null;\n};\n\nexport const ClientContext: Context<ClientContextProps | undefined> = createContext<ClientContextProps | undefined>(\n  undefined,\n);\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\nexport type ClientProviderProps = Omit<ClientOptions, 'config' | 'services'> & {\n  children?: ReactNode;\n\n  /**\n   * Config object or async provider.\n   */\n  config?: Config | Provider<Promise<Config>>;\n\n  /**\n   * Callback to enable the caller to create a custom ClientServicesProvider.\n   *\n   * Most apps won't need this.\n   */\n  services?: (config?: Config) => MaybePromise<ClientServicesProvider>;\n\n  /**\n   * Client object or async provider to enable to caller to do custom initialization.\n   *\n   * Most apps won't need this.\n   */\n  // TODO(wittjosiah): Remove async and just use to keeping reference to client?\n  //   (Prefering `onInitialized` for custom initialization.)\n  client?: Client | Provider<Promise<Client>>;\n\n  /**\n   * ReactNode to display until the client is available.\n   */\n  // TODO(wittjosiah): Rename to `placeholder`.\n  fallback?: FunctionComponent<Partial<ClientContextProps>>;\n\n  /**\n   * Set to false to stop default signal factory from being registered.\n   */\n  registerSignalFactory?: 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 = ({\n  children,\n  config: configProvider,\n  services: createServices,\n  client: clientProvider,\n  fallback: Fallback = () => null,\n  registerSignalFactory: register = true,\n  onInitialized,\n  ...options\n}: ClientProviderProps) => {\n  useMemo(() => {\n    // TODO(wittjosiah): Ideally this should be imported asynchronosly because it is optional.\n    //   Unfortunately, async import seemed to break signals React instrumentation.\n    register && registerSignalFactory();\n  }, []);\n\n  const [client, setClient] = useState(clientProvider instanceof Client ? clientProvider : undefined);\n  const [status, setStatus] = useState<SystemStatus | null>(null);\n  const [error, setError] = useState();\n  if (error) {\n    throw error;\n  }\n\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  useEffect(() => {\n    const done = async (client: Client) => {\n      await client.initialize().catch(setError);\n      log('client ready');\n      await onInitialized?.(client);\n      log('initialization complete');\n      setClient(client);\n      setStatus(client.status.get() ?? SystemStatus.ACTIVE);\n      printBanner(client);\n    };\n\n    const timeout = setTimeout(async () => {\n      if (clientProvider) {\n        // Asynchronously request client.\n        const client = await getAsyncValue(clientProvider);\n        await done(client);\n      } else {\n        // Asynchronously construct client (config may be undefined).\n        const config = await getAsyncValue(configProvider);\n        log('resolved config', { config });\n        const services = await createServices?.(config);\n        log('created services', { services });\n        const client = new Client({ config, services, ...options });\n        log('created client');\n        await done(client);\n      }\n    });\n\n    return () => {\n      log('clean up');\n      clearTimeout(timeout);\n      void client?.destroy().catch((err) => log.catch(err));\n    };\n  }, [clientProvider, configProvider, createServices]);\n\n  if (!client || status !== SystemStatus.ACTIVE) {\n    return <Fallback client={client} status={status} />;\n  }\n\n  // prettier-ignore\n  return (\n    <ClientContext.Provider value={{ client, status }}>\n      {children}\n    </ClientContext.Provider>\n  );\n};\n", "//\n// Copyright 2021 DXOS.org\n//\n\nimport { type Client } from '@dxos/client';\n\n// http://patorjk.com/software/taag/#p=testall&f=Patorjk-HeX&t=DXOS\nconst BANNER = (client: Client) => {\n  const commitHash = client.config.get('runtime.app.build.commitHash');\n  const hash = commitHash ? ` App Commit ${commitHash} \\n` : '';\n\n  return (\n    '\\n' +\n    '_/\\\\/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\______/\\\\/\\\\/\\\\/\\\\/\\\\_\\n' +\n    '_/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\__/\\\\/\\\\_________\\n' +\n    '_/\\\\/\\\\____/\\\\/\\\\______/\\\\/\\\\______/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\___\\n' +\n    '_/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\__________/\\\\/\\\\_\\n' +\n    '_/\\\\/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\/\\\\___\\n' +\n    `\\n DXOS Client ${client.version} \\n${hash}`\n  );\n};\n\nlet bannerPrinted = false;\n\nexport const printBanner = (client: Client) => {\n  if (bannerPrinted) {\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 2022 DXOS.org\n//\n\nimport { useContext } from 'react';\n\nimport type { ClientServices } from '@dxos/client/services';\nimport { raise } from '@dxos/debug';\n\nimport { ClientContext } from './ClientContext';\n\nexport const useClientServices = (): ClientServices | undefined => {\n  const { services } = useContext(ClientContext) ?? raise(new Error('Missing ClientContext.'));\n  return services;\n};\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport { useContext } from 'react';\n\nimport { raise } from '@dxos/debug';\n\nimport { ClientContext } from './ClientContext';\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 { type Shell } from '@dxos/client/services';\n\nimport { useClient } from './ClientContext';\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// Copyright 2022 DXOS.org\n//\n\nimport { useContext } from 'react';\n\nimport type { SystemStatus } from '@dxos/client/services';\nimport { raise } from '@dxos/debug';\n\nimport { ClientContext } from './ClientContext';\n\nexport const useStatus = (): SystemStatus | null | undefined => {\n  const { status } = useContext(ClientContext) ?? raise(new Error('Missing ClientContext.'));\n  return status;\n};\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport {\n  type AgentHostingProviderClient,\n  EldonAgentHostingProviderClient,\n  FakeAgentHostingProvider,\n} from '@dxos/client/services';\nimport { type Config } from '@dxos/config';\nimport { log } from '@dxos/log';\n\n/*\n * Interface for invoking the agent hosting provider client.\n * @experimental\n */\nexport const useAgentHostingProviderClient = (config: Config): AgentHostingProviderClient | null => {\n  // TODO: Dynamically discover based on runtime config\n  if (\n    config.get('runtime.app.env.DX_ENVIRONMENT') !== 'development' &&\n    localStorage.getItem('dxos.org/shell/features/agentHosting') !== 'true'\n  ) {\n    return null;\n  }\n\n  const agentHostingConfig = config.get('runtime.services.agentHosting');\n  if (!agentHostingConfig) {\n    log.info('no agent hosting configured');\n    return null;\n  }\n\n  if (agentHostingConfig.type === 'LOCAL_TESTING') {\n    return new FakeAgentHostingProvider(config);\n  }\n\n  return new EldonAgentHostingProviderClient(config);\n};\n"],
-  "mappings": "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",
-  "names": ["React", "useState", "createContext", "useContext", "useEffect", "useMemo", "Client", "SystemStatus", "raise", "registerSignalFactory", "log", "getAsyncValue", "BANNER", "client", "commitHash", "config", "get", "hash", "version", "bannerPrinted", "printBanner", "console", "log", "ClientContext", "createContext", "undefined", "useClient", "client", "useContext", "raise", "Error", "ClientProvider", "children", "config", "configProvider", "services", "createServices", "clientProvider", "fallback", "Fallback", "registerSignalFactory", "register", "onInitialized", "options", "useMemo", "setClient", "useState", "Client", "status", "setStatus", "error", "setError", "useEffect", "subscription", "subscribe", "unsubscribe", "done", "initialize", "catch", "log", "get", "SystemStatus", "ACTIVE", "printBanner", "timeout", "setTimeout", "getAsyncValue", "clearTimeout", "destroy", "err", "Provider", "value", "useContext", "raise", "useClientServices", "services", "useContext", "ClientContext", "raise", "Error", "useContext", "raise", "useConfig", "client", "useContext", "ClientContext", "raise", "Error", "config", "useShell", "client", "useClient", "shell", "useContext", "raise", "useStatus", "status", "useContext", "ClientContext", "raise", "Error", "EldonAgentHostingProviderClient", "FakeAgentHostingProvider", "log", "useAgentHostingProviderClient", "config", "get", "localStorage", "getItem", "agentHostingConfig", "info", "type"]
+  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nimport React, {\n  type ReactNode,\n  useState,\n  type Context,\n  createContext,\n  useContext,\n  useEffect,\n  type FunctionComponent,\n  useMemo,\n} from 'react';\n\nimport { Client, type ClientOptions } from '@dxos/client';\nimport { SystemStatus, type ClientServices, type ClientServicesProvider } from '@dxos/client/services';\nimport { type Config } from '@dxos/config';\nimport { raise } from '@dxos/debug';\nimport { registerSignalFactory } from '@dxos/echo-signals/react';\nimport { log } from '@dxos/log';\nimport { getAsyncValue, type MaybePromise, type Provider } from '@dxos/util'; // TODO(burdon): Deprecate \"util\"?\n\nimport { printBanner } from '../banner';\n\n// TODO(burdon): Reconcile with ClientOptions.\nexport type ClientContextProps = {\n  client: Client;\n\n  // Optionally expose services (e.g., for devtools).\n  // TODO(burdon): Can't this just be accessed via `client.services`?\n  services?: ClientServices;\n\n  status?: SystemStatus | null;\n};\n\nexport const ClientContext: Context<ClientContextProps | undefined> = createContext<ClientContextProps | undefined>(\n  undefined,\n);\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\nexport type ClientProviderProps = Omit<ClientOptions, 'config' | 'services'> & {\n  children?: ReactNode;\n\n  /**\n   * Config object or async provider.\n   */\n  config?: Config | Provider<Promise<Config>>;\n\n  /**\n   * Callback to enable the caller to create a custom ClientServicesProvider.\n   *\n   * Most apps won't need this.\n   */\n  services?: (config?: Config) => MaybePromise<ClientServicesProvider>;\n\n  /**\n   * Client object or async provider to enable to caller to do custom initialization.\n   *\n   * Most apps won't need this.\n   */\n  // TODO(wittjosiah): Remove async and just use to keeping reference to client?\n  //   (Prefering `onInitialized` for custom initialization.)\n  client?: Client | Provider<Promise<Client>>;\n\n  /**\n   * ReactNode to display until the client is available.\n   */\n  // TODO(wittjosiah): Rename to `placeholder`.\n  fallback?: FunctionComponent<Partial<ClientContextProps>>;\n\n  /**\n   * Set to false to stop default signal factory from being registered.\n   */\n  registerSignalFactory?: 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 = ({\n  children,\n  config: configProvider,\n  services: createServices,\n  client: clientProvider,\n  fallback: Fallback = () => null,\n  registerSignalFactory: register = true,\n  onInitialized,\n  ...options\n}: ClientProviderProps) => {\n  useMemo(() => {\n    // TODO(wittjosiah): Ideally this should be imported asynchronosly because it is optional.\n    //   Unfortunately, async import seemed to break signals React instrumentation.\n    register && registerSignalFactory();\n  }, []);\n\n  const [client, setClient] = useState(clientProvider instanceof Client ? clientProvider : undefined);\n  const [status, setStatus] = useState<SystemStatus | null>(null);\n  const [error, setError] = useState();\n  if (error) {\n    throw error;\n  }\n\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  useEffect(() => {\n    const done = async (client: Client) => {\n      await client.initialize().catch(setError);\n      log('client ready');\n      await onInitialized?.(client);\n      log('initialization complete');\n      setClient(client);\n      setStatus(client.status.get() ?? SystemStatus.ACTIVE);\n      printBanner(client);\n    };\n\n    const timeout = setTimeout(async () => {\n      if (clientProvider) {\n        // Asynchronously request client.\n        const client = await getAsyncValue(clientProvider);\n        await done(client);\n      } else {\n        // Asynchronously construct client (config may be undefined).\n        const config = await getAsyncValue(configProvider);\n        log('resolved config', { config });\n        const services = await createServices?.(config);\n        log('created services', { services });\n        const client = new Client({ config, services, ...options });\n        log('created client');\n        await done(client);\n      }\n    });\n\n    return () => {\n      log('clean up');\n      clearTimeout(timeout);\n      void client?.destroy().catch((err) => log.catch(err));\n    };\n  }, [clientProvider, configProvider, createServices]);\n\n  if (!client || status !== SystemStatus.ACTIVE) {\n    return <Fallback client={client} status={status} />;\n  }\n\n  // prettier-ignore\n  return (\n    <ClientContext.Provider value={{ client, status }}>\n      {children}\n    </ClientContext.Provider>\n  );\n};\n", "//\n// Copyright 2021 DXOS.org\n//\n\nimport { type Client } from '@dxos/client';\n\n// http://patorjk.com/software/taag/#p=testall&f=Patorjk-HeX&t=DXOS\nconst BANNER = (client: Client) => {\n  const commitHash = client.config.get('runtime.app.build.commitHash');\n  const hash = commitHash ? ` App Commit ${commitHash} \\n` : '';\n\n  return (\n    '\\n' +\n    '_/\\\\/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\______/\\\\/\\\\/\\\\/\\\\/\\\\_\\n' +\n    '_/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\__/\\\\/\\\\_________\\n' +\n    '_/\\\\/\\\\____/\\\\/\\\\______/\\\\/\\\\______/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\___\\n' +\n    '_/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\__________/\\\\/\\\\_\\n' +\n    '_/\\\\/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\/\\\\___\\n' +\n    `\\n DXOS Client ${client.version} \\n${hash}`\n  );\n};\n\nlet bannerPrinted = false;\n\nexport const printBanner = (client: Client) => {\n  if (bannerPrinted) {\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 2022 DXOS.org\n//\n\nimport { useContext } from 'react';\n\nimport type { ClientServices } from '@dxos/client/services';\nimport { raise } from '@dxos/debug';\n\nimport { ClientContext } from './ClientContext';\n\nexport const useClientServices = (): ClientServices | undefined => {\n  const { services } = useContext(ClientContext) ?? raise(new Error('Missing ClientContext.'));\n  return services;\n};\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport { useContext } from 'react';\n\nimport { raise } from '@dxos/debug';\n\nimport { ClientContext } from './ClientContext';\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 { type Shell } from '@dxos/client/services';\n\nimport { useClient } from './ClientContext';\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// Copyright 2022 DXOS.org\n//\n\nimport { useContext } from 'react';\n\nimport type { SystemStatus } from '@dxos/client/services';\nimport { raise } from '@dxos/debug';\n\nimport { ClientContext } from './ClientContext';\n\nexport const useStatus = (): SystemStatus | null | undefined => {\n  const { status } = useContext(ClientContext) ?? raise(new Error('Missing ClientContext.'));\n  return status;\n};\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport {\n  type AgentHostingProviderClient,\n  DXOSAgentHostingProviderClient,\n  FakeAgentHostingProvider,\n} from '@dxos/client/services';\nimport { type Config } from '@dxos/config';\nimport { log } from '@dxos/log';\n\n/*\n * Interface for invoking the agent hosting provider client.\n * @experimental\n */\nexport const useAgentHostingProviderClient = (config: Config): AgentHostingProviderClient | null => {\n  // TODO: Dynamically discover based on runtime config\n  if (\n    config.get('runtime.app.env.DX_ENVIRONMENT') !== 'development' &&\n    localStorage.getItem('dxos.org/shell/features/agentHosting') !== 'true'\n  ) {\n    return null;\n  }\n\n  const agentHostingConfig = config.get('runtime.services.agentHosting');\n  if (!agentHostingConfig) {\n    log.info('no agent hosting configured');\n    return null;\n  }\n\n  if (agentHostingConfig.type === 'LOCAL_TESTING') {\n    return new FakeAgentHostingProvider(config);\n  }\n\n  return new DXOSAgentHostingProviderClient(config);\n};\n"],
+  "mappings": "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",
+  "names": ["React", "useState", "createContext", "useContext", "useEffect", "useMemo", "Client", "SystemStatus", "raise", "registerSignalFactory", "log", "getAsyncValue", "BANNER", "client", "commitHash", "config", "get", "hash", "version", "bannerPrinted", "printBanner", "console", "log", "ClientContext", "createContext", "undefined", "useClient", "client", "useContext", "raise", "Error", "ClientProvider", "children", "config", "configProvider", "services", "createServices", "clientProvider", "fallback", "Fallback", "registerSignalFactory", "register", "onInitialized", "options", "useMemo", "setClient", "useState", "Client", "status", "setStatus", "error", "setError", "useEffect", "subscription", "subscribe", "unsubscribe", "done", "initialize", "catch", "log", "get", "SystemStatus", "ACTIVE", "printBanner", "timeout", "setTimeout", "getAsyncValue", "clearTimeout", "destroy", "err", "Provider", "value", "useContext", "raise", "useClientServices", "services", "useContext", "ClientContext", "raise", "Error", "useContext", "raise", "useConfig", "client", "useContext", "ClientContext", "raise", "Error", "config", "useShell", "client", "useClient", "shell", "useContext", "raise", "useStatus", "status", "useContext", "ClientContext", "raise", "Error", "DXOSAgentHostingProviderClient", "FakeAgentHostingProvider", "log", "useAgentHostingProviderClient", "config", "get", "localStorage", "getItem", "agentHostingConfig", "info", "type"]
 }

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

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

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

@@ -1,9 +1,9 @@
 import {
   useInvitationStatus
-} from "../chunk-Y64VSVTU.mjs";
+} from "../chunk-BQ4BAP42.mjs";
 import {
   useClient
-} from "../chunk-6SW7V4VI.mjs";
+} from "../chunk-HJDLXXEZ.mjs";
 
 // packages/sdk/react-client/src/echo/index.ts
 export * from "@dxos/client/echo";
@@ -59,30 +59,41 @@ var useMembers = (spaceKey) => {
 
 // packages/sdk/react-client/src/echo/useQuery.ts
 import { useMemo, useSyncExternalStore } from "react";
-var useQuery = (space, filter, options, deps) => {
-  const query = useMemo(() => space?.db.query(filter, options), [
-    space?.db,
+import { 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);
+    let subscribed = false;
+    return {
+      subscribe: (cb) => {
+        subscribed = true;
+        const unsubscribe = query?.subscribe(cb) ?? noop;
+        return () => {
+          unsubscribe?.();
+          subscribed = false;
+        };
+      },
+      getObjects: () => subscribed && query ? query.objects : EMPTY_ARRAY
+    };
+  }, [
+    spaceOrEcho,
     ...typeof filter === "function" ? [] : filterToDepsArray(filter),
     ...deps ?? []
   ]);
-  return useSyncExternalStore((cb) => query?.subscribe?.(cb) ?? cb, () => query?.objects) ?? [];
+  return useSyncExternalStore(subscribe, getObjects) ?? [];
+};
+var filterToDepsArray = (filter) => Object.entries(filter ?? {}).flat(10).map((x) => typeof x === "function" || typeof x === "object" ? null : x);
+var noop = () => {
 };
-var filterToDepsArray = (filter) => Object.entries(filter ?? {}).flat();
+var EMPTY_ARRAY = [];
 
 // packages/sdk/react-client/src/echo/useSpaceInvitations.ts
-import { useMemo as useMemo2, useSyncExternalStore as useSyncExternalStore2 } from "react";
-import { SpaceProxy } from "@dxos/client/echo";
+import { useMemo as useMemo2 } from "react";
+import { MulticastObservable as MulticastObservable2 } from "@dxos/async";
+import { useMulticastObservable as useMulticastObservable3 } from "@dxos/react-async";
 var useSpaceInvitations = (spaceKey) => {
   const space = useSpace(spaceKey);
-  const invitations = useSyncExternalStore2((listener) => {
-    if (!(space instanceof SpaceProxy)) {
-      return () => {
-      };
-    }
-    const subscription = space.invitations.subscribe(() => listener());
-    return () => subscription.unsubscribe();
-  }, () => space?.invitations.get()) ?? [];
-  return invitations;
+  return useMulticastObservable3(space?.invitations ?? MulticastObservable2.empty()) ?? [];
 };
 var useSpaceInvitation = (spaceKey, invitationId) => {
   const invitations = useSpaceInvitations(spaceKey);

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 { 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.presence !== SpaceMember.PresenceState.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 spaceKey the key of the space to look for\n */\nexport const useSpace = (spaceKey?: 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 (spaceKey) {\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, spaceKey]);\n\n  if (spaceKey) {\n    return spaces.find((space) => space.key.equals(spaceKey));\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.READY);\n};\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { useMemo, useSyncExternalStore } from 'react';\n\nimport type { QueryOptions, TypedObject, Query, FilterSource, Space } from '@dxos/client/echo';\n\ntype UseQuery = {\n  <T extends TypedObject>(space?: Space, filter?: FilterSource<T>, options?: QueryOptions, deps?: any[]): T[];\n};\n\n/**\n * Create subscription.\n */\n// TODO(burdon): Support typed operator filters (e.g., Note.filter(note => ...)).\nexport const useQuery: UseQuery = <T extends TypedObject>(\n  space?: Space,\n  filter?: FilterSource<T>,\n  options?: QueryOptions,\n  deps?: any[],\n) => {\n  const query = useMemo(\n    () => space?.db.query(filter, options) as Query<T> | undefined,\n    [space?.db, ...(typeof filter === 'function' ? [] : filterToDepsArray(filter)), ...(deps ?? [])],\n  );\n\n  // https://beta.reactjs.org/reference/react/useSyncExternalStore\n  return (\n    useSyncExternalStore<T[] | undefined>(\n      (cb) => query?.subscribe?.(cb) ?? cb,\n      () => query?.objects,\n    ) ?? []\n  );\n};\n\nconst filterToDepsArray = (filter?: FilterSource<any>) => Object.entries(filter ?? {}).flat();\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { useMemo, useSyncExternalStore } from 'react';\n\nimport { type PublicKey } from '@dxos/client';\nimport { SpaceProxy } from '@dxos/client/echo';\n\nimport { useSpace } from './useSpaces';\nimport { useInvitationStatus } from '../invitations';\n\nexport const useSpaceInvitations = (spaceKey?: PublicKey) => {\n  const space = useSpace(spaceKey);\n  const invitations =\n    useSyncExternalStore(\n      (listener) => {\n        if (!(space instanceof SpaceProxy)) {\n          return () => {};\n        }\n\n        const subscription = space.invitations.subscribe(() => listener());\n        return () => subscription.unsubscribe();\n      },\n      () => space?.invitations.get(),\n    ) ?? [];\n\n  return invitations;\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", "SpaceMember", "useMulticastObservable", "useEffect", "useState", "SpaceState", "useMulticastObservable", "useSpace", "spaceKey", "client", "useClient", "spaces", "useMulticastObservable", "ready", "setReady", "useState", "useEffect", "timeout", "setTimeout", "isReady", "wait", "clearTimeout", "find", "space", "key", "equals", "halo", "identity", "get", "default", "useSpaces", "all", "filter", "state", "SpaceState", "READY", "useMembers", "spaceKey", "spaces", "useSpaces", "all", "space", "find", "key", "equals", "undefined", "members", "useMulticastObservable", "MulticastObservable", "empty", "filter", "member", "presence", "SpaceMember", "PresenceState", "REMOVED", "useMemo", "useSyncExternalStore", "useQuery", "space", "filter", "options", "deps", "query", "useMemo", "db", "filterToDepsArray", "useSyncExternalStore", "cb", "subscribe", "objects", "Object", "entries", "flat", "useMemo", "useSyncExternalStore", "SpaceProxy", "useSpaceInvitations", "spaceKey", "space", "useSpace", "invitations", "useSyncExternalStore", "listener", "SpaceProxy", "subscription", "subscribe", "unsubscribe", "get", "useSpaceInvitation", "invitationId", "invitation", "useMemo", "find", "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 { 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.presence !== SpaceMember.PresenceState.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 spaceKey the key of the space to look for\n */\nexport const useSpace = (spaceKey?: 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 (spaceKey) {\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, spaceKey]);\n\n  if (spaceKey) {\n    return spaces.find((space) => space.key.equals(spaceKey));\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.READY);\n};\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { useMemo, useSyncExternalStore } from 'react';\n\nimport {\n  type QueryOptions,\n  type Query,\n  type FilterSource,\n  type Space,\n  type EchoReactiveObject,\n  type Echo,\n  isSpace,\n} from '@dxos/client/echo';\n\ntype UseQuery = {\n  <T extends EchoReactiveObject<any>>(\n    spaceOrEcho?: Space | Echo,\n    filter?: FilterSource<T>,\n    options?: QueryOptions,\n    deps?: any[],\n  ): T[];\n};\n\n/**\n * Create subscription.\n */\n// TODO(burdon): Support typed operator filters (e.g., Note.filter(note => ...)).\nexport const useQuery: UseQuery = <T extends EchoReactiveObject<any>>(\n  spaceOrEcho?: Space | Echo,\n  filter?: FilterSource<T>,\n  options?: QueryOptions,\n  deps?: any[],\n) => {\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"],
+  "mappings": "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",
+  "names": ["MulticastObservable", "SpaceMember", "useMulticastObservable", "useEffect", "useState", "SpaceState", "useMulticastObservable", "useSpace", "spaceKey", "client", "useClient", "spaces", "useMulticastObservable", "ready", "setReady", "useState", "useEffect", "timeout", "setTimeout", "isReady", "wait", "clearTimeout", "find", "space", "key", "equals", "halo", "identity", "get", "default", "useSpaces", "all", "filter", "state", "SpaceState", "READY", "useMembers", "spaceKey", "spaces", "useSpaces", "all", "space", "find", "key", "equals", "undefined", "members", "useMulticastObservable", "MulticastObservable", "empty", "filter", "member", "presence", "SpaceMember", "PresenceState", "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"]
 }

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

@@ -1,44 +1,33 @@
 import {
   useInvitationStatus
-} from "../chunk-Y64VSVTU.mjs";
+} from "../chunk-BQ4BAP42.mjs";
 import {
   useClient
-} from "../chunk-6SW7V4VI.mjs";
+} from "../chunk-HJDLXXEZ.mjs";
 
 // packages/sdk/react-client/src/halo/index.ts
-import { Device, DeviceKind, DeviceType, HaloProxy } from "@dxos/client/halo";
+import { Device, DeviceKind, DeviceType } from "@dxos/client/halo";
 
 // packages/sdk/react-client/src/halo/useContacts.ts
-import { useSyncExternalStore } from "react";
+import { useMulticastObservable } from "@dxos/react-async";
 var useContacts = () => {
   const client = useClient();
-  const contacts = useSyncExternalStore((listener) => {
-    const subscription = client.halo.contacts.subscribe(listener);
-    return () => subscription.unsubscribe();
-  }, () => client.halo.contacts.get());
-  return contacts;
+  return useMulticastObservable(client.halo.contacts);
 };
 
 // packages/sdk/react-client/src/halo/useDevices.ts
-import { useSyncExternalStore as useSyncExternalStore2 } from "react";
+import { useMulticastObservable as useMulticastObservable2 } from "@dxos/react-async";
 var useDevices = () => {
   const client = useClient();
-  const devices = useSyncExternalStore2((listener) => {
-    const subscription = client.halo.devices.subscribe(listener);
-    return () => subscription.unsubscribe();
-  }, () => client.halo.devices.get());
-  return devices;
+  return useMulticastObservable2(client.halo.devices);
 };
 
 // packages/sdk/react-client/src/halo/useHaloInvitations.ts
-import { useMemo, useSyncExternalStore as useSyncExternalStore3 } from "react";
+import { useMemo } from "react";
+import { useMulticastObservable as useMulticastObservable3 } from "@dxos/react-async";
 var useHaloInvitations = () => {
   const client = useClient();
-  const invitations = useSyncExternalStore3((listener) => {
-    const subscription = client.halo.invitations.subscribe(() => listener());
-    return () => subscription.unsubscribe();
-  }, () => client.halo.invitations.get()) ?? [];
-  return invitations;
+  return useMulticastObservable3(client.halo.invitations);
 };
 var useHaloInvitation = (invitationId) => {
   const invitations = useHaloInvitations();
@@ -49,10 +38,10 @@ var useHaloInvitation = (invitationId) => {
 };
 
 // packages/sdk/react-client/src/halo/useIdentity.ts
-import { useMulticastObservable } from "@dxos/react-async";
+import { useMulticastObservable as useMulticastObservable4 } from "@dxos/react-async";
 var useIdentity = () => {
   const client = useClient();
-  return useMulticastObservable(client.halo.identity);
+  return useMulticastObservable4(client.halo.identity);
 };
 
 // packages/sdk/react-client/src/halo/useKeyStore.ts
@@ -99,7 +88,6 @@ export {
   Device,
   DeviceKind,
   DeviceType,
-  HaloProxy,
   KeyStore,
   useContacts,
   useDevices,

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/halo/index.ts", "../../../../src/halo/useContacts.ts", "../../../../src/halo/useDevices.ts", "../../../../src/halo/useHaloInvitations.ts", "../../../../src/halo/useIdentity.ts", "../../../../src/halo/useKeyStore.ts"],
-  "sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\n// NOTE: Export * fails here.\nexport {\n  type Contact,\n  Device,\n  DeviceKind,\n  DeviceType,\n  type Identity,\n  // generateSeedPhrase,\n  type Halo,\n  HaloProxy,\n} from '@dxos/client/halo';\n\nexport * from './useContacts';\nexport * from './useDevices';\nexport * from './useHaloInvitations';\nexport * from './useIdentity';\nexport * from './useKeyStore';\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport { useSyncExternalStore } from 'react';\n\nimport type { Contact } from '@dxos/client/halo';\n\nimport { useClient } from '../client';\n\n/**\n * Returns all known Contacts across all Spaces.\n * Contacts are known members of a common Space.\n * Requires ClientContext to be set via ClientProvider.\n */\nexport const useContacts = (): Contact[] => {\n  const client = useClient();\n  const contacts = useSyncExternalStore(\n    (listener) => {\n      const subscription = client.halo.contacts.subscribe(listener);\n      return () => subscription.unsubscribe();\n    },\n    () => client.halo.contacts.get(),\n  );\n\n  return contacts;\n};\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport { useSyncExternalStore } from 'react';\n\nimport type { Device } from '@dxos/client/halo';\n\nimport { useClient } from '../client';\n\nexport const useDevices = (): Device[] => {\n  const client = useClient();\n  const devices = useSyncExternalStore(\n    (listener) => {\n      const subscription = client.halo.devices.subscribe(listener);\n      return () => subscription.unsubscribe();\n    },\n    () => client.halo.devices.get(),\n  );\n\n  return devices;\n};\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { useMemo, useSyncExternalStore } from 'react';\n\nimport { useClient } from '../client';\nimport { useInvitationStatus } from '../invitations';\n\nexport const useHaloInvitations = () => {\n  const client = useClient();\n  const invitations =\n    useSyncExternalStore(\n      (listener) => {\n        const subscription = client.halo.invitations.subscribe(() => listener());\n        return () => subscription.unsubscribe();\n      },\n      () => client.halo.invitations.get(),\n    ) ?? [];\n\n  return invitations;\n};\n\nexport const useHaloInvitation = (invitationId?: string) => {\n  const invitations = useHaloInvitations();\n  const invitation = useMemo(\n    () => invitations.find((invitation) => invitation.get().invitationId === invitationId),\n    [invitations],\n  );\n  return useInvitationStatus(invitation);\n};\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport { type Identity } from '@dxos/client/halo';\nimport { useMulticastObservable } from '@dxos/react-async';\n\nimport { useClient } from '../client';\n\n/**\n * Hook returning DXOS identity object.\n * Requires ClientContext to be set via ClientProvider.\n */\nexport const useIdentity = (): Identity | null => {\n  const client = useClient();\n  return useMulticastObservable(client.halo.identity);\n};\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { useMemo, useReducer } from 'react';\n\n// TODO(burdon): Move to settings plugin.\nexport class KeyStore {\n  private _keyMap = new Map<string, string>();\n\n  constructor(private readonly _defaultKeys: string[] = []) {}\n\n  get map() {\n    return this._keyMap;\n  }\n\n  // TODO(burdon): Create subkeys.\n  initialize() {\n    this._defaultKeys.forEach((key) => {\n      const value = localStorage.getItem(key);\n      this.setKey(key, value ?? '');\n    });\n\n    return this;\n  }\n\n  getKey(key: string) {\n    localStorage.getItem(key);\n  }\n\n  setKey(key: string, value: string) {\n    localStorage.setItem(key, '');\n    this._keyMap.set(key, value);\n  }\n}\n\n/**\n * Settings store.\n * @deprecated Replace with HALO key store when available.\n */\nexport const useKeyStore = (\n  defaultKeys: string[] = [],\n): [Map<string, string>, (key: string, value: string) => void] => {\n  const [, forceUpdate] = useReducer((x) => x + 1, 0);\n  const store = useMemo(() => new KeyStore(defaultKeys).initialize(), [defaultKeys]);\n  const setKey = (key: string, value: string) => {\n    store.setKey(key, value);\n    forceUpdate();\n  };\n\n  return [store.map, setKey];\n};\n"],
-  "mappings": ";;;;;;;;AAKA,SAEEA,QACAC,YACAC,YAIAC,iBACK;;;ACVP,SAASC,4BAA4B;AAW9B,IAAMC,cAAc,MAAA;AACzB,QAAMC,SAASC,UAAAA;AACf,QAAMC,WAAWC,qBACf,CAACC,aAAAA;AACC,UAAMC,eAAeL,OAAOM,KAAKJ,SAASK,UAAUH,QAAAA;AACpD,WAAO,MAAMC,aAAaG,YAAW;EACvC,GACA,MAAMR,OAAOM,KAAKJ,SAASO,IAAG,CAAA;AAGhC,SAAOP;AACT;;;ACtBA,SAASQ,wBAAAA,6BAA4B;AAM9B,IAAMC,aAAa,MAAA;AACxB,QAAMC,SAASC,UAAAA;AACf,QAAMC,UAAUC,sBACd,CAACC,aAAAA;AACC,UAAMC,eAAeL,OAAOM,KAAKJ,QAAQK,UAAUH,QAAAA;AACnD,WAAO,MAAMC,aAAaG,YAAW;EACvC,GACA,MAAMR,OAAOM,KAAKJ,QAAQO,IAAG,CAAA;AAG/B,SAAOP;AACT;;;ACjBA,SAASQ,SAASC,wBAAAA,6BAA4B;AAKvC,IAAMC,qBAAqB,MAAA;AAChC,QAAMC,SAASC,UAAAA;AACf,QAAMC,cACJC,sBACE,CAACC,aAAAA;AACC,UAAMC,eAAeL,OAAOM,KAAKJ,YAAYK,UAAU,MAAMH,SAAAA,CAAAA;AAC7D,WAAO,MAAMC,aAAaG,YAAW;EACvC,GACA,MAAMR,OAAOM,KAAKJ,YAAYO,IAAG,CAAA,KAC9B,CAAA;AAEP,SAAOP;AACT;AAEO,IAAMQ,oBAAoB,CAACC,iBAAAA;AAChC,QAAMT,cAAcH,mBAAAA;AACpB,QAAMa,aAAaC,QACjB,MAAMX,YAAYY,KAAK,CAACF,gBAAeA,YAAWH,IAAG,EAAGE,iBAAiBA,YAAAA,GACzE;IAACT;GAAY;AAEf,SAAOa,oBAAoBH,UAAAA;AAC7B;;;ACzBA,SAASI,8BAA8B;AAQhC,IAAMC,cAAc,MAAA;AACzB,QAAMC,SAASC,UAAAA;AACf,SAAOC,uBAAuBF,OAAOG,KAAKC,QAAQ;AACpD;;;ACZA,SAASC,WAAAA,UAASC,kBAAkB;AAG7B,IAAMC,WAAN,MAAMA;EAGXC,YAA6BC,eAAyB,CAAA,GAAI;SAA7BA,eAAAA;SAFrBC,UAAU,oBAAIC,IAAAA;EAEqC;EAE3D,IAAIC,MAAM;AACR,WAAO,KAAKF;EACd;;EAGAG,aAAa;AACX,SAAKJ,aAAaK,QAAQ,CAACC,QAAAA;AACzB,YAAMC,QAAQC,aAAaC,QAAQH,GAAAA;AACnC,WAAKI,OAAOJ,KAAKC,SAAS,EAAA;IAC5B,CAAA;AAEA,WAAO;EACT;EAEAI,OAAOL,KAAa;AAClBE,iBAAaC,QAAQH,GAAAA;EACvB;EAEAI,OAAOJ,KAAaC,OAAe;AACjCC,iBAAaI,QAAQN,KAAK,EAAA;AAC1B,SAAKL,QAAQY,IAAIP,KAAKC,KAAAA;EACxB;AACF;AAMO,IAAMO,cAAc,CACzBC,cAAwB,CAAA,MAAE;AAE1B,QAAM,CAAA,EAAGC,WAAAA,IAAeC,WAAW,CAACC,MAAMA,IAAI,GAAG,CAAA;AACjD,QAAMC,QAAQC,SAAQ,MAAM,IAAItB,SAASiB,WAAAA,EAAaX,WAAU,GAAI;IAACW;GAAY;AACjF,QAAML,SAAS,CAACJ,KAAaC,UAAAA;AAC3BY,UAAMT,OAAOJ,KAAKC,KAAAA;AAClBS,gBAAAA;EACF;AAEA,SAAO;IAACG,MAAMhB;IAAKO;;AACrB;",
-  "names": ["Device", "DeviceKind", "DeviceType", "HaloProxy", "useSyncExternalStore", "useContacts", "client", "useClient", "contacts", "useSyncExternalStore", "listener", "subscription", "halo", "subscribe", "unsubscribe", "get", "useSyncExternalStore", "useDevices", "client", "useClient", "devices", "useSyncExternalStore", "listener", "subscription", "halo", "subscribe", "unsubscribe", "get", "useMemo", "useSyncExternalStore", "useHaloInvitations", "client", "useClient", "invitations", "useSyncExternalStore", "listener", "subscription", "halo", "subscribe", "unsubscribe", "get", "useHaloInvitation", "invitationId", "invitation", "useMemo", "find", "useInvitationStatus", "useMulticastObservable", "useIdentity", "client", "useClient", "useMulticastObservable", "halo", "identity", "useMemo", "useReducer", "KeyStore", "constructor", "_defaultKeys", "_keyMap", "Map", "map", "initialize", "forEach", "key", "value", "localStorage", "getItem", "setKey", "getKey", "setItem", "set", "useKeyStore", "defaultKeys", "forceUpdate", "useReducer", "x", "store", "useMemo"]
+  "sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\n// NOTE: Export * fails here.\nexport { type Contact, type Identity, type Halo, Device, DeviceKind, DeviceType } from '@dxos/client/halo';\n\nexport * from './useContacts';\nexport * from './useDevices';\nexport * from './useHaloInvitations';\nexport * from './useIdentity';\nexport * from './useKeyStore';\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport type { Contact } from '@dxos/client/halo';\nimport { useMulticastObservable } from '@dxos/react-async';\n\nimport { useClient } from '../client';\n\n/**\n * Returns all known Contacts across all Spaces.\n * Contacts are known members of a common Space.\n * Requires ClientContext to be set via ClientProvider.\n */\nexport const useContacts = (): Contact[] => {\n  const client = useClient();\n  return useMulticastObservable(client.halo.contacts);\n};\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport type { Device } from '@dxos/client/halo';\nimport { useMulticastObservable } from '@dxos/react-async';\n\nimport { useClient } from '../client';\n\nexport const useDevices = (): Device[] => {\n  const client = useClient();\n  return useMulticastObservable(client.halo.devices);\n};\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { useMemo } from 'react';\n\nimport { useMulticastObservable } from '@dxos/react-async';\n\nimport { useClient } from '../client';\nimport { useInvitationStatus, type CancellableInvitationObservable } from '../invitations';\n\nexport const useHaloInvitations = (): CancellableInvitationObservable[] => {\n  const client = useClient();\n  return useMulticastObservable(client.halo.invitations);\n};\n\nexport const useHaloInvitation = (invitationId?: string) => {\n  const invitations = useHaloInvitations();\n  const invitation = useMemo(\n    () => invitations.find((invitation) => invitation.get().invitationId === invitationId),\n    [invitations],\n  );\n  return useInvitationStatus(invitation);\n};\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport { type Identity } from '@dxos/client/halo';\nimport { useMulticastObservable } from '@dxos/react-async';\n\nimport { useClient } from '../client';\n\n/**\n * Hook returning DXOS identity object.\n * Requires ClientContext to be set via ClientProvider.\n */\nexport const useIdentity = (): Identity | null => {\n  const client = useClient();\n  return useMulticastObservable(client.halo.identity);\n};\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { useMemo, useReducer } from 'react';\n\n// TODO(burdon): Move to settings plugin.\nexport class KeyStore {\n  private _keyMap = new Map<string, string>();\n\n  constructor(private readonly _defaultKeys: string[] = []) {}\n\n  get map() {\n    return this._keyMap;\n  }\n\n  // TODO(burdon): Create subkeys.\n  initialize() {\n    this._defaultKeys.forEach((key) => {\n      const value = localStorage.getItem(key);\n      this.setKey(key, value ?? '');\n    });\n\n    return this;\n  }\n\n  getKey(key: string) {\n    localStorage.getItem(key);\n  }\n\n  setKey(key: string, value: string) {\n    localStorage.setItem(key, '');\n    this._keyMap.set(key, value);\n  }\n}\n\n/**\n * Settings store.\n * @deprecated Replace with HALO key store when available.\n */\nexport const useKeyStore = (\n  defaultKeys: string[] = [],\n): [Map<string, string>, (key: string, value: string) => void] => {\n  const [, forceUpdate] = useReducer((x) => x + 1, 0);\n  const store = useMemo(() => new KeyStore(defaultKeys).initialize(), [defaultKeys]);\n  const setKey = (key: string, value: string) => {\n    store.setKey(key, value);\n    forceUpdate();\n  };\n\n  return [store.map, setKey];\n};\n"],
+  "mappings": ";;;;;;;;AAKA,SAAiDA,QAAQC,YAAYC,kBAAkB;;;ACAvF,SAASC,8BAA8B;AAShC,IAAMC,cAAc,MAAA;AACzB,QAAMC,SAASC,UAAAA;AACf,SAAOC,uBAAuBF,OAAOG,KAAKC,QAAQ;AACpD;;;ACZA,SAASC,0BAAAA,+BAA8B;AAIhC,IAAMC,aAAa,MAAA;AACxB,QAAMC,SAASC,UAAAA;AACf,SAAOC,wBAAuBF,OAAOG,KAAKC,OAAO;AACnD;;;ACRA,SAASC,eAAe;AAExB,SAASC,0BAAAA,+BAA8B;AAKhC,IAAMC,qBAAqB,MAAA;AAChC,QAAMC,SAASC,UAAAA;AACf,SAAOC,wBAAuBF,OAAOG,KAAKC,WAAW;AACvD;AAEO,IAAMC,oBAAoB,CAACC,iBAAAA;AAChC,QAAMF,cAAcL,mBAAAA;AACpB,QAAMQ,aAAaC,QACjB,MAAMJ,YAAYK,KAAK,CAACF,gBAAeA,YAAWG,IAAG,EAAGJ,iBAAiBA,YAAAA,GACzE;IAACF;GAAY;AAEf,SAAOO,oBAAoBJ,UAAAA;AAC7B;;;AClBA,SAASK,0BAAAA,+BAA8B;AAQhC,IAAMC,cAAc,MAAA;AACzB,QAAMC,SAASC,UAAAA;AACf,SAAOC,wBAAuBF,OAAOG,KAAKC,QAAQ;AACpD;;;ACZA,SAASC,WAAAA,UAASC,kBAAkB;AAG7B,IAAMC,WAAN,MAAMA;EAGXC,YAA6BC,eAAyB,CAAA,GAAI;SAA7BA,eAAAA;SAFrBC,UAAU,oBAAIC,IAAAA;EAEqC;EAE3D,IAAIC,MAAM;AACR,WAAO,KAAKF;EACd;;EAGAG,aAAa;AACX,SAAKJ,aAAaK,QAAQ,CAACC,QAAAA;AACzB,YAAMC,QAAQC,aAAaC,QAAQH,GAAAA;AACnC,WAAKI,OAAOJ,KAAKC,SAAS,EAAA;IAC5B,CAAA;AAEA,WAAO;EACT;EAEAI,OAAOL,KAAa;AAClBE,iBAAaC,QAAQH,GAAAA;EACvB;EAEAI,OAAOJ,KAAaC,OAAe;AACjCC,iBAAaI,QAAQN,KAAK,EAAA;AAC1B,SAAKL,QAAQY,IAAIP,KAAKC,KAAAA;EACxB;AACF;AAMO,IAAMO,cAAc,CACzBC,cAAwB,CAAA,MAAE;AAE1B,QAAM,CAAA,EAAGC,WAAAA,IAAeC,WAAW,CAACC,MAAMA,IAAI,GAAG,CAAA;AACjD,QAAMC,QAAQC,SAAQ,MAAM,IAAItB,SAASiB,WAAAA,EAAaX,WAAU,GAAI;IAACW;GAAY;AACjF,QAAML,SAAS,CAACJ,KAAaC,UAAAA;AAC3BY,UAAMT,OAAOJ,KAAKC,KAAAA;AAClBS,gBAAAA;EACF;AAEA,SAAO;IAACG,MAAMhB;IAAKO;;AACrB;",
+  "names": ["Device", "DeviceKind", "DeviceType", "useMulticastObservable", "useContacts", "client", "useClient", "useMulticastObservable", "halo", "contacts", "useMulticastObservable", "useDevices", "client", "useClient", "useMulticastObservable", "halo", "devices", "useMemo", "useMulticastObservable", "useHaloInvitations", "client", "useClient", "useMulticastObservable", "halo", "invitations", "useHaloInvitation", "invitationId", "invitation", "useMemo", "find", "get", "useInvitationStatus", "useMulticastObservable", "useIdentity", "client", "useClient", "useMulticastObservable", "halo", "identity", "useMemo", "useReducer", "KeyStore", "constructor", "_defaultKeys", "_keyMap", "Map", "map", "initialize", "forEach", "key", "value", "localStorage", "getItem", "setKey", "getKey", "setItem", "set", "useKeyStore", "defaultKeys", "forceUpdate", "useReducer", "x", "store", "useMemo"]
 }

package/dist/lib/browser/index.mjs

@@ -7,7 +7,7 @@ import {
   useConfig,
   useShell,
   useStatus
-} from "./chunk-6SW7V4VI.mjs";
+} from "./chunk-HJDLXXEZ.mjs";
 
 // packages/sdk/react-client/src/index.ts
 export * from "@dxos/client";

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

@@ -5,7 +5,7 @@ import {
   InvitationEncoder,
   InvitationsProxy,
   useInvitationStatus
-} from "../chunk-Y64VSVTU.mjs";
+} from "../chunk-BQ4BAP42.mjs";
 export {
   AuthenticatingInvitationObservable,
   CancellableInvitationObservable,

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

@@ -1,19 +1,15 @@
 import {
   useClient
-} from "../chunk-6SW7V4VI.mjs";
+} from "../chunk-HJDLXXEZ.mjs";
 
 // packages/sdk/react-client/src/mesh/index.ts
 export * from "@dxos/client/mesh";
 
 // packages/sdk/react-client/src/mesh/useNetworkStatus.ts
-import { useSyncExternalStore } from "react";
+import { useMulticastObservable } from "@dxos/react-async";
 var useNetworkStatus = () => {
   const client = useClient();
-  const networkStatus = useSyncExternalStore((listener) => {
-    const subscription = client.mesh.networkStatus.subscribe(listener);
-    return () => subscription.unsubscribe();
-  }, () => client.mesh.networkStatus.get());
-  return networkStatus;
+  return useMulticastObservable(client.mesh.networkStatus);
 };
 export {
   useNetworkStatus

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/mesh/index.ts", "../../../../src/mesh/useNetworkStatus.ts"],
-  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nexport * from '@dxos/client/mesh';\n\nexport * from './useNetworkStatus';\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport { useSyncExternalStore } from 'react';\n\nimport { type NetworkStatus } from '@dxos/client/mesh';\n\nimport { useClient } from '../client';\n\n/**\n * Creates a network status subscription.\n */\nexport const useNetworkStatus = (): NetworkStatus => {\n  const client = useClient();\n  const networkStatus = useSyncExternalStore(\n    (listener) => {\n      const subscription = client.mesh.networkStatus.subscribe(listener);\n      return () => subscription.unsubscribe();\n    },\n    () => client.mesh.networkStatus.get(),\n  );\n\n  return networkStatus;\n};\n"],
-  "mappings": ";;;;;AAIA,cAAc;;;ACAd,SAASA,4BAA4B;AAS9B,IAAMC,mBAAmB,MAAA;AAC9B,QAAMC,SAASC,UAAAA;AACf,QAAMC,gBAAgBC,qBACpB,CAACC,aAAAA;AACC,UAAMC,eAAeL,OAAOM,KAAKJ,cAAcK,UAAUH,QAAAA;AACzD,WAAO,MAAMC,aAAaG,YAAW;EACvC,GACA,MAAMR,OAAOM,KAAKJ,cAAcO,IAAG,CAAA;AAGrC,SAAOP;AACT;",
-  "names": ["useSyncExternalStore", "useNetworkStatus", "client", "useClient", "networkStatus", "useSyncExternalStore", "listener", "subscription", "mesh", "subscribe", "unsubscribe", "get"]
+  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nexport * from '@dxos/client/mesh';\n\nexport * from './useNetworkStatus';\n", "//\n// Copyright 2020 DXOS.org\n//\n\nimport { type NetworkStatus } from '@dxos/client/mesh';\nimport { useMulticastObservable } from '@dxos/react-async';\n\nimport { useClient } from '../client';\n\n/**\n * Creates a network status subscription.\n */\nexport const useNetworkStatus = (): NetworkStatus => {\n  const client = useClient();\n  return useMulticastObservable(client.mesh.networkStatus);\n};\n"],
+  "mappings": ";;;;;AAIA,cAAc;;;ACCd,SAASA,8BAA8B;AAOhC,IAAMC,mBAAmB,MAAA;AAC9B,QAAMC,SAASC,UAAAA;AACf,SAAOC,uBAAuBF,OAAOG,KAAKC,aAAa;AACzD;",
+  "names": ["useMulticastObservable", "useNetworkStatus", "client", "useClient", "useMulticastObservable", "mesh", "networkStatus"]
 }