@dxos/client-services 0.3.3-main.e0ded2e → 0.3.3-main.f2ca85a

package/dist/lib/node/index.cjs

@@ -2538,6 +2538,7 @@ var ClientRpcServer = class {
 };
 
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
+var import_async10 = require("@dxos/async");
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
 var import_credentials9 = require("@dxos/credentials");
 var import_document_model = require("@dxos/document-model");
@@ -2576,7 +2577,7 @@ var getPlatform = () => {
 };
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.3.3-main.e0ded2e";
+var DXOS_VERSION = "0.3.3-main.f2ca85a";
 
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/diagnostics.ts";
@@ -2595,7 +2596,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
   {
     (0, import_invariant9.invariant)(clientServices.LoggingService, "SystemService is not available.", {
       F: __dxlog_file10,
-      L: 88,
+      L: 93,
       S: void 0,
       A: [
         "clientServices.LoggingService",
@@ -2628,6 +2629,19 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
       bytes,
       length
     }));
+    const status = await (0, import_codec_protobuf10.getFirstStreamValue)(clientServices.NetworkService.queryStatus(), {
+      timeout: DEFAULT_TIMEOUT
+    }).catch(() => void 0);
+    diagnostics.networkStatus = status;
+    const swarmInfoDone = new import_async10.Trigger();
+    serviceContext.networkManager.connectionLog?.update.on(async () => {
+      const swarms = serviceContext.networkManager.connectionLog?.swarms;
+      diagnostics.swarms = swarms;
+      await swarmInfoDone.wake();
+    });
+    await swarmInfoDone.wait({
+      timeout: DEFAULT_TIMEOUT
+    });
   }
   diagnostics.config = config.values;
   return diagnostics;
@@ -2641,7 +2655,7 @@ var getProperties = (space) => {
   } catch (err) {
     import_log8.log.warn(err.message, void 0, {
       F: __dxlog_file10,
-      L: 145,
+      L: 168,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2697,7 +2711,7 @@ var getSpaceStats = async (space) => {
 };
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
-var import_async14 = require("@dxos/async");
+var import_async15 = require("@dxos/async");
 var import_context9 = require("@dxos/context");
 var import_credentials14 = require("@dxos/credentials");
 var import_debug7 = require("@dxos/debug");
@@ -2714,7 +2728,7 @@ var import_tracing4 = require("@dxos/tracing");
 var import_util7 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
-var import_async12 = require("@dxos/async");
+var import_async13 = require("@dxos/async");
 var import_context8 = require("@dxos/context");
 var import_credentials13 = require("@dxos/credentials");
 var import_invariant11 = require("@dxos/invariant");
@@ -2726,7 +2740,7 @@ var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip"
 var import_util6 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-var import_async11 = require("@dxos/async");
+var import_async12 = require("@dxos/async");
 var import_client_protocol3 = require("@dxos/client-protocol");
 var import_context7 = require("@dxos/context");
 var import_debug4 = require("@dxos/debug");
@@ -2741,7 +2755,7 @@ var import_tracing3 = require("@dxos/tracing");
 var import_util5 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
-var import_async10 = require("@dxos/async");
+var import_async11 = require("@dxos/async");
 var import_context6 = require("@dxos/context");
 var import_invariant10 = require("@dxos/invariant");
 var import_keys8 = require("@dxos/keys");
@@ -2757,7 +2771,7 @@ var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var NotarizationPlugin = class {
   constructor() {
     this._ctx = new import_context6.Context();
-    this._extensionOpened = new import_async10.Event();
+    this._extensionOpened = new import_async11.Event();
     this._extensions = /* @__PURE__ */ new Set();
     this._processedCredentials = new import_util4.ComplexSet(import_keys8.PublicKey.hash);
     this._processCredentialsTriggers = new import_util4.ComplexMap(import_keys8.PublicKey.hash);
@@ -2791,7 +2805,7 @@ var NotarizationPlugin = class {
         "'Credentials must have an id'"
       ]
     });
-    const errors = new import_async10.Trigger();
+    const errors = new import_async11.Trigger();
     const ctx = this._ctx.derive({
       onError: (err) => {
         import_log9.log.warn("Notarization error", {
@@ -2808,7 +2822,7 @@ var NotarizationPlugin = class {
     });
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
-      (0, import_async10.scheduleTask)(ctx, () => {
+      (0, import_async11.scheduleTask)(ctx, () => {
         import_log9.log.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
@@ -2819,12 +2833,12 @@ var NotarizationPlugin = class {
           C: (f, a) => f(...a)
         });
         void ctx.dispose();
-        errors.throw(new import_async10.TimeoutError(timeout, "Notarization timed out"));
+        errors.throw(new import_async11.TimeoutError(timeout, "Notarization timed out"));
       }, timeout);
     }
     const allNotarized = Promise.all(credentials.map((credential) => this._waitUntilProcessed(credential.id)));
     const peersTried = /* @__PURE__ */ new Set();
-    const notarizeTask = new import_async10.DeferredTask(ctx, async () => {
+    const notarizeTask = new import_async11.DeferredTask(ctx, async () => {
       try {
         if (this._extensions.size === 0) {
           return;
@@ -2842,7 +2856,7 @@ var NotarizationPlugin = class {
             C: (f, a) => f(...a)
           });
           peersTried.clear();
-          (0, import_async10.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
+          (0, import_async11.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
           return;
         }
         peersTried.add(peer);
@@ -2864,7 +2878,7 @@ var NotarizationPlugin = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        await (0, import_async10.sleep)(successDelay);
+        await (0, import_async11.sleep)(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
           import_log9.log.warn("error notarizing (recoverable)", err, {
@@ -2922,7 +2936,7 @@ var NotarizationPlugin = class {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await (0, import_util4.entry)(this._processCredentialsTriggers, id).orInsert(new import_async10.Trigger()).value.wait();
+    await (0, import_util4.entry)(this._processCredentialsTriggers, id).orInsert(new import_async11.Trigger()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -3030,7 +3044,7 @@ var DataSpace = class DataSpace2 {
     * Error for _state === SpaceState.ERROR.
     */
     this.error = void 0;
-    this.stateUpdate = new import_async11.Event();
+    this.stateUpdate = new import_async12.Event();
     this.metrics = {};
     this._inner = params.inner;
     this._inner.stateUpdate.on(this._ctx, () => this.stateUpdate.emit());
@@ -3136,7 +3150,7 @@ var DataSpace = class DataSpace2 {
   * Initialize the data pipeline in a separate task.
   */
   initializeDataPipelineAsync() {
-    (0, import_async11.scheduleTask)(this._ctx, async () => {
+    (0, import_async12.scheduleTask)(this._ctx, async () => {
       try {
         this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
@@ -3186,7 +3200,7 @@ var DataSpace = class DataSpace2 {
       C: (f, a) => f(...a)
     });
     await this._initializeAndReadControlPipeline();
-    await (0, import_async11.sleep)(1);
+    await (0, import_async12.sleep)(1);
     await this._inner.initializeDataPipeline();
     this.metrics.dataPipelineOpen = /* @__PURE__ */ new Date();
     await (0, import_context7.cancelWithContext)(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
@@ -3342,10 +3356,10 @@ var DataSpace = class DataSpace2 {
   }
 };
 _ts_decorate3([
-  import_async11.synchronized
+  import_async12.synchronized
 ], DataSpace.prototype, "open", null);
 _ts_decorate3([
-  import_async11.synchronized
+  import_async12.synchronized
 ], DataSpace.prototype, "close", null);
 _ts_decorate3([
   import_tracing3.trace.span({
@@ -3361,13 +3375,13 @@ _ts_decorate3([
   (0, import_debug4.timed)(1e4)
 ], DataSpace.prototype, "_createWritableFeeds", null);
 _ts_decorate3([
-  import_async11.synchronized
+  import_async12.synchronized
 ], DataSpace.prototype, "activate", null);
 _ts_decorate3([
-  import_async11.synchronized
+  import_async12.synchronized
 ], DataSpace.prototype, "deactivate", null);
 DataSpace = _ts_decorate3([
-  (0, import_async11.trackLeaks)("open", "close")
+  (0, import_async12.trackLeaks)("open", "close")
 ], DataSpace);
 
 // packages/sdk/client-services/src/packlets/spaces/genesis.ts
@@ -3460,7 +3474,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     this._signingContext = _signingContext;
     this._feedStore = _feedStore;
     this._ctx = new import_context8.Context();
-    this.updated = new import_async12.Event();
+    this.updated = new import_async13.Event();
     this._spaces = new import_util6.ComplexMap(import_keys10.PublicKey.hash);
     this._isOpen = false;
     this._instanceId = import_keys10.PublicKey.random().toHex();
@@ -3757,23 +3771,23 @@ var DataSpaceManager = class DataSpaceManager2 {
   }
 };
 _ts_decorate4([
-  import_async12.synchronized
+  import_async13.synchronized
 ], DataSpaceManager.prototype, "open", null);
 _ts_decorate4([
-  import_async12.synchronized
+  import_async13.synchronized
 ], DataSpaceManager.prototype, "close", null);
 _ts_decorate4([
-  import_async12.synchronized
+  import_async13.synchronized
 ], DataSpaceManager.prototype, "createSpace", null);
 _ts_decorate4([
-  import_async12.synchronized
+  import_async13.synchronized
 ], DataSpaceManager.prototype, "acceptSpace", null);
 DataSpaceManager = _ts_decorate4([
-  (0, import_async12.trackLeaks)("open", "close")
+  (0, import_async13.trackLeaks)("open", "close")
 ], DataSpaceManager);
 
 // packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
-var import_async13 = require("@dxos/async");
+var import_async14 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_debug6 = require("@dxos/debug");
 var import_invariant12 = require("@dxos/invariant");
@@ -3814,7 +3828,7 @@ var SpacesServiceImpl = class {
   }
   querySpaces() {
     return new import_codec_protobuf11.Stream(({ next, ctx }) => {
-      const scheduler = new import_async13.UpdateScheduler(ctx, async () => {
+      const scheduler = new import_async14.UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
         (0, import_log12.log)("update", {
@@ -3831,9 +3845,9 @@ var SpacesServiceImpl = class {
       }, {
         maxFrequency: process.env.NODE_ENV === "test" ? void 0 : 2
       });
-      (0, import_async13.scheduleTask)(ctx, async () => {
+      (0, import_async14.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const subscriptions = new import_async13.EventSubscriptions();
+        const subscriptions = new import_async14.EventSubscriptions();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeSpaces = () => {
           subscriptions.clear();
@@ -3868,7 +3882,7 @@ var SpacesServiceImpl = class {
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
-      (0, import_async13.scheduleTask)(ctx, async () => {
+      (0, import_async14.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
@@ -3887,7 +3901,7 @@ var SpacesServiceImpl = class {
         }
       };
       ctx.onDispose(() => space.spaceState.removeCredentialProcessor(processor));
-      (0, import_async13.scheduleTask)(ctx, async () => {
+      (0, import_async14.scheduleTask)(ctx, async () => {
         await space.spaceState.addCredentialProcessor(processor);
         if (noTail) {
           close();
@@ -4011,7 +4025,7 @@ var ServiceContext = class ServiceContext2 {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this.modelFactory = modelFactory;
-    this.initialized = new import_async14.Trigger();
+    this.initialized = new import_async15.Trigger();
     this.dataServiceSubscriptions = new import_echo_pipeline2.DataServiceSubscriptions();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = import_keys11.PublicKey.random().toHex();
@@ -4240,7 +4254,7 @@ ServiceContext = _ts_decorate5([
 ], ServiceContext);
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
-var import_async17 = require("@dxos/async");
+var import_async18 = require("@dxos/async");
 var import_client_protocol5 = require("@dxos/client-protocol");
 var import_context10 = require("@dxos/context");
 var import_document_model2 = require("@dxos/document-model");
@@ -4283,7 +4297,7 @@ var ServiceRegistry = class {
 };
 
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
-var import_async15 = require("@dxos/async");
+var import_async16 = require("@dxos/async");
 var import_codec_protobuf12 = require("@dxos/codec-protobuf");
 var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
 var DevicesServiceImpl = class {
@@ -4311,7 +4325,7 @@ var DevicesServiceImpl = class {
           });
         }
       };
-      const subscriptions = new import_async15.EventSubscriptions();
+      const subscriptions = new import_async16.EventSubscriptions();
       subscriptions.add(this._identityManager.stateUpdate.on(() => {
         update();
         if (this._identityManager.identity) {
@@ -4386,14 +4400,14 @@ _ts_decorate6([
 var isLocked = (lockPath) => import_lock_file.LockFile.isLocked(lockPath);
 
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
-var import_async16 = require("@dxos/async");
+var import_async17 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
 var import_log15 = require("@dxos/log");
 var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util8 = require("@dxos/util");
 var LoggingServiceImpl = class {
   constructor() {
-    this._logs = new import_async16.Event();
+    this._logs = new import_async17.Event();
     this._started = /* @__PURE__ */ new Date();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
@@ -4676,7 +4690,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     callbacks
   } = {}) {
     this._tracingService = import_tracing5.TRACE_PROCESSOR.createTraceSender();
-    this._statusUpdate = new import_async17.Event();
+    this._statusUpdate = new import_async18.Event();
     this._opening = false;
     this._open = false;
     this._storage = storage;
@@ -5007,11 +5021,11 @@ _ts_decorate7([
   import_tracing5.trace.info()
 ], ClientServicesHost.prototype, "_open", void 0);
 _ts_decorate7([
-  import_async17.synchronized,
+  import_async18.synchronized,
   import_tracing5.trace.span()
 ], ClientServicesHost.prototype, "open", null);
 _ts_decorate7([
-  import_async17.synchronized,
+  import_async18.synchronized,
   import_tracing5.trace.span()
 ], ClientServicesHost.prototype, "close", null);
 ClientServicesHost = _ts_decorate7([
@@ -5019,7 +5033,7 @@ ClientServicesHost = _ts_decorate7([
 ], ClientServicesHost);
 
 // packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
-var import_async19 = require("@dxos/async");
+var import_async20 = require("@dxos/async");
 var import_client_protocol7 = require("@dxos/client-protocol");
 var import_context11 = require("@dxos/context");
 var import_log17 = require("@dxos/log");
@@ -5028,7 +5042,7 @@ var import_network_manager3 = require("@dxos/network-manager");
 var import_util11 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
-var import_async18 = require("@dxos/async");
+var import_async19 = require("@dxos/async");
 var import_client_protocol6 = require("@dxos/client-protocol");
 var import_invariant16 = require("@dxos/invariant");
 var import_iframe = require("@dxos/protocols/proto/dxos/iframe");
@@ -5037,7 +5051,7 @@ var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var ShellRuntimeImpl = class {
   constructor(_port) {
     this._port = _port;
-    this.layoutUpdate = new import_async18.Event();
+    this.layoutUpdate = new import_async19.Event();
     this._layout = import_iframe.ShellLayout.DEFAULT;
   }
   get layout() {
@@ -5110,7 +5124,7 @@ var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var LOCK_KEY = "DXOS_RESOURCE_LOCK";
 var IFrameHostRuntime = class {
   constructor({ config, origin, appPort, shellPort }) {
-    this._ready = new import_async19.Trigger();
+    this._ready = new import_async20.Trigger();
     this._configProvider = config;
     this.origin = origin;
     this._appPort = appPort;
@@ -5214,7 +5228,7 @@ _ts_decorate8([
 ], IFrameHostRuntime.prototype, "origin", void 0);
 
 // packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts
-var import_async20 = require("@dxos/async");
+var import_async21 = require("@dxos/async");
 var import_client_protocol8 = require("@dxos/client-protocol");
 var import_log18 = require("@dxos/log");
 var import_network_manager4 = require("@dxos/network-manager");
@@ -5225,7 +5239,7 @@ var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var IFrameProxyRuntime = class {
   constructor({ config, systemPort, shellPort }) {
     this._id = String(Math.floor(Math.random() * 1e6));
-    this._release = new import_async20.Trigger();
+    this._release = new import_async21.Trigger();
     this._configProvider = config;
     this._systemPort = systemPort;
     this._shellPort = shellPort;
@@ -5253,8 +5267,8 @@ var IFrameProxyRuntime = class {
     let lockKey;
     if (typeof navigator !== "undefined") {
       lockKey = this._lockKey(origin);
-      this._release = new import_async20.Trigger();
-      const ready = new import_async20.Trigger();
+      this._release = new import_async21.Trigger();
+      const ready = new import_async21.Trigger();
       void navigator.locks.request(lockKey, async () => {
         ready.wake();
         await this._release.wait();
@@ -5290,14 +5304,14 @@ var IFrameProxyRuntime = class {
 };
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
-var import_async22 = require("@dxos/async");
+var import_async23 = require("@dxos/async");
 var import_context12 = require("@dxos/context");
 var import_log20 = require("@dxos/log");
 var import_messaging3 = require("@dxos/messaging");
 var import_network_manager5 = require("@dxos/network-manager");
 
 // packages/sdk/client-services/src/packlets/vault/worker-session.ts
-var import_async21 = require("@dxos/async");
+var import_async22 = require("@dxos/async");
 var import_client_protocol9 = require("@dxos/client-protocol");
 var import_invariant17 = require("@dxos/invariant");
 var import_log19 = require("@dxos/log");
@@ -5316,7 +5330,7 @@ function _ts_decorate9(decorators, target, key, desc) {
 var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/worker-session.ts";
 var WorkerSession = class {
   constructor({ serviceHost, systemPort, appPort, shellPort, readySignal }) {
-    this._startTrigger = new import_async21.Trigger();
+    this._startTrigger = new import_async22.Trigger();
     this.onClose = new import_util13.Callback();
     (0, import_invariant17.invariant)(serviceHost, void 0, {
       F: __dxlog_file21,
@@ -5444,7 +5458,7 @@ var WorkerSession = class {
   }
   async _maybeOpenShell() {
     try {
-      await (0, import_async21.asyncTimeout)(this._shellClientRpc.open(), 1e3);
+      await (0, import_async22.asyncTimeout)(this._shellClientRpc.open(), 1e3);
     } catch {
       import_log19.log.info("No shell connected.", void 0, {
         F: __dxlog_file21,
@@ -5472,7 +5486,7 @@ var WorkerRuntime = class {
   constructor(_configProvider) {
     this._configProvider = _configProvider;
     this._transportFactory = new import_network_manager5.SimplePeerTransportProxyFactory();
-    this._ready = new import_async22.Trigger();
+    this._ready = new import_async23.Trigger();
     this._sessions = /* @__PURE__ */ new Set();
     this._clientServices = new ClientServicesHost({
       callbacks: {