@dxos/client-services 0.6.14-staging.e15392e → 0.7.0

package/dist/lib/node/{chunk-4BJB67XI.cjs → chunk-3ERQHVZE.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_4BJB67XI_exports = {};
-__export(chunk_4BJB67XI_exports, {
+var chunk_3ERQHVZE_exports = {};
+__export(chunk_3ERQHVZE_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -72,7 +72,7 @@ __export(chunk_4BJB67XI_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_4BJB67XI_exports);
+module.exports = __toCommonJS(chunk_3ERQHVZE_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -277,6 +277,7 @@ var import_invitations5 = require("@dxos/protocols/proto/dxos/halo/invitations")
 var import_util11 = require("@dxos/util");
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
 var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
+var import_tracing9 = require("@dxos/tracing");
 var import_credentials18 = require("@dxos/credentials");
 var import_feed_store5 = require("@dxos/feed-store");
 var import_invariant17 = require("@dxos/invariant");
@@ -300,7 +301,7 @@ var import_log21 = require("@dxos/log");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_debug4 = require("@dxos/debug");
 var import_rpc = require("@dxos/rpc");
-var import_tracing9 = require("@dxos/tracing");
+var import_tracing10 = require("@dxos/tracing");
 var import_async21 = require("@dxos/async");
 var import_context15 = require("@dxos/context");
 var import_invariant20 = require("@dxos/invariant");
@@ -325,7 +326,7 @@ var import_log23 = require("@dxos/log");
 var import_protocols16 = require("@dxos/protocols");
 var import_services21 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
-var import_tracing10 = require("@dxos/tracing");
+var import_tracing11 = require("@dxos/tracing");
 var import_util12 = require("@dxos/util");
 var import_credentials23 = require("@dxos/credentials");
 var import_crypto4 = require("@dxos/crypto");
@@ -360,7 +361,7 @@ var import_messaging = require("@dxos/messaging");
 var import_network_manager2 = require("@dxos/network-manager");
 var import_protocols20 = require("@dxos/protocols");
 var import_services22 = require("@dxos/protocols/proto/dxos/client/services");
-var import_tracing11 = require("@dxos/tracing");
+var import_tracing12 = require("@dxos/tracing");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
 var import_async24 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
@@ -738,7 +739,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.6.14-staging.e15392e";
+var DXOS_VERSION = "0.7.0";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -1132,7 +1133,7 @@ var EdgeFeedReplicator = class extends import_context3.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;
       }
@@ -1166,10 +1167,12 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       });
       this._onMessage(payload);
     }));
-    this._messenger.connected.on(this._ctx, async () => {
-      await this._resetConnection();
-      this._startReplication();
-    });
+    this._ctx.onDispose(this._messenger.onReconnected(() => {
+      (0, import_async6.scheduleMicroTask)(this._ctx, () => this._handleReconnect());
+    }));
+  }
+  async _handleReconnect() {
+    await this._resetConnection();
     if (this._messenger.isConnected) {
       this._startReplication();
     }
@@ -1177,7 +1180,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
   async _close() {
     (0, import_log3.log)("close", void 0, {
       F: __dxlog_file5,
-      L: 91,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1189,7 +1192,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     this._connectionCtx = connectionCtx;
     (0, import_log3.log)("connection context created", void 0, {
       F: __dxlog_file5,
-      L: 99,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1202,7 +1205,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
   async _resetConnection() {
     (0, import_log3.log)("resetConnection", void 0, {
       F: __dxlog_file5,
-      L: 108,
+      L: 112,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1218,7 +1221,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       hasConnectionCtx: !!this._connectionCtx
     }, {
       F: __dxlog_file5,
-      L: 116,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1235,7 +1238,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       key: feed.key
     }, {
       F: __dxlog_file5,
-      L: 129,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1251,7 +1254,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     if (!this._connectionCtx) {
       import_log3.log.info("message dropped because connection was disposed", void 0, {
         F: __dxlog_file5,
-        L: 142,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1265,13 +1268,13 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     };
     import_log3.log.info("sending message", logPayload, {
       F: __dxlog_file5,
-      L: 148,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant2.invariant)(message.feedKey, void 0, {
       F: __dxlog_file5,
-      L: 150,
+      L: 154,
       S: this,
       A: [
         "message.feedKey",
@@ -1283,7 +1286,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       type: message.type
     }, {
       F: __dxlog_file5,
-      L: 153,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1302,7 +1305,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     if (!this._connectionCtx) {
       import_log3.log.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file5,
-        L: 168,
+        L: 172,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1317,7 +1320,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
               message
             }, {
               F: __dxlog_file5,
-              L: 174,
+              L: 178,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1328,7 +1331,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
                 feedKey
               }, {
                 F: __dxlog_file5,
-                L: 179,
+                L: 183,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1361,7 +1364,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file5,
-            L: 201,
+            L: 205,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1372,7 +1375,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
               feedKey
             }, {
               F: __dxlog_file5,
-              L: 206,
+              L: 210,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1386,7 +1389,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             ...message
           }, {
             F: __dxlog_file5,
-            L: 215,
+            L: 219,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1401,7 +1404,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       to
     }, {
       F: __dxlog_file5,
-      L: 222,
+      L: 226,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1411,7 +1414,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       });
       (0, import_invariant2.invariant)(data instanceof Uint8Array, void 0, {
         F: __dxlog_file5,
-        L: 227,
+        L: 231,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1439,7 +1442,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file5,
-      L: 248,
+      L: 252,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1461,7 +1464,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       if (!this._remoteLength.has(feed.key)) {
         (0, import_log3.log)("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file5,
-          L: 269,
+          L: 273,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1486,7 +1489,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
         if (err instanceof import_edge_client.EdgeIdentityChangedError || err instanceof import_edge_client.EdgeConnectionClosedError) {
           (0, import_log3.log)("resetting on reconnect", void 0, {
             F: __dxlog_file5,
-            L: 286,
+            L: 290,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1497,7 +1500,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       }
     }, {
       F: __dxlog_file5,
-      L: 280
+      L: 284
     });
     return connectionCtx;
   }
@@ -4887,6 +4890,7 @@ var tryAcquireBeforeContextDisposed = async (ctx, mutex) => {
   })());
 };
 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 {
@@ -4900,7 +4904,7 @@ var EdgeInvitationHandler = class {
     if (!this._client) {
       (0, import_log14.log)("edge disabled", void 0, {
         F: __dxlog_file16,
-        L: 65,
+        L: 66,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4914,7 +4918,7 @@ var EdgeInvitationHandler = class {
         invitation
       }, {
         F: __dxlog_file16,
-        L: 79,
+        L: 80,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4924,7 +4928,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 {
@@ -4937,19 +4943,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) {
               (0, import_async16.scheduleTask)(ctx, tryHandleInvitation, error.retryAfterMs ?? this._calculateNextRetryMs());
             }
-          } else {
+          } else if (requestCount < MAX_RETRIES_PER_INVITATION) {
             import_log14.log.info("failed to handle invitation with edge", {
               error
             }, {
               F: __dxlog_file16,
-              L: 104,
+              L: 107,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -4964,14 +4970,14 @@ var EdgeInvitationHandler = class {
     try {
       (0, import_log14.log)("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);
-      (0, import_log14.log)("edge invitation flow acquired the lock", void 0, {
+      import_log14.log.verbose("edge invitation flow acquired the lock", void 0, {
         F: __dxlog_file16,
-        L: 122,
+        L: 125,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5004,7 +5010,7 @@ var EdgeInvitationHandler = class {
   async _joinSpaceByInvitation(guardedState, spaceId, request) {
     (0, import_invariant13.invariant)(this._client, void 0, {
       F: __dxlog_file16,
-      L: 157,
+      L: 160,
       S: this,
       A: [
         "this._client",
@@ -5092,14 +5098,14 @@ var InvitationGuestExtension = class extends import_teleport2.RpcExtension {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      (0, import_log15.log)("guest acquire lock", void 0, {
+      import_log15.log.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);
-      (0, import_log15.log)("guest lock acquired", void 0, {
+      import_log15.log.verbose("guest lock acquired", void 0, {
         F: __dxlog_file17,
         L: 91,
         S: this,
@@ -5108,7 +5114,7 @@ var InvitationGuestExtension = class extends import_teleport2.RpcExtension {
       await (0, import_context12.cancelWithContext)(this._ctx, this.rpc.InvitationHostService.options({
         role: import_invitations3.InvitationOptions.Role.GUEST
       }));
-      (0, import_log15.log)("options sent", void 0, {
+      import_log15.log.verbose("options sent", void 0, {
         F: __dxlog_file17,
         L: 96,
         S: this,
@@ -5117,7 +5123,7 @@ var InvitationGuestExtension = class extends import_teleport2.RpcExtension {
       await (0, import_context12.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT
       }));
-      (0, import_log15.log)("options received", void 0, {
+      import_log15.log.verbose("options received", void 0, {
         F: __dxlog_file17,
         L: 98,
         S: this,
@@ -5151,7 +5157,7 @@ var InvitationGuestExtension = class extends import_teleport2.RpcExtension {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock.release();
       this._invitationFlowLock = null;
-      (0, import_log15.log)("invitation flow lock released", void 0, {
+      import_log15.log.verbose("invitation flow lock released", void 0, {
         F: __dxlog_file17,
         L: 131,
         S: this,
@@ -5237,7 +5243,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
               authMethod: import_services14.Invitation.AuthMethod.NONE
             };
           }
-          (0, import_log16.log)("guest introduced themselves", {
+          import_log16.log.verbose("guest introduced themselves", {
             guestProfile: profile
           }, {
             F: __dxlog_file18,
@@ -5272,7 +5278,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
-          (0, import_log16.log)("received authentication request", {
+          import_log16.log.verbose("received authentication request", {
             authCode: code
           }, {
             F: __dxlog_file18,
@@ -5400,41 +5406,39 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      (0, import_log16.log)("host acquire lock", void 0, {
+      import_log16.log.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);
-      (0, import_log16.log)("host lock acquired", void 0, {
+      import_log16.log.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(import_services14.Invitation.State.CONNECTING);
       await this.rpc.InvitationHostService.options({
         role: import_invitations4.InvitationOptions.Role.HOST
       });
-      (0, import_log16.log)("options sent", void 0, {
+      import_log16.log.verbose("options sent", void 0, {
         F: __dxlog_file18,
-        L: 245,
+        L: 244,
         S: this,
         C: (f, a) => f(...a)
       });
       await (0, import_context13.cancelWithContext)(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT2
       }));
-      (0, import_log16.log)("options received", void 0, {
+      import_log16.log.verbose("options received", void 0, {
         F: __dxlog_file18,
-        L: 247,
+        L: 246,
         S: this,
         C: (f, a) => f(...a)
       });
       if (this._remoteOptions?.role !== import_invitations4.InvitationOptions.Role.GUEST) {
-        this._callbacks.onStateUpdate(lastState);
         throw new import_protocols12.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations4.InvitationOptions.Role.GUEST,
           remoteOptions: this._remoteOptions,
@@ -5481,9 +5485,9 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock?.release();
       this._invitationFlowLock = null;
-      (0, import_log16.log)("invitation flow lock released", void 0, {
+      import_log16.log.verbose("invitation flow lock released", void 0, {
         F: __dxlog_file18,
-        L: 302,
+        L: 299,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5677,7 +5681,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, {
@@ -5685,7 +5689,9 @@ var InvitationsHandler = class {
           return ctx.disposed ? null : guardedState.current;
         },
         onStateUpdate: (newState) => {
-          guardedState.set(extension, newState);
+          if (newState !== import_services11.Invitation.State.ERROR && newState !== import_services11.Invitation.State.TIMEOUT) {
+            guardedState.set(extension, newState);
+          }
           return guardedState.current;
         },
         admit: async (admissionRequest) => {
@@ -5695,14 +5701,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;
             (0, import_invariant12.invariant)(deviceKey, void 0, {
               F: __dxlog_file21,
-              L: 110,
+              L: 112,
               S: this,
               A: [
                 "deviceKey",
@@ -5721,7 +5727,7 @@ var InvitationsHandler = class {
           let admitted = false;
           connectionCtx.onDispose(() => {
             if (!admitted) {
-              guardedState.error(extension, new import_context10.ContextDisposedError());
+              guardedState.set(extension, import_services11.Invitation.State.CONNECTING);
             }
           });
           (0, import_async15.scheduleTask)(connectionCtx, async () => {
@@ -5731,27 +5737,27 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file21,
-                L: 135,
+                L: 137,
                 S: this,
                 C: (f, a) => f(...a)
               });
-              (0, import_log13.log)("connected", {
+              import_log13.log.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
               });
-              (0, import_log13.log)("admitted guest", {
+              import_log13.log.verbose("admitted guest", {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 138,
+                L: 140,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5761,7 +5767,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file21,
-                L: 141,
+                L: 143,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5770,24 +5776,25 @@ var InvitationsHandler = class {
                 await ctx.dispose();
               }
             } catch (err) {
+              const stateChanged = guardedState.set(extension, import_services11.Invitation.State.CONNECTING);
               if (err instanceof import_async15.TimeoutError) {
-                if (guardedState.set(extension, import_services11.Invitation.State.TIMEOUT)) {
+                if (stateChanged) {
                   metrics.increment("dxos.invitation.timeout");
-                  (0, import_log13.log)("timeout", {
+                  import_log13.log.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");
                   import_log13.log.error("failed", err, {
                     F: __dxlog_file21,
-                    L: 156,
+                    L: 159,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -5798,7 +5805,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file21,
-                L: 159,
+                L: 162,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5807,35 +5814,36 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
+          const stateChanged = guardedState.set(extension, import_services11.Invitation.State.CONNECTING);
           if (err instanceof import_protocols9.InvalidInvitationExtensionRoleError) {
             (0, import_log13.log)("invalid role", {
               ...err.context
             }, {
               F: __dxlog_file21,
-              L: 167,
+              L: 171,
               S: this,
               C: (f, a) => f(...a)
             });
             return;
           }
           if (err instanceof import_async15.TimeoutError) {
-            if (guardedState.set(extension, import_services11.Invitation.State.TIMEOUT)) {
+            if (stateChanged) {
               metrics.increment("dxos.invitation.timeout");
-              (0, import_log13.log)("timeout", {
+              import_log13.log.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");
               import_log13.log.error("failed", err, {
                 F: __dxlog_file21,
-                L: 178,
+                L: 182,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5849,18 +5857,25 @@ var InvitationsHandler = class {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
         import_log13.log.warn("invitation has already expired", void 0, {
           F: __dxlog_file21,
-          L: 189,
+          L: 193,
           S: this,
           C: (f, a) => f(...a)
         });
-      } else {
-        (0, import_async15.scheduleTask)(ctx, async () => {
-          await swarmConnection.close();
-          guardedState.set(null, import_services11.Invitation.State.EXPIRED);
-          metrics.increment("dxos.invitation.expired");
-          await ctx.dispose();
-        }, invitation.created.getTime() + invitation.lifetime * 1e3 - Date.now());
+        guardedState.set(null, import_services11.Invitation.State.EXPIRED);
+        void ctx.dispose().catch((err) => import_log13.log.catch(err, void 0, {
+          F: __dxlog_file21,
+          L: 195,
+          S: this,
+          C: (f, a) => f(...a)
+        }));
+        return;
       }
+      (0, import_async15.scheduleTask)(ctx, async () => {
+        await swarmConnection.close();
+        guardedState.set(null, import_services11.Invitation.State.EXPIRED);
+        metrics.increment("dxos.invitation.expired");
+        await ctx.dispose();
+      }, invitation.created.getTime() + invitation.lifetime * 1e3 - Date.now());
     }
     let swarmConnection;
     (0, import_async15.scheduleTask)(ctx, async () => {
@@ -5876,7 +5891,7 @@ var InvitationsHandler = class {
       type: invitation.type
     }, {
       F: __dxlog_file21,
-      L: 220,
+      L: 226,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5884,7 +5899,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: 229,
+        L: 235,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -5902,7 +5917,7 @@ var InvitationsHandler = class {
         triedPeers: triedPeersIds.size
       }, {
         F: __dxlog_file21,
-        L: 237,
+        L: 243,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5924,12 +5939,12 @@ var InvitationsHandler = class {
             return;
           }
           connectionCtx.onDispose(async () => {
-            (0, import_log13.log)("extension disposed", {
+            import_log13.log.verbose("extension disposed", {
               admitted,
               currentState: guardedState.current.state
             }, {
               F: __dxlog_file21,
-              L: 265,
+              L: 271,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5947,7 +5962,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file21,
-                L: 277,
+                L: 283,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5959,7 +5974,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 288,
+                L: 294,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5969,7 +5984,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 292,
+                L: 298,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5983,7 +5998,7 @@ var InvitationsHandler = class {
                 authMethod: introductionResponse.authMethod
               }, {
                 F: __dxlog_file21,
-                L: 300,
+                L: 306,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -6005,7 +6020,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 330,
+                L: 336,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -6018,7 +6033,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 344,
+                L: 350,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -6031,25 +6046,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 import_async15.TimeoutError) {
-                (0, import_log13.log)("timeout", {
+                import_log13.log.verbose("timeout", {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file21,
-                  L: 356,
+                  L: 362,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 guardedState.set(extension, import_services11.Invitation.State.TIMEOUT);
               } else {
-                (0, import_log13.log)("auth failed", err, {
+                import_log13.log.verbose("auth failed", err, {
                   F: __dxlog_file21,
-                  L: 359,
+                  L: 365,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -6061,7 +6076,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file21,
-                L: 363,
+                L: 369,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -6073,19 +6088,19 @@ var InvitationsHandler = class {
             return;
           }
           if (err instanceof import_async15.TimeoutError) {
-            (0, import_log13.log)("timeout", {
+            import_log13.log.verbose("timeout", {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file21,
-              L: 372,
+              L: 378,
               S: this,
               C: (f, a) => f(...a)
             });
             guardedState.set(extension, import_services11.Invitation.State.TIMEOUT);
           } else {
-            (0, import_log13.log)("auth failed", err, {
+            import_log13.log.verbose("auth failed", err, {
               F: __dxlog_file21,
-              L: 375,
+              L: 381,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -6102,7 +6117,7 @@ var InvitationsHandler = class {
           ...protocol.toJSON()
         }, {
           F: __dxlog_file21,
-          L: 387,
+          L: 393,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -6122,7 +6137,7 @@ var InvitationsHandler = class {
       } else {
         (0, import_invariant12.invariant)(invitation.swarmKey, void 0, {
           F: __dxlog_file21,
-          L: 399,
+          L: 405,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -6166,7 +6181,7 @@ var InvitationsHandler = class {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       (0, import_log13.log)("guest waiting for authentication code...", void 0, {
         F: __dxlog_file21,
-        L: 451,
+        L: 457,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6174,7 +6189,7 @@ var InvitationsHandler = class {
       const authCode = await authenticated.wait(options);
       (0, import_log13.log)("sending authentication request", void 0, {
         F: __dxlog_file21,
-        L: 455,
+        L: 461,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6193,7 +6208,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file21,
-            L: 466,
+            L: 472,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6211,7 +6226,7 @@ var InvitationsHandler = class {
     }
     (0, import_log13.log)("sending authentication request", void 0, {
       F: __dxlog_file21,
-      L: 485,
+      L: 491,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6241,7 +6256,10 @@ var InvitationsServiceImpl = class {
   }
   createInvitation(options) {
     return new import_codec_protobuf10.Stream(({ next, close }) => {
-      void this._invitationsManager.createInvitation(options).then((invitation) => invitation.subscribe(next, close, close)).catch(close);
+      void this._invitationsManager.createInvitation(options).then((invitation) => {
+        import_tracing9.trace.metrics.increment("dxos.invitation.created");
+        invitation.subscribe(next, close, close);
+      }).catch(close);
     });
   }
   acceptInvitation(request) {
@@ -6798,8 +6816,8 @@ var InvitationsManager = class {
       this._persistentInvitationsLoadedEvent.once(ctx, () => callback());
     }
   }
-  _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 ?? {};
+  _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 authCode = options?.authCode ?? (authMethod === import_services18.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials20.generatePasscode)(import_client_protocol6.AUTHENTICATION_CODE_LENGTH) : void 0);
     return {
       invitationId,
@@ -6816,6 +6834,7 @@ var InvitationsManager = class {
       role,
       multiUse,
       delegationCredentialId: options?.delegationCredentialId,
+      ...options,
       ...protocol.getInvitationContext()
     };
   }
@@ -6828,14 +6847,14 @@ var InvitationsManager = class {
       }
     }, {
       F: __dxlog_file23,
-      L: 234
+      L: 236
     });
     ctx.onDispose(() => {
       (0, import_log20.log)("complete", {
         ...handler.toJSON()
       }, {
         F: __dxlog_file23,
-        L: 241,
+        L: 243,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6868,7 +6887,7 @@ var InvitationsManager = class {
             ...handler.toJSON()
           }, {
             F: __dxlog_file23,
-            L: 261,
+            L: 263,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6879,7 +6898,7 @@ var InvitationsManager = class {
         } else {
           import_log20.log.warn("auth failed", err, {
             F: __dxlog_file23,
-            L: 264,
+            L: 266,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6892,14 +6911,14 @@ var InvitationsManager = class {
       }
     }, {
       F: __dxlog_file23,
-      L: 258
+      L: 260
     });
     ctx.onDispose(() => {
       (0, import_log20.log)("complete", {
         ...handler.toJSON()
       }, {
         F: __dxlog_file23,
-        L: 271,
+        L: 273,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6944,7 +6963,7 @@ var InvitationsManager = class {
     } catch (err) {
       import_log20.log.catch(err, void 0, {
         F: __dxlog_file23,
-        L: 307,
+        L: 309,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7015,7 +7034,7 @@ function _ts_decorate8(decorators, target, key, desc) {
 var ClientRpcServer = class {
   constructor(params) {
     this._handlerCache = /* @__PURE__ */ new Map();
-    this._callMetrics = new import_tracing9.MapCounter();
+    this._callMetrics = new import_tracing10.MapCounter();
     const { serviceRegistry, handleCall, handleStream, ...rpcOptions } = params;
     this._handleCall = handleCall;
     this._handleStream = handleStream;
@@ -7069,13 +7088,13 @@ var ClientRpcServer = class {
   }
 };
 _ts_decorate8([
-  import_tracing9.trace.metricsCounter()
+  import_tracing10.trace.metricsCounter()
 ], ClientRpcServer.prototype, "_callMetrics", void 0);
 _ts_decorate8([
-  import_tracing9.trace.info()
+  import_tracing10.trace.info()
 ], ClientRpcServer.prototype, "_services", null);
 ClientRpcServer = _ts_decorate8([
-  import_tracing9.trace.resource()
+  import_tracing10.trace.resource()
 ], ClientRpcServer);
 function _ts_decorate9(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -7819,8 +7838,8 @@ var ServiceContext = class extends import_context16.Resource {
           S: this,
           C: (f, a) => f(...a)
         });
-        if (params?.deviceCredential) {
-          edgeIdentity = await (0, import_edge_client2.createChainEdgeIdentity)(identity.signer, identity.identityKey, identity.deviceKey, {
+        if (params?.deviceCredential || Boolean(globalThis?.DEVICE_INVITE_INTEROP)) {
+          edgeIdentity = await (0, import_edge_client2.createChainEdgeIdentity)(identity.signer, identity.identityKey, identity.deviceKey, params?.deviceCredential && {
             credential: params.deviceCredential
           }, []);
         } else {
@@ -7855,14 +7874,14 @@ var ServiceContext = class extends import_context16.Resource {
   }
 };
 _ts_decorate10([
-  import_tracing10.trace.span()
+  import_tracing11.trace.span()
 ], ServiceContext.prototype, "_open", null);
 _ts_decorate10([
-  import_tracing10.trace.span()
+  import_tracing11.trace.span()
 ], ServiceContext.prototype, "_initialize", null);
 ServiceContext = _ts_decorate10([
   (0, import_util12.safeInstanceof)("dxos.client-services.ServiceContext"),
-  import_tracing10.trace.resource()
+  import_tracing11.trace.resource()
 ], ServiceContext);
 var ServiceRegistry = class {
   // prettier-ignore
@@ -8097,8 +8116,9 @@ var importProfileData = async ({ storage, level }, archive) => {
 };
 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);
@@ -8114,7 +8134,7 @@ var DevicesServiceImpl = class {
         } else {
           (0, import_invariant25.invariant)(this._identityManager.identity?.presence, "presence not present", {
             F: __dxlog_file29,
-            L: 32,
+            L: 36,
             S: this,
             A: [
               "this._identityManager.identity?.presence",
@@ -8125,12 +8145,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 = import_services23.Device.PresenceState.ONLINE;
+              } else if (profile.os?.toUpperCase() === "EDGE") {
+                presence = this._edgeConnection?.isConnected ? import_services23.Device.PresenceState.ONLINE : import_services23.Device.PresenceState.OFFLINE;
+              } else {
+                presence = peers.some((peer) => peer.identityKey.equals(key)) ? import_services23.Device.PresenceState.ONLINE : import_services23.Device.PresenceState.OFFLINE;
+              }
               return {
                 deviceKey: key,
                 kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services23.DeviceKind.CURRENT : import_services23.DeviceKind.TRUSTED,
                 profile,
-                presence: isMe ? import_services23.Device.PresenceState.ONLINE : peerState ? import_services23.Device.PresenceState.ONLINE : import_services23.Device.PresenceState.OFFLINE
+                presence
               };
             })
           });
@@ -8465,7 +8492,7 @@ var ClientServicesHost = class {
     callbacks,
     runtimeParams
   } = {}) {
-    this._tracingService = import_tracing11.TRACE_PROCESSOR.createTraceSender();
+    this._tracingService = import_tracing12.TRACE_PROCESSOR.createTraceSender();
     this._statusUpdate = new import_async23.Event();
     this._edgeConnection = void 0;
     this._edgeHttpClient = void 0;
@@ -8704,7 +8731,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,
@@ -8828,24 +8855,24 @@ var ClientServicesHost = class {
   }
 };
 _ts_decorate11([
-  import_tracing11.trace.info()
+  import_tracing12.trace.info()
 ], ClientServicesHost.prototype, "_opening", void 0);
 _ts_decorate11([
-  import_tracing11.trace.info()
+  import_tracing12.trace.info()
 ], ClientServicesHost.prototype, "_open", void 0);
 _ts_decorate11([
-  import_tracing11.trace.info()
+  import_tracing12.trace.info()
 ], ClientServicesHost.prototype, "_resetting", void 0);
 _ts_decorate11([
   import_async23.synchronized,
-  import_tracing11.trace.span()
+  import_tracing12.trace.span()
 ], ClientServicesHost.prototype, "open", null);
 _ts_decorate11([
   import_async23.synchronized,
-  import_tracing11.trace.span()
+  import_tracing12.trace.span()
 ], ClientServicesHost.prototype, "close", null);
 ClientServicesHost = _ts_decorate11([
-  import_tracing11.trace.resource()
+  import_tracing12.trace.resource()
 ], ClientServicesHost);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -8893,4 +8920,4 @@ ClientServicesHost = _ts_decorate11([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-4BJB67XI.cjs.map
+//# sourceMappingURL=chunk-3ERQHVZE.cjs.map