@dxos/client-services 0.6.14-main.f49f251 → 0.6.14-staging.3e2eaca

package/dist/lib/node-esm/{chunk-4NBD4YSD.mjs → chunk-POX3HG6I.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.6.14-main.f49f251";
+var DXOS_VERSION = "0.6.14-staging.3e2eaca";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -831,7 +831,7 @@ var EdgeFeedReplicator = class extends Resource {
       S: this,
       C: (f, a) => f(...a)
     });
-    this._ctx.onDispose(this._messenger.addListener((message) => {
+    this._ctx.onDispose(this._messenger.onMessage((message) => {
       if (!message.serviceId) {
         return;
       }
@@ -865,10 +865,12 @@ var EdgeFeedReplicator = class extends Resource {
       });
       this._onMessage(payload);
     }));
-    this._messenger.connected.on(this._ctx, async () => {
-      await this._resetConnection();
-      this._startReplication();
-    });
+    this._ctx.onDispose(this._messenger.onReconnected(() => {
+      scheduleMicroTask(this._ctx, () => this._handleReconnect());
+    }));
+  }
+  async _handleReconnect() {
+    await this._resetConnection();
     if (this._messenger.isConnected) {
       this._startReplication();
     }
@@ -876,7 +878,7 @@ var EdgeFeedReplicator = class extends Resource {
   async _close() {
     log3("close", void 0, {
       F: __dxlog_file5,
-      L: 91,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -888,7 +890,7 @@ var EdgeFeedReplicator = class extends Resource {
     this._connectionCtx = connectionCtx;
     log3("connection context created", void 0, {
       F: __dxlog_file5,
-      L: 99,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -901,7 +903,7 @@ var EdgeFeedReplicator = class extends Resource {
   async _resetConnection() {
     log3("resetConnection", void 0, {
       F: __dxlog_file5,
-      L: 108,
+      L: 112,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -917,7 +919,7 @@ var EdgeFeedReplicator = class extends Resource {
       hasConnectionCtx: !!this._connectionCtx
     }, {
       F: __dxlog_file5,
-      L: 116,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -934,7 +936,7 @@ var EdgeFeedReplicator = class extends Resource {
       key: feed.key
     }, {
       F: __dxlog_file5,
-      L: 129,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -950,7 +952,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log3.info("message dropped because connection was disposed", void 0, {
         F: __dxlog_file5,
-        L: 142,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -964,13 +966,13 @@ var EdgeFeedReplicator = class extends Resource {
     };
     log3.info("sending message", logPayload, {
       F: __dxlog_file5,
-      L: 148,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(message.feedKey, void 0, {
       F: __dxlog_file5,
-      L: 150,
+      L: 154,
       S: this,
       A: [
         "message.feedKey",
@@ -982,7 +984,7 @@ var EdgeFeedReplicator = class extends Resource {
       type: message.type
     }, {
       F: __dxlog_file5,
-      L: 153,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1001,7 +1003,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log3.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file5,
-        L: 168,
+        L: 172,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1016,7 +1018,7 @@ var EdgeFeedReplicator = class extends Resource {
               message
             }, {
               F: __dxlog_file5,
-              L: 174,
+              L: 178,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1027,7 +1029,7 @@ var EdgeFeedReplicator = class extends Resource {
                 feedKey
               }, {
                 F: __dxlog_file5,
-                L: 179,
+                L: 183,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1060,7 +1062,7 @@ var EdgeFeedReplicator = class extends Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file5,
-            L: 201,
+            L: 205,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1071,7 +1073,7 @@ var EdgeFeedReplicator = class extends Resource {
               feedKey
             }, {
               F: __dxlog_file5,
-              L: 206,
+              L: 210,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1085,7 +1087,7 @@ var EdgeFeedReplicator = class extends Resource {
             ...message
           }, {
             F: __dxlog_file5,
-            L: 215,
+            L: 219,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1100,7 +1102,7 @@ var EdgeFeedReplicator = class extends Resource {
       to
     }, {
       F: __dxlog_file5,
-      L: 222,
+      L: 226,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1110,7 +1112,7 @@ var EdgeFeedReplicator = class extends Resource {
       });
       invariant2(data instanceof Uint8Array, void 0, {
         F: __dxlog_file5,
-        L: 227,
+        L: 231,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1138,7 +1140,7 @@ var EdgeFeedReplicator = class extends Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file5,
-      L: 248,
+      L: 252,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1160,7 +1162,7 @@ var EdgeFeedReplicator = class extends Resource {
       if (!this._remoteLength.has(feed.key)) {
         log3("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file5,
-          L: 269,
+          L: 273,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1185,7 +1187,7 @@ var EdgeFeedReplicator = class extends Resource {
         if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
           log3("resetting on reconnect", void 0, {
             F: __dxlog_file5,
-            L: 286,
+            L: 290,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1196,7 +1198,7 @@ var EdgeFeedReplicator = class extends Resource {
       }
     }, {
       F: __dxlog_file5,
-      L: 280
+      L: 284
     });
     return connectionCtx;
   }
@@ -4759,6 +4761,7 @@ var tryAcquireBeforeContextDisposed = async (ctx, mutex) => {
 
 // packages/sdk/client-services/src/packlets/invitations/edge-invitation-handler.ts
 var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/edge-invitation-handler.ts";
+var MAX_RETRIES_PER_INVITATION = 5;
 var DEFAULT_REQUEST_RETRY_INTERVAL_MS = 3e3;
 var DEFAULT_REQUEST_RETRY_JITTER_MS = 500;
 var EdgeInvitationHandler = class {
@@ -4772,7 +4775,7 @@ var EdgeInvitationHandler = class {
     if (!this._client) {
       log13("edge disabled", void 0, {
         F: __dxlog_file16,
-        L: 65,
+        L: 66,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4786,7 +4789,7 @@ var EdgeInvitationHandler = class {
         invitation
       }, {
         F: __dxlog_file16,
-        L: 79,
+        L: 80,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4796,7 +4799,9 @@ var EdgeInvitationHandler = class {
       this._flowLock?.release();
       this._flowLock = void 0;
     });
+    let requestCount = 0;
     const tryHandleInvitation = async () => {
+      requestCount++;
       const admissionRequest = await protocol.createAdmissionRequest(deviceProfile);
       if (admissionRequest.space) {
         try {
@@ -4809,19 +4814,19 @@ var EdgeInvitationHandler = class {
               after: error.retryAfterMs ?? this._calculateNextRetryMs()
             }, {
               F: __dxlog_file16,
-              L: 95,
+              L: 98,
               S: this,
               C: (f, a) => f(...a)
             });
-            if (error.isRetryable) {
+            if (error.isRetryable && requestCount < MAX_RETRIES_PER_INVITATION) {
               scheduleTask5(ctx, tryHandleInvitation, error.retryAfterMs ?? this._calculateNextRetryMs());
             }
-          } else {
+          } else if (requestCount < MAX_RETRIES_PER_INVITATION) {
             log13.info("failed to handle invitation with edge", {
               error
             }, {
               F: __dxlog_file16,
-              L: 104,
+              L: 107,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -4836,14 +4841,14 @@ var EdgeInvitationHandler = class {
     try {
       log13("edge invitation flow", void 0, {
         F: __dxlog_file16,
-        L: 120,
+        L: 123,
         S: this,
         C: (f, a) => f(...a)
       });
       this._flowLock = await tryAcquireBeforeContextDisposed(ctx, guardedState.mutex);
-      log13("edge invitation flow acquired the lock", void 0, {
+      log13.verbose("edge invitation flow acquired the lock", void 0, {
         F: __dxlog_file16,
-        L: 122,
+        L: 125,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4876,7 +4881,7 @@ var EdgeInvitationHandler = class {
   async _joinSpaceByInvitation(guardedState, spaceId, request) {
     invariant11(this._client, void 0, {
       F: __dxlog_file16,
-      L: 157,
+      L: 160,
       S: this,
       A: [
         "this._client",
@@ -4974,14 +4979,14 @@ var InvitationGuestExtension = class extends RpcExtension2 {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      log14("guest acquire lock", void 0, {
+      log14.verbose("guest acquire lock", void 0, {
         F: __dxlog_file17,
         L: 89,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      log14("guest lock acquired", void 0, {
+      log14.verbose("guest lock acquired", void 0, {
         F: __dxlog_file17,
         L: 91,
         S: this,
@@ -4990,7 +4995,7 @@ var InvitationGuestExtension = class extends RpcExtension2 {
       await cancelWithContext4(this._ctx, this.rpc.InvitationHostService.options({
         role: InvitationOptions.Role.GUEST
       }));
-      log14("options sent", void 0, {
+      log14.verbose("options sent", void 0, {
         F: __dxlog_file17,
         L: 96,
         S: this,
@@ -4999,7 +5004,7 @@ var InvitationGuestExtension = class extends RpcExtension2 {
       await cancelWithContext4(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT
       }));
-      log14("options received", void 0, {
+      log14.verbose("options received", void 0, {
         F: __dxlog_file17,
         L: 98,
         S: this,
@@ -5033,7 +5038,7 @@ var InvitationGuestExtension = class extends RpcExtension2 {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock.release();
       this._invitationFlowLock = null;
-      log14("invitation flow lock released", void 0, {
+      log14.verbose("invitation flow lock released", void 0, {
         F: __dxlog_file17,
         L: 131,
         S: this,
@@ -5132,7 +5137,7 @@ var InvitationHostExtension = class extends RpcExtension3 {
               authMethod: Invitation5.AuthMethod.NONE
             };
           }
-          log15("guest introduced themselves", {
+          log15.verbose("guest introduced themselves", {
             guestProfile: profile
           }, {
             F: __dxlog_file18,
@@ -5167,7 +5172,7 @@ var InvitationHostExtension = class extends RpcExtension3 {
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
-          log15("received authentication request", {
+          log15.verbose("received authentication request", {
             authCode: code
           }, {
             F: __dxlog_file18,
@@ -5295,41 +5300,39 @@ var InvitationHostExtension = class extends RpcExtension3 {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      log15("host acquire lock", void 0, {
+      log15.verbose("host acquire lock", void 0, {
         F: __dxlog_file18,
         L: 239,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      log15("host lock acquired", void 0, {
+      log15.verbose("host lock acquired", void 0, {
         F: __dxlog_file18,
         L: 241,
         S: this,
         C: (f, a) => f(...a)
       });
-      const lastState = this._requireActiveInvitation().state;
       this._callbacks.onStateUpdate(Invitation5.State.CONNECTING);
       await this.rpc.InvitationHostService.options({
         role: InvitationOptions2.Role.HOST
       });
-      log15("options sent", void 0, {
+      log15.verbose("options sent", void 0, {
         F: __dxlog_file18,
-        L: 245,
+        L: 244,
         S: this,
         C: (f, a) => f(...a)
       });
       await cancelWithContext5(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT2
       }));
-      log15("options received", void 0, {
+      log15.verbose("options received", void 0, {
         F: __dxlog_file18,
-        L: 247,
+        L: 246,
         S: this,
         C: (f, a) => f(...a)
       });
       if (this._remoteOptions?.role !== InvitationOptions2.Role.GUEST) {
-        this._callbacks.onStateUpdate(lastState);
         throw new InvalidInvitationExtensionRoleError2(void 0, {
           expected: InvitationOptions2.Role.GUEST,
           remoteOptions: this._remoteOptions,
@@ -5376,9 +5379,9 @@ var InvitationHostExtension = class extends RpcExtension3 {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock?.release();
       this._invitationFlowLock = null;
-      log15("invitation flow lock released", void 0, {
+      log15.verbose("invitation flow lock released", void 0, {
         F: __dxlog_file18,
-        L: 302,
+        L: 299,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5586,7 +5589,7 @@ var InvitationsHandler = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    metrics.increment("dxos.invitation.created");
+    metrics.increment("dxos.invitation.host");
     const guardedState = createGuardedInvitationState(ctx, invitation, stream);
     const createExtension = () => {
       const extension = new InvitationHostExtension(guardedState.mutex, {
@@ -5594,7 +5597,9 @@ var InvitationsHandler = class {
           return ctx.disposed ? null : guardedState.current;
         },
         onStateUpdate: (newState) => {
-          guardedState.set(extension, newState);
+          if (newState !== Invitation7.State.ERROR && newState !== Invitation7.State.TIMEOUT) {
+            guardedState.set(extension, newState);
+          }
           return guardedState.current;
         },
         admit: async (admissionRequest) => {
@@ -5604,14 +5609,14 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file21,
-              L: 105,
+              L: 107,
               S: this,
               C: (f, a) => f(...a)
             });
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             invariant15(deviceKey, void 0, {
               F: __dxlog_file21,
-              L: 110,
+              L: 112,
               S: this,
               A: [
                 "deviceKey",
@@ -5630,7 +5635,7 @@ var InvitationsHandler = class {
           let admitted = false;
           connectionCtx.onDispose(() => {
             if (!admitted) {
-              guardedState.error(extension, new ContextDisposedError3());
+              guardedState.set(extension, Invitation7.State.CONNECTING);
             }
           });
           scheduleTask7(connectionCtx, async () => {
@@ -5640,27 +5645,27 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file21,
-                L: 135,
+                L: 137,
                 S: this,
                 C: (f, a) => f(...a)
               });
-              log18("connected", {
+              log18.verbose("connected", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 136,
+                L: 138,
                 S: this,
                 C: (f, a) => f(...a)
               });
               const deviceKey = await extension.completedTrigger.wait({
                 timeout: invitation.timeout
               });
-              log18("admitted guest", {
+              log18.verbose("admitted guest", {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 138,
+                L: 140,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5670,7 +5675,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file21,
-                L: 141,
+                L: 143,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5679,24 +5684,25 @@ var InvitationsHandler = class {
                 await ctx.dispose();
               }
             } catch (err) {
+              const stateChanged = guardedState.set(extension, Invitation7.State.CONNECTING);
               if (err instanceof TimeoutError2) {
-                if (guardedState.set(extension, Invitation7.State.TIMEOUT)) {
+                if (stateChanged) {
                   metrics.increment("dxos.invitation.timeout");
-                  log18("timeout", {
+                  log18.verbose("timeout", {
                     ...protocol.toJSON()
                   }, {
                     F: __dxlog_file21,
-                    L: 151,
+                    L: 154,
                     S: this,
                     C: (f, a) => f(...a)
                   });
                 }
               } else {
-                if (guardedState.error(extension, err)) {
+                if (stateChanged) {
                   metrics.increment("dxos.invitation.failed");
                   log18.error("failed", err, {
                     F: __dxlog_file21,
-                    L: 156,
+                    L: 159,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -5707,7 +5713,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file21,
-                L: 159,
+                L: 162,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5716,35 +5722,36 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
+          const stateChanged = guardedState.set(extension, Invitation7.State.CONNECTING);
           if (err instanceof InvalidInvitationExtensionRoleError3) {
             log18("invalid role", {
               ...err.context
             }, {
               F: __dxlog_file21,
-              L: 167,
+              L: 171,
               S: this,
               C: (f, a) => f(...a)
             });
             return;
           }
           if (err instanceof TimeoutError2) {
-            if (guardedState.set(extension, Invitation7.State.TIMEOUT)) {
+            if (stateChanged) {
               metrics.increment("dxos.invitation.timeout");
-              log18("timeout", {
+              log18.verbose("timeout", {
                 err
               }, {
                 F: __dxlog_file21,
-                L: 173,
+                L: 177,
                 S: this,
                 C: (f, a) => f(...a)
               });
             }
           } else {
-            if (guardedState.error(extension, err)) {
+            if (stateChanged) {
               metrics.increment("dxos.invitation.failed");
               log18.error("failed", err, {
                 F: __dxlog_file21,
-                L: 178,
+                L: 182,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5758,18 +5765,25 @@ var InvitationsHandler = class {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
         log18.warn("invitation has already expired", void 0, {
           F: __dxlog_file21,
-          L: 189,
+          L: 193,
           S: this,
           C: (f, a) => f(...a)
         });
-      } else {
-        scheduleTask7(ctx, async () => {
-          await swarmConnection.close();
-          guardedState.set(null, Invitation7.State.EXPIRED);
-          metrics.increment("dxos.invitation.expired");
-          await ctx.dispose();
-        }, invitation.created.getTime() + invitation.lifetime * 1e3 - Date.now());
+        guardedState.set(null, Invitation7.State.EXPIRED);
+        void ctx.dispose().catch((err) => log18.catch(err, void 0, {
+          F: __dxlog_file21,
+          L: 195,
+          S: this,
+          C: (f, a) => f(...a)
+        }));
+        return;
       }
+      scheduleTask7(ctx, async () => {
+        await swarmConnection.close();
+        guardedState.set(null, Invitation7.State.EXPIRED);
+        metrics.increment("dxos.invitation.expired");
+        await ctx.dispose();
+      }, invitation.created.getTime() + invitation.lifetime * 1e3 - Date.now());
     }
     let swarmConnection;
     scheduleTask7(ctx, async () => {
@@ -5785,7 +5799,7 @@ var InvitationsHandler = class {
       type: invitation.type
     }, {
       F: __dxlog_file21,
-      L: 220,
+      L: 226,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5793,7 +5807,7 @@ var InvitationsHandler = class {
     if (deviceProfile) {
       invariant15(invitation.kind === Invitation7.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file21,
-        L: 229,
+        L: 235,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -5811,7 +5825,7 @@ var InvitationsHandler = class {
         triedPeers: triedPeersIds.size
       }, {
         F: __dxlog_file21,
-        L: 237,
+        L: 243,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5833,12 +5847,12 @@ var InvitationsHandler = class {
             return;
           }
           connectionCtx.onDispose(async () => {
-            log18("extension disposed", {
+            log18.verbose("extension disposed", {
               admitted,
               currentState: guardedState.current.state
             }, {
               F: __dxlog_file21,
-              L: 265,
+              L: 271,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5856,7 +5870,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file21,
-                L: 277,
+                L: 283,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5868,7 +5882,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 288,
+                L: 294,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5878,7 +5892,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 292,
+                L: 298,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5892,7 +5906,7 @@ var InvitationsHandler = class {
                 authMethod: introductionResponse.authMethod
               }, {
                 F: __dxlog_file21,
-                L: 300,
+                L: 306,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5914,7 +5928,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 330,
+                L: 336,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5927,7 +5941,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 344,
+                L: 350,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5940,25 +5954,25 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file21,
-                L: 353,
+                L: 359,
                 S: this,
                 C: (f, a) => f(...a)
               });
             } catch (err) {
               if (err instanceof TimeoutError2) {
-                log18("timeout", {
+                log18.verbose("timeout", {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file21,
-                  L: 356,
+                  L: 362,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 guardedState.set(extension, Invitation7.State.TIMEOUT);
               } else {
-                log18("auth failed", err, {
+                log18.verbose("auth failed", err, {
                   F: __dxlog_file21,
-                  L: 359,
+                  L: 365,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -5970,7 +5984,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file21,
-                L: 363,
+                L: 369,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5982,19 +5996,19 @@ var InvitationsHandler = class {
             return;
           }
           if (err instanceof TimeoutError2) {
-            log18("timeout", {
+            log18.verbose("timeout", {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file21,
-              L: 372,
+              L: 378,
               S: this,
               C: (f, a) => f(...a)
             });
             guardedState.set(extension, Invitation7.State.TIMEOUT);
           } else {
-            log18("auth failed", err, {
+            log18.verbose("auth failed", err, {
               F: __dxlog_file21,
-              L: 375,
+              L: 381,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -6011,7 +6025,7 @@ var InvitationsHandler = class {
           ...protocol.toJSON()
         }, {
           F: __dxlog_file21,
-          L: 387,
+          L: 393,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -6031,7 +6045,7 @@ var InvitationsHandler = class {
       } else {
         invariant15(invitation.swarmKey, void 0, {
           F: __dxlog_file21,
-          L: 399,
+          L: 405,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -6075,7 +6089,7 @@ var InvitationsHandler = class {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       log18("guest waiting for authentication code...", void 0, {
         F: __dxlog_file21,
-        L: 451,
+        L: 457,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6083,7 +6097,7 @@ var InvitationsHandler = class {
       const authCode = await authenticated.wait(options);
       log18("sending authentication request", void 0, {
         F: __dxlog_file21,
-        L: 455,
+        L: 461,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6102,7 +6116,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file21,
-            L: 466,
+            L: 472,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6120,7 +6134,7 @@ var InvitationsHandler = class {
     }
     log18("sending authentication request", void 0, {
       F: __dxlog_file21,
-      L: 485,
+      L: 491,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6144,6 +6158,7 @@ var createAdmissionKeypair = () => {
 // packages/sdk/client-services/src/packlets/invitations/invitations-service.ts
 import { Stream as Stream9 } from "@dxos/codec-protobuf";
 import { QueryInvitationsResponse } from "@dxos/protocols/proto/dxos/client/services";
+import { trace as trace8 } from "@dxos/tracing";
 var InvitationsServiceImpl = class {
   constructor(_invitationsManager) {
     this._invitationsManager = _invitationsManager;
@@ -6154,7 +6169,10 @@ var InvitationsServiceImpl = class {
   }
   createInvitation(options) {
     return new Stream9(({ next, close }) => {
-      void this._invitationsManager.createInvitation(options).then((invitation) => invitation.subscribe(next, close, close)).catch(close);
+      void this._invitationsManager.createInvitation(options).then((invitation) => {
+        trace8.metrics.increment("dxos.invitation.created");
+        invitation.subscribe(next, close, close);
+      }).catch(close);
     });
   }
   acceptInvitation(request) {
@@ -6732,8 +6750,8 @@ var InvitationsManager = class {
       this._persistentInvitationsLoadedEvent.once(ctx, () => callback());
     }
   }
-  _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 ?? {};
+  _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 authCode = options?.authCode ?? (authMethod === Invitation9.AuthMethod.SHARED_SECRET ? generatePasscode(AUTHENTICATION_CODE_LENGTH) : void 0);
     return {
       invitationId,
@@ -6750,6 +6768,7 @@ var InvitationsManager = class {
       role,
       multiUse,
       delegationCredentialId: options?.delegationCredentialId,
+      ...options,
       ...protocol.getInvitationContext()
     };
   }
@@ -6762,14 +6781,14 @@ var InvitationsManager = class {
       }
     }, {
       F: __dxlog_file23,
-      L: 234
+      L: 236
     });
     ctx.onDispose(() => {
       log20("complete", {
         ...handler.toJSON()
       }, {
         F: __dxlog_file23,
-        L: 241,
+        L: 243,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6802,7 +6821,7 @@ var InvitationsManager = class {
             ...handler.toJSON()
           }, {
             F: __dxlog_file23,
-            L: 261,
+            L: 263,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6813,7 +6832,7 @@ var InvitationsManager = class {
         } else {
           log20.warn("auth failed", err, {
             F: __dxlog_file23,
-            L: 264,
+            L: 266,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6826,14 +6845,14 @@ var InvitationsManager = class {
       }
     }, {
       F: __dxlog_file23,
-      L: 258
+      L: 260
     });
     ctx.onDispose(() => {
       log20("complete", {
         ...handler.toJSON()
       }, {
         F: __dxlog_file23,
-        L: 271,
+        L: 273,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6878,7 +6897,7 @@ var InvitationsManager = class {
     } catch (err) {
       log20.catch(err, void 0, {
         F: __dxlog_file23,
-        L: 307,
+        L: 309,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6950,7 +6969,7 @@ var isLocked = (lockPath) => LockFile.isLocked(lockPath);
 import { Stream as Stream10 } from "@dxos/codec-protobuf";
 import { raise as raise2 } from "@dxos/debug";
 import { parseMethodName, RpcPeer } from "@dxos/rpc";
-import { MapCounter, trace as trace8 } from "@dxos/tracing";
+import { MapCounter, trace as trace9 } from "@dxos/tracing";
 function _ts_decorate8(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -7014,13 +7033,13 @@ var ClientRpcServer = class {
   }
 };
 _ts_decorate8([
-  trace8.metricsCounter()
+  trace9.metricsCounter()
 ], ClientRpcServer.prototype, "_callMetrics", void 0);
 _ts_decorate8([
-  trace8.info()
+  trace9.info()
 ], ClientRpcServer.prototype, "_services", null);
 ClientRpcServer = _ts_decorate8([
-  trace8.resource()
+  trace9.resource()
 ], ClientRpcServer);
 
 // packages/sdk/client-services/src/packlets/agents/edge-agent-manager.ts
@@ -7295,7 +7314,7 @@ import { invariant as invariant21 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
 import { PublicKey as PublicKey15 } from "@dxos/keys";
 import { log as log24 } from "@dxos/log";
-import { InvalidStorageVersionError, STORAGE_VERSION as STORAGE_VERSION2, trace as trace9 } from "@dxos/protocols";
+import { InvalidStorageVersionError, STORAGE_VERSION as STORAGE_VERSION2, trace as trace10 } from "@dxos/protocols";
 import { Invitation as Invitation10 } from "@dxos/protocols/proto/dxos/client/services";
 import { BlobStore } from "@dxos/teleport-extension-object-sync";
 import { trace as Trace3 } from "@dxos/tracing";
@@ -7553,7 +7572,7 @@ var ServiceContext = class extends Resource7 {
       S: this,
       C: (f, a) => f(...a)
     });
-    log24.trace("dxos.sdk.service-context.open", trace9.begin({
+    log24.trace("dxos.sdk.service-context.open", trace10.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file27,
@@ -7588,7 +7607,7 @@ var ServiceContext = class extends Resource7 {
       S: this,
       C: (f, a) => f(...a)
     });
-    log24.trace("dxos.sdk.service-context.open", trace9.end({
+    log24.trace("dxos.sdk.service-context.open", trace10.end({
       id: this._instanceId
     }), {
       F: __dxlog_file27,
@@ -7808,8 +7827,8 @@ var ServiceContext = class extends Resource7 {
           S: this,
           C: (f, a) => f(...a)
         });
-        if (params?.deviceCredential) {
-          edgeIdentity = await createChainEdgeIdentity(identity.signer, identity.identityKey, identity.deviceKey, {
+        if (params?.deviceCredential || Boolean(globalThis?.DEVICE_INVITE_INTEROP)) {
+          edgeIdentity = await createChainEdgeIdentity(identity.signer, identity.identityKey, identity.deviceKey, params?.deviceCredential && {
             credential: params.deviceCredential
           }, []);
         } else {
@@ -8121,7 +8140,7 @@ import { PublicKey as PublicKey19 } from "@dxos/keys";
 import { log as log27 } from "@dxos/log";
 import { EdgeSignalManager, WebsocketSignalManager } from "@dxos/messaging";
 import { SwarmNetworkManager, createIceProvider, createRtcTransportFactory } from "@dxos/network-manager";
-import { trace as trace10 } from "@dxos/protocols";
+import { trace as trace11 } from "@dxos/protocols";
 import { SystemStatus } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR as TRACE_PROCESSOR3, trace as Trace4 } from "@dxos/tracing";
 import { WebsocketRpcClient } from "@dxos/websocket-rpc";
@@ -8133,8 +8152,9 @@ import { invariant as invariant23 } from "@dxos/invariant";
 import { Device as Device2, DeviceKind as DeviceKind2 } from "@dxos/protocols/proto/dxos/client/services";
 var __dxlog_file29 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
-  constructor(_identityManager) {
+  constructor(_identityManager, _edgeConnection) {
     this._identityManager = _identityManager;
+    this._edgeConnection = _edgeConnection;
   }
   async updateDevice(profile) {
     return this._identityManager.updateDeviceProfile(profile);
@@ -8150,7 +8170,7 @@ var DevicesServiceImpl = class {
         } else {
           invariant23(this._identityManager.identity?.presence, "presence not present", {
             F: __dxlog_file29,
-            L: 32,
+            L: 36,
             S: this,
             A: [
               "this._identityManager.identity?.presence",
@@ -8161,12 +8181,19 @@ var DevicesServiceImpl = class {
           next({
             devices: Array.from(deviceKeys.entries()).map(([key, profile]) => {
               const isMe = this._identityManager.identity?.deviceKey.equals(key);
-              const peerState = peers.find((peer) => peer.identityKey.equals(key));
+              let presence;
+              if (isMe) {
+                presence = Device2.PresenceState.ONLINE;
+              } else if (profile.os?.toUpperCase() === "EDGE") {
+                presence = this._edgeConnection?.isConnected ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
+              } else {
+                presence = peers.some((peer) => peer.identityKey.equals(key)) ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
+              }
               return {
                 deviceKey: key,
                 kind: this._identityManager.identity?.deviceKey.equals(key) ? DeviceKind2.CURRENT : DeviceKind2.TRUSTED,
                 profile,
-                presence: isMe ? Device2.PresenceState.ONLINE : peerState ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE
+                presence
               };
             })
           });
@@ -8690,7 +8717,7 @@ var ClientServicesHost = class {
       return;
     }
     const traceId = PublicKey19.random().toHex();
-    log27.trace("dxos.client-services.host.open", trace10.begin({
+    log27.trace("dxos.client-services.host.open", trace11.begin({
       id: traceId
     }), {
       F: __dxlog_file30,
@@ -8764,7 +8791,7 @@ var ClientServicesHost = class {
       IdentityService: identityService,
       ContactsService: new ContactsServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, dataSpaceManagerProvider),
       InvitationsService: new InvitationsServiceImpl(this._serviceContext.invitationsManager),
-      DevicesService: new DevicesServiceImpl(this._serviceContext.identityManager),
+      DevicesService: new DevicesServiceImpl(this._serviceContext.identityManager, this._edgeConnection),
       SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, dataSpaceManagerProvider),
       DataService: this._serviceContext.echoHost.dataService,
       QueryService: this._serviceContext.echoHost.queryService,
@@ -8804,7 +8831,7 @@ var ClientServicesHost = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    log27.trace("dxos.client-services.host.open", trace10.end({
+    log27.trace("dxos.client-services.host.open", trace11.end({
       id: traceId
     }), {
       F: __dxlog_file30,
@@ -8847,7 +8874,7 @@ var ClientServicesHost = class {
   }
   async reset() {
     const traceId = PublicKey19.random().toHex();
-    log27.trace("dxos.sdk.client-services-host.reset", trace10.begin({
+    log27.trace("dxos.sdk.client-services-host.reset", trace11.begin({
       id: traceId
     }), {
       F: __dxlog_file30,
@@ -8871,7 +8898,7 @@ var ClientServicesHost = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    log27.trace("dxos.sdk.client-services-host.reset", trace10.end({
+    log27.trace("dxos.sdk.client-services-host.reset", trace11.end({
       id: traceId
     }), {
       F: __dxlog_file30,
@@ -8953,4 +8980,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-4NBD4YSD.mjs.map
+//# sourceMappingURL=chunk-POX3HG6I.mjs.map