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

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

@@ -1 +1 @@
-{"version":3,"file":"invitations-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitations-service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGzD,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,uBAAuB,EAC5B,UAAU,EACV,KAAK,kBAAkB,EACvB,wBAAwB,EACzB,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAqB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEnF;;GAEG;AACH,qBAAa,sBAAuB,YAAW,kBAAkB;IAY7D,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAbjC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA4C;IAC/E,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA+C;IAClF,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA2B;IAC9D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA2B;IAC/D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA2B;IAC3D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA2B;IAC5D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2B;IAClD,OAAO,CAAC,QAAQ,CAAC,iCAAiC,CAAe;IACjE,OAAO,CAAC,4BAA4B,CAAS;gBAG1B,mBAAmB,EAAE,kBAAkB,EACvC,WAAW,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,kBAAkB,EAC3D,cAAc,EAAE,aAAa;IAIhD,iBAAiB;IAMjB,gBAAgB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAoDnD,yBAAyB;;;IAoB/B,gBAAgB,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,uBAAuB,GAAG,MAAM,CAAC,UAAU,CAAC;IAqC/F,YAAY,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9E,gBAAgB,CAAC,EAAE,YAAY,EAAE,EAAE;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBjF,gBAAgB,IAAI,MAAM,CAAC,wBAAwB,CAAC;CA+ErD"}
+{"version":3,"file":"invitations-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/invitations/invitations-service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAG/E,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,uBAAuB,EAC5B,UAAU,EACV,KAAK,kBAAkB,EACvB,wBAAwB,EACzB,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEhE;;GAEG;AACH,qBAAa,sBAAuB,YAAW,kBAAkB;IAY7D,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAbjC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA4C;IAC/E,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA+C;IAClF,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA2B;IAC9D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA2B;IAC/D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA2B;IAC3D,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA2B;IAC5D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2B;IAClD,OAAO,CAAC,QAAQ,CAAC,iCAAiC,CAAe;IACjE,OAAO,CAAC,4BAA4B,CAAS;gBAG1B,mBAAmB,EAAE,kBAAkB,EACvC,WAAW,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,kBAAkB,EAC3D,cAAc,EAAE,aAAa;IAIhD,iBAAiB;IAMjB,gBAAgB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IAoDnD,yBAAyB;;;IAoB/B,gBAAgB,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,uBAAuB,GAAG,MAAM,CAAC,UAAU,CAAC;IAqC/F,YAAY,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9E,gBAAgB,CAAC,EAAE,YAAY,EAAE,EAAE;QAAE,YAAY,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBjF,gBAAgB,IAAI,MAAM,CAAC,wBAAwB,CAAC;CA+ErD"}

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

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.4.10-main.3c620fb";
+export declare const DXOS_VERSION = "0.4.10-main.3e35a2f";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.4.10-main.3c620fb",
+  "version": "0.4.10-main.3e35a2f",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -24,43 +24,43 @@
   "dependencies": {
     "level": "^8.0.1",
     "platform": "^1.3.6",
-    "@dxos/async": "0.4.10-main.3c620fb",
-    "@dxos/client-protocol": "0.4.10-main.3c620fb",
-    "@dxos/codec-protobuf": "0.4.10-main.3c620fb",
-    "@dxos/automerge": "0.4.10-main.3c620fb",
-    "@dxos/config": "0.4.10-main.3c620fb",
-    "@dxos/context": "0.4.10-main.3c620fb",
-    "@dxos/crypto": "0.4.10-main.3c620fb",
-    "@dxos/credentials": "0.4.10-main.3c620fb",
-    "@dxos/echo-db": "0.4.10-main.3c620fb",
-    "@dxos/echo-pipeline": "0.4.10-main.3c620fb",
-    "@dxos/debug": "0.4.10-main.3c620fb",
-    "@dxos/echo-schema": "0.4.10-main.3c620fb",
-    "@dxos/feed-store": "0.4.10-main.3c620fb",
-    "@dxos/indexing": "0.4.10-main.3c620fb",
-    "@dxos/invariant": "0.4.10-main.3c620fb",
-    "@dxos/keyring": "0.4.10-main.3c620fb",
-    "@dxos/keys": "0.4.10-main.3c620fb",
-    "@dxos/lock-file": "0.4.10-main.3c620fb",
-    "@dxos/messaging": "0.4.10-main.3c620fb",
-    "@dxos/network-manager": "0.4.10-main.3c620fb",
-    "@dxos/log": "0.4.10-main.3c620fb",
-    "@dxos/node-std": "0.4.10-main.3c620fb",
-    "@dxos/protocols": "0.4.10-main.3c620fb",
-    "@dxos/random-access-storage": "0.4.10-main.3c620fb",
-    "@dxos/rpc": "0.4.10-main.3c620fb",
-    "@dxos/teleport-extension-gossip": "0.4.10-main.3c620fb",
-    "@dxos/teleport": "0.4.10-main.3c620fb",
-    "@dxos/teleport-extension-object-sync": "0.4.10-main.3c620fb",
-    "@dxos/timeframe": "0.4.10-main.3c620fb",
-    "@dxos/tracing": "0.4.10-main.3c620fb",
-    "@dxos/util": "0.4.10-main.3c620fb",
-    "@dxos/websocket-rpc": "0.4.10-main.3c620fb"
+    "@dxos/async": "0.4.10-main.3e35a2f",
+    "@dxos/client-protocol": "0.4.10-main.3e35a2f",
+    "@dxos/automerge": "0.4.10-main.3e35a2f",
+    "@dxos/codec-protobuf": "0.4.10-main.3e35a2f",
+    "@dxos/config": "0.4.10-main.3e35a2f",
+    "@dxos/credentials": "0.4.10-main.3e35a2f",
+    "@dxos/context": "0.4.10-main.3e35a2f",
+    "@dxos/crypto": "0.4.10-main.3e35a2f",
+    "@dxos/debug": "0.4.10-main.3e35a2f",
+    "@dxos/echo-db": "0.4.10-main.3e35a2f",
+    "@dxos/echo-pipeline": "0.4.10-main.3e35a2f",
+    "@dxos/echo-schema": "0.4.10-main.3e35a2f",
+    "@dxos/feed-store": "0.4.10-main.3e35a2f",
+    "@dxos/indexing": "0.4.10-main.3e35a2f",
+    "@dxos/keys": "0.4.10-main.3e35a2f",
+    "@dxos/invariant": "0.4.10-main.3e35a2f",
+    "@dxos/lock-file": "0.4.10-main.3e35a2f",
+    "@dxos/keyring": "0.4.10-main.3e35a2f",
+    "@dxos/log": "0.4.10-main.3e35a2f",
+    "@dxos/network-manager": "0.4.10-main.3e35a2f",
+    "@dxos/messaging": "0.4.10-main.3e35a2f",
+    "@dxos/protocols": "0.4.10-main.3e35a2f",
+    "@dxos/node-std": "0.4.10-main.3e35a2f",
+    "@dxos/random-access-storage": "0.4.10-main.3e35a2f",
+    "@dxos/rpc": "0.4.10-main.3e35a2f",
+    "@dxos/teleport": "0.4.10-main.3e35a2f",
+    "@dxos/teleport-extension-gossip": "0.4.10-main.3e35a2f",
+    "@dxos/teleport-extension-object-sync": "0.4.10-main.3e35a2f",
+    "@dxos/timeframe": "0.4.10-main.3e35a2f",
+    "@dxos/tracing": "0.4.10-main.3e35a2f",
+    "@dxos/util": "0.4.10-main.3e35a2f",
+    "@dxos/websocket-rpc": "0.4.10-main.3e35a2f"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.4.10-main.3c620fb"
+    "@dxos/signal": "0.4.10-main.3e35a2f"
   },
   "publishConfig": {
     "access": "public"

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

@@ -76,7 +76,8 @@ export class InvitationsHandler {
       swarmKey = PublicKey.random(),
       persistent = true,
       created = new Date(),
-      lifetime = 86400, // 1 day
+      lifetime = 86400, // 1 day,
+      multiUse = false,
     } = options ?? {};
     const authCode =
       options?.authCode ??
@@ -91,9 +92,10 @@ export class InvitationsHandler {
       swarmKey,
       authCode,
       timeout,
-      persistent,
+      persistent: persistent && type !== Invitation.Type.OFFLINE, // offline invitations are persisted in control feed
       created,
       lifetime,
+      multiUse,
       ...protocol.getInvitationContext(),
     };
 
@@ -162,7 +164,7 @@ export class InvitationsHandler {
               }
               log.trace('dxos.sdk.invitations-handler.host.onOpen', trace.error({ id: traceId, error: err }));
             } finally {
-              if (type !== Invitation.Type.MULTIUSE) {
+              if (!multiUse) {
                 // Wait for graceful close before disposing.
                 await swarmConnection.close();
                 await ctx.dispose();
@@ -424,12 +426,3 @@ export class InvitationsHandler {
     return observable;
   }
 }
-
-export const invitationExpired = (invitation: Invitation) => {
-  return (
-    invitation.created &&
-    invitation.lifetime &&
-    invitation.lifetime !== 0 &&
-    invitation.created.getTime() + invitation.lifetime * 1000 < Date.now()
-  );
-};

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

@@ -6,7 +6,7 @@ import { Event, scheduleTask } from '@dxos/async';
 import { type AuthenticatingInvitation, type CancellableInvitation } from '@dxos/client-protocol';
 import { Stream } from '@dxos/codec-protobuf';
 import { Context } from '@dxos/context';
-import { type MetadataStore } from '@dxos/echo-pipeline';
+import { hasInvitationExpired, type MetadataStore } from '@dxos/echo-pipeline';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import {
@@ -18,7 +18,7 @@ import {
 } from '@dxos/protocols/proto/dxos/client/services';
 
 import { type InvitationProtocol } from './invitation-protocol';
-import { invitationExpired, type InvitationsHandler } from './invitations-handler';
+import { type InvitationsHandler } from './invitations-handler';
 
 /**
  * Adapts invitation service observable to client/service stream.
@@ -91,7 +91,7 @@ export class InvitationsServiceImpl implements InvitationsService {
           }
 
           this._createInvitations.delete(invitation.get().invitationId);
-          if (invitation.get().type !== Invitation.Type.MULTIUSE) {
+          if (!invitation.get().multiUse) {
             this._removedCreated.emit(invitation.get());
           }
         },
@@ -103,7 +103,7 @@ export class InvitationsServiceImpl implements InvitationsService {
     const persistentInvitations = this._metadataStore.getInvitations();
 
     // get saved persistent invitations, filter and remove from storage those that have expired.
-    const freshInvitations = persistentInvitations.filter(async (invitation) => !invitationExpired(invitation));
+    const freshInvitations = persistentInvitations.filter(async (invitation) => !hasInvitationExpired(invitation));
 
     const cInvitations = freshInvitations.map((persistentInvitation) => {
       invariant(!this._createInvitations.get(persistentInvitation.invitationId), 'invitation already exists');
@@ -148,7 +148,7 @@ export class InvitationsServiceImpl implements InvitationsService {
         () => {
           close();
           this._acceptInvitations.delete(invitation.get().invitationId);
-          if (invitation.get().type !== Invitation.Type.MULTIUSE) {
+          if (!invitation.get().multiUse) {
             this._removedAccepted.emit(invitation.get());
           }
         },

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.4.10-main.3c620fb";
+export const DXOS_VERSION = "0.4.10-main.3e35a2f";