@dxos/client-services 0.5.1-next.2ad6c47 → 0.5.1-next.7f021b8

package/dist/lib/node/{chunk-EAWN3LCD.cjs → chunk-Q6Z4BMTZ.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_EAWN3LCD_exports = {};
-__export(chunk_EAWN3LCD_exports, {
+var chunk_Q6Z4BMTZ_exports = {};
+__export(chunk_Q6Z4BMTZ_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   ClientServicesProviderResource: () => ClientServicesProviderResource,
@@ -66,7 +66,7 @@ __export(chunk_EAWN3LCD_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_EAWN3LCD_exports);
+module.exports = __toCommonJS(chunk_Q6Z4BMTZ_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -211,9 +211,9 @@ var import_async15 = require("@dxos/async");
 var import_context10 = require("@dxos/context");
 var import_credentials15 = require("@dxos/credentials");
 var import_debug6 = require("@dxos/debug");
+var import_echo_db = require("@dxos/echo-db");
 var import_echo_pipeline4 = require("@dxos/echo-pipeline");
 var import_feed_store4 = require("@dxos/feed-store");
-var import_indexing = require("@dxos/indexing");
 var import_invariant13 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
 var import_keys11 = require("@dxos/keys");
@@ -223,12 +223,10 @@ var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_tracing5 = require("@dxos/tracing");
 var import_util7 = require("@dxos/util");
-var import_automerge = require("@dxos/automerge/automerge");
-var import_protocols12 = require("@dxos/protocols");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_credentials16 = require("@dxos/credentials");
 var import_invariant14 = require("@dxos/invariant");
-var import_protocols13 = require("@dxos/protocols");
+var import_protocols12 = require("@dxos/protocols");
 var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing6 = require("@dxos/tracing");
 var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
@@ -241,13 +239,12 @@ var import_client_protocol5 = require("@dxos/client-protocol");
 var import_context11 = require("@dxos/context");
 var import_echo_pipeline5 = require("@dxos/echo-pipeline");
 var import_echo_schema2 = require("@dxos/echo-schema");
-var import_indexing2 = require("@dxos/indexing");
 var import_invariant15 = require("@dxos/invariant");
 var import_keys12 = require("@dxos/keys");
 var import_log13 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager2 = require("@dxos/network-manager");
-var import_protocols14 = require("@dxos/protocols");
+var import_protocols13 = require("@dxos/protocols");
 var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing8 = require("@dxos/tracing");
 var import_util9 = require("@dxos/util");
@@ -266,7 +263,7 @@ var import_log15 = require("@dxos/log");
 var import_services17 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util10 = require("@dxos/util");
 var import_codec_protobuf14 = require("@dxos/codec-protobuf");
-var import_protocols15 = require("@dxos/protocols");
+var import_protocols14 = require("@dxos/protocols");
 var import_config2 = require("@dxos/protocols/proto/dxos/config");
 var import_random_access_storage = require("@dxos/random-access-storage");
 var import_client_protocol6 = require("@dxos/client-protocol");
@@ -3382,7 +3379,7 @@ var DataSpace = class {
     this._metadataStore = params.metadataStore;
     this._signingContext = params.signingContext;
     this._callbacks = params.callbacks ?? {};
-    this._automergeHost = params.automergeHost;
+    this._echoHost = params.echoHost;
     this.authVerifier = new TrustedKeySetAuthVerifier({
       trustedKeysProvider: () => new import_util4.ComplexSet(import_keys8.PublicKey.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
       update: this._inner.stateUpdate,
@@ -3394,7 +3391,7 @@ var DataSpace = class {
       state: import_services8.SpaceState[this._state]
     }, {
       F: __dxlog_file11,
-      L: 140,
+      L: 135,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3444,7 +3441,7 @@ var DataSpace = class {
       state: import_services8.SpaceState[this._state]
     }, {
       F: __dxlog_file11,
-      L: 198,
+      L: 193,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3462,7 +3459,7 @@ var DataSpace = class {
       state: import_services8.SpaceState[this._state]
     }, {
       F: __dxlog_file11,
-      L: 212,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3494,7 +3491,7 @@ var DataSpace = class {
         if (err instanceof import_protocols7.CancelledError || err instanceof import_context7.ContextDisposedError) {
           (0, import_log8.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file11,
-            L: 245,
+            L: 240,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3502,7 +3499,7 @@ var DataSpace = class {
         }
         import_log8.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file11,
-          L: 249,
+          L: 244,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3511,7 +3508,7 @@ var DataSpace = class {
           state: import_services8.SpaceState[this._state]
         }, {
           F: __dxlog_file11,
-          L: 251,
+          L: 246,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3531,7 +3528,7 @@ var DataSpace = class {
       state: import_services8.SpaceState[this._state]
     }, {
       F: __dxlog_file11,
-      L: 267,
+      L: 262,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3541,7 +3538,7 @@ var DataSpace = class {
     await (0, import_context7.cancelWithContext)(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
     (0, import_log8.log)("data pipeline ready", void 0, {
       F: __dxlog_file11,
-      L: 279,
+      L: 274,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3551,7 +3548,7 @@ var DataSpace = class {
       state: import_services8.SpaceState[this._state]
     }, {
       F: __dxlog_file11,
-      L: 283,
+      L: 278,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3567,7 +3564,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     (0, import_log8.log)("writable feeds created", void 0, {
       F: __dxlog_file11,
-      L: 299,
+      L: 294,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3630,12 +3627,12 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file11,
-      L: 365,
+      L: 360,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._automergeHost._requestedDocs.add(rootUrl);
-    const handle = this._automergeHost.repo.find(rootUrl);
+    this._echoHost.replicateDocument(rootUrl);
+    const handle = this._echoHost.automergeRepo.find(rootUrl);
     queueMicrotask(async () => {
       try {
         await (0, import_debug3.warnAfterTimeout)(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
@@ -3662,7 +3659,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file11,
-          L: 388,
+          L: 383,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3700,7 +3697,7 @@ var DataSpace = class {
         break;
       case import_services8.CreateEpochRequest.Migration.INIT_AUTOMERGE:
         {
-          const document = this._automergeHost.repo.create();
+          const document = this._echoHost.automergeRepo.create();
           epoch = {
             previousId: this._automergeSpaceState.lastEpoch?.id,
             number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
@@ -3712,12 +3709,12 @@ var DataSpace = class {
       case import_services8.CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY:
         {
           const currentRootUrl = this._automergeSpaceState.rootUrl;
-          const rootHandle = this._automergeHost.repo.find(currentRootUrl);
+          const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl);
           await (0, import_context7.cancelWithContext)(this._ctx, (0, import_async10.asyncTimeout)(rootHandle.whenReady(), 1e4));
-          const newRoot = this._automergeHost.repo.create(rootHandle.docSync());
+          const newRoot = this._echoHost.automergeRepo.create(rootHandle.docSync());
           (0, import_invariant9.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
             F: __dxlog_file11,
-            L: 438,
+            L: 433,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
@@ -3736,19 +3733,19 @@ var DataSpace = class {
         {
           import_log8.log.info("Fragmenting", void 0, {
             F: __dxlog_file11,
-            L: 450,
+            L: 445,
             S: this,
             C: (f, a) => f(...a)
           });
           const currentRootUrl = this._automergeSpaceState.rootUrl;
-          const rootHandle = this._automergeHost.repo.find(currentRootUrl);
+          const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl);
           await (0, import_context7.cancelWithContext)(this._ctx, (0, import_async10.asyncTimeout)(rootHandle.whenReady(), 1e4));
           const objects = Object.entries(rootHandle.docSync().objects);
           const properties = objects.find(([_, value]) => value.system.type?.itemId === import_echo_schema.TYPE_PROPERTIES);
           const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
           (0, import_invariant9.invariant)(properties, "Properties not found", {
             F: __dxlog_file11,
-            L: 460,
+            L: 455,
             S: this,
             A: [
               "properties",
@@ -3761,17 +3758,17 @@ var DataSpace = class {
               properties
             ])
           };
-          const newRoot = this._automergeHost.repo.create(newSpaceDoc);
+          const newRoot = this._echoHost.automergeRepo.create(newSpaceDoc);
           (0, import_invariant9.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
             F: __dxlog_file11,
-            L: 465,
+            L: 460,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
               ""
             ]
           });
-          const docLoader = new import_echo_pipeline3.AutomergeDocumentLoaderImpl(this.key, this._automergeHost.repo);
+          const docLoader = new import_echo_pipeline3.AutomergeDocumentLoaderImpl(this.key, this._echoHost.automergeRepo);
           await docLoader.loadSpaceRootDocHandle(this._ctx, {
             rootUrl: newRoot.url
           });
@@ -3833,7 +3830,7 @@ var DataSpace = class {
       state: import_services8.SpaceState[this._state]
     }, {
       F: __dxlog_file11,
-      L: 531,
+      L: 526,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3963,13 +3960,13 @@ var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var DataSpaceManager = class {
-  constructor(_spaceManager, _metadataStore, _keyring, _signingContext, _feedStore, _automergeHost, _invitationsManager, params) {
+  constructor(_spaceManager, _metadataStore, _keyring, _signingContext, _feedStore, _echoHost, _invitationsManager, params) {
     this._spaceManager = _spaceManager;
     this._metadataStore = _metadataStore;
     this._keyring = _keyring;
     this._signingContext = _signingContext;
     this._feedStore = _feedStore;
-    this._automergeHost = _automergeHost;
+    this._echoHost = _echoHost;
     this._invitationsManager = _invitationsManager;
     this._ctx = new import_context9.Context();
     this.updated = new import_async13.Event();
@@ -3987,7 +3984,7 @@ var DataSpaceManager = class {
   async open() {
     (0, import_log10.log)("open", void 0, {
       F: __dxlog_file12,
-      L: 101,
+      L: 102,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3995,7 +3992,7 @@ var DataSpaceManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 102,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4003,7 +4000,7 @@ var DataSpaceManager = class {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file12,
-      L: 103,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4013,7 +4010,7 @@ var DataSpaceManager = class {
           spaceMetadata
         }, {
           F: __dxlog_file12,
-          L: 107,
+          L: 108,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4024,7 +4021,7 @@ var DataSpaceManager = class {
           err
         }, {
           F: __dxlog_file12,
-          L: 110,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4041,7 +4038,7 @@ var DataSpaceManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 123,
+      L: 124,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4049,7 +4046,7 @@ var DataSpaceManager = class {
   async close() {
     (0, import_log10.log)("close", void 0, {
       F: __dxlog_file12,
-      L: 128,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4065,7 +4062,7 @@ var DataSpaceManager = class {
   async createSpace() {
     (0, import_invariant11.invariant)(this._isOpen, "Not open.", {
       F: __dxlog_file12,
-      L: 141,
+      L: 142,
       S: this,
       A: [
         "this._isOpen",
@@ -4086,23 +4083,18 @@ var DataSpaceManager = class {
       spaceKey
     }, {
       F: __dxlog_file12,
-      L: 153,
+      L: 154,
       S: this,
       C: (f, a) => f(...a)
     });
-    const automergeRoot = this._automergeHost.repo.create();
-    automergeRoot.change((doc) => {
-      doc.access = {
-        spaceKey: spaceKey.toHex()
-      };
-    });
+    const automergeRootUrl = await this._echoHost.createSpaceRoot(spaceKey);
     const space = await this._constructSpace(metadata);
-    const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRoot.url);
+    const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, automergeRootUrl);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
     (0, import_invariant11.invariant)((0, import_credentials12.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file12,
-      L: 166,
+      L: 163,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -4120,13 +4112,13 @@ var DataSpaceManager = class {
       opts
     }, {
       F: __dxlog_file12,
-      L: 178,
+      L: 175,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant11.invariant)(this._isOpen, "Not open.", {
       F: __dxlog_file12,
-      L: 179,
+      L: 176,
       S: this,
       A: [
         "this._isOpen",
@@ -4135,7 +4127,7 @@ var DataSpaceManager = class {
     });
     (0, import_invariant11.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file12,
-      L: 180,
+      L: 177,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -4170,7 +4162,7 @@ var DataSpaceManager = class {
       metadata
     }, {
       F: __dxlog_file12,
-      L: 213,
+      L: 210,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4202,13 +4194,13 @@ var DataSpaceManager = class {
           remotePeerId: session.remotePeerId
         }));
         session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
-        this._automergeHost.authorizeDevice(space.key, session.remotePeerId);
-        session.addExtension("dxos.mesh.teleport.automerge", this._automergeHost.createExtension());
+        this._echoHost.authorizeDevice(space.key, session.remotePeerId);
+        session.addExtension("dxos.mesh.teleport.automerge", this._echoHost.createReplicationExtension());
       },
       onAuthFailure: () => {
         import_log10.log.warn("auth failure", void 0, {
           F: __dxlog_file12,
-          L: 250,
+          L: 247,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4228,6 +4220,7 @@ var DataSpaceManager = class {
       presence,
       keyring: this._keyring,
       feedStore: this._feedStore,
+      echoHost: this._echoHost,
       signingContext: this._signingContext,
       callbacks: {
         beforeReady: async () => {
@@ -4235,7 +4228,7 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file12,
-            L: 271,
+            L: 269,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4246,7 +4239,7 @@ var DataSpaceManager = class {
             open: this._isOpen
           }, {
             F: __dxlog_file12,
-            L: 274,
+            L: 272,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4262,14 +4255,13 @@ var DataSpaceManager = class {
             space: space.key
           }, {
             F: __dxlog_file12,
-            L: 281,
+            L: 279,
             S: this,
             C: (f, a) => f(...a)
           });
         }
       },
-      cache: metadata.cache,
-      automergeHost: this._automergeHost
+      cache: metadata.cache
     });
     if (metadata.state !== import_services9.SpaceState.INACTIVE) {
       await dataSpace.open();
@@ -4539,31 +4531,6 @@ var SpacesServiceImpl = class {
   }
 };
 var getChannelId = (channel) => `user-channel/${channel}`;
-var createSelectedDocumentsIterator = (automergeHost) => (
-  /**
-  * Get object data blobs from Automerge Repo by ids.
-  * @param ids
-  */
-  // TODO(mykola): Unload automerge handles after usage.
-  async function* loadDocuments(ids) {
-    for (const id of ids) {
-      const { documentId, objectId } = import_protocols12.idCodec.decode(id);
-      const handle = automergeHost.repo.handles[documentId] ?? automergeHost.repo.find(documentId);
-      if (!handle.isReady()) {
-        await handle.whenReady();
-      }
-      const doc = handle.docSync();
-      const hash = (0, import_automerge.getHeads)(doc).join("");
-      yield doc.objects?.[objectId] ? [
-        {
-          id,
-          object: doc.objects[objectId],
-          currentHash: hash
-        }
-      ] : [];
-    }
-  }
-);
 function _ts_decorate6(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -4608,24 +4575,9 @@ var ServiceContext = class extends import_context10.Resource {
       snapshotStore: this.snapshotStore
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams);
-    this.indexMetadata = new import_indexing.IndexMetadataStore({
-      db: level.sublevel("index-metadata")
-    });
-    this.automergeHost = new import_echo_pipeline4.AutomergeHost({
-      directory: storage.createDirectory("automerge"),
-      db: level.sublevel("automerge"),
-      storageCallbacks: (0, import_indexing.createStorageCallbacks)({
-        host: () => this.automergeHost,
-        metadata: this.indexMetadata
-      })
-    });
-    this.indexer = new import_indexing.Indexer({
-      db: this.level,
-      indexStore: new import_indexing.IndexStore({
-        db: level.sublevel("index-storage")
-      }),
-      metadataStore: this.indexMetadata,
-      loadDocuments: createSelectedDocumentsIterator(this.automergeHost)
+    this.echoHost = new import_echo_db.EchoHost({
+      kv: this.level,
+      storage: this.storage
     });
     this.invitations = new InvitationsHandler(this.networkManager);
     this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
@@ -4635,7 +4587,7 @@ var ServiceContext = class extends import_context10.Resource {
     await this._checkStorageVersion();
     (0, import_log12.log)("opening...", void 0, {
       F: __dxlog_file14,
-      L: 164,
+      L: 151,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4643,13 +4595,13 @@ var ServiceContext = class extends import_context10.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file14,
-      L: 165,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
     await this.signalManager.open();
     await this.networkManager.open();
-    await this.automergeHost.open();
+    await this.echoHost.open(ctx);
     await this.metadataStore.load();
     await this.spaceManager.open();
     await this.identityManager.open(ctx);
@@ -4661,7 +4613,7 @@ var ServiceContext = class extends import_context10.Resource {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file14,
-      L: 178,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4669,39 +4621,38 @@ var ServiceContext = class extends import_context10.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file14,
-      L: 180,
+      L: 167,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log12.log)("opened", void 0, {
       F: __dxlog_file14,
-      L: 181,
+      L: 168,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async _close() {
+  async _close(ctx) {
     (0, import_log12.log)("closing...", void 0, {
       F: __dxlog_file14,
-      L: 185,
+      L: 172,
       S: this,
       C: (f, a) => f(...a)
     });
     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();
     await this.feedStore.close();
+    await this.metadataStore.close();
+    await this.echoHost.close(ctx);
     await this.networkManager.close();
     await this.signalManager.close();
-    await this.metadataStore.close();
-    await this.indexer.destroy();
     (0, import_log12.log)("closed", void 0, {
       F: __dxlog_file14,
-      L: 198,
+      L: 184,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4715,7 +4666,7 @@ var ServiceContext = class extends import_context10.Resource {
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant13.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file14,
-      L: 209,
+      L: 195,
       S: this,
       A: [
         "factory",
@@ -4747,7 +4698,7 @@ var ServiceContext = class extends import_context10.Resource {
   async _initialize(ctx) {
     (0, import_log12.log)("initializing spaces...", void 0, {
       F: __dxlog_file14,
-      L: 240,
+      L: 226,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4765,12 +4716,12 @@ var ServiceContext = class extends import_context10.Resource {
         });
       }
     };
-    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, signingContext, this.feedStore, this.automergeHost, this.invitationsManager, this._runtimeParams);
+    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, signingContext, this.feedStore, this.echoHost, this.invitationsManager, this._runtimeParams);
     await this.dataSpaceManager.open();
     this._handlerFactories.set(import_services11.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant13.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file14,
-        L: 265,
+        L: 251,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -4794,7 +4745,7 @@ var ServiceContext = class extends import_context10.Resource {
             details: assertion
           }, {
             F: __dxlog_file14,
-            L: 281,
+            L: 267,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4805,7 +4756,7 @@ var ServiceContext = class extends import_context10.Resource {
             details: assertion
           }, {
             F: __dxlog_file14,
-            L: 285,
+            L: 271,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4816,7 +4767,7 @@ var ServiceContext = class extends import_context10.Resource {
             details: assertion
           }, {
             F: __dxlog_file14,
-            L: 290,
+            L: 276,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4827,7 +4778,7 @@ var ServiceContext = class extends import_context10.Resource {
         } catch (err) {
           import_log12.log.catch(err, void 0, {
             F: __dxlog_file14,
-            L: 296,
+            L: 282,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4869,7 +4820,7 @@ var ServiceRegistry = class {
     delete this._handlers[name];
   }
 };
-var DXOS_VERSION = "0.5.1-next.2ad6c47";
+var DXOS_VERSION = "0.5.1-next.7f021b8";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -4906,7 +4857,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
     client: {
       version: DXOS_VERSION,
       storage: {
-        version: import_protocols13.STORAGE_VERSION
+        version: import_protocols12.STORAGE_VERSION
       }
     },
     trace: import_tracing6.TRACE_PROCESSOR.getDiagnostics()
@@ -5305,16 +5256,16 @@ var StorageDriver = import_config2.Runtime.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
   const { persistent = false, keyStore, dataStore } = config ?? {};
   if (persistent && dataStore === StorageDriver.RAM) {
-    throw new import_protocols15.InvalidConfigError("RAM storage cannot be used in persistent mode.");
+    throw new import_protocols14.InvalidConfigError("RAM storage cannot be used in persistent mode.");
   }
   if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
-    throw new import_protocols15.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
+    throw new import_protocols14.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
   }
   if (persistent && keyStore === StorageDriver.RAM) {
-    throw new import_protocols15.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
+    throw new import_protocols14.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
   }
   if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
-    throw new import_protocols15.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+    throw new import_protocols14.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
   }
   return {
     storage: (0, import_random_access_storage.createStorage)({
@@ -5502,7 +5453,7 @@ var ClientServicesHost = class {
   initialize({ config, ...options }) {
     (0, import_invariant15.invariant)(!this._open, "service host is open", {
       F: __dxlog_file18,
-      L: 198,
+      L: 190,
       S: this,
       A: [
         "!this._open",
@@ -5511,14 +5462,14 @@ var ClientServicesHost = class {
     });
     (0, import_log13.log)("initializing...", void 0, {
       F: __dxlog_file18,
-      L: 199,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       (0, import_invariant15.invariant)(!this._config, "config already set", {
         F: __dxlog_file18,
-        L: 202,
+        L: 194,
         S: this,
         A: [
           "!this._config",
@@ -5533,7 +5484,7 @@ var ClientServicesHost = class {
     if (!options.signalManager) {
       import_log13.log.warn("running signaling without telemetry metadata.", void 0, {
         F: __dxlog_file18,
-        L: 210,
+        L: 202,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5544,7 +5495,7 @@ var ClientServicesHost = class {
     this._signalManager = signalManager;
     (0, import_invariant15.invariant)(!this._networkManager, "network manager already set", {
       F: __dxlog_file18,
-      L: 221,
+      L: 213,
       S: this,
       A: [
         "!this._networkManager",
@@ -5558,7 +5509,7 @@ var ClientServicesHost = class {
     });
     (0, import_log13.log)("initialized", void 0, {
       F: __dxlog_file18,
-      L: 228,
+      L: 220,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5568,17 +5519,17 @@ var ClientServicesHost = class {
       return;
     }
     const traceId = import_keys12.PublicKey.random().toHex();
-    import_log13.log.trace("dxos.client-services.host.open", import_protocols14.trace.begin({
+    import_log13.log.trace("dxos.client-services.host.open", import_protocols13.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 239,
+      L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant15.invariant)(this._config, "config not set", {
       F: __dxlog_file18,
-      L: 241,
+      L: 233,
       S: this,
       A: [
         "this._config",
@@ -5587,7 +5538,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant15.invariant)(this._storage, "storage not set", {
       F: __dxlog_file18,
-      L: 242,
+      L: 234,
       S: this,
       A: [
         "this._storage",
@@ -5596,7 +5547,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant15.invariant)(this._signalManager, "signal manager not set", {
       F: __dxlog_file18,
-      L: 243,
+      L: 235,
       S: this,
       A: [
         "this._signalManager",
@@ -5605,7 +5556,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant15.invariant)(this._networkManager, "network manager not set", {
       F: __dxlog_file18,
-      L: 244,
+      L: 236,
       S: this,
       A: [
         "this._networkManager",
@@ -5617,22 +5568,17 @@ var ClientServicesHost = class {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file18,
-      L: 247,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
+    await this._resourceLock?.acquire();
     if (!this._level) {
       this._level = await createLevel(this._config.get("runtime.client.storage", {}));
     }
     await this._level.open();
-    await this._resourceLock?.acquire();
     await this._loggingService.open();
     this._serviceContext = new ServiceContext(this._storage, this._level, this._networkManager, this._signalManager, this._runtimeParams);
-    this._queryService = new import_indexing2.QueryServiceImpl({
-      indexer: this._serviceContext.indexer,
-      automergeHost: this._serviceContext.automergeHost
-    });
-    await this._queryService.open(ctx);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
       IdentityService: new IdentityServiceImpl((params) => this._createIdentity(params), this._serviceContext.identityManager, this._serviceContext.keyring, (profile) => this._serviceContext.broadcastProfileUpdate(profile)),
@@ -5642,8 +5588,8 @@ var ClientServicesHost = class {
         await this._serviceContext.initialized.wait();
         return this._serviceContext.dataSpaceManager;
       }),
-      DataService: new import_echo_pipeline5.DataServiceImpl(this._serviceContext.automergeHost),
-      QueryService: this._queryService,
+      DataService: this._serviceContext.echoHost.dataService,
+      QueryService: this._serviceContext.echoHost.queryService,
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
       LoggingService: this._loggingService,
       TracingService: this._tracingService,
@@ -5674,15 +5620,15 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 330,
+      L: 315,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log13.log.trace("dxos.client-services.host.open", import_protocols14.trace.end({
+    import_log13.log.trace("dxos.client-services.host.open", import_protocols13.trace.end({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 331,
+      L: 316,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5696,7 +5642,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 342,
+      L: 327,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5706,7 +5652,6 @@ var ClientServicesHost = class {
       SystemService: this._systemService
     });
     await this._loggingService.close();
-    await this._queryService.close();
     await this._serviceContext.close();
     await this._level?.close();
     this._open = false;
@@ -5715,24 +5660,24 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file18,
-      L: 352,
+      L: 336,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
     const traceId = import_keys12.PublicKey.random().toHex();
-    import_log13.log.trace("dxos.sdk.client-services-host.reset", import_protocols14.trace.begin({
+    import_log13.log.trace("dxos.sdk.client-services-host.reset", import_protocols13.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 357,
+      L: 341,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log13.log)("resetting...", void 0, {
       F: __dxlog_file18,
-      L: 359,
+      L: 343,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5740,15 +5685,15 @@ var ClientServicesHost = class {
     await this._storage.reset();
     (0, import_log13.log)("reset", void 0, {
       F: __dxlog_file18,
-      L: 362,
+      L: 346,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log13.log.trace("dxos.sdk.client-services-host.reset", import_protocols14.trace.end({
+    import_log13.log.trace("dxos.sdk.client-services-host.reset", import_protocols13.trace.end({
       id: traceId
     }), {
       F: __dxlog_file18,
-      L: 363,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5761,14 +5706,14 @@ var ClientServicesHost = class {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     (0, import_invariant15.invariant)(automergeIndex, void 0, {
       F: __dxlog_file18,
-      L: 375,
+      L: 359,
       S: this,
       A: [
         "automergeIndex",
         ""
       ]
     });
-    const document = await this._serviceContext.automergeHost.repo.find(automergeIndex);
+    const document = await this._serviceContext.echoHost.automergeRepo.find(automergeIndex);
     await document.whenReady();
     const properties = {
       system: {
@@ -5788,7 +5733,7 @@ var ClientServicesHost = class {
         propertiesId
       ], properties);
     });
-    await this._serviceContext.automergeHost.repo.flush();
+    await this._serviceContext.echoHost.flush();
     return identity;
   }
 };
@@ -5881,4 +5826,4 @@ var findConfigs = () => {
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-EAWN3LCD.cjs.map
+//# sourceMappingURL=chunk-Q6Z4BMTZ.cjs.map