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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. package/dist/lib/browser/{chunk-Y64VSVTU.mjs → chunk-BQ4BAP42.mjs} +4 -3
  2. package/dist/lib/browser/chunk-BQ4BAP42.mjs.map +7 -0
  3. package/dist/lib/browser/echo/index.mjs +28 -17
  4. package/dist/lib/browser/echo/index.mjs.map +3 -3
  5. package/dist/lib/browser/halo/index.mjs +11 -23
  6. package/dist/lib/browser/halo/index.mjs.map +3 -3
  7. package/dist/lib/browser/invitations/index.mjs +1 -1
  8. package/dist/lib/browser/mesh/index.mjs +2 -6
  9. package/dist/lib/browser/mesh/index.mjs.map +3 -3
  10. package/dist/lib/browser/meta.json +1 -1
  11. package/dist/lib/browser/testing/index.mjs +2 -2
  12. package/dist/lib/browser/testing/index.mjs.map +3 -3
  13. package/dist/lib/node/{chunk-PNDYOCJA.cjs → chunk-X5URYLUS.cjs} +7 -6
  14. package/dist/lib/node/chunk-X5URYLUS.cjs.map +7 -0
  15. package/dist/lib/node/echo/index.cjs +28 -17
  16. package/dist/lib/node/echo/index.cjs.map +3 -3
  17. package/dist/lib/node/halo/index.cjs +13 -26
  18. package/dist/lib/node/halo/index.cjs.map +3 -3
  19. package/dist/lib/node/invitations/index.cjs +7 -7
  20. package/dist/lib/node/invitations/index.cjs.map +1 -1
  21. package/dist/lib/node/mesh/index.cjs +2 -6
  22. package/dist/lib/node/mesh/index.cjs.map +3 -3
  23. package/dist/lib/node/meta.json +1 -1
  24. package/dist/lib/node/testing/index.cjs +2 -2
  25. package/dist/lib/node/testing/index.cjs.map +3 -3
  26. package/dist/types/src/echo/useQuery.d.ts +2 -2
  27. package/dist/types/src/echo/useQuery.d.ts.map +1 -1
  28. package/dist/types/src/echo/useSpaceInvitations.d.ts +2 -1
  29. package/dist/types/src/echo/useSpaceInvitations.d.ts.map +1 -1
  30. package/dist/types/src/halo/index.d.ts +1 -1
  31. package/dist/types/src/halo/index.d.ts.map +1 -1
  32. package/dist/types/src/halo/useContacts.d.ts.map +1 -1
  33. package/dist/types/src/halo/useDevices.d.ts.map +1 -1
  34. package/dist/types/src/halo/useHaloInvitations.d.ts +2 -1
  35. package/dist/types/src/halo/useHaloInvitations.d.ts.map +1 -1
  36. package/dist/types/src/invitations/useInvitationStatus.d.ts +1 -0
  37. package/dist/types/src/invitations/useInvitationStatus.d.ts.map +1 -1
  38. package/dist/types/src/mesh/useNetworkStatus.d.ts.map +1 -1
  39. package/dist/types/src/testing/ClientRepeater.d.ts +3 -3
  40. package/dist/types/src/testing/ClientRepeater.d.ts.map +1 -1
  41. package/package.json +33 -25
  42. package/src/echo/useQuery.ts +46 -15
  43. package/src/echo/useSpaceInvitations.ts +6 -18
  44. package/src/halo/index.ts +1 -10
  45. package/src/halo/useContacts.ts +2 -11
  46. package/src/halo/useDevices.ts +2 -11
  47. package/src/halo/useHaloInvitations.ts +6 -13
  48. package/src/invitations/useInvitationStatus.ts +3 -0
  49. package/src/mesh/useNetworkStatus.ts +2 -11
  50. package/src/testing/ClientRepeater.tsx +6 -8
  51. package/dist/lib/browser/chunk-Y64VSVTU.mjs.map +0 -7
  52. package/dist/lib/node/chunk-PNDYOCJA.cjs.map +0 -7
@@ -2,30 +2,18 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
- import { useMemo, useSyncExternalStore } from 'react';
5
+ import { useMemo } from 'react';
6
6
 
7
+ import { MulticastObservable } from '@dxos/async';
7
8
  import { type PublicKey } from '@dxos/client';
8
- import { SpaceProxy } from '@dxos/client/echo';
9
+ import { useMulticastObservable } from '@dxos/react-async';
9
10
 
10
11
  import { useSpace } from './useSpaces';
11
- import { useInvitationStatus } from '../invitations';
12
+ import { type CancellableInvitationObservable, useInvitationStatus } from '../invitations';
12
13
 
13
- export const useSpaceInvitations = (spaceKey?: PublicKey) => {
14
+ export const useSpaceInvitations = (spaceKey?: PublicKey): CancellableInvitationObservable[] => {
14
15
  const space = useSpace(spaceKey);
15
- const invitations =
16
- useSyncExternalStore(
17
- (listener) => {
18
- if (!(space instanceof SpaceProxy)) {
19
- return () => {};
20
- }
21
-
22
- const subscription = space.invitations.subscribe(() => listener());
23
- return () => subscription.unsubscribe();
24
- },
25
- () => space?.invitations.get(),
26
- ) ?? [];
27
-
28
- return invitations;
16
+ return useMulticastObservable(space?.invitations ?? MulticastObservable.empty()) ?? [];
29
17
  };
30
18
 
31
19
  export const useSpaceInvitation = (spaceKey?: PublicKey, invitationId?: string) => {
package/src/halo/index.ts CHANGED
@@ -3,16 +3,7 @@
3
3
  //
4
4
 
5
5
  // NOTE: Export * fails here.
6
- export {
7
- type Contact,
8
- Device,
9
- DeviceKind,
10
- DeviceType,
11
- type Identity,
12
- // generateSeedPhrase,
13
- type Halo,
14
- HaloProxy,
15
- } from '@dxos/client/halo';
6
+ export { type Contact, type Identity, type Halo, Device, DeviceKind, DeviceType } from '@dxos/client/halo';
16
7
 
17
8
  export * from './useContacts';
18
9
  export * from './useDevices';
@@ -2,9 +2,8 @@
2
2
  // Copyright 2020 DXOS.org
3
3
  //
4
4
 
5
- import { useSyncExternalStore } from 'react';
6
-
7
5
  import type { Contact } from '@dxos/client/halo';
6
+ import { useMulticastObservable } from '@dxos/react-async';
8
7
 
9
8
  import { useClient } from '../client';
10
9
 
@@ -15,13 +14,5 @@ import { useClient } from '../client';
15
14
  */
16
15
  export const useContacts = (): Contact[] => {
17
16
  const client = useClient();
18
- const contacts = useSyncExternalStore(
19
- (listener) => {
20
- const subscription = client.halo.contacts.subscribe(listener);
21
- return () => subscription.unsubscribe();
22
- },
23
- () => client.halo.contacts.get(),
24
- );
25
-
26
- return contacts;
17
+ return useMulticastObservable(client.halo.contacts);
27
18
  };
@@ -2,21 +2,12 @@
2
2
  // Copyright 2020 DXOS.org
3
3
  //
4
4
 
5
- import { useSyncExternalStore } from 'react';
6
-
7
5
  import type { Device } from '@dxos/client/halo';
6
+ import { useMulticastObservable } from '@dxos/react-async';
8
7
 
9
8
  import { useClient } from '../client';
10
9
 
11
10
  export const useDevices = (): Device[] => {
12
11
  const client = useClient();
13
- const devices = useSyncExternalStore(
14
- (listener) => {
15
- const subscription = client.halo.devices.subscribe(listener);
16
- return () => subscription.unsubscribe();
17
- },
18
- () => client.halo.devices.get(),
19
- );
20
-
21
- return devices;
12
+ return useMulticastObservable(client.halo.devices);
22
13
  };
@@ -2,23 +2,16 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
- import { useMemo, useSyncExternalStore } from 'react';
5
+ import { useMemo } from 'react';
6
+
7
+ import { useMulticastObservable } from '@dxos/react-async';
6
8
 
7
9
  import { useClient } from '../client';
8
- import { useInvitationStatus } from '../invitations';
10
+ import { useInvitationStatus, type CancellableInvitationObservable } from '../invitations';
9
11
 
10
- export const useHaloInvitations = () => {
12
+ export const useHaloInvitations = (): CancellableInvitationObservable[] => {
11
13
  const client = useClient();
12
- const invitations =
13
- useSyncExternalStore(
14
- (listener) => {
15
- const subscription = client.halo.invitations.subscribe(() => listener());
16
- return () => subscription.unsubscribe();
17
- },
18
- () => (client.halo.opened ? client.halo.invitations.get() : []),
19
- ) ?? [];
20
-
21
- return invitations;
14
+ return useMulticastObservable(client.halo.invitations);
22
15
  };
23
16
 
24
17
  export const useHaloInvitation = (invitationId?: string) => {
@@ -29,6 +29,7 @@ interface InvitationReducerState {
29
29
  id?: string;
30
30
  invitationCode?: string;
31
31
  authCode?: string;
32
+ multiUse?: boolean;
32
33
  }
33
34
 
34
35
  export type InvitationAction =
@@ -65,6 +66,7 @@ export type InvitationStatus = {
65
66
  type?: Invitation.Type;
66
67
  status: Invitation.State;
67
68
  haltedAt?: Invitation.State;
69
+ multiUse?: boolean;
68
70
  result: InvitationResult;
69
71
  error?: number;
70
72
  cancel(): void;
@@ -179,6 +181,7 @@ export const useInvitationStatus = (initialObservable?: CancellableInvitationObs
179
181
  connect,
180
182
  authenticate,
181
183
  id: invitation?.invitationId,
184
+ multiUse: invitation?.multiUse,
182
185
  invitationCode: invitation ? InvitationEncoder.encode(invitation) : undefined,
183
186
  authCode: invitation?.authCode,
184
187
  authMethod: invitation?.authMethod,
@@ -2,9 +2,8 @@
2
2
  // Copyright 2020 DXOS.org
3
3
  //
4
4
 
5
- import { useSyncExternalStore } from 'react';
6
-
7
5
  import { type NetworkStatus } from '@dxos/client/mesh';
6
+ import { useMulticastObservable } from '@dxos/react-async';
8
7
 
9
8
  import { useClient } from '../client';
10
9
 
@@ -13,13 +12,5 @@ import { useClient } from '../client';
13
12
  */
14
13
  export const useNetworkStatus = (): NetworkStatus => {
15
14
  const client = useClient();
16
- const networkStatus = useSyncExternalStore(
17
- (listener) => {
18
- const subscription = client.mesh.networkStatus.subscribe(listener);
19
- return () => subscription.unsubscribe();
20
- },
21
- () => client.mesh.networkStatus.get(),
22
- );
23
-
24
- return networkStatus;
15
+ return useMulticastObservable(client.mesh.networkStatus);
25
16
  };
@@ -5,7 +5,7 @@
5
5
  import React, { useState, type FC, useEffect } from 'react';
6
6
 
7
7
  import { Client, type PublicKey } from '@dxos/client';
8
- import { type SpaceProxy, type Space, type TypeCollection } from '@dxos/client/echo';
8
+ import { type Space } from '@dxos/client/echo';
9
9
  import { TestBuilder, performInvitation } from '@dxos/client/testing';
10
10
  import { registerSignalFactory } from '@dxos/echo-signals/react';
11
11
  import { faker } from '@dxos/random';
@@ -19,12 +19,12 @@ export type RepeatedComponentProps = { id: number; count: number };
19
19
 
20
20
  export type ClientRepeaterProps<P extends RepeatedComponentProps> = {
21
21
  component: FC<any>;
22
+ className?: string;
22
23
  controls?: FC<{ clients: Client[] }>;
23
24
  clients?: Client[];
24
25
  count?: number;
25
26
  registerSignalFactory?: boolean;
26
- className?: string;
27
- types?: TypeCollection;
27
+ schema?: Parameters<Client['addSchema']>;
28
28
  createIdentity?: boolean;
29
29
  createSpace?: boolean;
30
30
  onCreateSpace?: (space: Space) => MaybePromise<void>;
@@ -46,7 +46,7 @@ export const ClientRepeater = <P extends RepeatedComponentProps>(props: ClientRe
46
46
  controls: Controls,
47
47
  count = 1,
48
48
  className = 'flex w-full place-content-evenly',
49
- types,
49
+ schema,
50
50
  createIdentity,
51
51
  createSpace,
52
52
  onCreateSpace,
@@ -62,7 +62,7 @@ export const ClientRepeater = <P extends RepeatedComponentProps>(props: ClientRe
62
62
  const timeout = setTimeout(async () => {
63
63
  const clients = [...Array(count)].map((_) => new Client({ services: testBuilder.createLocal() }));
64
64
  await Promise.all(clients.map((client) => client.initialize()));
65
- types && clients.map((client) => client.spaces.addSchema(types));
65
+ schema && clients.map((client) => client.addSchema(...schema));
66
66
 
67
67
  if (createIdentity || createSpace) {
68
68
  await Promise.all(clients.map((client) => client.halo.createIdentity()));
@@ -72,9 +72,7 @@ export const ClientRepeater = <P extends RepeatedComponentProps>(props: ClientRe
72
72
  const space = await clients[0].spaces.create({ name: faker.commerce.productName() });
73
73
  setSpaceKey(space.key);
74
74
  await onCreateSpace?.(space);
75
- await Promise.all(
76
- clients.slice(1).map((client) => performInvitation({ host: space as SpaceProxy, guest: client.spaces })),
77
- );
75
+ await Promise.all(clients.slice(1).map((client) => performInvitation({ host: space, guest: client.spaces })));
78
76
  }
79
77
 
80
78
  setClients(clients);
@@ -1,7 +0,0 @@
1
- {
2
- "version": 3,
3
- "sources": ["../../../src/invitations/index.ts", "../../../src/invitations/useInvitationStatus.ts"],
4
- "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}\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 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 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"],
5
- "mappings": "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",
6
- "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", "invitationCode", "encode", "undefined", "authMethod", "type"]
7
- }
@@ -1,7 +0,0 @@
1
- {
2
- "version": 3,
3
- "sources": ["../../../src/invitations/index.ts", "../../../src/invitations/useInvitationStatus.ts"],
4
- "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}\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 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 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"],
5
- "mappings": "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",
6
- "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", "invitationCode", "InvitationEncoder", "encode", "undefined", "authMethod", "type"]
7
- }