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

package/dist/lib/browser/{chunk-OC4A3Z5C.mjs → chunk-UUQTHQF5.mjs}

@@ -2420,9 +2420,21 @@ var SpaceInvitationProtocol = class {
 import { Stream as Stream9 } from "@dxos/codec-protobuf";
 import { raise } from "@dxos/debug";
 import { parseMethodName, RpcPeer } from "@dxos/rpc";
-var ClientRpcServer = class {
+import { MapCounter, trace as trace5 } from "@dxos/tracing";
+function _ts_decorate3(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+var ClientRpcServer = class ClientRpcServer2 {
   constructor(params) {
     this._handlerCache = /* @__PURE__ */ new Map();
+    this._callMetrics = new MapCounter();
     const { serviceRegistry, handleCall, handleStream, ...rpcOptions } = params;
     this._handleCall = handleCall;
     this._handleStream = handleStream;
@@ -2432,6 +2444,7 @@ var ClientRpcServer = class {
       callHandler: (method, params2) => {
         const [serviceName, methodName] = parseMethodName(method);
         const handler = (method2, params3) => this._getServiceHandler(serviceName).call(method2, params3);
+        this._callMetrics.inc(`${serviceName}.${methodName} request`);
         if (this._handleCall) {
           return this._handleCall(methodName, params2, handler);
         } else {
@@ -2441,14 +2454,21 @@ var ClientRpcServer = class {
       streamHandler: (method, params2) => {
         const [serviceName, methodName] = parseMethodName(method);
         const handler = (method2, params3) => this._getServiceHandler(serviceName).callStream(method2, params3);
+        this._callMetrics.inc(`${serviceName}.${methodName} request stream`);
         if (this._handleStream) {
-          return Stream9.unwrapPromise(this._handleStream(methodName, params2, handler));
+          return Stream9.map(Stream9.unwrapPromise(this._handleStream(methodName, params2, handler)), (data) => {
+            this._callMetrics.inc(`${serviceName}.${methodName} response stream`);
+            return data;
+          });
         } else {
           return handler(methodName, params2);
         }
       }
     });
   }
+  get _services() {
+    return Object.keys(this._serviceRegistry.services);
+  }
   async open() {
     await this._rpcPeer.open();
   }
@@ -2467,8 +2487,18 @@ var ClientRpcServer = class {
     return this._handlerCache.get(serviceName);
   }
 };
+_ts_decorate3([
+  trace5.metricsCounter()
+], ClientRpcServer.prototype, "_callMetrics", void 0);
+_ts_decorate3([
+  trace5.info()
+], ClientRpcServer.prototype, "_services", null);
+ClientRpcServer = _ts_decorate3([
+  trace5.resource()
+], ClientRpcServer);
 
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
+import { Trigger as Trigger4 } from "@dxos/async";
 import { getFirstStreamValue } from "@dxos/codec-protobuf";
 import { credentialTypeFilter } from "@dxos/credentials";
 import { DocumentModel } from "@dxos/document-model";
@@ -2507,7 +2537,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.f990aad";
 
 // 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";
@@ -2526,7 +2556,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
   {
     invariant9(clientServices.LoggingService, "SystemService is not available.", {
       F: __dxlog_file10,
-      L: 88,
+      L: 93,
       S: void 0,
       A: [
         "clientServices.LoggingService",
@@ -2559,6 +2589,19 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
       bytes,
       length
     }));
+    const status = await getFirstStreamValue(clientServices.NetworkService.queryStatus(), {
+      timeout: DEFAULT_TIMEOUT
+    }).catch(() => void 0);
+    diagnostics.networkStatus = status;
+    const swarmInfoDone = new Trigger4();
+    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;
@@ -2572,7 +2615,7 @@ var getProperties = (space) => {
   } catch (err) {
     log8.warn(err.message, void 0, {
       F: __dxlog_file10,
-      L: 145,
+      L: 168,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2639,11 +2682,11 @@ import { CancelledError, SystemError } from "@dxos/protocols";
 import { SpaceState } from "@dxos/protocols/proto/dxos/client/services";
 import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe2 } from "@dxos/timeframe";
-import { trace as trace5 } from "@dxos/tracing";
+import { trace as trace6 } from "@dxos/tracing";
 import { ComplexSet as ComplexSet3 } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
-import { DeferredTask, Event as Event4, scheduleTask as scheduleTask3, sleep, TimeoutError as TimeoutError2, Trigger as Trigger4 } from "@dxos/async";
+import { DeferredTask, Event as Event4, scheduleTask as scheduleTask3, sleep, TimeoutError as TimeoutError2, Trigger as Trigger5 } from "@dxos/async";
 import { Context as Context6, rejectOnDispose } from "@dxos/context";
 import { invariant as invariant10 } from "@dxos/invariant";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
@@ -2693,7 +2736,7 @@ var NotarizationPlugin = class {
         "'Credentials must have an id'"
       ]
     });
-    const errors = new Trigger4();
+    const errors = new Trigger5();
     const ctx = this._ctx.derive({
       onError: (err) => {
         log9.warn("Notarization error", {
@@ -2824,7 +2867,7 @@ var NotarizationPlugin = class {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await entry(this._processCredentialsTriggers, id).orInsert(new Trigger4()).value.wait();
+    await entry(this._processCredentialsTriggers, id).orInsert(new Trigger5()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -2911,7 +2954,7 @@ var NotarizationTeleportExtension = class extends RpcExtension2 {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-function _ts_decorate3(decorators, target, key, desc) {
+function _ts_decorate4(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -3243,32 +3286,32 @@ var DataSpace = class DataSpace2 {
     this.stateUpdate.emit();
   }
 };
-_ts_decorate3([
+_ts_decorate4([
   synchronized
 ], DataSpace.prototype, "open", null);
-_ts_decorate3([
+_ts_decorate4([
   synchronized
 ], DataSpace.prototype, "close", null);
-_ts_decorate3([
-  trace5.span({
+_ts_decorate4([
+  trace6.span({
     showInBrowserTimeline: true
   })
 ], DataSpace.prototype, "initializeDataPipeline", null);
-_ts_decorate3([
-  trace5.span({
+_ts_decorate4([
+  trace6.span({
     showInBrowserTimeline: true
   })
 ], DataSpace.prototype, "_initializeAndReadControlPipeline", null);
-_ts_decorate3([
+_ts_decorate4([
   timed(1e4)
 ], DataSpace.prototype, "_createWritableFeeds", null);
-_ts_decorate3([
+_ts_decorate4([
   synchronized
 ], DataSpace.prototype, "activate", null);
-_ts_decorate3([
+_ts_decorate4([
   synchronized
 ], DataSpace.prototype, "deactivate", null);
-DataSpace = _ts_decorate3([
+DataSpace = _ts_decorate4([
   trackLeaks("open", "close")
 ], DataSpace);
 
@@ -3279,7 +3322,7 @@ import { getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credent
 import { invariant as invariant11 } from "@dxos/invariant";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
 import { log as log11 } from "@dxos/log";
-import { trace as trace6 } from "@dxos/protocols";
+import { trace as trace7 } from "@dxos/protocols";
 import { SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
 import { Gossip, Presence } from "@dxos/teleport-extension-gossip";
 import { ComplexMap as ComplexMap3, deferFunction as deferFunction2, forEachAsync } from "@dxos/util";
@@ -3354,7 +3397,7 @@ var spaceGenesis = async (keyring, signingContext, space) => {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
-function _ts_decorate4(decorators, target, key, desc) {
+function _ts_decorate5(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -3390,7 +3433,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    log11.trace("dxos.echo.data-space-manager.open", trace6.begin({
+    log11.trace("dxos.echo.data-space-manager.open", trace7.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
@@ -3436,7 +3479,7 @@ var DataSpaceManager = class DataSpaceManager2 {
         space.initializeDataPipelineAsync();
       }
     }
-    log11.trace("dxos.echo.data-space-manager.open", trace6.end({
+    log11.trace("dxos.echo.data-space-manager.open", trace7.end({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
@@ -3670,19 +3713,19 @@ var DataSpaceManager = class DataSpaceManager2 {
     return dataSpace;
   }
 };
-_ts_decorate4([
+_ts_decorate5([
   synchronized2
 ], DataSpaceManager.prototype, "open", null);
-_ts_decorate4([
+_ts_decorate5([
   synchronized2
 ], DataSpaceManager.prototype, "close", null);
-_ts_decorate4([
+_ts_decorate5([
   synchronized2
 ], DataSpaceManager.prototype, "createSpace", null);
-_ts_decorate4([
+_ts_decorate5([
   synchronized2
 ], DataSpaceManager.prototype, "acceptSpace", null);
-DataSpaceManager = _ts_decorate4([
+DataSpaceManager = _ts_decorate5([
   trackLeaks2("open", "close")
 ], DataSpaceManager);
 
@@ -3908,7 +3951,7 @@ var SpacesServiceImpl = class {
 var getChannelId = (channel) => `user-channel/${channel}`;
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
-import { Trigger as Trigger5 } from "@dxos/async";
+import { Trigger as Trigger6 } from "@dxos/async";
 import { Context as Context9 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 import { failUndefined as failUndefined3 } from "@dxos/debug";
@@ -3918,12 +3961,12 @@ import { invariant as invariant13 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
 import { PublicKey as PublicKey10 } from "@dxos/keys";
 import { log as log13 } from "@dxos/log";
-import { InvalidStorageVersionError, STORAGE_VERSION as STORAGE_VERSION2, trace as trace7 } from "@dxos/protocols";
+import { InvalidStorageVersionError, STORAGE_VERSION as STORAGE_VERSION2, trace as trace8 } from "@dxos/protocols";
 import { Invitation as Invitation6 } from "@dxos/protocols/proto/dxos/client/services";
 import { BlobStore } from "@dxos/teleport-extension-object-sync";
 import { trace as Trace2 } from "@dxos/tracing";
 import { safeInstanceof } from "@dxos/util";
-function _ts_decorate5(decorators, target, key, desc) {
+function _ts_decorate6(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -3940,7 +3983,7 @@ var ServiceContext = class ServiceContext2 {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this.modelFactory = modelFactory;
-    this.initialized = new Trigger5();
+    this.initialized = new Trigger6();
     this.dataServiceSubscriptions = new DataServiceSubscriptions();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = PublicKey10.random().toHex();
@@ -3978,7 +4021,7 @@ var ServiceContext = class ServiceContext2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    log13.trace("dxos.sdk.service-context.open", trace7.begin({
+    log13.trace("dxos.sdk.service-context.open", trace8.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file15,
@@ -3994,7 +4037,7 @@ var ServiceContext = class ServiceContext2 {
     if (this.identityManager.identity) {
       await this._initialize(ctx);
     }
-    log13.trace("dxos.sdk.service-context.open", trace7.end({
+    log13.trace("dxos.sdk.service-context.open", trace8.end({
       id: this._instanceId
     }), {
       F: __dxlog_file15,
@@ -4157,13 +4200,13 @@ var ServiceContext = class ServiceContext2 {
     await identity.space.spaceState.addCredentialProcessor(this._deviceSpaceSync);
   }
 };
-_ts_decorate5([
+_ts_decorate6([
   Trace2.span()
 ], ServiceContext.prototype, "open", null);
-_ts_decorate5([
+_ts_decorate6([
   Trace2.span()
 ], ServiceContext.prototype, "_initialize", null);
-ServiceContext = _ts_decorate5([
+ServiceContext = _ts_decorate6([
   safeInstanceof("dxos.client-services.ServiceContext"),
   Trace2.resource()
 ], ServiceContext);
@@ -4193,10 +4236,10 @@ var ServiceRegistry = class {
 };
 
 // packages/sdk/client-services/src/packlets/locks/browser.ts
-import { asyncTimeout, Trigger as Trigger6 } from "@dxos/async";
+import { asyncTimeout, Trigger as Trigger7 } from "@dxos/async";
 import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
 import { log as log14, logInfo } from "@dxos/log";
-function _ts_decorate6(decorators, target, key, desc) {
+function _ts_decorate7(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -4214,7 +4257,7 @@ var Message;
 var Lock = class {
   constructor({ lockKey, onAcquire, onRelease }) {
     this._broadcastChannel = new BroadcastChannel("vault-resource-lock");
-    this._releaseTrigger = new Trigger6();
+    this._releaseTrigger = new Trigger7();
     this._lockKey = lockKey;
     this._onAcquire = onAcquire;
     this._onRelease = onRelease;
@@ -4274,13 +4317,13 @@ var Lock = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    const acquired = new Trigger6();
+    const acquired = new Trigger7();
     void navigator.locks.request(this._lockKey, {
       steal
     }, async () => {
       await this._onAcquire?.();
       acquired.wake();
-      this._releaseTrigger = new Trigger6();
+      this._releaseTrigger = new Trigger7();
       await this._releaseTrigger.wait();
       log14("releasing lock...", void 0, {
         F: __dxlog_file16,
@@ -4309,7 +4352,7 @@ var Lock = class {
     });
   }
 };
-_ts_decorate6([
+_ts_decorate7([
   logInfo
 ], Lock.prototype, "lockKey", null);
 var isLocked = (lockPath) => {
@@ -4378,7 +4421,7 @@ import { log as log16 } from "@dxos/log";
 import { WebsocketSignalManager } from "@dxos/messaging";
 import { ModelFactory } from "@dxos/model-factory";
 import { createSimplePeerTransportFactory, NetworkManager } from "@dxos/network-manager";
-import { trace as trace8 } from "@dxos/protocols";
+import { trace as trace9 } from "@dxos/protocols";
 import { SystemStatus } from "@dxos/protocols/proto/dxos/client/services";
 import { TextModel } from "@dxos/text-model";
 import { TRACE_PROCESSOR, trace as Trace3 } from "@dxos/tracing";
@@ -4632,7 +4675,7 @@ var SystemServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
-function _ts_decorate7(decorators, target, key, desc) {
+function _ts_decorate8(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -4802,7 +4845,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       return;
     }
     const traceId = PublicKey11.random().toHex();
-    log16.trace("dxos.client-services.host.open", trace8.begin({
+    log16.trace("dxos.client-services.host.open", trace9.begin({
       id: traceId
     }), {
       F: __dxlog_file17,
@@ -4901,7 +4944,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    log16.trace("dxos.client-services.host.open", trace8.end({
+    log16.trace("dxos.client-services.host.open", trace9.end({
       id: traceId
     }), {
       F: __dxlog_file17,
@@ -4942,7 +4985,7 @@ var ClientServicesHost = class ClientServicesHost2 {
   }
   async reset() {
     const traceId = PublicKey11.random().toHex();
-    log16.trace("dxos.sdk.client-services-host.reset", trace8.begin({
+    log16.trace("dxos.sdk.client-services-host.reset", trace9.begin({
       id: traceId
     }), {
       F: __dxlog_file17,
@@ -4964,7 +5007,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    log16.trace("dxos.sdk.client-services-host.reset", trace8.end({
+    log16.trace("dxos.sdk.client-services-host.reset", trace9.end({
       id: traceId
     }), {
       F: __dxlog_file17,
@@ -4994,21 +5037,21 @@ var ClientServicesHost = class ClientServicesHost2 {
     return identity;
   }
 };
-_ts_decorate7([
+_ts_decorate8([
   Trace3.info()
 ], ClientServicesHost.prototype, "_opening", void 0);
-_ts_decorate7([
+_ts_decorate8([
   Trace3.info()
 ], ClientServicesHost.prototype, "_open", void 0);
-_ts_decorate7([
+_ts_decorate8([
   synchronized3,
   Trace3.span()
 ], ClientServicesHost.prototype, "open", null);
-_ts_decorate7([
+_ts_decorate8([
   synchronized3,
   Trace3.span()
 ], ClientServicesHost.prototype, "close", null);
-ClientServicesHost = _ts_decorate7([
+ClientServicesHost = _ts_decorate8([
   Trace3.resource()
 ], ClientServicesHost);
 
@@ -5045,4 +5088,4 @@ export {
   createDefaultModelFactory,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-OC4A3Z5C.mjs.map
+//# sourceMappingURL=chunk-UUQTHQF5.mjs.map