@dxos/client-services 0.3.9-main.eb5df3b → 0.3.9-main.ee839a8

package/dist/lib/browser/{chunk-DWIAIB2O.mjs → chunk-YV3J332I.mjs}

@@ -2541,7 +2541,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.3.9-main.eb5df3b";
+var DXOS_VERSION = "0.3.9-main.ee839a8";
 
 // 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";
@@ -2985,7 +2985,6 @@ var DataSpace = class DataSpace2 {
     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;
@@ -3004,6 +3003,7 @@ var DataSpace = class DataSpace2 {
     this._metadataStore = params.metadataStore;
     this._signingContext = params.signingContext;
     this._callbacks = params.callbacks ?? {};
+    this._automergeHost = params.automergeHost;
     this.authVerifier = new TrustedKeySetAuthVerifier({
       trustedKeysProvider: () => new ComplexSet3(PublicKey8.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
       update: this._inner.stateUpdate,
@@ -3015,7 +3015,7 @@ var DataSpace = class DataSpace2 {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 138,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3062,7 +3062,7 @@ var DataSpace = class DataSpace2 {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 190,
+      L: 189,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3080,7 +3080,7 @@ var DataSpace = class DataSpace2 {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 204,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3112,7 +3112,7 @@ var DataSpace = class DataSpace2 {
         if (err instanceof CancelledError) {
           log10("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 237,
+            L: 236,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3120,7 +3120,7 @@ var DataSpace = class DataSpace2 {
         }
         log10.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 241,
+          L: 240,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3129,7 +3129,7 @@ var DataSpace = class DataSpace2 {
           state: SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 243,
+          L: 242,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3149,7 +3149,7 @@ var DataSpace = class DataSpace2 {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 259,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3160,7 +3160,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: 273,
+      L: 272,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3171,7 +3171,7 @@ var DataSpace = class DataSpace2 {
     this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     log10("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 282,
+      L: 281,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3181,7 +3181,7 @@ var DataSpace = class DataSpace2 {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 286,
+      L: 285,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3197,7 +3197,7 @@ var DataSpace = class DataSpace2 {
     await this._createWritableFeeds();
     log10("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 302,
+      L: 301,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3279,12 +3279,12 @@ var DataSpace = class DataSpace2 {
         }
         break;
       case CreateEpochRequest.Migration.INIT_AUTOMERGE: {
-        const document = this._automergeHost?.repo.create();
+        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
+          automergeRoot: document.url
         };
       }
     }
@@ -3337,7 +3337,7 @@ var DataSpace = class DataSpace2 {
       state: SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 451,
+      L: 450,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3701,11 +3701,12 @@ var DataSpaceManager = class DataSpaceManager2 {
           remotePeerId: session.remotePeerId
         }));
         session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
+        session.addExtension("dxos.mesh.teleport.automerge", this._automergeHost.createExtension());
       },
       onAuthFailure: () => {
         log11.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 233,
+          L: 234,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3729,7 +3730,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 251,
+            L: 252,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3741,7 +3742,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 258,
+            L: 259,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3754,7 +3755,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 264,
+            L: 265,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4127,6 +4128,7 @@ var ServiceContext = class ServiceContext2 {
     if (this._deviceSpaceSync && this.identityManager.identity) {
       await this.identityManager.identity.space.spaceState.removeCredentialProcessor(this._deviceSpaceSync);
     }
+    await this.automergeHost.close();
     await this.dataSpaceManager?.close();
     await this.identityManager.close();
     await this.spaceManager.close();
@@ -4137,7 +4139,7 @@ var ServiceContext = class ServiceContext2 {
     await this.metadataStore.close();
     log13("closed", void 0, {
       F: __dxlog_file15,
-      L: 161,
+      L: 162,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4151,7 +4153,7 @@ var ServiceContext = class ServiceContext2 {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant13(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 172,
+      L: 173,
       S: this,
       A: [
         "factory",
@@ -4183,7 +4185,7 @@ var ServiceContext = class ServiceContext2 {
   async _initialize(ctx) {
     log13("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 203,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4206,7 +4208,7 @@ var ServiceContext = class ServiceContext2 {
     this._handlerFactories.set(Invitation6.Kind.SPACE, (invitation) => {
       invariant13(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 227,
+        L: 228,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4230,7 +4232,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 243,
+            L: 244,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4241,7 +4243,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 247,
+            L: 248,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4252,7 +4254,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 252,
+            L: 253,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4263,7 +4265,7 @@ var ServiceContext = class ServiceContext2 {
         } catch (err) {
           log13.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 258,
+            L: 259,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5164,4 +5166,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-DWIAIB2O.mjs.map
+//# sourceMappingURL=chunk-YV3J332I.mjs.map