@dxos/client-services 0.3.9-main.57b66d1 → 0.3.9-main.5b3ca13
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-HSYLW5AV.mjs → chunk-OHR2WF47.mjs} +119 -65
- package/dist/lib/browser/{chunk-HSYLW5AV.mjs.map → chunk-OHR2WF47.mjs.map} +4 -4
- package/dist/lib/browser/index.mjs +1 -1
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/packlets/testing/index.mjs +6 -3
- package/dist/lib/browser/packlets/testing/index.mjs.map +3 -3
- package/dist/lib/node/{chunk-FX4ZAUTZ.cjs → chunk-HPCOLT4I.cjs} +128 -77
- package/dist/lib/node/chunk-HPCOLT4I.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 +11 -8
- package/dist/lib/node/packlets/testing/index.cjs.map +3 -3
- package/dist/types/src/packlets/services/service-context.d.ts +2 -1
- package/dist/types/src/packlets/services/service-context.d.ts.map +1 -1
- package/dist/types/src/packlets/services/service-host.d.ts.map +1 -1
- package/dist/types/src/packlets/spaces/automerge-space-state.d.ts +8 -0
- package/dist/types/src/packlets/spaces/automerge-space-state.d.ts.map +1 -0
- package/dist/types/src/packlets/spaces/data-space-manager.d.ts +3 -2
- 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 -2
- package/dist/types/src/packlets/spaces/data-space.d.ts.map +1 -1
- package/dist/types/src/packlets/spaces/genesis.d.ts +1 -1
- package/dist/types/src/packlets/spaces/genesis.d.ts.map +1 -1
- package/dist/types/src/packlets/testing/test-builder.d.ts +3 -1
- package/dist/types/src/packlets/testing/test-builder.d.ts.map +1 -1
- package/dist/types/src/version.d.ts +1 -1
- package/package.json +35 -35
- package/src/packlets/services/service-context.ts +5 -0
- package/src/packlets/services/service-host.ts +5 -2
- package/src/packlets/spaces/automerge-space-state.ts +22 -0
- package/src/packlets/spaces/data-space-manager.ts +12 -2
- package/src/packlets/spaces/data-space.ts +53 -6
- package/src/packlets/spaces/genesis.ts +7 -1
- package/src/packlets/testing/test-builder.ts +7 -0
- package/src/version.ts +1 -1
- package/dist/lib/node/chunk-FX4ZAUTZ.cjs.map +0 -7
|
@@ -2534,7 +2534,7 @@ var getPlatform = () => {
|
|
|
2534
2534
|
};
|
|
2535
2535
|
|
|
2536
2536
|
// packages/sdk/client-services/src/version.ts
|
|
2537
|
-
var DXOS_VERSION = "0.3.9-main.
|
|
2537
|
+
var DXOS_VERSION = "0.3.9-main.5b3ca13";
|
|
2538
2538
|
|
|
2539
2539
|
// packages/sdk/client-services/src/packlets/services/diagnostics.ts
|
|
2540
2540
|
var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
|
|
@@ -2668,12 +2668,30 @@ import { createMappedFeedWriter } from "@dxos/echo-pipeline";
|
|
|
2668
2668
|
import { PublicKey as PublicKey8 } from "@dxos/keys";
|
|
2669
2669
|
import { log as log10 } from "@dxos/log";
|
|
2670
2670
|
import { CancelledError, SystemError } from "@dxos/protocols";
|
|
2671
|
-
import { SpaceState } from "@dxos/protocols/proto/dxos/client/services";
|
|
2671
|
+
import { SpaceState, CreateEpochRequest } from "@dxos/protocols/proto/dxos/client/services";
|
|
2672
2672
|
import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
|
|
2673
2673
|
import { Timeframe as Timeframe2 } from "@dxos/timeframe";
|
|
2674
2674
|
import { trace as trace6 } from "@dxos/tracing";
|
|
2675
2675
|
import { ComplexSet as ComplexSet3 } from "@dxos/util";
|
|
2676
2676
|
|
|
2677
|
+
// packages/sdk/client-services/src/packlets/spaces/automerge-space-state.ts
|
|
2678
|
+
import { checkCredentialType } from "@dxos/credentials";
|
|
2679
|
+
var AutomergeSpaceState = class {
|
|
2680
|
+
constructor() {
|
|
2681
|
+
this.rootUrl = void 0;
|
|
2682
|
+
this.lastEpoch = void 0;
|
|
2683
|
+
}
|
|
2684
|
+
async processCredential(credential) {
|
|
2685
|
+
if (!checkCredentialType(credential, "dxos.halo.credentials.Epoch")) {
|
|
2686
|
+
return;
|
|
2687
|
+
}
|
|
2688
|
+
this.lastEpoch = credential;
|
|
2689
|
+
if (credential.subject.assertion.automergeRoot) {
|
|
2690
|
+
this.rootUrl = credential.subject.assertion.automergeRoot;
|
|
2691
|
+
}
|
|
2692
|
+
}
|
|
2693
|
+
};
|
|
2694
|
+
|
|
2677
2695
|
// packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
|
|
2678
2696
|
import { DeferredTask, Event as Event4, scheduleTask as scheduleTask3, sleep, TimeoutError as TimeoutError2, Trigger as Trigger4 } from "@dxos/async";
|
|
2679
2697
|
import { Context as Context6, rejectOnDispose } from "@dxos/context";
|
|
@@ -2959,6 +2977,10 @@ var DataSpace = class DataSpace2 {
|
|
|
2959
2977
|
constructor(params) {
|
|
2960
2978
|
this._ctx = new Context7();
|
|
2961
2979
|
this._notarizationPlugin = new NotarizationPlugin();
|
|
2980
|
+
this._cache = void 0;
|
|
2981
|
+
this._automergeHost = void 0;
|
|
2982
|
+
// TODO(dmaretskyi): Move into Space?
|
|
2983
|
+
this._automergeSpaceState = new AutomergeSpaceState();
|
|
2962
2984
|
this._state = SpaceState.CLOSED;
|
|
2963
2985
|
/**
|
|
2964
2986
|
* Error for _state === SpaceState.ERROR.
|
|
@@ -2986,7 +3008,7 @@ var DataSpace = class DataSpace2 {
|
|
|
2986
3008
|
state: SpaceState[this._state]
|
|
2987
3009
|
}, {
|
|
2988
3010
|
F: __dxlog_file12,
|
|
2989
|
-
L:
|
|
3011
|
+
L: 138,
|
|
2990
3012
|
S: this,
|
|
2991
3013
|
C: (f, a) => f(...a)
|
|
2992
3014
|
});
|
|
@@ -3016,6 +3038,9 @@ var DataSpace = class DataSpace2 {
|
|
|
3016
3038
|
get cache() {
|
|
3017
3039
|
return this._cache;
|
|
3018
3040
|
}
|
|
3041
|
+
get automergeSpaceState() {
|
|
3042
|
+
return this._automergeSpaceState;
|
|
3043
|
+
}
|
|
3019
3044
|
async open() {
|
|
3020
3045
|
await this._open();
|
|
3021
3046
|
}
|
|
@@ -3023,13 +3048,14 @@ var DataSpace = class DataSpace2 {
|
|
|
3023
3048
|
await this._gossip.open();
|
|
3024
3049
|
await this._notarizationPlugin.open();
|
|
3025
3050
|
await this._inner.spaceState.addCredentialProcessor(this._notarizationPlugin);
|
|
3051
|
+
await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
|
|
3026
3052
|
await this._inner.open(new Context7());
|
|
3027
3053
|
this._state = SpaceState.CONTROL_ONLY;
|
|
3028
3054
|
log10("new state", {
|
|
3029
3055
|
state: SpaceState[this._state]
|
|
3030
3056
|
}, {
|
|
3031
3057
|
F: __dxlog_file12,
|
|
3032
|
-
L:
|
|
3058
|
+
L: 190,
|
|
3033
3059
|
S: this,
|
|
3034
3060
|
C: (f, a) => f(...a)
|
|
3035
3061
|
});
|
|
@@ -3047,7 +3073,7 @@ var DataSpace = class DataSpace2 {
|
|
|
3047
3073
|
state: SpaceState[this._state]
|
|
3048
3074
|
}, {
|
|
3049
3075
|
F: __dxlog_file12,
|
|
3050
|
-
L:
|
|
3076
|
+
L: 204,
|
|
3051
3077
|
S: this,
|
|
3052
3078
|
C: (f, a) => f(...a)
|
|
3053
3079
|
});
|
|
@@ -3055,6 +3081,7 @@ var DataSpace = class DataSpace2 {
|
|
|
3055
3081
|
this._ctx = new Context7();
|
|
3056
3082
|
await this.authVerifier.close();
|
|
3057
3083
|
await this._inner.close();
|
|
3084
|
+
await this._inner.spaceState.removeCredentialProcessor(this._automergeSpaceState);
|
|
3058
3085
|
await this._inner.spaceState.removeCredentialProcessor(this._notarizationPlugin);
|
|
3059
3086
|
await this._notarizationPlugin.close();
|
|
3060
3087
|
await this._presence.destroy();
|
|
@@ -3078,7 +3105,7 @@ var DataSpace = class DataSpace2 {
|
|
|
3078
3105
|
if (err instanceof CancelledError) {
|
|
3079
3106
|
log10("data pipeline initialization cancelled", err, {
|
|
3080
3107
|
F: __dxlog_file12,
|
|
3081
|
-
L:
|
|
3108
|
+
L: 237,
|
|
3082
3109
|
S: this,
|
|
3083
3110
|
C: (f, a) => f(...a)
|
|
3084
3111
|
});
|
|
@@ -3086,7 +3113,7 @@ var DataSpace = class DataSpace2 {
|
|
|
3086
3113
|
}
|
|
3087
3114
|
log10.error("Error initializing data pipeline", err, {
|
|
3088
3115
|
F: __dxlog_file12,
|
|
3089
|
-
L:
|
|
3116
|
+
L: 241,
|
|
3090
3117
|
S: this,
|
|
3091
3118
|
C: (f, a) => f(...a)
|
|
3092
3119
|
});
|
|
@@ -3095,7 +3122,7 @@ var DataSpace = class DataSpace2 {
|
|
|
3095
3122
|
state: SpaceState[this._state]
|
|
3096
3123
|
}, {
|
|
3097
3124
|
F: __dxlog_file12,
|
|
3098
|
-
L:
|
|
3125
|
+
L: 243,
|
|
3099
3126
|
S: this,
|
|
3100
3127
|
C: (f, a) => f(...a)
|
|
3101
3128
|
});
|
|
@@ -3115,7 +3142,7 @@ var DataSpace = class DataSpace2 {
|
|
|
3115
3142
|
state: SpaceState[this._state]
|
|
3116
3143
|
}, {
|
|
3117
3144
|
F: __dxlog_file12,
|
|
3118
|
-
L:
|
|
3145
|
+
L: 259,
|
|
3119
3146
|
S: this,
|
|
3120
3147
|
C: (f, a) => f(...a)
|
|
3121
3148
|
});
|
|
@@ -3126,7 +3153,7 @@ var DataSpace = class DataSpace2 {
|
|
|
3126
3153
|
await cancelWithContext2(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
|
|
3127
3154
|
log10("waiting for data pipeline to reach target timeframe", void 0, {
|
|
3128
3155
|
F: __dxlog_file12,
|
|
3129
|
-
L:
|
|
3156
|
+
L: 273,
|
|
3130
3157
|
S: this,
|
|
3131
3158
|
C: (f, a) => f(...a)
|
|
3132
3159
|
});
|
|
@@ -3137,7 +3164,7 @@ var DataSpace = class DataSpace2 {
|
|
|
3137
3164
|
this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
|
|
3138
3165
|
log10("data pipeline ready", void 0, {
|
|
3139
3166
|
F: __dxlog_file12,
|
|
3140
|
-
L:
|
|
3167
|
+
L: 282,
|
|
3141
3168
|
S: this,
|
|
3142
3169
|
C: (f, a) => f(...a)
|
|
3143
3170
|
});
|
|
@@ -3147,7 +3174,7 @@ var DataSpace = class DataSpace2 {
|
|
|
3147
3174
|
state: SpaceState[this._state]
|
|
3148
3175
|
}, {
|
|
3149
3176
|
F: __dxlog_file12,
|
|
3150
|
-
L:
|
|
3177
|
+
L: 286,
|
|
3151
3178
|
S: this,
|
|
3152
3179
|
C: (f, a) => f(...a)
|
|
3153
3180
|
});
|
|
@@ -3163,7 +3190,7 @@ var DataSpace = class DataSpace2 {
|
|
|
3163
3190
|
await this._createWritableFeeds();
|
|
3164
3191
|
log10("writable feeds created", void 0, {
|
|
3165
3192
|
F: __dxlog_file12,
|
|
3166
|
-
L:
|
|
3193
|
+
L: 302,
|
|
3167
3194
|
S: this,
|
|
3168
3195
|
C: (f, a) => f(...a)
|
|
3169
3196
|
});
|
|
@@ -3235,8 +3262,28 @@ var DataSpace = class DataSpace2 {
|
|
|
3235
3262
|
}
|
|
3236
3263
|
});
|
|
3237
3264
|
}
|
|
3238
|
-
async createEpoch() {
|
|
3239
|
-
|
|
3265
|
+
async createEpoch(options) {
|
|
3266
|
+
let epoch;
|
|
3267
|
+
switch (options?.migration) {
|
|
3268
|
+
case void 0:
|
|
3269
|
+
case CreateEpochRequest.Migration.NONE:
|
|
3270
|
+
{
|
|
3271
|
+
epoch = await this.dataPipeline.createEpoch();
|
|
3272
|
+
}
|
|
3273
|
+
break;
|
|
3274
|
+
case CreateEpochRequest.Migration.INIT_AUTOMERGE: {
|
|
3275
|
+
const document = this._automergeHost?.repo.create();
|
|
3276
|
+
epoch = {
|
|
3277
|
+
previousId: this._automergeSpaceState.lastEpoch?.id,
|
|
3278
|
+
number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
|
|
3279
|
+
timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe2(),
|
|
3280
|
+
automergeRoot: document?.url
|
|
3281
|
+
};
|
|
3282
|
+
}
|
|
3283
|
+
}
|
|
3284
|
+
if (!epoch) {
|
|
3285
|
+
return;
|
|
3286
|
+
}
|
|
3240
3287
|
const receipt = await this.inner.controlPipeline.writer.write({
|
|
3241
3288
|
credential: {
|
|
3242
3289
|
credential: await this._signingContext.credentialSigner.createCredential({
|
|
@@ -3283,7 +3330,7 @@ var DataSpace = class DataSpace2 {
|
|
|
3283
3330
|
state: SpaceState[this._state]
|
|
3284
3331
|
}, {
|
|
3285
3332
|
F: __dxlog_file12,
|
|
3286
|
-
L:
|
|
3333
|
+
L: 451,
|
|
3287
3334
|
S: this,
|
|
3288
3335
|
C: (f, a) => f(...a)
|
|
3289
3336
|
});
|
|
@@ -3336,7 +3383,7 @@ import { createCredential } from "@dxos/credentials";
|
|
|
3336
3383
|
import { failUndefined as failUndefined2 } from "@dxos/debug";
|
|
3337
3384
|
import { AdmittedFeed as AdmittedFeed4, SpaceMember as SpaceMember2 } from "@dxos/protocols/proto/dxos/halo/credentials";
|
|
3338
3385
|
import { Timeframe as Timeframe3 } from "@dxos/timeframe";
|
|
3339
|
-
var spaceGenesis = async (keyring, signingContext, space) => {
|
|
3386
|
+
var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
|
|
3340
3387
|
const credentials = [
|
|
3341
3388
|
await createCredential({
|
|
3342
3389
|
signer: keyring,
|
|
@@ -3386,7 +3433,8 @@ var spaceGenesis = async (keyring, signingContext, space) => {
|
|
|
3386
3433
|
number: 0,
|
|
3387
3434
|
previousId: void 0,
|
|
3388
3435
|
timeframe: new Timeframe3(),
|
|
3389
|
-
snapshotCid: void 0
|
|
3436
|
+
snapshotCid: void 0,
|
|
3437
|
+
automergeRoot
|
|
3390
3438
|
}
|
|
3391
3439
|
})
|
|
3392
3440
|
];
|
|
@@ -3415,13 +3463,14 @@ var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
|
|
|
3415
3463
|
var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
|
|
3416
3464
|
var PRESENCE_OFFLINE_TIMEOUT = 2e4;
|
|
3417
3465
|
var DataSpaceManager = class DataSpaceManager2 {
|
|
3418
|
-
constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _feedStore) {
|
|
3466
|
+
constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _feedStore, _automergeHost) {
|
|
3419
3467
|
this._spaceManager = _spaceManager;
|
|
3420
3468
|
this._metadataStore = _metadataStore;
|
|
3421
3469
|
this._dataServiceSubscriptions = _dataServiceSubscriptions;
|
|
3422
3470
|
this._keyring = _keyring;
|
|
3423
3471
|
this._signingContext = _signingContext;
|
|
3424
3472
|
this._feedStore = _feedStore;
|
|
3473
|
+
this._automergeHost = _automergeHost;
|
|
3425
3474
|
this._ctx = new Context8();
|
|
3426
3475
|
this.updated = new Event6();
|
|
3427
3476
|
this._spaces = new ComplexMap3(PublicKey9.hash);
|
|
@@ -3435,7 +3484,7 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3435
3484
|
async open() {
|
|
3436
3485
|
log11("open", void 0, {
|
|
3437
3486
|
F: __dxlog_file13,
|
|
3438
|
-
L:
|
|
3487
|
+
L: 90,
|
|
3439
3488
|
S: this,
|
|
3440
3489
|
C: (f, a) => f(...a)
|
|
3441
3490
|
});
|
|
@@ -3443,7 +3492,7 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3443
3492
|
id: this._instanceId
|
|
3444
3493
|
}), {
|
|
3445
3494
|
F: __dxlog_file13,
|
|
3446
|
-
L:
|
|
3495
|
+
L: 91,
|
|
3447
3496
|
S: this,
|
|
3448
3497
|
C: (f, a) => f(...a)
|
|
3449
3498
|
});
|
|
@@ -3451,7 +3500,7 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3451
3500
|
spaces: this._metadataStore.spaces.length
|
|
3452
3501
|
}, {
|
|
3453
3502
|
F: __dxlog_file13,
|
|
3454
|
-
L:
|
|
3503
|
+
L: 92,
|
|
3455
3504
|
S: this,
|
|
3456
3505
|
C: (f, a) => f(...a)
|
|
3457
3506
|
});
|
|
@@ -3461,7 +3510,7 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3461
3510
|
spaceMetadata
|
|
3462
3511
|
}, {
|
|
3463
3512
|
F: __dxlog_file13,
|
|
3464
|
-
L:
|
|
3513
|
+
L: 96,
|
|
3465
3514
|
S: this,
|
|
3466
3515
|
C: (f, a) => f(...a)
|
|
3467
3516
|
});
|
|
@@ -3472,7 +3521,7 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3472
3521
|
err
|
|
3473
3522
|
}, {
|
|
3474
3523
|
F: __dxlog_file13,
|
|
3475
|
-
L:
|
|
3524
|
+
L: 99,
|
|
3476
3525
|
S: this,
|
|
3477
3526
|
C: (f, a) => f(...a)
|
|
3478
3527
|
});
|
|
@@ -3489,7 +3538,7 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3489
3538
|
id: this._instanceId
|
|
3490
3539
|
}), {
|
|
3491
3540
|
F: __dxlog_file13,
|
|
3492
|
-
L:
|
|
3541
|
+
L: 112,
|
|
3493
3542
|
S: this,
|
|
3494
3543
|
C: (f, a) => f(...a)
|
|
3495
3544
|
});
|
|
@@ -3497,7 +3546,7 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3497
3546
|
async close() {
|
|
3498
3547
|
log11("close", void 0, {
|
|
3499
3548
|
F: __dxlog_file13,
|
|
3500
|
-
L:
|
|
3549
|
+
L: 117,
|
|
3501
3550
|
S: this,
|
|
3502
3551
|
C: (f, a) => f(...a)
|
|
3503
3552
|
});
|
|
@@ -3513,7 +3562,7 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3513
3562
|
async createSpace() {
|
|
3514
3563
|
invariant11(this._isOpen, "Not open.", {
|
|
3515
3564
|
F: __dxlog_file13,
|
|
3516
|
-
L:
|
|
3565
|
+
L: 130,
|
|
3517
3566
|
S: this,
|
|
3518
3567
|
A: [
|
|
3519
3568
|
"this._isOpen",
|
|
@@ -3534,17 +3583,18 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3534
3583
|
spaceKey
|
|
3535
3584
|
}, {
|
|
3536
3585
|
F: __dxlog_file13,
|
|
3537
|
-
L:
|
|
3586
|
+
L: 142,
|
|
3538
3587
|
S: this,
|
|
3539
3588
|
C: (f, a) => f(...a)
|
|
3540
3589
|
});
|
|
3541
3590
|
const space = await this._constructSpace(metadata);
|
|
3542
|
-
const
|
|
3591
|
+
const automergeRoot = this._automergeHost.repo.create();
|
|
3592
|
+
const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRoot.url);
|
|
3543
3593
|
await this._metadataStore.addSpace(metadata);
|
|
3544
3594
|
const memberCredential = credentials[1];
|
|
3545
3595
|
invariant11(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
|
|
3546
3596
|
F: __dxlog_file13,
|
|
3547
|
-
L:
|
|
3597
|
+
L: 151,
|
|
3548
3598
|
S: this,
|
|
3549
3599
|
A: [
|
|
3550
3600
|
"getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
|
|
@@ -3562,13 +3612,13 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3562
3612
|
opts
|
|
3563
3613
|
}, {
|
|
3564
3614
|
F: __dxlog_file13,
|
|
3565
|
-
L:
|
|
3615
|
+
L: 163,
|
|
3566
3616
|
S: this,
|
|
3567
3617
|
C: (f, a) => f(...a)
|
|
3568
3618
|
});
|
|
3569
3619
|
invariant11(this._isOpen, "Not open.", {
|
|
3570
3620
|
F: __dxlog_file13,
|
|
3571
|
-
L:
|
|
3621
|
+
L: 164,
|
|
3572
3622
|
S: this,
|
|
3573
3623
|
A: [
|
|
3574
3624
|
"this._isOpen",
|
|
@@ -3577,7 +3627,7 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3577
3627
|
});
|
|
3578
3628
|
invariant11(!this._spaces.has(opts.spaceKey), "Space already exists.", {
|
|
3579
3629
|
F: __dxlog_file13,
|
|
3580
|
-
L:
|
|
3630
|
+
L: 165,
|
|
3581
3631
|
S: this,
|
|
3582
3632
|
A: [
|
|
3583
3633
|
"!this._spaces.has(opts.spaceKey)",
|
|
@@ -3612,7 +3662,7 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3612
3662
|
metadata
|
|
3613
3663
|
}, {
|
|
3614
3664
|
F: __dxlog_file13,
|
|
3615
|
-
L:
|
|
3665
|
+
L: 198,
|
|
3616
3666
|
S: this,
|
|
3617
3667
|
C: (f, a) => f(...a)
|
|
3618
3668
|
});
|
|
@@ -3648,7 +3698,7 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3648
3698
|
onAuthFailure: () => {
|
|
3649
3699
|
log11.warn("auth failure", void 0, {
|
|
3650
3700
|
F: __dxlog_file13,
|
|
3651
|
-
L:
|
|
3701
|
+
L: 233,
|
|
3652
3702
|
S: this,
|
|
3653
3703
|
C: (f, a) => f(...a)
|
|
3654
3704
|
});
|
|
@@ -3672,7 +3722,7 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3672
3722
|
space: space.key
|
|
3673
3723
|
}, {
|
|
3674
3724
|
F: __dxlog_file13,
|
|
3675
|
-
L:
|
|
3725
|
+
L: 251,
|
|
3676
3726
|
S: this,
|
|
3677
3727
|
C: (f, a) => f(...a)
|
|
3678
3728
|
});
|
|
@@ -3684,7 +3734,7 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3684
3734
|
open: this._isOpen
|
|
3685
3735
|
}, {
|
|
3686
3736
|
F: __dxlog_file13,
|
|
3687
|
-
L:
|
|
3737
|
+
L: 258,
|
|
3688
3738
|
S: this,
|
|
3689
3739
|
C: (f, a) => f(...a)
|
|
3690
3740
|
});
|
|
@@ -3697,14 +3747,15 @@ var DataSpaceManager = class DataSpaceManager2 {
|
|
|
3697
3747
|
space: space.key
|
|
3698
3748
|
}, {
|
|
3699
3749
|
F: __dxlog_file13,
|
|
3700
|
-
L:
|
|
3750
|
+
L: 264,
|
|
3701
3751
|
S: this,
|
|
3702
3752
|
C: (f, a) => f(...a)
|
|
3703
3753
|
});
|
|
3704
3754
|
await this._dataServiceSubscriptions.unregisterSpace(space.key);
|
|
3705
3755
|
}
|
|
3706
3756
|
},
|
|
3707
|
-
cache: metadata.cache
|
|
3757
|
+
cache: metadata.cache,
|
|
3758
|
+
automergeHost: this._automergeHost
|
|
3708
3759
|
});
|
|
3709
3760
|
if (metadata.state !== SpaceState2.INACTIVE) {
|
|
3710
3761
|
await dataSpace.open();
|
|
@@ -3961,7 +4012,7 @@ import { Trigger as Trigger5 } from "@dxos/async";
|
|
|
3961
4012
|
import { Context as Context9 } from "@dxos/context";
|
|
3962
4013
|
import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
|
|
3963
4014
|
import { failUndefined as failUndefined3 } from "@dxos/debug";
|
|
3964
|
-
import { valueEncoding, MetadataStore, SpaceManager, DataServiceSubscriptions, SnapshotStore } from "@dxos/echo-pipeline";
|
|
4015
|
+
import { valueEncoding, MetadataStore, SpaceManager, DataServiceSubscriptions, SnapshotStore, AutomergeHost } from "@dxos/echo-pipeline";
|
|
3965
4016
|
import { FeedFactory, FeedStore } from "@dxos/feed-store";
|
|
3966
4017
|
import { invariant as invariant13 } from "@dxos/invariant";
|
|
3967
4018
|
import { Keyring } from "@dxos/keyring";
|
|
@@ -4016,6 +4067,7 @@ var ServiceContext = class ServiceContext2 {
|
|
|
4016
4067
|
snapshotStore: this.snapshotStore
|
|
4017
4068
|
});
|
|
4018
4069
|
this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
|
|
4070
|
+
this.automergeHost = new AutomergeHost(storage.createDirectory("automerge"));
|
|
4019
4071
|
this.invitations = new InvitationsHandler(this.networkManager);
|
|
4020
4072
|
this._handlerFactories.set(Invitation6.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined3(), this._acceptIdentity.bind(this)));
|
|
4021
4073
|
}
|
|
@@ -4023,7 +4075,7 @@ var ServiceContext = class ServiceContext2 {
|
|
|
4023
4075
|
await this._checkStorageVersion();
|
|
4024
4076
|
log13("opening...", void 0, {
|
|
4025
4077
|
F: __dxlog_file15,
|
|
4026
|
-
L:
|
|
4078
|
+
L: 133,
|
|
4027
4079
|
S: this,
|
|
4028
4080
|
C: (f, a) => f(...a)
|
|
4029
4081
|
});
|
|
@@ -4031,7 +4083,7 @@ var ServiceContext = class ServiceContext2 {
|
|
|
4031
4083
|
id: this._instanceId
|
|
4032
4084
|
}), {
|
|
4033
4085
|
F: __dxlog_file15,
|
|
4034
|
-
L:
|
|
4086
|
+
L: 134,
|
|
4035
4087
|
S: this,
|
|
4036
4088
|
C: (f, a) => f(...a)
|
|
4037
4089
|
});
|
|
@@ -4047,13 +4099,13 @@ var ServiceContext = class ServiceContext2 {
|
|
|
4047
4099
|
id: this._instanceId
|
|
4048
4100
|
}), {
|
|
4049
4101
|
F: __dxlog_file15,
|
|
4050
|
-
L:
|
|
4102
|
+
L: 144,
|
|
4051
4103
|
S: this,
|
|
4052
4104
|
C: (f, a) => f(...a)
|
|
4053
4105
|
});
|
|
4054
4106
|
log13("opened", void 0, {
|
|
4055
4107
|
F: __dxlog_file15,
|
|
4056
|
-
L:
|
|
4108
|
+
L: 145,
|
|
4057
4109
|
S: this,
|
|
4058
4110
|
C: (f, a) => f(...a)
|
|
4059
4111
|
});
|
|
@@ -4061,7 +4113,7 @@ var ServiceContext = class ServiceContext2 {
|
|
|
4061
4113
|
async close() {
|
|
4062
4114
|
log13("closing...", void 0, {
|
|
4063
4115
|
F: __dxlog_file15,
|
|
4064
|
-
L:
|
|
4116
|
+
L: 149,
|
|
4065
4117
|
S: this,
|
|
4066
4118
|
C: (f, a) => f(...a)
|
|
4067
4119
|
});
|
|
@@ -4078,7 +4130,7 @@ var ServiceContext = class ServiceContext2 {
|
|
|
4078
4130
|
await this.metadataStore.close();
|
|
4079
4131
|
log13("closed", void 0, {
|
|
4080
4132
|
F: __dxlog_file15,
|
|
4081
|
-
L:
|
|
4133
|
+
L: 161,
|
|
4082
4134
|
S: this,
|
|
4083
4135
|
C: (f, a) => f(...a)
|
|
4084
4136
|
});
|
|
@@ -4092,7 +4144,7 @@ var ServiceContext = class ServiceContext2 {
|
|
|
4092
4144
|
const factory = this._handlerFactories.get(invitation.kind);
|
|
4093
4145
|
invariant13(factory, `Unknown invitation kind: ${invitation.kind}`, {
|
|
4094
4146
|
F: __dxlog_file15,
|
|
4095
|
-
L:
|
|
4147
|
+
L: 172,
|
|
4096
4148
|
S: this,
|
|
4097
4149
|
A: [
|
|
4098
4150
|
"factory",
|
|
@@ -4124,7 +4176,7 @@ var ServiceContext = class ServiceContext2 {
|
|
|
4124
4176
|
async _initialize(ctx) {
|
|
4125
4177
|
log13("initializing spaces...", void 0, {
|
|
4126
4178
|
F: __dxlog_file15,
|
|
4127
|
-
L:
|
|
4179
|
+
L: 203,
|
|
4128
4180
|
S: this,
|
|
4129
4181
|
C: (f, a) => f(...a)
|
|
4130
4182
|
});
|
|
@@ -4142,12 +4194,12 @@ var ServiceContext = class ServiceContext2 {
|
|
|
4142
4194
|
});
|
|
4143
4195
|
}
|
|
4144
4196
|
};
|
|
4145
|
-
this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore);
|
|
4197
|
+
this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore, this.automergeHost);
|
|
4146
4198
|
await this.dataSpaceManager.open();
|
|
4147
4199
|
this._handlerFactories.set(Invitation6.Kind.SPACE, (invitation) => {
|
|
4148
4200
|
invariant13(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
|
|
4149
4201
|
F: __dxlog_file15,
|
|
4150
|
-
L:
|
|
4202
|
+
L: 227,
|
|
4151
4203
|
S: this,
|
|
4152
4204
|
A: [
|
|
4153
4205
|
"this.dataSpaceManager",
|
|
@@ -4171,7 +4223,7 @@ var ServiceContext = class ServiceContext2 {
|
|
|
4171
4223
|
details: assertion
|
|
4172
4224
|
}, {
|
|
4173
4225
|
F: __dxlog_file15,
|
|
4174
|
-
L:
|
|
4226
|
+
L: 243,
|
|
4175
4227
|
S: this,
|
|
4176
4228
|
C: (f, a) => f(...a)
|
|
4177
4229
|
});
|
|
@@ -4182,7 +4234,7 @@ var ServiceContext = class ServiceContext2 {
|
|
|
4182
4234
|
details: assertion
|
|
4183
4235
|
}, {
|
|
4184
4236
|
F: __dxlog_file15,
|
|
4185
|
-
L:
|
|
4237
|
+
L: 247,
|
|
4186
4238
|
S: this,
|
|
4187
4239
|
C: (f, a) => f(...a)
|
|
4188
4240
|
});
|
|
@@ -4193,7 +4245,7 @@ var ServiceContext = class ServiceContext2 {
|
|
|
4193
4245
|
details: assertion
|
|
4194
4246
|
}, {
|
|
4195
4247
|
F: __dxlog_file15,
|
|
4196
|
-
L:
|
|
4248
|
+
L: 252,
|
|
4197
4249
|
S: this,
|
|
4198
4250
|
C: (f, a) => f(...a)
|
|
4199
4251
|
});
|
|
@@ -4204,7 +4256,7 @@ var ServiceContext = class ServiceContext2 {
|
|
|
4204
4256
|
} catch (err) {
|
|
4205
4257
|
log13.catch(err, void 0, {
|
|
4206
4258
|
F: __dxlog_file15,
|
|
4207
|
-
L:
|
|
4259
|
+
L: 258,
|
|
4208
4260
|
S: this,
|
|
4209
4261
|
C: (f, a) => f(...a)
|
|
4210
4262
|
});
|
|
@@ -4924,7 +4976,7 @@ var ClientServicesHost = class ClientServicesHost2 {
|
|
|
4924
4976
|
await this._serviceContext.initialized.wait();
|
|
4925
4977
|
return this._serviceContext.dataSpaceManager;
|
|
4926
4978
|
}),
|
|
4927
|
-
DataService: new DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
|
|
4979
|
+
DataService: new DataServiceImpl(this._serviceContext.dataServiceSubscriptions, this._serviceContext.automergeHost),
|
|
4928
4980
|
NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
|
|
4929
4981
|
LoggingService: this._loggingService,
|
|
4930
4982
|
TracingService: this._tracingService,
|
|
@@ -4954,7 +5006,7 @@ var ClientServicesHost = class ClientServicesHost2 {
|
|
|
4954
5006
|
deviceKey
|
|
4955
5007
|
}, {
|
|
4956
5008
|
F: __dxlog_file17,
|
|
4957
|
-
L:
|
|
5009
|
+
L: 320,
|
|
4958
5010
|
S: this,
|
|
4959
5011
|
C: (f, a) => f(...a)
|
|
4960
5012
|
});
|
|
@@ -4962,7 +5014,7 @@ var ClientServicesHost = class ClientServicesHost2 {
|
|
|
4962
5014
|
id: traceId
|
|
4963
5015
|
}), {
|
|
4964
5016
|
F: __dxlog_file17,
|
|
4965
|
-
L:
|
|
5017
|
+
L: 321,
|
|
4966
5018
|
S: this,
|
|
4967
5019
|
C: (f, a) => f(...a)
|
|
4968
5020
|
});
|
|
@@ -4976,7 +5028,7 @@ var ClientServicesHost = class ClientServicesHost2 {
|
|
|
4976
5028
|
deviceKey
|
|
4977
5029
|
}, {
|
|
4978
5030
|
F: __dxlog_file17,
|
|
4979
|
-
L:
|
|
5031
|
+
L: 332,
|
|
4980
5032
|
S: this,
|
|
4981
5033
|
C: (f, a) => f(...a)
|
|
4982
5034
|
});
|
|
@@ -4992,7 +5044,7 @@ var ClientServicesHost = class ClientServicesHost2 {
|
|
|
4992
5044
|
deviceKey
|
|
4993
5045
|
}, {
|
|
4994
5046
|
F: __dxlog_file17,
|
|
4995
|
-
L:
|
|
5047
|
+
L: 339,
|
|
4996
5048
|
S: this,
|
|
4997
5049
|
C: (f, a) => f(...a)
|
|
4998
5050
|
});
|
|
@@ -5003,13 +5055,13 @@ var ClientServicesHost = class ClientServicesHost2 {
|
|
|
5003
5055
|
id: traceId
|
|
5004
5056
|
}), {
|
|
5005
5057
|
F: __dxlog_file17,
|
|
5006
|
-
L:
|
|
5058
|
+
L: 344,
|
|
5007
5059
|
S: this,
|
|
5008
5060
|
C: (f, a) => f(...a)
|
|
5009
5061
|
});
|
|
5010
5062
|
log16("resetting...", void 0, {
|
|
5011
5063
|
F: __dxlog_file17,
|
|
5012
|
-
L:
|
|
5064
|
+
L: 346,
|
|
5013
5065
|
S: this,
|
|
5014
5066
|
C: (f, a) => f(...a)
|
|
5015
5067
|
});
|
|
@@ -5017,7 +5069,7 @@ var ClientServicesHost = class ClientServicesHost2 {
|
|
|
5017
5069
|
await this._storage.reset();
|
|
5018
5070
|
log16("reset", void 0, {
|
|
5019
5071
|
F: __dxlog_file17,
|
|
5020
|
-
L:
|
|
5072
|
+
L: 349,
|
|
5021
5073
|
S: this,
|
|
5022
5074
|
C: (f, a) => f(...a)
|
|
5023
5075
|
});
|
|
@@ -5025,7 +5077,7 @@ var ClientServicesHost = class ClientServicesHost2 {
|
|
|
5025
5077
|
id: traceId
|
|
5026
5078
|
}), {
|
|
5027
5079
|
F: __dxlog_file17,
|
|
5028
|
-
L:
|
|
5080
|
+
L: 350,
|
|
5029
5081
|
S: this,
|
|
5030
5082
|
C: (f, a) => f(...a)
|
|
5031
5083
|
});
|
|
@@ -5035,7 +5087,9 @@ var ClientServicesHost = class ClientServicesHost2 {
|
|
|
5035
5087
|
const identity = await this._serviceContext.createIdentity(params);
|
|
5036
5088
|
await this._serviceContext.initialized.wait();
|
|
5037
5089
|
const space = await this._serviceContext.dataSpaceManager.createSpace();
|
|
5038
|
-
const obj = new Properties(
|
|
5090
|
+
const obj = new Properties(void 0, {
|
|
5091
|
+
useAutomergeBackend: false
|
|
5092
|
+
});
|
|
5039
5093
|
obj[defaultKey] = identity.identityKey.toHex();
|
|
5040
5094
|
await this._serviceRegistry.services.DataService.write({
|
|
5041
5095
|
spaceKey: space.key,
|
|
@@ -5102,4 +5156,4 @@ export {
|
|
|
5102
5156
|
createDefaultModelFactory,
|
|
5103
5157
|
ClientServicesHost
|
|
5104
5158
|
};
|
|
5105
|
-
//# sourceMappingURL=chunk-
|
|
5159
|
+
//# sourceMappingURL=chunk-OHR2WF47.mjs.map
|