@dxos/client-services 0.8.1 → 0.8.2-main.12df754

package/dist/lib/browser/{chunk-MHDASPY5.mjs → chunk-GCPSASQQ.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.8.1";
+var DXOS_VERSION = "0.8.2-main.12df754";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -817,6 +817,7 @@ import { log as log4, logInfo } from "@dxos/log";
 import { EdgeService } from "@dxos/protocols";
 import { buf } from "@dxos/protocols/buf";
 import { MessageSchema as RouterMessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
+import { EdgeStatus } from "@dxos/protocols/proto/dxos/client/services";
 import { ComplexMap as ComplexMap2, arrayToBuffer, bufferToArray, defaultMap, rangeFromTo } from "@dxos/util";
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -907,7 +908,7 @@ var EdgeFeedReplicator = class extends Resource {
   async _open() {
     log4("open", void 0, {
       F: __dxlog_file6,
-      L: 56,
+      L: 57,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -926,7 +927,7 @@ var EdgeFeedReplicator = class extends Resource {
           _spaceId: this._spaceId
         }, {
           F: __dxlog_file6,
-          L: 70,
+          L: 71,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -939,7 +940,7 @@ var EdgeFeedReplicator = class extends Resource {
         type: payload.type
       }, {
         F: __dxlog_file6,
-        L: 75,
+        L: 76,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -951,14 +952,14 @@ var EdgeFeedReplicator = class extends Resource {
   }
   async _handleReconnect() {
     await this._resetConnection();
-    if (this._messenger.isConnected) {
+    if (this._messenger.status === EdgeStatus.CONNECTED) {
       this._startReplication();
     }
   }
   async _close() {
     log4("close", void 0, {
       F: __dxlog_file6,
-      L: 95,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -970,7 +971,7 @@ var EdgeFeedReplicator = class extends Resource {
     this._connectionCtx = connectionCtx;
     log4("connection context created", void 0, {
       F: __dxlog_file6,
-      L: 103,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -983,7 +984,7 @@ var EdgeFeedReplicator = class extends Resource {
   async _resetConnection() {
     log4("resetConnection", void 0, {
       F: __dxlog_file6,
-      L: 112,
+      L: 113,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -999,7 +1000,7 @@ var EdgeFeedReplicator = class extends Resource {
       hasConnectionCtx: !!this._connectionCtx
     }, {
       F: __dxlog_file6,
-      L: 120,
+      L: 121,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1016,7 +1017,7 @@ var EdgeFeedReplicator = class extends Resource {
       key: feed.key
     }, {
       F: __dxlog_file6,
-      L: 133,
+      L: 134,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1032,7 +1033,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log4("message dropped because connection was disposed", void 0, {
         F: __dxlog_file6,
-        L: 146,
+        L: 147,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1044,14 +1045,14 @@ var EdgeFeedReplicator = class extends Resource {
         blocks: message.blocks.map((b) => b.index)
       }, {
         F: __dxlog_file6,
-        L: 151,
+        L: 152,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     invariant2(message.feedKey, void 0, {
       F: __dxlog_file6,
-      L: 157,
+      L: 158,
       S: this,
       A: [
         "message.feedKey",
@@ -1063,7 +1064,7 @@ var EdgeFeedReplicator = class extends Resource {
       type: message.type
     }, {
       F: __dxlog_file6,
-      L: 160,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1082,7 +1083,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log4.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file6,
-        L: 175,
+        L: 176,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1100,7 +1101,7 @@ var EdgeFeedReplicator = class extends Resource {
                 feedKey
               }, {
                 F: __dxlog_file6,
-                L: 184,
+                L: 185,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1116,7 +1117,7 @@ var EdgeFeedReplicator = class extends Resource {
             if (message.length > feed.length) {
               log4("requesting missing blocks", logMeta, {
                 F: __dxlog_file6,
-                L: 194,
+                L: 195,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1131,7 +1132,7 @@ var EdgeFeedReplicator = class extends Resource {
             } else if (message.length < feed.length) {
               log4("pushing blocks to remote", logMeta, {
                 F: __dxlog_file6,
-                L: 202,
+                L: 203,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1150,7 +1151,7 @@ var EdgeFeedReplicator = class extends Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file6,
-            L: 211,
+            L: 212,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1161,7 +1162,7 @@ var EdgeFeedReplicator = class extends Resource {
               feedKey
             }, {
               F: __dxlog_file6,
-              L: 216,
+              L: 217,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1175,7 +1176,7 @@ var EdgeFeedReplicator = class extends Resource {
             ...message
           }, {
             F: __dxlog_file6,
-            L: 225,
+            L: 226,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1190,7 +1191,7 @@ var EdgeFeedReplicator = class extends Resource {
       to
     }, {
       F: __dxlog_file6,
-      L: 232,
+      L: 233,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1200,7 +1201,7 @@ var EdgeFeedReplicator = class extends Resource {
       });
       invariant2(data instanceof Uint8Array, void 0, {
         F: __dxlog_file6,
-        L: 237,
+        L: 238,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1228,7 +1229,7 @@ var EdgeFeedReplicator = class extends Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file6,
-      L: 258,
+      L: 259,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1250,7 +1251,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: 279,
+          L: 280,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1275,7 +1276,7 @@ var EdgeFeedReplicator = class extends Resource {
         if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
           log4("resetting on reconnect", void 0, {
             F: __dxlog_file6,
-            L: 296,
+            L: 297,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1286,7 +1287,7 @@ var EdgeFeedReplicator = class extends Resource {
       }
     }, {
       F: __dxlog_file6,
-      L: 290
+      L: 291
     });
     return connectionCtx;
   }
@@ -7646,28 +7647,22 @@ _ts_decorate9([
 // packages/sdk/client-services/src/packlets/agents/edge-agent-service.ts
 import { Stream as Stream11 } from "@dxos/codec-protobuf/stream";
 import { EdgeAgentStatus as EdgeAgentStatus2 } from "@dxos/protocols";
-import { QueryAgentStatusResponse, QueryEdgeStatusResponse } from "@dxos/protocols/proto/dxos/client/services";
+import { QueryAgentStatusResponse, EdgeStatus as EdgeStatus2 } from "@dxos/protocols/proto/dxos/client/services";
 var EdgeAgentServiceImpl = class {
   constructor(_agentManagerProvider, _edgeConnection) {
     this._agentManagerProvider = _agentManagerProvider;
     this._edgeConnection = _edgeConnection;
   }
+  // TODO(mykola): Reconcile with NetworkService.queryStatus.
   queryEdgeStatus() {
     return new Stream11(({ ctx, next }) => {
-      next({
-        status: QueryEdgeStatusResponse.EdgeStatus.NOT_CONNECTED
-      });
-      if (!this._edgeConnection) {
-        return;
-      }
-      ctx.onDispose(
-        // TODO(wittjosiah): EdgeConnection should include a disconnected event as well.
-        this._edgeConnection.onReconnected(() => {
-          next({
-            status: QueryEdgeStatusResponse.EdgeStatus.CONNECTED
-          });
-        })
-      );
+      const update = () => {
+        next({
+          status: this._edgeConnection?.status ?? EdgeStatus2.NOT_CONNECTED
+        });
+      };
+      this._edgeConnection?.statusChanged.on(ctx, update);
+      update();
     });
   }
   async createAgent() {
@@ -8659,7 +8654,7 @@ import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 import { SubscriptionList as SubscriptionList3 } from "@dxos/async";
 import { Stream as Stream12 } from "@dxos/codec-protobuf/stream";
 import { invariant as invariant24 } from "@dxos/invariant";
-import { Device as Device2, DeviceKind as DeviceKind2 } from "@dxos/protocols/proto/dxos/client/services";
+import { Device as Device2, DeviceKind as DeviceKind2, EdgeStatus as EdgeStatus3 } from "@dxos/protocols/proto/dxos/client/services";
 var __dxlog_file31 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager, _edgeConnection) {
@@ -8680,7 +8675,7 @@ var DevicesServiceImpl = class {
         } else {
           invariant24(this._identityManager.identity?.presence, "presence not present", {
             F: __dxlog_file31,
-            L: 36,
+            L: 37,
             S: this,
             A: [
               "this._identityManager.identity?.presence",
@@ -8695,7 +8690,7 @@ var DevicesServiceImpl = class {
               if (isMe) {
                 presence = Device2.PresenceState.ONLINE;
               } else if (profile.os?.toUpperCase() === "EDGE") {
-                presence = this._edgeConnection?.isConnected ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
+                presence = this._edgeConnection?.status === EdgeStatus3.CONNECTED ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
               } else {
                 presence = peers.some((peer) => peer.identityKey.equals(key)) ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
               }
@@ -8955,12 +8950,13 @@ var LOG_PROCESSING = 0;
 // packages/sdk/client-services/src/packlets/network/network-service.ts
 import { Stream as Stream15 } from "@dxos/codec-protobuf/stream";
 var NetworkServiceImpl = class {
-  constructor(networkManager, signalManager) {
+  constructor(networkManager, signalManager, edgeConnection) {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
+    this.edgeConnection = edgeConnection;
   }
   queryStatus() {
-    return new Stream15(({ next }) => {
+    return new Stream15(({ ctx, next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
@@ -8971,13 +8967,9 @@ var NetworkServiceImpl = class {
           }))
         });
       };
-      const unsubscribeSwarm = this.networkManager.connectionStateChanged.on(() => update());
-      const unsubscribeSignal = this.signalManager.statusChanged?.on(() => update());
+      this.networkManager.connectionStateChanged.on(ctx, () => update());
+      this.signalManager.statusChanged?.on(ctx, () => update());
       update();
-      return () => {
-        unsubscribeSwarm();
-        unsubscribeSignal?.();
-      };
     });
   }
   async updateConfig(request) {
@@ -8993,26 +8985,24 @@ var NetworkServiceImpl = class {
     return this.signalManager.query(request);
   }
   subscribeSwarmState(request) {
-    return new Stream15(({ next }) => {
-      const unsubscribe = this.signalManager.swarmState?.on((state) => {
+    return new Stream15(({ ctx, next }) => {
+      this.signalManager.swarmState?.on(ctx, (state) => {
         if (request.topic.equals(state.swarmKey)) {
           next(state);
         }
       });
-      return unsubscribe;
     });
   }
   async sendMessage(message) {
     return this.signalManager.sendMessage(message);
   }
   subscribeMessages(peer) {
-    return new Stream15(({ next }) => {
-      const unsubscribe = this.signalManager.onMessage.on((message) => {
+    return new Stream15(({ ctx, next }) => {
+      this.signalManager.onMessage.on(ctx, (message) => {
         if (message.recipient.peerKey === peer.peerKey) {
           next(message);
         }
       });
-      return unsubscribe;
     });
   }
 };
@@ -9337,7 +9327,7 @@ var ClientServicesHost = class {
       SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, dataSpaceManagerProvider),
       DataService: this._serviceContext.echoHost.dataService,
       QueryService: this._serviceContext.echoHost.queryService,
-      NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
+      NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager, this._edgeConnection),
       LoggingService: this._loggingService,
       TracingService: this._tracingService,
       // TODO(burdon): Move to new protobuf definitions.
@@ -9369,7 +9359,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file32,
-      L: 366,
+      L: 370,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9377,7 +9367,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file32,
-      L: 367,
+      L: 371,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9391,7 +9381,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file32,
-      L: 378,
+      L: 382,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9409,7 +9399,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file32,
-      L: 387,
+      L: 391,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9420,13 +9410,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file32,
-      L: 392,
+      L: 396,
       S: this,
       C: (f, a) => f(...a)
     });
     log28.info("resetting...", void 0, {
       F: __dxlog_file32,
-      L: 394,
+      L: 398,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9436,7 +9426,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     log28.info("reset", void 0, {
       F: __dxlog_file32,
-      L: 401,
+      L: 405,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9444,7 +9434,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file32,
-      L: 402,
+      L: 406,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9522,4 +9512,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-MHDASPY5.mjs.map
+//# sourceMappingURL=chunk-GCPSASQQ.mjs.map