@dxos/client-services 0.6.2 → 0.6.3-main.0308ae2
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-CFKVGKP3.mjs → chunk-5VHFFY7B.mjs} +143 -122
- package/dist/lib/browser/chunk-5VHFFY7B.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-7XBIZ7NK.cjs → chunk-CVLKGJK5.cjs} +141 -120
- package/dist/lib/node/chunk-CVLKGJK5.cjs.map +7 -0
- package/dist/lib/node/index.cjs +45 -45
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node/packlets/testing/index.cjs +8 -8
- package/dist/types/src/packlets/invitations/invitation-guest-extenstion.d.ts.map +1 -1
- package/dist/types/src/packlets/invitations/invitation-host-extension.d.ts.map +1 -1
- package/dist/types/src/packlets/invitations/invitation-topology.d.ts +2 -2
- package/dist/types/src/packlets/invitations/invitation-topology.d.ts.map +1 -1
- package/dist/types/src/packlets/invitations/invitations-handler.d.ts.map +1 -1
- package/dist/types/src/packlets/spaces/data-space-manager.d.ts.map +1 -1
- package/dist/types/src/packlets/spaces/data-space.d.ts +8 -2
- package/dist/types/src/packlets/spaces/data-space.d.ts.map +1 -1
- package/dist/types/src/version.d.ts +1 -1
- package/dist/types/src/version.d.ts.map +1 -1
- package/package.json +36 -36
- package/src/packlets/identity/identity-service.ts +2 -2
- package/src/packlets/invitations/invitation-guest-extenstion.ts +8 -5
- package/src/packlets/invitations/invitation-host-extension.ts +5 -5
- package/src/packlets/invitations/invitation-topology.ts +4 -4
- package/src/packlets/invitations/invitations-handler.ts +13 -12
- package/src/packlets/spaces/data-space-manager.test.ts +6 -6
- package/src/packlets/spaces/data-space-manager.ts +28 -16
- package/src/packlets/spaces/data-space.ts +31 -27
- package/src/packlets/spaces/spaces-service.ts +6 -6
- package/src/version.ts +1 -5
- package/dist/lib/browser/chunk-CFKVGKP3.mjs.map +0 -7
- package/dist/lib/node/chunk-7XBIZ7NK.cjs.map +0 -7
|
@@ -30,7 +30,7 @@ __export(testing_exports, {
|
|
|
30
30
|
sanitizeInvitation: () => sanitizeInvitation
|
|
31
31
|
});
|
|
32
32
|
module.exports = __toCommonJS(testing_exports);
|
|
33
|
-
var
|
|
33
|
+
var import_chunk_CVLKGJK5 = require("../../chunk-CVLKGJK5.cjs");
|
|
34
34
|
var import_credentials = require("@dxos/credentials");
|
|
35
35
|
var import_keys = require("@dxos/keys");
|
|
36
36
|
var import_async = require("@dxos/async");
|
|
@@ -227,7 +227,7 @@ var createInvitation = async (host, options) => {
|
|
|
227
227
|
authMethod: import_services.Invitation.AuthMethod.NONE,
|
|
228
228
|
...options ?? {}
|
|
229
229
|
};
|
|
230
|
-
if (host instanceof
|
|
230
|
+
if (host instanceof import_chunk_CVLKGJK5.ServiceContext) {
|
|
231
231
|
return host.invitationsManager.createInvitation({
|
|
232
232
|
kind: import_services.Invitation.Kind.SPACE,
|
|
233
233
|
...options
|
|
@@ -237,7 +237,7 @@ var createInvitation = async (host, options) => {
|
|
|
237
237
|
};
|
|
238
238
|
var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
|
|
239
239
|
invitation = sanitizeInvitation(invitation);
|
|
240
|
-
if (guest instanceof
|
|
240
|
+
if (guest instanceof import_chunk_CVLKGJK5.ServiceContext) {
|
|
241
241
|
return guest.invitationsManager.acceptInvitation({
|
|
242
242
|
invitation,
|
|
243
243
|
deviceProfile: guestDeviceProfile
|
|
@@ -247,7 +247,7 @@ var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
|
|
|
247
247
|
};
|
|
248
248
|
var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/testing/test-builder.ts";
|
|
249
249
|
var createServiceHost = (config, signalManagerContext) => {
|
|
250
|
-
return new
|
|
250
|
+
return new import_chunk_CVLKGJK5.ClientServicesHost({
|
|
251
251
|
config,
|
|
252
252
|
signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
|
|
253
253
|
transportFactory: import_network_manager.MemoryTransportFactory
|
|
@@ -263,7 +263,7 @@ var createServiceContext = async ({ signalContext = new import_messaging.MemoryS
|
|
|
263
263
|
});
|
|
264
264
|
const level = (0, import_testing.createTestLevel)();
|
|
265
265
|
await level.open();
|
|
266
|
-
return new
|
|
266
|
+
return new import_chunk_CVLKGJK5.ServiceContext(storage, level, networkManager, signalManager, {
|
|
267
267
|
invitationConnectionDefaultParams: {
|
|
268
268
|
controlHeartbeatInterval: 200
|
|
269
269
|
},
|
|
@@ -370,12 +370,12 @@ var TestPeer = class {
|
|
|
370
370
|
});
|
|
371
371
|
}
|
|
372
372
|
get dataSpaceManager() {
|
|
373
|
-
return this._props.dataSpaceManager ??= new
|
|
373
|
+
return this._props.dataSpaceManager ??= new import_chunk_CVLKGJK5.DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, this.identity, this.feedStore, this.echoHost, this.invitationsManager, this._opts.dataSpaceParams);
|
|
374
374
|
}
|
|
375
375
|
get invitationsManager() {
|
|
376
|
-
return this._props.invitationsManager ??= new
|
|
376
|
+
return this._props.invitationsManager ??= new import_chunk_CVLKGJK5.InvitationsManager(new import_chunk_CVLKGJK5.InvitationsHandler(this.networkManager), (invitation) => {
|
|
377
377
|
if (invitation.kind === import_services2.Invitation.Kind.SPACE) {
|
|
378
|
-
return new
|
|
378
|
+
return new import_chunk_CVLKGJK5.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
|
|
379
379
|
} else {
|
|
380
380
|
throw new Error("not implemented");
|
|
381
381
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation-guest-extenstion.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitation-guest-extenstion.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAA4B,MAAM,aAAa,CAAC;AACnE,OAAO,EAAqB,OAAO,EAAE,MAAM,eAAe,CAAC;AAI3D,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,KAAK,qBAAqB,
|
|
1
|
+
{"version":3,"file":"invitation-guest-extenstion.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitation-guest-extenstion.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAA4B,MAAM,aAAa,CAAC;AACnE,OAAO,EAAqB,OAAO,EAAE,MAAM,eAAe,CAAC;AAI3D,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,KAAK,qBAAqB,EAAqB,MAAM,6CAA6C,CAAC;AAC5G,OAAO,EAAE,KAAK,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAMrE,KAAK,iCAAiC,GAAG;IAEvC,MAAM,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC/D,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAEhC,aAAa,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,KAAK,KAAK,IAAI,CAAC;CACrD,CAAC;AAEF;;GAEG;AACH,qBAAa,wBAAyB,SAAQ,YAAY,CACxD;IAAE,qBAAqB,EAAE,qBAAqB,CAAA;CAAE,EAChD;IAAE,qBAAqB,EAAE,qBAAqB,CAAA;CAAE,CACjD;IAUG,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAV7B,OAAO,CAAC,IAAI,CAAiB;IAC7B,OAAO,CAAC,cAAc,CAAC,CAAoB;IAC3C,OAAO,CAAC,qBAAqB,CAAiB;IAC9C;;OAEG;IACH,OAAO,CAAC,mBAAmB,CAA2B;gBAGnC,oBAAoB,EAAE,KAAK,EAC3B,UAAU,EAAE,iCAAiC;IAYzD,WAAW,IAAI,OAAO;cAIJ,WAAW,IAAI,OAAO,CAAC;QAAE,qBAAqB,EAAE,qBAAqB,CAAA;KAAE,CAAC;IAqBlF,MAAM,CAAC,OAAO,EAAE,gBAAgB;IAiChC,OAAO;IAIP,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAIzB,QAAQ;CAQvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation-host-extension.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitation-host-extension.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAmB,OAAO,EAAgB,MAAM,aAAa,CAAC;AACjF,OAAO,EAAqB,OAAO,EAAE,MAAM,eAAe,CAAC;AAG3D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AACxE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EAEtB,KAAK,qBAAqB,EAE3B,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,KAAK,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAOrE,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAElC,KAAK,gCAAgC,GAAG;IACtC,gBAAgB,EAAE,UAAU,GAAG,IAAI,CAAC;IAGpC,MAAM,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC/D,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAEhC,aAAa,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,KAAK,KAAK,IAAI,CAAC;IAEpD,KAAK,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;CAClE,CAAC;AAEF;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,YAAY,CACvD;IAAE,qBAAqB,EAAE,qBAAqB,CAAA;CAAE,EAChD;IAAE,qBAAqB,EAAE,qBAAqB,CAAA;CAAE,CACjD;IA8BG,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU;IA1B7B,OAAO,CAAC,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"invitation-host-extension.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitation-host-extension.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAmB,OAAO,EAAgB,MAAM,aAAa,CAAC;AACjF,OAAO,EAAqB,OAAO,EAAE,MAAM,eAAe,CAAC;AAG3D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AACxE,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EAEtB,KAAK,qBAAqB,EAE3B,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,KAAK,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAOrE,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAElC,KAAK,gCAAgC,GAAG;IACtC,gBAAgB,EAAE,UAAU,GAAG,IAAI,CAAC;IAGpC,MAAM,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC/D,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAEhC,aAAa,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,KAAK,KAAK,IAAI,CAAC;IAEpD,KAAK,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;CAClE,CAAC;AAEF;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,YAAY,CACvD;IAAE,qBAAqB,EAAE,qBAAqB,CAAA;CAAE,EAChD;IAAE,qBAAqB,EAAE,qBAAqB,CAAA;CAAE,CACjD;IA8BG,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU;IA1B7B,OAAO,CAAC,cAAc,CAAC,CAAoB;IAC3C,OAAO,CAAC,qBAAqB,CAAiB;IAE9C,OAAO,CAAC,UAAU,CAAC,CAAqB;IAEjC,YAAY,CAAC,EAAE,eAAe,CAAa;IAE3C,oBAAoB,UAAS;IAEpC;;OAEG;IACI,mBAAmB,SAAK;IAE/B;;OAEG;IACI,gBAAgB,qBAA4B;IAEnD;;OAEG;IACH,OAAO,CAAC,mBAAmB,CAA2B;gBAGnC,oBAAoB,EAAE,KAAK,EAC3B,UAAU,EAAE,gCAAgC;IAYxD,WAAW,IAAI,OAAO;cAIJ,WAAW,IAAI,OAAO,CAAC;QAAE,qBAAqB,EAAE,qBAAqB,CAAA;KAAE,CAAC;IA0IlF,MAAM,CAAC,OAAO,EAAE,gBAAgB;IAkC/C,OAAO,CAAC,wBAAwB;IAShC,OAAO,CAAC,sBAAsB;IAWf,OAAO;IAIP,OAAO;YAIR,QAAQ;CAQvB;AAED,eAAO,MAAM,wBAAwB,eAAgB,UAAU,YACT,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PublicKey } from '@dxos/keys';
|
|
2
2
|
import type { SwarmController, Topology } from '@dxos/network-manager';
|
|
3
|
-
import {
|
|
3
|
+
import { InvitationOptions } from '@dxos/protocols/proto/dxos/halo/invitations';
|
|
4
4
|
/**
|
|
5
5
|
* Hosts are listening on an invitation topic.
|
|
6
6
|
* They initiate a connection with any new peer if they are not currently in the invitation flow
|
|
@@ -27,7 +27,7 @@ export declare class InvitationTopology implements Topology {
|
|
|
27
27
|
* for guests we failed an invitation flow with (potentially due to a network error).
|
|
28
28
|
*/
|
|
29
29
|
private _seenPeers;
|
|
30
|
-
constructor(_role:
|
|
30
|
+
constructor(_role: InvitationOptions.Role);
|
|
31
31
|
init(controller: SwarmController): void;
|
|
32
32
|
update(): void;
|
|
33
33
|
onOffer(peer: PublicKey): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation-topology.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitation-topology.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"invitation-topology.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitation-topology.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAGhF;;;;;;;;;;;;;GAaG;AACH,qBAAa,kBAAmB,YAAW,QAAQ;IAarC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAZlC,OAAO,CAAC,WAAW,CAAC,CAAkB;IAEtC;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU,CAA6C;gBAElC,KAAK,EAAE,iBAAiB,CAAC,IAAI;IAE1D,IAAI,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI;IAKvC,MAAM,IAAI,IAAI;IA6BR,OAAO,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAK1C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,QAAQ;CAGT"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitations-handler.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitations-handler.ts"],"names":[],"mappings":";AAIA,OAAO,EAAS,KAAK,UAAU,EAA8B,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAE/F,OAAO,EAAE,KAAK,OAAO,EAAwB,MAAM,eAAe,CAAC;AAOnE,OAAO,EAAE,KAAK,gBAAgB,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAC/F,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AASzF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"invitations-handler.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitations-handler.ts"],"names":[],"mappings":";AAIA,OAAO,EAAS,KAAK,UAAU,EAA8B,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAE/F,OAAO,EAAE,KAAK,OAAO,EAAwB,MAAM,eAAe,CAAC;AAOnE,OAAO,EAAE,KAAK,gBAAgB,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAC/F,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AASzF,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAUhE;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IAG1C,oBAAoB,CAClB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,EAC9B,QAAQ,EAAE,kBAAkB,EAC5B,UAAU,EAAE,UAAU,GACrB,IAAI;IAwHP,gBAAgB,CACd,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,EAC9B,QAAQ,EAAE,kBAAkB,EAC5B,UAAU,EAAE,UAAU,EACtB,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,EAClC,aAAa,CAAC,EAAE,qBAAqB,GACpC,IAAI;YA+JO,UAAU;IA2BxB;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAsD3B,OAAO,CAAC,eAAe;IAgBvB,OAAO,CAAC,cAAc;YAUR,mBAAmB;YA6BnB,mBAAmB;CAsBlC;AAED,eAAO,MAAM,sBAAsB,QAAO,gBAGzC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-space-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space-manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"data-space-manager.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ import { type SpaceCache } from '@dxos/protocols/proto/dxos/echo/metadata';
|
|
|
11
11
|
import { type Epoch, type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
12
12
|
import { type GossipMessage } from '@dxos/protocols/proto/dxos/mesh/teleport/gossip';
|
|
13
13
|
import { type Gossip, type Presence } from '@dxos/teleport-extension-gossip';
|
|
14
|
+
import { Timeframe } from '@dxos/timeframe';
|
|
14
15
|
import { AutomergeSpaceState } from './automerge-space-state';
|
|
15
16
|
import { type SigningContext } from './data-space-manager';
|
|
16
17
|
import { NotarizationPlugin } from './notarization-plugin';
|
|
@@ -64,7 +65,7 @@ export declare class DataSpace {
|
|
|
64
65
|
private _state;
|
|
65
66
|
private _databaseRoot;
|
|
66
67
|
/**
|
|
67
|
-
* Error for _state === SpaceState.
|
|
68
|
+
* Error for _state === SpaceState.SPACE_ERROR.
|
|
68
69
|
*/
|
|
69
70
|
error: Error | undefined;
|
|
70
71
|
readonly authVerifier: TrustedKeySetAuthVerifier;
|
|
@@ -100,8 +101,13 @@ export declare class DataSpace {
|
|
|
100
101
|
private _createWritableFeeds;
|
|
101
102
|
private _onNewAutomergeRoot;
|
|
102
103
|
updateOwnProfile(profile: ProfileDocument): Promise<void>;
|
|
103
|
-
createEpoch(options?: CreateEpochOptions): Promise<
|
|
104
|
+
createEpoch(options?: CreateEpochOptions): Promise<CreateEpochResult | null>;
|
|
104
105
|
activate(): Promise<void>;
|
|
105
106
|
deactivate(): Promise<void>;
|
|
106
107
|
}
|
|
108
|
+
type CreateEpochResult = {
|
|
109
|
+
credential: SpecificCredential<Epoch>;
|
|
110
|
+
timeframe: Timeframe;
|
|
111
|
+
};
|
|
112
|
+
export {};
|
|
107
113
|
//# sourceMappingURL=data-space.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-space.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAwD,MAAM,aAAa,CAAC;AAG1F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,EAA0B,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE7F,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EACL,KAAK,kBAAkB,EACvB,UAAU,EACV,KAAK,KAAK,IAAI,UAAU,EACzB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAIL,KAAK,KAAK,EACV,KAAK,eAAe,EACrB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,iDAAiD,CAAC;AACrF,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"data-space.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/spaces/data-space.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const DXOS_VERSION = "0.6.
|
|
1
|
+
export declare const DXOS_VERSION = "0.6.3-main.0308ae2";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/version.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,uBAAuB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/client-services",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.3-main.0308ae2",
|
|
4
4
|
"description": "DXOS client services implementation",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -23,45 +23,45 @@
|
|
|
23
23
|
],
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"platform": "^1.3.6",
|
|
26
|
-
"@dxos/
|
|
27
|
-
"@dxos/
|
|
28
|
-
"@dxos/
|
|
29
|
-
"@dxos/
|
|
30
|
-
"@dxos/context": "0.6.
|
|
31
|
-
"@dxos/
|
|
32
|
-
"@dxos/credentials": "0.6.
|
|
33
|
-
"@dxos/
|
|
34
|
-
"@dxos/
|
|
35
|
-
"@dxos/echo-
|
|
36
|
-
"@dxos/echo-pipeline": "0.6.
|
|
37
|
-
"@dxos/
|
|
38
|
-
"@dxos/
|
|
39
|
-
"@dxos/
|
|
40
|
-
"@dxos/
|
|
41
|
-
"@dxos/
|
|
42
|
-
"@dxos/keyring": "0.6.
|
|
43
|
-
"@dxos/keys": "0.6.
|
|
44
|
-
"@dxos/kv-store": "0.6.
|
|
45
|
-
"@dxos/lock-file": "0.6.
|
|
46
|
-
"@dxos/log": "0.6.
|
|
47
|
-
"@dxos/messaging": "0.6.
|
|
48
|
-
"@dxos/
|
|
49
|
-
"@dxos/
|
|
50
|
-
"@dxos/
|
|
51
|
-
"@dxos/random-access-storage": "0.6.
|
|
52
|
-
"@dxos/rpc": "0.6.
|
|
53
|
-
"@dxos/teleport": "0.6.
|
|
54
|
-
"@dxos/teleport-extension-gossip": "0.6.
|
|
55
|
-
"@dxos/teleport-extension-object-sync": "0.6.
|
|
56
|
-
"@dxos/
|
|
57
|
-
"@dxos/
|
|
58
|
-
"@dxos/
|
|
59
|
-
"@dxos/
|
|
26
|
+
"@dxos/codec-protobuf": "0.6.3-main.0308ae2",
|
|
27
|
+
"@dxos/async": "0.6.3-main.0308ae2",
|
|
28
|
+
"@dxos/automerge": "0.6.3-main.0308ae2",
|
|
29
|
+
"@dxos/config": "0.6.3-main.0308ae2",
|
|
30
|
+
"@dxos/context": "0.6.3-main.0308ae2",
|
|
31
|
+
"@dxos/client-protocol": "0.6.3-main.0308ae2",
|
|
32
|
+
"@dxos/credentials": "0.6.3-main.0308ae2",
|
|
33
|
+
"@dxos/crypto": "0.6.3-main.0308ae2",
|
|
34
|
+
"@dxos/debug": "0.6.3-main.0308ae2",
|
|
35
|
+
"@dxos/echo-db": "0.6.3-main.0308ae2",
|
|
36
|
+
"@dxos/echo-pipeline": "0.6.3-main.0308ae2",
|
|
37
|
+
"@dxos/echo-protocol": "0.6.3-main.0308ae2",
|
|
38
|
+
"@dxos/feed-store": "0.6.3-main.0308ae2",
|
|
39
|
+
"@dxos/indexing": "0.6.3-main.0308ae2",
|
|
40
|
+
"@dxos/invariant": "0.6.3-main.0308ae2",
|
|
41
|
+
"@dxos/echo-schema": "0.6.3-main.0308ae2",
|
|
42
|
+
"@dxos/keyring": "0.6.3-main.0308ae2",
|
|
43
|
+
"@dxos/keys": "0.6.3-main.0308ae2",
|
|
44
|
+
"@dxos/kv-store": "0.6.3-main.0308ae2",
|
|
45
|
+
"@dxos/lock-file": "0.6.3-main.0308ae2",
|
|
46
|
+
"@dxos/log": "0.6.3-main.0308ae2",
|
|
47
|
+
"@dxos/messaging": "0.6.3-main.0308ae2",
|
|
48
|
+
"@dxos/node-std": "0.6.3-main.0308ae2",
|
|
49
|
+
"@dxos/network-manager": "0.6.3-main.0308ae2",
|
|
50
|
+
"@dxos/protocols": "0.6.3-main.0308ae2",
|
|
51
|
+
"@dxos/random-access-storage": "0.6.3-main.0308ae2",
|
|
52
|
+
"@dxos/rpc": "0.6.3-main.0308ae2",
|
|
53
|
+
"@dxos/teleport": "0.6.3-main.0308ae2",
|
|
54
|
+
"@dxos/teleport-extension-gossip": "0.6.3-main.0308ae2",
|
|
55
|
+
"@dxos/teleport-extension-object-sync": "0.6.3-main.0308ae2",
|
|
56
|
+
"@dxos/timeframe": "0.6.3-main.0308ae2",
|
|
57
|
+
"@dxos/util": "0.6.3-main.0308ae2",
|
|
58
|
+
"@dxos/tracing": "0.6.3-main.0308ae2",
|
|
59
|
+
"@dxos/websocket-rpc": "0.6.3-main.0308ae2"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
62
62
|
"@types/platform": "^1.3.4",
|
|
63
63
|
"@types/readable-stream": "^2.3.9",
|
|
64
|
-
"@dxos/signal": "0.6.
|
|
64
|
+
"@dxos/signal": "0.6.3-main.0308ae2"
|
|
65
65
|
},
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public"
|
|
@@ -114,13 +114,13 @@ export class IdentityServiceImpl extends Resource implements IdentityService {
|
|
|
114
114
|
const allProcessed = safeAwaitAll(
|
|
115
115
|
dataSpaceManager.spaces.values(),
|
|
116
116
|
async (space) => {
|
|
117
|
-
if (space.state === SpaceState.
|
|
117
|
+
if (space.state === SpaceState.SPACE_CLOSED) {
|
|
118
118
|
await space.open();
|
|
119
119
|
|
|
120
120
|
// Wait until the space is either READY or REQUIRES_MIGRATION.
|
|
121
121
|
// NOTE: Space could potentially never initialize if the space data is corrupted.
|
|
122
122
|
const requiresMigration = space.stateUpdate.waitForCondition(
|
|
123
|
-
() => space.state === SpaceState.
|
|
123
|
+
() => space.state === SpaceState.SPACE_REQUIRES_MIGRATION,
|
|
124
124
|
);
|
|
125
125
|
await Promise.race([space.initializeDataPipeline(), requiresMigration]);
|
|
126
126
|
}
|
|
@@ -8,7 +8,7 @@ import { invariant } from '@dxos/invariant';
|
|
|
8
8
|
import { log } from '@dxos/log';
|
|
9
9
|
import { InvalidInvitationExtensionRoleError, schema } from '@dxos/protocols';
|
|
10
10
|
import { type Invitation } from '@dxos/protocols/proto/dxos/client/services';
|
|
11
|
-
import { type InvitationHostService,
|
|
11
|
+
import { type InvitationHostService, InvitationOptions } from '@dxos/protocols/proto/dxos/halo/invitations';
|
|
12
12
|
import { type ExtensionContext, RpcExtension } from '@dxos/teleport';
|
|
13
13
|
|
|
14
14
|
import { tryAcquireBeforeContextDisposed } from './utils';
|
|
@@ -31,7 +31,7 @@ export class InvitationGuestExtension extends RpcExtension<
|
|
|
31
31
|
{ InvitationHostService: InvitationHostService }
|
|
32
32
|
> {
|
|
33
33
|
private _ctx = new Context();
|
|
34
|
-
private _remoteOptions?:
|
|
34
|
+
private _remoteOptions?: InvitationOptions;
|
|
35
35
|
private _remoteOptionsTrigger = new Trigger();
|
|
36
36
|
/**
|
|
37
37
|
* Held to allow only one invitation flow at a time to be active.
|
|
@@ -84,13 +84,16 @@ export class InvitationGuestExtension extends RpcExtension<
|
|
|
84
84
|
log('guest acquire lock');
|
|
85
85
|
this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
|
|
86
86
|
log('guest lock acquired');
|
|
87
|
-
await cancelWithContext(
|
|
87
|
+
await cancelWithContext(
|
|
88
|
+
this._ctx,
|
|
89
|
+
this.rpc.InvitationHostService.options({ role: InvitationOptions.Role.GUEST }),
|
|
90
|
+
);
|
|
88
91
|
log('options sent');
|
|
89
92
|
await cancelWithContext(this._ctx, this._remoteOptionsTrigger.wait({ timeout: OPTIONS_TIMEOUT }));
|
|
90
93
|
log('options received');
|
|
91
|
-
if (this._remoteOptions?.role !==
|
|
94
|
+
if (this._remoteOptions?.role !== InvitationOptions.Role.HOST) {
|
|
92
95
|
throw new InvalidInvitationExtensionRoleError(undefined, {
|
|
93
|
-
expected:
|
|
96
|
+
expected: InvitationOptions.Role.HOST,
|
|
94
97
|
remoteOptions: this._remoteOptions,
|
|
95
98
|
remotePeerId: context.remotePeerId,
|
|
96
99
|
});
|
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
type AdmissionResponse,
|
|
17
17
|
AuthenticationResponse,
|
|
18
18
|
type InvitationHostService,
|
|
19
|
-
|
|
19
|
+
InvitationOptions,
|
|
20
20
|
} from '@dxos/protocols/proto/dxos/halo/invitations';
|
|
21
21
|
import { type ExtensionContext, RpcExtension } from '@dxos/teleport';
|
|
22
22
|
|
|
@@ -50,7 +50,7 @@ export class InvitationHostExtension extends RpcExtension<
|
|
|
50
50
|
* @internal
|
|
51
51
|
*/
|
|
52
52
|
private _ctx = new Context();
|
|
53
|
-
private _remoteOptions?:
|
|
53
|
+
private _remoteOptions?: InvitationOptions;
|
|
54
54
|
private _remoteOptionsTrigger = new Trigger();
|
|
55
55
|
|
|
56
56
|
private _challenge?: Buffer = undefined;
|
|
@@ -239,15 +239,15 @@ export class InvitationHostExtension extends RpcExtension<
|
|
|
239
239
|
log('host lock acquired');
|
|
240
240
|
const lastState = this._requireActiveInvitation().state;
|
|
241
241
|
this._callbacks.onStateUpdate(Invitation.State.CONNECTING);
|
|
242
|
-
await this.rpc.InvitationHostService.options({ role:
|
|
242
|
+
await this.rpc.InvitationHostService.options({ role: InvitationOptions.Role.HOST });
|
|
243
243
|
log('options sent');
|
|
244
244
|
await cancelWithContext(this._ctx, this._remoteOptionsTrigger.wait({ timeout: OPTIONS_TIMEOUT }));
|
|
245
245
|
log('options received');
|
|
246
|
-
if (this._remoteOptions?.role !==
|
|
246
|
+
if (this._remoteOptions?.role !== InvitationOptions.Role.GUEST) {
|
|
247
247
|
// we connected with another host, restore previous real invitation flow status
|
|
248
248
|
this._callbacks.onStateUpdate(lastState);
|
|
249
249
|
throw new InvalidInvitationExtensionRoleError(undefined, {
|
|
250
|
-
expected:
|
|
250
|
+
expected: InvitationOptions.Role.GUEST,
|
|
251
251
|
remoteOptions: this._remoteOptions,
|
|
252
252
|
remotePeerId: context.remotePeerId,
|
|
253
253
|
});
|
|
@@ -6,7 +6,7 @@ import { invariant } from '@dxos/invariant';
|
|
|
6
6
|
import { PublicKey } from '@dxos/keys';
|
|
7
7
|
import { log } from '@dxos/log';
|
|
8
8
|
import type { SwarmController, Topology } from '@dxos/network-manager';
|
|
9
|
-
import {
|
|
9
|
+
import { InvitationOptions } from '@dxos/protocols/proto/dxos/halo/invitations';
|
|
10
10
|
import { ComplexSet } from '@dxos/util';
|
|
11
11
|
|
|
12
12
|
/**
|
|
@@ -36,7 +36,7 @@ export class InvitationTopology implements Topology {
|
|
|
36
36
|
*/
|
|
37
37
|
private _seenPeers = new ComplexSet<PublicKey>(PublicKey.hash);
|
|
38
38
|
|
|
39
|
-
constructor(private readonly _role:
|
|
39
|
+
constructor(private readonly _role: InvitationOptions.Role) {}
|
|
40
40
|
|
|
41
41
|
init(controller: SwarmController): void {
|
|
42
42
|
invariant(!this._controller, 'Already initialized.');
|
|
@@ -48,7 +48,7 @@ export class InvitationTopology implements Topology {
|
|
|
48
48
|
const { ownPeerId, candidates, connected, allPeers } = this._controller.getState();
|
|
49
49
|
|
|
50
50
|
// guests don't initiate connections
|
|
51
|
-
if (this._role ===
|
|
51
|
+
if (this._role === InvitationOptions.Role.GUEST) {
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
54
|
|
|
@@ -82,6 +82,6 @@ export class InvitationTopology implements Topology {
|
|
|
82
82
|
}
|
|
83
83
|
|
|
84
84
|
toString() {
|
|
85
|
-
return `InvitationTopology(${this._role ===
|
|
85
|
+
return `InvitationTopology(${this._role === InvitationOptions.Role.GUEST ? 'guest' : 'host'})`;
|
|
86
86
|
}
|
|
87
87
|
}
|
|
@@ -14,7 +14,7 @@ import { InvalidInvitationExtensionRoleError, trace } from '@dxos/protocols';
|
|
|
14
14
|
import { type AdmissionKeypair, Invitation } from '@dxos/protocols/proto/dxos/client/services';
|
|
15
15
|
import { type DeviceProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
|
|
16
16
|
import { AuthenticationResponse, type IntroductionResponse } from '@dxos/protocols/proto/dxos/halo/invitations';
|
|
17
|
-
import {
|
|
17
|
+
import { InvitationOptions } from '@dxos/protocols/proto/dxos/halo/invitations';
|
|
18
18
|
import { type ExtensionContext, type TeleportExtension, type TeleportParams } from '@dxos/teleport';
|
|
19
19
|
import { trace as _trace } from '@dxos/tracing';
|
|
20
20
|
import { ComplexSet } from '@dxos/util';
|
|
@@ -26,6 +26,7 @@ import { InvitationTopology } from './invitation-topology';
|
|
|
26
26
|
import { stateToString } from './utils';
|
|
27
27
|
|
|
28
28
|
const metrics = _trace.metrics;
|
|
29
|
+
|
|
29
30
|
const MAX_DELEGATED_INVITATION_HOST_TRIES = 3;
|
|
30
31
|
|
|
31
32
|
type InvitationExtension = InvitationHostExtension | InvitationGuestExtension;
|
|
@@ -73,7 +74,7 @@ export class InvitationsHandler {
|
|
|
73
74
|
protocol: InvitationProtocol,
|
|
74
75
|
invitation: Invitation,
|
|
75
76
|
): void {
|
|
76
|
-
metrics.increment('invitation.created');
|
|
77
|
+
metrics.increment('dxos.invitation.created');
|
|
77
78
|
const guardedState = this._createGuardedState(ctx, invitation, stream);
|
|
78
79
|
// Called for every connecting peer.
|
|
79
80
|
const createExtension = (): InvitationHostExtension => {
|
|
@@ -120,7 +121,7 @@ export class InvitationsHandler {
|
|
|
120
121
|
const deviceKey = await extension.completedTrigger.wait({ timeout: invitation.timeout });
|
|
121
122
|
log('admitted guest', { guest: deviceKey, ...protocol.toJSON() });
|
|
122
123
|
guardedState.set(extension, Invitation.State.SUCCESS);
|
|
123
|
-
metrics.increment('invitation.success');
|
|
124
|
+
metrics.increment('dxos.invitation.success');
|
|
124
125
|
log.trace('dxos.sdk.invitations-handler.host.onOpen', trace.end({ id: traceId }));
|
|
125
126
|
admitted = true;
|
|
126
127
|
|
|
@@ -130,12 +131,12 @@ export class InvitationsHandler {
|
|
|
130
131
|
} catch (err: any) {
|
|
131
132
|
if (err instanceof TimeoutError) {
|
|
132
133
|
if (guardedState.set(extension, Invitation.State.TIMEOUT)) {
|
|
133
|
-
metrics.increment('invitation.timeout');
|
|
134
|
+
metrics.increment('dxos.invitation.timeout');
|
|
134
135
|
log('timeout', { ...protocol.toJSON() });
|
|
135
136
|
}
|
|
136
137
|
} else {
|
|
137
138
|
if (guardedState.error(extension, err)) {
|
|
138
|
-
metrics.increment('invitation.failed');
|
|
139
|
+
metrics.increment('dxos.invitation.failed');
|
|
139
140
|
log.error('failed', err);
|
|
140
141
|
}
|
|
141
142
|
}
|
|
@@ -152,12 +153,12 @@ export class InvitationsHandler {
|
|
|
152
153
|
}
|
|
153
154
|
if (err instanceof TimeoutError) {
|
|
154
155
|
if (guardedState.set(extension, Invitation.State.TIMEOUT)) {
|
|
155
|
-
metrics.increment('invitation.timeout');
|
|
156
|
+
metrics.increment('dxos.invitation.timeout');
|
|
156
157
|
log('timeout', { err });
|
|
157
158
|
}
|
|
158
159
|
} else {
|
|
159
160
|
if (guardedState.error(extension, err)) {
|
|
160
|
-
metrics.increment('invitation.failed');
|
|
161
|
+
metrics.increment('dxos.invitation.failed');
|
|
161
162
|
log.error('failed', err);
|
|
162
163
|
}
|
|
163
164
|
}
|
|
@@ -177,7 +178,7 @@ export class InvitationsHandler {
|
|
|
177
178
|
// ensure the swarm is closed before changing state and closing the stream.
|
|
178
179
|
await swarmConnection.close();
|
|
179
180
|
guardedState.set(null, Invitation.State.EXPIRED);
|
|
180
|
-
metrics.increment('invitation.expired');
|
|
181
|
+
metrics.increment('dxos.invitation.expired');
|
|
181
182
|
await ctx.dispose();
|
|
182
183
|
},
|
|
183
184
|
invitation.created.getTime() + invitation.lifetime * 1000 - Date.now(),
|
|
@@ -187,7 +188,7 @@ export class InvitationsHandler {
|
|
|
187
188
|
|
|
188
189
|
let swarmConnection: SwarmConnection;
|
|
189
190
|
scheduleTask(ctx, async () => {
|
|
190
|
-
swarmConnection = await this._joinSwarm(ctx, invitation,
|
|
191
|
+
swarmConnection = await this._joinSwarm(ctx, invitation, InvitationOptions.Role.HOST, createExtension);
|
|
191
192
|
guardedState.set(null, Invitation.State.CONNECTING);
|
|
192
193
|
});
|
|
193
194
|
}
|
|
@@ -352,7 +353,7 @@ export class InvitationsHandler {
|
|
|
352
353
|
await ctx.dispose();
|
|
353
354
|
} else {
|
|
354
355
|
invariant(invitation.swarmKey);
|
|
355
|
-
await this._joinSwarm(ctx, invitation,
|
|
356
|
+
await this._joinSwarm(ctx, invitation, InvitationOptions.Role.GUEST, createExtension);
|
|
356
357
|
guardedState.set(null, Invitation.State.CONNECTING);
|
|
357
358
|
}
|
|
358
359
|
});
|
|
@@ -361,11 +362,11 @@ export class InvitationsHandler {
|
|
|
361
362
|
private async _joinSwarm(
|
|
362
363
|
ctx: Context,
|
|
363
364
|
invitation: Invitation,
|
|
364
|
-
role:
|
|
365
|
+
role: InvitationOptions.Role,
|
|
365
366
|
extensionFactory: () => TeleportExtension,
|
|
366
367
|
): Promise<SwarmConnection> {
|
|
367
368
|
let label: string;
|
|
368
|
-
if (role ===
|
|
369
|
+
if (role === InvitationOptions.Role.GUEST) {
|
|
369
370
|
label = 'invitation guest';
|
|
370
371
|
} else if (invitation.kind === Invitation.Kind.DEVICE) {
|
|
371
372
|
label = 'invitation host for device';
|
|
@@ -157,14 +157,14 @@ describe('DataSpaceManager', () => {
|
|
|
157
157
|
|
|
158
158
|
const space = await peer.dataSpaceManager.createSpace();
|
|
159
159
|
await space.inner.controlPipeline.state.waitUntilTimeframe(space.inner.controlPipeline.state.endTimeframe);
|
|
160
|
-
expect(space.state).to.equal(SpaceState.
|
|
160
|
+
expect(space.state).to.equal(SpaceState.SPACE_READY);
|
|
161
161
|
|
|
162
162
|
await space.deactivate();
|
|
163
|
-
expect(space.state).to.equal(SpaceState.
|
|
163
|
+
expect(space.state).to.equal(SpaceState.SPACE_INACTIVE);
|
|
164
164
|
|
|
165
165
|
await space.activate();
|
|
166
166
|
await asyncTimeout(
|
|
167
|
-
space.stateUpdate.waitForCondition(() => space.state === SpaceState.
|
|
167
|
+
space.stateUpdate.waitForCondition(() => space.state === SpaceState.SPACE_READY),
|
|
168
168
|
500,
|
|
169
169
|
);
|
|
170
170
|
});
|
|
@@ -180,10 +180,10 @@ describe('DataSpaceManager', () => {
|
|
|
180
180
|
await reloadDataSpaces(peer);
|
|
181
181
|
|
|
182
182
|
const space = getFirstSpace(peer);
|
|
183
|
-
expect(space.state).to.equal(SpaceState.
|
|
183
|
+
expect(space.state).to.equal(SpaceState.SPACE_CLOSED);
|
|
184
184
|
await space.activate();
|
|
185
185
|
await asyncTimeout(
|
|
186
|
-
space.stateUpdate.waitForCondition(() => space.state === SpaceState.
|
|
186
|
+
space.stateUpdate.waitForCondition(() => space.state === SpaceState.SPACE_READY),
|
|
187
187
|
500,
|
|
188
188
|
);
|
|
189
189
|
});
|
|
@@ -202,7 +202,7 @@ describe('DataSpaceManager', () => {
|
|
|
202
202
|
|
|
203
203
|
await reloadDataSpaces(peer);
|
|
204
204
|
|
|
205
|
-
expect(getFirstSpace(peer).state).to.eq(SpaceState.
|
|
205
|
+
expect(getFirstSpace(peer).state).to.eq(SpaceState.SPACE_INACTIVE);
|
|
206
206
|
});
|
|
207
207
|
});
|
|
208
208
|
|