@dxos/client-services 0.6.14-main.f49f251 → 0.6.14-staging.54a8bab

package/dist/lib/browser/{chunk-Z3SSMM5X.mjs → chunk-GFOAZHIO.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.54a8bab";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -909,7 +909,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;
       }
@@ -943,10 +943,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();
     }
@@ -954,7 +956,7 @@ var EdgeFeedReplicator = class extends Resource {
   async _close() {
     log4("close", void 0, {
       F: __dxlog_file6,
-      L: 91,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -966,7 +968,7 @@ var EdgeFeedReplicator = class extends Resource {
     this._connectionCtx = connectionCtx;
     log4("connection context created", void 0, {
       F: __dxlog_file6,
-      L: 99,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -979,7 +981,7 @@ var EdgeFeedReplicator = class extends Resource {
   async _resetConnection() {
     log4("resetConnection", void 0, {
       F: __dxlog_file6,
-      L: 108,
+      L: 112,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -995,7 +997,7 @@ var EdgeFeedReplicator = class extends Resource {
       hasConnectionCtx: !!this._connectionCtx
     }, {
       F: __dxlog_file6,
-      L: 116,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1012,7 +1014,7 @@ var EdgeFeedReplicator = class extends Resource {
       key: feed.key
     }, {
       F: __dxlog_file6,
-      L: 129,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1028,7 +1030,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log4.info("message dropped because connection was disposed", void 0, {
         F: __dxlog_file6,
-        L: 142,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1042,13 +1044,13 @@ var EdgeFeedReplicator = class extends Resource {
     };
     log4.info("sending message", logPayload, {
       F: __dxlog_file6,
-      L: 148,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(message.feedKey, void 0, {
       F: __dxlog_file6,
-      L: 150,
+      L: 154,
       S: this,
       A: [
         "message.feedKey",
@@ -1060,7 +1062,7 @@ var EdgeFeedReplicator = class extends Resource {
       type: message.type
     }, {
       F: __dxlog_file6,
-      L: 153,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1079,7 +1081,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log4.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file6,
-        L: 168,
+        L: 172,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1094,7 +1096,7 @@ var EdgeFeedReplicator = class extends Resource {
               message
             }, {
               F: __dxlog_file6,
-              L: 174,
+              L: 178,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1105,7 +1107,7 @@ var EdgeFeedReplicator = class extends Resource {
                 feedKey
               }, {
                 F: __dxlog_file6,
-                L: 179,
+                L: 183,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1138,7 +1140,7 @@ var EdgeFeedReplicator = class extends Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file6,
-            L: 201,
+            L: 205,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1149,7 +1151,7 @@ var EdgeFeedReplicator = class extends Resource {
               feedKey
             }, {
               F: __dxlog_file6,
-              L: 206,
+              L: 210,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1163,7 +1165,7 @@ var EdgeFeedReplicator = class extends Resource {
             ...message
           }, {
             F: __dxlog_file6,
-            L: 215,
+            L: 219,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1178,7 +1180,7 @@ var EdgeFeedReplicator = class extends Resource {
       to
     }, {
       F: __dxlog_file6,
-      L: 222,
+      L: 226,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1188,7 +1190,7 @@ var EdgeFeedReplicator = class extends Resource {
       });
       invariant2(data instanceof Uint8Array, void 0, {
         F: __dxlog_file6,
-        L: 227,
+        L: 231,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1216,7 +1218,7 @@ var EdgeFeedReplicator = class extends Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file6,
-      L: 248,
+      L: 252,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1238,7 +1240,7 @@ var EdgeFeedReplicator = class extends Resource {
       if (!this._remoteLength.has(feed.key)) {
         log4("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file6,
-          L: 269,
+          L: 273,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1263,7 +1265,7 @@ var EdgeFeedReplicator = class extends Resource {
         if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
           log4("resetting on reconnect", void 0, {
             F: __dxlog_file6,
-            L: 286,
+            L: 290,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1274,7 +1276,7 @@ var EdgeFeedReplicator = class extends Resource {
       }
     }, {
       F: __dxlog_file6,
-      L: 280
+      L: 284
     });
     return connectionCtx;
   }
@@ -8276,8 +8278,9 @@ import { invariant as invariant22 } from "@dxos/invariant";
 import { Device as Device2, DeviceKind as DeviceKind2 } from "@dxos/protocols/proto/dxos/client/services";
 var __dxlog_file30 = "/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);
@@ -8293,7 +8296,7 @@ var DevicesServiceImpl = class {
         } else {
           invariant22(this._identityManager.identity?.presence, "presence not present", {
             F: __dxlog_file30,
-            L: 32,
+            L: 36,
             S: this,
             A: [
               "this._identityManager.identity?.presence",
@@ -8304,12 +8307,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
               };
             })
           });
@@ -8907,7 +8917,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,
@@ -9096,4 +9106,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-Z3SSMM5X.mjs.map
+//# sourceMappingURL=chunk-GFOAZHIO.mjs.map