@dxos/client-services 0.3.11-main.8d54a30 → 0.3.11-main.8feb6a5
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-THRUWWCL.mjs → chunk-NL2YAECI.mjs} +40 -19
- package/dist/lib/browser/chunk-NL2YAECI.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/{chunk-FFVCPJTG.cjs → chunk-72F5Z47S.cjs} +42 -21
- package/dist/lib/node/chunk-72F5Z47S.cjs.map +7 -0
- package/dist/lib/node/index.cjs +37 -37
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node/packlets/testing/index.cjs +8 -8
- package/dist/types/src/packlets/identity/identity-service.d.ts +3 -3
- package/dist/types/src/packlets/identity/identity-service.d.ts.map +1 -1
- package/dist/types/src/packlets/services/service-host.d.ts.map +1 -1
- package/dist/types/src/version.d.ts +1 -1
- package/package.json +35 -35
- package/src/packlets/identity/identity-service.test.ts +1 -1
- package/src/packlets/identity/identity-service.ts +6 -3
- package/src/packlets/invitations/invitations-handler.ts +1 -1
- package/src/packlets/services/service-host.ts +27 -12
- package/src/version.ts +1 -1
- package/dist/lib/browser/chunk-THRUWWCL.mjs.map +0 -7
- package/dist/lib/node/chunk-FFVCPJTG.cjs.map +0 -7
|
@@ -31,7 +31,7 @@ __export(testing_exports, {
|
|
|
31
31
|
syncItemsLocal: () => syncItemsLocal
|
|
32
32
|
});
|
|
33
33
|
module.exports = __toCommonJS(testing_exports);
|
|
34
|
-
var
|
|
34
|
+
var import_chunk_72F5Z47S = require("../../chunk-72F5Z47S.cjs");
|
|
35
35
|
var import_credentials = require("@dxos/credentials");
|
|
36
36
|
var import_keys = require("@dxos/keys");
|
|
37
37
|
var import_async = require("@dxos/async");
|
|
@@ -216,7 +216,7 @@ var createInvitation = (host, options) => {
|
|
|
216
216
|
authMethod: import_services.Invitation.AuthMethod.NONE,
|
|
217
217
|
...options ?? {}
|
|
218
218
|
};
|
|
219
|
-
if (host instanceof
|
|
219
|
+
if (host instanceof import_chunk_72F5Z47S.ServiceContext) {
|
|
220
220
|
const hostHandler = host.getInvitationHandler({
|
|
221
221
|
kind: import_services.Invitation.Kind.SPACE,
|
|
222
222
|
...options
|
|
@@ -227,7 +227,7 @@ var createInvitation = (host, options) => {
|
|
|
227
227
|
};
|
|
228
228
|
var acceptInvitation = (guest, invitation) => {
|
|
229
229
|
invitation = sanitizeInvitation(invitation);
|
|
230
|
-
if (guest instanceof
|
|
230
|
+
if (guest instanceof import_chunk_72F5Z47S.ServiceContext) {
|
|
231
231
|
const guestHandler = guest.getInvitationHandler({
|
|
232
232
|
kind: invitation.kind
|
|
233
233
|
});
|
|
@@ -236,7 +236,7 @@ var acceptInvitation = (guest, invitation) => {
|
|
|
236
236
|
return guest.join(invitation);
|
|
237
237
|
};
|
|
238
238
|
var createServiceHost = (config, signalManagerContext) => {
|
|
239
|
-
return new
|
|
239
|
+
return new import_chunk_72F5Z47S.ClientServicesHost({
|
|
240
240
|
config,
|
|
241
241
|
signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
|
|
242
242
|
transportFactory: import_network_manager.MemoryTransportFactory
|
|
@@ -250,8 +250,8 @@ var createServiceContext = ({ signalContext = new import_messaging.MemorySignalM
|
|
|
250
250
|
signalManager,
|
|
251
251
|
transportFactory: import_network_manager.MemoryTransportFactory
|
|
252
252
|
});
|
|
253
|
-
const modelFactory = (0,
|
|
254
|
-
return new
|
|
253
|
+
const modelFactory = (0, import_chunk_72F5Z47S.createDefaultModelFactory)();
|
|
254
|
+
return new import_chunk_72F5Z47S.ServiceContext(storage, networkManager, signalManager, modelFactory);
|
|
255
255
|
};
|
|
256
256
|
var createPeers = async (numPeers) => {
|
|
257
257
|
const signalContext = new import_messaging.MemorySignalManagerContext();
|
|
@@ -335,7 +335,7 @@ var TestPeer = class {
|
|
|
335
335
|
feedStore: this.feedStore,
|
|
336
336
|
networkManager: this.networkManager,
|
|
337
337
|
metadataStore: this.metadataStore,
|
|
338
|
-
modelFactory: (0,
|
|
338
|
+
modelFactory: (0, import_chunk_72F5Z47S.createDefaultModelFactory)(),
|
|
339
339
|
snapshotStore: this.snapshotStore,
|
|
340
340
|
blobStore: this.blobStore
|
|
341
341
|
});
|
|
@@ -347,7 +347,7 @@ var TestPeer = class {
|
|
|
347
347
|
return this._props.automergeHost ??= new import_echo_pipeline.AutomergeHost(this.storage.createDirectory("automerge"));
|
|
348
348
|
}
|
|
349
349
|
get dataSpaceManager() {
|
|
350
|
-
return this._props.dataSpaceManager ??= new
|
|
350
|
+
return this._props.dataSpaceManager ??= new import_chunk_72F5Z47S.DataSpaceManager(this.spaceManager, this.metadataStore, new import_echo_pipeline.DataServiceSubscriptions(), this.keyring, this.identity, this.feedStore, this.automergeHost);
|
|
351
351
|
}
|
|
352
352
|
async createIdentity() {
|
|
353
353
|
this._props.signingContext ??= await createSigningContext(this.keyring);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Stream } from '@dxos/codec-protobuf';
|
|
2
2
|
import { type Keyring } from '@dxos/keyring';
|
|
3
|
-
import { type Identity, type IdentityService, type QueryIdentityResponse, type RecoverIdentityRequest, type SignPresentationRequest } from '@dxos/protocols/proto/dxos/client/services';
|
|
3
|
+
import { type CreateIdentityRequest, type Identity, type IdentityService, type QueryIdentityResponse, type RecoverIdentityRequest, type SignPresentationRequest } from '@dxos/protocols/proto/dxos/client/services';
|
|
4
4
|
import { type Presentation, type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
5
5
|
import { type CreateIdentityOptions, type IdentityManager } from './identity-manager';
|
|
6
6
|
export declare class IdentityServiceImpl implements IdentityService {
|
|
@@ -8,8 +8,8 @@ export declare class IdentityServiceImpl implements IdentityService {
|
|
|
8
8
|
private readonly _identityManager;
|
|
9
9
|
private readonly _keyring;
|
|
10
10
|
private readonly _onProfileUpdate?;
|
|
11
|
-
constructor(_createIdentity: (params
|
|
12
|
-
createIdentity(request:
|
|
11
|
+
constructor(_createIdentity: (params: CreateIdentityOptions, useAutomerge: boolean) => Promise<Identity>, _identityManager: IdentityManager, _keyring: Keyring, _onProfileUpdate?: ((profile: ProfileDocument | undefined) => Promise<void>) | undefined);
|
|
12
|
+
createIdentity(request: CreateIdentityRequest): Promise<Identity>;
|
|
13
13
|
recoverIdentity(request: RecoverIdentityRequest): Promise<Identity>;
|
|
14
14
|
queryIdentity(): Stream<QueryIdentityResponse>;
|
|
15
15
|
private _getIdentity;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAI9C,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC7B,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAEtG,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"identity-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/identity/identity-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAI9C,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,QAAQ,EACb,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC7B,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAEtG,OAAO,EAAE,KAAK,qBAAqB,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAItF,qBAAa,mBAAoB,YAAW,eAAe;IAEvD,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAHjB,eAAe,EAAE,CAAC,MAAM,EAAE,qBAAqB,EAAE,YAAY,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,EAC5F,gBAAgB,EAAE,eAAe,EACjC,QAAQ,EAAE,OAAO,EACjB,gBAAgB,CAAC,aAAY,eAAe,GAAG,SAAS,KAAK,QAAQ,IAAI,CAAC,aAAA;IAGvF,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAKjE,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAIzE,aAAa,IAAI,MAAM,CAAC,qBAAqB,CAAC;IAS9C,OAAO,CAAC,YAAY;IAYd,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC;IAO1D,gBAAgB,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAC,YAAY,CAAC;CAWhG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-host.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,KAAK,cAAc,EAA0B,MAAM,uBAAuB,CAAC;AACzG,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAOxC,OAAO,EAAE,KAAK,aAAa,EAA0B,MAAM,iBAAiB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAoD,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIhH,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAM3D,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAarD,eAAO,MAAM,yBAAyB,oBAErC,CAAC;AAiBF,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,2BAA2B,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBACa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IACrD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuC;IAEvE,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,UAAU,CAAC,CAA8B;IACjD,OAAO,CAAC,cAAc,CAAC,CAAyC;IAEhE,OAAO,CAAC,eAAe,CAAkB;IAGzC,OAAO,CAAC,QAAQ,CAAS;IAGzB,OAAO,CAAC,KAAK,CAAS;gBAEV,EACV,MAAM,EACN,YAA0C,EAC1C,gBAAgB,EAChB,aAAa,EACb,OAAO,EAEP,OAAO,EACP,SAAS,GACV,GAAE,wBAA6B;IAiDhC,IAAI,MAAM,YAET;IAED,IAAI,MAAM,uBAET;IAED,IAAI,OAAO,mBAEV;IAED,IAAI,eAAe,oCAElB;IAED,IAAI,WAAW,sDAEd;IAED,IAAI,QAAQ,4BAEX;IAED;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,iBAAiB;IAiC9C,IAAI,CAAC,GAAG,EAAE,OAAO;IA6FjB,KAAK;IAgBL,KAAK;YAYG,eAAe;
|
|
1
|
+
{"version":3,"file":"service-host.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/service-host.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,KAAK,cAAc,EAA0B,MAAM,uBAAuB,CAAC;AACzG,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAOxC,OAAO,EAAE,KAAK,aAAa,EAA0B,MAAM,iBAAiB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAoD,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIhH,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAM3D,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAarD,eAAO,MAAM,yBAAyB,oBAErC,CAAC;AAiBF,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,2BAA2B,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;GAEG;AACH,qBACa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;IACnE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IACrD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuC;IAEvE,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,cAAc,CAAC,CAAgB;IACvC,OAAO,CAAC,eAAe,CAAC,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,CAAU;IAC3B,OAAO,CAAC,UAAU,CAAC,CAA8B;IACjD,OAAO,CAAC,cAAc,CAAC,CAAyC;IAEhE,OAAO,CAAC,eAAe,CAAkB;IAGzC,OAAO,CAAC,QAAQ,CAAS;IAGzB,OAAO,CAAC,KAAK,CAAS;gBAEV,EACV,MAAM,EACN,YAA0C,EAC1C,gBAAgB,EAChB,aAAa,EACb,OAAO,EAEP,OAAO,EACP,SAAS,GACV,GAAE,wBAA6B;IAiDhC,IAAI,MAAM,YAET;IAED,IAAI,MAAM,uBAET;IAED,IAAI,OAAO,mBAEV;IAED,IAAI,eAAe,oCAElB;IAED,IAAI,WAAW,sDAEd;IAED,IAAI,QAAQ,4BAEX;IAED;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,EAAE,iBAAiB;IAiC9C,IAAI,CAAC,GAAG,EAAE,OAAO;IA6FjB,KAAK;IAgBL,KAAK;YAYG,eAAe;CAiC9B"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const DXOS_VERSION = "0.3.11-main.
|
|
1
|
+
export declare const DXOS_VERSION = "0.3.11-main.8feb6a5";
|
|
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.11-main.
|
|
3
|
+
"version": "0.3.11-main.8feb6a5",
|
|
4
4
|
"description": "DXOS client services implementation",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -22,44 +22,44 @@
|
|
|
22
22
|
],
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"platform": "^1.3.6",
|
|
25
|
-
"@dxos/async": "0.3.11-main.
|
|
26
|
-
"@dxos/client-protocol": "0.3.11-main.
|
|
27
|
-
"@dxos/
|
|
28
|
-
"@dxos/
|
|
29
|
-
"@dxos/
|
|
30
|
-
"@dxos/
|
|
31
|
-
"@dxos/
|
|
32
|
-
"@dxos/debug": "0.3.11-main.
|
|
33
|
-
"@dxos/
|
|
34
|
-
"@dxos/echo-pipeline": "0.3.11-main.
|
|
35
|
-
"@dxos/
|
|
36
|
-
"@dxos/
|
|
37
|
-
"@dxos/
|
|
38
|
-
"@dxos/
|
|
39
|
-
"@dxos/keyring": "0.3.11-main.
|
|
40
|
-
"@dxos/keys": "0.3.11-main.
|
|
41
|
-
"@dxos/lock-file": "0.3.11-main.
|
|
42
|
-
"@dxos/log": "0.3.11-main.
|
|
43
|
-
"@dxos/
|
|
44
|
-
"@dxos/
|
|
45
|
-
"@dxos/network-manager": "0.3.11-main.
|
|
46
|
-
"@dxos/node-std": "0.3.11-main.
|
|
47
|
-
"@dxos/protocols": "0.3.11-main.
|
|
48
|
-
"@dxos/
|
|
49
|
-
"@dxos/
|
|
50
|
-
"@dxos/teleport-extension-
|
|
51
|
-
"@dxos/
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/text-model": "0.3.11-main.
|
|
54
|
-
"@dxos/
|
|
55
|
-
"@dxos/
|
|
56
|
-
"@dxos/util": "0.3.11-main.
|
|
57
|
-
"@dxos/websocket-rpc": "0.3.11-main.
|
|
25
|
+
"@dxos/async": "0.3.11-main.8feb6a5",
|
|
26
|
+
"@dxos/client-protocol": "0.3.11-main.8feb6a5",
|
|
27
|
+
"@dxos/codec-protobuf": "0.3.11-main.8feb6a5",
|
|
28
|
+
"@dxos/config": "0.3.11-main.8feb6a5",
|
|
29
|
+
"@dxos/credentials": "0.3.11-main.8feb6a5",
|
|
30
|
+
"@dxos/crypto": "0.3.11-main.8feb6a5",
|
|
31
|
+
"@dxos/context": "0.3.11-main.8feb6a5",
|
|
32
|
+
"@dxos/debug": "0.3.11-main.8feb6a5",
|
|
33
|
+
"@dxos/document-model": "0.3.11-main.8feb6a5",
|
|
34
|
+
"@dxos/echo-pipeline": "0.3.11-main.8feb6a5",
|
|
35
|
+
"@dxos/echo-db": "0.3.11-main.8feb6a5",
|
|
36
|
+
"@dxos/feed-store": "0.3.11-main.8feb6a5",
|
|
37
|
+
"@dxos/invariant": "0.3.11-main.8feb6a5",
|
|
38
|
+
"@dxos/echo-schema": "0.3.11-main.8feb6a5",
|
|
39
|
+
"@dxos/keyring": "0.3.11-main.8feb6a5",
|
|
40
|
+
"@dxos/keys": "0.3.11-main.8feb6a5",
|
|
41
|
+
"@dxos/lock-file": "0.3.11-main.8feb6a5",
|
|
42
|
+
"@dxos/log": "0.3.11-main.8feb6a5",
|
|
43
|
+
"@dxos/model-factory": "0.3.11-main.8feb6a5",
|
|
44
|
+
"@dxos/messaging": "0.3.11-main.8feb6a5",
|
|
45
|
+
"@dxos/network-manager": "0.3.11-main.8feb6a5",
|
|
46
|
+
"@dxos/node-std": "0.3.11-main.8feb6a5",
|
|
47
|
+
"@dxos/protocols": "0.3.11-main.8feb6a5",
|
|
48
|
+
"@dxos/random-access-storage": "0.3.11-main.8feb6a5",
|
|
49
|
+
"@dxos/rpc": "0.3.11-main.8feb6a5",
|
|
50
|
+
"@dxos/teleport-extension-gossip": "0.3.11-main.8feb6a5",
|
|
51
|
+
"@dxos/teleport": "0.3.11-main.8feb6a5",
|
|
52
|
+
"@dxos/teleport-extension-object-sync": "0.3.11-main.8feb6a5",
|
|
53
|
+
"@dxos/text-model": "0.3.11-main.8feb6a5",
|
|
54
|
+
"@dxos/tracing": "0.3.11-main.8feb6a5",
|
|
55
|
+
"@dxos/timeframe": "0.3.11-main.8feb6a5",
|
|
56
|
+
"@dxos/util": "0.3.11-main.8feb6a5",
|
|
57
|
+
"@dxos/websocket-rpc": "0.3.11-main.8feb6a5"
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
60
|
"@types/platform": "^1.3.4",
|
|
61
61
|
"@types/readable-stream": "^2.3.9",
|
|
62
|
-
"@dxos/signal": "0.3.11-main.
|
|
62
|
+
"@dxos/signal": "0.3.11-main.8feb6a5"
|
|
63
63
|
},
|
|
64
64
|
"publishConfig": {
|
|
65
65
|
"access": "public"
|
|
@@ -44,7 +44,7 @@ describe('IdentityService', () => {
|
|
|
44
44
|
});
|
|
45
45
|
|
|
46
46
|
test('creates a new identity with a display name', async () => {
|
|
47
|
-
const identity = await identityService.createIdentity({ displayName: 'Example' });
|
|
47
|
+
const identity = await identityService.createIdentity({ profile: { displayName: 'Example' } });
|
|
48
48
|
|
|
49
49
|
expect(identity.identityKey).to.be.instanceof(PublicKey);
|
|
50
50
|
expect(identity.spaceKey).to.be.instanceof(PublicKey);
|
|
@@ -8,6 +8,7 @@ import { todo } from '@dxos/debug';
|
|
|
8
8
|
import { invariant } from '@dxos/invariant';
|
|
9
9
|
import { type Keyring } from '@dxos/keyring';
|
|
10
10
|
import {
|
|
11
|
+
type CreateIdentityRequest,
|
|
11
12
|
type Identity,
|
|
12
13
|
type IdentityService,
|
|
13
14
|
type QueryIdentityResponse,
|
|
@@ -18,16 +19,18 @@ import { type Presentation, type ProfileDocument } from '@dxos/protocols/proto/d
|
|
|
18
19
|
|
|
19
20
|
import { type CreateIdentityOptions, type IdentityManager } from './identity-manager';
|
|
20
21
|
|
|
22
|
+
const CREATE_PROFILE_WITH_AUTOMERGE_DEFAULT = true;
|
|
23
|
+
|
|
21
24
|
export class IdentityServiceImpl implements IdentityService {
|
|
22
25
|
constructor(
|
|
23
|
-
private readonly _createIdentity: (params
|
|
26
|
+
private readonly _createIdentity: (params: CreateIdentityOptions, useAutomerge: boolean) => Promise<Identity>,
|
|
24
27
|
private readonly _identityManager: IdentityManager,
|
|
25
28
|
private readonly _keyring: Keyring,
|
|
26
29
|
private readonly _onProfileUpdate?: (profile: ProfileDocument | undefined) => Promise<void>,
|
|
27
30
|
) {}
|
|
28
31
|
|
|
29
|
-
async createIdentity(request:
|
|
30
|
-
await this._createIdentity(request);
|
|
32
|
+
async createIdentity(request: CreateIdentityRequest): Promise<Identity> {
|
|
33
|
+
await this._createIdentity(request.profile ?? {}, request.useAutomerge ?? CREATE_PROFILE_WITH_AUTOMERGE_DEFAULT);
|
|
31
34
|
return this._getIdentity()!;
|
|
32
35
|
}
|
|
33
36
|
|
|
@@ -321,7 +321,7 @@ export class InvitationsHandler {
|
|
|
321
321
|
|
|
322
322
|
// 5. Success.
|
|
323
323
|
log('admitted by host', { ...protocol.toJSON() });
|
|
324
|
-
setState({ ...result, state: Invitation.State.SUCCESS });
|
|
324
|
+
setState({ ...result, target: invitation.target, state: Invitation.State.SUCCESS });
|
|
325
325
|
log.trace('dxos.sdk.invitations-handler.guest.onOpen', trace.end({ id: traceId }));
|
|
326
326
|
} catch (err: any) {
|
|
327
327
|
if (err instanceof TimeoutError) {
|
|
@@ -8,7 +8,7 @@ import { type Config } from '@dxos/config';
|
|
|
8
8
|
import { Context } from '@dxos/context';
|
|
9
9
|
import { DocumentModel } from '@dxos/document-model';
|
|
10
10
|
import { DataServiceImpl } from '@dxos/echo-pipeline';
|
|
11
|
-
import { type TypedObject, base } from '@dxos/echo-schema';
|
|
11
|
+
import { type TypedObject, base, getRawDoc } from '@dxos/echo-schema';
|
|
12
12
|
import { invariant } from '@dxos/invariant';
|
|
13
13
|
import { PublicKey } from '@dxos/keys';
|
|
14
14
|
import { log } from '@dxos/log';
|
|
@@ -28,7 +28,7 @@ import { ServiceContext } from './service-context';
|
|
|
28
28
|
import { ServiceRegistry } from './service-registry';
|
|
29
29
|
import { DevicesServiceImpl } from '../devices';
|
|
30
30
|
import { DevtoolsServiceImpl, DevtoolsHostEvents } from '../devtools';
|
|
31
|
-
import { type CreateIdentityOptions
|
|
31
|
+
import { IdentityServiceImpl, type CreateIdentityOptions } from '../identity';
|
|
32
32
|
import { InvitationsServiceImpl } from '../invitations';
|
|
33
33
|
import { Lock, type ResourceLock } from '../locks';
|
|
34
34
|
import { LoggingServiceImpl } from '../logging';
|
|
@@ -260,7 +260,7 @@ export class ClientServicesHost {
|
|
|
260
260
|
SystemService: this._systemService,
|
|
261
261
|
|
|
262
262
|
IdentityService: new IdentityServiceImpl(
|
|
263
|
-
(params) => this._createIdentity(params),
|
|
263
|
+
(params, useAutomerge) => this._createIdentity(params, useAutomerge),
|
|
264
264
|
this._serviceContext.identityManager,
|
|
265
265
|
this._serviceContext.keyring,
|
|
266
266
|
(profile) => this._serviceContext.broadcastProfileUpdate(profile),
|
|
@@ -351,21 +351,36 @@ export class ClientServicesHost {
|
|
|
351
351
|
await this._callbacks?.onReset?.();
|
|
352
352
|
}
|
|
353
353
|
|
|
354
|
-
private async _createIdentity(params
|
|
354
|
+
private async _createIdentity(params: CreateIdentityOptions, useAutomerge: boolean) {
|
|
355
355
|
const identity = await this._serviceContext.createIdentity(params);
|
|
356
356
|
|
|
357
357
|
// Setup default space.
|
|
358
358
|
await this._serviceContext.initialized.wait();
|
|
359
359
|
const space = await this._serviceContext.dataSpaceManager!.createSpace();
|
|
360
|
-
|
|
360
|
+
|
|
361
|
+
const obj: TypedObject = new Properties(undefined, { automerge: useAutomerge });
|
|
361
362
|
obj[defaultKey] = identity.identityKey.toHex();
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
363
|
+
|
|
364
|
+
if (!useAutomerge) {
|
|
365
|
+
await this._serviceRegistry.services.DataService!.write({
|
|
366
|
+
spaceKey: space.key,
|
|
367
|
+
batch: {
|
|
368
|
+
objects: [createGenesisMutationFromTypedObject(obj)],
|
|
369
|
+
},
|
|
370
|
+
});
|
|
371
|
+
await this._serviceRegistry.services.DataService!.flush({ spaceKey: space.key });
|
|
372
|
+
} else {
|
|
373
|
+
// TODO(dmaretskyi): Refactor this.
|
|
374
|
+
const automergeIndex = space.automergeSpaceState.rootUrl;
|
|
375
|
+
invariant(automergeIndex);
|
|
376
|
+
const document = await this._serviceContext.automergeHost.repo.find(automergeIndex as any);
|
|
377
|
+
await document.whenReady();
|
|
378
|
+
|
|
379
|
+
document.change((doc: any) => {
|
|
380
|
+
doc.objects ??= {};
|
|
381
|
+
doc.objects[obj[base]._id] = getRawDoc(obj).handle.docSync();
|
|
382
|
+
});
|
|
383
|
+
}
|
|
369
384
|
|
|
370
385
|
return identity;
|
|
371
386
|
}
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const DXOS_VERSION = "0.3.11-main.
|
|
1
|
+
export const DXOS_VERSION = "0.3.11-main.8feb6a5";
|