@dxos/client-services 0.3.9-main.ee9a520 → 0.3.9-main.ef334cd

package/dist/lib/browser/{chunk-QETXI73D.mjs → chunk-5AFGJQGV.mjs}

@@ -2534,7 +2534,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.3.9-main.ee9a520";
+var DXOS_VERSION = "0.3.9-main.ef334cd";
 
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 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";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
 import { log as log10 } from "@dxos/log";
 import { CancelledError, SystemError } from "@dxos/protocols";
-import { SpaceState } from "@dxos/protocols/proto/dxos/client/services";
+import { SpaceState, CreateEpochRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe2 } from "@dxos/timeframe";
 import { trace as trace6 } from "@dxos/tracing";
 import { ComplexSet as ComplexSet3 } from "@dxos/util";
 
+// packages/sdk/client-services/src/packlets/spaces/automerge-space-state.ts
+import { checkCredentialType } from "@dxos/credentials";
+var AutomergeSpaceState = class {
+  constructor() {
+    this.rootUrl = void 0;
+    this.lastEpoch = void 0;
+  }
+  async processCredential(credential) {
+    if (!checkCredentialType(credential, "dxos.halo.credentials.Epoch")) {
+      return;
+    }
+    this.lastEpoch = credential;
+    if (credential.subject.assertion.automergeRoot) {
+      this.rootUrl = credential.subject.assertion.automergeRoot;
+    }
+  }
+};
+
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
 import { DeferredTask, Event as Event4, scheduleTask as scheduleTask3, sleep, TimeoutError as TimeoutError2, Trigger as Trigger4 } from "@dxos/async";
 import { Context as Context6, rejectOnDispose } from "@dxos/context";
@@ -2959,6 +2977,10 @@ var DataSpace = class DataSpace2 {
   constructor(params) {
     this._ctx = new Context7();
     this._notarizationPlugin = new NotarizationPlugin();
+    this._cache = void 0;
+    this._automergeHost = void 0;
+    // TODO(dmaretskyi): Move into Space?
+    this._automergeSpaceState = new AutomergeSpaceState();
     this._state = SpaceState.CLOSED;
     /**
     * Error for _state === SpaceState.ERROR.
@@ -2986,7 +3008,7 @@ var DataSpace = class DataSpace2 {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 118,
+      L: 138,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3016,6 +3038,9 @@ var DataSpace = class DataSpace2 {
   get cache() {
     return this._cache;
   }
+  get automergeSpaceState() {
+    return this._automergeSpaceState;
+  }
   async open() {
     await this._open();
   }
@@ -3023,13 +3048,14 @@ var DataSpace = class DataSpace2 {
     await this._gossip.open();
     await this._notarizationPlugin.open();
     await this._inner.spaceState.addCredentialProcessor(this._notarizationPlugin);
+    await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
     await this._inner.open(new Context7());
     this._state = SpaceState.CONTROL_ONLY;
     log10("new state", {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 165,
+      L: 190,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3047,7 +3073,7 @@ var DataSpace = class DataSpace2 {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 179,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3055,6 +3081,7 @@ var DataSpace = class DataSpace2 {
     this._ctx = new Context7();
     await this.authVerifier.close();
     await this._inner.close();
+    await this._inner.spaceState.removeCredentialProcessor(this._automergeSpaceState);
     await this._inner.spaceState.removeCredentialProcessor(this._notarizationPlugin);
     await this._notarizationPlugin.close();
     await this._presence.destroy();
@@ -3078,7 +3105,7 @@ var DataSpace = class DataSpace2 {
         if (err instanceof CancelledError) {
           log10("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 211,
+            L: 237,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3086,7 +3113,7 @@ var DataSpace = class DataSpace2 {
         }
         log10.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 215,
+          L: 241,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3095,7 +3122,7 @@ var DataSpace = class DataSpace2 {
           state: SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 217,
+          L: 243,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3115,7 +3142,7 @@ var DataSpace = class DataSpace2 {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 233,
+      L: 259,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3126,7 +3153,7 @@ var DataSpace = class DataSpace2 {
     await cancelWithContext2(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
     log10("waiting for data pipeline to reach target timeframe", void 0, {
       F: __dxlog_file12,
-      L: 247,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3137,7 +3164,7 @@ var DataSpace = class DataSpace2 {
     this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     log10("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 256,
+      L: 282,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3147,7 +3174,7 @@ var DataSpace = class DataSpace2 {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 260,
+      L: 286,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3163,7 +3190,7 @@ var DataSpace = class DataSpace2 {
     await this._createWritableFeeds();
     log10("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 276,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3235,8 +3262,28 @@ var DataSpace = class DataSpace2 {
       }
     });
   }
-  async createEpoch() {
-    const epoch = await this.dataPipeline.createEpoch();
+  async createEpoch(options) {
+    let epoch;
+    switch (options?.migration) {
+      case void 0:
+      case CreateEpochRequest.Migration.NONE:
+        {
+          epoch = await this.dataPipeline.createEpoch();
+        }
+        break;
+      case CreateEpochRequest.Migration.INIT_AUTOMERGE: {
+        const document = this._automergeHost?.repo.create();
+        epoch = {
+          previousId: this._automergeSpaceState.lastEpoch?.id,
+          number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
+          timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe2(),
+          automergeRoot: document?.url
+        };
+      }
+    }
+    if (!epoch) {
+      return;
+    }
     const receipt = await this.inner.controlPipeline.writer.write({
       credential: {
         credential: await this._signingContext.credentialSigner.createCredential({
@@ -3283,7 +3330,7 @@ var DataSpace = class DataSpace2 {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 404,
+      L: 451,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3415,13 +3462,14 @@ var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var DataSpaceManager = class DataSpaceManager2 {
-  constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _feedStore) {
+  constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _feedStore, _automergeHost) {
     this._spaceManager = _spaceManager;
     this._metadataStore = _metadataStore;
     this._dataServiceSubscriptions = _dataServiceSubscriptions;
     this._keyring = _keyring;
     this._signingContext = _signingContext;
     this._feedStore = _feedStore;
+    this._automergeHost = _automergeHost;
     this._ctx = new Context8();
     this.updated = new Event6();
     this._spaces = new ComplexMap3(PublicKey9.hash);
@@ -3435,7 +3483,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   async open() {
     log11("open", void 0, {
       F: __dxlog_file13,
-      L: 83,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3443,7 +3491,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 84,
+      L: 93,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3451,7 +3499,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file13,
-      L: 85,
+      L: 94,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3461,7 +3509,7 @@ var DataSpaceManager = class DataSpaceManager2 {
           spaceMetadata
         }, {
           F: __dxlog_file13,
-          L: 89,
+          L: 98,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3472,7 +3520,7 @@ var DataSpaceManager = class DataSpaceManager2 {
           err
         }, {
           F: __dxlog_file13,
-          L: 92,
+          L: 101,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3489,7 +3537,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       id: this._instanceId
     }), {
       F: __dxlog_file13,
-      L: 105,
+      L: 114,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3497,7 +3545,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   async close() {
     log11("close", void 0, {
       F: __dxlog_file13,
-      L: 110,
+      L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3513,7 +3561,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   async createSpace() {
     invariant11(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 123,
+      L: 132,
       S: this,
       A: [
         "this._isOpen",
@@ -3534,7 +3582,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       spaceKey
     }, {
       F: __dxlog_file13,
-      L: 135,
+      L: 144,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3544,7 +3592,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     const memberCredential = credentials[1];
     invariant11(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file13,
-      L: 142,
+      L: 151,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3562,13 +3610,13 @@ var DataSpaceManager = class DataSpaceManager2 {
       opts
     }, {
       F: __dxlog_file13,
-      L: 154,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant11(this._isOpen, "Not open.", {
       F: __dxlog_file13,
-      L: 155,
+      L: 164,
       S: this,
       A: [
         "this._isOpen",
@@ -3577,7 +3625,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     });
     invariant11(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file13,
-      L: 156,
+      L: 165,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -3612,7 +3660,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       metadata
     }, {
       F: __dxlog_file13,
-      L: 189,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3648,7 +3696,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       onAuthFailure: () => {
         log11.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 224,
+          L: 233,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3672,7 +3720,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 242,
+            L: 251,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3684,7 +3732,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 249,
+            L: 258,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3697,14 +3745,15 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 255,
+            L: 264,
             S: this,
             C: (f, a) => f(...a)
           });
           await this._dataServiceSubscriptions.unregisterSpace(space.key);
         }
       },
-      cache: metadata.cache
+      cache: metadata.cache,
+      automergeHost: this._automergeHost
     });
     if (metadata.state !== SpaceState2.INACTIVE) {
       await dataSpace.open();
@@ -3961,7 +4010,7 @@ import { Trigger as Trigger5 } from "@dxos/async";
 import { Context as Context9 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 import { failUndefined as failUndefined3 } from "@dxos/debug";
-import { valueEncoding, MetadataStore, SpaceManager, DataServiceSubscriptions, SnapshotStore } from "@dxos/echo-pipeline";
+import { valueEncoding, MetadataStore, SpaceManager, DataServiceSubscriptions, SnapshotStore, AutomergeHost } from "@dxos/echo-pipeline";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
 import { invariant as invariant13 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
@@ -4016,6 +4065,7 @@ var ServiceContext = class ServiceContext2 {
       snapshotStore: this.snapshotStore
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
+    this.automergeHost = new AutomergeHost(storage.createDirectory("automerge"));
     this.invitations = new InvitationsHandler(this.networkManager);
     this._handlerFactories.set(Invitation6.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined3(), this._acceptIdentity.bind(this)));
   }
@@ -4023,7 +4073,7 @@ var ServiceContext = class ServiceContext2 {
     await this._checkStorageVersion();
     log13("opening...", void 0, {
       F: __dxlog_file15,
-      L: 129,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4031,7 +4081,7 @@ var ServiceContext = class ServiceContext2 {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 130,
+      L: 134,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4047,13 +4097,13 @@ var ServiceContext = class ServiceContext2 {
       id: this._instanceId
     }), {
       F: __dxlog_file15,
-      L: 140,
+      L: 144,
       S: this,
       C: (f, a) => f(...a)
     });
     log13("opened", void 0, {
       F: __dxlog_file15,
-      L: 141,
+      L: 145,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4061,7 +4111,7 @@ var ServiceContext = class ServiceContext2 {
   async close() {
     log13("closing...", void 0, {
       F: __dxlog_file15,
-      L: 145,
+      L: 149,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4078,7 +4128,7 @@ var ServiceContext = class ServiceContext2 {
     await this.metadataStore.close();
     log13("closed", void 0, {
       F: __dxlog_file15,
-      L: 157,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4092,7 +4142,7 @@ var ServiceContext = class ServiceContext2 {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant13(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 168,
+      L: 172,
       S: this,
       A: [
         "factory",
@@ -4124,7 +4174,7 @@ var ServiceContext = class ServiceContext2 {
   async _initialize(ctx) {
     log13("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 199,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4142,12 +4192,12 @@ var ServiceContext = class ServiceContext2 {
         });
       }
     };
-    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore);
+    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore, this.automergeHost);
     await this.dataSpaceManager.open();
     this._handlerFactories.set(Invitation6.Kind.SPACE, (invitation) => {
       invariant13(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 222,
+        L: 227,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4171,7 +4221,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 238,
+            L: 243,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4182,7 +4232,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 242,
+            L: 247,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4193,7 +4243,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 247,
+            L: 252,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4204,7 +4254,7 @@ var ServiceContext = class ServiceContext2 {
         } catch (err) {
           log13.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 253,
+            L: 258,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4924,7 +4974,7 @@ var ClientServicesHost = class ClientServicesHost2 {
         await this._serviceContext.initialized.wait();
         return this._serviceContext.dataSpaceManager;
       }),
-      DataService: new DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
+      DataService: new DataServiceImpl(this._serviceContext.dataServiceSubscriptions, this._serviceContext.automergeHost),
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
       LoggingService: this._loggingService,
       TracingService: this._tracingService,
@@ -4954,7 +5004,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 317,
+      L: 320,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4962,7 +5012,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 318,
+      L: 321,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4976,7 +5026,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 329,
+      L: 332,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4992,7 +5042,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       deviceKey
     }, {
       F: __dxlog_file17,
-      L: 336,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5003,13 +5053,13 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 341,
+      L: 344,
       S: this,
       C: (f, a) => f(...a)
     });
     log16("resetting...", void 0, {
       F: __dxlog_file17,
-      L: 343,
+      L: 346,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5017,7 +5067,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     await this._storage.reset();
     log16("reset", void 0, {
       F: __dxlog_file17,
-      L: 346,
+      L: 349,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5025,7 +5075,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       id: traceId
     }), {
       F: __dxlog_file17,
-      L: 347,
+      L: 350,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5102,4 +5152,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-QETXI73D.mjs.map
+//# sourceMappingURL=chunk-5AFGJQGV.mjs.map