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

package/dist/lib/browser/testing/index.mjs

@@ -6,7 +6,7 @@ import {
   InvitationsManager,
   ServiceContext,
   SpaceInvitationProtocol
-} from "../chunk-RFZHCLFI.mjs";
+} from "../chunk-O46EJ5BJ.mjs";
 
 // packages/sdk/client-services/src/packlets/testing/credential-utils.ts
 import { createCredential } from "@dxos/credentials";

package/dist/lib/node/{chunk-WCTGAZLA.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_WCTGAZLA_exports = {};
-__export(chunk_WCTGAZLA_exports, {
+var chunk_WFDMSV4I_exports = {};
+__export(chunk_WFDMSV4I_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -72,7 +72,7 @@ __export(chunk_WCTGAZLA_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_WCTGAZLA_exports);
+module.exports = __toCommonJS(chunk_WFDMSV4I_exports);
 var import_async = require("@dxos/async");
 var import_stream = require("@dxos/codec-protobuf/stream");
 var import_feed_store = require("@dxos/feed-store");
@@ -735,7 +735,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.7.5-main.9d2a38b";
+var DXOS_VERSION = "0.7.5-main.e9bb01b";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -2784,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
@@ -4789,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 () => {
@@ -5765,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)
         }));
@@ -5787,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 () => {
@@ -5803,7 +5810,7 @@ var InvitationsHandler = class {
       type: invitation.type
     }, {
       F: __dxlog_file21,
-      L: 226,
+      L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5811,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",
@@ -5829,7 +5836,7 @@ var InvitationsHandler = class {
         triedPeers: triedPeersIds.size
       }, {
         F: __dxlog_file21,
-        L: 243,
+        L: 244,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5856,7 +5863,7 @@ var InvitationsHandler = class {
               currentState: guardedState.current.state
             }, {
               F: __dxlog_file21,
-              L: 271,
+              L: 272,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5874,7 +5881,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file21,
-                L: 283,
+                L: 284,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5886,7 +5893,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 294,
+                L: 295,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5896,7 +5903,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 298,
+                L: 299,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5910,7 +5917,7 @@ var InvitationsHandler = class {
                 authMethod: introductionResponse.authMethod
               }, {
                 F: __dxlog_file21,
-                L: 306,
+                L: 307,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5932,7 +5939,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 336,
+                L: 337,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5945,7 +5952,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 350,
+                L: 351,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5958,7 +5965,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file21,
-                L: 359,
+                L: 360,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5968,7 +5975,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file21,
-                  L: 362,
+                  L: 363,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -5976,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)
                 });
@@ -5988,7 +5995,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file21,
-                L: 369,
+                L: 370,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -6004,7 +6011,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file21,
-              L: 378,
+              L: 379,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -6012,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)
             });
@@ -6029,7 +6036,7 @@ var InvitationsHandler = class {
           ...protocol.toJSON()
         }, {
           F: __dxlog_file21,
-          L: 393,
+          L: 394,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -6042,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",
@@ -6093,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)
       });
@@ -6101,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)
       });
@@ -6120,7 +6127,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file21,
-            L: 472,
+            L: 473,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6138,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)
     });
@@ -6151,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 {
@@ -6285,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",
@@ -6295,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",
@@ -6311,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",
@@ -6323,7 +6337,7 @@ var SpaceInvitationProtocol = class {
       guest: request.space.deviceKey
     }, {
       F: __dxlog_file22,
-      L: 80,
+      L: 81,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6345,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",
@@ -6355,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",
@@ -6365,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",
@@ -6378,7 +6392,7 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file22,
-      L: 107,
+      L: 108,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6387,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",
@@ -6408,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",
@@ -6417,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",
@@ -6427,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",
@@ -6439,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",
@@ -6485,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",
@@ -6496,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'",
@@ -6505,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)",
@@ -6729,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,
@@ -8893,4 +8907,4 @@ ClientServicesHost = _ts_decorate11([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-WCTGAZLA.cjs.map
+//# sourceMappingURL=chunk-WFDMSV4I.cjs.map