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

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

@@ -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.9d2a38b";
+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";
@@ -2648,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
@@ -4705,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";
@@ -4735,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 () => {
@@ -5750,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)
         }));
@@ -5772,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 () => {
@@ -5788,7 +5795,7 @@ var InvitationsHandler = class {
       type: invitation.type
     }, {
       F: __dxlog_file22,
-      L: 226,
+      L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5796,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",
@@ -5814,7 +5821,7 @@ var InvitationsHandler = class {
         triedPeers: triedPeersIds.size
       }, {
         F: __dxlog_file22,
-        L: 243,
+        L: 244,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5841,7 +5848,7 @@ var InvitationsHandler = class {
               currentState: guardedState.current.state
             }, {
               F: __dxlog_file22,
-              L: 271,
+              L: 272,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5859,7 +5866,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file22,
-                L: 283,
+                L: 284,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5871,7 +5878,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file22,
-                L: 294,
+                L: 295,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5881,7 +5888,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file22,
-                L: 298,
+                L: 299,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5895,7 +5902,7 @@ var InvitationsHandler = class {
                 authMethod: introductionResponse.authMethod
               }, {
                 F: __dxlog_file22,
-                L: 306,
+                L: 307,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5917,7 +5924,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file22,
-                L: 336,
+                L: 337,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5930,7 +5937,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file22,
-                L: 350,
+                L: 351,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5943,7 +5950,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file22,
-                L: 359,
+                L: 360,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5953,7 +5960,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file22,
-                  L: 362,
+                  L: 363,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -5961,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)
                 });
@@ -5973,7 +5980,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file22,
-                L: 369,
+                L: 370,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5989,7 +5996,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file22,
-              L: 378,
+              L: 379,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5997,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)
             });
@@ -6014,7 +6021,7 @@ var InvitationsHandler = class {
           ...protocol.toJSON()
         }, {
           F: __dxlog_file22,
-          L: 393,
+          L: 394,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -6027,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",
@@ -6078,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)
       });
@@ -6086,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)
       });
@@ -6105,7 +6112,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file22,
-            L: 472,
+            L: 473,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6123,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)
     });
@@ -6136,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 {
@@ -6250,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";
@@ -6270,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) {
@@ -6284,7 +6298,7 @@ var SpaceInvitationProtocol = class {
   getInvitationContext() {
     invariant16(this._spaceKey, void 0, {
       F: __dxlog_file23,
-      L: 64,
+      L: 65,
       S: this,
       A: [
         "this._spaceKey",
@@ -6294,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",
@@ -6310,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",
@@ -6322,7 +6336,7 @@ var SpaceInvitationProtocol = class {
       guest: request.space.deviceKey
     }, {
       F: __dxlog_file23,
-      L: 80,
+      L: 81,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6344,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",
@@ -6354,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",
@@ -6364,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",
@@ -6377,7 +6391,7 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file23,
-      L: 107,
+      L: 108,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6386,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",
@@ -6407,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",
@@ -6416,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",
@@ -6426,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",
@@ -6438,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",
@@ -6458,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.");
@@ -6484,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",
@@ -6495,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'",
@@ -6504,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)",
@@ -6740,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,
@@ -9096,4 +9110,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-RFZHCLFI.mjs.map
+//# sourceMappingURL=chunk-O46EJ5BJ.mjs.map