@dxos/client-services 0.3.9-main.604ae36 → 0.3.9-main.62f3346

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.
Files changed (34) hide show
  1. package/dist/lib/browser/{chunk-E4BT55VD.mjs → chunk-D5HVD42G.mjs} +51 -38
  2. package/dist/lib/browser/chunk-D5HVD42G.mjs.map +7 -0
  3. package/dist/lib/browser/index.mjs +1 -1
  4. package/dist/lib/browser/meta.json +1 -1
  5. package/dist/lib/browser/packlets/testing/index.mjs +7 -3
  6. package/dist/lib/browser/packlets/testing/index.mjs.map +3 -3
  7. package/dist/lib/node/{chunk-AKVILVWG.cjs → chunk-ZKL5NJWW.cjs} +46 -41
  8. package/dist/lib/node/{chunk-AKVILVWG.cjs.map → chunk-ZKL5NJWW.cjs.map} +3 -3
  9. package/dist/lib/node/index.cjs +37 -37
  10. package/dist/lib/node/meta.json +1 -1
  11. package/dist/lib/node/packlets/testing/index.cjs +11 -8
  12. package/dist/lib/node/packlets/testing/index.cjs.map +3 -3
  13. package/dist/types/src/packlets/services/automerge-host.test.d.ts +2 -0
  14. package/dist/types/src/packlets/services/automerge-host.test.d.ts.map +1 -0
  15. package/dist/types/src/packlets/services/service-context.d.ts.map +1 -1
  16. package/dist/types/src/packlets/spaces/data-space-manager.d.ts +2 -2
  17. package/dist/types/src/packlets/spaces/data-space-manager.d.ts.map +1 -1
  18. package/dist/types/src/packlets/spaces/data-space.d.ts +2 -2
  19. package/dist/types/src/packlets/spaces/data-space.d.ts.map +1 -1
  20. package/dist/types/src/packlets/spaces/genesis.d.ts +1 -1
  21. package/dist/types/src/packlets/spaces/genesis.d.ts.map +1 -1
  22. package/dist/types/src/packlets/testing/test-builder.d.ts +3 -1
  23. package/dist/types/src/packlets/testing/test-builder.d.ts.map +1 -1
  24. package/dist/types/src/version.d.ts +1 -1
  25. package/package.json +35 -35
  26. package/src/packlets/services/automerge-host.test.ts +56 -0
  27. package/src/packlets/services/service-context.ts +1 -0
  28. package/src/packlets/services/service-host.ts +1 -1
  29. package/src/packlets/spaces/data-space-manager.ts +4 -4
  30. package/src/packlets/spaces/data-space.ts +5 -6
  31. package/src/packlets/spaces/genesis.ts +7 -1
  32. package/src/packlets/testing/test-builder.ts +7 -0
  33. package/src/version.ts +1 -1
  34. package/dist/lib/browser/chunk-E4BT55VD.mjs.map +0 -7
@@ -1,5 +1,12 @@
1
1
  import "@dxos/node-std/globals";
2
2
 
3
+ // inject-globals:@inject-globals
4
+ import {
5
+ global,
6
+ Buffer,
7
+ process
8
+ } from "@dxos/node-std/inject-globals";
9
+
3
10
  // packages/sdk/client-services/src/packlets/devtools/feeds.ts
4
11
  import { EventSubscriptions } from "@dxos/async";
5
12
  import { Stream } from "@dxos/codec-protobuf";
@@ -2534,7 +2541,7 @@ var getPlatform = () => {
2534
2541
  };
2535
2542
 
2536
2543
  // packages/sdk/client-services/src/version.ts
2537
- var DXOS_VERSION = "0.3.9-main.604ae36";
2544
+ var DXOS_VERSION = "0.3.9-main.62f3346";
2538
2545
 
2539
2546
  // packages/sdk/client-services/src/packlets/services/diagnostics.ts
2540
2547
  var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
@@ -2978,7 +2985,6 @@ var DataSpace = class DataSpace2 {
2978
2985
  this._ctx = new Context7();
2979
2986
  this._notarizationPlugin = new NotarizationPlugin();
2980
2987
  this._cache = void 0;
2981
- this._automergeHost = void 0;
2982
2988
  // TODO(dmaretskyi): Move into Space?
2983
2989
  this._automergeSpaceState = new AutomergeSpaceState();
2984
2990
  this._state = SpaceState.CLOSED;
@@ -2997,6 +3003,7 @@ var DataSpace = class DataSpace2 {
2997
3003
  this._metadataStore = params.metadataStore;
2998
3004
  this._signingContext = params.signingContext;
2999
3005
  this._callbacks = params.callbacks ?? {};
3006
+ this._automergeHost = params.automergeHost;
3000
3007
  this.authVerifier = new TrustedKeySetAuthVerifier({
3001
3008
  trustedKeysProvider: () => new ComplexSet3(PublicKey8.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
3002
3009
  update: this._inner.stateUpdate,
@@ -3008,7 +3015,7 @@ var DataSpace = class DataSpace2 {
3008
3015
  state: SpaceState[this._state]
3009
3016
  }, {
3010
3017
  F: __dxlog_file12,
3011
- L: 138,
3018
+ L: 137,
3012
3019
  S: this,
3013
3020
  C: (f, a) => f(...a)
3014
3021
  });
@@ -3055,7 +3062,7 @@ var DataSpace = class DataSpace2 {
3055
3062
  state: SpaceState[this._state]
3056
3063
  }, {
3057
3064
  F: __dxlog_file12,
3058
- L: 190,
3065
+ L: 189,
3059
3066
  S: this,
3060
3067
  C: (f, a) => f(...a)
3061
3068
  });
@@ -3073,7 +3080,7 @@ var DataSpace = class DataSpace2 {
3073
3080
  state: SpaceState[this._state]
3074
3081
  }, {
3075
3082
  F: __dxlog_file12,
3076
- L: 204,
3083
+ L: 203,
3077
3084
  S: this,
3078
3085
  C: (f, a) => f(...a)
3079
3086
  });
@@ -3105,7 +3112,7 @@ var DataSpace = class DataSpace2 {
3105
3112
  if (err instanceof CancelledError) {
3106
3113
  log10("data pipeline initialization cancelled", err, {
3107
3114
  F: __dxlog_file12,
3108
- L: 237,
3115
+ L: 236,
3109
3116
  S: this,
3110
3117
  C: (f, a) => f(...a)
3111
3118
  });
@@ -3113,7 +3120,7 @@ var DataSpace = class DataSpace2 {
3113
3120
  }
3114
3121
  log10.error("Error initializing data pipeline", err, {
3115
3122
  F: __dxlog_file12,
3116
- L: 241,
3123
+ L: 240,
3117
3124
  S: this,
3118
3125
  C: (f, a) => f(...a)
3119
3126
  });
@@ -3122,7 +3129,7 @@ var DataSpace = class DataSpace2 {
3122
3129
  state: SpaceState[this._state]
3123
3130
  }, {
3124
3131
  F: __dxlog_file12,
3125
- L: 243,
3132
+ L: 242,
3126
3133
  S: this,
3127
3134
  C: (f, a) => f(...a)
3128
3135
  });
@@ -3142,7 +3149,7 @@ var DataSpace = class DataSpace2 {
3142
3149
  state: SpaceState[this._state]
3143
3150
  }, {
3144
3151
  F: __dxlog_file12,
3145
- L: 259,
3152
+ L: 258,
3146
3153
  S: this,
3147
3154
  C: (f, a) => f(...a)
3148
3155
  });
@@ -3153,7 +3160,7 @@ var DataSpace = class DataSpace2 {
3153
3160
  await cancelWithContext2(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
3154
3161
  log10("waiting for data pipeline to reach target timeframe", void 0, {
3155
3162
  F: __dxlog_file12,
3156
- L: 273,
3163
+ L: 272,
3157
3164
  S: this,
3158
3165
  C: (f, a) => f(...a)
3159
3166
  });
@@ -3164,7 +3171,7 @@ var DataSpace = class DataSpace2 {
3164
3171
  this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
3165
3172
  log10("data pipeline ready", void 0, {
3166
3173
  F: __dxlog_file12,
3167
- L: 282,
3174
+ L: 281,
3168
3175
  S: this,
3169
3176
  C: (f, a) => f(...a)
3170
3177
  });
@@ -3174,7 +3181,7 @@ var DataSpace = class DataSpace2 {
3174
3181
  state: SpaceState[this._state]
3175
3182
  }, {
3176
3183
  F: __dxlog_file12,
3177
- L: 286,
3184
+ L: 285,
3178
3185
  S: this,
3179
3186
  C: (f, a) => f(...a)
3180
3187
  });
@@ -3190,7 +3197,7 @@ var DataSpace = class DataSpace2 {
3190
3197
  await this._createWritableFeeds();
3191
3198
  log10("writable feeds created", void 0, {
3192
3199
  F: __dxlog_file12,
3193
- L: 302,
3200
+ L: 301,
3194
3201
  S: this,
3195
3202
  C: (f, a) => f(...a)
3196
3203
  });
@@ -3272,12 +3279,12 @@ var DataSpace = class DataSpace2 {
3272
3279
  }
3273
3280
  break;
3274
3281
  case CreateEpochRequest.Migration.INIT_AUTOMERGE: {
3275
- const document = this._automergeHost?.repo.create();
3282
+ const document = this._automergeHost.repo.create();
3276
3283
  epoch = {
3277
3284
  previousId: this._automergeSpaceState.lastEpoch?.id,
3278
3285
  number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
3279
3286
  timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe2(),
3280
- automergeRoot: document?.url
3287
+ automergeRoot: document.url
3281
3288
  };
3282
3289
  }
3283
3290
  }
@@ -3330,7 +3337,7 @@ var DataSpace = class DataSpace2 {
3330
3337
  state: SpaceState[this._state]
3331
3338
  }, {
3332
3339
  F: __dxlog_file12,
3333
- L: 451,
3340
+ L: 450,
3334
3341
  S: this,
3335
3342
  C: (f, a) => f(...a)
3336
3343
  });
@@ -3383,7 +3390,7 @@ import { createCredential } from "@dxos/credentials";
3383
3390
  import { failUndefined as failUndefined2 } from "@dxos/debug";
3384
3391
  import { AdmittedFeed as AdmittedFeed4, SpaceMember as SpaceMember2 } from "@dxos/protocols/proto/dxos/halo/credentials";
3385
3392
  import { Timeframe as Timeframe3 } from "@dxos/timeframe";
3386
- var spaceGenesis = async (keyring, signingContext, space) => {
3393
+ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
3387
3394
  const credentials = [
3388
3395
  await createCredential({
3389
3396
  signer: keyring,
@@ -3433,7 +3440,8 @@ var spaceGenesis = async (keyring, signingContext, space) => {
3433
3440
  number: 0,
3434
3441
  previousId: void 0,
3435
3442
  timeframe: new Timeframe3(),
3436
- snapshotCid: void 0
3443
+ snapshotCid: void 0,
3444
+ automergeRoot
3437
3445
  }
3438
3446
  })
3439
3447
  ];
@@ -3483,7 +3491,7 @@ var DataSpaceManager = class DataSpaceManager2 {
3483
3491
  async open() {
3484
3492
  log11("open", void 0, {
3485
3493
  F: __dxlog_file13,
3486
- L: 92,
3494
+ L: 90,
3487
3495
  S: this,
3488
3496
  C: (f, a) => f(...a)
3489
3497
  });
@@ -3491,7 +3499,7 @@ var DataSpaceManager = class DataSpaceManager2 {
3491
3499
  id: this._instanceId
3492
3500
  }), {
3493
3501
  F: __dxlog_file13,
3494
- L: 93,
3502
+ L: 91,
3495
3503
  S: this,
3496
3504
  C: (f, a) => f(...a)
3497
3505
  });
@@ -3499,7 +3507,7 @@ var DataSpaceManager = class DataSpaceManager2 {
3499
3507
  spaces: this._metadataStore.spaces.length
3500
3508
  }, {
3501
3509
  F: __dxlog_file13,
3502
- L: 94,
3510
+ L: 92,
3503
3511
  S: this,
3504
3512
  C: (f, a) => f(...a)
3505
3513
  });
@@ -3509,7 +3517,7 @@ var DataSpaceManager = class DataSpaceManager2 {
3509
3517
  spaceMetadata
3510
3518
  }, {
3511
3519
  F: __dxlog_file13,
3512
- L: 98,
3520
+ L: 96,
3513
3521
  S: this,
3514
3522
  C: (f, a) => f(...a)
3515
3523
  });
@@ -3520,7 +3528,7 @@ var DataSpaceManager = class DataSpaceManager2 {
3520
3528
  err
3521
3529
  }, {
3522
3530
  F: __dxlog_file13,
3523
- L: 101,
3531
+ L: 99,
3524
3532
  S: this,
3525
3533
  C: (f, a) => f(...a)
3526
3534
  });
@@ -3537,7 +3545,7 @@ var DataSpaceManager = class DataSpaceManager2 {
3537
3545
  id: this._instanceId
3538
3546
  }), {
3539
3547
  F: __dxlog_file13,
3540
- L: 114,
3548
+ L: 112,
3541
3549
  S: this,
3542
3550
  C: (f, a) => f(...a)
3543
3551
  });
@@ -3545,7 +3553,7 @@ var DataSpaceManager = class DataSpaceManager2 {
3545
3553
  async close() {
3546
3554
  log11("close", void 0, {
3547
3555
  F: __dxlog_file13,
3548
- L: 119,
3556
+ L: 117,
3549
3557
  S: this,
3550
3558
  C: (f, a) => f(...a)
3551
3559
  });
@@ -3561,7 +3569,7 @@ var DataSpaceManager = class DataSpaceManager2 {
3561
3569
  async createSpace() {
3562
3570
  invariant11(this._isOpen, "Not open.", {
3563
3571
  F: __dxlog_file13,
3564
- L: 132,
3572
+ L: 130,
3565
3573
  S: this,
3566
3574
  A: [
3567
3575
  "this._isOpen",
@@ -3582,12 +3590,13 @@ var DataSpaceManager = class DataSpaceManager2 {
3582
3590
  spaceKey
3583
3591
  }, {
3584
3592
  F: __dxlog_file13,
3585
- L: 144,
3593
+ L: 142,
3586
3594
  S: this,
3587
3595
  C: (f, a) => f(...a)
3588
3596
  });
3589
3597
  const space = await this._constructSpace(metadata);
3590
- const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner);
3598
+ const automergeRoot = this._automergeHost.repo.create();
3599
+ const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRoot.url);
3591
3600
  await this._metadataStore.addSpace(metadata);
3592
3601
  const memberCredential = credentials[1];
3593
3602
  invariant11(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
@@ -4118,6 +4127,7 @@ var ServiceContext = class ServiceContext2 {
4118
4127
  if (this._deviceSpaceSync && this.identityManager.identity) {
4119
4128
  await this.identityManager.identity.space.spaceState.removeCredentialProcessor(this._deviceSpaceSync);
4120
4129
  }
4130
+ await this.automergeHost.close();
4121
4131
  await this.dataSpaceManager?.close();
4122
4132
  await this.identityManager.close();
4123
4133
  await this.spaceManager.close();
@@ -4128,7 +4138,7 @@ var ServiceContext = class ServiceContext2 {
4128
4138
  await this.metadataStore.close();
4129
4139
  log13("closed", void 0, {
4130
4140
  F: __dxlog_file15,
4131
- L: 161,
4141
+ L: 162,
4132
4142
  S: this,
4133
4143
  C: (f, a) => f(...a)
4134
4144
  });
@@ -4142,7 +4152,7 @@ var ServiceContext = class ServiceContext2 {
4142
4152
  const factory = this._handlerFactories.get(invitation.kind);
4143
4153
  invariant13(factory, `Unknown invitation kind: ${invitation.kind}`, {
4144
4154
  F: __dxlog_file15,
4145
- L: 172,
4155
+ L: 173,
4146
4156
  S: this,
4147
4157
  A: [
4148
4158
  "factory",
@@ -4174,7 +4184,7 @@ var ServiceContext = class ServiceContext2 {
4174
4184
  async _initialize(ctx) {
4175
4185
  log13("initializing spaces...", void 0, {
4176
4186
  F: __dxlog_file15,
4177
- L: 203,
4187
+ L: 204,
4178
4188
  S: this,
4179
4189
  C: (f, a) => f(...a)
4180
4190
  });
@@ -4197,7 +4207,7 @@ var ServiceContext = class ServiceContext2 {
4197
4207
  this._handlerFactories.set(Invitation6.Kind.SPACE, (invitation) => {
4198
4208
  invariant13(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
4199
4209
  F: __dxlog_file15,
4200
- L: 227,
4210
+ L: 228,
4201
4211
  S: this,
4202
4212
  A: [
4203
4213
  "this.dataSpaceManager",
@@ -4221,7 +4231,7 @@ var ServiceContext = class ServiceContext2 {
4221
4231
  details: assertion
4222
4232
  }, {
4223
4233
  F: __dxlog_file15,
4224
- L: 243,
4234
+ L: 244,
4225
4235
  S: this,
4226
4236
  C: (f, a) => f(...a)
4227
4237
  });
@@ -4232,7 +4242,7 @@ var ServiceContext = class ServiceContext2 {
4232
4242
  details: assertion
4233
4243
  }, {
4234
4244
  F: __dxlog_file15,
4235
- L: 247,
4245
+ L: 248,
4236
4246
  S: this,
4237
4247
  C: (f, a) => f(...a)
4238
4248
  });
@@ -4243,7 +4253,7 @@ var ServiceContext = class ServiceContext2 {
4243
4253
  details: assertion
4244
4254
  }, {
4245
4255
  F: __dxlog_file15,
4246
- L: 252,
4256
+ L: 253,
4247
4257
  S: this,
4248
4258
  C: (f, a) => f(...a)
4249
4259
  });
@@ -4254,7 +4264,7 @@ var ServiceContext = class ServiceContext2 {
4254
4264
  } catch (err) {
4255
4265
  log13.catch(err, void 0, {
4256
4266
  F: __dxlog_file15,
4257
- L: 258,
4267
+ L: 259,
4258
4268
  S: this,
4259
4269
  C: (f, a) => f(...a)
4260
4270
  });
@@ -5085,7 +5095,9 @@ var ClientServicesHost = class ClientServicesHost2 {
5085
5095
  const identity = await this._serviceContext.createIdentity(params);
5086
5096
  await this._serviceContext.initialized.wait();
5087
5097
  const space = await this._serviceContext.dataSpaceManager.createSpace();
5088
- const obj = new Properties();
5098
+ const obj = new Properties(void 0, {
5099
+ useAutomergeBackend: false
5100
+ });
5089
5101
  obj[defaultKey] = identity.identityKey.toHex();
5090
5102
  await this._serviceRegistry.services.DataService.write({
5091
5103
  spaceKey: space.key,
@@ -5120,6 +5132,7 @@ ClientServicesHost = _ts_decorate8([
5120
5132
  ], ClientServicesHost);
5121
5133
 
5122
5134
  export {
5135
+ Buffer,
5123
5136
  subscribeToFeeds,
5124
5137
  subscribeToFeedBlocks,
5125
5138
  subscribeToNetworkStatus,
@@ -5152,4 +5165,4 @@ export {
5152
5165
  createDefaultModelFactory,
5153
5166
  ClientServicesHost
5154
5167
  };
5155
- //# sourceMappingURL=chunk-E4BT55VD.mjs.map
5168
+ //# sourceMappingURL=chunk-D5HVD42G.mjs.map