@dxos/client-services 0.1.55-main.ff36828 → 0.1.55

package/dist/types/src/packlets/logging/logging-service.d.ts

@@ -1,5 +1,5 @@
 import { Stream } from '@dxos/codec-protobuf';
-import { LogEntry, LoggingService, QueryLogsRequest } from '@dxos/protocols/proto/dxos/client/services';
+import { LogEntry, LoggingService, Metrics, QueryLogsRequest, ControlMetricsRequest, ControlMetricsResponse, QueryMetricsRequest } from '@dxos/protocols/proto/dxos/client/services';
 /**
  * Logging service used to spy on logs of the host.
  */
@@ -7,6 +7,8 @@ export declare class LoggingServiceImpl implements LoggingService {
     private readonly _logs;
     open(): Promise<void>;
     close(): Promise<void>;
+    controlMetrics({ reset, record }: ControlMetricsRequest): Promise<ControlMetricsResponse>;
+    queryMetrics({ interval }: QueryMetricsRequest): Stream<Metrics>;
     queryLogs(request: QueryLogsRequest): Stream<LogEntry>;
     private _logProcessor;
 }

package/dist/types/src/packlets/logging/logging-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logging-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/logging/logging-service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAGxG;;GAEG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IAEhD,IAAI;IAIJ,KAAK;IAKX,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAAC,QAAQ,CAAC;IA4CtD,OAAO,CAAC,aAAa,CAEnB;CACH"}
+{"version":3,"file":"logging-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/logging/logging-service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,OAAO,EACL,QAAQ,EACR,cAAc,EACd,OAAO,EACP,gBAAgB,EAChB,qBAAqB,EACrB,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,4CAA4C,CAAC;AAGpD;;GAEG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgC;IAEhD,IAAI;IAIJ,KAAK;IAKL,cAAc,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAc/F,YAAY,CAAC,EAAE,QAAQ,EAAE,EAAE,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC;IA4BhE,SAAS,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAAC,QAAQ,CAAC;IA4CtD,OAAO,CAAC,aAAa,CAEnB;CACH"}

package/dist/types/src/packlets/system/system-service.d.ts

@@ -1,7 +1,7 @@
 import { Event } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
 import { Config } from '@dxos/config';
-import { SystemStatus, SystemStatusResponse, SystemService, UpdateSystemStatusRequest } from '@dxos/protocols/proto/dxos/client/services';
+import { SystemService, SystemStatus, UpdateStatusRequest, QueryStatusRequest, QueryStatusResponse } from '@dxos/protocols/proto/dxos/client/services';
 import { MaybePromise } from '@dxos/util';
 export type SystemServiceOptions = {
     config?: Config;
@@ -10,9 +10,6 @@ export type SystemServiceOptions = {
     onUpdateStatus: (status: SystemStatus) => MaybePromise<void>;
     onReset: () => MaybePromise<void>;
 };
-/**
- *
- */
 export declare class SystemServiceImpl implements SystemService {
     private readonly _config?;
     private readonly _statusUpdate;
@@ -21,8 +18,8 @@ export declare class SystemServiceImpl implements SystemService {
     private readonly _onReset;
     constructor({ config, statusUpdate, onUpdateStatus, getCurrentStatus, onReset }: SystemServiceOptions);
     getConfig(): Promise<import("@dxos/config").ConfigProto>;
-    updateStatus({ status }: UpdateSystemStatusRequest): Promise<void>;
-    queryStatus(): Stream<SystemStatusResponse>;
+    updateStatus({ status }: UpdateStatusRequest): Promise<void>;
+    queryStatus({ interval }?: QueryStatusRequest): Stream<QueryStatusResponse>;
     reset(): Promise<void>;
 }
 //# sourceMappingURL=system-service.d.ts.map

package/dist/types/src/packlets/system/system-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"system-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/system/system-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,oBAAoB,EACpB,aAAa,EACb,yBAAyB,EAC1B,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,cAAc,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7D,OAAO,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;CACnC,CAAC;AAEF;;GAEG;AACH,qBAAa,iBAAkB,YAAW,aAAa;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAiC;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAuC;IACrE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA2C;IAC7E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyC;IACzE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;gBAE/C,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,OAAO,EAAE,EAAE,oBAAoB;IAQ/F,SAAS;IAIT,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,yBAAyB;IAIxD,WAAW,IAAI,MAAM,CAAC,oBAAoB,CAAC;IAiBrC,KAAK;CAGZ"}
+{"version":3,"file":"system-service.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/system/system-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EACL,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,cAAc,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7D,OAAO,EAAE,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;CACnC,CAAC;AAEF,qBAAa,iBAAkB,YAAW,aAAa;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAiC;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAuC;IACrE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA2C;IAC7E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyC;IACzE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;gBAE/C,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,OAAO,EAAE,EAAE,oBAAoB;IAQ/F,SAAS;IAIT,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,mBAAmB;IAKlD,WAAW,CAAC,EAAE,QAAgB,EAAE,GAAE,kBAAuB,GAAG,MAAM,CAAC,mBAAmB,CAAC;IAgBjF,KAAK;CAGZ"}

package/package.json

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

package/src/packlets/logging/logging-service.ts

@@ -5,8 +5,16 @@
 import { Event } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
 import { LogLevel, LogProcessor, LogEntry as NaturalLogEntry, getContextFromEntry, log } from '@dxos/log';
-import { LogEntry, LoggingService, QueryLogsRequest } from '@dxos/protocols/proto/dxos/client/services';
-import { jsonify } from '@dxos/util';
+import {
+  LogEntry,
+  LoggingService,
+  Metrics,
+  QueryLogsRequest,
+  ControlMetricsRequest,
+  ControlMetricsResponse,
+  QueryMetricsRequest,
+} from '@dxos/protocols/proto/dxos/client/services';
+import { jsonify, numericalValues, tracer } from '@dxos/util';
 
 /**
  * Logging service used to spy on logs of the host.
@@ -23,6 +31,48 @@ export class LoggingServiceImpl implements LoggingService {
     log.runtimeConfig.processors.splice(index, 1);
   }
 
+  async controlMetrics({ reset, record }: ControlMetricsRequest): Promise<ControlMetricsResponse> {
+    if (reset) {
+      tracer.clear();
+    }
+
+    if (record === true) {
+      tracer.start();
+    } else if (record === false) {
+      tracer.stop();
+    }
+
+    return { recording: tracer.recording };
+  }
+
+  queryMetrics({ interval }: QueryMetricsRequest): Stream<Metrics> {
+    // TODO(burdon): Map all traces; how to bind to reducer/metrics shape (e.g., numericalValues)?
+    const createNumericalValues = (key: string) => {
+      const consume = tracer.get(key) ?? [];
+      return { key, stats: numericalValues(consume, 'duration') };
+    };
+
+    return new Stream(({ next }) => {
+      const update = () => {
+        const metrics: Metrics = {
+          timestamp: new Date(),
+          values: [
+            createNumericalValues('dxos.echo.pipeline.control'),
+            createNumericalValues('dxos.echo.pipeline.data'),
+          ],
+        };
+
+        next(metrics);
+      };
+
+      update();
+      const i = setInterval(update, interval);
+      return () => {
+        clearInterval(i);
+      };
+    });
+  }
+
   queryLogs(request: QueryLogsRequest): Stream<LogEntry> {
     return new Stream<LogEntry>(({ ctx, next }) => {
       const handler = (entry: NaturalLogEntry) => {

package/src/packlets/system/system-service.test.ts

@@ -6,7 +6,7 @@ import { expect } from 'chai';
 
 import { Event, Trigger } from '@dxos/async';
 import { Config } from '@dxos/config';
-import { SystemStatus, SystemStatusResponse, SystemService } from '@dxos/protocols/proto/dxos/client/services';
+import { SystemService, SystemStatus, QueryStatusResponse } from '@dxos/protocols/proto/dxos/client/services';
 import { beforeEach, describe, test } from '@dxos/test';
 
 import { SystemServiceImpl } from './system-service';
@@ -55,8 +55,8 @@ describe('SystemService', () => {
   });
 
   test('queryStatus returns initial status', async () => {
-    const status = new Trigger<SystemStatusResponse>();
-    systemService.queryStatus().subscribe((response) => {
+    const status = new Trigger<QueryStatusResponse>();
+    systemService.queryStatus({}).subscribe((response) => {
       status.wake(response);
     });
     expect(await status.wait()).to.deep.equal({ status: SystemStatus.ACTIVE });
@@ -64,7 +64,7 @@ describe('SystemService', () => {
 
   test('queryStatus streams status changes', async () => {
     const statuses: SystemStatus[] = [];
-    systemService.queryStatus().subscribe(({ status }) => {
+    systemService.queryStatus({}).subscribe(({ status }) => {
       statuses.push(status);
     });
     changeStatus(SystemStatus.INACTIVE);

package/src/packlets/system/system-service.ts

@@ -6,10 +6,11 @@ import { Event } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';
 import { Config } from '@dxos/config';
 import {
-  SystemStatus,
-  SystemStatusResponse,
   SystemService,
-  UpdateSystemStatusRequest,
+  SystemStatus,
+  UpdateStatusRequest,
+  QueryStatusRequest,
+  QueryStatusResponse,
 } from '@dxos/protocols/proto/dxos/client/services';
 import { MaybePromise } from '@dxos/util';
 
@@ -21,9 +22,6 @@ export type SystemServiceOptions = {
   onReset: () => MaybePromise<void>;
 };
 
-/**
- *
- */
 export class SystemServiceImpl implements SystemService {
   private readonly _config?: SystemServiceOptions['config'];
   private readonly _statusUpdate: SystemServiceOptions['statusUpdate'];
@@ -43,11 +41,12 @@ export class SystemServiceImpl implements SystemService {
     return this._config?.values ?? {};
   }
 
-  async updateStatus({ status }: UpdateSystemStatusRequest) {
+  async updateStatus({ status }: UpdateStatusRequest) {
     await this._onUpdateStatus(status);
   }
 
-  queryStatus(): Stream<SystemStatusResponse> {
+  // TODO(burdon): Standardize interval option in stream request?
+  queryStatus({ interval = 3_000 }: QueryStatusRequest = {}): Stream<QueryStatusResponse> {
     return new Stream(({ next }) => {
       const update = () => {
         next({ status: this._getCurrentStatus() });
@@ -55,10 +54,9 @@ export class SystemServiceImpl implements SystemService {
 
       update();
       const unsubscribe = this._statusUpdate.on(() => update());
-      const interval = setInterval(update, 3000);
-
+      const i = setInterval(update, interval);
       return () => {
-        clearInterval(interval);
+        clearInterval(i);
         unsubscribe();
       };
     });