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

package/dist/lib/browser/{chunk-27A4ATQX.mjs → chunk-O46EJ5BJ.mjs}

@@ -2,7 +2,7 @@ import "@dxos/node-std/globals";
 
 // packages/sdk/client-services/src/packlets/devtools/feeds.ts
 import { EventSubscriptions } from "@dxos/async";
-import { Stream } from "@dxos/codec-protobuf";
+import { Stream } from "@dxos/codec-protobuf/stream";
 import { FeedIterator } from "@dxos/feed-store";
 import { PublicKey } from "@dxos/keys";
 import { log } from "@dxos/log";
@@ -113,7 +113,7 @@ var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
 };
 
 // packages/sdk/client-services/src/packlets/devtools/network.ts
-import { Stream as Stream2 } from "@dxos/codec-protobuf";
+import { Stream as Stream2 } from "@dxos/codec-protobuf/stream";
 import { Context } from "@dxos/context";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devtools/network.ts";
@@ -210,7 +210,7 @@ var getNetworkPeers = ({ networkManager }, request) => {
 };
 
 // packages/sdk/client-services/src/packlets/devtools/spaces.ts
-import { Stream as Stream3 } from "@dxos/codec-protobuf";
+import { Stream as Stream3 } from "@dxos/codec-protobuf/stream";
 var subscribeToSpaces = (context, { spaceKeys = [] }) => {
   return new Stream3(({ next }) => {
     let unsubscribe;
@@ -247,11 +247,11 @@ var subscribeToSpaces = (context, { spaceKeys = [] }) => {
 
 // packages/sdk/client-services/src/packlets/devtools/devtools.ts
 import { Event as AsyncEvent } from "@dxos/async";
-import { Stream as Stream6 } from "@dxos/codec-protobuf";
+import { Stream as Stream6 } from "@dxos/codec-protobuf/stream";
 
 // packages/sdk/client-services/src/packlets/devtools/keys.ts
 import { scheduleTask } from "@dxos/async";
-import { Stream as Stream4 } from "@dxos/codec-protobuf";
+import { Stream as Stream4 } from "@dxos/codec-protobuf/stream";
 var subscribeToKeyringKeys = ({ keyring }) => new Stream4(({ next, ctx }) => {
   const update = async () => {
     next({
@@ -263,7 +263,7 @@ var subscribeToKeyringKeys = ({ keyring }) => new Stream4(({ next, ctx }) => {
 });
 
 // packages/sdk/client-services/src/packlets/devtools/metadata.ts
-import { Stream as Stream5 } from "@dxos/codec-protobuf";
+import { Stream as Stream5 } from "@dxos/codec-protobuf/stream";
 var subscribeToMetadata = ({ context }) => new Stream5(({ next, ctx }) => {
   context.metadataStore.update.on(ctx, (data) => next({
     metadata: data
@@ -397,7 +397,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.7.5-main.9d26e3a";
+var DXOS_VERSION = "0.7.5-main.e9bb01b";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -1451,6 +1451,7 @@ var NotarizationPlugin = class extends Resource3 {
     this._processedCredentials = new ComplexSet(PublicKey4.hash);
     this._processCredentialsTriggers = new ComplexMap3(PublicKey4.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) {
@@ -1458,15 +1459,6 @@ var NotarizationPlugin = class extends Resource3 {
     }
   }
   setActiveEdgePollingEnabled(enabled) {
-    invariant4(this.isOpen, void 0, {
-      F: __dxlog_file8,
-      L: 109,
-      S: this,
-      A: [
-        "this.isOpen",
-        ""
-      ]
-    });
     const client = this._edgeClient;
     invariant4(client, void 0, {
       F: __dxlog_file8,
@@ -1477,30 +1469,30 @@ var NotarizationPlugin = class extends Resource3 {
         ""
       ]
     });
-    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();
   }
   /**
@@ -1678,10 +1670,23 @@ var NotarizationPlugin = class extends Resource3 {
       ]
     });
     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
@@ -1700,7 +1705,7 @@ var NotarizationPlugin = class extends Resource3 {
         if (!credentials.length) {
           log5("edge did not return credentials for notarization", void 0, {
             F: __dxlog_file8,
-            L: 296,
+            L: 311,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1710,7 +1715,7 @@ var NotarizationPlugin = class extends Resource3 {
           count: credentials.length
         }, {
           F: __dxlog_file8,
-          L: 300,
+          L: 315,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1723,7 +1728,7 @@ var NotarizationPlugin = class extends Resource3 {
           count: decodedCredentials.length
         }, {
           F: __dxlog_file8,
-          L: 309,
+          L: 324,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1751,7 +1756,7 @@ var NotarizationPlugin = class extends Resource3 {
     for (const credential of credentials) {
       invariant4(credential.id, "Credential must have an id", {
         F: __dxlog_file8,
-        L: 335,
+        L: 350,
         S: this,
         A: [
           "credential.id",
@@ -1775,7 +1780,7 @@ var NotarizationPlugin = class extends Resource3 {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file8,
-          L: 350,
+          L: 365,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1787,7 +1792,7 @@ var NotarizationPlugin = class extends Resource3 {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file8,
-          L: 355,
+          L: 370,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1804,7 +1809,7 @@ var NotarizationPlugin = class extends Resource3 {
         peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
       }, {
         F: __dxlog_file8,
-        L: 367,
+        L: 382,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1820,7 +1825,7 @@ var handleEdgeError = (error) => {
   if (!(error instanceof EdgeCallFailedError) || error.errorData) {
     log5.catch(error, void 0, {
       F: __dxlog_file8,
-      L: 381,
+      L: 396,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -1829,7 +1834,7 @@ var handleEdgeError = (error) => {
       reason: error.reason
     }, {
       F: __dxlog_file8,
-      L: 383,
+      L: 398,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2643,7 +2648,7 @@ var DataSpaceManager = class extends Resource4 {
         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
@@ -2670,7 +2675,7 @@ DataSpaceManager = _ts_decorate3([
 
 // packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
 import { EventSubscriptions as EventSubscriptions2, UpdateScheduler, scheduleTask as scheduleTask3 } from "@dxos/async";
-import { Stream as Stream7 } from "@dxos/codec-protobuf";
+import { Stream as Stream7 } from "@dxos/codec-protobuf/stream";
 import { createAdmissionCredentials as createAdmissionCredentials2, getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 import { raise } from "@dxos/debug";
 import { writeMessages as writeMessages2 } from "@dxos/feed-store";
@@ -3756,7 +3761,7 @@ IdentityManager = _ts_decorate5([
 
 // packages/sdk/client-services/src/packlets/identity/identity-service.ts
 import { Trigger as Trigger4, sleep as sleep2 } from "@dxos/async";
-import { Stream as Stream8 } from "@dxos/codec-protobuf";
+import { Stream as Stream8 } from "@dxos/codec-protobuf/stream";
 import { Resource as Resource5 } from "@dxos/context";
 import { createCredential as createCredential2, signPresentation } from "@dxos/credentials";
 import { invariant as invariant9 } from "@dxos/invariant";
@@ -4700,14 +4705,14 @@ var DeviceInvitationProtocol = class {
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
 import { scheduleTask as scheduleTask7, TimeoutError as TimeoutError2 } from "@dxos/async";
-import { INVITATION_TIMEOUT } from "@dxos/client-protocol";
+import { INVITATION_TIMEOUT, getExpirationTime } from "@dxos/client-protocol";
 import { ContextDisposedError as ContextDisposedError3 } from "@dxos/context";
 import { createKeyPair, sign as sign2 } from "@dxos/crypto";
 import { invariant as invariant15 } from "@dxos/invariant";
 import { PublicKey as PublicKey11 } from "@dxos/keys";
 import { log as log18 } from "@dxos/log";
 import { createTeleportProtocolFactory } from "@dxos/network-manager";
-import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError3, trace as trace7 } from "@dxos/protocols";
+import { InvalidInvitationError, InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError3, trace as trace7 } from "@dxos/protocols";
 import { Invitation as Invitation7 } from "@dxos/protocols/proto/dxos/client/services";
 import { AuthenticationResponse as AuthenticationResponse2 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { InvitationOptions as InvitationOptions4 } from "@dxos/protocols/proto/dxos/halo/invitations";
@@ -4730,6 +4735,12 @@ import { Invitation as Invitation3 } from "@dxos/protocols/proto/dxos/client/ser
 var stateToString = (state) => {
   return Object.entries(Invitation3.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 cancelWithContext3(ctx, (async () => {
@@ -5745,18 +5756,19 @@ var InvitationsHandler = class {
       });
       return extension;
     };
-    if (invitation.lifetime && invitation.created) {
-      if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
+    const expiresOn = getExpirationTime(invitation);
+    if (expiresOn) {
+      if (expiresOn.getTime() < Date.now()) {
         log18.warn("invitation has already expired", void 0, {
           F: __dxlog_file22,
-          L: 193,
+          L: 194,
           S: this,
           C: (f, a) => f(...a)
         });
         guardedState.set(null, Invitation7.State.EXPIRED);
         void ctx.dispose().catch((err) => log18.catch(err, void 0, {
           F: __dxlog_file22,
-          L: 195,
+          L: 196,
           S: this,
           C: (f, a) => f(...a)
         }));
@@ -5767,7 +5779,7 @@ var InvitationsHandler = class {
         guardedState.set(null, Invitation7.State.EXPIRED);
         metrics.increment("dxos.invitation.expired");
         await ctx.dispose();
-      }, invitation.created.getTime() + invitation.lifetime * 1e3 - Date.now());
+      }, expiresOn.getTime() - Date.now());
     }
     let swarmConnection;
     scheduleTask7(ctx, async () => {
@@ -5783,7 +5795,7 @@ var InvitationsHandler = class {
       type: invitation.type
     }, {
       F: __dxlog_file22,
-      L: 226,
+      L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5791,7 +5803,7 @@ var InvitationsHandler = class {
     if (deviceProfile) {
       invariant15(invitation.kind === Invitation7.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file22,
-        L: 235,
+        L: 236,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -5809,7 +5821,7 @@ var InvitationsHandler = class {
         triedPeers: triedPeersIds.size
       }, {
         F: __dxlog_file22,
-        L: 243,
+        L: 244,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5836,7 +5848,7 @@ var InvitationsHandler = class {
               currentState: guardedState.current.state
             }, {
               F: __dxlog_file22,
-              L: 271,
+              L: 272,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5854,7 +5866,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file22,
-                L: 283,
+                L: 284,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5866,7 +5878,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file22,
-                L: 294,
+                L: 295,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5876,7 +5888,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file22,
-                L: 298,
+                L: 299,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5890,7 +5902,7 @@ var InvitationsHandler = class {
                 authMethod: introductionResponse.authMethod
               }, {
                 F: __dxlog_file22,
-                L: 306,
+                L: 307,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5912,7 +5924,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file22,
-                L: 336,
+                L: 337,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5925,7 +5937,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file22,
-                L: 350,
+                L: 351,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5938,7 +5950,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file22,
-                L: 359,
+                L: 360,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5948,7 +5960,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file22,
-                  L: 362,
+                  L: 363,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -5956,7 +5968,7 @@ var InvitationsHandler = class {
               } else {
                 log18.verbose("auth failed", err, {
                   F: __dxlog_file22,
-                  L: 365,
+                  L: 366,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -5968,7 +5980,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file22,
-                L: 369,
+                L: 370,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5984,7 +5996,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file22,
-              L: 378,
+              L: 379,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5992,7 +6004,7 @@ var InvitationsHandler = class {
           } else {
             log18.verbose("auth failed", err, {
               F: __dxlog_file22,
-              L: 381,
+              L: 382,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -6009,7 +6021,7 @@ var InvitationsHandler = class {
           ...protocol.toJSON()
         }, {
           F: __dxlog_file22,
-          L: 393,
+          L: 394,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -6022,14 +6034,14 @@ var InvitationsHandler = class {
     });
     edgeInvitationHandler.handle(ctx, guardedState, protocol, deviceProfile);
     scheduleTask7(ctx, async () => {
-      const error = protocol.checkInvitation(invitation);
+      const error = checkInvitation(protocol, invitation);
       if (error) {
         stream.error(error);
         await ctx.dispose();
       } else {
         invariant15(invitation.swarmKey, void 0, {
           F: __dxlog_file22,
-          L: 405,
+          L: 406,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -6073,7 +6085,7 @@ var InvitationsHandler = class {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       log18("guest waiting for authentication code...", void 0, {
         F: __dxlog_file22,
-        L: 457,
+        L: 458,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6081,7 +6093,7 @@ var InvitationsHandler = class {
       const authCode = await authenticated.wait(options);
       log18("sending authentication request", void 0, {
         F: __dxlog_file22,
-        L: 461,
+        L: 462,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6100,7 +6112,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file22,
-            L: 472,
+            L: 473,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6118,7 +6130,7 @@ var InvitationsHandler = class {
     }
     log18("sending authentication request", void 0, {
       F: __dxlog_file22,
-      L: 491,
+      L: 492,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6131,6 +6143,13 @@ var InvitationsHandler = class {
     }
   }
 };
+var checkInvitation = (protocol, invitation) => {
+  const expiresOn = getExpirationTime(invitation);
+  if (expiresOn && expiresOn.getTime() < Date.now()) {
+    return new InvalidInvitationError("Invitation already expired.");
+  }
+  return protocol.checkInvitation(invitation);
+};
 var createAdmissionKeypair = () => {
   const keypair = createKeyPair();
   return {
@@ -6140,7 +6159,7 @@ var createAdmissionKeypair = () => {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-service.ts
-import { Stream as Stream9 } from "@dxos/codec-protobuf";
+import { Stream as Stream9 } from "@dxos/codec-protobuf/stream";
 import { QueryInvitationsResponse } from "@dxos/protocols/proto/dxos/client/services";
 import { trace as trace8 } from "@dxos/tracing";
 var InvitationsServiceImpl = class {
@@ -6245,7 +6264,7 @@ import { createCancelDelegatedSpaceInvitationCredential, createDelegatedSpaceInv
 import { writeMessages as writeMessages4 } from "@dxos/feed-store";
 import { invariant as invariant16 } from "@dxos/invariant";
 import { log as log19 } from "@dxos/log";
-import { AlreadyJoinedError as AlreadyJoinedError3, AuthorizationError as AuthorizationError2, InvalidInvitationError, SpaceNotFoundError as SpaceNotFoundError2 } from "@dxos/protocols";
+import { AlreadyJoinedError as AlreadyJoinedError3, AuthorizationError as AuthorizationError2, InvalidInvitationError as InvalidInvitationError2, SpaceNotFoundError as SpaceNotFoundError2 } from "@dxos/protocols";
 import { Invitation as Invitation8 } from "@dxos/protocols/proto/dxos/client/services";
 import { SpaceMember as SpaceMember6 } from "@dxos/protocols/proto/dxos/halo/credentials";
 var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
@@ -6265,7 +6284,7 @@ var SpaceInvitationProtocol = class {
   }
   checkCanInviteNewMembers() {
     if (this._spaceKey == null) {
-      return new InvalidInvitationError("No spaceKey was provided for a space invitation.");
+      return new InvalidInvitationError2("No spaceKey was provided for a space invitation.");
     }
     const space = this._spaceManager.spaces.get(this._spaceKey);
     if (space == null) {
@@ -6279,7 +6298,7 @@ var SpaceInvitationProtocol = class {
   getInvitationContext() {
     invariant16(this._spaceKey, void 0, {
       F: __dxlog_file23,
-      L: 64,
+      L: 65,
       S: this,
       A: [
         "this._spaceKey",
@@ -6289,7 +6308,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant16(space, void 0, {
       F: __dxlog_file23,
-      L: 66,
+      L: 67,
       S: this,
       A: [
         "space",
@@ -6305,7 +6324,7 @@ var SpaceInvitationProtocol = class {
   async admit(invitation, request, guestProfile) {
     invariant16(this._spaceKey && request.space, void 0, {
       F: __dxlog_file23,
-      L: 79,
+      L: 80,
       S: this,
       A: [
         "this._spaceKey && request.space",
@@ -6317,7 +6336,7 @@ var SpaceInvitationProtocol = class {
       guest: request.space.deviceKey
     }, {
       F: __dxlog_file23,
-      L: 80,
+      L: 81,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6339,7 +6358,7 @@ var SpaceInvitationProtocol = class {
   async delegate(invitation) {
     invariant16(this._spaceKey, void 0, {
       F: __dxlog_file23,
-      L: 100,
+      L: 101,
       S: this,
       A: [
         "this._spaceKey",
@@ -6349,7 +6368,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant16(space, void 0, {
       F: __dxlog_file23,
-      L: 102,
+      L: 103,
       S: this,
       A: [
         "space",
@@ -6359,7 +6378,7 @@ var SpaceInvitationProtocol = class {
     if (invitation.authMethod === Invitation8.AuthMethod.KNOWN_PUBLIC_KEY) {
       invariant16(invitation.guestKeypair?.publicKey, void 0, {
         F: __dxlog_file23,
-        L: 104,
+        L: 105,
         S: this,
         A: [
           "invitation.guestKeypair?.publicKey",
@@ -6372,7 +6391,7 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file23,
-      L: 107,
+      L: 108,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6381,13 +6400,13 @@ var SpaceInvitationProtocol = class {
       authMethod: invitation.authMethod,
       swarmKey: invitation.swarmKey,
       role: invitation.role ?? SpaceMember6.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 === Invitation8.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
     });
     invariant16(credential.credential, void 0, {
       F: __dxlog_file23,
-      L: 127,
+      L: 126,
       S: this,
       A: [
         "credential.credential",
@@ -6402,7 +6421,7 @@ var SpaceInvitationProtocol = class {
   async cancelDelegation(invitation) {
     invariant16(this._spaceKey, void 0, {
       F: __dxlog_file23,
-      L: 133,
+      L: 132,
       S: this,
       A: [
         "this._spaceKey",
@@ -6411,7 +6430,7 @@ var SpaceInvitationProtocol = class {
     });
     invariant16(invitation.type === Invitation8.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
       F: __dxlog_file23,
-      L: 134,
+      L: 133,
       S: this,
       A: [
         "invitation.type === Invitation.Type.DELEGATED && invitation.delegationCredentialId",
@@ -6421,7 +6440,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant16(space, void 0, {
       F: __dxlog_file23,
-      L: 136,
+      L: 135,
       S: this,
       A: [
         "space",
@@ -6433,14 +6452,14 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file23,
-      L: 138,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
     const credential = await createCancelDelegatedSpaceInvitationCredential(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
     invariant16(credential.credential, void 0, {
       F: __dxlog_file23,
-      L: 145,
+      L: 144,
       S: this,
       A: [
         "credential.credential",
@@ -6453,7 +6472,7 @@ var SpaceInvitationProtocol = class {
   }
   checkInvitation(invitation) {
     if (invitation.spaceKey == null) {
-      return new InvalidInvitationError("No spaceKey was provided for a space invitation.");
+      return new InvalidInvitationError2("No spaceKey was provided for a space invitation.");
     }
     if (this._spaceManager.spaces.has(invitation.spaceKey)) {
       return new AlreadyJoinedError3("Already joined space.");
@@ -6479,7 +6498,7 @@ var SpaceInvitationProtocol = class {
   async accept(response) {
     invariant16(response.space, void 0, {
       F: __dxlog_file23,
-      L: 180,
+      L: 179,
       S: this,
       A: [
         "response.space",
@@ -6490,7 +6509,7 @@ var SpaceInvitationProtocol = class {
     const assertion = getCredentialAssertion5(credential);
     invariant16(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file23,
-      L: 183,
+      L: 182,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -6499,7 +6518,7 @@ var SpaceInvitationProtocol = class {
     });
     invariant16(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
       F: __dxlog_file23,
-      L: 184,
+      L: 183,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
@@ -6735,7 +6754,7 @@ var InvitationsManager = class {
     }
   }
   _createInvitation(protocol, _options) {
-    const { invitationId = PublicKey12.random().toHex(), type = Invitation9.Type.INTERACTIVE, authMethod = Invitation9.AuthMethod.SHARED_SECRET, state = Invitation9.State.INIT, timeout = INVITATION_TIMEOUT2, swarmKey = PublicKey12.random(), persistent = _options?.authMethod !== Invitation9.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = SpaceMember7.Role.ADMIN, lifetime = 86400, multiUse = false, ...options } = _options ?? {};
+    const { invitationId = PublicKey12.random().toHex(), type = Invitation9.Type.INTERACTIVE, authMethod = Invitation9.AuthMethod.SHARED_SECRET, state = Invitation9.State.INIT, timeout = INVITATION_TIMEOUT2, swarmKey = PublicKey12.random(), persistent = _options?.authMethod !== Invitation9.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = SpaceMember7.Role.ADMIN, lifetime = 86400 * 7, multiUse = false, ...options } = _options ?? {};
     const authCode = options?.authCode ?? (authMethod === Invitation9.AuthMethod.SHARED_SECRET ? generatePasscode(AUTHENTICATION_CODE_LENGTH) : void 0);
     return {
       invitationId,
@@ -7322,7 +7341,7 @@ _ts_decorate9([
 ], EdgeAgentManager.prototype, "createAgent", null);
 
 // packages/sdk/client-services/src/packlets/agents/edge-agent-service.ts
-import { Stream as Stream11 } from "@dxos/codec-protobuf";
+import { Stream as Stream11 } from "@dxos/codec-protobuf/stream";
 import { EdgeAgentStatus as EdgeAgentStatus2 } from "@dxos/protocols";
 import { QueryAgentStatusResponse, QueryEdgeStatusResponse } from "@dxos/protocols/proto/dxos/client/services";
 var EdgeAgentServiceImpl = class {
@@ -7630,7 +7649,8 @@ var ServiceContext = class extends Resource7 {
     this.recoveryManager = new EdgeIdentityRecoveryManager(this.keyring, this._edgeHttpClient, () => this.identityManager.identity, this._acceptIdentity.bind(this));
     this.echoHost = new 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 MeshEchoReplicator();
     this.invitations = new InvitationsHandler(this.networkManager, this._edgeHttpClient, _runtimeParams?.invitationConnectionDefaultParams);
@@ -7649,7 +7669,7 @@ var ServiceContext = class extends Resource7 {
     await this._checkStorageVersion();
     log24("opening...", void 0, {
       F: __dxlog_file28,
-      L: 198,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7657,7 +7677,7 @@ var ServiceContext = class extends Resource7 {
       id: this._instanceId
     }), {
       F: __dxlog_file28,
-      L: 199,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7684,7 +7704,7 @@ var ServiceContext = class extends Resource7 {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file28,
-      L: 227,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7692,13 +7712,13 @@ var ServiceContext = class extends Resource7 {
       id: this._instanceId
     }), {
       F: __dxlog_file28,
-      L: 229,
+      L: 230,
       S: this,
       C: (f, a) => f(...a)
     });
     log24("opened", void 0, {
       F: __dxlog_file28,
-      L: 230,
+      L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7706,7 +7726,7 @@ var ServiceContext = class extends Resource7 {
   async _close(ctx) {
     log24("closing...", void 0, {
       F: __dxlog_file28,
-      L: 234,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7725,7 +7745,7 @@ var ServiceContext = class extends Resource7 {
     await this._edgeConnection?.close();
     log24("closed", void 0, {
       F: __dxlog_file28,
-      L: 250,
+      L: 251,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7736,7 +7756,7 @@ var ServiceContext = class extends Resource7 {
     await identity.joinNetwork();
     await this._initialize(new Context9(void 0, {
       F: __dxlog_file28,
-      L: 257
+      L: 258
     }));
     return identity;
   }
@@ -7747,7 +7767,7 @@ var ServiceContext = class extends Resource7 {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant20(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file28,
-      L: 266,
+      L: 267,
       S: this,
       A: [
         "factory",
@@ -7773,7 +7793,7 @@ var ServiceContext = class extends Resource7 {
     await this.identityManager.acceptIdentity(identity, identityRecord, params.deviceProfile);
     await this._initialize(new Context9(void 0, {
       F: __dxlog_file28,
-      L: 285
+      L: 286
     }));
     return identity;
   }
@@ -7787,7 +7807,7 @@ var ServiceContext = class extends Resource7 {
   async _initialize(ctx) {
     log24("initializing spaces...", void 0, {
       F: __dxlog_file28,
-      L: 300,
+      L: 301,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7826,7 +7846,7 @@ var ServiceContext = class extends Resource7 {
     this._handlerFactories.set(Invitation10.Kind.SPACE, (invitation) => {
       invariant20(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file28,
-        L: 338,
+        L: 339,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -7850,7 +7870,7 @@ var ServiceContext = class extends Resource7 {
             details: assertion
           }, {
             F: __dxlog_file28,
-            L: 354,
+            L: 355,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7861,7 +7881,7 @@ var ServiceContext = class extends Resource7 {
             details: assertion
           }, {
             F: __dxlog_file28,
-            L: 358,
+            L: 359,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7872,7 +7892,7 @@ var ServiceContext = class extends Resource7 {
             details: assertion
           }, {
             F: __dxlog_file28,
-            L: 363,
+            L: 364,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7883,7 +7903,7 @@ var ServiceContext = class extends Resource7 {
         } catch (err) {
           log24.catch(err, void 0, {
             F: __dxlog_file28,
-            L: 369,
+            L: 370,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7904,7 +7924,7 @@ var ServiceContext = class extends Resource7 {
           swarms: this.networkManager.topics
         }, {
           F: __dxlog_file28,
-          L: 383,
+          L: 384,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -7918,7 +7938,7 @@ var ServiceContext = class extends Resource7 {
           });
           invariant20(identity.deviceCredentialChain, void 0, {
             F: __dxlog_file28,
-            L: 402,
+            L: 403,
             S: this,
             A: [
               "identity.deviceCredentialChain",
@@ -8228,7 +8248,7 @@ import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
 import { EventSubscriptions as EventSubscriptions3 } from "@dxos/async";
-import { Stream as Stream12 } from "@dxos/codec-protobuf";
+import { Stream as Stream12 } from "@dxos/codec-protobuf/stream";
 import { invariant as invariant22 } from "@dxos/invariant";
 import { Device as Device2, DeviceKind as DeviceKind2 } from "@dxos/protocols/proto/dxos/client/services";
 var __dxlog_file30 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
@@ -8318,7 +8338,7 @@ var DevicesServiceImpl = class {
 
 // packages/sdk/client-services/src/packlets/identity/contacts-service.ts
 import { EventSubscriptions as EventSubscriptions4, scheduleTask as scheduleTask9, UpdateScheduler as UpdateScheduler2 } from "@dxos/async";
-import { Stream as Stream13 } from "@dxos/codec-protobuf";
+import { Stream as Stream13 } from "@dxos/codec-protobuf/stream";
 import { PublicKey as PublicKey17 } from "@dxos/keys";
 import { ComplexMap as ComplexMap5, ComplexSet as ComplexSet6 } from "@dxos/util";
 var ContactsServiceImpl = class {
@@ -8401,7 +8421,7 @@ var ContactsServiceImpl = class {
 
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
 import { Event as Event10 } from "@dxos/async";
-import { Stream as Stream14 } from "@dxos/codec-protobuf";
+import { Stream as Stream14 } from "@dxos/codec-protobuf/stream";
 import { PublicKey as PublicKey18 } from "@dxos/keys";
 import { getContextFromEntry, log as log26 } from "@dxos/log";
 import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
@@ -8524,7 +8544,7 @@ var shouldLog = (entry2, request) => {
 var LOG_PROCESSING = 0;
 
 // packages/sdk/client-services/src/packlets/network/network-service.ts
-import { Stream as Stream15 } from "@dxos/codec-protobuf";
+import { Stream as Stream15 } from "@dxos/codec-protobuf/stream";
 var NetworkServiceImpl = class {
   constructor(networkManager, signalManager) {
     this.networkManager = networkManager;
@@ -8554,10 +8574,39 @@ 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 Stream15(({ 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 Stream15(({ next }) => {
+      const unsubscribe = this.signalManager.onMessage.on((message) => {
+        if (message.recipient.peerKey === peer.peerKey) {
+          next(message);
+        }
+      });
+      return unsubscribe;
+    });
+  }
 };
 
 // packages/sdk/client-services/src/packlets/system/system-service.ts
-import { Stream as Stream16 } from "@dxos/codec-protobuf";
+import { Stream as Stream16 } from "@dxos/codec-protobuf/stream";
 import { GetDiagnosticsRequest as GetDiagnosticsRequest2 } from "@dxos/protocols/proto/dxos/client/services";
 import { jsonKeyReplacer as jsonKeyReplacer2 } from "@dxos/util";
 var SystemServiceImpl = class {
@@ -9061,4 +9110,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-27A4ATQX.mjs.map
+//# sourceMappingURL=chunk-O46EJ5BJ.mjs.map