@dxos/client-services 0.3.2-main.de57e73 → 0.3.2-main.ec06501
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-XEZCTVLQ.mjs → chunk-KLSDV4XQ.mjs} +76 -66
- package/dist/lib/browser/chunk-KLSDV4XQ.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +1 -1
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/packlets/testing/index.mjs +1 -1
- package/dist/lib/node/index.cjs +111 -91
- package/dist/lib/node/index.cjs.map +3 -3
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node/packlets/testing/index.cjs +109 -89
- package/dist/lib/node/packlets/testing/index.cjs.map +3 -3
- package/dist/types/src/packlets/devices/devices-service.d.ts +2 -2
- package/dist/types/src/packlets/devices/devices-service.d.ts.map +1 -1
- package/dist/types/src/packlets/identity/identity-manager.d.ts.map +1 -1
- package/dist/types/src/packlets/identity/identity.d.ts +3 -3
- package/dist/types/src/packlets/identity/identity.d.ts.map +1 -1
- package/dist/types/src/packlets/invitations/invitations-service.d.ts.map +1 -1
- package/dist/types/src/version.d.ts +1 -1
- package/package.json +37 -35
- package/src/packlets/devices/devices-service.ts +4 -3
- package/src/packlets/identity/identity-manager.test.ts +12 -0
- package/src/packlets/identity/identity-manager.ts +12 -0
- package/src/packlets/identity/identity.test.ts +2 -2
- package/src/packlets/identity/identity.ts +6 -4
- package/src/packlets/invitations/invitations-service.ts +0 -2
- package/src/version.ts +1 -1
- package/dist/lib/browser/chunk-XEZCTVLQ.mjs.map +0 -7
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { Stream } from '@dxos/codec-protobuf';
|
|
2
2
|
import { Device, DevicesService, QueryDevicesResponse } from '@dxos/protocols/proto/dxos/client/services';
|
|
3
|
-
import {
|
|
3
|
+
import { DeviceProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
4
4
|
import { IdentityManager } from '../identity';
|
|
5
5
|
export declare class DevicesServiceImpl implements DevicesService {
|
|
6
6
|
private readonly _identityManager;
|
|
7
7
|
constructor(_identityManager: IdentityManager);
|
|
8
|
-
updateDevice(
|
|
8
|
+
updateDevice(profile: DeviceProfileDocument): Promise<Device>;
|
|
9
9
|
queryDevices(): Stream<QueryDevicesResponse>;
|
|
10
10
|
}
|
|
11
11
|
//# sourceMappingURL=devices-service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devices-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/devices/devices-service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAc,cAAc,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AACtH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"devices-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/devices/devices-service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAc,cAAc,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AACtH,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAEpF,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,kBAAmB,YAAW,cAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;gBAAhB,gBAAgB,EAAE,eAAe;IAExD,YAAY,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC;IAInE,YAAY,IAAI,MAAM,CAAC,oBAAoB,CAAC;CAqC7C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"identity-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity-manager.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAiB,MAAM,qBAAqB,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAEnE,OAAO,EAAgB,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK5C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAQtC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,EAAE,SAAS,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,SAAS,CAAC;IACxB,kBAAkB,EAAE,SAAS,CAAC;IAC9B,cAAc,EAAE,SAAS,CAAC;IAC1B,WAAW,EAAE,SAAS,CAAC;IAEvB;;;OAGG;IACH,gBAAgB,CAAC,EAAE,SAAS,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAGF,qBACa,eAAe;IAQxB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAVhC,QAAQ,CAAC,WAAW,cAAe;IAEnC,OAAO,CAAC,SAAS,CAAC,CAAW;gBAKV,cAAc,EAAE,aAAa,EAC7B,QAAQ,EAAE,OAAO,EACjB,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,EAClC,aAAa,EAAE,YAAY;IAG9C,IAAI,QAAQ,yBAEX;IAGK,IAAI,CAAC,GAAG,EAAE,OAAO;IAmBjB,KAAK;IAIL,cAAc,CAAC,EAAE,WAAW,EAAE,GAAE,qBAA0B;IA6EhE;;OAEG;IACG,cAAc,CAAC,MAAM,EAAE,kBAAkB;IA+B/C;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,eAAe;YAiB9B,kBAAkB;YA2ClB,eAAe;CAc9B"}
|
|
@@ -4,9 +4,9 @@ import { CredentialSigner } from '@dxos/credentials';
|
|
|
4
4
|
import { Signer } from '@dxos/crypto';
|
|
5
5
|
import { Space } from '@dxos/echo-pipeline';
|
|
6
6
|
import { PublicKey } from '@dxos/keys';
|
|
7
|
-
import { ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
7
|
+
import { DeviceProfileDocument, ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
8
8
|
import { DeviceAdmissionRequest } from '@dxos/protocols/proto/dxos/halo/invitations';
|
|
9
|
-
import {
|
|
9
|
+
import { ComplexMap } from '@dxos/util';
|
|
10
10
|
import { TrustedKeySetAuthVerifier } from './authenticator';
|
|
11
11
|
export type IdentityParams = {
|
|
12
12
|
identityKey: PublicKey;
|
|
@@ -27,7 +27,7 @@ export declare class Identity {
|
|
|
27
27
|
readonly deviceKey: PublicKey;
|
|
28
28
|
readonly stateUpdate: Event<void>;
|
|
29
29
|
constructor({ space, signer, identityKey, deviceKey }: IdentityParams);
|
|
30
|
-
get authorizedDeviceKeys():
|
|
30
|
+
get authorizedDeviceKeys(): ComplexMap<PublicKey, DeviceProfileDocument>;
|
|
31
31
|
open(ctx: Context): Promise<void>;
|
|
32
32
|
close(ctx: Context): Promise<void>;
|
|
33
33
|
ready(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAEL,gBAAgB,EAIjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAG5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAgB,eAAe,EAAE,MAAM,6CAA6C,CAAC;
|
|
1
|
+
{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAEL,gBAAgB,EAIjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAG5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAgB,qBAAqB,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AACnH,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAErF,OAAO,EAAE,UAAU,EAAc,MAAM,YAAY,CAAC;AAEpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,MAAM,MAAM,cAAc,GAAG;IAC3B,WAAW,EAAE,SAAS,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,qBACa,QAAQ;IACnB,SAAgB,KAAK,EAAE,KAAK,CAAC;IAC7B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqB;IACzD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAsB;IAC3D,SAAgB,YAAY,EAAE,yBAAyB,CAAC;IAExD,SAAgB,WAAW,EAAE,SAAS,CAAC;IACvC,SAAgB,SAAS,EAAE,SAAS,CAAC;IAErC,SAAgB,WAAW,cAAe;gBAE9B,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,cAAc;IA2BrE,IAAI,oBAAoB,IAAI,UAAU,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAEvE;IAGK,IAAI,CAAC,GAAG,EAAE,OAAO;IAOjB,KAAK,CAAC,GAAG,EAAE,OAAO;IAOlB,KAAK;IAMX,IAAI,eAAe,IAAI,eAAe,GAAG,SAAS,CAEjD;IAED;;OAEG;IACH,IAAI,eAAe,mDAElB;IAED,IAAI,YAAY,cAEf;IAED,IAAI,kBAAkB,cAErB;IAED,IAAI,qBAAqB,4EAExB;IAED,uBAAuB,IAAI,sBAAsB;IAQjD;;;OAGG;IACH,2BAA2B,IAAI,gBAAgB;IAS/C;;OAEG;IACH,yBAAyB,IAAI,gBAAgB;IAIvC,WAAW,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,EAAE,sBAAsB;CA2CrF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitations-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitations-service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG9C,OAAO,EACL,qBAAqB,EACrB,UAAU,EACV,kBAAkB,EAClB,wBAAwB,EACzB,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D;;GAEG;AACH,qBAAa,sBAAuB,YAAW,kBAAkB;IAS7D,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAT9B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA4C;IAC/E,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA+C;IAClF,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA2B;IAC9D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA2B;IAC/D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA2B;IAC3D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA2B;gBAGzC,mBAAmB,EAAE,kBAAkB,EACvC,WAAW,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,kBAAkB;IAI9E,iBAAiB;IAMjB,gBAAgB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAgCzD,gBAAgB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAgCnD,YAAY,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9E,gBAAgB,CAAC,EAAE,YAAY,EAAE,EAAE;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"invitations-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitations-service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG9C,OAAO,EACL,qBAAqB,EACrB,UAAU,EACV,kBAAkB,EAClB,wBAAwB,EACzB,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D;;GAEG;AACH,qBAAa,sBAAuB,YAAW,kBAAkB;IAS7D,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAT9B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA4C;IAC/E,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA+C;IAClF,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA2B;IAC9D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA2B;IAC/D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA2B;IAC3D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA2B;gBAGzC,mBAAmB,EAAE,kBAAkB,EACvC,WAAW,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,kBAAkB;IAI9E,iBAAiB;IAMjB,gBAAgB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAgCzD,gBAAgB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAgCnD,YAAY,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9E,gBAAgB,CAAC,EAAE,YAAY,EAAE,EAAE;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBjF,gBAAgB,IAAI,MAAM,CAAC,wBAAwB,CAAC;CAkDrD"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const DXOS_VERSION = "0.3.2-main.
|
|
1
|
+
export declare const DXOS_VERSION = "0.3.2-main.ec06501";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/client-services",
|
|
3
|
-
"version": "0.3.2-main.
|
|
3
|
+
"version": "0.3.2-main.ec06501",
|
|
4
4
|
"description": "DXOS client services implementation",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -21,43 +21,45 @@
|
|
|
21
21
|
"src"
|
|
22
22
|
],
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"
|
|
25
|
-
"@dxos/
|
|
26
|
-
"@dxos/
|
|
27
|
-
"@dxos/
|
|
28
|
-
"@dxos/
|
|
29
|
-
"@dxos/
|
|
30
|
-
"@dxos/
|
|
31
|
-
"@dxos/
|
|
32
|
-
"@dxos/
|
|
33
|
-
"@dxos/
|
|
34
|
-
"@dxos/echo-
|
|
35
|
-
"@dxos/echo-
|
|
36
|
-
"@dxos/
|
|
37
|
-
"@dxos/
|
|
38
|
-
"@dxos/
|
|
39
|
-
"@dxos/
|
|
40
|
-
"@dxos/
|
|
41
|
-
"@dxos/
|
|
42
|
-
"@dxos/
|
|
43
|
-
"@dxos/
|
|
44
|
-
"@dxos/
|
|
45
|
-
"@dxos/
|
|
46
|
-
"@dxos/
|
|
47
|
-
"@dxos/
|
|
48
|
-
"@dxos/
|
|
49
|
-
"@dxos/
|
|
50
|
-
"@dxos/teleport
|
|
51
|
-
"@dxos/teleport-extension-
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/
|
|
54
|
-
"@dxos/
|
|
55
|
-
"@dxos/
|
|
56
|
-
"@dxos/
|
|
24
|
+
"platform": "^1.3.6",
|
|
25
|
+
"@dxos/async": "0.3.2-main.ec06501",
|
|
26
|
+
"@dxos/client-protocol": "0.3.2-main.ec06501",
|
|
27
|
+
"@dxos/codec-protobuf": "0.3.2-main.ec06501",
|
|
28
|
+
"@dxos/config": "0.3.2-main.ec06501",
|
|
29
|
+
"@dxos/context": "0.3.2-main.ec06501",
|
|
30
|
+
"@dxos/credentials": "0.3.2-main.ec06501",
|
|
31
|
+
"@dxos/crypto": "0.3.2-main.ec06501",
|
|
32
|
+
"@dxos/debug": "0.3.2-main.ec06501",
|
|
33
|
+
"@dxos/document-model": "0.3.2-main.ec06501",
|
|
34
|
+
"@dxos/echo-db": "0.3.2-main.ec06501",
|
|
35
|
+
"@dxos/echo-pipeline": "0.3.2-main.ec06501",
|
|
36
|
+
"@dxos/echo-schema": "0.3.2-main.ec06501",
|
|
37
|
+
"@dxos/feed-store": "0.3.2-main.ec06501",
|
|
38
|
+
"@dxos/invariant": "0.3.2-main.ec06501",
|
|
39
|
+
"@dxos/keyring": "0.3.2-main.ec06501",
|
|
40
|
+
"@dxos/keys": "0.3.2-main.ec06501",
|
|
41
|
+
"@dxos/lock-file": "0.3.2-main.ec06501",
|
|
42
|
+
"@dxos/log": "0.3.2-main.ec06501",
|
|
43
|
+
"@dxos/messaging": "0.3.2-main.ec06501",
|
|
44
|
+
"@dxos/model-factory": "0.3.2-main.ec06501",
|
|
45
|
+
"@dxos/network-manager": "0.3.2-main.ec06501",
|
|
46
|
+
"@dxos/node-std": "0.3.2-main.ec06501",
|
|
47
|
+
"@dxos/protocols": "0.3.2-main.ec06501",
|
|
48
|
+
"@dxos/random-access-storage": "0.3.2-main.ec06501",
|
|
49
|
+
"@dxos/rpc": "0.3.2-main.ec06501",
|
|
50
|
+
"@dxos/teleport": "0.3.2-main.ec06501",
|
|
51
|
+
"@dxos/teleport-extension-gossip": "0.3.2-main.ec06501",
|
|
52
|
+
"@dxos/teleport-extension-object-sync": "0.3.2-main.ec06501",
|
|
53
|
+
"@dxos/text-model": "0.3.2-main.ec06501",
|
|
54
|
+
"@dxos/timeframe": "0.3.2-main.ec06501",
|
|
55
|
+
"@dxos/tracing": "0.3.2-main.ec06501",
|
|
56
|
+
"@dxos/util": "0.3.2-main.ec06501",
|
|
57
|
+
"@dxos/websocket-rpc": "0.3.2-main.ec06501"
|
|
57
58
|
},
|
|
58
59
|
"devDependencies": {
|
|
60
|
+
"@types/platform": "^1.3.4",
|
|
59
61
|
"@types/readable-stream": "^2.3.9",
|
|
60
|
-
"@dxos/signal": "0.3.2-main.
|
|
62
|
+
"@dxos/signal": "0.3.2-main.ec06501"
|
|
61
63
|
},
|
|
62
64
|
"publishConfig": {
|
|
63
65
|
"access": "public"
|
|
@@ -5,14 +5,14 @@
|
|
|
5
5
|
import { EventSubscriptions } from '@dxos/async';
|
|
6
6
|
import { Stream } from '@dxos/codec-protobuf';
|
|
7
7
|
import { Device, DeviceKind, DevicesService, QueryDevicesResponse } from '@dxos/protocols/proto/dxos/client/services';
|
|
8
|
-
import {
|
|
8
|
+
import { DeviceProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
9
9
|
|
|
10
10
|
import { IdentityManager } from '../identity';
|
|
11
11
|
|
|
12
12
|
export class DevicesServiceImpl implements DevicesService {
|
|
13
13
|
constructor(private readonly _identityManager: IdentityManager) {}
|
|
14
14
|
|
|
15
|
-
updateDevice(
|
|
15
|
+
async updateDevice(profile: DeviceProfileDocument): Promise<Device> {
|
|
16
16
|
throw new Error('Method not implemented.');
|
|
17
17
|
}
|
|
18
18
|
|
|
@@ -24,9 +24,10 @@ export class DevicesServiceImpl implements DevicesService {
|
|
|
24
24
|
next({ devices: [] });
|
|
25
25
|
} else {
|
|
26
26
|
next({
|
|
27
|
-
devices: Array.from(deviceKeys.
|
|
27
|
+
devices: Array.from(deviceKeys.entries()).map(([key, profile]) => ({
|
|
28
28
|
deviceKey: key,
|
|
29
29
|
kind: this._identityManager.identity?.deviceKey.equals(key) ? DeviceKind.CURRENT : DeviceKind.TRUSTED,
|
|
30
|
+
profile,
|
|
30
31
|
})),
|
|
31
32
|
});
|
|
32
33
|
}
|
|
@@ -151,4 +151,16 @@ describe('identity/identity-manager', () => {
|
|
|
151
151
|
expect(identity2.space.protocol.sessions.get(identity1.deviceKey)).to.exist;
|
|
152
152
|
expect(identity2.space.protocol.sessions.get(identity1.deviceKey)?.authStatus).to.equal(AuthStatus.SUCCESS);
|
|
153
153
|
});
|
|
154
|
+
|
|
155
|
+
test('sets device profile', async () => {
|
|
156
|
+
const signalContext = new MemorySignalManagerContext();
|
|
157
|
+
|
|
158
|
+
const peer = await setupPeer({ signalContext });
|
|
159
|
+
const identity = await peer.identityManager.createIdentity();
|
|
160
|
+
|
|
161
|
+
// Note: Waiting for device profile credential to be processed.
|
|
162
|
+
await identity.stateUpdate.waitForCount(1);
|
|
163
|
+
|
|
164
|
+
expect(!!identity.authorizedDeviceKeys.get(identity.deviceKey)?.platform).is.true;
|
|
165
|
+
});
|
|
154
166
|
});
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
// Copyright 2022 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
+
import platform from 'platform';
|
|
6
|
+
|
|
5
7
|
import { Event } from '@dxos/async';
|
|
6
8
|
import { Context } from '@dxos/context';
|
|
7
9
|
import { createCredentialSignerWithKey, CredentialGenerator } from '@dxos/credentials';
|
|
@@ -134,6 +136,16 @@ export class IdentityManager {
|
|
|
134
136
|
// NOTE: This credential is written last. This is a hack to make sure that display name is set before identity is "ready".
|
|
135
137
|
credentials.push(await generator.createDeviceAuthorization(identityRecord.deviceKey));
|
|
136
138
|
|
|
139
|
+
// Write device metadata to profile.
|
|
140
|
+
credentials.push(
|
|
141
|
+
await generator.createDeviceProfile({
|
|
142
|
+
platform: platform.name,
|
|
143
|
+
platformVersion: platform.version,
|
|
144
|
+
architecture: typeof platform.os?.architecture === 'number' ? String(platform.os.architecture) : undefined,
|
|
145
|
+
os: platform.os?.family,
|
|
146
|
+
osVersion: platform.os?.version,
|
|
147
|
+
}),
|
|
148
|
+
);
|
|
137
149
|
for (const credential of credentials) {
|
|
138
150
|
await identity.controlPipeline.writer.write({
|
|
139
151
|
credential: { credential },
|
|
@@ -336,7 +336,7 @@ describe('identity/identity', () => {
|
|
|
336
336
|
await identity2.ready();
|
|
337
337
|
}
|
|
338
338
|
|
|
339
|
-
expect(Array.from(identity1.authorizedDeviceKeys.
|
|
340
|
-
expect(Array.from(identity2.authorizedDeviceKeys.
|
|
339
|
+
expect(Array.from(identity1.authorizedDeviceKeys.keys())).toEqual([identity1.deviceKey, identity2.deviceKey]);
|
|
340
|
+
expect(Array.from(identity2.authorizedDeviceKeys.keys())).toEqual([identity1.deviceKey, identity2.deviceKey]);
|
|
341
341
|
});
|
|
342
342
|
});
|
|
@@ -20,10 +20,10 @@ import { invariant } from '@dxos/invariant';
|
|
|
20
20
|
import { PublicKey } from '@dxos/keys';
|
|
21
21
|
import { log } from '@dxos/log';
|
|
22
22
|
import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
|
|
23
|
-
import { AdmittedFeed, ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
23
|
+
import { AdmittedFeed, DeviceProfileDocument, ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
24
24
|
import { DeviceAdmissionRequest } from '@dxos/protocols/proto/dxos/halo/invitations';
|
|
25
25
|
import { trace } from '@dxos/tracing';
|
|
26
|
-
import { ComplexSet } from '@dxos/util';
|
|
26
|
+
import { ComplexMap, ComplexSet } from '@dxos/util';
|
|
27
27
|
|
|
28
28
|
import { TrustedKeySetAuthVerifier } from './authenticator';
|
|
29
29
|
|
|
@@ -57,6 +57,8 @@ export class Identity {
|
|
|
57
57
|
this.identityKey = identityKey;
|
|
58
58
|
this.deviceKey = deviceKey;
|
|
59
59
|
|
|
60
|
+
log.trace('dxos.halo.device', { deviceKey });
|
|
61
|
+
|
|
60
62
|
this._deviceStateMachine = new DeviceStateMachine({
|
|
61
63
|
identityKey: this.identityKey,
|
|
62
64
|
deviceKey: this.deviceKey,
|
|
@@ -68,14 +70,14 @@ export class Identity {
|
|
|
68
70
|
});
|
|
69
71
|
|
|
70
72
|
this.authVerifier = new TrustedKeySetAuthVerifier({
|
|
71
|
-
trustedKeysProvider: () => this.authorizedDeviceKeys,
|
|
73
|
+
trustedKeysProvider: () => new ComplexSet(PublicKey.hash, this.authorizedDeviceKeys.keys()),
|
|
72
74
|
update: this.stateUpdate,
|
|
73
75
|
authTimeout: AUTH_TIMEOUT,
|
|
74
76
|
});
|
|
75
77
|
}
|
|
76
78
|
|
|
77
79
|
// TODO(burdon): Expose state object?
|
|
78
|
-
get authorizedDeviceKeys():
|
|
80
|
+
get authorizedDeviceKeys(): ComplexMap<PublicKey, DeviceProfileDocument> {
|
|
79
81
|
return this._deviceStateMachine.authorizedDeviceKeys;
|
|
80
82
|
}
|
|
81
83
|
|
|
@@ -128,8 +128,6 @@ export class InvitationsServiceImpl implements InvitationsService {
|
|
|
128
128
|
await accepted.cancel();
|
|
129
129
|
this._acceptInvitations.delete(invitationId);
|
|
130
130
|
this._removedAccepted.emit(accepted.get());
|
|
131
|
-
} else {
|
|
132
|
-
log.warn('invalid invitation', { invitationId });
|
|
133
131
|
}
|
|
134
132
|
}
|
|
135
133
|
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const DXOS_VERSION = "0.3.2-main.
|
|
1
|
+
export const DXOS_VERSION = "0.3.2-main.ec06501";
|