@dxos/client-services 0.7.5-main.9d26e3a → 0.7.5-main.e9bb01b

package/dist/lib/node/{chunk-7FKXMJDD.cjs → chunk-WFDMSV4I.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_7FKXMJDD_exports = {};
-__export(chunk_7FKXMJDD_exports, {
+var chunk_WFDMSV4I_exports = {};
+__export(chunk_WFDMSV4I_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -72,24 +72,24 @@ __export(chunk_7FKXMJDD_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_7FKXMJDD_exports);
+module.exports = __toCommonJS(chunk_WFDMSV4I_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.5-main.9d26e3a";
+var DXOS_VERSION = "0.7.5-main.e9bb01b";
 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;
@@ -1633,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) {
@@ -1640,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,
@@ -1659,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();
   }
   /**
@@ -1860,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
@@ -1882,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)
           });
@@ -1892,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)
         });
@@ -1905,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)
         });
@@ -1933,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",
@@ -1957,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)
         });
@@ -1969,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)
         });
@@ -1986,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)
       });
@@ -2002,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)
     });
@@ -2011,7 +2016,7 @@ var handleEdgeError = (error) => {
       reason: error.reason
     }, {
       F: __dxlog_file7,
-      L: 383,
+      L: 398,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2779,7 +2784,7 @@ var DataSpaceManager = class extends import_context7.Resource {
         guestKeypair: invitation.guestKey ? {
           publicKey: invitation.guestKey
         } : void 0,
-        lifetime: invitation.expiresOn ? invitation.expiresOn.getTime() - Date.now() : void 0,
+        lifetime: invitation.expiresOn ? (invitation.expiresOn.getTime() - Date.now()) / 1e3 : void 0,
         multiUse: invitation.multiUse,
         delegationCredentialId: credentialId,
         persistent: false
@@ -2871,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));
@@ -2931,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));
@@ -2943,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) => {
@@ -3901,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()
       });
@@ -4784,6 +4789,12 @@ var DeviceInvitationProtocol = class {
 var stateToString = (state) => {
   return Object.entries(import_services13.Invitation.State).find(([key, val]) => val === state)?.[0] ?? "unknown";
 };
+var computeExpirationTime = (invitation) => {
+  if (!invitation.lifetime) {
+    return;
+  }
+  return new Date((invitation.created?.getTime() ?? Date.now()) + invitation.lifetime * 1e3);
+};
 var tryAcquireBeforeContextDisposed = async (ctx, mutex) => {
   let guard;
   return (0, import_context11.cancelWithContext)(ctx, (async () => {
@@ -5760,18 +5771,19 @@ var InvitationsHandler = class {
       });
       return extension;
     };
-    if (invitation.lifetime && invitation.created) {
-      if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
+    const expiresOn = (0, import_client_protocol5.getExpirationTime)(invitation);
+    if (expiresOn) {
+      if (expiresOn.getTime() < Date.now()) {
         import_log12.log.warn("invitation has already expired", void 0, {
           F: __dxlog_file21,
-          L: 193,
+          L: 194,
           S: this,
           C: (f, a) => f(...a)
         });
         guardedState.set(null, import_services11.Invitation.State.EXPIRED);
         void ctx.dispose().catch((err) => import_log12.log.catch(err, void 0, {
           F: __dxlog_file21,
-          L: 195,
+          L: 196,
           S: this,
           C: (f, a) => f(...a)
         }));
@@ -5782,7 +5794,7 @@ var InvitationsHandler = class {
         guardedState.set(null, import_services11.Invitation.State.EXPIRED);
         metrics.increment("dxos.invitation.expired");
         await ctx.dispose();
-      }, invitation.created.getTime() + invitation.lifetime * 1e3 - Date.now());
+      }, expiresOn.getTime() - Date.now());
     }
     let swarmConnection;
     (0, import_async15.scheduleTask)(ctx, async () => {
@@ -5798,7 +5810,7 @@ var InvitationsHandler = class {
       type: invitation.type
     }, {
       F: __dxlog_file21,
-      L: 226,
+      L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5806,7 +5818,7 @@ var InvitationsHandler = class {
     if (deviceProfile) {
       (0, import_invariant12.invariant)(invitation.kind === import_services11.Invitation.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file21,
-        L: 235,
+        L: 236,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -5824,7 +5836,7 @@ var InvitationsHandler = class {
         triedPeers: triedPeersIds.size
       }, {
         F: __dxlog_file21,
-        L: 243,
+        L: 244,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5851,7 +5863,7 @@ var InvitationsHandler = class {
               currentState: guardedState.current.state
             }, {
               F: __dxlog_file21,
-              L: 271,
+              L: 272,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5869,7 +5881,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file21,
-                L: 283,
+                L: 284,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5881,7 +5893,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 294,
+                L: 295,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5891,7 +5903,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 298,
+                L: 299,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5905,7 +5917,7 @@ var InvitationsHandler = class {
                 authMethod: introductionResponse.authMethod
               }, {
                 F: __dxlog_file21,
-                L: 306,
+                L: 307,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5927,7 +5939,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 336,
+                L: 337,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5940,7 +5952,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 350,
+                L: 351,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5953,7 +5965,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file21,
-                L: 359,
+                L: 360,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5963,7 +5975,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file21,
-                  L: 362,
+                  L: 363,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -5971,7 +5983,7 @@ var InvitationsHandler = class {
               } else {
                 import_log12.log.verbose("auth failed", err, {
                   F: __dxlog_file21,
-                  L: 365,
+                  L: 366,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -5983,7 +5995,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file21,
-                L: 369,
+                L: 370,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5999,7 +6011,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file21,
-              L: 378,
+              L: 379,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -6007,7 +6019,7 @@ var InvitationsHandler = class {
           } else {
             import_log12.log.verbose("auth failed", err, {
               F: __dxlog_file21,
-              L: 381,
+              L: 382,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -6024,7 +6036,7 @@ var InvitationsHandler = class {
           ...protocol.toJSON()
         }, {
           F: __dxlog_file21,
-          L: 393,
+          L: 394,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -6037,14 +6049,14 @@ var InvitationsHandler = class {
     });
     edgeInvitationHandler.handle(ctx, guardedState, protocol, deviceProfile);
     (0, import_async15.scheduleTask)(ctx, async () => {
-      const error = protocol.checkInvitation(invitation);
+      const error = checkInvitation(protocol, invitation);
       if (error) {
         stream.error(error);
         await ctx.dispose();
       } else {
         (0, import_invariant12.invariant)(invitation.swarmKey, void 0, {
           F: __dxlog_file21,
-          L: 405,
+          L: 406,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -6088,7 +6100,7 @@ var InvitationsHandler = class {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       (0, import_log12.log)("guest waiting for authentication code...", void 0, {
         F: __dxlog_file21,
-        L: 457,
+        L: 458,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6096,7 +6108,7 @@ var InvitationsHandler = class {
       const authCode = await authenticated.wait(options);
       (0, import_log12.log)("sending authentication request", void 0, {
         F: __dxlog_file21,
-        L: 461,
+        L: 462,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6115,7 +6127,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file21,
-            L: 472,
+            L: 473,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6133,7 +6145,7 @@ var InvitationsHandler = class {
     }
     (0, import_log12.log)("sending authentication request", void 0, {
       F: __dxlog_file21,
-      L: 491,
+      L: 492,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6146,6 +6158,13 @@ var InvitationsHandler = class {
     }
   }
 };
+var checkInvitation = (protocol, invitation) => {
+  const expiresOn = (0, import_client_protocol5.getExpirationTime)(invitation);
+  if (expiresOn && expiresOn.getTime() < Date.now()) {
+    return new import_protocols9.InvalidInvitationError("Invitation already expired.");
+  }
+  return protocol.checkInvitation(invitation);
+};
 var createAdmissionKeypair = () => {
   const keypair = (0, import_crypto.createKeyPair)();
   return {
@@ -6162,7 +6181,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);
@@ -6171,7 +6190,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);
     });
   }
@@ -6182,7 +6201,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,
@@ -6280,7 +6299,7 @@ var SpaceInvitationProtocol = class {
   getInvitationContext() {
     (0, import_invariant17.invariant)(this._spaceKey, void 0, {
       F: __dxlog_file22,
-      L: 64,
+      L: 65,
       S: this,
       A: [
         "this._spaceKey",
@@ -6290,7 +6309,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     (0, import_invariant17.invariant)(space, void 0, {
       F: __dxlog_file22,
-      L: 66,
+      L: 67,
       S: this,
       A: [
         "space",
@@ -6306,7 +6325,7 @@ var SpaceInvitationProtocol = class {
   async admit(invitation, request, guestProfile) {
     (0, import_invariant17.invariant)(this._spaceKey && request.space, void 0, {
       F: __dxlog_file22,
-      L: 79,
+      L: 80,
       S: this,
       A: [
         "this._spaceKey && request.space",
@@ -6318,7 +6337,7 @@ var SpaceInvitationProtocol = class {
       guest: request.space.deviceKey
     }, {
       F: __dxlog_file22,
-      L: 80,
+      L: 81,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6340,7 +6359,7 @@ var SpaceInvitationProtocol = class {
   async delegate(invitation) {
     (0, import_invariant17.invariant)(this._spaceKey, void 0, {
       F: __dxlog_file22,
-      L: 100,
+      L: 101,
       S: this,
       A: [
         "this._spaceKey",
@@ -6350,7 +6369,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     (0, import_invariant17.invariant)(space, void 0, {
       F: __dxlog_file22,
-      L: 102,
+      L: 103,
       S: this,
       A: [
         "space",
@@ -6360,7 +6379,7 @@ var SpaceInvitationProtocol = class {
     if (invitation.authMethod === import_services17.Invitation.AuthMethod.KNOWN_PUBLIC_KEY) {
       (0, import_invariant17.invariant)(invitation.guestKeypair?.publicKey, void 0, {
         F: __dxlog_file22,
-        L: 104,
+        L: 105,
         S: this,
         A: [
           "invitation.guestKeypair?.publicKey",
@@ -6373,7 +6392,7 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file22,
-      L: 107,
+      L: 108,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6382,13 +6401,13 @@ var SpaceInvitationProtocol = class {
       authMethod: invitation.authMethod,
       swarmKey: invitation.swarmKey,
       role: invitation.role ?? import_credentials19.SpaceMember.Role.ADMIN,
-      expiresOn: invitation.lifetime ? new Date((invitation.created?.getTime() ?? Date.now()) + invitation.lifetime) : void 0,
+      expiresOn: computeExpirationTime(invitation),
       multiUse: invitation.multiUse ?? false,
       guestKey: invitation.authMethod === import_services17.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
     });
     (0, import_invariant17.invariant)(credential.credential, void 0, {
       F: __dxlog_file22,
-      L: 127,
+      L: 126,
       S: this,
       A: [
         "credential.credential",
@@ -6403,7 +6422,7 @@ var SpaceInvitationProtocol = class {
   async cancelDelegation(invitation) {
     (0, import_invariant17.invariant)(this._spaceKey, void 0, {
       F: __dxlog_file22,
-      L: 133,
+      L: 132,
       S: this,
       A: [
         "this._spaceKey",
@@ -6412,7 +6431,7 @@ var SpaceInvitationProtocol = class {
     });
     (0, import_invariant17.invariant)(invitation.type === import_services17.Invitation.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
       F: __dxlog_file22,
-      L: 134,
+      L: 133,
       S: this,
       A: [
         "invitation.type === Invitation.Type.DELEGATED && invitation.delegationCredentialId",
@@ -6422,7 +6441,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     (0, import_invariant17.invariant)(space, void 0, {
       F: __dxlog_file22,
-      L: 136,
+      L: 135,
       S: this,
       A: [
         "space",
@@ -6434,14 +6453,14 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file22,
-      L: 138,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
     const credential = await (0, import_credentials18.createCancelDelegatedSpaceInvitationCredential)(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
     (0, import_invariant17.invariant)(credential.credential, void 0, {
       F: __dxlog_file22,
-      L: 145,
+      L: 144,
       S: this,
       A: [
         "credential.credential",
@@ -6480,7 +6499,7 @@ var SpaceInvitationProtocol = class {
   async accept(response) {
     (0, import_invariant17.invariant)(response.space, void 0, {
       F: __dxlog_file22,
-      L: 180,
+      L: 179,
       S: this,
       A: [
         "response.space",
@@ -6491,7 +6510,7 @@ var SpaceInvitationProtocol = class {
     const assertion = (0, import_credentials18.getCredentialAssertion)(credential);
     (0, import_invariant17.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file22,
-      L: 183,
+      L: 182,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -6500,7 +6519,7 @@ var SpaceInvitationProtocol = class {
     });
     (0, import_invariant17.invariant)(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
       F: __dxlog_file22,
-      L: 184,
+      L: 183,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
@@ -6724,7 +6743,7 @@ var InvitationsManager = class {
     }
   }
   _createInvitation(protocol, _options) {
-    const { invitationId = import_keys14.PublicKey.random().toHex(), type = import_services18.Invitation.Type.INTERACTIVE, authMethod = import_services18.Invitation.AuthMethod.SHARED_SECRET, state = import_services18.Invitation.State.INIT, timeout = import_client_protocol6.INVITATION_TIMEOUT, swarmKey = import_keys14.PublicKey.random(), persistent = _options?.authMethod !== import_services18.Invitation.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = import_credentials21.SpaceMember.Role.ADMIN, lifetime = 86400, multiUse = false, ...options } = _options ?? {};
+    const { invitationId = import_keys14.PublicKey.random().toHex(), type = import_services18.Invitation.Type.INTERACTIVE, authMethod = import_services18.Invitation.AuthMethod.SHARED_SECRET, state = import_services18.Invitation.State.INIT, timeout = import_client_protocol6.INVITATION_TIMEOUT, swarmKey = import_keys14.PublicKey.random(), persistent = _options?.authMethod !== import_services18.Invitation.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = import_credentials21.SpaceMember.Role.ADMIN, lifetime = 86400 * 7, multiUse = false, ...options } = _options ?? {};
     const authCode = options?.authCode ?? (authMethod === import_services18.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials20.generatePasscode)(import_client_protocol6.AUTHENTICATION_CODE_LENGTH) : void 0);
     return {
       invitationId,
@@ -6963,7 +6982,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;
           });
@@ -7229,7 +7248,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
       });
@@ -7250,7 +7269,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
       });
@@ -7498,7 +7517,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);
@@ -7517,7 +7537,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)
     });
@@ -7525,7 +7545,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)
     });
@@ -7552,7 +7572,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)
     });
@@ -7560,13 +7580,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)
     });
@@ -7574,7 +7594,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)
     });
@@ -7593,7 +7613,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)
     });
@@ -7604,7 +7624,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;
   }
@@ -7615,7 +7635,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",
@@ -7641,7 +7661,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;
   }
@@ -7655,7 +7675,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)
     });
@@ -7694,7 +7714,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",
@@ -7718,7 +7738,7 @@ var ServiceContext = class extends import_context16.Resource {
             details: assertion
           }, {
             F: __dxlog_file27,
-            L: 354,
+            L: 355,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7729,7 +7749,7 @@ var ServiceContext = class extends import_context16.Resource {
             details: assertion
           }, {
             F: __dxlog_file27,
-            L: 358,
+            L: 359,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7740,7 +7760,7 @@ var ServiceContext = class extends import_context16.Resource {
             details: assertion
           }, {
             F: __dxlog_file27,
-            L: 363,
+            L: 364,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7751,7 +7771,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)
           });
@@ -7772,7 +7792,7 @@ var ServiceContext = class extends import_context16.Resource {
           swarms: this.networkManager.topics
         }, {
           F: __dxlog_file27,
-          L: 383,
+          L: 384,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -7786,7 +7806,7 @@ var ServiceContext = class extends import_context16.Resource {
           });
           (0, import_invariant21.invariant)(identity.deviceCredentialChain, void 0, {
             F: __dxlog_file27,
-            L: 402,
+            L: 403,
             S: this,
             A: [
               "identity.deviceCredentialChain",
@@ -8062,7 +8082,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) {
@@ -8184,7 +8204,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);
@@ -8253,7 +8273,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(),
@@ -8275,7 +8295,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;
@@ -8335,7 +8355,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,
@@ -8358,6 +8378,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 }) {
@@ -8392,7 +8441,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()
@@ -8858,4 +8907,4 @@ ClientServicesHost = _ts_decorate11([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-7FKXMJDD.cjs.map
+//# sourceMappingURL=chunk-WFDMSV4I.cjs.map