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

package/dist/lib/node-esm/testing/index.mjs

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

package/dist/types/src/packlets/invitations/invitations-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invitations-handler.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitations-handler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAA8B,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAExF,OAAO,EAAE,KAAK,OAAO,EAAwB,MAAM,eAAe,CAAC;AAQnE,OAAO,EAAE,KAAK,gBAAgB,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAC/F,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAGzF,OAAO,EAAiD,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIpG,OAAO,EAAE,KAAK,oBAAoB,EAAyB,MAAM,2BAA2B,CAAC;AAG7F,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAQhE,MAAM,MAAM,0BAA0B,GAAG;IACvC,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAClC,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACxC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IAGrC,oBAAoB,CAClB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,EAC9B,QAAQ,EAAE,kBAAkB,EAC5B,UAAU,EAAE,UAAU,GACrB,IAAI;IAwIP,gBAAgB,CACd,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,EAC9B,QAAQ,EAAE,kBAAkB,EAC5B,UAAU,EAAE,UAAU,EACtB,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,EAClC,aAAa,CAAC,EAAE,qBAAqB,GACpC,IAAI;YAuMO,UAAU;YA0BV,mBAAmB;YA6BnB,mBAAmB;CAqBlC;AAED,eAAO,MAAM,sBAAsB,QAAO,gBAGzC,CAAC"}
+{"version":3,"file":"invitations-handler.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitations-handler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAA8B,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAExF,OAAO,EAAE,KAAK,OAAO,EAAwB,MAAM,eAAe,CAAC;AAQnE,OAAO,EAAE,KAAK,gBAAgB,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAC/F,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAGzF,OAAO,EAAiD,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIpG,OAAO,EAAE,KAAK,oBAAoB,EAAyB,MAAM,2BAA2B,CAAC;AAG7F,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAQhE,MAAM,MAAM,0BAA0B,GAAG;IACvC,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAClC,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACxC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,kBAAkB;IAK3B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IAGrC,oBAAoB,CAClB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,EAC9B,QAAQ,EAAE,kBAAkB,EAC5B,UAAU,EAAE,UAAU,GACrB,IAAI;IAyIP,gBAAgB,CACd,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC,EAC9B,QAAQ,EAAE,kBAAkB,EAC5B,UAAU,EAAE,UAAU,EACtB,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,EAClC,aAAa,CAAC,EAAE,qBAAqB,GACpC,IAAI;YAuMO,UAAU;YA0BV,mBAAmB;YA6BnB,mBAAmB;CAqBlC;AAUD,eAAO,MAAM,sBAAsB,QAAO,gBAGzC,CAAC"}

package/dist/types/src/packlets/invitations/space-invitation-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"space-invitation-protocol.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/space-invitation-protocol.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EACL,kBAAkB,EAClB,KAAK,QAAQ,EAEb,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AACxE,OAAO,EAAe,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAChG,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACzB,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAEvE,qBAAa,uBAAwB,YAAW,kBAAkB;IAE9D,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAHV,aAAa,EAAE,gBAAgB,EAC/B,eAAe,EAAE,cAAc,EAC/B,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,SAAS,YAAA;IAGxC,MAAM,IAAI,MAAM;IAQhB,wBAAwB,IAAI,QAAQ,GAAG,SAAS;IAchD,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC;IAWhE,KAAK,CACT,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,gBAAgB,EACzB,YAAY,CAAC,EAAE,eAAe,GAAG,SAAS,GACzC,OAAO,CAAC,iBAAiB,CAAC;IAqBvB,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;IAiCpD,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7D,eAAe,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC;IAS/C,kBAAkB,IAAI,mBAAmB;IAMnC,sBAAsB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAenD,MAAM,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;CAuBxE"}
+{"version":3,"file":"space-invitation-protocol.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/space-invitation-protocol.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EACL,kBAAkB,EAClB,KAAK,QAAQ,EAEb,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AACxE,OAAO,EAAe,KAAK,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAChG,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACzB,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAEvE,qBAAa,uBAAwB,YAAW,kBAAkB;IAE9D,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAHV,aAAa,EAAE,gBAAgB,EAC/B,eAAe,EAAE,cAAc,EAC/B,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,SAAS,YAAA;IAGxC,MAAM,IAAI,MAAM;IAQhB,wBAAwB,IAAI,QAAQ,GAAG,SAAS;IAchD,oBAAoB,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC;IAWhE,KAAK,CACT,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,gBAAgB,EACzB,YAAY,CAAC,EAAE,eAAe,GAAG,SAAS,GACzC,OAAO,CAAC,iBAAiB,CAAC;IAqBvB,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;IA+BpD,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB7D,eAAe,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC;IAS/C,kBAAkB,IAAI,mBAAmB;IAMnC,sBAAsB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAenD,MAAM,CAAC,QAAQ,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;CAuBxE"}

package/dist/types/src/packlets/invitations/utils.d.ts

@@ -2,5 +2,6 @@ import { type Mutex, type MutexGuard } from '@dxos/async';
 import { type Context } from '@dxos/context';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 export declare const stateToString: (state: Invitation.State) => string;
+export declare const computeExpirationTime: (invitation: Partial<Invitation>) => Date | undefined;
 export declare const tryAcquireBeforeContextDisposed: (ctx: Context, mutex: Mutex) => Promise<MutexGuard>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/types/src/packlets/invitations/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAqB,KAAK,OAAO,EAAwB,MAAM,eAAe,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAExE,eAAO,MAAM,aAAa,UAAW,UAAU,CAAC,KAAK,KAAG,MAEvD,CAAC;AAEF,eAAO,MAAM,+BAA+B,QAAe,OAAO,SAAS,KAAK,KAAG,OAAO,CAAC,UAAU,CAcpG,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAqB,KAAK,OAAO,EAAwB,MAAM,eAAe,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAExE,eAAO,MAAM,aAAa,UAAW,UAAU,CAAC,KAAK,KAAG,MAEvD,CAAC;AAEF,eAAO,MAAM,qBAAqB,eAAgB,OAAO,CAAC,UAAU,CAAC,KAAG,IAAI,GAAG,SAK9E,CAAC;AAEF,eAAO,MAAM,+BAA+B,QAAe,OAAO,SAAS,KAAK,KAAG,OAAO,CAAC,UAAU,CAcpG,CAAC"}

package/dist/types/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.7.5-main.9d2a38b";
+export declare const DXOS_VERSION = "0.7.5-main.e9bb01b";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.7.5-main.9d2a38b",
+  "version": "0.7.5-main.e9bb01b",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -42,48 +42,48 @@
   "dependencies": {
     "cbor-x": "^1.5.4",
     "platform": "^1.3.6",
-    "@dxos/async": "0.7.5-main.9d2a38b",
-    "@dxos/automerge": "0.7.5-main.9d2a38b",
-    "@dxos/client-protocol": "0.7.5-main.9d2a38b",
-    "@dxos/codec-protobuf": "0.7.5-main.9d2a38b",
-    "@dxos/config": "0.7.5-main.9d2a38b",
-    "@dxos/context": "0.7.5-main.9d2a38b",
-    "@dxos/credentials": "0.7.5-main.9d2a38b",
-    "@dxos/crypto": "0.7.5-main.9d2a38b",
-    "@dxos/debug": "0.7.5-main.9d2a38b",
-    "@dxos/echo-db": "0.7.5-main.9d2a38b",
-    "@dxos/echo-pipeline": "0.7.5-main.9d2a38b",
-    "@dxos/echo-protocol": "0.7.5-main.9d2a38b",
-    "@dxos/echo-schema": "0.7.5-main.9d2a38b",
-    "@dxos/edge-client": "0.7.5-main.9d2a38b",
-    "@dxos/feed-store": "0.7.5-main.9d2a38b",
-    "@dxos/indexing": "0.7.5-main.9d2a38b",
-    "@dxos/invariant": "0.7.5-main.9d2a38b",
-    "@dxos/keyring": "0.7.5-main.9d2a38b",
-    "@dxos/keys": "0.7.5-main.9d2a38b",
-    "@dxos/kv-store": "0.7.5-main.9d2a38b",
-    "@dxos/lock-file": "0.7.5-main.9d2a38b",
-    "@dxos/log": "0.7.5-main.9d2a38b",
-    "@dxos/messaging": "0.7.5-main.9d2a38b",
-    "@dxos/network-manager": "0.7.5-main.9d2a38b",
-    "@dxos/node-std": "0.7.5-main.9d2a38b",
-    "@dxos/protocols": "0.7.5-main.9d2a38b",
-    "@dxos/random-access-storage": "0.7.5-main.9d2a38b",
-    "@dxos/rpc": "0.7.5-main.9d2a38b",
-    "@dxos/teleport-extension-gossip": "0.7.5-main.9d2a38b",
-    "@dxos/teleport-extension-object-sync": "0.7.5-main.9d2a38b",
-    "@dxos/timeframe": "0.7.5-main.9d2a38b",
-    "@dxos/teleport": "0.7.5-main.9d2a38b",
-    "@dxos/tracing": "0.7.5-main.9d2a38b",
-    "@dxos/util": "0.7.5-main.9d2a38b",
-    "@dxos/websocket-rpc": "0.7.5-main.9d2a38b"
+    "@dxos/async": "0.7.5-main.e9bb01b",
+    "@dxos/automerge": "0.7.5-main.e9bb01b",
+    "@dxos/client-protocol": "0.7.5-main.e9bb01b",
+    "@dxos/config": "0.7.5-main.e9bb01b",
+    "@dxos/codec-protobuf": "0.7.5-main.e9bb01b",
+    "@dxos/credentials": "0.7.5-main.e9bb01b",
+    "@dxos/context": "0.7.5-main.e9bb01b",
+    "@dxos/crypto": "0.7.5-main.e9bb01b",
+    "@dxos/debug": "0.7.5-main.e9bb01b",
+    "@dxos/echo-db": "0.7.5-main.e9bb01b",
+    "@dxos/echo-pipeline": "0.7.5-main.e9bb01b",
+    "@dxos/echo-protocol": "0.7.5-main.e9bb01b",
+    "@dxos/echo-schema": "0.7.5-main.e9bb01b",
+    "@dxos/edge-client": "0.7.5-main.e9bb01b",
+    "@dxos/feed-store": "0.7.5-main.e9bb01b",
+    "@dxos/indexing": "0.7.5-main.e9bb01b",
+    "@dxos/kv-store": "0.7.5-main.e9bb01b",
+    "@dxos/keys": "0.7.5-main.e9bb01b",
+    "@dxos/invariant": "0.7.5-main.e9bb01b",
+    "@dxos/keyring": "0.7.5-main.e9bb01b",
+    "@dxos/lock-file": "0.7.5-main.e9bb01b",
+    "@dxos/log": "0.7.5-main.e9bb01b",
+    "@dxos/messaging": "0.7.5-main.e9bb01b",
+    "@dxos/network-manager": "0.7.5-main.e9bb01b",
+    "@dxos/node-std": "0.7.5-main.e9bb01b",
+    "@dxos/random-access-storage": "0.7.5-main.e9bb01b",
+    "@dxos/protocols": "0.7.5-main.e9bb01b",
+    "@dxos/teleport": "0.7.5-main.e9bb01b",
+    "@dxos/teleport-extension-gossip": "0.7.5-main.e9bb01b",
+    "@dxos/rpc": "0.7.5-main.e9bb01b",
+    "@dxos/teleport-extension-object-sync": "0.7.5-main.e9bb01b",
+    "@dxos/timeframe": "0.7.5-main.e9bb01b",
+    "@dxos/tracing": "0.7.5-main.e9bb01b",
+    "@dxos/util": "0.7.5-main.e9bb01b",
+    "@dxos/websocket-rpc": "0.7.5-main.e9bb01b"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
     "get-port-please": "^3.1.1",
-    "@dxos/signal": "0.7.5-main.9d2a38b",
-    "@dxos/test-utils": "0.7.5-main.9d2a38b"
+    "@dxos/signal": "0.7.5-main.e9bb01b",
+    "@dxos/test-utils": "0.7.5-main.e9bb01b"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/invitations/invitations-handler.ts

@@ -3,7 +3,7 @@
 //
 
 import { type PushStream, scheduleTask, TimeoutError, type Trigger } from '@dxos/async';
-import { INVITATION_TIMEOUT } from '@dxos/client-protocol';
+import { INVITATION_TIMEOUT, getExpirationTime } from '@dxos/client-protocol';
 import { type Context, ContextDisposedError } from '@dxos/context';
 import { createKeyPair, sign } from '@dxos/crypto';
 import { type EdgeHttpClient } from '@dxos/edge-client';
@@ -11,7 +11,7 @@ import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { createTeleportProtocolFactory, type SwarmNetworkManager, type SwarmConnection } from '@dxos/network-manager';
-import { InvalidInvitationExtensionRoleError, trace } from '@dxos/protocols';
+import { InvalidInvitationError, InvalidInvitationExtensionRoleError, trace } from '@dxos/protocols';
 import { type AdmissionKeypair, Invitation } from '@dxos/protocols/proto/dxos/client/services';
 import { type DeviceProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { AuthenticationResponse, type IntroductionResponse } from '@dxos/protocols/proto/dxos/halo/invitations';
@@ -188,8 +188,9 @@ export class InvitationsHandler {
       return extension;
     };
 
-    if (invitation.lifetime && invitation.created) {
-      if (invitation.created.getTime() + invitation.lifetime * 1000 < Date.now()) {
+    const expiresOn = getExpirationTime(invitation);
+    if (expiresOn) {
+      if (expiresOn.getTime() < Date.now()) {
         log.warn('invitation has already expired');
         guardedState.set(null, Invitation.State.EXPIRED);
         void ctx.dispose().catch((err) => log.catch(err));
@@ -204,7 +205,7 @@ export class InvitationsHandler {
           metrics.increment('dxos.invitation.expired');
           await ctx.dispose();
         },
-        invitation.created.getTime() + invitation.lifetime * 1000 - Date.now(),
+        expiresOn.getTime() - Date.now(),
       );
     }
 
@@ -397,7 +398,7 @@ export class InvitationsHandler {
     edgeInvitationHandler.handle(ctx, guardedState, protocol, deviceProfile);
 
     scheduleTask(ctx, async () => {
-      const error = protocol.checkInvitation(invitation);
+      const error = checkInvitation(protocol, invitation);
       if (error) {
         stream.error(error);
         await ctx.dispose();
@@ -499,6 +500,14 @@ export class InvitationsHandler {
   }
 }
 
+const checkInvitation = (protocol: InvitationProtocol, invitation: Partial<Invitation>) => {
+  const expiresOn = getExpirationTime(invitation);
+  if (expiresOn && expiresOn.getTime() < Date.now()) {
+    return new InvalidInvitationError('Invitation already expired.');
+  }
+  return protocol.checkInvitation(invitation);
+};
+
 export const createAdmissionKeypair = (): AdmissionKeypair => {
   const keypair = createKeyPair();
   return { publicKey: PublicKey.from(keypair.publicKey), privateKey: keypair.secretKey };

package/src/packlets/invitations/invitations-manager.ts

@@ -202,7 +202,7 @@ export class InvitationsManager {
       created = new Date(),
       guestKeypair = undefined,
       role = SpaceMember.Role.ADMIN,
-      lifetime = 86400, // 1 day,
+      lifetime = 86400 * 7, // 7 days,
       multiUse = false,
       ...options
     } = _options ?? {};

package/src/packlets/invitations/space-invitation-protocol.ts

@@ -28,6 +28,7 @@ import {
 } from '@dxos/protocols/proto/dxos/halo/invitations';
 
 import { type InvitationProtocol } from './invitation-protocol';
+import { computeExpirationTime } from './utils';
 import { type DataSpaceManager, type SigningContext } from '../spaces';
 
 export class SpaceInvitationProtocol implements InvitationProtocol {
@@ -113,9 +114,7 @@ export class SpaceInvitationProtocol implements InvitationProtocol {
         authMethod: invitation.authMethod,
         swarmKey: invitation.swarmKey,
         role: invitation.role ?? SpaceMember.Role.ADMIN,
-        expiresOn: invitation.lifetime
-          ? new Date((invitation.created?.getTime() ?? Date.now()) + invitation.lifetime)
-          : undefined,
+        expiresOn: computeExpirationTime(invitation),
         multiUse: invitation.multiUse ?? false,
         guestKey:
           invitation.authMethod === Invitation.AuthMethod.KNOWN_PUBLIC_KEY

package/src/packlets/invitations/utils.ts

@@ -10,6 +10,13 @@ export const stateToString = (state: Invitation.State): string => {
   return Object.entries(Invitation.State).find(([key, val]) => val === state)?.[0] ?? 'unknown';
 };
 
+export const computeExpirationTime = (invitation: Partial<Invitation>): Date | undefined => {
+  if (!invitation.lifetime) {
+    return;
+  }
+  return new Date((invitation.created?.getTime() ?? Date.now()) + invitation.lifetime * 1000);
+};
+
 export const tryAcquireBeforeContextDisposed = async (ctx: Context, mutex: Mutex): Promise<MutexGuard> => {
   let guard: MutexGuard | undefined;
   return cancelWithContext(

package/src/packlets/spaces/data-space-manager.ts

@@ -609,7 +609,7 @@ export class DataSpaceManager extends Resource {
         invitationId: invitation.invitationId,
         swarmKey: invitation.swarmKey,
         guestKeypair: invitation.guestKey ? { publicKey: invitation.guestKey } : undefined,
-        lifetime: invitation.expiresOn ? invitation.expiresOn.getTime() - Date.now() : undefined,
+        lifetime: invitation.expiresOn ? (invitation.expiresOn.getTime() - Date.now()) / 1000 : undefined,
         multiUse: invitation.multiUse,
         delegationCredentialId: credentialId,
         persistent: false,

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.7.5-main.9d2a38b";
+export const DXOS_VERSION = "0.7.5-main.e9bb01b";