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

package/dist/lib/node/{chunk-CFTXUTZN.cjs → chunk-5FOIMHNE.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_CFTXUTZN_exports = {};
-__export(chunk_CFTXUTZN_exports, {
+var chunk_5FOIMHNE_exports = {};
+__export(chunk_5FOIMHNE_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -60,7 +60,7 @@ __export(chunk_CFTXUTZN_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_CFTXUTZN_exports);
+module.exports = __toCommonJS(chunk_5FOIMHNE_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -2649,7 +2649,7 @@ var getPlatform = () => {
     };
   }
 };
-var DXOS_VERSION = "0.3.9-main.eb5df3b";
+var DXOS_VERSION = "0.3.9-main.ee839a8";
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
 var DEFAULT_TIMEOUT = 1e3;
 var createDiagnostics = async (clientServices, serviceContext, config) => {
@@ -3061,7 +3061,6 @@ var DataSpace = class DataSpace2 {
     this._ctx = new import_context6.Context();
     this._notarizationPlugin = new NotarizationPlugin();
     this._cache = void 0;
-    this._automergeHost = void 0;
     this._automergeSpaceState = new AutomergeSpaceState();
     this._state = import_services7.SpaceState.CLOSED;
     this.error = void 0;
@@ -3076,6 +3075,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 import_util4.ComplexSet(import_keys7.PublicKey.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
       update: this._inner.stateUpdate,
@@ -3087,7 +3087,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 138,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3134,7 +3134,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 190,
+      L: 189,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3152,7 +3152,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 204,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3184,7 +3184,7 @@ var DataSpace = class DataSpace2 {
         if (err instanceof import_protocols6.CancelledError) {
           (0, import_log9.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 237,
+            L: 236,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3192,7 +3192,7 @@ var DataSpace = class DataSpace2 {
         }
         import_log9.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 241,
+          L: 240,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3201,7 +3201,7 @@ var DataSpace = class DataSpace2 {
           state: import_services7.SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 243,
+          L: 242,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3221,7 +3221,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 259,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3232,7 +3232,7 @@ var DataSpace = class DataSpace2 {
     await (0, import_context6.cancelWithContext)(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
     (0, import_log9.log)("waiting for data pipeline to reach target timeframe", void 0, {
       F: __dxlog_file12,
-      L: 273,
+      L: 272,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3243,7 +3243,7 @@ var DataSpace = class DataSpace2 {
     this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     (0, import_log9.log)("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 282,
+      L: 281,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3253,7 +3253,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 286,
+      L: 285,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3269,7 +3269,7 @@ var DataSpace = class DataSpace2 {
     await this._createWritableFeeds();
     (0, import_log9.log)("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 302,
+      L: 301,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3351,12 +3351,12 @@ var DataSpace = class DataSpace2 {
         }
         break;
       case import_services7.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 import_timeframe2.Timeframe(),
-          automergeRoot: document?.url
+          automergeRoot: document.url
         };
       }
     }
@@ -3409,7 +3409,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 451,
+      L: 450,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3753,11 +3753,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: () => {
         import_log11.log.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 233,
+          L: 234,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3781,7 +3782,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 251,
+            L: 252,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3793,7 +3794,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             open: this._isOpen
           }, {
             F: __dxlog_file13,
-            L: 258,
+            L: 259,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3806,7 +3807,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             space: space.key
           }, {
             F: __dxlog_file13,
-            L: 264,
+            L: 265,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4153,6 +4154,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();
@@ -4163,7 +4165,7 @@ var ServiceContext = class ServiceContext2 {
     await this.metadataStore.close();
     (0, import_log13.log)("closed", void 0, {
       F: __dxlog_file15,
-      L: 161,
+      L: 162,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4177,7 +4179,7 @@ var ServiceContext = class ServiceContext2 {
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant13.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
-      L: 172,
+      L: 173,
       S: this,
       A: [
         "factory",
@@ -4209,7 +4211,7 @@ var ServiceContext = class ServiceContext2 {
   async _initialize(ctx) {
     (0, import_log13.log)("initializing spaces...", void 0, {
       F: __dxlog_file15,
-      L: 203,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4232,7 +4234,7 @@ var ServiceContext = class ServiceContext2 {
     this._handlerFactories.set(import_services10.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant13.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
-        L: 227,
+        L: 228,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4256,7 +4258,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 243,
+            L: 244,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4267,7 +4269,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 247,
+            L: 248,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4278,7 +4280,7 @@ var ServiceContext = class ServiceContext2 {
             details: assertion
           }, {
             F: __dxlog_file15,
-            L: 252,
+            L: 253,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4289,7 +4291,7 @@ var ServiceContext = class ServiceContext2 {
         } catch (err) {
           import_log13.log.catch(err, void 0, {
             F: __dxlog_file15,
-            L: 258,
+            L: 259,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5069,4 +5071,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-CFTXUTZN.cjs.map
+//# sourceMappingURL=chunk-5FOIMHNE.cjs.map