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

package/dist/lib/node/index.cjs

@@ -2489,9 +2489,21 @@ var SpaceInvitationProtocol = class {
 var import_codec_protobuf9 = require("@dxos/codec-protobuf");
 var import_debug3 = require("@dxos/debug");
 var import_rpc = require("@dxos/rpc");
-var ClientRpcServer = class {
+var import_tracing3 = require("@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 import_tracing3.MapCounter();
     const { serviceRegistry, handleCall, handleStream, ...rpcOptions } = params;
     this._handleCall = handleCall;
     this._handleStream = handleStream;
@@ -2501,6 +2513,7 @@ var ClientRpcServer = class {
       callHandler: (method, params2) => {
         const [serviceName, methodName] = (0, import_rpc.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 {
@@ -2510,14 +2523,21 @@ var ClientRpcServer = class {
       streamHandler: (method, params2) => {
         const [serviceName, methodName] = (0, import_rpc.parseMethodName)(method);
         const handler = (method2, params3) => this._getServiceHandler(serviceName).callStream(method2, params3);
+        this._callMetrics.inc(`${serviceName}.${methodName} request stream`);
         if (this._handleStream) {
-          return import_codec_protobuf9.Stream.unwrapPromise(this._handleStream(methodName, params2, handler));
+          return import_codec_protobuf9.Stream.map(import_codec_protobuf9.Stream.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();
   }
@@ -2536,6 +2556,15 @@ var ClientRpcServer = class {
     return this._handlerCache.get(serviceName);
   }
 };
+_ts_decorate3([
+  import_tracing3.trace.metricsCounter()
+], ClientRpcServer.prototype, "_callMetrics", void 0);
+_ts_decorate3([
+  import_tracing3.trace.info()
+], ClientRpcServer.prototype, "_services", null);
+ClientRpcServer = _ts_decorate3([
+  import_tracing3.trace.resource()
+], ClientRpcServer);
 
 // packages/sdk/client-services/src/packlets/services/diagnostics.ts
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
@@ -2576,7 +2605,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.e5ff429";
 
 // 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 +2624,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
   {
     (0, import_invariant9.invariant)(clientServices.LoggingService, "SystemService is not available.", {
       F: __dxlog_file10,
-      L: 88,
+      L: 92,
       S: void 0,
       A: [
         "clientServices.LoggingService",
@@ -2628,6 +2657,11 @@ 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;
+    diagnostics.swarms = serviceContext.networkManager.connectionLog?.swarms;
   }
   diagnostics.config = config.values;
   return diagnostics;
@@ -2641,7 +2675,7 @@ var getProperties = (space) => {
   } catch (err) {
     import_log8.log.warn(err.message, void 0, {
       F: __dxlog_file10,
-      L: 145,
+      L: 160,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2710,7 +2744,7 @@ var import_log13 = require("@dxos/log");
 var import_protocols10 = require("@dxos/protocols");
 var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
-var import_tracing4 = require("@dxos/tracing");
+var import_tracing5 = require("@dxos/tracing");
 var import_util7 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
@@ -2737,7 +2771,7 @@ var import_protocols7 = require("@dxos/protocols");
 var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe2 = require("@dxos/timeframe");
-var import_tracing3 = require("@dxos/tracing");
+var import_tracing4 = require("@dxos/tracing");
 var import_util5 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
@@ -3009,7 +3043,7 @@ var NotarizationTeleportExtension = class extends import_teleport2.RpcExtension
 };
 
 // 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);
@@ -3341,32 +3375,32 @@ var DataSpace = class DataSpace2 {
     this.stateUpdate.emit();
   }
 };
-_ts_decorate3([
+_ts_decorate4([
   import_async11.synchronized
 ], DataSpace.prototype, "open", null);
-_ts_decorate3([
+_ts_decorate4([
   import_async11.synchronized
 ], DataSpace.prototype, "close", null);
-_ts_decorate3([
-  import_tracing3.trace.span({
+_ts_decorate4([
+  import_tracing4.trace.span({
     showInBrowserTimeline: true
   })
 ], DataSpace.prototype, "initializeDataPipeline", null);
-_ts_decorate3([
-  import_tracing3.trace.span({
+_ts_decorate4([
+  import_tracing4.trace.span({
     showInBrowserTimeline: true
   })
 ], DataSpace.prototype, "_initializeAndReadControlPipeline", null);
-_ts_decorate3([
+_ts_decorate4([
   (0, import_debug4.timed)(1e4)
 ], DataSpace.prototype, "_createWritableFeeds", null);
-_ts_decorate3([
+_ts_decorate4([
   import_async11.synchronized
 ], DataSpace.prototype, "activate", null);
-_ts_decorate3([
+_ts_decorate4([
   import_async11.synchronized
 ], DataSpace.prototype, "deactivate", null);
-DataSpace = _ts_decorate3([
+DataSpace = _ts_decorate4([
   (0, import_async11.trackLeaks)("open", "close")
 ], DataSpace);
 
@@ -3440,7 +3474,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);
@@ -3756,19 +3790,19 @@ var DataSpaceManager = class DataSpaceManager2 {
     return dataSpace;
   }
 };
-_ts_decorate4([
+_ts_decorate5([
   import_async12.synchronized
 ], DataSpaceManager.prototype, "open", null);
-_ts_decorate4([
+_ts_decorate5([
   import_async12.synchronized
 ], DataSpaceManager.prototype, "close", null);
-_ts_decorate4([
+_ts_decorate5([
   import_async12.synchronized
 ], DataSpaceManager.prototype, "createSpace", null);
-_ts_decorate4([
+_ts_decorate5([
   import_async12.synchronized
 ], DataSpaceManager.prototype, "acceptSpace", null);
-DataSpaceManager = _ts_decorate4([
+DataSpaceManager = _ts_decorate5([
   (0, import_async12.trackLeaks)("open", "close")
 ], DataSpaceManager);
 
@@ -3994,7 +4028,7 @@ var SpacesServiceImpl = class {
 var getChannelId = (channel) => `user-channel/${channel}`;
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
-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);
@@ -4228,15 +4262,15 @@ var ServiceContext = class ServiceContext2 {
     await identity.space.spaceState.addCredentialProcessor(this._deviceSpaceSync);
   }
 };
-_ts_decorate5([
-  import_tracing4.trace.span()
+_ts_decorate6([
+  import_tracing5.trace.span()
 ], ServiceContext.prototype, "open", null);
-_ts_decorate5([
-  import_tracing4.trace.span()
+_ts_decorate6([
+  import_tracing5.trace.span()
 ], ServiceContext.prototype, "_initialize", null);
-ServiceContext = _ts_decorate5([
+ServiceContext = _ts_decorate6([
   (0, import_util7.safeInstanceof)("dxos.client-services.ServiceContext"),
-  import_tracing4.trace.resource()
+  import_tracing5.trace.resource()
 ], ServiceContext);
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
@@ -4255,7 +4289,7 @@ var import_network_manager2 = require("@dxos/network-manager");
 var import_protocols12 = require("@dxos/protocols");
 var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
 var import_text_model = require("@dxos/text-model");
-var import_tracing5 = require("@dxos/tracing");
+var import_tracing6 = require("@dxos/tracing");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
 
 // packages/sdk/client-services/src/packlets/services/service-registry.ts
@@ -4330,7 +4364,7 @@ var DevicesServiceImpl = class {
 var import_invariant14 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
 var import_log14 = require("@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);
@@ -4380,7 +4414,7 @@ var Lock = class {
     await import_lock_file.LockFile.release(this._fileHandle);
   }
 };
-_ts_decorate6([
+_ts_decorate7([
   import_log14.logInfo
 ], Lock.prototype, "lockKey", null);
 var isLocked = (lockPath) => import_lock_file.LockFile.isLocked(lockPath);
@@ -4638,7 +4672,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);
@@ -4675,7 +4709,7 @@ var ClientServicesHost = class ClientServicesHost2 {
     lockKey,
     callbacks
   } = {}) {
-    this._tracingService = import_tracing5.TRACE_PROCESSOR.createTraceSender();
+    this._tracingService = import_tracing6.TRACE_PROCESSOR.createTraceSender();
     this._statusUpdate = new import_async17.Event();
     this._opening = false;
     this._open = false;
@@ -5000,22 +5034,22 @@ var ClientServicesHost = class ClientServicesHost2 {
     return identity;
   }
 };
-_ts_decorate7([
-  import_tracing5.trace.info()
+_ts_decorate8([
+  import_tracing6.trace.info()
 ], ClientServicesHost.prototype, "_opening", void 0);
-_ts_decorate7([
-  import_tracing5.trace.info()
+_ts_decorate8([
+  import_tracing6.trace.info()
 ], ClientServicesHost.prototype, "_open", void 0);
-_ts_decorate7([
+_ts_decorate8([
   import_async17.synchronized,
-  import_tracing5.trace.span()
+  import_tracing6.trace.span()
 ], ClientServicesHost.prototype, "open", null);
-_ts_decorate7([
+_ts_decorate8([
   import_async17.synchronized,
-  import_tracing5.trace.span()
+  import_tracing6.trace.span()
 ], ClientServicesHost.prototype, "close", null);
-ClientServicesHost = _ts_decorate7([
-  import_tracing5.trace.resource()
+ClientServicesHost = _ts_decorate8([
+  import_tracing6.trace.resource()
 ], ClientServicesHost);
 
 // packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
@@ -5096,7 +5130,7 @@ var ShellRuntimeImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
-function _ts_decorate8(decorators, target, key, desc) {
+function _ts_decorate9(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);
@@ -5209,7 +5243,7 @@ var IFrameHostRuntime = class {
     });
   }
 };
-_ts_decorate8([
+_ts_decorate9([
   import_log17.logInfo
 ], IFrameHostRuntime.prototype, "origin", void 0);
 
@@ -5303,7 +5337,7 @@ var import_invariant17 = require("@dxos/invariant");
 var import_log19 = require("@dxos/log");
 var import_rpc4 = require("@dxos/rpc");
 var import_util13 = require("@dxos/util");
-function _ts_decorate9(decorators, target, key, desc) {
+function _ts_decorate10(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);
@@ -5459,10 +5493,10 @@ var WorkerSession = class {
     }).then(callback);
   }
 };
-_ts_decorate9([
+_ts_decorate10([
   import_log19.logInfo
 ], WorkerSession.prototype, "origin", void 0);
-_ts_decorate9([
+_ts_decorate10([
   import_log19.logInfo
 ], WorkerSession.prototype, "lockKey", void 0);