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

package/dist/types/src/packlets/services/client-rpc-server.d.ts

@@ -14,6 +14,8 @@ export declare class ClientRpcServer {
     private readonly _handlerCache;
     private readonly _handleCall;
     private readonly _handleStream;
+    private readonly _callMetrics;
+    private get _services();
     constructor(params: ClientRpcServerParams);
     open(): Promise<void>;
     close(): Promise<void>;

package/dist/types/src/packlets/services/client-rpc-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-rpc-server.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/client-rpc-server.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,KAAK,GAAG,EAAuB,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE7E,OAAO,EAA4B,KAAK,cAAc,EAAsB,MAAM,WAAW,CAAC;AAC9F,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,eAAe,CAAC,cAAc,CAAC,CAAC;IACjD,UAAU,CAAC,EAAE,CACX,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,YAAY,CAAC,GAAG,CAAC,KACxD,OAAO,CAAC,GAAG,CAAC,CAAC;IAClB,YAAY,CAAC,EAAE,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,KAClD,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;CAChC,GAAG,IAAI,CAAC,cAAc,EAAE,aAAa,GAAG,eAAe,CAAC,CAAC;AAE1D,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;IACnE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IACxE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsC;IAClE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAwC;gBAE1D,MAAM,EAAE,qBAAqB;IAgCnC,IAAI;IAIJ,KAAK;IAIX,OAAO,CAAC,kBAAkB;CAiB3B"}
+{"version":3,"file":"client-rpc-server.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/services/client-rpc-server.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,KAAK,GAAG,EAAuB,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE7E,OAAO,EAA4B,KAAK,cAAc,EAAsB,MAAM,WAAW,CAAC;AAE9F,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,eAAe,CAAC,cAAc,CAAC,CAAC;IACjD,UAAU,CAAC,EAAE,CACX,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,YAAY,CAAC,GAAG,CAAC,KACxD,OAAO,CAAC,GAAG,CAAC,CAAC;IAClB,YAAY,CAAC,EAAE,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,GAAG,EACX,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,MAAM,CAAC,GAAG,CAAC,KAClD,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;CAChC,GAAG,IAAI,CAAC,cAAc,EAAE,aAAa,GAAG,eAAe,CAAC,CAAC;AAE1D,qBACa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkC;IACnE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IACxE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsC;IAClE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAwC;IAGtE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoB;IAGjD,OAAO,KAAK,SAAS,GAEpB;gBAEW,MAAM,EAAE,qBAAqB;IAuCnC,IAAI;IAIJ,KAAK;IAIX,OAAO,CAAC,kBAAkB;CAiB3B"}

package/dist/types/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const DXOS_VERSION = "0.3.3-main.f2ca85a";
+export declare const DXOS_VERSION = "0.3.3-main.f990aad";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.3.3-main.f2ca85a",
+  "version": "0.3.3-main.f990aad",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -22,44 +22,44 @@
   ],
   "dependencies": {
     "platform": "^1.3.6",
-    "@dxos/async": "0.3.3-main.f2ca85a",
-    "@dxos/client-protocol": "0.3.3-main.f2ca85a",
-    "@dxos/codec-protobuf": "0.3.3-main.f2ca85a",
-    "@dxos/config": "0.3.3-main.f2ca85a",
-    "@dxos/context": "0.3.3-main.f2ca85a",
-    "@dxos/credentials": "0.3.3-main.f2ca85a",
-    "@dxos/crypto": "0.3.3-main.f2ca85a",
-    "@dxos/debug": "0.3.3-main.f2ca85a",
-    "@dxos/document-model": "0.3.3-main.f2ca85a",
-    "@dxos/echo-db": "0.3.3-main.f2ca85a",
-    "@dxos/echo-pipeline": "0.3.3-main.f2ca85a",
-    "@dxos/echo-schema": "0.3.3-main.f2ca85a",
-    "@dxos/feed-store": "0.3.3-main.f2ca85a",
-    "@dxos/invariant": "0.3.3-main.f2ca85a",
-    "@dxos/keyring": "0.3.3-main.f2ca85a",
-    "@dxos/keys": "0.3.3-main.f2ca85a",
-    "@dxos/lock-file": "0.3.3-main.f2ca85a",
-    "@dxos/log": "0.3.3-main.f2ca85a",
-    "@dxos/messaging": "0.3.3-main.f2ca85a",
-    "@dxos/model-factory": "0.3.3-main.f2ca85a",
-    "@dxos/network-manager": "0.3.3-main.f2ca85a",
-    "@dxos/node-std": "0.3.3-main.f2ca85a",
-    "@dxos/protocols": "0.3.3-main.f2ca85a",
-    "@dxos/random-access-storage": "0.3.3-main.f2ca85a",
-    "@dxos/rpc": "0.3.3-main.f2ca85a",
-    "@dxos/teleport": "0.3.3-main.f2ca85a",
-    "@dxos/teleport-extension-gossip": "0.3.3-main.f2ca85a",
-    "@dxos/teleport-extension-object-sync": "0.3.3-main.f2ca85a",
-    "@dxos/text-model": "0.3.3-main.f2ca85a",
-    "@dxos/timeframe": "0.3.3-main.f2ca85a",
-    "@dxos/tracing": "0.3.3-main.f2ca85a",
-    "@dxos/util": "0.3.3-main.f2ca85a",
-    "@dxos/websocket-rpc": "0.3.3-main.f2ca85a"
+    "@dxos/async": "0.3.3-main.f990aad",
+    "@dxos/client-protocol": "0.3.3-main.f990aad",
+    "@dxos/codec-protobuf": "0.3.3-main.f990aad",
+    "@dxos/config": "0.3.3-main.f990aad",
+    "@dxos/context": "0.3.3-main.f990aad",
+    "@dxos/credentials": "0.3.3-main.f990aad",
+    "@dxos/crypto": "0.3.3-main.f990aad",
+    "@dxos/debug": "0.3.3-main.f990aad",
+    "@dxos/document-model": "0.3.3-main.f990aad",
+    "@dxos/echo-db": "0.3.3-main.f990aad",
+    "@dxos/echo-pipeline": "0.3.3-main.f990aad",
+    "@dxos/echo-schema": "0.3.3-main.f990aad",
+    "@dxos/feed-store": "0.3.3-main.f990aad",
+    "@dxos/invariant": "0.3.3-main.f990aad",
+    "@dxos/keyring": "0.3.3-main.f990aad",
+    "@dxos/keys": "0.3.3-main.f990aad",
+    "@dxos/lock-file": "0.3.3-main.f990aad",
+    "@dxos/log": "0.3.3-main.f990aad",
+    "@dxos/messaging": "0.3.3-main.f990aad",
+    "@dxos/model-factory": "0.3.3-main.f990aad",
+    "@dxos/network-manager": "0.3.3-main.f990aad",
+    "@dxos/node-std": "0.3.3-main.f990aad",
+    "@dxos/protocols": "0.3.3-main.f990aad",
+    "@dxos/random-access-storage": "0.3.3-main.f990aad",
+    "@dxos/rpc": "0.3.3-main.f990aad",
+    "@dxos/teleport": "0.3.3-main.f990aad",
+    "@dxos/teleport-extension-gossip": "0.3.3-main.f990aad",
+    "@dxos/teleport-extension-object-sync": "0.3.3-main.f990aad",
+    "@dxos/text-model": "0.3.3-main.f990aad",
+    "@dxos/timeframe": "0.3.3-main.f990aad",
+    "@dxos/tracing": "0.3.3-main.f990aad",
+    "@dxos/util": "0.3.3-main.f990aad",
+    "@dxos/websocket-rpc": "0.3.3-main.f990aad"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.3.3-main.f2ca85a"
+    "@dxos/signal": "0.3.3-main.f990aad"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/services/client-rpc-server.ts

@@ -6,6 +6,7 @@ import { type ClientServices } from '@dxos/client-protocol';
 import { type Any, type ServiceHandler, Stream } from '@dxos/codec-protobuf';
 import { raise } from '@dxos/debug';
 import { parseMethodName, RpcPeer, type RpcPeerOptions, type ServiceBundle } from '@dxos/rpc';
+import { MapCounter, trace } from '@dxos/tracing';
 import { type MaybePromise } from '@dxos/util';
 
 import { type ServiceRegistry } from './service-registry';
@@ -24,6 +25,7 @@ export type ClientRpcServerParams = {
   ) => MaybePromise<Stream<Any>>;
 } & Omit<RpcPeerOptions, 'callHandler' | 'streamHandler'>;
 
+@trace.resource()
 export class ClientRpcServer {
   private readonly _serviceRegistry: ServiceRegistry<ClientServices>;
   private readonly _rpcPeer: RpcPeer;
@@ -31,6 +33,14 @@ export class ClientRpcServer {
   private readonly _handleCall: ClientRpcServerParams['handleCall'];
   private readonly _handleStream: ClientRpcServerParams['handleStream'];
 
+  @trace.metricsCounter()
+  private readonly _callMetrics = new MapCounter();
+
+  @trace.info()
+  private get _services() {
+    return Object.keys(this._serviceRegistry.services);
+  }
+
   constructor(params: ClientRpcServerParams) {
     const { serviceRegistry, handleCall, handleStream, ...rpcOptions } = params;
     this._handleCall = handleCall;
@@ -43,6 +53,8 @@ export class ClientRpcServer {
         const [serviceName, methodName] = parseMethodName(method);
         const handler = (method: string, params: Any) => this._getServiceHandler(serviceName).call(method, params);
 
+        this._callMetrics.inc(`${serviceName}.${methodName} request`);
+
         if (this._handleCall) {
           return this._handleCall(methodName, params, handler);
         } else {
@@ -54,8 +66,13 @@ export class ClientRpcServer {
         const handler = (method: string, params: Any) =>
           this._getServiceHandler(serviceName).callStream(method, params);
 
+        this._callMetrics.inc(`${serviceName}.${methodName} request stream`);
+
         if (this._handleStream) {
-          return Stream.unwrapPromise(this._handleStream(methodName, params, handler));
+          return Stream.map(Stream.unwrapPromise(this._handleStream(methodName, params, handler)), (data) => {
+            this._callMetrics.inc(`${serviceName}.${methodName} response stream`);
+            return data;
+          });
         } else {
           return handler(methodName, params);
         }

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.3.3-main.f2ca85a";
+export const DXOS_VERSION = "0.3.3-main.f990aad";