@dxos/client-services 0.4.10-main.3c620fb → 0.4.10-main.3e35a2f

package/dist/lib/browser/{chunk-H2TNTLUE.mjs → chunk-S3G2RM7S.mjs}

@@ -1639,11 +1639,11 @@ var InvitationsHandler = class {
     this._networkManager = _networkManager;
   }
   createInvitation(protocol, options) {
-    const { invitationId = PublicKey6.random().toHex(), type = Invitation3.Type.INTERACTIVE, authMethod = Invitation3.AuthMethod.SHARED_SECRET, state = Invitation3.State.INIT, timeout = INVITATION_TIMEOUT, swarmKey = PublicKey6.random(), persistent = true, created = /* @__PURE__ */ new Date(), lifetime = 86400 } = options ?? {};
+    const { invitationId = PublicKey6.random().toHex(), type = Invitation3.Type.INTERACTIVE, authMethod = Invitation3.AuthMethod.SHARED_SECRET, state = Invitation3.State.INIT, timeout = INVITATION_TIMEOUT, swarmKey = PublicKey6.random(), persistent = true, created = /* @__PURE__ */ new Date(), lifetime = 86400, multiUse = false } = options ?? {};
     const authCode = options?.authCode ?? (authMethod === Invitation3.AuthMethod.SHARED_SECRET ? generatePasscode(AUTHENTICATION_CODE_LENGTH) : void 0);
     invariant6(protocol, void 0, {
       F: __dxlog_file7,
-      L: 84,
+      L: 85,
       S: this,
       A: [
         "protocol",
@@ -1658,9 +1658,10 @@ var InvitationsHandler = class {
       swarmKey,
       authCode,
       timeout,
-      persistent,
+      persistent: persistent && type !== Invitation3.Type.OFFLINE,
       created,
       lifetime,
+      multiUse,
       ...protocol.getInvitationContext()
     };
     const stream = new PushStream();
@@ -1675,7 +1676,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 109,
+        L: 111,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1700,7 +1701,7 @@ var InvitationsHandler = class {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             invariant6(deviceKey, void 0, {
               F: __dxlog_file7,
-              L: 130,
+              L: 132,
               S: this,
               A: [
                 "deviceKey",
@@ -1723,7 +1724,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 148,
+                L: 150,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1731,7 +1732,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 149,
+                L: 151,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1747,7 +1748,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 152,
+                L: 154,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1759,7 +1760,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 154,
+                L: 156,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1769,7 +1770,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 157,
+                  L: 159,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1780,7 +1781,7 @@ var InvitationsHandler = class {
               } else {
                 log5.error("failed", err, {
                   F: __dxlog_file7,
-                  L: 160,
+                  L: 162,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1791,12 +1792,12 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 163,
+                L: 165,
                 S: this,
                 C: (f, a) => f(...a)
               });
             } finally {
-              if (type !== Invitation3.Type.MULTIUSE) {
+              if (!multiUse) {
                 await swarmConnection.close();
                 await ctx.dispose();
               }
@@ -1812,7 +1813,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 178,
+              L: 180,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1823,7 +1824,7 @@ var InvitationsHandler = class {
           } else {
             log5.error("failed", err, {
               F: __dxlog_file7,
-              L: 181,
+              L: 183,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1837,7 +1838,7 @@ var InvitationsHandler = class {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
         log5.warn("invitation has already expired", void 0, {
           F: __dxlog_file7,
-          L: 192,
+          L: 194,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1888,7 +1889,7 @@ var InvitationsHandler = class {
     const { timeout = INVITATION_TIMEOUT } = invitation;
     invariant6(protocol, void 0, {
       F: __dxlog_file7,
-      L: 246,
+      L: 248,
       S: this,
       A: [
         "protocol",
@@ -1898,7 +1899,7 @@ var InvitationsHandler = class {
     if (deviceProfile) {
       invariant6(invitation.kind === Invitation3.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file7,
-        L: 250,
+        L: 252,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -1913,7 +1914,7 @@ var InvitationsHandler = class {
     const setState = (newData) => {
       invariant6(newData.state !== void 0, void 0, {
         F: __dxlog_file7,
-        L: 261,
+        L: 263,
         S: this,
         A: [
           "newData.state !== undefined",
@@ -1933,7 +1934,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             F: __dxlog_file7,
-            L: 269,
+            L: 271,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1943,7 +1944,7 @@ var InvitationsHandler = class {
         } else {
           log5.warn("auth failed", err, {
             F: __dxlog_file7,
-            L: 272,
+            L: 274,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1957,7 +1958,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 280,
+        L: 282,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1972,7 +1973,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               F: __dxlog_file7,
-              L: 290,
+              L: 292,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1987,7 +1988,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 299,
+                L: 301,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1999,7 +2000,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 307,
+                L: 309,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2010,7 +2011,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 311,
+                L: 313,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2020,7 +2021,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file7,
-                L: 315,
+                L: 317,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2029,7 +2030,7 @@ var InvitationsHandler = class {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
                   log5("guest waiting for authentication code...", void 0, {
                     F: __dxlog_file7,
-                    L: 321,
+                    L: 323,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -2041,7 +2042,7 @@ var InvitationsHandler = class {
                   });
                   log5("sending authentication request", void 0, {
                     F: __dxlog_file7,
-                    L: 325,
+                    L: 327,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -2062,7 +2063,7 @@ var InvitationsHandler = class {
                         attempt
                       }, {
                         F: __dxlog_file7,
-                        L: 336,
+                        L: 338,
                         S: this,
                         C: (f, a) => f(...a)
                       });
@@ -2075,7 +2076,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 344,
+                L: 346,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2087,7 +2088,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 355,
+                L: 357,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2100,7 +2101,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 357,
+                L: 359,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2110,7 +2111,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 360,
+                  L: 362,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2120,7 +2121,7 @@ var InvitationsHandler = class {
               } else {
                 log5("auth failed", err, {
                   F: __dxlog_file7,
-                  L: 363,
+                  L: 365,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2131,7 +2132,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 366,
+                L: 368,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2149,7 +2150,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 377,
+              L: 379,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2159,7 +2160,7 @@ var InvitationsHandler = class {
           } else {
             log5("auth failed", err, {
               F: __dxlog_file7,
-              L: 380,
+              L: 382,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2176,7 +2177,7 @@ var InvitationsHandler = class {
       } else {
         invariant6(invitation.swarmKey, void 0, {
           F: __dxlog_file7,
-          L: 394,
+          L: 396,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -2215,14 +2216,12 @@ var InvitationsHandler = class {
     return observable;
   }
 };
-var invitationExpired = (invitation) => {
-  return invitation.created && invitation.lifetime && invitation.lifetime !== 0 && invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now();
-};
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-service.ts
 import { Event as Event3, scheduleTask as scheduleTask3 } from "@dxos/async";
 import { Stream as Stream8 } from "@dxos/codec-protobuf";
 import { Context as Context6 } from "@dxos/context";
+import { hasInvitationExpired } from "@dxos/echo-pipeline";
 import { invariant as invariant7 } from "@dxos/invariant";
 import { log as log6 } from "@dxos/log";
 import { Invitation as Invitation4, QueryInvitationsResponse } from "@dxos/protocols/proto/dxos/client/services";
@@ -2281,7 +2280,7 @@ var InvitationsServiceImpl = class {
           await this._metadataStore.removeInvitation(invitation.get().invitationId);
         }
         this._createInvitations.delete(invitation.get().invitationId);
-        if (invitation.get().type !== Invitation4.Type.MULTIUSE) {
+        if (!invitation.get().multiUse) {
           this._removedCreated.emit(invitation.get());
         }
       });
@@ -2289,7 +2288,7 @@ var InvitationsServiceImpl = class {
   }
   async loadPersistentInvitations() {
     const persistentInvitations = this._metadataStore.getInvitations();
-    const freshInvitations = persistentInvitations.filter(async (invitation) => !invitationExpired(invitation));
+    const freshInvitations = persistentInvitations.filter(async (invitation) => !hasInvitationExpired(invitation));
     const cInvitations = freshInvitations.map((persistentInvitation) => {
       invariant7(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
         F: __dxlog_file8,
@@ -2342,7 +2341,7 @@ var InvitationsServiceImpl = class {
       }, () => {
         close();
         this._acceptInvitations.delete(invitation.get().invitationId);
-        if (invitation.get().type !== Invitation4.Type.MULTIUSE) {
+        if (!invitation.get().multiUse) {
           this._removedAccepted.emit(invitation.get());
         }
       });
@@ -4636,7 +4635,7 @@ import { SpaceMember as SpaceMember3 } from "@dxos/protocols/proto/dxos/client/s
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.4.10-main.3c620fb";
+var DXOS_VERSION = "0.4.10-main.3e35a2f";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -5869,7 +5868,6 @@ export {
   IdentityServiceImpl,
   DeviceInvitationProtocol,
   InvitationsHandler,
-  invitationExpired,
   InvitationsServiceImpl,
   SpaceInvitationProtocol,
   ClientRpcServer,
@@ -5889,4 +5887,4 @@ export {
   ClientServicesHost,
   ClientServicesProviderResource
 };
-//# sourceMappingURL=chunk-H2TNTLUE.mjs.map
+//# sourceMappingURL=chunk-S3G2RM7S.mjs.map