@dxos/react-client 0.6.11 → 0.6.12-main.5cc132e
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/dist/lib/browser/{chunk-CL7JDETM.mjs → chunk-ESSNDYBJ.mjs} +70 -61
- package/dist/lib/browser/chunk-ESSNDYBJ.mjs.map +7 -0
- package/dist/lib/browser/devtools/index.mjs +1 -1
- package/dist/lib/browser/echo/index.mjs +1 -1
- package/dist/lib/browser/halo/index.mjs +1 -1
- package/dist/lib/browser/index.mjs +1 -3
- package/dist/lib/browser/index.mjs.map +1 -1
- package/dist/lib/browser/mesh/index.mjs +1 -1
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/testing/index.mjs +1 -1
- package/dist/lib/browser/testing/index.mjs.map +2 -2
- package/dist/lib/node/{chunk-C4EWAKPZ.cjs → chunk-N474KOAU.cjs} +71 -61
- package/dist/lib/node/chunk-N474KOAU.cjs.map +7 -0
- package/dist/lib/node/devtools/index.cjs +2 -2
- package/dist/lib/node/echo/index.cjs +3 -3
- package/dist/lib/node/halo/index.cjs +5 -5
- package/dist/lib/node/index.cjs +12 -14
- package/dist/lib/node/index.cjs.map +1 -1
- package/dist/lib/node/mesh/index.cjs +2 -2
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node/testing/index.cjs +4 -4
- package/dist/lib/node/testing/index.cjs.map +2 -2
- package/dist/lib/node-esm/chunk-AL2CUQ46.mjs +163 -0
- package/dist/lib/node-esm/chunk-AL2CUQ46.mjs.map +7 -0
- package/dist/lib/node-esm/chunk-ESSNDYBJ.mjs +300 -0
- package/dist/lib/node-esm/chunk-ESSNDYBJ.mjs.map +7 -0
- package/dist/lib/node-esm/devtools/index.mjs +43 -0
- package/dist/lib/node-esm/devtools/index.mjs.map +7 -0
- package/dist/lib/node-esm/echo/index.mjs +131 -0
- package/dist/lib/node-esm/echo/index.mjs.map +7 -0
- package/dist/lib/node-esm/halo/index.mjs +99 -0
- package/dist/lib/node-esm/halo/index.mjs.map +7 -0
- package/dist/lib/node-esm/index.mjs +32 -0
- package/dist/lib/node-esm/index.mjs.map +7 -0
- package/dist/lib/node-esm/invitations/index.mjs +17 -0
- package/dist/lib/node-esm/invitations/index.mjs.map +7 -0
- package/dist/lib/node-esm/mesh/index.mjs +17 -0
- package/dist/lib/node-esm/mesh/index.mjs.map +7 -0
- package/dist/lib/node-esm/meta.json +1 -0
- package/dist/lib/node-esm/testing/index.mjs +165 -0
- package/dist/lib/node-esm/testing/index.mjs.map +7 -0
- package/dist/lib/node-esm/worker.mjs +3 -0
- package/dist/lib/node-esm/worker.mjs.map +7 -0
- package/dist/types/src/client/ClientProvider.d.ts +65 -9
- package/dist/types/src/client/ClientProvider.d.ts.map +1 -1
- package/dist/types/src/client/context.d.ts +1 -4
- package/dist/types/src/client/context.d.ts.map +1 -1
- package/dist/types/src/client/index.d.ts +0 -1
- package/dist/types/src/client/index.d.ts.map +1 -1
- package/dist/types/src/playwright/playwright.config.d.ts +2 -2
- package/dist/types/src/playwright/playwright.config.d.ts.map +1 -1
- package/dist/types/src/testing/util.d.ts +5 -3
- package/dist/types/src/testing/util.d.ts.map +1 -1
- package/dist/types/src/testing/withClientProvider.d.ts.map +1 -1
- package/package.json +45 -36
- package/project.json +3 -23
- package/src/client/ClientProvider.test.tsx +7 -4
- package/src/client/ClientProvider.tsx +130 -90
- package/src/client/context.ts +4 -4
- package/src/client/index.ts +0 -3
- package/src/client/useConfig.test.tsx +7 -11
- package/src/echo/useSpaces.test.tsx +6 -8
- package/src/halo/useDevices.test.tsx +3 -5
- package/src/playwright/playwright.config.ts +13 -2
- package/src/playwright/smoke.spec.ts +5 -10
- package/src/testing/util.tsx +11 -6
- package/src/testing/withClientProvider.tsx +1 -0
- package/tsconfig.json +4 -2
- package/vitest.config.ts +22 -0
- package/dist/lib/browser/chunk-CL7JDETM.mjs.map +0 -7
- package/dist/lib/node/chunk-C4EWAKPZ.cjs.map +0 -7
- package/dist/types/src/client/useClientServices.d.ts +0 -3
- package/dist/types/src/client/useClientServices.d.ts.map +0 -1
- package/src/client/useClientServices.ts +0 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientProvider.d.ts","sourceRoot":"","sources":["../../../../src/client/ClientProvider.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"ClientProvider.d.ts","sourceRoot":"","sources":["../../../../src/client/ClientProvider.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,EAEZ,KAAK,iBAAiB,EACtB,KAAK,SAAS,EAIf,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,MAAM,EAAE,KAAK,aAAa,EAAE,KAAK,sBAAsB,EAAgB,MAAM,cAAc,CAAC;AACrG,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAI3C,OAAO,EAAyB,KAAK,YAAY,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAErF,OAAO,EAAiB,KAAK,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAGnE;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,GAClE,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,UAAU,CAAC,GAAG;IAC3C,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAE5C;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAE5C;;;;OAIG;IACH,QAAQ,CAAC,EAAE,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,YAAY,CAAC,sBAAsB,CAAC,CAAC,CAAC;IAEhG;;;;OAIG;IACH,KAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;IAExB;;OAEG;IACH,QAAQ,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAE1D;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACxD,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,cAAc;eA3DZ,SAAS;IAEpB;;;;OAIG;aACM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3C;;;;OAIG;aACM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE3C;;;;OAIG;eACQ,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,YAAY,CAAC,sBAAsB,CAAC,CAAC;IAE/F;;;;OAIG;YACK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;IAEvB;;OAEG;eACQ,iBAAiB,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAEzD;;;;OAIG;4BACqB,OAAO;IAE/B;;OAEG;oBACa,OAAO;IAEvB;;;;OAIG;oBACa,CAAC,MAAM,EAAE,MAAM,KAAK,YAAY,CAAC,IAAI,CAAC;4CAkHzD,CAAC"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
import { type Client, type ClientServices, type SystemStatus } from '@dxos/client';
|
|
1
|
+
import { type Client, type SystemStatus } from '@dxos/client';
|
|
3
2
|
export type ClientContextProps = {
|
|
4
3
|
client: Client;
|
|
5
|
-
services?: ClientServices;
|
|
6
4
|
status?: SystemStatus | null;
|
|
7
5
|
};
|
|
8
|
-
export declare const ClientContext: Context<ClientContextProps | undefined>;
|
|
9
6
|
//# sourceMappingURL=context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../src/client/context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../../src/client/context.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAE9D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;CAC9B,CAAC"}
|
|
@@ -2,7 +2,6 @@ export * from './AgentHostingProvider';
|
|
|
2
2
|
export * from './ClientProvider';
|
|
3
3
|
export * from './context';
|
|
4
4
|
export * from './useClient';
|
|
5
|
-
export * from './useClientServices';
|
|
6
5
|
export * from './useClientStatus';
|
|
7
6
|
export * from './useConfig';
|
|
8
7
|
export * from './useShell';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/client/index.ts"],"names":[],"mappings":"AAIA,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/client/index.ts"],"names":[],"mappings":"AAIA,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAE1B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
export default
|
|
1
|
+
declare const _default: import("@playwright/test").PlaywrightTestConfig<{}, {}>;
|
|
2
|
+
export default _default;
|
|
3
3
|
//# sourceMappingURL=playwright.config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright.config.d.ts","sourceRoot":"","sources":["../../../../src/playwright/playwright.config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"playwright.config.d.ts","sourceRoot":"","sources":["../../../../src/playwright/playwright.config.ts"],"names":[],"mappings":";AASA,wBAQG"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { Client } from '@dxos/client';
|
|
2
|
+
import { Client, type Config } from '@dxos/client';
|
|
3
3
|
import { type Space } from '@dxos/client/echo';
|
|
4
|
-
export declare const createClient: ({ createIdentity, createSpace, }?: {
|
|
4
|
+
export declare const createClient: ({ config, createIdentity, createSpace, }?: {
|
|
5
|
+
config?: Config;
|
|
5
6
|
createIdentity?: boolean;
|
|
6
7
|
createSpace?: boolean;
|
|
7
8
|
}) => Promise<{
|
|
8
9
|
client: Client;
|
|
9
10
|
space: Space | undefined;
|
|
10
11
|
}>;
|
|
11
|
-
export declare const
|
|
12
|
+
export declare const createClientContextProvider: (client: Client) => Promise<({ children }: any) => React.JSX.Element>;
|
|
13
|
+
export declare const createClientProvider: (client: Client) => Promise<({ children }: any) => React.JSX.Element>;
|
|
12
14
|
//# sourceMappingURL=util.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/testing/util.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,MAAM,EAAY,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/testing/util.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAY,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAK/C,eAAO,MAAM,YAAY,8CAItB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE;;;EActE,CAAC;AAEF,eAAO,MAAM,2BAA2B,WAAkB,MAAM,4BACxC,GAAG,uBAC1B,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAkB,MAAM,4BACjC,GAAG,uBAC1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withClientProvider.d.ts","sourceRoot":"","sources":["../../../../src/testing/withClientProvider.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAKlD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAkB,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAErE,KAAK,eAAe,GAAG;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACvE,CAAC;AA4BF,MAAM,MAAM,uBAAuB,GAAG,eAAe,GAAG,mBAAmB,CAAC;AAE5E;;GAEG;AACH,eAAO,MAAM,kBAAkB,8EAM5B,uBAAuB,KAAQ,SAYjC,CAAC;AAKF,MAAM,MAAM,4BAA4B,GAAG,eAAe,GAAG,mBAAmB,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3G;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"withClientProvider.d.ts","sourceRoot":"","sources":["../../../../src/testing/withClientProvider.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAKlD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAkB,KAAK,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAErE,KAAK,eAAe,GAAG;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CACvE,CAAC;AA4BF,MAAM,MAAM,uBAAuB,GAAG,eAAe,GAAG,mBAAmB,CAAC;AAE5E;;GAEG;AACH,eAAO,MAAM,kBAAkB,8EAM5B,uBAAuB,KAAQ,SAYjC,CAAC;AAKF,MAAM,MAAM,4BAA4B,GAAG,eAAe,GAAG,mBAAmB,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3G;;;;GAIG;AAEH,eAAO,MAAM,uBAAuB,yFAOjC,4BAA4B,KAAG,SAuCjC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,65 +1,73 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/react-client",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.12-main.5cc132e",
|
|
4
4
|
"description": "React client API",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
7
7
|
"license": "MIT",
|
|
8
8
|
"author": "DXOS.org",
|
|
9
9
|
"exports": {
|
|
10
|
-
".": {
|
|
11
|
-
"browser": "./dist/lib/browser/index.mjs",
|
|
12
|
-
"node": {
|
|
13
|
-
"default": "./dist/lib/node/index.cjs"
|
|
14
|
-
},
|
|
15
|
-
"types": "./dist/types/src/index.d.ts"
|
|
16
|
-
},
|
|
17
10
|
"./devtools": {
|
|
18
11
|
"browser": "./dist/lib/browser/devtools/index.mjs",
|
|
19
12
|
"node": {
|
|
20
|
-
"
|
|
13
|
+
"require": "./dist/lib/node/devtools/index.cjs",
|
|
14
|
+
"default": "./dist/lib/node-esm/devtools/index.mjs"
|
|
21
15
|
},
|
|
22
16
|
"types": "./dist/types/src/devtools/index.d.ts"
|
|
23
17
|
},
|
|
24
18
|
"./echo": {
|
|
25
19
|
"browser": "./dist/lib/browser/echo/index.mjs",
|
|
26
20
|
"node": {
|
|
27
|
-
"
|
|
21
|
+
"require": "./dist/lib/node/echo/index.cjs",
|
|
22
|
+
"default": "./dist/lib/node-esm/echo/index.mjs"
|
|
28
23
|
},
|
|
29
24
|
"types": "./dist/types/src/echo/index.d.ts"
|
|
30
25
|
},
|
|
31
26
|
"./halo": {
|
|
32
27
|
"browser": "./dist/lib/browser/halo/index.mjs",
|
|
33
28
|
"node": {
|
|
34
|
-
"
|
|
29
|
+
"require": "./dist/lib/node/halo/index.cjs",
|
|
30
|
+
"default": "./dist/lib/node-esm/halo/index.mjs"
|
|
35
31
|
},
|
|
36
32
|
"types": "./dist/types/src/halo/index.d.ts"
|
|
37
33
|
},
|
|
34
|
+
".": {
|
|
35
|
+
"browser": "./dist/lib/browser/index.mjs",
|
|
36
|
+
"node": {
|
|
37
|
+
"require": "./dist/lib/node/index.cjs",
|
|
38
|
+
"default": "./dist/lib/node-esm/index.mjs"
|
|
39
|
+
},
|
|
40
|
+
"types": "./dist/types/src/index.d.ts"
|
|
41
|
+
},
|
|
38
42
|
"./invitations": {
|
|
39
43
|
"browser": "./dist/lib/browser/invitations/index.mjs",
|
|
40
44
|
"node": {
|
|
41
|
-
"
|
|
45
|
+
"require": "./dist/lib/node/invitations/index.cjs",
|
|
46
|
+
"default": "./dist/lib/node-esm/invitations/index.mjs"
|
|
42
47
|
},
|
|
43
48
|
"types": "./dist/types/src/invitations/index.d.ts"
|
|
44
49
|
},
|
|
45
50
|
"./mesh": {
|
|
46
51
|
"browser": "./dist/lib/browser/mesh/index.mjs",
|
|
47
52
|
"node": {
|
|
48
|
-
"
|
|
53
|
+
"require": "./dist/lib/node/mesh/index.cjs",
|
|
54
|
+
"default": "./dist/lib/node-esm/mesh/index.mjs"
|
|
49
55
|
},
|
|
50
56
|
"types": "./dist/types/src/mesh/index.d.ts"
|
|
51
57
|
},
|
|
52
58
|
"./testing": {
|
|
53
59
|
"browser": "./dist/lib/browser/testing/index.mjs",
|
|
54
60
|
"node": {
|
|
55
|
-
"
|
|
61
|
+
"require": "./dist/lib/node/testing/index.cjs",
|
|
62
|
+
"default": "./dist/lib/node-esm/testing/index.mjs"
|
|
56
63
|
},
|
|
57
64
|
"types": "./dist/types/src/testing/index.d.ts"
|
|
58
65
|
},
|
|
59
66
|
"./worker": {
|
|
60
67
|
"browser": "./dist/lib/browser/worker.mjs",
|
|
61
68
|
"node": {
|
|
62
|
-
"
|
|
69
|
+
"require": "./dist/lib/node/worker.cjs",
|
|
70
|
+
"default": "./dist/lib/node-esm/worker.mjs"
|
|
63
71
|
},
|
|
64
72
|
"types": "./dist/types/src/worker.d.ts"
|
|
65
73
|
}
|
|
@@ -92,19 +100,19 @@
|
|
|
92
100
|
},
|
|
93
101
|
"dependencies": {
|
|
94
102
|
"react-error-boundary": "^4.0.13",
|
|
95
|
-
"@dxos/async": "0.6.
|
|
96
|
-
"@dxos/
|
|
97
|
-
"@dxos/
|
|
98
|
-
"@dxos/config": "0.6.
|
|
99
|
-
"@dxos/debug": "0.6.
|
|
100
|
-
"@dxos/echo-schema": "0.6.
|
|
101
|
-
"@dxos/
|
|
102
|
-
"@dxos/
|
|
103
|
-
"@dxos/
|
|
104
|
-
"@dxos/node-std": "0.6.
|
|
105
|
-
"@dxos/protocols": "0.6.
|
|
106
|
-
"@dxos/react-hooks": "0.6.
|
|
107
|
-
"@dxos/util": "0.6.
|
|
103
|
+
"@dxos/async": "0.6.12-main.5cc132e",
|
|
104
|
+
"@dxos/codec-protobuf": "0.6.12-main.5cc132e",
|
|
105
|
+
"@dxos/client": "0.6.12-main.5cc132e",
|
|
106
|
+
"@dxos/config": "0.6.12-main.5cc132e",
|
|
107
|
+
"@dxos/debug": "0.6.12-main.5cc132e",
|
|
108
|
+
"@dxos/echo-schema": "0.6.12-main.5cc132e",
|
|
109
|
+
"@dxos/invariant": "0.6.12-main.5cc132e",
|
|
110
|
+
"@dxos/log": "0.6.12-main.5cc132e",
|
|
111
|
+
"@dxos/echo-signals": "0.6.12-main.5cc132e",
|
|
112
|
+
"@dxos/node-std": "0.6.12-main.5cc132e",
|
|
113
|
+
"@dxos/protocols": "0.6.12-main.5cc132e",
|
|
114
|
+
"@dxos/react-hooks": "0.6.12-main.5cc132e",
|
|
115
|
+
"@dxos/util": "0.6.12-main.5cc132e"
|
|
108
116
|
},
|
|
109
117
|
"devDependencies": {
|
|
110
118
|
"@testing-library/dom": "^8.17.1",
|
|
@@ -114,20 +122,21 @@
|
|
|
114
122
|
"@types/react-dom": "~18.2.0",
|
|
115
123
|
"react": "~18.2.0",
|
|
116
124
|
"react-dom": "~18.2.0",
|
|
117
|
-
"@dxos/
|
|
118
|
-
"@dxos/
|
|
119
|
-
"@dxos/react-ui": "0.6.
|
|
120
|
-
"@dxos/
|
|
121
|
-
"@dxos/
|
|
125
|
+
"@dxos/random": "0.6.12-main.5cc132e",
|
|
126
|
+
"@dxos/react-ui": "0.6.12-main.5cc132e",
|
|
127
|
+
"@dxos/react-ui-syntax-highlighter": "0.6.12-main.5cc132e",
|
|
128
|
+
"@dxos/test-utils": "0.6.12-main.5cc132e",
|
|
129
|
+
"@dxos/react-ui-theme": "0.6.12-main.5cc132e",
|
|
130
|
+
"@dxos/storybook-utils": "0.6.12-main.5cc132e"
|
|
122
131
|
},
|
|
123
132
|
"peerDependencies": {
|
|
124
133
|
"react": "^18.0.0",
|
|
125
134
|
"react-dom": "^18.0.0",
|
|
126
|
-
"@dxos/react-ui": "0.6.
|
|
127
|
-
"@dxos/react-ui-theme": "0.6.
|
|
135
|
+
"@dxos/react-ui": "0.6.12-main.5cc132e",
|
|
136
|
+
"@dxos/react-ui-theme": "0.6.12-main.5cc132e"
|
|
128
137
|
},
|
|
129
138
|
"optionalDependencies": {
|
|
130
|
-
"@dxos/random": "0.6.
|
|
139
|
+
"@dxos/random": "0.6.12-main.5cc132e"
|
|
131
140
|
},
|
|
132
141
|
"publishConfig": {
|
|
133
142
|
"access": "public"
|
package/project.json
CHANGED
|
@@ -26,32 +26,12 @@
|
|
|
26
26
|
"dependsOn": [
|
|
27
27
|
"^compile",
|
|
28
28
|
"stories:mkdist"
|
|
29
|
-
]
|
|
30
|
-
"options": {
|
|
31
|
-
"playwrightConfigPath": "{projectRoot}/src/playwright/playwright.config.ts",
|
|
32
|
-
"serve": "stories:storybook-e2e",
|
|
33
|
-
"testPatterns": [
|
|
34
|
-
"{projectRoot}/src/playwright/**/*.spec.{ts,js}"
|
|
35
|
-
],
|
|
36
|
-
"timeout": 60000,
|
|
37
|
-
"watchPatterns": [
|
|
38
|
-
"{projectRoot}/src/**/*"
|
|
39
|
-
]
|
|
40
|
-
}
|
|
29
|
+
]
|
|
41
30
|
},
|
|
42
31
|
"lint": {},
|
|
43
|
-
"test": {
|
|
44
|
-
"options": {
|
|
45
|
-
"ciEnvironments": [
|
|
46
|
-
"nodejs"
|
|
47
|
-
],
|
|
48
|
-
"domRequired": true,
|
|
49
|
-
"forceExit": true
|
|
50
|
-
}
|
|
51
|
-
}
|
|
32
|
+
"test": {}
|
|
52
33
|
},
|
|
53
34
|
"implicitDependencies": [
|
|
54
|
-
"esbuild"
|
|
55
|
-
"test"
|
|
35
|
+
"esbuild"
|
|
56
36
|
]
|
|
57
37
|
}
|
|
@@ -2,14 +2,13 @@
|
|
|
2
2
|
// Copyright 2020 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { renderHook, screen, render, act } from '@testing-library/react';
|
|
6
|
-
import expect from 'expect';
|
|
5
|
+
import { renderHook, screen, render, act, cleanup } from '@testing-library/react';
|
|
7
6
|
import React, { Component, type PropsWithChildren } from 'react';
|
|
7
|
+
import { afterEach, beforeEach, describe, expect, test } from 'vitest';
|
|
8
8
|
|
|
9
9
|
import { waitForCondition } from '@dxos/async';
|
|
10
10
|
import { Client, Config, SystemStatus, fromHost } from '@dxos/client';
|
|
11
11
|
import { log } from '@dxos/log';
|
|
12
|
-
import { describe, test } from '@dxos/test';
|
|
13
12
|
|
|
14
13
|
import { ClientProvider } from './ClientProvider';
|
|
15
14
|
import { useClient } from './useClient';
|
|
@@ -97,6 +96,10 @@ describe('ClientProvider', () => {
|
|
|
97
96
|
await client.halo.createIdentity({ displayName: 'test-user' });
|
|
98
97
|
});
|
|
99
98
|
|
|
99
|
+
afterEach(() => {
|
|
100
|
+
cleanup();
|
|
101
|
+
});
|
|
102
|
+
|
|
100
103
|
test('Renders with children', async () => {
|
|
101
104
|
render(
|
|
102
105
|
<ClientProvider client={client}>
|
|
@@ -148,7 +151,7 @@ describe('ClientProvider', () => {
|
|
|
148
151
|
|
|
149
152
|
await act(async () => {
|
|
150
153
|
await waitForCondition({
|
|
151
|
-
condition: () => newClient.status.get() === SystemStatus.ACTIVE
|
|
154
|
+
condition: () => !client.initialized && newClient.status.get() === SystemStatus.ACTIVE,
|
|
152
155
|
});
|
|
153
156
|
});
|
|
154
157
|
expect(client.initialized).toBe(false);
|
|
@@ -2,12 +2,19 @@
|
|
|
2
2
|
// Copyright 2020 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import React, {
|
|
5
|
+
import React, {
|
|
6
|
+
forwardRef,
|
|
7
|
+
type FunctionComponent,
|
|
8
|
+
type ReactNode,
|
|
9
|
+
useEffect,
|
|
10
|
+
useImperativeHandle,
|
|
11
|
+
useState,
|
|
12
|
+
} from 'react';
|
|
6
13
|
|
|
7
14
|
import { Client, type ClientOptions, type ClientServicesProvider, SystemStatus } from '@dxos/client';
|
|
8
15
|
import { type Config } from '@dxos/config';
|
|
9
16
|
import { type S } from '@dxos/echo-schema';
|
|
10
|
-
import {
|
|
17
|
+
import { registerSignalRuntime } from '@dxos/echo-signals/react';
|
|
11
18
|
import { log } from '@dxos/log';
|
|
12
19
|
import { useControlledValue } from '@dxos/react-hooks';
|
|
13
20
|
import { getAsyncProviderValue, type MaybePromise, type Provider } from '@dxos/util';
|
|
@@ -23,29 +30,30 @@ export type ClientProviderProps = Pick<ClientContextProps, 'status'> &
|
|
|
23
30
|
children?: ReactNode;
|
|
24
31
|
|
|
25
32
|
/**
|
|
26
|
-
*
|
|
33
|
+
* Client object or async provider to enable to caller to do custom initialization.
|
|
34
|
+
*
|
|
35
|
+
* NOTE: For advanced use cases only.
|
|
27
36
|
*/
|
|
28
|
-
|
|
37
|
+
client?: Client | Provider<Promise<Client>>;
|
|
29
38
|
|
|
30
39
|
/**
|
|
31
|
-
*
|
|
40
|
+
* Config object or async provider.
|
|
32
41
|
*
|
|
33
|
-
*
|
|
42
|
+
* NOTE: If a `client` is provided then `config` is ignored.
|
|
34
43
|
*/
|
|
35
|
-
|
|
36
|
-
// (Preferring `onInitialized` for custom initialization.)
|
|
37
|
-
// TODO(burdon): Use useImperativeHandle to expose client.
|
|
38
|
-
client?: Client | Provider<Promise<Client>>;
|
|
44
|
+
config?: Config | Provider<Promise<Config>>;
|
|
39
45
|
|
|
40
46
|
/**
|
|
41
47
|
* Callback to enable the caller to create a custom ClientServicesProvider.
|
|
42
48
|
*
|
|
43
|
-
*
|
|
49
|
+
* NOTE: If a `client` is provided then `services` is ignored.
|
|
44
50
|
*/
|
|
45
51
|
services?: ClientServicesProvider | ((config?: Config) => MaybePromise<ClientServicesProvider>);
|
|
46
52
|
|
|
47
53
|
/**
|
|
48
54
|
* List of schema to register.
|
|
55
|
+
*
|
|
56
|
+
* NOTE: If a `client` is provided then `types` will not be added until after the children are first rendered.
|
|
49
57
|
*/
|
|
50
58
|
types?: S.Schema<any>[];
|
|
51
59
|
|
|
@@ -55,10 +63,16 @@ export type ClientProviderProps = Pick<ClientContextProps, 'status'> &
|
|
|
55
63
|
fallback?: FunctionComponent<Partial<ClientContextProps>>;
|
|
56
64
|
|
|
57
65
|
/**
|
|
58
|
-
* Set to false to stop default signal
|
|
66
|
+
* Set to false to stop default signal runtime from being registered.
|
|
67
|
+
*
|
|
68
|
+
* The signals runtime is used to provide reactive updates to ECHO objects.
|
|
69
|
+
*/
|
|
70
|
+
registerSignalRuntime?: boolean;
|
|
71
|
+
|
|
72
|
+
/**
|
|
73
|
+
* Skip the DXOS banner print.
|
|
59
74
|
*/
|
|
60
|
-
|
|
61
|
-
registerSignalFactory?: boolean;
|
|
75
|
+
disableBanner?: boolean;
|
|
62
76
|
|
|
63
77
|
/**
|
|
64
78
|
* Post initialization hook to enable to caller to do custom initialization.
|
|
@@ -72,85 +86,111 @@ export type ClientProviderProps = Pick<ClientContextProps, 'status'> &
|
|
|
72
86
|
* Root component that provides the DXOS client instance to child components.
|
|
73
87
|
* To be used with the `useClient` hook.
|
|
74
88
|
*/
|
|
75
|
-
export const ClientProvider = (
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
89
|
+
export const ClientProvider = forwardRef<Client | undefined, ClientProviderProps>(
|
|
90
|
+
(
|
|
91
|
+
{
|
|
92
|
+
children,
|
|
93
|
+
config: configProvider,
|
|
94
|
+
client: clientProvider,
|
|
95
|
+
services: servicesProvider,
|
|
96
|
+
types,
|
|
97
|
+
status: controlledStatus,
|
|
98
|
+
fallback: Fallback = () => null,
|
|
99
|
+
registerSignalRuntime: _registerSignalRuntime = true,
|
|
100
|
+
disableBanner,
|
|
101
|
+
onInitialized,
|
|
102
|
+
...options
|
|
103
|
+
},
|
|
104
|
+
forwardedRef,
|
|
105
|
+
) => {
|
|
106
|
+
useEffect(() => {
|
|
107
|
+
// TODO(wittjosiah): Ideally this should be imported asynchronously because it is optional.
|
|
108
|
+
// Unfortunately, async import seemed to break signals React instrumentation.
|
|
109
|
+
_registerSignalRuntime && registerSignalRuntime();
|
|
110
|
+
}, [_registerSignalRuntime]);
|
|
111
|
+
|
|
112
|
+
// The client is initialized asynchronously.
|
|
113
|
+
// If an error occurs during initialization, it is caught and the state is set.
|
|
114
|
+
// This allows the error to be thrown in the render method.
|
|
115
|
+
// The assumption is that a client initialization error is fatal to the app.
|
|
116
|
+
// This error will be caught by the nearest error boundary.
|
|
117
|
+
const [error, setError] = useState();
|
|
118
|
+
if (error) {
|
|
119
|
+
throw error;
|
|
105
120
|
}
|
|
106
121
|
|
|
107
|
-
const
|
|
108
|
-
return () => subscription.unsubscribe();
|
|
109
|
-
}, [client, setStatus]);
|
|
110
|
-
|
|
111
|
-
// Initialize client.
|
|
112
|
-
useEffect(() => {
|
|
113
|
-
const done = async (client: Client) => {
|
|
114
|
-
await client.initialize().catch(setError);
|
|
115
|
-
log('client ready');
|
|
116
|
-
await onInitialized?.(client);
|
|
117
|
-
log('initialization complete');
|
|
118
|
-
if (types) {
|
|
119
|
-
client.addTypes(types);
|
|
120
|
-
}
|
|
122
|
+
const [client, setClient] = useState(clientProvider instanceof Client ? clientProvider : undefined);
|
|
121
123
|
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
printBanner(client);
|
|
125
|
-
};
|
|
126
|
-
|
|
127
|
-
const t = setTimeout(async () => {
|
|
128
|
-
if (clientProvider) {
|
|
129
|
-
// Asynchronously request client.
|
|
130
|
-
const client = await getAsyncProviderValue(clientProvider);
|
|
131
|
-
await done(client);
|
|
132
|
-
} else {
|
|
133
|
-
// Asynchronously construct client (config may be undefined).
|
|
134
|
-
const config = await getAsyncProviderValue(configProvider);
|
|
135
|
-
log('resolved config', { config });
|
|
136
|
-
const services = await getAsyncProviderValue(servicesProvider, config);
|
|
137
|
-
log('created services', { services });
|
|
138
|
-
const client = new Client({ config, services, ...options });
|
|
139
|
-
log('created client');
|
|
140
|
-
await done(client);
|
|
141
|
-
}
|
|
142
|
-
});
|
|
124
|
+
// Provide external access.
|
|
125
|
+
useImperativeHandle(forwardedRef, () => client, [client]);
|
|
143
126
|
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
127
|
+
// Client status subscription.
|
|
128
|
+
const [status, setStatus] = useControlledValue(controlledStatus);
|
|
129
|
+
useEffect(() => {
|
|
130
|
+
if (!client) {
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
150
133
|
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
134
|
+
const subscription = client.status.subscribe((status) => setStatus(status));
|
|
135
|
+
return () => subscription.unsubscribe();
|
|
136
|
+
}, [client]);
|
|
137
|
+
|
|
138
|
+
// Create and/or initialize client.
|
|
139
|
+
useEffect(() => {
|
|
140
|
+
const initialize = async (client: Client) => {
|
|
141
|
+
if (!client.initialized) {
|
|
142
|
+
await client.initialize().catch(setError);
|
|
143
|
+
log('client ready');
|
|
144
|
+
if (types) {
|
|
145
|
+
client.addTypes(types);
|
|
146
|
+
}
|
|
147
|
+
await onInitialized?.(client);
|
|
148
|
+
log('initialization complete');
|
|
149
|
+
} else if (types) {
|
|
150
|
+
client.addTypes(types);
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
setClient(client);
|
|
154
|
+
|
|
155
|
+
if (!disableBanner) {
|
|
156
|
+
printBanner(client);
|
|
157
|
+
}
|
|
158
|
+
};
|
|
159
|
+
|
|
160
|
+
let client: Client;
|
|
161
|
+
const t = setTimeout(async () => {
|
|
162
|
+
if (clientProvider) {
|
|
163
|
+
// Asynchronously request client.
|
|
164
|
+
client = await getAsyncProviderValue(clientProvider);
|
|
165
|
+
await initialize(client);
|
|
166
|
+
} else {
|
|
167
|
+
// Asynchronously construct client (config may be undefined).
|
|
168
|
+
const config = await getAsyncProviderValue(configProvider);
|
|
169
|
+
log('resolved config', { config });
|
|
170
|
+
const services = await getAsyncProviderValue(servicesProvider, config);
|
|
171
|
+
log('created services', { services });
|
|
172
|
+
client = new Client({ config, services, ...options });
|
|
173
|
+
log('created client');
|
|
174
|
+
await initialize(client);
|
|
175
|
+
}
|
|
176
|
+
});
|
|
177
|
+
|
|
178
|
+
return () => {
|
|
179
|
+
log('clean up');
|
|
180
|
+
clearTimeout(t);
|
|
181
|
+
void client
|
|
182
|
+
?.destroy()
|
|
183
|
+
.then(() => {
|
|
184
|
+
log('destroyed');
|
|
185
|
+
})
|
|
186
|
+
.catch((err) => log.catch(err));
|
|
187
|
+
};
|
|
188
|
+
}, [configProvider, clientProvider, servicesProvider, disableBanner]);
|
|
189
|
+
|
|
190
|
+
if (!client?.initialized || status !== SystemStatus.ACTIVE) {
|
|
191
|
+
return <Fallback client={client} status={status} />;
|
|
192
|
+
}
|
|
154
193
|
|
|
155
|
-
|
|
156
|
-
}
|
|
194
|
+
return <ClientContext.Provider value={{ client, status }}>{children}</ClientContext.Provider>;
|
|
195
|
+
},
|
|
196
|
+
);
|
package/src/client/context.ts
CHANGED
|
@@ -4,17 +4,17 @@
|
|
|
4
4
|
|
|
5
5
|
import { type Context, createContext } from 'react';
|
|
6
6
|
|
|
7
|
-
import { type Client, type
|
|
7
|
+
import { type Client, type SystemStatus } from '@dxos/client';
|
|
8
8
|
|
|
9
9
|
export type ClientContextProps = {
|
|
10
10
|
client: Client;
|
|
11
11
|
|
|
12
|
-
// Optionally expose services (e.g., for devtools).
|
|
13
|
-
services?: ClientServices;
|
|
14
|
-
|
|
15
12
|
status?: SystemStatus | null;
|
|
16
13
|
};
|
|
17
14
|
|
|
15
|
+
/**
|
|
16
|
+
* @internal Use ClientProvider to create or initialize the Client.
|
|
17
|
+
*/
|
|
18
18
|
export const ClientContext: Context<ClientContextProps | undefined> = createContext<ClientContextProps | undefined>(
|
|
19
19
|
undefined,
|
|
20
20
|
);
|
package/src/client/index.ts
CHANGED
|
@@ -4,12 +4,9 @@
|
|
|
4
4
|
|
|
5
5
|
export * from './AgentHostingProvider';
|
|
6
6
|
export * from './ClientProvider';
|
|
7
|
-
|
|
8
|
-
// TODO(burdon): Remove.
|
|
9
7
|
export * from './context';
|
|
10
8
|
|
|
11
9
|
export * from './useClient';
|
|
12
|
-
export * from './useClientServices';
|
|
13
10
|
export * from './useClientStatus';
|
|
14
11
|
export * from './useConfig';
|
|
15
12
|
export * from './useShell';
|