@dxos/react-client 0.4.10-main.76f1ccd → 0.4.10-main.7850f82

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/testing/index.ts", "../../../../src/testing/ClientRepeater.tsx", "../../../../src/testing/FullscreenDecorator.tsx"],
-  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nexport * from '@dxos/client/testing';\n\nexport * from './ClientRepeater';\nexport * from './FullscreenDecorator';\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport React, { useState, type FC, useEffect } from 'react';\n\nimport { Client, type PublicKey } from '@dxos/client';\nimport { type SpaceProxy, type Space, type TypeCollection } from '@dxos/client/echo';\nimport { TestBuilder, performInvitation } from '@dxos/client/testing';\nimport { registerSignalFactory } from '@dxos/echo-signals/react';\nimport { faker } from '@dxos/random';\nimport { type MaybePromise } from '@dxos/util';\n\nimport { ClientContext } from '../client';\n\nconst testBuilder = new TestBuilder();\n\nexport type RepeatedComponentProps = { id: number; count: number };\n\nexport type ClientRepeaterProps<P extends RepeatedComponentProps> = {\n  component: FC<any>;\n  controls?: FC<{ clients: Client[] }>;\n  clients?: Client[];\n  count?: number;\n  registerSignalFactory?: boolean;\n  className?: string;\n  types?: TypeCollection;\n  createIdentity?: boolean;\n  createSpace?: boolean;\n  onCreateSpace?: (space: Space) => MaybePromise<void>;\n  args?: Omit<P, 'id' | 'count'>;\n};\n\n/**\n * Utility component for Storybook stories which sets up clients for n peers.\n * The `Component` property is rendered n times, once for each peer.\n */\n// NOTE: This is specifically not a storybook decorator because it broke stories as a decorator.\n//   This seems primarily due to the fact that it required top-level await for the clients to initialize.\n//   Storybook seemed to handle it alright, but Chromatic had a lot of trouble with it.\n//   There was also a question of whether or not calling the story function multiple times was a good idea.\n// TODO(wittjosiah): Rename.\nexport const ClientRepeater = <P extends RepeatedComponentProps>(props: ClientRepeaterProps<P>) => {\n  const {\n    component: Component,\n    controls: Controls,\n    count = 1,\n    className = 'flex w-full place-content-evenly',\n    types,\n    createIdentity,\n    createSpace,\n    onCreateSpace,\n  } = props;\n  if (props.registerSignalFactory ?? true) {\n    registerSignalFactory();\n  }\n\n  const [clients, setClients] = useState(props.clients ?? []);\n  const [spaceKey, setSpaceKey] = useState<PublicKey>();\n\n  useEffect(() => {\n    const timeout = setTimeout(async () => {\n      const clients = [...Array(count)].map((_) => new Client({ services: testBuilder.createLocal() }));\n      await Promise.all(clients.map((client) => client.initialize()));\n      types && clients.map((client) => client.spaces.addSchema(types));\n\n      if (createIdentity || createSpace) {\n        await Promise.all(clients.map((client) => client.halo.createIdentity()));\n      }\n\n      if (createSpace) {\n        const space = await clients[0].spaces.create({ name: faker.commerce.productName() });\n        setSpaceKey(space.key);\n        await onCreateSpace?.(space);\n        await Promise.all(\n          clients.slice(1).map((client) => performInvitation({ host: space as SpaceProxy, guest: client.spaces })),\n        );\n      }\n\n      setClients(clients);\n    });\n\n    return () => clearTimeout(timeout);\n  }, []);\n\n  if (clients.length === 0) {\n    return null;\n  }\n\n  return (\n    <>\n      {Controls && <Controls clients={clients} />}\n      <div className={className}>\n        {clients.map((client, index) => (\n          <ClientContext.Provider key={index} value={{ client }}>\n            <Component id={index} count={clients.length} {...{ ...props.args, spaceKey }} />\n          </ClientContext.Provider>\n        ))}\n      </div>\n    </>\n  );\n};\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport type { DecoratorFunction } from '@storybook/csf';\nimport type { ReactRenderer } from '@storybook/react';\nimport React from 'react';\n\nexport const FullscreenDecorator = (className?: string): DecoratorFunction<ReactRenderer> => {\n  return (Story) => (\n    <div className={['flex fixed inset-0 overflow-hidden', className].join(' ')}>\n      <Story />\n    </div>\n  );\n};\n"],
-  "mappings": ";;;;;AAIA,cAAc;;;ACAd,OAAOA,SAASC,UAAmBC,iBAAiB;AAEpD,SAASC,cAA8B;AAEvC,SAASC,aAAaC,yBAAyB;AAC/C,SAASC,6BAA6B;AACtC,SAASC,aAAa;AAKtB,IAAMC,cAAc,IAAIC,YAAAA;AA2BjB,IAAMC,iBAAiB,CAAmCC,UAAAA;AAC/D,QAAM,EACJC,WAAWC,WACXC,UAAUC,UACVC,QAAQ,GACRC,YAAY,oCACZC,OACAC,gBACAC,aACAC,cAAa,IACXV;AACJ,MAAIA,MAAMW,yBAAyB,MAAM;AACvCA,0BAAAA;EACF;AAEA,QAAM,CAACC,SAASC,UAAAA,IAAcC,SAASd,MAAMY,WAAW,CAAA,CAAE;AAC1D,QAAM,CAACG,UAAUC,WAAAA,IAAeF,SAAAA;AAEhCG,YAAU,MAAA;AACR,UAAMC,UAAUC,WAAW,YAAA;AACzB,YAAMP,WAAU;WAAIQ,MAAMf,KAAAA;QAAQgB,IAAI,CAACC,MAAM,IAAIC,OAAO;QAAEC,UAAU3B,YAAY4B,YAAW;MAAG,CAAA,CAAA;AAC9F,YAAMC,QAAQC,IAAIf,SAAQS,IAAI,CAACO,WAAWA,OAAOC,WAAU,CAAA,CAAA;AAC3DtB,eAASK,SAAQS,IAAI,CAACO,WAAWA,OAAOE,OAAOC,UAAUxB,KAAAA,CAAAA;AAEzD,UAAIC,kBAAkBC,aAAa;AACjC,cAAMiB,QAAQC,IAAIf,SAAQS,IAAI,CAACO,WAAWA,OAAOI,KAAKxB,eAAc,CAAA,CAAA;MACtE;AAEA,UAAIC,aAAa;AACf,cAAMwB,QAAQ,MAAMrB,SAAQ,CAAA,EAAGkB,OAAOI,OAAO;UAAEC,MAAMC,MAAMC,SAASC,YAAW;QAAG,CAAA;AAClFtB,oBAAYiB,MAAMM,GAAG;AACrB,cAAM7B,gBAAgBuB,KAAAA;AACtB,cAAMP,QAAQC,IACZf,SAAQ4B,MAAM,CAAA,EAAGnB,IAAI,CAACO,WAAWa,kBAAkB;UAAEC,MAAMT;UAAqBU,OAAOf,OAAOE;QAAO,CAAA,CAAA,CAAA;MAEzG;AAEAjB,iBAAWD,QAAAA;IACb,CAAA;AAEA,WAAO,MAAMgC,aAAa1B,OAAAA;EAC5B,GAAG,CAAA,CAAE;AAEL,MAAIN,QAAQiC,WAAW,GAAG;AACxB,WAAO;EACT;AAEA,SACE,sBAAA,cAAA,MAAA,UAAA,MACGzC,YAAY,sBAAA,cAACA,UAAAA;IAASQ;MACvB,sBAAA,cAACkC,OAAAA;IAAIxC;KACFM,QAAQS,IAAI,CAACO,QAAQmB,UACpB,sBAAA,cAACC,cAAcC,UAAQ;IAACV,KAAKQ;IAAOG,OAAO;MAAEtB;IAAO;KAClD,sBAAA,cAAC1B,WAAAA;IAAUiD,IAAIJ;IAAO1C,OAAOO,QAAQiC;IAAc,GAAG7C,MAAMoD;IAAMrC;;AAM9E;;;AC/FA,OAAOsC,YAAW;AAEX,IAAMC,sBAAsB,CAACC,cAAAA;AAClC,SAAO,CAACC,UACN,gBAAAC,OAAA,cAACC,OAAAA;IAAIH,WAAW;MAAC;MAAsCA;MAAWI,KAAK,GAAA;KACrE,gBAAAF,OAAA,cAACD,OAAAA,IAAAA,CAAAA;AAGP;",
-  "names": ["React", "useState", "useEffect", "Client", "TestBuilder", "performInvitation", "registerSignalFactory", "faker", "testBuilder", "TestBuilder", "ClientRepeater", "props", "component", "Component", "controls", "Controls", "count", "className", "types", "createIdentity", "createSpace", "onCreateSpace", "registerSignalFactory", "clients", "setClients", "useState", "spaceKey", "setSpaceKey", "useEffect", "timeout", "setTimeout", "Array", "map", "_", "Client", "services", "createLocal", "Promise", "all", "client", "initialize", "spaces", "addSchema", "halo", "space", "create", "name", "faker", "commerce", "productName", "key", "slice", "performInvitation", "host", "guest", "clearTimeout", "length", "div", "index", "ClientContext", "Provider", "value", "id", "args", "React", "FullscreenDecorator", "className", "Story", "React", "div", "join"]
+  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nexport * from '@dxos/client/testing';\n\nexport * from './ClientRepeater';\nexport * from './FullscreenDecorator';\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport React, { useState, type FC, useEffect } from 'react';\n\nimport { Client, type PublicKey } from '@dxos/client';\nimport { type Space } from '@dxos/client/echo';\nimport { TestBuilder, performInvitation } from '@dxos/client/testing';\nimport { registerSignalFactory } from '@dxos/echo-signals/react';\nimport { faker } from '@dxos/random';\nimport { type MaybePromise } from '@dxos/util';\n\nimport { ClientContext } from '../client';\n\nconst testBuilder = new TestBuilder();\n\nexport type RepeatedComponentProps = { id: number; count: number };\n\nexport type ClientRepeaterProps<P extends RepeatedComponentProps> = {\n  component: FC<any>;\n  className?: string;\n  controls?: FC<{ clients: Client[] }>;\n  clients?: Client[];\n  count?: number;\n  registerSignalFactory?: boolean;\n  schema?: Parameters<Client['addSchema']>;\n  createIdentity?: boolean;\n  createSpace?: boolean;\n  onCreateSpace?: (space: Space) => MaybePromise<void>;\n  args?: Omit<P, 'id' | 'count'>;\n};\n\n/**\n * Utility component for Storybook stories which sets up clients for n peers.\n * The `Component` property is rendered n times, once for each peer.\n */\n// NOTE: This is specifically not a storybook decorator because it broke stories as a decorator.\n//   This seems primarily due to the fact that it required top-level await for the clients to initialize.\n//   Storybook seemed to handle it alright, but Chromatic had a lot of trouble with it.\n//   There was also a question of whether or not calling the story function multiple times was a good idea.\n// TODO(wittjosiah): Rename.\nexport const ClientRepeater = <P extends RepeatedComponentProps>(props: ClientRepeaterProps<P>) => {\n  const {\n    component: Component,\n    controls: Controls,\n    count = 1,\n    className = 'flex w-full place-content-evenly',\n    schema,\n    createIdentity,\n    createSpace,\n    onCreateSpace,\n  } = props;\n  if (props.registerSignalFactory ?? true) {\n    registerSignalFactory();\n  }\n\n  const [clients, setClients] = useState(props.clients ?? []);\n  const [spaceKey, setSpaceKey] = useState<PublicKey>();\n\n  useEffect(() => {\n    const timeout = setTimeout(async () => {\n      const clients = [...Array(count)].map((_) => new Client({ services: testBuilder.createLocal() }));\n      await Promise.all(clients.map((client) => client.initialize()));\n      schema && clients.map((client) => client.addSchema(...schema));\n\n      if (createIdentity || createSpace) {\n        await Promise.all(clients.map((client) => client.halo.createIdentity()));\n      }\n\n      if (createSpace) {\n        const space = await clients[0].spaces.create({ name: faker.commerce.productName() });\n        setSpaceKey(space.key);\n        await onCreateSpace?.(space);\n        await Promise.all(clients.slice(1).map((client) => performInvitation({ host: space, guest: client.spaces })));\n      }\n\n      setClients(clients);\n    });\n\n    return () => clearTimeout(timeout);\n  }, []);\n\n  if (clients.length === 0) {\n    return null;\n  }\n\n  return (\n    <>\n      {Controls && <Controls clients={clients} />}\n      <div className={className}>\n        {clients.map((client, index) => (\n          <ClientContext.Provider key={index} value={{ client }}>\n            <Component id={index} count={clients.length} {...{ ...props.args, spaceKey }} />\n          </ClientContext.Provider>\n        ))}\n      </div>\n    </>\n  );\n};\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport type { DecoratorFunction } from '@storybook/csf';\nimport type { ReactRenderer } from '@storybook/react';\nimport React from 'react';\n\nexport const FullscreenDecorator = (className?: string): DecoratorFunction<ReactRenderer> => {\n  return (Story) => (\n    <div className={['flex fixed inset-0 overflow-hidden', className].join(' ')}>\n      <Story />\n    </div>\n  );\n};\n"],
+  "mappings": ";;;;;AAIA,cAAc;;;ACAd,OAAOA,SAASC,UAAmBC,iBAAiB;AAEpD,SAASC,cAA8B;AAEvC,SAASC,aAAaC,yBAAyB;AAC/C,SAASC,6BAA6B;AACtC,SAASC,aAAa;AAKtB,IAAMC,cAAc,IAAIC,YAAAA;AA2BjB,IAAMC,iBAAiB,CAAmCC,UAAAA;AAC/D,QAAM,EACJC,WAAWC,WACXC,UAAUC,UACVC,QAAQ,GACRC,YAAY,oCACZC,QACAC,gBACAC,aACAC,cAAa,IACXV;AACJ,MAAIA,MAAMW,yBAAyB,MAAM;AACvCA,0BAAAA;EACF;AAEA,QAAM,CAACC,SAASC,UAAAA,IAAcC,SAASd,MAAMY,WAAW,CAAA,CAAE;AAC1D,QAAM,CAACG,UAAUC,WAAAA,IAAeF,SAAAA;AAEhCG,YAAU,MAAA;AACR,UAAMC,UAAUC,WAAW,YAAA;AACzB,YAAMP,WAAU;WAAIQ,MAAMf,KAAAA;QAAQgB,IAAI,CAACC,MAAM,IAAIC,OAAO;QAAEC,UAAU3B,YAAY4B,YAAW;MAAG,CAAA,CAAA;AAC9F,YAAMC,QAAQC,IAAIf,SAAQS,IAAI,CAACO,WAAWA,OAAOC,WAAU,CAAA,CAAA;AAC3DtB,gBAAUK,SAAQS,IAAI,CAACO,WAAWA,OAAOE,UAAS,GAAIvB,MAAAA,CAAAA;AAEtD,UAAIC,kBAAkBC,aAAa;AACjC,cAAMiB,QAAQC,IAAIf,SAAQS,IAAI,CAACO,WAAWA,OAAOG,KAAKvB,eAAc,CAAA,CAAA;MACtE;AAEA,UAAIC,aAAa;AACf,cAAMuB,QAAQ,MAAMpB,SAAQ,CAAA,EAAGqB,OAAOC,OAAO;UAAEC,MAAMC,MAAMC,SAASC,YAAW;QAAG,CAAA;AAClFtB,oBAAYgB,MAAMO,GAAG;AACrB,cAAM7B,gBAAgBsB,KAAAA;AACtB,cAAMN,QAAQC,IAAIf,SAAQ4B,MAAM,CAAA,EAAGnB,IAAI,CAACO,WAAWa,kBAAkB;UAAEC,MAAMV;UAAOW,OAAOf,OAAOK;QAAO,CAAA,CAAA,CAAA;MAC3G;AAEApB,iBAAWD,QAAAA;IACb,CAAA;AAEA,WAAO,MAAMgC,aAAa1B,OAAAA;EAC5B,GAAG,CAAA,CAAE;AAEL,MAAIN,QAAQiC,WAAW,GAAG;AACxB,WAAO;EACT;AAEA,SACE,sBAAA,cAAA,MAAA,UAAA,MACGzC,YAAY,sBAAA,cAACA,UAAAA;IAASQ;MACvB,sBAAA,cAACkC,OAAAA;IAAIxC;KACFM,QAAQS,IAAI,CAACO,QAAQmB,UACpB,sBAAA,cAACC,cAAcC,UAAQ;IAACV,KAAKQ;IAAOG,OAAO;MAAEtB;IAAO;KAClD,sBAAA,cAAC1B,WAAAA;IAAUiD,IAAIJ;IAAO1C,OAAOO,QAAQiC;IAAc,GAAG7C,MAAMoD;IAAMrC;;AAM9E;;;AC7FA,OAAOsC,YAAW;AAEX,IAAMC,sBAAsB,CAACC,cAAAA;AAClC,SAAO,CAACC,UACN,gBAAAC,OAAA,cAACC,OAAAA;IAAIH,WAAW;MAAC;MAAsCA;MAAWI,KAAK,GAAA;KACrE,gBAAAF,OAAA,cAACD,OAAAA,IAAAA,CAAAA;AAGP;",
+  "names": ["React", "useState", "useEffect", "Client", "TestBuilder", "performInvitation", "registerSignalFactory", "faker", "testBuilder", "TestBuilder", "ClientRepeater", "props", "component", "Component", "controls", "Controls", "count", "className", "schema", "createIdentity", "createSpace", "onCreateSpace", "registerSignalFactory", "clients", "setClients", "useState", "spaceKey", "setSpaceKey", "useEffect", "timeout", "setTimeout", "Array", "map", "_", "Client", "services", "createLocal", "Promise", "all", "client", "initialize", "addSchema", "halo", "space", "spaces", "create", "name", "faker", "commerce", "productName", "key", "slice", "performInvitation", "host", "guest", "clearTimeout", "length", "div", "index", "ClientContext", "Provider", "value", "id", "args", "React", "FullscreenDecorator", "className", "Story", "React", "div", "join"]
 }

package/dist/lib/node/{chunk-PNDYOCJA.cjs → chunk-X5URYLUS.cjs}

@@ -16,8 +16,8 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_PNDYOCJA_exports = {};
-__export(chunk_PNDYOCJA_exports, {
+var chunk_X5URYLUS_exports = {};
+__export(chunk_X5URYLUS_exports, {
   AuthenticatingInvitationObservable: () => import_invitations.AuthenticatingInvitationObservable,
   CancellableInvitationObservable: () => import_invitations.CancellableInvitationObservable,
   Invitation: () => import_invitations.Invitation,
@@ -25,7 +25,7 @@ __export(chunk_PNDYOCJA_exports, {
   InvitationsProxy: () => import_invitations.InvitationsProxy,
   useInvitationStatus: () => useInvitationStatus
 });
-module.exports = __toCommonJS(chunk_PNDYOCJA_exports);
+module.exports = __toCommonJS(chunk_X5URYLUS_exports);
 var import_invitations = require("@dxos/client/invitations");
 var import_react = require("react");
 var import_invitations2 = require("@dxos/client/invitations");
@@ -37,7 +37,7 @@ var useInvitationStatus = (initialObservable) => {
       action
     }, {
       F: __dxlog_file,
-      L: 79,
+      L: 81,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -129,7 +129,7 @@ var useInvitationStatus = (initialObservable) => {
       authCode
     }, {
       F: __dxlog_file,
-      L: 163,
+      L: 165,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -151,6 +151,7 @@ var useInvitationStatus = (initialObservable) => {
       connect,
       authenticate,
       id: invitation?.invitationId,
+      multiUse: invitation?.multiUse,
       invitationCode: invitation ? import_invitations2.InvitationEncoder.encode(invitation) : void 0,
       authCode: invitation?.authCode,
       authMethod: invitation?.authMethod,
@@ -173,4 +174,4 @@ var useInvitationStatus = (initialObservable) => {
   InvitationsProxy,
   useInvitationStatus
 });
-//# sourceMappingURL=chunk-PNDYOCJA.cjs.map
+//# sourceMappingURL=chunk-X5URYLUS.cjs.map

package/dist/lib/node/chunk-X5URYLUS.cjs.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": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,yBAOO;ACRP,mBAA0E;AAG1E,IAAAA,sBAKO;AACP,iBAAoB;;AAgEb,IAAMC,sBAAsB,CAACC,sBAAAA;AAClC,QAAM,CAACC,OAAOC,QAAAA,QAAYC,yBACxB,CAACC,MAAMC,WAAAA;AACLC,wBAAI,uBAAuB;MAAED;IAAO,GAAA;;;;;;AACpC,WAAO;MACL,GAAGD;;MAEHG,QAAQF,OAAOE;;MAEfC,QAAQH,OAAOE,WAAWE,+BAAWC,MAAMC,UAAUN,OAAOG,SAASJ,KAAKI;;MAE1E,GAAIH,OAAOE,WAAWE,+BAAWC,MAAME,SAAS;QAAEC,OAAOR,OAAOQ;MAAM;;MAEtE,IAAKR,OAAOE,WAAWE,+BAAWC,MAAME,SACtCP,OAAOE,WAAWE,+BAAWC,MAAMI,aACnCT,OAAOE,WAAWE,+BAAWC,MAAMK,YAAY;QAC/CC,UAAU,OAAOZ,KAAKY,aAAa,cAAcX,OAAOW,WAAWZ,KAAKY;MAC1E;MACAC,YACEZ,OAAOE,WAAWE,+BAAWC,MAAMQ,aAAab,OAAOY,cAAcb,KAAKa,aAAab,KAAKa;IAChG;EACF,GACA,MACA,CAACE,SAAAA;AACC,WAAO;MACLZ,QAAQE,+BAAWC,MAAMU;MACzBZ,QAAQ;QAAEa,UAAU;QAAMC,aAAa;QAAMC,UAAU;QAAMC,QAAQ;MAAK;MAC1EP,YAAYjB;IACd;EACF,CAAA;AAKFyB,8BAAU,MAAA;AACR,UAAMC,SAAS,CAACC,eAAAA;AACd,cAAQA,WAAW1B,OAAK;QACtB,KAAKQ,+BAAWC,MAAMkB;QACtB,KAAKnB,+BAAWC,MAAMmB;QACtB,KAAKpB,+BAAWC,MAAMoB,gBAAgB;AACpC5B,mBAAS;YACPK,QAAQoB,WAAW1B;UACrB,CAAA;AACA;QACF;QAEA,KAAKQ,+BAAWC,MAAMC,SAAS;AAC7BT,mBAAS;YACPK,QAAQoB,WAAW1B;YACnBO,QAAQ;cACNa,UAAUM,WAAWN,YAAY;cACjCC,aAAaK,WAAWL,eAAe;cACvCC,UAAUI,WAAWJ,YAAY;cACjCC,QAAQG,WAAWH,UAAU;YAC/B;UACF,CAAA;AACA;QACF;QAEA,KAAKf,+BAAWC,MAAMI;QACtB,KAAKL,+BAAWC,MAAMK,SAAS;AAC7Bb,mBAAS;YAAEK,QAAQoB,WAAW1B;YAAOe,UAAUf,MAAMM;UAAO,CAAA;AAC5D;QACF;MACF;IACF;AAEA,UAAMwB,eAAe9B,MAAMgB,YAAYe,UAAUN,QAAQ,CAACO,QAAAA;AACxD/B,eAAS;QAAEK,QAAQE,+BAAWC,MAAME;QAAOC,OAAOoB;QAAKjB,UAAUf,MAAMM;MAAO,CAAA;IAChF,CAAA;AAEA,UAAM2B,eAAejC,MAAMgB,YAAYkB,IAAAA;AACvC,QAAID,cAAc;AAChBR,aAAOQ,YAAAA;IACT;AAEA,WAAO,MAAMH,cAAcK,YAAAA;EAC7B,GAAG;IAACnC,MAAMgB;IAAYhB,MAAMM;GAAO;AAInC,QAAM8B,cAAUC,0BAAY,CAACrB,eAAAA;AAC3Bf,aAAS;MAAEK,QAAQE,+BAAWC,MAAMQ;MAAYD;IAAW,CAAA;EAC7D,GAAG,CAAA,CAAE;AAEL,QAAMsB,mBAAeD,0BACnB,CAACE,aAAAA;AACClC,wBAAI,qBAAqB;MAAEkC;IAAS,GAAA;;;;;;AACpC,WAAQvC,MAAMgB,WAAkDsB,aAAaC,QAAAA;EAC/E,GACA;IAACvC,MAAMgB;GAAW;AAGpB,QAAMwB,aAASH,0BAAY,YAAYrC,MAAMgB,YAAYwB,OAAAA,GAAU;IAACxC,MAAMgB;GAAW;AAErF,aAAOyB,sBAAQ,MAAA;AACb,UAAMf,aAAa1B,MAAMgB,YAAYkB,IAAAA;AACrC,UAAM3B,SAAS;MACbD,QAAQN,MAAMM;MACdS,UAAUf,MAAMe;MAChBR,QAAQP,MAAMO;MACdK,OAAOZ,MAAMY;MACb4B;MACAJ;MACAE;MACAI,IAAIhB,YAAYiB;MAChBC,UAAUlB,YAAYkB;MACtBC,gBAAgBnB,aAAaoB,sCAAkBC,OAAOrB,UAAAA,IAAcsB;MACpET,UAAUb,YAAYa;MACtBU,YAAYvB,YAAYuB;MACxBC,MAAMxB,YAAYwB;IACpB;AAEA,WAAO3C;EACT,GAAG;IAACP;IAAOwC;IAAQJ;IAASE;GAAa;AAC3C;",
+  "names": ["import_invitations", "useInvitationStatus", "initialObservable", "state", "dispatch", "useReducer", "prev", "action", "log", "status", "result", "Invitation", "State", "SUCCESS", "ERROR", "error", "CANCELLED", "TIMEOUT", "haltedAt", "observable", "CONNECTING", "_arg", "INIT", "spaceKey", "identityKey", "swarmKey", "target", "useEffect", "update", "invitation", "CONNECTED", "READY_FOR_AUTHENTICATION", "AUTHENTICATING", "subscription", "subscribe", "err", "currentState", "get", "unsubscribe", "connect", "useCallback", "authenticate", "authCode", "cancel", "useMemo", "id", "invitationId", "multiUse", "invitationCode", "InvitationEncoder", "encode", "undefined", "authMethod", "type"]
+}

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

@@ -28,7 +28,7 @@ __export(echo_exports, {
   useSubscription: () => useSubscription
 });
 module.exports = __toCommonJS(echo_exports);
-var import_chunk_PNDYOCJA = require("../chunk-PNDYOCJA.cjs");
+var import_chunk_X5URYLUS = require("../chunk-X5URYLUS.cjs");
 var import_chunk_IRRRZ2KE = require("../chunk-IRRRZ2KE.cjs");
 __reExport(echo_exports, require("@dxos/client/echo"), module.exports);
 var import_async = require("@dxos/async");
@@ -38,8 +38,10 @@ var import_react = require("react");
 var import_echo2 = require("@dxos/client/echo");
 var import_react_async2 = require("@dxos/react-async");
 var import_react2 = require("react");
-var import_react3 = require("react");
 var import_echo3 = require("@dxos/client/echo");
+var import_react3 = require("react");
+var import_async2 = require("@dxos/async");
+var import_react_async3 = require("@dxos/react-async");
 var import_react4 = require("react");
 var import_echo4 = require("@dxos/client/echo");
 var useSpace = (spaceKey) => {
@@ -79,33 +81,42 @@ var useMembers = (spaceKey) => {
   const members = (0, import_react_async.useMulticastObservable)(space?.members ?? import_async.MulticastObservable.empty()) ?? [];
   return members.filter((member) => member.presence !== import_echo.SpaceMember.PresenceState.REMOVED);
 };
-var useQuery = (space, filter, options, deps) => {
-  const query = (0, import_react2.useMemo)(() => space?.db.query(filter, options), [
-    space?.db,
+var useQuery = (spaceOrEcho, filter, options, deps) => {
+  const { subscribe, getObjects } = (0, import_react2.useMemo)(() => {
+    const query = (0, import_echo3.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 (0, import_react2.useSyncExternalStore)((cb) => query?.subscribe?.(cb) ?? cb, () => query?.objects) ?? [];
+  return (0, import_react2.useSyncExternalStore)(subscribe, getObjects) ?? [];
 };
-var filterToDepsArray = (filter) => Object.entries(filter ?? {}).flat();
+var filterToDepsArray = (filter) => Object.entries(filter ?? {}).flat(10).map((x) => typeof x === "function" || typeof x === "object" ? null : x);
+var noop = () => {
+};
+var EMPTY_ARRAY = [];
 var useSpaceInvitations = (spaceKey) => {
   const space = useSpace(spaceKey);
-  const invitations = (0, import_react3.useSyncExternalStore)((listener) => {
-    if (!(space instanceof import_echo3.SpaceProxy)) {
-      return () => {
-      };
-    }
-    const subscription = space.invitations.subscribe(() => listener());
-    return () => subscription.unsubscribe();
-  }, () => space?.invitations.get()) ?? [];
-  return invitations;
+  return (0, import_react_async3.useMulticastObservable)(space?.invitations ?? import_async2.MulticastObservable.empty()) ?? [];
 };
 var useSpaceInvitation = (spaceKey, invitationId) => {
   const invitations = useSpaceInvitations(spaceKey);
   const invitation = (0, import_react3.useMemo)(() => invitations.find((invitation2) => invitation2.get().invitationId === invitationId), [
     invitations
   ]);
-  return (0, import_chunk_PNDYOCJA.useInvitationStatus)(invitation);
+  return (0, import_chunk_X5URYLUS.useInvitationStatus)(invitation);
 };
 var useSubscription = (cb, selection) => {
   const callbackRef = (0, import_react4.useRef)(cb);

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/echo/index.ts", "../../../../src/echo/useMembers.ts", "../../../../src/echo/useSpaces.ts", "../../../../src/echo/useQuery.ts", "../../../../src/echo/useSpaceInvitations.ts", "../../../../src/echo/useSubscription.ts"],
-  "sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nexport * from '@dxos/client/echo';\n\nexport * from './useMembers';\nexport * from './useQuery';\nexport * from './useSpaces';\nexport * from './useSpaceInvitations';\nexport * from './useSubscription';\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { MulticastObservable } from '@dxos/async';\nimport { type PublicKey } from '@dxos/client';\nimport { 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, OpaqueEchoObject, Query, FilterSource, Space } from '@dxos/client/echo';\n\ntype UseQuery = {\n  <T extends OpaqueEchoObject>(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 OpaqueEchoObject>(\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": ["import_echo", "import_react_async", "import_react", "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", "undefined", "members", "MulticastObservable", "empty", "member", "presence", "SpaceMember", "PresenceState", "REMOVED", "useQuery", "options", "deps", "query", "useMemo", "db", "filterToDepsArray", "useSyncExternalStore", "cb", "subscribe", "objects", "Object", "entries", "flat", "useSpaceInvitations", "invitations", "listener", "SpaceProxy", "subscription", "unsubscribe", "useSpaceInvitation", "invitationId", "invitation", "useInvitationStatus", "useSubscription", "selection", "callbackRef", "useRef", "current", "subscriptionRef", "createSubscription", "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": ["import_echo", "import_react_async", "import_react", "import_async", "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", "undefined", "members", "MulticastObservable", "empty", "member", "presence", "SpaceMember", "PresenceState", "REMOVED", "useQuery", "spaceOrEcho", "options", "deps", "subscribe", "getObjects", "useMemo", "query", "isSpace", "db", "subscribed", "cb", "unsubscribe", "noop", "objects", "EMPTY_ARRAY", "filterToDepsArray", "useSyncExternalStore", "Object", "entries", "flat", "map", "x", "useSpaceInvitations", "invitations", "useSpaceInvitation", "invitationId", "invitation", "useInvitationStatus", "useSubscription", "selection", "callbackRef", "useRef", "current", "subscriptionRef", "createSubscription", "update"]
 }

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

@@ -21,7 +21,6 @@ __export(halo_exports, {
   Device: () => import_halo.Device,
   DeviceKind: () => import_halo.DeviceKind,
   DeviceType: () => import_halo.DeviceType,
-  HaloProxy: () => import_halo.HaloProxy,
   KeyStore: () => KeyStore,
   useContacts: () => useContacts,
   useDevices: () => useDevices,
@@ -31,48 +30,37 @@ __export(halo_exports, {
   useKeyStore: () => useKeyStore
 });
 module.exports = __toCommonJS(halo_exports);
-var import_chunk_PNDYOCJA = require("../chunk-PNDYOCJA.cjs");
+var import_chunk_X5URYLUS = require("../chunk-X5URYLUS.cjs");
 var import_chunk_IRRRZ2KE = require("../chunk-IRRRZ2KE.cjs");
 var import_halo = require("@dxos/client/halo");
+var import_react_async = require("@dxos/react-async");
+var import_react_async2 = require("@dxos/react-async");
 var import_react = require("react");
+var import_react_async3 = require("@dxos/react-async");
+var import_react_async4 = require("@dxos/react-async");
 var import_react2 = require("react");
-var import_react3 = require("react");
-var import_react_async = require("@dxos/react-async");
-var import_react4 = require("react");
 var useContacts = () => {
   const client = (0, import_chunk_IRRRZ2KE.useClient)();
-  const contacts = (0, import_react.useSyncExternalStore)((listener) => {
-    const subscription = client.halo.contacts.subscribe(listener);
-    return () => subscription.unsubscribe();
-  }, () => client.halo.contacts.get());
-  return contacts;
+  return (0, import_react_async.useMulticastObservable)(client.halo.contacts);
 };
 var useDevices = () => {
   const client = (0, import_chunk_IRRRZ2KE.useClient)();
-  const devices = (0, import_react2.useSyncExternalStore)((listener) => {
-    const subscription = client.halo.devices.subscribe(listener);
-    return () => subscription.unsubscribe();
-  }, () => client.halo.devices.get());
-  return devices;
+  return (0, import_react_async2.useMulticastObservable)(client.halo.devices);
 };
 var useHaloInvitations = () => {
   const client = (0, import_chunk_IRRRZ2KE.useClient)();
-  const invitations = (0, import_react3.useSyncExternalStore)((listener) => {
-    const subscription = client.halo.invitations.subscribe(() => listener());
-    return () => subscription.unsubscribe();
-  }, () => client.halo.opened ? client.halo.invitations.get() : []) ?? [];
-  return invitations;
+  return (0, import_react_async3.useMulticastObservable)(client.halo.invitations);
 };
 var useHaloInvitation = (invitationId) => {
   const invitations = useHaloInvitations();
-  const invitation = (0, import_react3.useMemo)(() => invitations.find((invitation2) => invitation2.get().invitationId === invitationId), [
+  const invitation = (0, import_react.useMemo)(() => invitations.find((invitation2) => invitation2.get().invitationId === invitationId), [
     invitations
   ]);
-  return (0, import_chunk_PNDYOCJA.useInvitationStatus)(invitation);
+  return (0, import_chunk_X5URYLUS.useInvitationStatus)(invitation);
 };
 var useIdentity = () => {
   const client = (0, import_chunk_IRRRZ2KE.useClient)();
-  return (0, import_react_async.useMulticastObservable)(client.halo.identity);
+  return (0, import_react_async4.useMulticastObservable)(client.halo.identity);
 };
 var KeyStore = class {
   constructor(_defaultKeys = []) {
@@ -99,8 +87,8 @@ var KeyStore = class {
   }
 };
 var useKeyStore = (defaultKeys = []) => {
-  const [, forceUpdate] = (0, import_react4.useReducer)((x) => x + 1, 0);
-  const store = (0, import_react4.useMemo)(() => new KeyStore(defaultKeys).initialize(), [
+  const [, forceUpdate] = (0, import_react2.useReducer)((x) => x + 1, 0);
+  const store = (0, import_react2.useMemo)(() => new KeyStore(defaultKeys).initialize(), [
     defaultKeys
   ]);
   const setKey = (key, value) => {
@@ -117,7 +105,6 @@ var useKeyStore = (defaultKeys = []) => {
   Device,
   DeviceKind,
   DeviceType,
-  HaloProxy,
   KeyStore,
   useContacts,
   useDevices,

package/dist/lib/node/halo/index.cjs.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.opened ? 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,kBASO;ACVP,mBAAqC;ACArC,IAAAA,gBAAqC;ACArC,IAAAA,gBAA8C;ACC9C,yBAAuC;ACDvC,IAAAA,gBAAoC;AJW7B,IAAMC,cAAc,MAAA;AACzB,QAAMC,aAASC,iCAAAA;AACf,QAAMC,eAAWC,mCACf,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;AChBO,IAAMQ,aAAa,MAAA;AACxB,QAAMV,aAASC,iCAAAA;AACf,QAAMU,cAAUR,cAAAA,sBACd,CAACC,aAAAA;AACC,UAAMC,eAAeL,OAAOM,KAAKK,QAAQJ,UAAUH,QAAAA;AACnD,WAAO,MAAMC,aAAaG,YAAW;EACvC,GACA,MAAMR,OAAOM,KAAKK,QAAQF,IAAG,CAAA;AAG/B,SAAOE;AACT;ACZO,IAAMC,qBAAqB,MAAA;AAChC,QAAMZ,aAASC,iCAAAA;AACf,QAAMY,kBACJV,cAAAA,sBACE,CAACC,aAAAA;AACC,UAAMC,eAAeL,OAAOM,KAAKO,YAAYN,UAAU,MAAMH,SAAAA,CAAAA;AAC7D,WAAO,MAAMC,aAAaG,YAAW;EACvC,GACA,MAAOR,OAAOM,KAAKQ,SAASd,OAAOM,KAAKO,YAAYJ,IAAG,IAAK,CAAA,CAAE,KAC3D,CAAA;AAEP,SAAOI;AACT;AAEO,IAAME,oBAAoB,CAACC,iBAAAA;AAChC,QAAMH,cAAcD,mBAAAA;AACpB,QAAMK,iBAAaC,uBACjB,MAAML,YAAYM,KAAK,CAACF,gBAAeA,YAAWR,IAAG,EAAGO,iBAAiBA,YAAAA,GACzE;IAACH;GAAY;AAEf,aAAOO,2CAAoBH,UAAAA;AAC7B;ACjBO,IAAMI,cAAc,MAAA;AACzB,QAAMrB,aAASC,iCAAAA;AACf,aAAOqB,2CAAuBtB,OAAOM,KAAKiB,QAAQ;AACpD;ACTO,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,QAAeC,0BAAW,CAACC,MAAMA,IAAI,GAAG,CAAA;AACjD,QAAMC,YAAQ3B,cAAAA,SAAQ,MAAM,IAAIM,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": ["import_react", "useContacts", "client", "useClient", "contacts", "useSyncExternalStore", "listener", "subscription", "halo", "subscribe", "unsubscribe", "get", "useDevices", "devices", "useHaloInvitations", "invitations", "opened", "useHaloInvitation", "invitationId", "invitation", "useMemo", "find", "useInvitationStatus", "useIdentity", "useMulticastObservable", "identity", "KeyStore", "constructor", "_defaultKeys", "_keyMap", "Map", "map", "initialize", "forEach", "key", "value", "localStorage", "getItem", "setKey", "getKey", "setItem", "set", "useKeyStore", "defaultKeys", "forceUpdate", "useReducer", "x", "store"]
+  "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,kBAAuF;ACAvF,yBAAuC;ACAvC,IAAAA,sBAAuC;ACDvC,mBAAwB;AAExB,IAAAA,sBAAuC;ACDvC,IAAAA,sBAAuC;ACDvC,IAAAC,gBAAoC;AJU7B,IAAMC,cAAc,MAAA;AACzB,QAAMC,aAASC,iCAAAA;AACf,aAAOC,2CAAuBF,OAAOG,KAAKC,QAAQ;AACpD;ACRO,IAAMC,aAAa,MAAA;AACxB,QAAML,aAASC,iCAAAA;AACf,aAAOC,oBAAAA,wBAAuBF,OAAOG,KAAKG,OAAO;AACnD;ACDO,IAAMC,qBAAqB,MAAA;AAChC,QAAMP,aAASC,iCAAAA;AACf,aAAOC,oBAAAA,wBAAuBF,OAAOG,KAAKK,WAAW;AACvD;AAEO,IAAMC,oBAAoB,CAACC,iBAAAA;AAChC,QAAMF,cAAcD,mBAAAA;AACpB,QAAMI,iBAAaC,sBACjB,MAAMJ,YAAYK,KAAK,CAACF,gBAAeA,YAAWG,IAAG,EAAGJ,iBAAiBA,YAAAA,GACzE;IAACF;GAAY;AAEf,aAAOO,2CAAoBJ,UAAAA;AAC7B;ACVO,IAAMK,cAAc,MAAA;AACzB,QAAMhB,aAASC,iCAAAA;AACf,aAAOC,oBAAAA,wBAAuBF,OAAOG,KAAKc,QAAQ;AACpD;ACTO,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,QAAeC,0BAAW,CAACC,MAAMA,IAAI,GAAG,CAAA;AACjD,QAAMC,YAAQ3B,cAAAA,SAAQ,MAAM,IAAIM,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": ["import_react_async", "import_react", "useContacts", "client", "useClient", "useMulticastObservable", "halo", "contacts", "useDevices", "devices", "useHaloInvitations", "invitations", "useHaloInvitation", "invitationId", "invitation", "useMemo", "find", "get", "useInvitationStatus", "useIdentity", "identity", "KeyStore", "constructor", "_defaultKeys", "_keyMap", "Map", "map", "initialize", "forEach", "key", "value", "localStorage", "getItem", "setKey", "getKey", "setItem", "set", "useKeyStore", "defaultKeys", "forceUpdate", "useReducer", "x", "store"]
 }

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

@@ -18,15 +18,15 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var invitations_exports = {};
 __export(invitations_exports, {
-  AuthenticatingInvitationObservable: () => import_chunk_PNDYOCJA.AuthenticatingInvitationObservable,
-  CancellableInvitationObservable: () => import_chunk_PNDYOCJA.CancellableInvitationObservable,
-  Invitation: () => import_chunk_PNDYOCJA.Invitation,
-  InvitationEncoder: () => import_chunk_PNDYOCJA.InvitationEncoder,
-  InvitationsProxy: () => import_chunk_PNDYOCJA.InvitationsProxy,
-  useInvitationStatus: () => import_chunk_PNDYOCJA.useInvitationStatus
+  AuthenticatingInvitationObservable: () => import_chunk_X5URYLUS.AuthenticatingInvitationObservable,
+  CancellableInvitationObservable: () => import_chunk_X5URYLUS.CancellableInvitationObservable,
+  Invitation: () => import_chunk_X5URYLUS.Invitation,
+  InvitationEncoder: () => import_chunk_X5URYLUS.InvitationEncoder,
+  InvitationsProxy: () => import_chunk_X5URYLUS.InvitationsProxy,
+  useInvitationStatus: () => import_chunk_X5URYLUS.useInvitationStatus
 });
 module.exports = __toCommonJS(invitations_exports);
-var import_chunk_PNDYOCJA = require("../chunk-PNDYOCJA.cjs");
+var import_chunk_X5URYLUS = require("../chunk-X5URYLUS.cjs");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AuthenticatingInvitationObservable,

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["index.cjs"],
-  "sourcesContent": ["import {\n  AuthenticatingInvitationObservable,\n  CancellableInvitationObservable,\n  Invitation,\n  InvitationEncoder,\n  InvitationsProxy,\n  useInvitationStatus\n} from \"../chunk-PNDYOCJA.cjs\";\nexport {\n  AuthenticatingInvitationObservable,\n  CancellableInvitationObservable,\n  Invitation,\n  InvitationEncoder,\n  InvitationsProxy,\n  useInvitationStatus\n};\n//# sourceMappingURL=index.cjs.map\n"],
+  "sourcesContent": ["import {\n  AuthenticatingInvitationObservable,\n  CancellableInvitationObservable,\n  Invitation,\n  InvitationEncoder,\n  InvitationsProxy,\n  useInvitationStatus\n} from \"../chunk-X5URYLUS.cjs\";\nexport {\n  AuthenticatingInvitationObservable,\n  CancellableInvitationObservable,\n  Invitation,\n  InvitationEncoder,\n  InvitationsProxy,\n  useInvitationStatus\n};\n//# sourceMappingURL=index.cjs.map\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAOO;",
   "names": []
 }

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

@@ -24,14 +24,10 @@ __export(mesh_exports, {
 module.exports = __toCommonJS(mesh_exports);
 var import_chunk_IRRRZ2KE = require("../chunk-IRRRZ2KE.cjs");
 __reExport(mesh_exports, require("@dxos/client/mesh"), module.exports);
-var import_react = require("react");
+var import_react_async = require("@dxos/react-async");
 var useNetworkStatus = () => {
   const client = (0, import_chunk_IRRRZ2KE.useClient)();
-  const networkStatus = (0, import_react.useSyncExternalStore)((listener) => {
-    const subscription = client.mesh.networkStatus.subscribe(listener);
-    return () => subscription.unsubscribe();
-  }, () => client.mesh.networkStatus.get());
-  return networkStatus;
+  return (0, import_react_async.useMulticastObservable)(client.mesh.networkStatus);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/lib/node/mesh/index.cjs.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,yBAAc;ACAd,mBAAqC;AAS9B,IAAMA,mBAAmB,MAAA;AAC9B,QAAMC,aAASC,iCAAAA;AACf,QAAMC,oBAAgBC,mCACpB,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": ["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,yBAAc;ACCd,yBAAuC;AAOhC,IAAMA,mBAAmB,MAAA;AAC9B,QAAMC,aAASC,iCAAAA;AACf,aAAOC,2CAAuBF,OAAOG,KAAKC,aAAa;AACzD;",
+  "names": ["useNetworkStatus", "client", "useClient", "useMulticastObservable", "mesh", "networkStatus"]
 }