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

package/dist/lib/node/testing/index.cjs

@@ -32,7 +32,7 @@ __export(testing_exports, {
   sanitizeInvitation: () => sanitizeInvitation
 });
 module.exports = __toCommonJS(testing_exports);
-var import_chunk_A2WCOW6P = require("../chunk-A2WCOW6P.cjs");
+var import_chunk_BAW7EMSB = require("../chunk-BAW7EMSB.cjs");
 var import_credentials = require("@dxos/credentials");
 var import_keys = require("@dxos/keys");
 var import_async = require("@dxos/async");
@@ -235,7 +235,7 @@ var createInvitation = async (host, options) => {
     authMethod: import_services.Invitation.AuthMethod.NONE,
     ...options ?? {}
   };
-  if (host instanceof import_chunk_A2WCOW6P.ServiceContext) {
+  if (host instanceof import_chunk_BAW7EMSB.ServiceContext) {
     return host.invitationsManager.createInvitation({
       kind: import_services.Invitation.Kind.SPACE,
       ...options
@@ -245,7 +245,7 @@ var createInvitation = async (host, options) => {
 };
 var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
   invitation = sanitizeInvitation(invitation);
-  if (guest instanceof import_chunk_A2WCOW6P.ServiceContext) {
+  if (guest instanceof import_chunk_BAW7EMSB.ServiceContext) {
     return guest.invitationsManager.acceptInvitation({
       invitation,
       deviceProfile: guestDeviceProfile
@@ -255,7 +255,7 @@ var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
 };
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/testing/test-builder.ts";
 var createServiceHost = (config, signalManagerContext) => {
-  return new import_chunk_A2WCOW6P.ClientServicesHost({
+  return new import_chunk_BAW7EMSB.ClientServicesHost({
     config,
     signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
     transportFactory: import_network_manager.MemoryTransportFactory
@@ -274,7 +274,7 @@ var createServiceContext = async ({ signalManagerFactory = async () => {
   });
   const level = (0, import_testing.createTestLevel)();
   await level.open();
-  return new import_chunk_A2WCOW6P.ServiceContext(storage, level, networkManager, signalManager, void 0, void 0, {
+  return new import_chunk_BAW7EMSB.ServiceContext(storage, level, networkManager, signalManager, void 0, void 0, {
     invitationConnectionDefaultParams: {
       teleport: {
         controlHeartbeatInterval: 200
@@ -385,7 +385,7 @@ var TestPeer = class {
     return this._props.meshEchoReplicator ??= new import_echo_pipeline.MeshEchoReplicator();
   }
   get dataSpaceManager() {
-    return this._props.dataSpaceManager ??= new import_chunk_A2WCOW6P.DataSpaceManager({
+    return this._props.dataSpaceManager ??= new import_chunk_BAW7EMSB.DataSpaceManager({
       spaceManager: this.spaceManager,
       metadataStore: this.metadataStore,
       keyring: this.keyring,
@@ -400,9 +400,9 @@ var TestPeer = class {
     });
   }
   get invitationsManager() {
-    return this._props.invitationsManager ??= new import_chunk_A2WCOW6P.InvitationsManager(new import_chunk_A2WCOW6P.InvitationsHandler(this.networkManager), (invitation) => {
+    return this._props.invitationsManager ??= new import_chunk_BAW7EMSB.InvitationsManager(new import_chunk_BAW7EMSB.InvitationsHandler(this.networkManager), (invitation) => {
       if (invitation.kind === import_services2.Invitation.Kind.SPACE) {
-        return new import_chunk_A2WCOW6P.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
+        return new import_chunk_BAW7EMSB.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
       } else {
         throw new Error("not implemented");
       }

package/dist/lib/node-esm/{chunk-SK52YZK7.mjs → chunk-NDJKR4OF.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";
@@ -739,6 +739,7 @@ import { log as log3, 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;
@@ -829,7 +830,7 @@ var EdgeFeedReplicator = class extends Resource {
   async _open() {
     log3("open", void 0, {
       F: __dxlog_file5,
-      L: 56,
+      L: 57,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -848,7 +849,7 @@ var EdgeFeedReplicator = class extends Resource {
           _spaceId: this._spaceId
         }, {
           F: __dxlog_file5,
-          L: 70,
+          L: 71,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -861,7 +862,7 @@ var EdgeFeedReplicator = class extends Resource {
         type: payload.type
       }, {
         F: __dxlog_file5,
-        L: 75,
+        L: 76,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -873,14 +874,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() {
     log3("close", void 0, {
       F: __dxlog_file5,
-      L: 95,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -892,7 +893,7 @@ var EdgeFeedReplicator = class extends Resource {
     this._connectionCtx = connectionCtx;
     log3("connection context created", void 0, {
       F: __dxlog_file5,
-      L: 103,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -905,7 +906,7 @@ var EdgeFeedReplicator = class extends Resource {
   async _resetConnection() {
     log3("resetConnection", void 0, {
       F: __dxlog_file5,
-      L: 112,
+      L: 113,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -921,7 +922,7 @@ var EdgeFeedReplicator = class extends Resource {
       hasConnectionCtx: !!this._connectionCtx
     }, {
       F: __dxlog_file5,
-      L: 120,
+      L: 121,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -938,7 +939,7 @@ var EdgeFeedReplicator = class extends Resource {
       key: feed.key
     }, {
       F: __dxlog_file5,
-      L: 133,
+      L: 134,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -954,7 +955,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log3("message dropped because connection was disposed", void 0, {
         F: __dxlog_file5,
-        L: 146,
+        L: 147,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -966,14 +967,14 @@ var EdgeFeedReplicator = class extends Resource {
         blocks: message.blocks.map((b) => b.index)
       }, {
         F: __dxlog_file5,
-        L: 151,
+        L: 152,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     invariant2(message.feedKey, void 0, {
       F: __dxlog_file5,
-      L: 157,
+      L: 158,
       S: this,
       A: [
         "message.feedKey",
@@ -985,7 +986,7 @@ var EdgeFeedReplicator = class extends Resource {
       type: message.type
     }, {
       F: __dxlog_file5,
-      L: 160,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1004,7 +1005,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log3.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file5,
-        L: 175,
+        L: 176,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1022,7 +1023,7 @@ var EdgeFeedReplicator = class extends Resource {
                 feedKey
               }, {
                 F: __dxlog_file5,
-                L: 184,
+                L: 185,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1038,7 +1039,7 @@ var EdgeFeedReplicator = class extends Resource {
             if (message.length > feed.length) {
               log3("requesting missing blocks", logMeta, {
                 F: __dxlog_file5,
-                L: 194,
+                L: 195,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1053,7 +1054,7 @@ var EdgeFeedReplicator = class extends Resource {
             } else if (message.length < feed.length) {
               log3("pushing blocks to remote", logMeta, {
                 F: __dxlog_file5,
-                L: 202,
+                L: 203,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1072,7 +1073,7 @@ var EdgeFeedReplicator = class extends Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file5,
-            L: 211,
+            L: 212,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1083,7 +1084,7 @@ var EdgeFeedReplicator = class extends Resource {
               feedKey
             }, {
               F: __dxlog_file5,
-              L: 216,
+              L: 217,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1097,7 +1098,7 @@ var EdgeFeedReplicator = class extends Resource {
             ...message
           }, {
             F: __dxlog_file5,
-            L: 225,
+            L: 226,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1112,7 +1113,7 @@ var EdgeFeedReplicator = class extends Resource {
       to
     }, {
       F: __dxlog_file5,
-      L: 232,
+      L: 233,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1122,7 +1123,7 @@ var EdgeFeedReplicator = class extends Resource {
       });
       invariant2(data instanceof Uint8Array, void 0, {
         F: __dxlog_file5,
-        L: 237,
+        L: 238,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1150,7 +1151,7 @@ var EdgeFeedReplicator = class extends Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file5,
-      L: 258,
+      L: 259,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1172,7 +1173,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: 279,
+          L: 280,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1197,7 +1198,7 @@ var EdgeFeedReplicator = class extends Resource {
         if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
           log3("resetting on reconnect", void 0, {
             F: __dxlog_file5,
-            L: 296,
+            L: 297,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1208,7 +1209,7 @@ var EdgeFeedReplicator = class extends Resource {
       }
     }, {
       F: __dxlog_file5,
-      L: 290
+      L: 291
     });
     return connectionCtx;
   }
@@ -7503,28 +7504,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() {
@@ -8516,7 +8511,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 invariant25 } 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_file30 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager, _edgeConnection) {
@@ -8537,7 +8532,7 @@ var DevicesServiceImpl = class {
         } else {
           invariant25(this._identityManager.identity?.presence, "presence not present", {
             F: __dxlog_file30,
-            L: 36,
+            L: 37,
             S: this,
             A: [
               "this._identityManager.identity?.presence",
@@ -8552,7 +8547,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;
               }
@@ -8812,12 +8807,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,
@@ -8828,13 +8824,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) {
@@ -8850,26 +8842,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;
     });
   }
 };
@@ -9194,7 +9184,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.
@@ -9226,7 +9216,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file31,
-      L: 366,
+      L: 370,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9234,7 +9224,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file31,
-      L: 367,
+      L: 371,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9248,7 +9238,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file31,
-      L: 378,
+      L: 382,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9266,7 +9256,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file31,
-      L: 387,
+      L: 391,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9277,13 +9267,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file31,
-      L: 392,
+      L: 396,
       S: this,
       C: (f, a) => f(...a)
     });
     log27.info("resetting...", void 0, {
       F: __dxlog_file31,
-      L: 394,
+      L: 398,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9293,7 +9283,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     log27.info("reset", void 0, {
       F: __dxlog_file31,
-      L: 401,
+      L: 405,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9301,7 +9291,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file31,
-      L: 402,
+      L: 406,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9379,4 +9369,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-SK52YZK7.mjs.map
+//# sourceMappingURL=chunk-NDJKR4OF.mjs.map