@dxos/client-services 0.7.4 → 0.7.5-labs.5f04cf6

package/dist/lib/node/{chunk-ZS24HRVA.cjs → chunk-LXXOZWCX.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_ZS24HRVA_exports = {};
-__export(chunk_ZS24HRVA_exports, {
+var chunk_LXXOZWCX_exports = {};
+__export(chunk_LXXOZWCX_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -72,24 +72,24 @@ __export(chunk_ZS24HRVA_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_ZS24HRVA_exports);
+module.exports = __toCommonJS(chunk_LXXOZWCX_exports);
 var import_async = require("@dxos/async");
-var import_codec_protobuf = require("@dxos/codec-protobuf");
+var import_stream = require("@dxos/codec-protobuf/stream");
 var import_feed_store = require("@dxos/feed-store");
 var import_keys = require("@dxos/keys");
 var import_log = require("@dxos/log");
 var import_util = require("@dxos/util");
-var import_codec_protobuf2 = require("@dxos/codec-protobuf");
+var import_stream2 = require("@dxos/codec-protobuf/stream");
 var import_context = require("@dxos/context");
 var import_keys2 = require("@dxos/keys");
-var import_codec_protobuf3 = require("@dxos/codec-protobuf");
+var import_stream3 = require("@dxos/codec-protobuf/stream");
 var import_async2 = require("@dxos/async");
-var import_codec_protobuf4 = require("@dxos/codec-protobuf");
+var import_stream4 = require("@dxos/codec-protobuf/stream");
 var import_async3 = require("@dxos/async");
-var import_codec_protobuf5 = require("@dxos/codec-protobuf");
-var import_codec_protobuf6 = require("@dxos/codec-protobuf");
+var import_stream5 = require("@dxos/codec-protobuf/stream");
+var import_stream6 = require("@dxos/codec-protobuf/stream");
 var import_async4 = require("@dxos/async");
-var import_codec_protobuf7 = require("@dxos/codec-protobuf");
+var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_credentials = require("@dxos/credentials");
 var import_invariant = require("@dxos/invariant");
 var import_protocols = require("@dxos/protocols");
@@ -184,7 +184,7 @@ var import_debug2 = require("@dxos/debug");
 var import_credentials12 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe3 = require("@dxos/timeframe");
 var import_async12 = require("@dxos/async");
-var import_codec_protobuf8 = require("@dxos/codec-protobuf");
+var import_stream7 = require("@dxos/codec-protobuf/stream");
 var import_credentials13 = require("@dxos/credentials");
 var import_debug3 = require("@dxos/debug");
 var import_feed_store4 = require("@dxos/feed-store");
@@ -208,7 +208,7 @@ var import_timeframe4 = require("@dxos/timeframe");
 var import_tracing7 = require("@dxos/tracing");
 var import_util8 = require("@dxos/util");
 var import_async14 = require("@dxos/async");
-var import_codec_protobuf9 = require("@dxos/codec-protobuf");
+var import_stream8 = require("@dxos/codec-protobuf/stream");
 var import_context9 = require("@dxos/context");
 var import_credentials16 = require("@dxos/credentials");
 var import_invariant10 = require("@dxos/invariant");
@@ -270,7 +270,7 @@ var import_keys13 = require("@dxos/keys");
 var import_log17 = require("@dxos/log");
 var import_invitations5 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_util11 = require("@dxos/util");
-var import_codec_protobuf10 = require("@dxos/codec-protobuf");
+var import_stream9 = require("@dxos/codec-protobuf/stream");
 var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing9 = require("@dxos/tracing");
 var import_credentials18 = require("@dxos/credentials");
@@ -293,7 +293,7 @@ var import_credentials21 = require("@dxos/protocols/proto/dxos/halo/credentials"
 var import_invariant19 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
 var import_log20 = require("@dxos/log");
-var import_codec_protobuf11 = require("@dxos/codec-protobuf");
+var import_codec_protobuf2 = require("@dxos/codec-protobuf");
 var import_debug4 = require("@dxos/debug");
 var import_rpc = require("@dxos/rpc");
 var import_tracing10 = require("@dxos/tracing");
@@ -305,7 +305,7 @@ var import_log21 = require("@dxos/log");
 var import_protocols14 = require("@dxos/protocols");
 var import_services19 = require("@dxos/protocols/proto/dxos/client/services");
 var import_metadata2 = require("@dxos/protocols/proto/dxos/echo/metadata");
-var import_codec_protobuf12 = require("@dxos/codec-protobuf");
+var import_stream10 = require("@dxos/codec-protobuf/stream");
 var import_protocols15 = require("@dxos/protocols");
 var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async22 = require("@dxos/async");
@@ -360,26 +360,26 @@ var import_services22 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing12 = require("@dxos/tracing");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
 var import_async24 = require("@dxos/async");
-var import_codec_protobuf13 = require("@dxos/codec-protobuf");
+var import_stream11 = require("@dxos/codec-protobuf/stream");
 var import_invariant25 = require("@dxos/invariant");
 var import_services23 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async25 = require("@dxos/async");
-var import_codec_protobuf14 = require("@dxos/codec-protobuf");
+var import_stream12 = require("@dxos/codec-protobuf/stream");
 var import_keys20 = require("@dxos/keys");
 var import_util15 = require("@dxos/util");
 var import_async26 = require("@dxos/async");
-var import_codec_protobuf15 = require("@dxos/codec-protobuf");
+var import_stream13 = require("@dxos/codec-protobuf/stream");
 var import_keys21 = require("@dxos/keys");
 var import_log26 = require("@dxos/log");
 var import_services24 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util16 = require("@dxos/util");
-var import_codec_protobuf16 = require("@dxos/codec-protobuf");
-var import_codec_protobuf17 = require("@dxos/codec-protobuf");
+var import_stream14 = require("@dxos/codec-protobuf/stream");
+var import_stream15 = require("@dxos/codec-protobuf/stream");
 var import_services25 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util17 = require("@dxos/util");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devtools/feeds.ts";
 var subscribeToFeeds = ({ feedStore, spaceManager }, { feedKeys }) => {
-  return new import_codec_protobuf.Stream(({ next }) => {
+  return new import_stream.Stream(({ next }) => {
     const subscriptions = new import_async.EventSubscriptions();
     const feedMap = new import_util.ComplexMap(import_keys.PublicKey.hash);
     const update = () => {
@@ -438,7 +438,7 @@ var findFeedOwner = (spaceManager, feedKey) => {
   };
 };
 var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
-  return new import_codec_protobuf.Stream(({ next }) => {
+  return new import_stream.Stream(({ next }) => {
     if (!feedKey) {
       return;
     }
@@ -482,7 +482,7 @@ var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
   });
 };
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devtools/network.ts";
-var subscribeToNetworkStatus = ({ signalManager }) => new import_codec_protobuf2.Stream(({ next, close }) => {
+var subscribeToNetworkStatus = ({ signalManager }) => new import_stream2.Stream(({ next, close }) => {
   const update = () => {
     try {
       const status = signalManager.getStatus?.();
@@ -496,7 +496,7 @@ var subscribeToNetworkStatus = ({ signalManager }) => new import_codec_protobuf2
   signalManager.statusChanged?.on(() => update());
   update();
 });
-var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf2.Stream(({ next }) => {
+var subscribeToSignal = ({ signalManager }) => new import_stream2.Stream(({ next }) => {
   const ctx = new import_context.Context(void 0, {
     F: __dxlog_file2,
     L: 36
@@ -531,7 +531,7 @@ var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf2.Stream
     return ctx.dispose();
   };
 });
-var subscribeToNetworkTopics = ({ networkManager }) => new import_codec_protobuf2.Stream(({ next, close }) => {
+var subscribeToNetworkTopics = ({ networkManager }) => new import_stream2.Stream(({ next, close }) => {
   const update = () => {
     try {
       const topics = networkManager.topics;
@@ -549,7 +549,7 @@ var subscribeToNetworkTopics = ({ networkManager }) => new import_codec_protobuf
   networkManager.topicsUpdated.on(update);
   update();
 });
-var subscribeToSwarmInfo = ({ networkManager }) => new import_codec_protobuf2.Stream(({ next }) => {
+var subscribeToSwarmInfo = ({ networkManager }) => new import_stream2.Stream(({ next }) => {
   const update = () => {
     const info = networkManager.connectionLog?.swarms;
     if (info) {
@@ -574,7 +574,7 @@ var getNetworkPeers = ({ networkManager }, request) => {
   };
 };
 var subscribeToSpaces = (context, { spaceKeys = [] }) => {
-  return new import_codec_protobuf3.Stream(({ next }) => {
+  return new import_stream3.Stream(({ next }) => {
     let unsubscribe;
     const update = async () => {
       const spaces = [
@@ -606,7 +606,7 @@ var subscribeToSpaces = (context, { spaceKeys = [] }) => {
     };
   });
 };
-var subscribeToKeyringKeys = ({ keyring }) => new import_codec_protobuf5.Stream(({ next, ctx }) => {
+var subscribeToKeyringKeys = ({ keyring }) => new import_stream5.Stream(({ next, ctx }) => {
   const update = async () => {
     next({
       keys: await keyring.list()
@@ -615,7 +615,7 @@ var subscribeToKeyringKeys = ({ keyring }) => new import_codec_protobuf5.Stream(
   keyring.keysUpdate.on(ctx, update);
   (0, import_async3.scheduleTask)(ctx, update);
 });
-var subscribeToMetadata = ({ context }) => new import_codec_protobuf6.Stream(({ next, ctx }) => {
+var subscribeToMetadata = ({ context }) => new import_stream6.Stream(({ next, ctx }) => {
   context.metadataStore.update.on(ctx, (data) => next({
     metadata: data
   }));
@@ -633,7 +633,7 @@ var DevtoolsServiceImpl = class {
     this.params = params;
   }
   events(request) {
-    return new import_codec_protobuf4.Stream(({ next }) => {
+    return new import_stream4.Stream(({ next }) => {
       this.params.events.ready.on(() => {
         next({
           ready: {}
@@ -735,7 +735,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.7.4";
+var DXOS_VERSION = "0.7.5-labs.5f04cf6";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -788,7 +788,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
           "'SystemService is not available.'"
         ]
       });
-      diagnostics.metrics = await (0, import_codec_protobuf7.getFirstStreamValue)(clientServices.LoggingService.queryMetrics({}), {
+      diagnostics.metrics = await (0, import_codec_protobuf.getFirstStreamValue)(clientServices.LoggingService.queryMetrics({}), {
         timeout: DEFAULT_TIMEOUT
       }).catch(() => void 0);
     })(),
@@ -803,14 +803,14 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
           spaceKey: identity.space.key,
           profile: identity.profileDocument
         };
-        const { devices } = await (0, import_codec_protobuf7.getFirstStreamValue)(clientServices.DevicesService.queryDevices(), {
+        const { devices } = await (0, import_codec_protobuf.getFirstStreamValue)(clientServices.DevicesService.queryDevices(), {
           timeout: DEFAULT_TIMEOUT
         }).catch(() => void 0) ?? {};
         diagnostics.devices = devices;
         if (serviceContext.dataSpaceManager) {
           diagnostics.spaces = await Promise.all(Array.from(serviceContext.dataSpaceManager.spaces.values()).map((space) => getSpaceStats(space)) ?? []);
         }
-        const { feeds = [] } = await (0, import_codec_protobuf7.getFirstStreamValue)(clientServices.DevtoolsHost.subscribeToFeeds({}), {
+        const { feeds = [] } = await (0, import_codec_protobuf.getFirstStreamValue)(clientServices.DevtoolsHost.subscribeToFeeds({}), {
           timeout: DEFAULT_TIMEOUT
         }).catch(() => void 0) ?? {};
         diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
@@ -818,7 +818,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
           bytes,
           length
         }));
-        const status = await (0, import_codec_protobuf7.getFirstStreamValue)(clientServices.NetworkService.queryStatus(), {
+        const status = await (0, import_codec_protobuf.getFirstStreamValue)(clientServices.NetworkService.queryStatus(), {
           timeout: DEFAULT_TIMEOUT
         }).catch(() => void 0);
         diagnostics.networkStatus = status;
@@ -1256,21 +1256,20 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       });
       return;
     }
-    const logPayload = message.type === "data" ? {
-      feedKey: message.feedKey,
-      blocks: message.blocks.map((b) => b.index)
-    } : {
-      message
-    };
-    import_log3.log.info("sending message", logPayload, {
-      F: __dxlog_file5,
-      L: 152,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    if (message.type === "data") {
+      import_log3.log.info("sending blocks", {
+        feedKey: message.feedKey,
+        blocks: message.blocks.map((b) => b.index)
+      }, {
+        F: __dxlog_file5,
+        L: 151,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
     (0, import_invariant2.invariant)(message.feedKey, void 0, {
       F: __dxlog_file5,
-      L: 154,
+      L: 157,
       S: this,
       A: [
         "message.feedKey",
@@ -1282,7 +1281,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       type: message.type
     }, {
       F: __dxlog_file5,
-      L: 157,
+      L: 160,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1301,7 +1300,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     if (!this._connectionCtx) {
       import_log3.log.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file5,
-        L: 172,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1312,14 +1311,6 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
         case "metadata": {
           try {
             var _usingCtx = _using_ctx();
-            import_log3.log.info("received metadata", {
-              message
-            }, {
-              F: __dxlog_file5,
-              L: 178,
-              S: this,
-              C: (f, a) => f(...a)
-            });
             const feedKey = import_keys3.PublicKey.fromHex(message.feedKey);
             const feed = this._feeds.get(feedKey);
             if (!feed) {
@@ -1327,7 +1318,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
                 feedKey
               }, {
                 F: __dxlog_file5,
-                L: 183,
+                L: 184,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1335,7 +1326,18 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             }
             const _guard = _usingCtx.u(await this._getPushMutex(feed.key).acquire());
             this._remoteLength.set(feedKey, message.length);
+            const logMeta = {
+              localLength: feed.length,
+              remoteLength: message.length,
+              feedKey
+            };
             if (message.length > feed.length) {
+              import_log3.log.info("requesting missing blocks", logMeta, {
+                F: __dxlog_file5,
+                L: 194,
+                S: this,
+                C: (f, a) => f(...a)
+              });
               await this._sendMessage({
                 type: "request",
                 feedKey: feedKey.toHex(),
@@ -1345,6 +1347,12 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
                 }
               });
             } else if (message.length < feed.length) {
+              import_log3.log.info("pushing blocks to remote", logMeta, {
+                F: __dxlog_file5,
+                L: 202,
+                S: this,
+                C: (f, a) => f(...a)
+              });
               await this._pushBlocks(feed, message.length, feed.length);
             }
             break;
@@ -1360,7 +1368,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file5,
-            L: 205,
+            L: 211,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1371,7 +1379,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
               feedKey
             }, {
               F: __dxlog_file5,
-              L: 210,
+              L: 216,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1385,7 +1393,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             ...message
           }, {
             F: __dxlog_file5,
-            L: 219,
+            L: 225,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1400,7 +1408,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       to
     }, {
       F: __dxlog_file5,
-      L: 226,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1410,7 +1418,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       });
       (0, import_invariant2.invariant)(data instanceof Uint8Array, void 0, {
         F: __dxlog_file5,
-        L: 231,
+        L: 237,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1438,7 +1446,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file5,
-      L: 252,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1460,7 +1468,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       if (!this._remoteLength.has(feed.key)) {
         (0, import_log3.log)("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file5,
-          L: 273,
+          L: 279,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1485,7 +1493,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
         if (err instanceof import_edge_client.EdgeIdentityChangedError || err instanceof import_edge_client.EdgeConnectionClosedError) {
           (0, import_log3.log)("resetting on reconnect", void 0, {
             F: __dxlog_file5,
-            L: 290,
+            L: 296,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1496,7 +1504,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       }
     }, {
       F: __dxlog_file5,
-      L: 284
+      L: 290
     });
     return connectionCtx;
   }
@@ -1625,6 +1633,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
     this._processedCredentials = new import_util5.ComplexSet(import_keys5.PublicKey.hash);
     this._processCredentialsTriggers = new import_util5.ComplexMap(import_keys5.PublicKey.hash);
     this._activeEdgePollingIntervalHandle = void 0;
+    this._activeEdgePollingEnabled = false;
     this._spaceId = params.spaceId;
     this._activeEdgePollingInterval = params.activeEdgePollingInterval ?? DEFAULT_ACTIVE_EDGE_POLLING_INTERVAL;
     if (params.edgeClient && params.edgeFeatures?.feedReplicator) {
@@ -1632,15 +1641,6 @@ var NotarizationPlugin = class extends import_context6.Resource {
     }
   }
   setActiveEdgePollingEnabled(enabled) {
-    (0, import_invariant5.invariant)(this.isOpen, void 0, {
-      F: __dxlog_file7,
-      L: 109,
-      S: this,
-      A: [
-        "this.isOpen",
-        ""
-      ]
-    });
     const client = this._edgeClient;
     (0, import_invariant5.invariant)(client, void 0, {
       F: __dxlog_file7,
@@ -1651,30 +1651,30 @@ var NotarizationPlugin = class extends import_context6.Resource {
         ""
       ]
     });
-    if (enabled && !this._activeEdgePollingIntervalHandle) {
-      this._activeEdgePollingIntervalHandle = setInterval(() => {
-        if (this._writer) {
-          this._notarizePendingEdgeCredentials(client, this._writer);
-        }
-      }, this._activeEdgePollingInterval);
-    } else if (!enabled && this._activeEdgePollingIntervalHandle) {
-      clearInterval(this._activeEdgePollingIntervalHandle);
-      this._activeEdgePollingIntervalHandle = void 0;
+    this._activeEdgePollingEnabled = enabled;
+    if (this.isOpen) {
+      if (enabled && !this._activeEdgePollingIntervalHandle) {
+        this._startPeriodicEdgePolling(client);
+      } else if (!enabled && this._activeEdgePollingIntervalHandle) {
+        this._stopPeriodicEdgePolling();
+      }
     }
   }
   get hasWriter() {
     return !!this._writer;
   }
   async _open() {
-    if (this._edgeClient && this._writer) {
-      this._notarizePendingEdgeCredentials(this._edgeClient, this._writer);
+    if (this._edgeClient) {
+      if (this._activeEdgePollingEnabled) {
+        this._startPeriodicEdgePolling(this._edgeClient);
+      }
+      if (this._writer) {
+        this._notarizePendingEdgeCredentials(this._edgeClient, this._writer);
+      }
     }
   }
   async _close() {
-    if (this._activeEdgePollingIntervalHandle) {
-      clearInterval(this._activeEdgePollingIntervalHandle);
-      this._activeEdgePollingIntervalHandle = void 0;
-    }
+    this._stopPeriodicEdgePolling();
     await this._ctx.dispose();
   }
   /**
@@ -1852,10 +1852,23 @@ var NotarizationPlugin = class extends import_context6.Resource {
       ]
     });
     this._writer = writer;
-    if (this._edgeClient) {
+    if (this._edgeClient && this.isOpen) {
       this._notarizePendingEdgeCredentials(this._edgeClient, writer);
     }
   }
+  _startPeriodicEdgePolling(client) {
+    this._activeEdgePollingIntervalHandle = setInterval(() => {
+      if (this._writer) {
+        this._notarizePendingEdgeCredentials(client, this._writer);
+      }
+    }, this._activeEdgePollingInterval);
+  }
+  _stopPeriodicEdgePolling() {
+    if (this._activeEdgePollingIntervalHandle) {
+      clearInterval(this._activeEdgePollingIntervalHandle);
+      this._activeEdgePollingIntervalHandle = void 0;
+    }
+  }
   /**
   * The method is used only for adding agent feeds to spaces.
   * When an agent is created we can admit them into all the existing spaces. In case the operation fails
@@ -1874,7 +1887,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
         if (!credentials.length) {
           (0, import_log5.log)("edge did not return credentials for notarization", void 0, {
             F: __dxlog_file7,
-            L: 296,
+            L: 311,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1884,7 +1897,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
           count: credentials.length
         }, {
           F: __dxlog_file7,
-          L: 300,
+          L: 315,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1897,7 +1910,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
           count: decodedCredentials.length
         }, {
           F: __dxlog_file7,
-          L: 309,
+          L: 324,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1925,7 +1938,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
     for (const credential of credentials) {
       (0, import_invariant5.invariant)(credential.id, "Credential must have an id", {
         F: __dxlog_file7,
-        L: 335,
+        L: 350,
         S: this,
         A: [
           "credential.id",
@@ -1949,7 +1962,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file7,
-          L: 350,
+          L: 365,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1961,7 +1974,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file7,
-          L: 355,
+          L: 370,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1978,7 +1991,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
         peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
       }, {
         F: __dxlog_file7,
-        L: 367,
+        L: 382,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1994,7 +2007,7 @@ var handleEdgeError = (error) => {
   if (!(error instanceof import_protocols4.EdgeCallFailedError) || error.errorData) {
     import_log5.log.catch(error, void 0, {
       F: __dxlog_file7,
-      L: 381,
+      L: 396,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2003,7 +2016,7 @@ var handleEdgeError = (error) => {
       reason: error.reason
     }, {
       F: __dxlog_file7,
-      L: 383,
+      L: 398,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2863,7 +2876,7 @@ var SpacesServiceImpl = class {
     await (0, import_feed_store4.writeMessages)(space.controlPipeline.writer, credentials);
   }
   querySpaces() {
-    return new import_codec_protobuf8.Stream(({ next, ctx }) => {
+    return new import_stream7.Stream(({ next, ctx }) => {
       const scheduler = new import_async12.UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
@@ -2923,7 +2936,7 @@ var SpacesServiceImpl = class {
     await space.postMessage(getChannelId(channel), message);
   }
   subscribeMessages({ spaceKey, channel }) {
-    return new import_codec_protobuf8.Stream(({ ctx, next }) => {
+    return new import_stream7.Stream(({ ctx, next }) => {
       (0, import_async12.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug3.raise)(new import_protocols6.SpaceNotFoundError(spaceKey));
@@ -2935,7 +2948,7 @@ var SpacesServiceImpl = class {
     });
   }
   queryCredentials({ spaceKey, noTail }) {
-    return new import_codec_protobuf8.Stream(({ ctx, next, close }) => {
+    return new import_stream7.Stream(({ ctx, next, close }) => {
       const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug3.raise)(new import_protocols6.SpaceNotFoundError(spaceKey));
       const processor = {
         processCredential: async (credential) => {
@@ -3893,7 +3906,7 @@ var IdentityServiceImpl = class extends import_context9.Resource {
     await identity.updateDefaultSpace(space.id);
   }
   queryIdentity() {
-    return new import_codec_protobuf9.Stream(({ next }) => {
+    return new import_stream8.Stream(({ next }) => {
       const emitNext = () => next({
         identity: this._getIdentity()
       });
@@ -6154,7 +6167,7 @@ var InvitationsServiceImpl = class {
     return {};
   }
   createInvitation(options) {
-    return new import_codec_protobuf10.Stream(({ next, close }) => {
+    return new import_stream9.Stream(({ next, close }) => {
       void this._invitationsManager.createInvitation(options).then((invitation) => {
         import_tracing9.trace.metrics.increment("dxos.invitation.created");
         invitation.subscribe(next, close, close);
@@ -6163,7 +6176,7 @@ var InvitationsServiceImpl = class {
   }
   acceptInvitation(request) {
     const invitation = this._invitationsManager.acceptInvitation(request);
-    return new import_codec_protobuf10.Stream(({ next, close }) => {
+    return new import_stream9.Stream(({ next, close }) => {
       invitation.subscribe(next, close, close);
     });
   }
@@ -6174,7 +6187,7 @@ var InvitationsServiceImpl = class {
     return this._invitationsManager.cancelInvitation(request);
   }
   queryInvitations() {
-    return new import_codec_protobuf10.Stream(({ next, ctx }) => {
+    return new import_stream9.Stream(({ next, ctx }) => {
       this._invitationsManager.invitationCreated.on(ctx, (invitation) => {
         next({
           action: import_services16.QueryInvitationsResponse.Action.ADDED,
@@ -6955,7 +6968,7 @@ var ClientRpcServer = class {
         const handler = (method2, params3) => this._getServiceHandler(serviceName).callStream(method2, params3);
         this._callMetrics.inc(`${serviceName}.${methodName} request stream`);
         if (this._handleStream) {
-          return import_codec_protobuf11.Stream.map(import_codec_protobuf11.Stream.unwrapPromise(this._handleStream(methodName, params2, handler)), (data) => {
+          return import_codec_protobuf2.Stream.map(import_codec_protobuf2.Stream.unwrapPromise(this._handleStream(methodName, params2, handler)), (data) => {
             this._callMetrics.inc(`${serviceName}.${methodName} response stream`);
             return data;
           });
@@ -7221,7 +7234,7 @@ var EdgeAgentServiceImpl = class {
     this._edgeConnection = _edgeConnection;
   }
   queryEdgeStatus() {
-    return new import_codec_protobuf12.Stream(({ ctx, next }) => {
+    return new import_stream10.Stream(({ ctx, next }) => {
       next({
         status: import_services20.QueryEdgeStatusResponse.EdgeStatus.NOT_CONNECTED
       });
@@ -7242,7 +7255,7 @@ var EdgeAgentServiceImpl = class {
     return (await this._agentManagerProvider()).createAgent();
   }
   queryAgentStatus() {
-    return new import_codec_protobuf12.Stream(({ ctx, next }) => {
+    return new import_stream10.Stream(({ ctx, next }) => {
       next({
         status: import_services20.QueryAgentStatusResponse.AgentStatus.UNKNOWN
       });
@@ -7490,7 +7503,8 @@ var ServiceContext = class extends import_context16.Resource {
     this.recoveryManager = new EdgeIdentityRecoveryManager(this.keyring, this._edgeHttpClient, () => this.identityManager.identity, this._acceptIdentity.bind(this));
     this.echoHost = new import_echo_pipeline4.EchoHost({
       kv: this.level,
-      peerIdProvider: () => this.identityManager.identity?.deviceKey?.toHex()
+      peerIdProvider: () => this.identityManager.identity?.deviceKey?.toHex(),
+      getSpaceKeyByRootDocumentId: (documentId) => this.spaceManager.findSpaceByRootDocumentId(documentId)?.key
     });
     this._meshReplicator = new import_echo_pipeline4.MeshEchoReplicator();
     this.invitations = new InvitationsHandler(this.networkManager, this._edgeHttpClient, _runtimeParams?.invitationConnectionDefaultParams);
@@ -7509,7 +7523,7 @@ var ServiceContext = class extends import_context16.Resource {
     await this._checkStorageVersion();
     (0, import_log22.log)("opening...", void 0, {
       F: __dxlog_file27,
-      L: 198,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7517,7 +7531,7 @@ var ServiceContext = class extends import_context16.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file27,
-      L: 199,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7544,7 +7558,7 @@ var ServiceContext = class extends import_context16.Resource {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file27,
-      L: 227,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7552,13 +7566,13 @@ var ServiceContext = class extends import_context16.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file27,
-      L: 229,
+      L: 230,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log22.log)("opened", void 0, {
       F: __dxlog_file27,
-      L: 230,
+      L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7566,7 +7580,7 @@ var ServiceContext = class extends import_context16.Resource {
   async _close(ctx) {
     (0, import_log22.log)("closing...", void 0, {
       F: __dxlog_file27,
-      L: 234,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7585,7 +7599,7 @@ var ServiceContext = class extends import_context16.Resource {
     await this._edgeConnection?.close();
     (0, import_log22.log)("closed", void 0, {
       F: __dxlog_file27,
-      L: 250,
+      L: 251,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7596,7 +7610,7 @@ var ServiceContext = class extends import_context16.Resource {
     await identity.joinNetwork();
     await this._initialize(new import_context16.Context(void 0, {
       F: __dxlog_file27,
-      L: 257
+      L: 258
     }));
     return identity;
   }
@@ -7607,7 +7621,7 @@ var ServiceContext = class extends import_context16.Resource {
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant21.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file27,
-      L: 266,
+      L: 267,
       S: this,
       A: [
         "factory",
@@ -7633,7 +7647,7 @@ var ServiceContext = class extends import_context16.Resource {
     await this.identityManager.acceptIdentity(identity, identityRecord, params.deviceProfile);
     await this._initialize(new import_context16.Context(void 0, {
       F: __dxlog_file27,
-      L: 285
+      L: 286
     }));
     return identity;
   }
@@ -7647,7 +7661,7 @@ var ServiceContext = class extends import_context16.Resource {
   async _initialize(ctx) {
     (0, import_log22.log)("initializing spaces...", void 0, {
       F: __dxlog_file27,
-      L: 300,
+      L: 301,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7686,7 +7700,7 @@ var ServiceContext = class extends import_context16.Resource {
     this._handlerFactories.set(import_services21.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant21.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file27,
-        L: 338,
+        L: 339,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -7710,7 +7724,7 @@ var ServiceContext = class extends import_context16.Resource {
             details: assertion
           }, {
             F: __dxlog_file27,
-            L: 354,
+            L: 355,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7721,7 +7735,7 @@ var ServiceContext = class extends import_context16.Resource {
             details: assertion
           }, {
             F: __dxlog_file27,
-            L: 358,
+            L: 359,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7732,7 +7746,7 @@ var ServiceContext = class extends import_context16.Resource {
             details: assertion
           }, {
             F: __dxlog_file27,
-            L: 363,
+            L: 364,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7743,7 +7757,7 @@ var ServiceContext = class extends import_context16.Resource {
         } catch (err) {
           import_log22.log.catch(err, void 0, {
             F: __dxlog_file27,
-            L: 369,
+            L: 370,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7759,12 +7773,12 @@ var ServiceContext = class extends import_context16.Resource {
       let edgeIdentity;
       const identity = this.identityManager.identity;
       if (identity) {
-        import_log22.log.info("Setting identity on edge connection", {
+        (0, import_log22.log)("setting identity on edge connection", {
           identity: identity.identityKey.toHex(),
           swarms: this.networkManager.topics
         }, {
           F: __dxlog_file27,
-          L: 383,
+          L: 384,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -7778,7 +7792,7 @@ var ServiceContext = class extends import_context16.Resource {
           });
           (0, import_invariant21.invariant)(identity.deviceCredentialChain, void 0, {
             F: __dxlog_file27,
-            L: 401,
+            L: 403,
             S: this,
             A: [
               "identity.deviceCredentialChain",
@@ -8054,7 +8068,7 @@ var DevicesServiceImpl = class {
     return this._identityManager.updateDeviceProfile(profile);
   }
   queryDevices() {
-    return new import_codec_protobuf13.Stream(({ next }) => {
+    return new import_stream11.Stream(({ next }) => {
       const update = () => {
         const deviceKeys = this._identityManager.identity?.authorizedDeviceKeys;
         if (!deviceKeys) {
@@ -8176,7 +8190,7 @@ var ContactsServiceImpl = class {
   }
   queryContacts() {
     const subscribedSpaceKeySet = new import_util15.ComplexSet(import_keys20.PublicKey.hash);
-    return new import_codec_protobuf14.Stream(({ next, ctx }) => {
+    return new import_stream12.Stream(({ next, ctx }) => {
       const pushUpdateTask = new import_async25.UpdateScheduler(ctx, async () => {
         const contacts = await this.getContacts();
         next(contacts);
@@ -8245,7 +8259,7 @@ var LoggingServiceImpl = class {
         stats: (0, import_util16.numericalValues)(events, "duration")
       };
     };
-    return new import_codec_protobuf15.Stream(({ next }) => {
+    return new import_stream13.Stream(({ next }) => {
       const update = () => {
         const metrics2 = {
           timestamp: /* @__PURE__ */ new Date(),
@@ -8267,7 +8281,7 @@ var LoggingServiceImpl = class {
     });
   }
   queryLogs(request) {
-    return new import_codec_protobuf15.Stream(({ ctx, next }) => {
+    return new import_stream13.Stream(({ ctx, next }) => {
       const handler = (entry2) => {
         if (LOG_PROCESSING > 0) {
           return;
@@ -8327,7 +8341,7 @@ var NetworkServiceImpl = class {
     this.signalManager = signalManager;
   }
   queryStatus() {
-    return new import_codec_protobuf16.Stream(({ next }) => {
+    return new import_stream14.Stream(({ next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
@@ -8350,6 +8364,35 @@ var NetworkServiceImpl = class {
   async updateConfig(request) {
     await this.networkManager.setConnectionState(request.swarm);
   }
+  async joinSwarm(request) {
+    return this.signalManager.join(request);
+  }
+  async leaveSwarm(request) {
+    return this.signalManager.leave(request);
+  }
+  subscribeSwarmState(request) {
+    return new import_stream14.Stream(({ next }) => {
+      const unsubscribe = this.signalManager.swarmState?.on((state) => {
+        if (request.topic.equals(state.swarmKey)) {
+          next(state);
+        }
+      });
+      return unsubscribe;
+    });
+  }
+  async sendMessage(message) {
+    return this.signalManager.sendMessage(message);
+  }
+  subscribeMessages(peer) {
+    return new import_stream14.Stream(({ next }) => {
+      const unsubscribe = this.signalManager.onMessage.on((message) => {
+        if (message.recipient.peerKey === peer.peerKey) {
+          next(message);
+        }
+      });
+      return unsubscribe;
+    });
+  }
 };
 var SystemServiceImpl = class {
   constructor({ config, statusUpdate, getDiagnostics, onUpdateStatus, getCurrentStatus, onReset }) {
@@ -8384,7 +8427,7 @@ var SystemServiceImpl = class {
   }
   // TODO(burdon): Standardize interval option in stream request?
   queryStatus({ interval = 3e3 } = {}) {
-    return new import_codec_protobuf17.Stream(({ next }) => {
+    return new import_stream15.Stream(({ next }) => {
       const update = () => {
         next({
           status: this._getCurrentStatus()
@@ -8850,4 +8893,4 @@ ClientServicesHost = _ts_decorate11([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-ZS24HRVA.cjs.map
+//# sourceMappingURL=chunk-LXXOZWCX.cjs.map