@dxos/react-client 0.8.4-main.ef1bc66f44 → 0.8.4-main.f466a3d56e
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.
- package/.storybook/main.mts +1 -3
- package/LICENSE +102 -5
- package/README.md +1 -1
- package/dist/lib/browser/{chunk-PFF63FPR.mjs → chunk-3LVU7RNK.mjs} +2 -2
- package/dist/lib/browser/{chunk-TSF6Y5VB.mjs → chunk-CZMIVAGI.mjs} +1 -1
- package/dist/lib/browser/{chunk-TSF6Y5VB.mjs.map → chunk-CZMIVAGI.mjs.map} +2 -2
- package/dist/lib/browser/{chunk-5UKA2BMA.mjs → chunk-XT352YI6.mjs} +11 -56
- package/dist/lib/browser/chunk-XT352YI6.mjs.map +7 -0
- package/dist/lib/browser/{chunk-LO3TU5CK.mjs → chunk-YHE6WD44.mjs} +3 -13
- package/dist/lib/browser/{chunk-LO3TU5CK.mjs.map → chunk-YHE6WD44.mjs.map} +2 -2
- package/dist/lib/browser/devtools/index.mjs +3 -8
- package/dist/lib/browser/devtools/index.mjs.map +2 -2
- package/dist/lib/browser/echo/index.mjs +26 -97
- package/dist/lib/browser/echo/index.mjs.map +4 -4
- package/dist/lib/browser/halo/index.mjs +3 -3
- package/dist/lib/browser/halo/index.mjs.map +2 -2
- package/dist/lib/browser/index.mjs +6 -21
- package/dist/lib/browser/index.mjs.map +2 -2
- package/dist/lib/browser/invitations/index.mjs +1 -1
- package/dist/lib/browser/mesh/index.mjs +2 -2
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/testing/index.mjs +15 -64
- package/dist/lib/browser/testing/index.mjs.map +3 -3
- package/dist/lib/node-esm/{chunk-NETTSER2.mjs → chunk-CUDKNAMV.mjs} +2 -2
- package/dist/lib/node-esm/{chunk-AQJH2UNZ.mjs → chunk-RQJPEHDY.mjs} +3 -13
- package/dist/lib/node-esm/{chunk-AQJH2UNZ.mjs.map → chunk-RQJPEHDY.mjs.map} +2 -2
- package/dist/lib/node-esm/{chunk-T3QTQHBD.mjs → chunk-WL3Z5HOH.mjs} +11 -56
- package/dist/lib/node-esm/chunk-WL3Z5HOH.mjs.map +7 -0
- package/dist/lib/node-esm/{chunk-373DPHEQ.mjs → chunk-WUTK2IJF.mjs} +1 -1
- package/dist/lib/node-esm/{chunk-373DPHEQ.mjs.map → chunk-WUTK2IJF.mjs.map} +2 -2
- package/dist/lib/node-esm/devtools/index.mjs +3 -8
- package/dist/lib/node-esm/devtools/index.mjs.map +2 -2
- package/dist/lib/node-esm/echo/index.mjs +26 -97
- package/dist/lib/node-esm/echo/index.mjs.map +4 -4
- package/dist/lib/node-esm/halo/index.mjs +3 -3
- package/dist/lib/node-esm/halo/index.mjs.map +2 -2
- package/dist/lib/node-esm/index.mjs +6 -21
- package/dist/lib/node-esm/index.mjs.map +2 -2
- package/dist/lib/node-esm/invitations/index.mjs +1 -1
- package/dist/lib/node-esm/mesh/index.mjs +2 -2
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/testing/index.mjs +15 -64
- package/dist/lib/node-esm/testing/index.mjs.map +3 -3
- package/dist/types/src/banner.d.ts.map +1 -1
- package/dist/types/src/client/AgentHostingProvider.d.ts.map +1 -1
- package/dist/types/src/client/ClientProvider.d.ts +1 -1
- package/dist/types/src/client/ClientProvider.d.ts.map +1 -1
- package/dist/types/src/client/useClientStatus.d.ts.map +1 -1
- package/dist/types/src/devtools/useStream.d.ts.map +1 -1
- package/dist/types/src/echo/index.d.ts +0 -1
- package/dist/types/src/echo/index.d.ts.map +1 -1
- package/dist/types/src/echo/useMembers.d.ts.map +1 -1
- package/dist/types/src/echo/useSpaceInvitations.d.ts +1 -1
- package/dist/types/src/echo/useSpaceInvitations.d.ts.map +1 -1
- package/dist/types/src/echo/useSpaceProperties.d.ts.map +1 -1
- package/dist/types/src/echo/useSpaces.d.ts +9 -7
- package/dist/types/src/echo/useSpaces.d.ts.map +1 -1
- package/dist/types/src/echo/useSubscription.d.ts.map +1 -1
- package/dist/types/src/echo/useSyncState.d.ts.map +1 -1
- package/dist/types/src/halo/Passkey.stories.d.ts.map +1 -1
- package/dist/types/src/halo/useHaloInvitations.d.ts.map +1 -1
- package/dist/types/src/halo/useKeyStore.d.ts.map +1 -1
- package/dist/types/src/invitations/useInvitationStatus.d.ts.map +1 -1
- package/dist/types/src/testing/ClientRepeater.d.ts +2 -2
- package/dist/types/src/testing/ClientRepeater.d.ts.map +1 -1
- package/dist/types/src/testing/ClientRepeater.stories.d.ts.map +1 -1
- package/dist/types/src/testing/context.d.ts +2 -1
- package/dist/types/src/testing/context.d.ts.map +1 -1
- package/dist/types/src/testing/util.d.ts.map +1 -1
- package/dist/types/src/testing/withClientProvider.d.ts.map +1 -1
- package/dist/types/src/testing/withClientProvider.stories.d.ts +1 -1
- package/dist/types/src/testing/withClientProvider.stories.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/docs/README.md +38 -38
- package/moon.yml +1 -4
- package/package.json +27 -51
- package/src/client/ClientProvider.test.tsx +0 -1
- package/src/client/ClientProvider.tsx +0 -1
- package/src/client/useConfig.test.tsx +0 -1
- package/src/echo/index.ts +0 -1
- package/src/echo/useSpaceInvitations.ts +1 -2
- package/src/echo/useSpaces.test.tsx +6 -13
- package/src/echo/useSpaces.ts +17 -31
- package/src/echo/useSyncState.ts +1 -5
- package/src/halo/Passkey.stories.tsx +4 -7
- package/src/halo/useDevices.test.tsx +0 -1
- package/src/testing/ClientRepeater.stories.tsx +4 -7
- package/src/testing/ClientRepeater.tsx +4 -5
- package/src/testing/context.tsx +2 -1
- package/src/testing/util.tsx +0 -1
- package/src/testing/withClientProvider.stories.tsx +6 -8
- package/src/testing/withClientProvider.tsx +6 -39
- package/tsconfig.json +6 -0
- package/typedoc.json +1 -1
- package/vitest.config.ts +0 -2
- package/.swc/plugins/linux_x86_64_19.0.0/727453fb3a62f7f1d952a41e051ca8a6f88cadc45cee43c6a4d1aa45f9b75665.wasmer-v7 +0 -0
- package/dist/lib/browser/chunk-5UKA2BMA.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-T3QTQHBD.mjs.map +0 -7
- package/dist/types/src/echo/useQueue.d.ts +0 -11
- package/dist/types/src/echo/useQueue.d.ts.map +0 -1
- package/src/echo/useQueue.ts +0 -74
- /package/dist/lib/browser/{chunk-PFF63FPR.mjs.map → chunk-3LVU7RNK.mjs.map} +0 -0
- /package/dist/lib/node-esm/{chunk-NETTSER2.mjs.map → chunk-CUDKNAMV.mjs.map} +0 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
ClientProvider
|
|
3
|
-
} from "../chunk-
|
|
4
|
-
import "../chunk-
|
|
3
|
+
} from "../chunk-XT352YI6.mjs";
|
|
4
|
+
import "../chunk-CZMIVAGI.mjs";
|
|
5
5
|
|
|
6
6
|
// src/testing/index.ts
|
|
7
7
|
export * from "@dxos/client/testing";
|
|
@@ -18,7 +18,7 @@ var useClientStory = () => {
|
|
|
18
18
|
import React, { useRef, useState } from "react";
|
|
19
19
|
import { Client } from "@dxos/client";
|
|
20
20
|
import { TestBuilder, performInvitation } from "@dxos/client/testing";
|
|
21
|
-
import {
|
|
21
|
+
import { random } from "@dxos/random";
|
|
22
22
|
import { useAsyncEffect } from "@dxos/react-hooks";
|
|
23
23
|
var ClientRepeater = (props) => {
|
|
24
24
|
const { component: Component, controls: Controls, count = 1, types, createIdentity, createSpace, onCreateSpace } = props;
|
|
@@ -39,7 +39,7 @@ var ClientRepeater = (props) => {
|
|
|
39
39
|
if (createSpace) {
|
|
40
40
|
const client = clients2[0];
|
|
41
41
|
const space = await client.spaces.create({
|
|
42
|
-
name:
|
|
42
|
+
name: random.commerce.productName()
|
|
43
43
|
});
|
|
44
44
|
setSpaceId(space.id);
|
|
45
45
|
await onCreateSpace?.({
|
|
@@ -70,19 +70,17 @@ var ClientRepeater = (props) => {
|
|
|
70
70
|
};
|
|
71
71
|
|
|
72
72
|
// src/testing/withClientProvider.tsx
|
|
73
|
-
import React2, { useCallback,
|
|
74
|
-
import { ErrorBoundary as NaturalErrorBoundary } from "react-error-boundary";
|
|
73
|
+
import React2, { useCallback, useMemo, useRef as useRef2, useState as useState2 } from "react";
|
|
75
74
|
import { Trigger } from "@dxos/async";
|
|
76
75
|
import { TestBuilder as TestBuilder2, performInvitation as performInvitation2 } from "@dxos/client/testing";
|
|
77
76
|
import { log } from "@dxos/log";
|
|
77
|
+
import { ErrorBoundary } from "@dxos/react-ui";
|
|
78
78
|
var __dxlog_file = "/__w/dxos/dxos/packages/sdk/react-client/src/testing/withClientProvider.tsx";
|
|
79
79
|
var initializeClient = async (client, { createIdentity, createSpace, onCreateIdentity, onCreateSpace, onInitialized }, context) => {
|
|
80
80
|
await onInitialized?.(client);
|
|
81
81
|
if (createIdentity || createSpace) {
|
|
82
82
|
if (!client.halo.identity.get()) {
|
|
83
83
|
await client.halo.createIdentity();
|
|
84
|
-
await client.spaces.waitUntilReady();
|
|
85
|
-
await client.spaces.default.waitUntilReady();
|
|
86
84
|
await onCreateIdentity?.({
|
|
87
85
|
client
|
|
88
86
|
}, context);
|
|
@@ -117,7 +115,9 @@ var withClientProvider = ({ createIdentity, createSpace, onCreateSpace, onCreate
|
|
|
117
115
|
}, context);
|
|
118
116
|
setData(data2);
|
|
119
117
|
};
|
|
120
|
-
return /* @__PURE__ */ React2.createElement(ErrorBoundary,
|
|
118
|
+
return /* @__PURE__ */ React2.createElement(ErrorBoundary, {
|
|
119
|
+
name: "client-provider"
|
|
120
|
+
}, /* @__PURE__ */ React2.createElement(ClientProvider, {
|
|
121
121
|
onInitialized: handleInitialized,
|
|
122
122
|
...props
|
|
123
123
|
}, /* @__PURE__ */ React2.createElement(ClientStory.Provider, {
|
|
@@ -153,12 +153,7 @@ var withMultiClientProvider = ({ numClients = 2, createIdentity, createSpace, on
|
|
|
153
153
|
log.info("inviting", {
|
|
154
154
|
index,
|
|
155
155
|
spaceId: space?.id
|
|
156
|
-
}, {
|
|
157
|
-
F: __dxlog_file,
|
|
158
|
-
L: 150,
|
|
159
|
-
S: void 0,
|
|
160
|
-
C: (f, a) => f(...a)
|
|
161
|
-
});
|
|
156
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 95, S: void 0 });
|
|
162
157
|
setSpaceId(space?.id);
|
|
163
158
|
spaceReady.current.wake(space);
|
|
164
159
|
} else {
|
|
@@ -168,23 +163,13 @@ var withMultiClientProvider = ({ numClients = 2, createIdentity, createSpace, on
|
|
|
168
163
|
}, context);
|
|
169
164
|
log.info("waiting", {
|
|
170
165
|
index
|
|
171
|
-
}, {
|
|
172
|
-
F: __dxlog_file,
|
|
173
|
-
L: 157,
|
|
174
|
-
S: void 0,
|
|
175
|
-
C: (f, a) => f(...a)
|
|
176
|
-
});
|
|
166
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 107, S: void 0 });
|
|
177
167
|
const space = await spaceReady.current.wait();
|
|
178
168
|
if (space) {
|
|
179
169
|
log.info("joining", {
|
|
180
170
|
index,
|
|
181
171
|
spaceId: space.id
|
|
182
|
-
}, {
|
|
183
|
-
F: __dxlog_file,
|
|
184
|
-
L: 160,
|
|
185
|
-
S: void 0,
|
|
186
|
-
C: (f, a) => f(...a)
|
|
187
|
-
});
|
|
172
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 112, S: void 0 });
|
|
188
173
|
await Promise.all(performInvitation2({
|
|
189
174
|
host: space,
|
|
190
175
|
guest: client.spaces
|
|
@@ -204,45 +189,11 @@ var withMultiClientProvider = ({ numClients = 2, createIdentity, createSpace, on
|
|
|
204
189
|
index,
|
|
205
190
|
spaceId
|
|
206
191
|
}
|
|
207
|
-
}, /* @__PURE__ */ React2.createElement(ErrorBoundary,
|
|
192
|
+
}, /* @__PURE__ */ React2.createElement(ErrorBoundary, {
|
|
193
|
+
name: "client-provider"
|
|
194
|
+
}, /* @__PURE__ */ React2.createElement(Story, null))))));
|
|
208
195
|
};
|
|
209
196
|
};
|
|
210
|
-
var ErrorBoundary = ({ children }) => {
|
|
211
|
-
const [error, setError] = useState2();
|
|
212
|
-
useEffect(() => {
|
|
213
|
-
const handleError = (event) => {
|
|
214
|
-
setError(event.reason);
|
|
215
|
-
};
|
|
216
|
-
window.addEventListener("unhandledrejection", handleError);
|
|
217
|
-
return () => window.removeEventListener("unhandledrejection", handleError);
|
|
218
|
-
}, []);
|
|
219
|
-
if (error) {
|
|
220
|
-
return /* @__PURE__ */ React2.createElement(ErrorFallback, {
|
|
221
|
-
error,
|
|
222
|
-
resetErrorBoundary: () => setError(void 0)
|
|
223
|
-
});
|
|
224
|
-
}
|
|
225
|
-
return /* @__PURE__ */ React2.createElement(NaturalErrorBoundary, {
|
|
226
|
-
FallbackComponent: ErrorFallback
|
|
227
|
-
}, children);
|
|
228
|
-
};
|
|
229
|
-
var ErrorFallback = ({ error }) => {
|
|
230
|
-
const { name, message, stack } = error instanceof Error ? error : {
|
|
231
|
-
name: "Error",
|
|
232
|
-
message: String(error),
|
|
233
|
-
stack: void 0
|
|
234
|
-
};
|
|
235
|
-
return /* @__PURE__ */ React2.createElement("div", {
|
|
236
|
-
role: "alert",
|
|
237
|
-
className: "flex flex-col p-4 gap-4 overflow-auto"
|
|
238
|
-
}, /* @__PURE__ */ React2.createElement("h1", {
|
|
239
|
-
className: "text-xl text-red-500"
|
|
240
|
-
}, name), /* @__PURE__ */ React2.createElement("div", {
|
|
241
|
-
className: "text-lg"
|
|
242
|
-
}, message), stack && /* @__PURE__ */ React2.createElement("pre", {
|
|
243
|
-
className: "whitespace-pre-wrap text-sm text-subdued"
|
|
244
|
-
}, stack));
|
|
245
|
-
};
|
|
246
197
|
export {
|
|
247
198
|
ClientRepeater,
|
|
248
199
|
ClientStory,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/testing/index.ts", "../../../../src/testing/context.tsx", "../../../../src/testing/ClientRepeater.tsx", "../../../../src/testing/withClientProvider.tsx"],
|
|
4
|
-
"sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nexport * from '@dxos/client/testing';\n\nexport * from './context';\nexport * from './ClientRepeater';\nexport * from './withClientProvider';\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { createContext, useContext } from 'react';\n\nimport { type Space, type SpaceId } from '@dxos/client/echo';\nimport { raise } from '@dxos/debug';\n\nexport type ClientStory = {\n index?: number;\n spaceId?: SpaceId;\n space?: Space;\n};\n\nexport const ClientStory = createContext<ClientStory | undefined>(undefined);\n\nexport const useClientStory = (): ClientStory => {\n return useContext(ClientStory) ?? raise(new Error('Missing ClientStory'));\n};\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport React, { type FC, useRef, useState } from 'react';\n\nimport { Client } from '@dxos/client';\nimport { TestBuilder, performInvitation } from '@dxos/client/testing';\nimport { type Type } from '@dxos/echo';\nimport { faker } from '@dxos/random';\nimport { useAsyncEffect } from '@dxos/react-hooks';\n\nimport { ClientProvider } from '../client';\nimport { type SpaceId } from '../echo';\n\nimport { type WithClientProviderProps } from './withClientProvider';\n\nexport type ClientRepeatedComponentProps = { id: number; count: number; spaceId?: SpaceId };\n\nexport type ClientRepeaterControlsProps = { clients: Client[] };\n\n// TODO(burdon): Reconcile with ClientProviderProps.\nexport type ClientRepeaterProps<P extends ClientRepeatedComponentProps> = {\n className?: string;\n component: FC<ClientRepeatedComponentProps>;\n controls?: FC<ClientRepeaterControlsProps>;\n count?: number;\n clients?: Client[];\n types?: Type.Obj.Any[];\n args?: Omit<P, 'id' | 'count'>;\n} & Pick<WithClientProviderProps, 'createIdentity' | 'createSpace' | 'onCreateSpace'>;\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 * @deprecated use `withClientProvider`.\n */\n// TODO(burdon): To discuss: evolve ClientRepeater with optional decorator that uses it.\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.\nexport const ClientRepeater = <P extends ClientRepeatedComponentProps>(props: ClientRepeaterProps<P>) => {\n const {\n component: Component,\n controls: Controls,\n count = 1,\n types,\n createIdentity,\n createSpace,\n onCreateSpace,\n } = props;\n\n const [clients, setClients] = useState(props.clients ?? []);\n const [spaceId, setSpaceId] = useState<SpaceId>();\n\n const testBuilder = useRef(new TestBuilder());\n useAsyncEffect(async () => {\n const clients = [...Array(count)].map(\n (_) => new Client({ services: testBuilder.current.createLocalClientServices(), types }),\n );\n\n await Promise.all(clients.map((client) => client.initialize()));\n if (createIdentity || createSpace) {\n await Promise.all(clients.map((client) => client.halo.createIdentity()));\n }\n\n if (createSpace) {\n const client = clients[0];\n const space = await client.spaces.create({ name: faker.commerce.productName() });\n setSpaceId(space.id);\n await onCreateSpace?.({ client, space }, {});\n await Promise.all(clients.slice(1).flatMap((client) => performInvitation({ host: space, guest: client.spaces })));\n }\n\n setClients(clients);\n }, []);\n\n if (clients.length === 0) {\n return null;\n }\n\n return (\n <>\n {Controls && <Controls clients={clients} />}\n {clients.map((client, index) => (\n <ClientProvider key={index} client={client}>\n <Component id={index} count={clients.length} spaceId={spaceId} {...{ ...props.args }} />\n </ClientProvider>\n ))}\n </>\n );\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Decorator, type StoryContext } from '@storybook/react';\nimport React, { type PropsWithChildren, useCallback, useEffect, useMemo, useRef, useState } from 'react';\nimport { type FallbackProps, ErrorBoundary as NaturalErrorBoundary } from 'react-error-boundary';\n\nimport { Trigger } from '@dxos/async';\nimport { type Client } from '@dxos/client';\nimport { type Space, type SpaceId } from '@dxos/client/echo';\nimport { TestBuilder, performInvitation } from '@dxos/client/testing';\nimport { log } from '@dxos/log';\nimport { type MaybePromise } from '@dxos/util';\n\nimport { ClientProvider, type ClientProviderProps } from '../client';\n\nimport { ClientStory } from './context';\n\ntype InitializeProps = {\n createIdentity?: boolean;\n createSpace?: boolean;\n onInitialized?: (client: Client) => MaybePromise<void>;\n onCreateIdentity?: (props: { client: Client }, context: StoryContext | any) => MaybePromise<void>;\n // NOTE: context must be untyped until ClientRepeater is removed.\n onCreateSpace?: (props: { client: Client; space: Space }, context: StoryContext | any) => MaybePromise<void>;\n};\n\n/**\n * Initialize client, identity and first space.\n */\nconst initializeClient = async (\n client: Client,\n { createIdentity, createSpace, onCreateIdentity, onCreateSpace, onInitialized }: InitializeProps,\n context: StoryContext,\n): Promise<ClientStory> => {\n await onInitialized?.(client);\n\n if (createIdentity || createSpace) {\n if (!client.halo.identity.get()) {\n await client.halo.createIdentity();\n await client.spaces.waitUntilReady();\n await client.spaces.default.waitUntilReady();\n await onCreateIdentity?.({ client }, context);\n }\n }\n\n let space: Space | undefined;\n if (createSpace) {\n space = await client.spaces.create({ name: 'Test Space' });\n await space.waitUntilReady(); // Is this required?\n await onCreateSpace?.({ client, space }, context);\n }\n\n return { space, spaceId: space?.id };\n};\n\nexport type WithClientProviderProps = InitializeProps & Omit<ClientProviderProps, 'onInitialized'>;\n\n/**\n * Decorator that provides the client context.\n */\nexport const withClientProvider = ({\n createIdentity,\n createSpace,\n onCreateSpace,\n onCreateIdentity,\n onInitialized,\n ...props\n}: WithClientProviderProps = {}): Decorator => {\n return (Story, context) => {\n const [data, setData] = useState<ClientStory>({});\n const handleInitialized = async (client: Client) => {\n const data = await initializeClient(\n client,\n {\n createIdentity,\n createSpace,\n onCreateSpace,\n onCreateIdentity,\n onInitialized,\n },\n context,\n );\n\n setData(data);\n };\n\n return (\n <ErrorBoundary>\n <ClientProvider onInitialized={handleInitialized} {...props}>\n <ClientStory.Provider value={data}>\n <Story />\n </ClientStory.Provider>\n </ClientProvider>\n </ErrorBoundary>\n );\n };\n};\n\n// TODO(burdon): Implement context per client for context.\n// TODO(burdon): Callback once all invitations have completed.\n// TODO(burdon): Delay/jitter for creation of other clients.\nexport type WithMultiClientProviderProps = InitializeProps &\n Omit<ClientProviderProps, 'onInitialized'> & { numClients?: number };\n\n/**\n * Decorator that creates a scaffold for multiple clients.\n * Orchestrates invitations between a randomly selected host and the remaining clients.\n */\nexport const withMultiClientProvider = ({\n numClients = 2,\n createIdentity,\n createSpace,\n onCreateSpace,\n onCreateIdentity,\n onInitialized,\n ...props\n}: WithMultiClientProviderProps): Decorator => {\n return (Story, context) => {\n const spaceReady = useRef(new Trigger<Space | undefined>());\n const [spaceId, setSpaceId] = useState<SpaceId>();\n\n const clients = useMemo(() => {\n const buidler = new TestBuilder();\n return Array.from({ length: numClients }).map(() => {\n return {\n services: buidler.createLocalClientServices(),\n };\n });\n }, [numClients]);\n\n // Handle invitations.\n // NOTE: The zeroth client isn't necessarily the first to be initialized.\n const handleInitialized = useCallback(async (client: Client, index: number) => {\n if (index === 0) {\n // Initialize host.\n const { space } = await initializeClient(\n client,\n {\n createIdentity,\n createSpace,\n onCreateSpace,\n onCreateIdentity,\n onInitialized,\n },\n context,\n );\n\n log.info('inviting', { index, spaceId: space?.id });\n setSpaceId(space?.id);\n spaceReady.current.wake(space);\n } else {\n // Initialize guest.\n await initializeClient(client, { createIdentity, onInitialized }, context);\n\n log.info('waiting', { index });\n const space = await spaceReady.current.wait();\n if (space) {\n log.info('joining', { index, spaceId: space.id });\n await Promise.all(\n performInvitation({\n host: space,\n guest: client.spaces,\n }),\n );\n }\n }\n }, []);\n\n return (\n <div className='absolute inset-0 grid grid-flow-col auto-cols-fr gap-4 overflow-hidden'>\n {clients.map((client, index) => (\n <ClientProvider\n key={index}\n services={client.services}\n onInitialized={(client) => handleInitialized(client, index)}\n {...props}\n >\n <ClientStory.Provider value={{ index, spaceId }}>\n <ErrorBoundary>\n <Story />\n </ErrorBoundary>\n </ClientStory.Provider>\n </ClientProvider>\n ))}\n </div>\n );\n };\n};\n\nconst ErrorBoundary = ({ children }: PropsWithChildren) => {\n const [error, setError] = useState<Error>();\n useEffect(() => {\n const handleError = (event: PromiseRejectionEvent) => {\n setError(event.reason);\n };\n\n window.addEventListener('unhandledrejection', handleError);\n return () => window.removeEventListener('unhandledrejection', handleError);\n }, []);\n\n if (error) {\n return <ErrorFallback error={error} resetErrorBoundary={() => setError(undefined)} />;\n }\n\n return <NaturalErrorBoundary FallbackComponent={ErrorFallback}>{children}</NaturalErrorBoundary>;\n};\n\nconst ErrorFallback = ({ error }: FallbackProps) => {\n const { name, message, stack } =\n error instanceof Error ? error : { name: 'Error', message: String(error), stack: undefined };\n\n return (\n <div role='alert' className='flex flex-col p-4 gap-4 overflow-auto'>\n <h1 className='text-xl text-red-500'>{name}</h1>\n <div className='text-lg'>{message}</div>\n {stack && <pre className='whitespace-pre-wrap text-sm text-subdued'>{stack}</pre>}\n </div>\n );\n};\n"],
|
|
5
|
-
"mappings": ";;;;;;AAIA,cAAc;;;ACAd,SAASA,eAAeC,kBAAkB;AAG1C,SAASC,aAAa;
|
|
6
|
-
"names": ["createContext", "useContext", "raise", "ClientStory", "
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nexport * from '@dxos/client/testing';\n\nexport * from './context';\nexport * from './ClientRepeater';\nexport * from './withClientProvider';\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { createContext, useContext } from 'react';\n\nimport { type Space } from '@dxos/client/echo';\nimport { raise } from '@dxos/debug';\nimport { type SpaceId } from '@dxos/keys';\n\nexport type ClientStory = {\n index?: number;\n spaceId?: SpaceId;\n space?: Space;\n};\n\nexport const ClientStory = createContext<ClientStory | undefined>(undefined);\n\nexport const useClientStory = (): ClientStory => {\n return useContext(ClientStory) ?? raise(new Error('Missing ClientStory'));\n};\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport React, { type FC, useRef, useState } from 'react';\n\nimport { Client } from '@dxos/client';\nimport { TestBuilder, performInvitation } from '@dxos/client/testing';\nimport { type Type } from '@dxos/echo';\nimport { type SpaceId } from '@dxos/keys';\nimport { random } from '@dxos/random';\nimport { useAsyncEffect } from '@dxos/react-hooks';\n\nimport { ClientProvider } from '../client';\nimport { type WithClientProviderProps } from './withClientProvider';\n\nexport type ClientRepeatedComponentProps = { id: number; count: number; spaceId?: SpaceId };\n\nexport type ClientRepeaterControlsProps = { clients: Client[] };\n\n// TODO(burdon): Reconcile with ClientProviderProps.\nexport type ClientRepeaterProps<P extends ClientRepeatedComponentProps> = {\n className?: string;\n component: FC<ClientRepeatedComponentProps>;\n controls?: FC<ClientRepeaterControlsProps>;\n count?: number;\n clients?: Client[];\n types?: Type.AnyObj[];\n args?: Omit<P, 'id' | 'count'>;\n} & Pick<WithClientProviderProps, 'createIdentity' | 'createSpace' | 'onCreateSpace'>;\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 * @deprecated use `withClientProvider`.\n */\n// TODO(burdon): To discuss: evolve ClientRepeater with optional decorator that uses it.\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.\nexport const ClientRepeater = <P extends ClientRepeatedComponentProps>(props: ClientRepeaterProps<P>) => {\n const {\n component: Component,\n controls: Controls,\n count = 1,\n types,\n createIdentity,\n createSpace,\n onCreateSpace,\n } = props;\n\n const [clients, setClients] = useState(props.clients ?? []);\n const [spaceId, setSpaceId] = useState<SpaceId>();\n\n const testBuilder = useRef(new TestBuilder());\n useAsyncEffect(async () => {\n const clients = [...Array(count)].map(\n (_) => new Client({ services: testBuilder.current.createLocalClientServices(), types }),\n );\n\n await Promise.all(clients.map((client) => client.initialize()));\n if (createIdentity || createSpace) {\n await Promise.all(clients.map((client) => client.halo.createIdentity()));\n }\n\n if (createSpace) {\n const client = clients[0];\n const space = await client.spaces.create({ name: random.commerce.productName() });\n setSpaceId(space.id);\n await onCreateSpace?.({ client, space }, {});\n await Promise.all(clients.slice(1).flatMap((client) => performInvitation({ host: space, guest: client.spaces })));\n }\n\n setClients(clients);\n }, []);\n\n if (clients.length === 0) {\n return null;\n }\n\n return (\n <>\n {Controls && <Controls clients={clients} />}\n {clients.map((client, index) => (\n <ClientProvider key={index} client={client}>\n <Component id={index} count={clients.length} spaceId={spaceId} {...{ ...props.args }} />\n </ClientProvider>\n ))}\n </>\n );\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Decorator, type StoryContext } from '@storybook/react';\nimport React, { useCallback, useMemo, useRef, useState } from 'react';\n\nimport { Trigger } from '@dxos/async';\nimport { type Client } from '@dxos/client';\nimport { type Space } from '@dxos/client/echo';\nimport { TestBuilder, performInvitation } from '@dxos/client/testing';\nimport { type SpaceId } from '@dxos/keys';\nimport { log } from '@dxos/log';\nimport { ErrorBoundary } from '@dxos/react-ui';\nimport { type MaybePromise } from '@dxos/util';\n\nimport { ClientProvider, type ClientProviderProps } from '../client';\nimport { ClientStory } from './context';\n\ntype InitializeProps = {\n createIdentity?: boolean;\n createSpace?: boolean;\n onInitialized?: (client: Client) => MaybePromise<void>;\n onCreateIdentity?: (props: { client: Client }, context: StoryContext | any) => MaybePromise<void>;\n // NOTE: context must be untyped until ClientRepeater is removed.\n onCreateSpace?: (props: { client: Client; space: Space }, context: StoryContext | any) => MaybePromise<void>;\n};\n\n/**\n * Initialize client, identity and first space.\n */\nconst initializeClient = async (\n client: Client,\n { createIdentity, createSpace, onCreateIdentity, onCreateSpace, onInitialized }: InitializeProps,\n context: StoryContext,\n): Promise<ClientStory> => {\n await onInitialized?.(client);\n\n if (createIdentity || createSpace) {\n if (!client.halo.identity.get()) {\n await client.halo.createIdentity();\n await onCreateIdentity?.({ client }, context);\n }\n }\n\n let space: Space | undefined;\n if (createSpace) {\n space = await client.spaces.create({ name: 'Test Space' });\n await space.waitUntilReady(); // Is this required?\n await onCreateSpace?.({ client, space }, context);\n }\n\n return { space, spaceId: space?.id };\n};\n\nexport type WithClientProviderProps = InitializeProps & Omit<ClientProviderProps, 'onInitialized'>;\n\n/**\n * Decorator that provides the client context.\n */\nexport const withClientProvider = ({\n createIdentity,\n createSpace,\n onCreateSpace,\n onCreateIdentity,\n onInitialized,\n ...props\n}: WithClientProviderProps = {}): Decorator => {\n return (Story, context) => {\n const [data, setData] = useState<ClientStory>({});\n const handleInitialized = async (client: Client) => {\n const data = await initializeClient(\n client,\n {\n createIdentity,\n createSpace,\n onCreateSpace,\n onCreateIdentity,\n onInitialized,\n },\n context,\n );\n\n setData(data);\n };\n\n return (\n <ErrorBoundary name='client-provider'>\n <ClientProvider onInitialized={handleInitialized} {...props}>\n <ClientStory.Provider value={data}>\n <Story />\n </ClientStory.Provider>\n </ClientProvider>\n </ErrorBoundary>\n );\n };\n};\n\n// TODO(burdon): Implement context per client for context.\n// TODO(burdon): Callback once all invitations have completed.\n// TODO(burdon): Delay/jitter for creation of other clients.\nexport type WithMultiClientProviderProps = InitializeProps &\n Omit<ClientProviderProps, 'onInitialized'> & { numClients?: number };\n\n/**\n * Decorator that creates a scaffold for multiple clients.\n * Orchestrates invitations between a randomly selected host and the remaining clients.\n */\nexport const withMultiClientProvider = ({\n numClients = 2,\n createIdentity,\n createSpace,\n onCreateSpace,\n onCreateIdentity,\n onInitialized,\n ...props\n}: WithMultiClientProviderProps): Decorator => {\n return (Story, context) => {\n const spaceReady = useRef(new Trigger<Space | undefined>());\n const [spaceId, setSpaceId] = useState<SpaceId>();\n\n const clients = useMemo(() => {\n const buidler = new TestBuilder();\n return Array.from({ length: numClients }).map(() => {\n return {\n services: buidler.createLocalClientServices(),\n };\n });\n }, [numClients]);\n\n // Handle invitations.\n // NOTE: The zeroth client isn't necessarily the first to be initialized.\n const handleInitialized = useCallback(async (client: Client, index: number) => {\n if (index === 0) {\n // Initialize host.\n const { space } = await initializeClient(\n client,\n {\n createIdentity,\n createSpace,\n onCreateSpace,\n onCreateIdentity,\n onInitialized,\n },\n context,\n );\n\n log.info('inviting', { index, spaceId: space?.id });\n setSpaceId(space?.id);\n spaceReady.current.wake(space);\n } else {\n // Initialize guest.\n await initializeClient(client, { createIdentity, onInitialized }, context);\n\n log.info('waiting', { index });\n const space = await spaceReady.current.wait();\n if (space) {\n log.info('joining', { index, spaceId: space.id });\n await Promise.all(\n performInvitation({\n host: space,\n guest: client.spaces,\n }),\n );\n }\n }\n }, []);\n\n return (\n <div className='absolute inset-0 grid grid-flow-col auto-cols-fr gap-4 overflow-hidden'>\n {clients.map((client, index) => (\n <ClientProvider\n key={index}\n services={client.services}\n onInitialized={(client) => handleInitialized(client, index)}\n {...props}\n >\n <ClientStory.Provider value={{ index, spaceId }}>\n <ErrorBoundary name='client-provider'>\n <Story />\n </ErrorBoundary>\n </ClientStory.Provider>\n </ClientProvider>\n ))}\n </div>\n );\n };\n};\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["createContext", "useContext", "raise", "ClientStory", "undefined", "useClientStory", "Error", "React", "useRef", "useState", "Client", "TestBuilder", "performInvitation", "random", "useAsyncEffect", "ClientRepeater", "props", "component", "Component", "controls", "Controls", "count", "types", "createIdentity", "createSpace", "onCreateSpace", "clients", "setClients", "useState", "spaceId", "setSpaceId", "testBuilder", "useRef", "TestBuilder", "useAsyncEffect", "Array", "map", "_", "Client", "services", "current", "createLocalClientServices", "Promise", "all", "client", "initialize", "halo", "space", "spaces", "create", "name", "random", "commerce", "productName", "id", "slice", "flatMap", "performInvitation", "host", "guest", "length", "index", "ClientProvider", "key", "args", "React", "useCallback", "useMemo", "useRef", "useState", "Trigger", "TestBuilder", "performInvitation", "log", "ErrorBoundary", "createIdentity", "createSpace", "identity", "halo", "onCreateIdentity", "client", "context", "space", "spaceId", "data", "useState", "handleInitialized", "initializeClient", "onCreateSpace", "onInitialized", "setData", "React", "ClientProvider", "value", "Story", "spaceReady", "Trigger", "setSpaceId", "clients", "useMemo", "buidler", "TestBuilder", "Array", "length", "numClients", "services", "info", "index", "id", "current", "log", "Promise", "performInvitation", "guest", "spaces", "className", "ClientStory", "Provider", "name"]
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
|
|
2
2
|
import {
|
|
3
3
|
ClientContext
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-WUTK2IJF.mjs";
|
|
5
5
|
|
|
6
6
|
// src/client/useClient.ts
|
|
7
7
|
import { useContext } from "react";
|
|
@@ -14,4 +14,4 @@ var useClient = () => {
|
|
|
14
14
|
export {
|
|
15
15
|
useClient
|
|
16
16
|
};
|
|
17
|
-
//# sourceMappingURL=chunk-
|
|
17
|
+
//# sourceMappingURL=chunk-CUDKNAMV.mjs.map
|
|
@@ -13,12 +13,7 @@ var useInvitationStatus = (observable) => {
|
|
|
13
13
|
const [state, dispatch] = useReducer((prev, action) => {
|
|
14
14
|
log("useInvitationStatus", {
|
|
15
15
|
action
|
|
16
|
-
}, {
|
|
17
|
-
F: __dxlog_file,
|
|
18
|
-
L: 91,
|
|
19
|
-
S: void 0,
|
|
20
|
-
C: (f, a) => f(...a)
|
|
21
|
-
});
|
|
16
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 12, S: void 0 });
|
|
22
17
|
const invitationProps = "invitation" in action ? {
|
|
23
18
|
id: action.invitation.invitationId,
|
|
24
19
|
multiUse: action.invitation.multiUse,
|
|
@@ -126,12 +121,7 @@ var useInvitationStatus = (observable) => {
|
|
|
126
121
|
const authenticate = useCallback((authCode) => {
|
|
127
122
|
log("authenticating...", {
|
|
128
123
|
authCode
|
|
129
|
-
}, {
|
|
130
|
-
F: __dxlog_file,
|
|
131
|
-
L: 196,
|
|
132
|
-
S: void 0,
|
|
133
|
-
C: (f, a) => f(...a)
|
|
134
|
-
});
|
|
124
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 125, S: void 0 });
|
|
135
125
|
return observable.authenticate(authCode);
|
|
136
126
|
}, [
|
|
137
127
|
observable
|
|
@@ -162,4 +152,4 @@ export {
|
|
|
162
152
|
Invitation2 as Invitation,
|
|
163
153
|
InvitationsProxy
|
|
164
154
|
};
|
|
165
|
-
//# sourceMappingURL=chunk-
|
|
155
|
+
//# sourceMappingURL=chunk-RQJPEHDY.mjs.map
|
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/invitations/index.ts", "../../../src/invitations/useInvitationStatus.ts"],
|
|
4
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 { useCallback, useEffect, useMemo, useReducer } 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?: Error;\n id?: string;\n multiUse?: boolean;\n shareable?: boolean;\n invitationCode?: string;\n authCode?: string;\n authMethod?: Invitation.AuthMethod;\n type?: Invitation.Type;\n}\n\ntype InvitationPayload = { invitation: Invitation };\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 } & InvitationPayload)\n | ({\n status: Invitation.State.CONNECTING;\n observable: CancellableInvitationObservable;\n } & InvitationPayload)\n | ({\n status: Invitation.State.SUCCESS;\n result: InvitationResult;\n } & InvitationPayload)\n | ({\n status: Invitation.State.CANCELLED | Invitation.State.TIMEOUT;\n haltedAt: Invitation.State;\n } & InvitationPayload)\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 shareable?: boolean;\n result: InvitationResult;\n error?: Error;\n cancel(): void;\n // TODO(wittjosiah): Remove?\n connect(observable: CancellableInvitationObservable): void;\n authenticate(authCode: string): Promise<void>;\n};\n\n// Without private key, the invitation code cannot be created.\n// These invitations are only available to be accepted but not shared.\nconst isShareableInvitation = (invitation: Invitation) =>\n invitation.authMethod !== Invitation.AuthMethod.KNOWN_PUBLIC_KEY || !!invitation.guestKeypair?.privateKey;\n\nexport const useInvitationStatus = (observable?: CancellableInvitationObservable): InvitationStatus => {\n const [state, dispatch] = useReducer(\n (prev: InvitationReducerState, action: InvitationAction): InvitationReducerState => {\n log('useInvitationStatus', { action });\n const invitationProps =\n 'invitation' in action\n ? {\n id: action.invitation.invitationId,\n multiUse: action.invitation.multiUse,\n invitationCode: InvitationEncoder.encode(action.invitation),\n authCode: action.invitation.authCode,\n authMethod: action.invitation.authMethod,\n shareable: isShareableInvitation(action.invitation),\n type: action.invitation.type,\n }\n : {};\n return {\n ...prev,\n ...invitationProps,\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 };\n },\n null,\n (_arg: null): InvitationReducerState => {\n const invitation = observable?.get();\n return {\n status: Invitation.State.INIT,\n result: { spaceKey: null, identityKey: null, swarmKey: null, target: null },\n id: invitation?.invitationId,\n multiUse: invitation?.multiUse,\n invitationCode: invitation ? InvitationEncoder.encode(invitation) : undefined,\n authCode: invitation?.authCode,\n authMethod: invitation?.authMethod,\n shareable: invitation ? isShareableInvitation(invitation) : false,\n type: invitation?.type,\n };\n },\n );\n\n // Handle unmount.\n\n useEffect(() => {\n const update = (invitation: Invitation) => {\n switch (invitation.state) {\n case Invitation.State.INIT:\n case Invitation.State.CONNECTED:\n case Invitation.State.READY_FOR_AUTHENTICATION:\n case Invitation.State.AUTHENTICATING: {\n dispatch({\n invitation,\n status: invitation.state,\n });\n break;\n }\n\n case Invitation.State.SUCCESS: {\n dispatch({\n invitation,\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({ invitation, status: invitation.state, haltedAt: state.status });\n break;\n }\n }\n };\n\n const subscription = observable?.subscribe(update, (err: Error) => {\n dispatch({ status: Invitation.State.ERROR, error: err, haltedAt: state.status });\n });\n\n const currentState = observable?.get();\n if (currentState) {\n update(currentState);\n }\n\n return () => subscription?.unsubscribe();\n }, [observable, state.status]);\n\n // Return memoized callbacks & values.\n\n const connect = useCallback((observable: CancellableInvitationObservable) => {\n dispatch({ invitation: observable.get(), status: Invitation.State.CONNECTING, observable });\n }, []);\n\n const authenticate = useCallback(\n (authCode: string) => {\n log('authenticating...', { authCode });\n return (observable as AuthenticatingInvitationObservable).authenticate(authCode);\n },\n [observable],\n );\n\n const cancel = useCallback(async () => observable?.cancel(), [observable]);\n\n return useMemo(() => {\n return {\n ...state,\n cancel,\n connect,\n authenticate,\n };\n }, [state, cancel, connect, authenticate]);\n};\n"],
|
|
5
|
-
"mappings": ";;;AAKA,SACEA,oCACAC,iCACAC,qBAAAA,oBACAC,cAAAA,aAEAC,wBACK;;;ACRP,SAASC,aAAaC,WAAWC,SAASC,kBAAkB;AAG5D,SAGEC,YACAC,yBACK;AACP,SAASC,WAAW
|
|
6
|
-
"names": ["AuthenticatingInvitationObservable", "CancellableInvitationObservable", "InvitationEncoder", "Invitation", "InvitationsProxy", "useCallback", "useEffect", "useMemo", "useReducer", "Invitation", "InvitationEncoder", "log", "
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["AuthenticatingInvitationObservable", "CancellableInvitationObservable", "InvitationEncoder", "Invitation", "InvitationsProxy", "useCallback", "useEffect", "useMemo", "useReducer", "Invitation", "InvitationEncoder", "log", "prev", "action", "invitationId", "multiUse", "invitation", "invitationCode", "authCode", "authMethod", "shareable", "isShareableInvitation", "type", "invitationProps", "status", "result", "INIT", "spaceKey", "identityKey", "swarmKey", "target", "State", "READY_FOR_AUTHENTICATION", "AUTHENTICATING", "dispatch", "haltedAt", "ERROR", "error", "update", "currentState", "subscription", "observable", "state", "cancel", "connect", "authenticate"]
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
|
|
2
2
|
import {
|
|
3
3
|
ClientContext
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-WUTK2IJF.mjs";
|
|
5
5
|
|
|
6
6
|
// src/client/ClientProvider.tsx
|
|
7
7
|
import React, { forwardRef, useEffect, useImperativeHandle, useState } from "react";
|
|
@@ -64,19 +64,9 @@ var ClientProvider = /* @__PURE__ */ forwardRef(({ children, config: configProp,
|
|
|
64
64
|
setError(err);
|
|
65
65
|
}
|
|
66
66
|
});
|
|
67
|
-
log("client ready", void 0, {
|
|
68
|
-
F: __dxlog_file,
|
|
69
|
-
L: 124,
|
|
70
|
-
S: void 0,
|
|
71
|
-
C: (f, a) => f(...a)
|
|
72
|
-
});
|
|
67
|
+
log("client ready", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 50, S: void 0 });
|
|
73
68
|
await onInitialized?.(client3);
|
|
74
|
-
log("initialization complete", void 0, {
|
|
75
|
-
F: __dxlog_file,
|
|
76
|
-
L: 126,
|
|
77
|
-
S: void 0,
|
|
78
|
-
C: (f, a) => f(...a)
|
|
79
|
-
});
|
|
69
|
+
log("initialization complete", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 52, S: void 0 });
|
|
80
70
|
}
|
|
81
71
|
setClient(client3);
|
|
82
72
|
if (!noBanner) {
|
|
@@ -92,66 +82,31 @@ var ClientProvider = /* @__PURE__ */ forwardRef(({ children, config: configProp,
|
|
|
92
82
|
const config = await getAsyncProviderValue(configProp);
|
|
93
83
|
log("resolved config", {
|
|
94
84
|
config
|
|
95
|
-
}, {
|
|
96
|
-
F: __dxlog_file,
|
|
97
|
-
L: 144,
|
|
98
|
-
S: void 0,
|
|
99
|
-
C: (f, a) => f(...a)
|
|
100
|
-
});
|
|
85
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 68, S: void 0 });
|
|
101
86
|
const services = await getAsyncProviderValue(servicesProp, config);
|
|
102
87
|
log("created services", {
|
|
103
88
|
services
|
|
104
|
-
}, {
|
|
105
|
-
F: __dxlog_file,
|
|
106
|
-
L: 146,
|
|
107
|
-
S: void 0,
|
|
108
|
-
C: (f, a) => f(...a)
|
|
109
|
-
});
|
|
89
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 72, S: void 0 });
|
|
110
90
|
client2 = new Client({
|
|
111
91
|
config,
|
|
112
92
|
services,
|
|
113
93
|
...options
|
|
114
94
|
});
|
|
115
|
-
log("created client", void 0, {
|
|
116
|
-
F: __dxlog_file,
|
|
117
|
-
L: 148,
|
|
118
|
-
S: void 0,
|
|
119
|
-
C: (f, a) => f(...a)
|
|
120
|
-
});
|
|
95
|
+
log("created client", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 80, S: void 0 });
|
|
121
96
|
await initialize(client2);
|
|
122
97
|
}
|
|
123
98
|
} catch (err) {
|
|
124
99
|
if (!disposed) {
|
|
125
|
-
log.catch(err, void 0, {
|
|
126
|
-
F: __dxlog_file,
|
|
127
|
-
L: 153,
|
|
128
|
-
S: void 0,
|
|
129
|
-
C: (f, a) => f(...a)
|
|
130
|
-
});
|
|
100
|
+
log.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 85, S: void 0 });
|
|
131
101
|
}
|
|
132
102
|
}
|
|
133
103
|
return () => {
|
|
134
|
-
log("clean up", void 0, {
|
|
135
|
-
F: __dxlog_file,
|
|
136
|
-
L: 158,
|
|
137
|
-
S: void 0,
|
|
138
|
-
C: (f, a) => f(...a)
|
|
139
|
-
});
|
|
104
|
+
log("clean up", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 89, S: void 0 });
|
|
140
105
|
disposed = true;
|
|
141
106
|
if (!clientProp) {
|
|
142
107
|
void client2?.destroy().then(() => {
|
|
143
|
-
log("destroyed", void 0, {
|
|
144
|
-
|
|
145
|
-
L: 165,
|
|
146
|
-
S: void 0,
|
|
147
|
-
C: (f, a) => f(...a)
|
|
148
|
-
});
|
|
149
|
-
}).catch((err) => log.catch(err, void 0, {
|
|
150
|
-
F: __dxlog_file,
|
|
151
|
-
L: 167,
|
|
152
|
-
S: void 0,
|
|
153
|
-
C: (f, a) => f(...a)
|
|
154
|
-
}));
|
|
108
|
+
log("destroyed", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 94, S: void 0 });
|
|
109
|
+
}).catch((err) => log.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 95, S: void 0 }));
|
|
155
110
|
}
|
|
156
111
|
};
|
|
157
112
|
}, [
|
|
@@ -177,4 +132,4 @@ var ClientProvider = /* @__PURE__ */ forwardRef(({ children, config: configProp,
|
|
|
177
132
|
export {
|
|
178
133
|
ClientProvider
|
|
179
134
|
};
|
|
180
|
-
//# sourceMappingURL=chunk-
|
|
135
|
+
//# sourceMappingURL=chunk-WL3Z5HOH.mjs.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/client/ClientProvider.tsx", "../../../src/banner.ts"],
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nimport React, {\n type FunctionComponent,\n type PropsWithChildren,\n forwardRef,\n useEffect,\n useImperativeHandle,\n useState,\n} from 'react';\n\nimport { Client, type ClientOptions, type ClientServicesProvider, SystemStatus } from '@dxos/client';\nimport { type Config } from '@dxos/config';\nimport { log } from '@dxos/log';\nimport { useAsyncEffect, useControlledState } from '@dxos/react-hooks';\nimport { type MaybePromise, type Provider, getAsyncProviderValue } from '@dxos/util';\n\nimport { printBanner } from '../banner';\nimport { ClientContext, type ClientContextProps } from './context';\n\n/**\n * Properties for the ClientProvider.\n */\nexport type ClientProviderProps = Omit<ClientOptions, 'config' | 'services'> &\n Pick<ClientContextProps, 'status'> &\n PropsWithChildren<{\n /**\n * Client object or async provider to enable to caller to do custom initialization.\n *\n * NOTE: For advanced use cases only.\n */\n client?: Client | Provider<Promise<Client>>;\n\n /**\n * Config object or async provider.\n *\n * NOTE: If a `client` is provided then `config` is ignored.\n */\n // TODO(burdon): Reconcile with ClientOptions.\n config?: Config | Provider<Promise<Config>>;\n\n /**\n * Callback to enable the caller to create a custom ClientServicesProvider.\n *\n * NOTE: If a `client` is provided then `services` is ignored.\n */\n // TODO(burdon): Reconcile with ClientOptions.\n services?: ClientServicesProvider | ((config?: Config) => MaybePromise<ClientServicesProvider>);\n\n /**\n * ReactNode to display until the client is available.\n */\n fallback?: FunctionComponent<Partial<ClientContextProps>>;\n\n /**\n * Skip the DXOS banner.\n */\n noBanner?: boolean;\n\n /**\n * Post initialization hook to enable to caller to do custom initialization.\n */\n onInitialized?: (client: Client) => MaybePromise<void>;\n }>;\n\n/**\n * Root component that provides the DXOS client instance to child components.\n * To be used with the `useClient` hook.\n */\nexport const ClientProvider = forwardRef<Client | undefined, ClientProviderProps>(\n (\n {\n children,\n config: configProp,\n client: clientProp,\n services: servicesProp,\n status: statusProp,\n fallback: Fallback = () => null,\n noBanner,\n onInitialized,\n ...options\n },\n forwardedRef,\n ) => {\n // The client is initialized asynchronously.\n // If an error occurs during initialization, it is caught and the state is set.\n // This allows the error to be thrown in the render method.\n // The assumption is that a client initialization error is fatal to the app.\n // This error will be caught by the nearest error boundary.\n const [error, setError] = useState();\n if (error) {\n throw error;\n }\n\n const [client, setClient] = useState(clientProp instanceof Client ? clientProp : undefined);\n\n // Provide external access.\n useImperativeHandle(forwardedRef, () => client, [client]);\n\n // Client status subscription.\n const [status, setStatus] = useControlledState(statusProp);\n useEffect(() => {\n if (!client) {\n return;\n }\n\n const subscription = client.status.subscribe((status) => setStatus(status));\n return () => subscription.unsubscribe();\n }, [client]);\n\n // Create and/or initialize client.\n useAsyncEffect(async () => {\n let disposed = false;\n const initialize = async (client: Client) => {\n if (!client.initialized) {\n await client.initialize().catch((err) => {\n if (!disposed) {\n setError(err);\n }\n });\n log('client ready');\n await onInitialized?.(client);\n log('initialization complete');\n }\n\n setClient(client);\n if (!noBanner) {\n printBanner(client);\n }\n };\n\n let client: Client;\n try {\n if (clientProp) {\n // Asynchronously request client.\n client = await getAsyncProviderValue(clientProp);\n await initialize(client);\n } else {\n // Asynchronously construct client (config may be undefined).\n const config = await getAsyncProviderValue(configProp);\n log('resolved config', { config });\n const services = await getAsyncProviderValue(servicesProp, config);\n log('created services', { services });\n client = new Client({ config, services, ...options });\n log('created client');\n await initialize(client);\n }\n } catch (err) {\n if (!disposed) {\n log.catch(err);\n }\n }\n\n return () => {\n log('clean up');\n disposed = true;\n // Only destroy if the client is not provided by the parent.\n if (!clientProp) {\n void client\n ?.destroy()\n .then(() => {\n log('destroyed');\n })\n .catch((err) => log.catch(err));\n }\n };\n }, [configProp, clientProp, servicesProp, noBanner]);\n\n if (!client?.initialized || status !== SystemStatus.ACTIVE) {\n return <Fallback client={client} status={status} />;\n }\n\n return <ClientContext.Provider value={{ client, status }}>{children}</ClientContext.Provider>;\n },\n);\n", "//\n// Copyright 2021 DXOS.org\n//\n\nimport { type Client } from '@dxos/client';\n\n// http://patorjk.com/software/taag/#p=testall&f=Patorjk-HeX&t=DXOS\nconst BANNER = (client: Client) => {\n const commitHash = client.config.get('runtime.app.build.commitHash');\n const hash = commitHash ? ` App Commit ${commitHash} \\n` : '';\n\n return (\n '\\n' +\n '_/\\\\/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\______/\\\\/\\\\/\\\\/\\\\/\\\\_\\n' +\n '_/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\__/\\\\/\\\\_________\\n' +\n '_/\\\\/\\\\____/\\\\/\\\\______/\\\\/\\\\______/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\___\\n' +\n '_/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\__________/\\\\/\\\\_\\n' +\n '_/\\\\/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\____/\\\\/\\\\/\\\\/\\\\/\\\\___\\n' +\n `\\n DXOS Client ${client.version} \\n${hash}`\n );\n};\n\nlet bannerPrinted = false;\n\nexport const printBanner = (client: Client) => {\n if (bannerPrinted || window.location.hostname === 'localhost') {\n return;\n }\n\n bannerPrinted = true;\n // eslint-disable-next-line no-console\n console.log(`%c${BANNER(client)}`, 'font-family: monospace;');\n};\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["React", "forwardRef", "useEffect", "useImperativeHandle", "useState", "Client", "SystemStatus", "log", "useAsyncEffect", "useControlledState", "getAsyncProviderValue", "BANNER", "client", "commitHash", "config", "get", "hash", "version", "bannerPrinted", "printBanner", "window", "location", "hostname", "console", "log", "error", "client", "useImperativeHandle", "forwardedRef", "status", "useAsyncEffect", "initialize", "catch", "setError", "err", "log", "setClient", "printBanner", "config", "services", "disposed", "clientProp", "configProp", "servicesProp", "noBanner", "children"]
|
|
7
|
+
}
|
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/client/context.ts"],
|
|
4
4
|
"sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nimport { type Context, createContext } from 'react';\n\nimport { type Client, type SystemStatus } from '@dxos/client';\n\nexport type ClientContextProps = {\n client: Client;\n status?: SystemStatus | null;\n};\n\n/**\n * @internal Use ClientProvider to create or initialize the Client.\n */\nexport const ClientContext: Context<ClientContextProps | undefined> = createContext<ClientContextProps | undefined>(\n undefined,\n);\n"],
|
|
5
|
-
"mappings": ";;;AAIA,SAAuBA,qBAAqB;AAYrC,IAAMC,
|
|
6
|
-
"names": ["createContext", "ClientContext", "
|
|
5
|
+
"mappings": ";;;AAIA,SAAuBA,qBAAqB;AAYrC,IAAMC,gBAAyDD,cACpEE,MAAAA;",
|
|
6
|
+
"names": ["createContext", "ClientContext", "undefined"]
|
|
7
7
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
|
|
2
2
|
import {
|
|
3
3
|
useClient
|
|
4
|
-
} from "../chunk-
|
|
5
|
-
import "../chunk-
|
|
4
|
+
} from "../chunk-CUDKNAMV.mjs";
|
|
5
|
+
import "../chunk-WUTK2IJF.mjs";
|
|
6
6
|
|
|
7
7
|
// src/devtools/index.ts
|
|
8
8
|
export * from "@dxos/client/devtools";
|
|
@@ -24,12 +24,7 @@ var useStream = (streamFactory, defaultValue, deps = []) => {
|
|
|
24
24
|
const stream = streamFactory();
|
|
25
25
|
stream.subscribe((response) => setValue(response), (err) => {
|
|
26
26
|
if (err) {
|
|
27
|
-
log.catch(err, void 0, {
|
|
28
|
-
F: __dxlog_file,
|
|
29
|
-
L: 21,
|
|
30
|
-
S: void 0,
|
|
31
|
-
C: (f, a) => f(...a)
|
|
32
|
-
});
|
|
27
|
+
log.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 14, S: void 0 });
|
|
33
28
|
}
|
|
34
29
|
});
|
|
35
30
|
return () => {
|
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/devtools/index.ts", "../../../../src/devtools/useDevtools.ts", "../../../../src/devtools/useStream.ts"],
|
|
4
4
|
"sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nexport * from '@dxos/client/devtools';\n\nexport * from './useDevtools';\nexport * from './useStream';\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport { type DevtoolsHost } from '@dxos/client/devtools';\nimport { raise } from '@dxos/debug';\n\nimport { useClient } from '../client';\n\nexport const useDevtools = (): DevtoolsHost => {\n const client = useClient();\n return client.services.services.DevtoolsHost ?? raise(new Error('DevtoolsHost not available.'));\n};\n", "//\n// Copyright 2021 DXOS.org\n//\n\nimport { type DependencyList, useEffect, useState } from 'react';\n\nimport { type Stream } from '@dxos/codec-protobuf/stream';\nimport { log } from '@dxos/log';\n\n/**\n * Subscribe to service API streams.\n */\nexport const useStream = <T>(streamFactory: () => Stream<T>, defaultValue: T, deps: DependencyList = []): T => {\n const [value, setValue] = useState<T | undefined>(defaultValue);\n useEffect(() => {\n const stream = streamFactory();\n stream.subscribe(\n (response: T) => setValue(response),\n (err) => {\n if (err) {\n log.catch(err);\n }\n },\n );\n\n return () => {\n void stream.close();\n };\n }, deps);\n\n return value ?? defaultValue;\n};\n"],
|
|
5
|
-
"mappings": ";;;;;;;AAIA,cAAc;;;ACCd,SAASA,aAAa;AAIf,IAAMC,cAAc,MAAA;AACzB,QAAMC,SAASC,UAAAA;AACf,SAAOD,OAAOE,SAASA,SAASC,gBAAgBC,MAAM,IAAIC,MAAM,6BAAA,CAAA;AAClE;;;ACRA,SAA8BC,WAAWC,gBAAgB;AAGzD,SAASC,WAAW
|
|
6
|
-
"names": ["raise", "useDevtools", "client", "useClient", "services", "DevtoolsHost", "raise", "Error", "useEffect", "useState", "log", "
|
|
5
|
+
"mappings": ";;;;;;;AAIA,cAAc;;;ACCd,SAASA,aAAa;AAIf,IAAMC,cAAc,MAAA;AACzB,QAAMC,SAASC,UAAAA;AACf,SAAOD,OAAOE,SAASA,SAASC,gBAAgBC,MAAM,IAAIC,MAAM,6BAAA,CAAA;AAClE;;;ACRA,SAA8BC,WAAWC,gBAAgB;AAGzD,SAASC,WAAW;AAEpB,IAAA,eAAA;AAKEF,IAAU,YAAA,CAAA,eAAA,cAAA,OAAA,CAAA,MAAA;QACR,CAAA,OAAMG,QAASC,IAAAA,SAAAA,YAAAA;YACfD,MAAOE;UAGH,SAAS,cAAA;qBACE,CAACC,aAAAA,SAAAA,QAAAA,GAAAA,CAAAA,QAAAA;AACZ,UAAA,KAAA;AACF,YAAA,MAAA,KAAA,QAAA,EAAA,YAAA,YAAA,GAAA,cAAA,GAAA,IAAA,GAAA,OAAA,CAAA;MAGF;;AAEA,WAAA,MAAA;AACCC,WAAAA,OAAAA,MAAAA;IAEH;EACA,GAAA,IAAA;;;",
|
|
6
|
+
"names": ["raise", "useDevtools", "client", "useClient", "services", "DevtoolsHost", "raise", "Error", "useEffect", "useState", "log", "stream", "streamFactory", "subscribe", "err", "deps"]
|
|
7
7
|
}
|