@dxos/client-services 0.6.2 → 0.6.3-main.226a8ae
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-ZCJ2EH5C.mjs} +64 -43
- package/dist/lib/browser/chunk-ZCJ2EH5C.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-LHYZLG23.cjs} +67 -46
- package/dist/lib/node/chunk-LHYZLG23.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/spaces/data-space-manager.d.ts.map +1 -1
- package/dist/types/src/packlets/spaces/data-space.d.ts +7 -1
- 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/invitations/invitations-handler.ts +7 -7
- package/src/packlets/spaces/data-space-manager.ts +22 -10
- package/src/packlets/spaces/data-space.ts +15 -11
- package/src/packlets/spaces/spaces-service.ts +4 -4
- 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_LHYZLG23 = require("../../chunk-LHYZLG23.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_LHYZLG23.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_LHYZLG23.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_LHYZLG23.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_LHYZLG23.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_LHYZLG23.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_LHYZLG23.InvitationsManager(new import_chunk_LHYZLG23.InvitationsHandler(this.networkManager), (invitation) => {
|
|
377
377
|
if (invitation.kind === import_services2.Invitation.Kind.SPACE) {
|
|
378
|
-
return new
|
|
378
|
+
return new import_chunk_LHYZLG23.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":"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":"AAIA,OAAO,EAAE,KAAK,EAA4B,MAAM,aAAa,CAAC;AAK9D,OAAO,EAEL,KAAK,gBAAgB,EAItB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAmD,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC/F,OAAO,EAEL,KAAK,aAAa,EAElB,KAAK,YAAY,EAGlB,MAAM,qBAAqB,CAAC;AAU7B,OAAO,EAAE,KAAK,SAAS,EAAiB,MAAM,kBAAkB,CAAC;AAEjE,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAExE,OAAO,EAAE,WAAW,EAAE,KAAK,UAAU,EAAE,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAIjH,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAA2C,MAAM,YAAY,CAAC;AAEjF,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAQzD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,SAAS,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,gBAAgB,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5D,UAAU,EAAE,MAAM,eAAe,GAAG,SAAS,CAAC;CAC/C;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,SAAS,CAAC;IACpB,cAAc,EAAE,SAAS,CAAC;IAE1B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,SAAS,CAAC;IAE7B;;;OAGG;IACH,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,SAAS,CAAC;IACpB,WAAW,EAAE,SAAS,CAAC;IACvB,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC;IACvB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,sBAAsB,CAAC,EAAE,SAAS,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,mCAAmC,CAAC,EAAE,MAAM,CAAC;IAC7C,iCAAiC,CAAC,EAAE,MAAM,CAAC;CAC5C,CAAC;AAEF,qBACa,gBAAgB;IAWzB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAjB3B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IAEtC,SAAgB,OAAO,cAAe;IAEtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwD;IAEhF,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;gBAGvC,aAAa,EAAE,YAAY,EAC3B,cAAc,EAAE,aAAa,EAC7B,QAAQ,EAAE,OAAO,EACjB,eAAe,EAAE,cAAc,EAC/B,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,EAClC,SAAS,EAAE,QAAQ,EACnB,mBAAmB,EAAE,kBAAkB,EACvC,OAAO,CAAC,2CAA+B;IA6B1D,IAAI,MAAM,qCAET;IAGK,IAAI;IAqBJ,KAAK;IAUX;;OAEG;IAEG,WAAW;IAgCX,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAqBlD,kBAAkB;YA0BV,qBAAqB;IAU7B,WAAW,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAqBzD,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC;IA6BnE;;;;OAIG;IACG,mBAAmB,CAAC,QAAQ,EAAE,SAAS;IAUhC,+BAA+B,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;YAaxE,eAAe;IA6G7B,OAAO,CAAC,wBAAwB;IAyBhC,OAAO,CAAC,uBAAuB;YAWjB,6BAA6B;YAiB7B,2BAA2B;CAqB1C"}
|
|
@@ -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';
|
|
@@ -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.226a8ae";
|
|
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.226a8ae",
|
|
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/async": "0.6.
|
|
27
|
-
"@dxos/
|
|
28
|
-
"@dxos/
|
|
29
|
-
"@dxos/
|
|
30
|
-
"@dxos/context": "0.6.
|
|
31
|
-
"@dxos/
|
|
32
|
-
"@dxos/
|
|
33
|
-
"@dxos/
|
|
34
|
-
"@dxos/echo-db": "0.6.
|
|
35
|
-
"@dxos/echo-
|
|
36
|
-
"@dxos/
|
|
37
|
-
"@dxos/
|
|
38
|
-
"@dxos/
|
|
39
|
-
"@dxos/
|
|
40
|
-
"@dxos/indexing": "0.6.
|
|
41
|
-
"@dxos/invariant": "0.6.
|
|
42
|
-
"@dxos/keyring": "0.6.
|
|
43
|
-
"@dxos/
|
|
44
|
-
"@dxos/
|
|
45
|
-
"@dxos/
|
|
46
|
-
"@dxos/log": "0.6.
|
|
47
|
-
"@dxos/messaging": "0.6.
|
|
48
|
-
"@dxos/network-manager": "0.6.
|
|
49
|
-
"@dxos/
|
|
50
|
-
"@dxos/
|
|
51
|
-
"@dxos/random-access-storage": "0.6.
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/
|
|
54
|
-
"@dxos/teleport-extension-
|
|
55
|
-
"@dxos/
|
|
56
|
-
"@dxos/
|
|
57
|
-
"@dxos/
|
|
58
|
-
"@dxos/
|
|
59
|
-
"@dxos/
|
|
26
|
+
"@dxos/async": "0.6.3-main.226a8ae",
|
|
27
|
+
"@dxos/automerge": "0.6.3-main.226a8ae",
|
|
28
|
+
"@dxos/client-protocol": "0.6.3-main.226a8ae",
|
|
29
|
+
"@dxos/config": "0.6.3-main.226a8ae",
|
|
30
|
+
"@dxos/context": "0.6.3-main.226a8ae",
|
|
31
|
+
"@dxos/credentials": "0.6.3-main.226a8ae",
|
|
32
|
+
"@dxos/crypto": "0.6.3-main.226a8ae",
|
|
33
|
+
"@dxos/codec-protobuf": "0.6.3-main.226a8ae",
|
|
34
|
+
"@dxos/echo-db": "0.6.3-main.226a8ae",
|
|
35
|
+
"@dxos/echo-pipeline": "0.6.3-main.226a8ae",
|
|
36
|
+
"@dxos/debug": "0.6.3-main.226a8ae",
|
|
37
|
+
"@dxos/echo-protocol": "0.6.3-main.226a8ae",
|
|
38
|
+
"@dxos/feed-store": "0.6.3-main.226a8ae",
|
|
39
|
+
"@dxos/echo-schema": "0.6.3-main.226a8ae",
|
|
40
|
+
"@dxos/indexing": "0.6.3-main.226a8ae",
|
|
41
|
+
"@dxos/invariant": "0.6.3-main.226a8ae",
|
|
42
|
+
"@dxos/keyring": "0.6.3-main.226a8ae",
|
|
43
|
+
"@dxos/lock-file": "0.6.3-main.226a8ae",
|
|
44
|
+
"@dxos/keys": "0.6.3-main.226a8ae",
|
|
45
|
+
"@dxos/kv-store": "0.6.3-main.226a8ae",
|
|
46
|
+
"@dxos/log": "0.6.3-main.226a8ae",
|
|
47
|
+
"@dxos/messaging": "0.6.3-main.226a8ae",
|
|
48
|
+
"@dxos/network-manager": "0.6.3-main.226a8ae",
|
|
49
|
+
"@dxos/node-std": "0.6.3-main.226a8ae",
|
|
50
|
+
"@dxos/protocols": "0.6.3-main.226a8ae",
|
|
51
|
+
"@dxos/random-access-storage": "0.6.3-main.226a8ae",
|
|
52
|
+
"@dxos/teleport": "0.6.3-main.226a8ae",
|
|
53
|
+
"@dxos/rpc": "0.6.3-main.226a8ae",
|
|
54
|
+
"@dxos/teleport-extension-object-sync": "0.6.3-main.226a8ae",
|
|
55
|
+
"@dxos/timeframe": "0.6.3-main.226a8ae",
|
|
56
|
+
"@dxos/teleport-extension-gossip": "0.6.3-main.226a8ae",
|
|
57
|
+
"@dxos/tracing": "0.6.3-main.226a8ae",
|
|
58
|
+
"@dxos/util": "0.6.3-main.226a8ae",
|
|
59
|
+
"@dxos/websocket-rpc": "0.6.3-main.226a8ae"
|
|
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.226a8ae"
|
|
65
65
|
},
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public"
|
|
@@ -73,7 +73,7 @@ export class InvitationsHandler {
|
|
|
73
73
|
protocol: InvitationProtocol,
|
|
74
74
|
invitation: Invitation,
|
|
75
75
|
): void {
|
|
76
|
-
metrics.increment('invitation.created');
|
|
76
|
+
metrics.increment('dxos.invitation.created');
|
|
77
77
|
const guardedState = this._createGuardedState(ctx, invitation, stream);
|
|
78
78
|
// Called for every connecting peer.
|
|
79
79
|
const createExtension = (): InvitationHostExtension => {
|
|
@@ -120,7 +120,7 @@ export class InvitationsHandler {
|
|
|
120
120
|
const deviceKey = await extension.completedTrigger.wait({ timeout: invitation.timeout });
|
|
121
121
|
log('admitted guest', { guest: deviceKey, ...protocol.toJSON() });
|
|
122
122
|
guardedState.set(extension, Invitation.State.SUCCESS);
|
|
123
|
-
metrics.increment('invitation.success');
|
|
123
|
+
metrics.increment('dxos.invitation.success');
|
|
124
124
|
log.trace('dxos.sdk.invitations-handler.host.onOpen', trace.end({ id: traceId }));
|
|
125
125
|
admitted = true;
|
|
126
126
|
|
|
@@ -130,12 +130,12 @@ export class InvitationsHandler {
|
|
|
130
130
|
} catch (err: any) {
|
|
131
131
|
if (err instanceof TimeoutError) {
|
|
132
132
|
if (guardedState.set(extension, Invitation.State.TIMEOUT)) {
|
|
133
|
-
metrics.increment('invitation.timeout');
|
|
133
|
+
metrics.increment('dxos.invitation.timeout');
|
|
134
134
|
log('timeout', { ...protocol.toJSON() });
|
|
135
135
|
}
|
|
136
136
|
} else {
|
|
137
137
|
if (guardedState.error(extension, err)) {
|
|
138
|
-
metrics.increment('invitation.failed');
|
|
138
|
+
metrics.increment('dxos.invitation.failed');
|
|
139
139
|
log.error('failed', err);
|
|
140
140
|
}
|
|
141
141
|
}
|
|
@@ -152,12 +152,12 @@ export class InvitationsHandler {
|
|
|
152
152
|
}
|
|
153
153
|
if (err instanceof TimeoutError) {
|
|
154
154
|
if (guardedState.set(extension, Invitation.State.TIMEOUT)) {
|
|
155
|
-
metrics.increment('invitation.timeout');
|
|
155
|
+
metrics.increment('dxos.invitation.timeout');
|
|
156
156
|
log('timeout', { err });
|
|
157
157
|
}
|
|
158
158
|
} else {
|
|
159
159
|
if (guardedState.error(extension, err)) {
|
|
160
|
-
metrics.increment('invitation.failed');
|
|
160
|
+
metrics.increment('dxos.invitation.failed');
|
|
161
161
|
log.error('failed', err);
|
|
162
162
|
}
|
|
163
163
|
}
|
|
@@ -177,7 +177,7 @@ export class InvitationsHandler {
|
|
|
177
177
|
// ensure the swarm is closed before changing state and closing the stream.
|
|
178
178
|
await swarmConnection.close();
|
|
179
179
|
guardedState.set(null, Invitation.State.EXPIRED);
|
|
180
|
-
metrics.increment('invitation.expired');
|
|
180
|
+
metrics.increment('dxos.invitation.expired');
|
|
181
181
|
await ctx.dispose();
|
|
182
182
|
},
|
|
183
183
|
invitation.created.getTime() + invitation.lifetime * 1000 - Date.now(),
|
|
@@ -382,16 +382,28 @@ export class DataSpaceManager {
|
|
|
382
382
|
credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
|
|
383
383
|
credentialAuthenticator: deferFunction(() => dataSpace.authVerifier.verifier),
|
|
384
384
|
},
|
|
385
|
-
onAuthorizedConnection: (session) =>
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
385
|
+
onAuthorizedConnection: (session) =>
|
|
386
|
+
queueMicrotask(async () => {
|
|
387
|
+
try {
|
|
388
|
+
if (!session.isOpen) {
|
|
389
|
+
return;
|
|
390
|
+
}
|
|
391
|
+
session.addExtension('dxos.mesh.teleport.admission-discovery', new CredentialServerExtension(space));
|
|
392
|
+
session.addExtension(
|
|
393
|
+
'dxos.mesh.teleport.gossip',
|
|
394
|
+
gossip.createExtension({ remotePeerId: session.remotePeerId }),
|
|
395
|
+
);
|
|
396
|
+
session.addExtension('dxos.mesh.teleport.notarization', dataSpace.notarizationPlugin.createExtension());
|
|
397
|
+
await this._echoHost.authorizeDevice(space.key, session.remotePeerId);
|
|
398
|
+
if (!session.isOpen) {
|
|
399
|
+
return;
|
|
400
|
+
}
|
|
401
|
+
session.addExtension('dxos.mesh.teleport.automerge', this._echoHost.createReplicationExtension());
|
|
402
|
+
} catch (err: any) {
|
|
403
|
+
log.warn('error on authorized connection', { err });
|
|
404
|
+
await session.close(err);
|
|
405
|
+
}
|
|
406
|
+
}),
|
|
395
407
|
onAuthFailure: () => {
|
|
396
408
|
log.warn('auth failure');
|
|
397
409
|
},
|
|
@@ -412,19 +412,17 @@ export class DataSpace {
|
|
|
412
412
|
|
|
413
413
|
// TODO(dmaretskyi): Close roots.
|
|
414
414
|
// TODO(dmaretskyi): How do we handle changing to the next EPOCH?
|
|
415
|
-
const root = await this._echoHost.openSpaceRoot(handle.url);
|
|
415
|
+
const root = await this._echoHost.openSpaceRoot(this.id, handle.url);
|
|
416
416
|
|
|
417
417
|
// NOTE: Make sure this assignment happens synchronously together with the state change.
|
|
418
418
|
this._databaseRoot = root;
|
|
419
419
|
if (root.getVersion() !== SpaceDocVersion.CURRENT) {
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
420
|
+
this._state = SpaceState.REQUIRES_MIGRATION;
|
|
421
|
+
this.stateUpdate.emit();
|
|
422
|
+
} else if (this._state !== SpaceState.READY) {
|
|
423
|
+
await this._enterReadyState();
|
|
424
424
|
} else {
|
|
425
|
-
|
|
426
|
-
await this._enterReadyState();
|
|
427
|
-
}
|
|
425
|
+
this.stateUpdate.emit();
|
|
428
426
|
}
|
|
429
427
|
} catch (err) {
|
|
430
428
|
if (err instanceof ContextDisposedError) {
|
|
@@ -447,7 +445,7 @@ export class DataSpace {
|
|
|
447
445
|
await this.inner.controlPipeline.writer.write({ credential: { credential } });
|
|
448
446
|
}
|
|
449
447
|
|
|
450
|
-
async createEpoch(options?: CreateEpochOptions): Promise<
|
|
448
|
+
async createEpoch(options?: CreateEpochOptions): Promise<CreateEpochResult | null> {
|
|
451
449
|
const ctx = this._ctx.derive();
|
|
452
450
|
|
|
453
451
|
// Preserving existing behavior.
|
|
@@ -483,10 +481,11 @@ export class DataSpace {
|
|
|
483
481
|
credential: { credential },
|
|
484
482
|
});
|
|
485
483
|
|
|
486
|
-
|
|
484
|
+
const timeframe = new Timeframe([[receipt.feedKey, receipt.seq]]);
|
|
485
|
+
await this.inner.controlPipeline.state.waitUntilTimeframe(timeframe);
|
|
487
486
|
await this._echoHost.updateIndexes();
|
|
488
487
|
|
|
489
|
-
return credential;
|
|
488
|
+
return { credential, timeframe };
|
|
490
489
|
}
|
|
491
490
|
|
|
492
491
|
@synchronized
|
|
@@ -515,3 +514,8 @@ export class DataSpace {
|
|
|
515
514
|
this.stateUpdate.emit();
|
|
516
515
|
}
|
|
517
516
|
}
|
|
517
|
+
|
|
518
|
+
type CreateEpochResult = {
|
|
519
|
+
credential: SpecificCredential<Epoch>;
|
|
520
|
+
timeframe: Timeframe;
|
|
521
|
+
};
|
|
@@ -112,7 +112,7 @@ export class SpacesServiceImpl implements SpacesService {
|
|
|
112
112
|
async () => {
|
|
113
113
|
const dataSpaceManager = await this._getDataSpaceManager();
|
|
114
114
|
const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
|
|
115
|
-
log('update', { spaces });
|
|
115
|
+
log('update', () => ({ ids: spaces.map((space) => space.id) }));
|
|
116
116
|
await this._updateMetrics();
|
|
117
117
|
next({ spaces });
|
|
118
118
|
},
|
|
@@ -226,8 +226,8 @@ export class SpacesServiceImpl implements SpacesService {
|
|
|
226
226
|
async createEpoch({ spaceKey, migration, automergeRootUrl }: CreateEpochRequest): Promise<CreateEpochResponse> {
|
|
227
227
|
const dataSpaceManager = await this._getDataSpaceManager();
|
|
228
228
|
const space = dataSpaceManager.spaces.get(spaceKey) ?? raise(new SpaceNotFoundError(spaceKey));
|
|
229
|
-
const
|
|
230
|
-
return { epochCredential: credential
|
|
229
|
+
const result = await space.createEpoch({ migration, newAutomergeRoot: automergeRootUrl });
|
|
230
|
+
return { epochCredential: result?.credential, controlTimeframe: result?.timeframe };
|
|
231
231
|
}
|
|
232
232
|
|
|
233
233
|
async admitContact(request: AdmitContactRequest): Promise<void> {
|
|
@@ -324,7 +324,7 @@ export class SpacesServiceImpl implements SpacesService {
|
|
|
324
324
|
const dataSpaceManager = await this._getDataSpaceManager();
|
|
325
325
|
const identity = this._identityManager.identity?.identityKey.truncate();
|
|
326
326
|
if (identity) {
|
|
327
|
-
trace.metrics.gauge('echo.space.count', dataSpaceManager.spaces.size, {
|
|
327
|
+
trace.metrics.gauge('dxos.echo.space.count', dataSpaceManager.spaces.size, {
|
|
328
328
|
tags: { identity },
|
|
329
329
|
});
|
|
330
330
|
}
|
package/src/version.ts
CHANGED