@tramvai/module-common 2.51.2 → 2.56.1

package/lib/command/commandLineRunner.d.ts

@@ -1,29 +1,27 @@
-import type { CommandLineDescription, CommandLine, CommandLines } from '@tramvai/core';
-import type { METRICS_MODULE_TOKEN } from '@tramvai/tokens-metrics';
+import type { CommandLineDescription, CommandLineRunner as Interface, CommandLines } from '@tramvai/core';
+import type { COMMAND_LINE_EXECUTION_END_TOKEN } from '@tramvai/tokens-core-private';
 import type { Container, ExtractDependencyType, Provider } from '@tinkoff/dippy';
 import type { ExecutionContext, EXECUTION_CONTEXT_MANAGER_TOKEN, LOGGER_TOKEN } from '@tramvai/tokens-common';
 type Deps = {
     lines: CommandLines;
     rootDi: Container;
     logger: ExtractDependencyType<typeof LOGGER_TOKEN>;
-    metrics: ExtractDependencyType<typeof METRICS_MODULE_TOKEN> | null;
     executionContextManager: ExtractDependencyType<typeof EXECUTION_CONTEXT_MANAGER_TOKEN>;
+    executionEndHandlers: ExtractDependencyType<typeof COMMAND_LINE_EXECUTION_END_TOKEN> | null;
 };
-export declare class CommandLineRunner implements CommandLine {
+export declare class CommandLineRunner implements Interface {
     lines: Deps['lines'];
     rootDi: Deps['rootDi'];
     log: ReturnType<Deps['logger']>;
-    metrics: Deps['metrics'];
     executionContextManager: Deps['executionContextManager'];
-    private metricsInstance;
+    executionEndHandlers: Deps['executionEndHandlers'];
     private executionContextByDi;
     private abortControllerByDi;
-    constructor({ lines, rootDi, logger, metrics, executionContextManager }: Deps);
+    constructor({ lines, rootDi, logger, executionContextManager, executionEndHandlers }: Deps);
     run(type: keyof CommandLines, status: keyof CommandLineDescription, providers?: Provider[], customDi?: Container): Promise<Container>;
     resolveExecutionContextFromDi(di: Container): ExecutionContext | null;
     private createLineChain;
     private instanceExecute;
-    private createDurationMetric;
     private throwError;
 }
 export {};

package/lib/command/defaultLines.d.ts

@@ -1,16 +1,5 @@
+import type { CommandLineDescription } from '@tramvai/core';
 export declare const lines: {
-    server: {
-        init: import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/core").Command>[];
-        close: import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/core").Command>[];
-        customer: import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/core").Command>[];
-        spa: import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/core").Command>[];
-        afterSpa: import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/core").Command>[];
-    };
-    client: {
-        init: import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/core").Command>[];
-        close: import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/core").Command>[];
-        customer: import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/core").Command>[];
-        spa: import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/core").Command>[];
-        afterSpa: import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/core").Command>[];
-    };
+    server: CommandLineDescription;
+    client: CommandLineDescription;
 };

package/lib/index.browser.js

@@ -19,9 +19,8 @@ import { createEvent, createReducer, convertAction, createDispatcher, devTools,
 import { format, parse } from '@tinkoff/url';
 import isEmpty from '@tinkoff/utils/is/empty';
 import values from '@tinkoff/utils/object/values';
-import { METRICS_MODULE_TOKEN } from '@tramvai/tokens-metrics';
+import { COMMAND_LINE_TIMING_INFO_TOKEN, COMMAND_LINE_EXECUTION_END_TOKEN } from '@tramvai/tokens-core-private';
 import { createChildContainer, provide as provide$1, Scope as Scope$1, createToken as createToken$1 } from '@tinkoff/dippy';
-import noop from '@tinkoff/utils/function/noop';
 import { isSilentError, ConditionFailError, ExecutionAbortError } from '@tinkoff/errors';
 import { PubSub } from '@tinkoff/pubsub';
 import identity from '@tinkoff/utils/function/identity';
@@ -384,7 +383,6 @@ function createConsumerContext({ di, dispatcherContext, pubsub, store }) {
     });
 }
 
-const DEFAULT_BUCKETS = [0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 20, 40, 60];
 const resolveDi = (type, status, diContainer, providers) => {
     let di = diContainer;
     if (status === 'customer' && type !== 'client') {
@@ -398,14 +396,14 @@ const resolveDi = (type, status, diContainer, providers) => {
     return di;
 };
 class CommandLineRunner {
-    constructor({ lines, rootDi, logger, metrics, executionContextManager }) {
+    constructor({ lines, rootDi, logger, executionContextManager, executionEndHandlers }) {
         this.executionContextByDi = new WeakMap();
         this.abortControllerByDi = new WeakMap();
         this.lines = lines;
         this.rootDi = rootDi;
         this.log = logger('command:command-line-runner');
-        this.metrics = metrics;
         this.executionContextManager = executionContextManager;
+        this.executionEndHandlers = executionEndHandlers;
     }
     run(type, status, providers, customDi) {
         const di = customDi !== null && customDi !== void 0 ? customDi : resolveDi(type, status, this.rootDi, providers);
@@ -415,26 +413,36 @@ class CommandLineRunner {
             type,
             status,
         });
+        const timingInfo = {};
+        di.register({ provide: COMMAND_LINE_TIMING_INFO_TOKEN, useValue: timingInfo });
         return (this.lines[type][status]
             .reduce((chain, line) => {
             return chain.then(() => {
-                const doneMetric = this.createDurationMetric();
+                const lineName = line.toString();
+                timingInfo[lineName] = { start: performance.now() };
                 // eslint-disable-next-line promise/no-nesting
                 return Promise.resolve()
                     .then(() => {
-                    return this.executionContextManager.withContext(rootExecutionContext, `command-line:${line.toString()}`, async (executionContext, abortController) => {
+                    return this.executionContextManager.withContext(rootExecutionContext, `command-line:${lineName}`, async (executionContext, abortController) => {
                         this.executionContextByDi.set(di, executionContext);
                         this.abortControllerByDi.set(di, abortController);
                         await this.createLineChain(di, line);
                     });
                 })
-                    .finally(() => doneMetric({ line: line.toString() }));
+                    .finally(() => {
+                    timingInfo[lineName].end = performance.now();
+                });
             });
         }, Promise.resolve())
             // После завершения цепочки отдаем context выполнения
             .finally(() => {
             this.executionContextByDi.delete(di);
             this.abortControllerByDi.delete(di);
+            if (this.executionEndHandlers) {
+                for (const executionEndHandler of this.executionEndHandlers) {
+                    executionEndHandler(di, type, status, timingInfo);
+                }
+            }
         })
             .then(() => di));
     }
@@ -506,21 +514,6 @@ class CommandLineRunner {
             this.throwError(err, di);
         });
     }
-    createDurationMetric() {
-        if (!this.metrics) {
-            return noop;
-        }
-        // Мы должны только один раз создавать инстанс метрики
-        if (!this.metricsInstance) {
-            this.metricsInstance = this.metrics.histogram({
-                name: `command_line_runner_execution_time`,
-                help: 'Command line processing duration',
-                labelNames: ['line'],
-                buckets: DEFAULT_BUCKETS,
-            });
-        }
-        return this.metricsInstance.startTimer();
-    }
     // eslint-disable-next-line class-methods-use-this
     throwError(err, di) {
         // eslint-disable-next-line no-param-reassign
@@ -565,11 +558,11 @@ CommandModule = __decorate([
                     lines: COMMAND_LINES_TOKEN,
                     rootDi: DI_TOKEN,
                     logger: LOGGER_TOKEN,
-                    metrics: {
-                        token: METRICS_MODULE_TOKEN,
+                    executionContextManager: EXECUTION_CONTEXT_MANAGER_TOKEN,
+                    executionEndHandlers: {
+                        token: COMMAND_LINE_EXECUTION_END_TOKEN,
                         optional: true,
                     },
-                    executionContextManager: EXECUTION_CONTEXT_MANAGER_TOKEN,
                 },
             }),
             provide$1({

package/lib/index.es.js

@@ -19,9 +19,8 @@ import { FASTIFY_REQUEST } from '@tramvai/tokens-server-private';
 import { format, parse } from '@tinkoff/url';
 import isEmpty from '@tinkoff/utils/is/empty';
 import values from '@tinkoff/utils/object/values';
-import { METRICS_MODULE_TOKEN } from '@tramvai/tokens-metrics';
+import { COMMAND_LINE_TIMING_INFO_TOKEN, COMMAND_LINE_EXECUTION_END_TOKEN } from '@tramvai/tokens-core-private';
 import { createChildContainer, provide as provide$1, Scope as Scope$1, createToken as createToken$1 } from '@tinkoff/dippy';
-import noop from '@tinkoff/utils/function/noop';
 import { isSilentError, ConditionFailError, ExecutionAbortError } from '@tinkoff/errors';
 import { PubSub } from '@tinkoff/pubsub';
 import identity from '@tinkoff/utils/function/identity';
@@ -377,7 +376,6 @@ function createConsumerContext({ di, dispatcherContext, pubsub, store }) {
     });
 }
 
-const DEFAULT_BUCKETS = [0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 20, 40, 60];
 const resolveDi = (type, status, diContainer, providers) => {
     let di = diContainer;
     if (status === 'customer' && type !== 'client') {
@@ -391,14 +389,14 @@ const resolveDi = (type, status, diContainer, providers) => {
     return di;
 };
 class CommandLineRunner {
-    constructor({ lines, rootDi, logger, metrics, executionContextManager }) {
+    constructor({ lines, rootDi, logger, executionContextManager, executionEndHandlers }) {
         this.executionContextByDi = new WeakMap();
         this.abortControllerByDi = new WeakMap();
         this.lines = lines;
         this.rootDi = rootDi;
         this.log = logger('command:command-line-runner');
-        this.metrics = metrics;
         this.executionContextManager = executionContextManager;
+        this.executionEndHandlers = executionEndHandlers;
     }
     run(type, status, providers, customDi) {
         const di = customDi !== null && customDi !== void 0 ? customDi : resolveDi(type, status, this.rootDi, providers);
@@ -408,26 +406,36 @@ class CommandLineRunner {
             type,
             status,
         });
+        const timingInfo = {};
+        di.register({ provide: COMMAND_LINE_TIMING_INFO_TOKEN, useValue: timingInfo });
         return (this.lines[type][status]
             .reduce((chain, line) => {
             return chain.then(() => {
-                const doneMetric = this.createDurationMetric();
+                const lineName = line.toString();
+                timingInfo[lineName] = { start: performance.now() };
                 // eslint-disable-next-line promise/no-nesting
                 return Promise.resolve()
                     .then(() => {
-                    return this.executionContextManager.withContext(rootExecutionContext, `command-line:${line.toString()}`, async (executionContext, abortController) => {
+                    return this.executionContextManager.withContext(rootExecutionContext, `command-line:${lineName}`, async (executionContext, abortController) => {
                         this.executionContextByDi.set(di, executionContext);
                         this.abortControllerByDi.set(di, abortController);
                         await this.createLineChain(di, line);
                     });
                 })
-                    .finally(() => doneMetric({ line: line.toString() }));
+                    .finally(() => {
+                    timingInfo[lineName].end = performance.now();
+                });
             });
         }, Promise.resolve())
             // После завершения цепочки отдаем context выполнения
             .finally(() => {
             this.executionContextByDi.delete(di);
             this.abortControllerByDi.delete(di);
+            if (this.executionEndHandlers) {
+                for (const executionEndHandler of this.executionEndHandlers) {
+                    executionEndHandler(di, type, status, timingInfo);
+                }
+            }
         })
             .then(() => di));
     }
@@ -499,21 +507,6 @@ class CommandLineRunner {
             this.throwError(err, di);
         });
     }
-    createDurationMetric() {
-        if (!this.metrics) {
-            return noop;
-        }
-        // Мы должны только один раз создавать инстанс метрики
-        if (!this.metricsInstance) {
-            this.metricsInstance = this.metrics.histogram({
-                name: `command_line_runner_execution_time`,
-                help: 'Command line processing duration',
-                labelNames: ['line'],
-                buckets: DEFAULT_BUCKETS,
-            });
-        }
-        return this.metricsInstance.startTimer();
-    }
     // eslint-disable-next-line class-methods-use-this
     throwError(err, di) {
         // eslint-disable-next-line no-param-reassign
@@ -558,11 +551,11 @@ CommandModule = __decorate([
                     lines: COMMAND_LINES_TOKEN,
                     rootDi: DI_TOKEN,
                     logger: LOGGER_TOKEN,
-                    metrics: {
-                        token: METRICS_MODULE_TOKEN,
+                    executionContextManager: EXECUTION_CONTEXT_MANAGER_TOKEN,
+                    executionEndHandlers: {
+                        token: COMMAND_LINE_EXECUTION_END_TOKEN,
                         optional: true,
                     },
-                    executionContextManager: EXECUTION_CONTEXT_MANAGER_TOKEN,
                 },
             }),
             provide$1({

package/lib/index.js

@@ -21,9 +21,8 @@ var tokensServerPrivate = require('@tramvai/tokens-server-private');
 var url = require('@tinkoff/url');
 var isEmpty = require('@tinkoff/utils/is/empty');
 var values = require('@tinkoff/utils/object/values');
-var tokensMetrics = require('@tramvai/tokens-metrics');
+var tokensCorePrivate = require('@tramvai/tokens-core-private');
 var dippy = require('@tinkoff/dippy');
-var noop = require('@tinkoff/utils/function/noop');
 var errors = require('@tinkoff/errors');
 var pubsub = require('@tinkoff/pubsub');
 var identity = require('@tinkoff/utils/function/identity');
@@ -48,7 +47,6 @@ var pathOr__default = /*#__PURE__*/_interopDefaultLegacy(pathOr);
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
 var isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(isEmpty);
 var values__default = /*#__PURE__*/_interopDefaultLegacy(values);
-var noop__default = /*#__PURE__*/_interopDefaultLegacy(noop);
 var identity__default = /*#__PURE__*/_interopDefaultLegacy(identity);
 var objectMap__default = /*#__PURE__*/_interopDefaultLegacy(objectMap);
 var uniq__default = /*#__PURE__*/_interopDefaultLegacy(uniq);
@@ -396,7 +394,6 @@ function createConsumerContext({ di, dispatcherContext, pubsub, store }) {
     });
 }
 
-const DEFAULT_BUCKETS = [0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2.5, 5, 10, 20, 40, 60];
 const resolveDi = (type, status, diContainer, providers) => {
     let di = diContainer;
     if (status === 'customer' && type !== 'client') {
@@ -410,14 +407,14 @@ const resolveDi = (type, status, diContainer, providers) => {
     return di;
 };
 class CommandLineRunner {
-    constructor({ lines, rootDi, logger, metrics, executionContextManager }) {
+    constructor({ lines, rootDi, logger, executionContextManager, executionEndHandlers }) {
         this.executionContextByDi = new WeakMap();
         this.abortControllerByDi = new WeakMap();
         this.lines = lines;
         this.rootDi = rootDi;
         this.log = logger('command:command-line-runner');
-        this.metrics = metrics;
         this.executionContextManager = executionContextManager;
+        this.executionEndHandlers = executionEndHandlers;
     }
     run(type, status, providers, customDi) {
         const di = customDi !== null && customDi !== void 0 ? customDi : resolveDi(type, status, this.rootDi, providers);
@@ -427,26 +424,36 @@ class CommandLineRunner {
             type,
             status,
         });
+        const timingInfo = {};
+        di.register({ provide: tokensCorePrivate.COMMAND_LINE_TIMING_INFO_TOKEN, useValue: timingInfo });
         return (this.lines[type][status]
             .reduce((chain, line) => {
             return chain.then(() => {
-                const doneMetric = this.createDurationMetric();
+                const lineName = line.toString();
+                timingInfo[lineName] = { start: performance.now() };
                 // eslint-disable-next-line promise/no-nesting
                 return Promise.resolve()
                     .then(() => {
-                    return this.executionContextManager.withContext(rootExecutionContext, `command-line:${line.toString()}`, async (executionContext, abortController) => {
+                    return this.executionContextManager.withContext(rootExecutionContext, `command-line:${lineName}`, async (executionContext, abortController) => {
                         this.executionContextByDi.set(di, executionContext);
                         this.abortControllerByDi.set(di, abortController);
                         await this.createLineChain(di, line);
                     });
                 })
-                    .finally(() => doneMetric({ line: line.toString() }));
+                    .finally(() => {
+                    timingInfo[lineName].end = performance.now();
+                });
             });
         }, Promise.resolve())
             // После завершения цепочки отдаем context выполнения
             .finally(() => {
             this.executionContextByDi.delete(di);
             this.abortControllerByDi.delete(di);
+            if (this.executionEndHandlers) {
+                for (const executionEndHandler of this.executionEndHandlers) {
+                    executionEndHandler(di, type, status, timingInfo);
+                }
+            }
         })
             .then(() => di));
     }
@@ -518,21 +525,6 @@ class CommandLineRunner {
             this.throwError(err, di);
         });
     }
-    createDurationMetric() {
-        if (!this.metrics) {
-            return noop__default["default"];
-        }
-        // Мы должны только один раз создавать инстанс метрики
-        if (!this.metricsInstance) {
-            this.metricsInstance = this.metrics.histogram({
-                name: `command_line_runner_execution_time`,
-                help: 'Command line processing duration',
-                labelNames: ['line'],
-                buckets: DEFAULT_BUCKETS,
-            });
-        }
-        return this.metricsInstance.startTimer();
-    }
     // eslint-disable-next-line class-methods-use-this
     throwError(err, di) {
         // eslint-disable-next-line no-param-reassign
@@ -577,11 +569,11 @@ exports.CommandModule = tslib.__decorate([
                     lines: core.COMMAND_LINES_TOKEN,
                     rootDi: core.DI_TOKEN,
                     logger: tokensCommon.LOGGER_TOKEN,
-                    metrics: {
-                        token: tokensMetrics.METRICS_MODULE_TOKEN,
+                    executionContextManager: tokensCommon.EXECUTION_CONTEXT_MANAGER_TOKEN,
+                    executionEndHandlers: {
+                        token: tokensCorePrivate.COMMAND_LINE_EXECUTION_END_TOKEN,
                         optional: true,
                     },
-                    executionContextManager: tokensCommon.EXECUTION_CONTEXT_MANAGER_TOKEN,
                 },
             }),
             dippy.provide({

package/lib/providers/clientProviders.d.ts

@@ -1,5 +1,5 @@
 export declare const providers: (import("@tramvai/core").Provider<unknown, import("@tinkoff/dippy").BaseTokenInterface<{
     stores: Record<string, any>;
 }>> | import("@tramvai/core").Provider<{
-    commandLineRunner: import("@tinkoff/dippy").BaseTokenInterface<import("@tramvai/tokens-core").CommandLine>;
+    commandLineRunner: import("@tinkoff/dippy").BaseTokenInterface<import("@tramvai/core").CommandLineRunner>;
 }, import("@tinkoff/dippy").MultiTokenInterface<import("@tramvai/core").Command>>)[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-common",
-  "version": "2.51.2",
+  "version": "2.56.1",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -33,28 +33,28 @@
     "@tinkoff/lru-cache-nano": "^7.8.1",
     "@tinkoff/pubsub": "0.5.5",
     "@tinkoff/url": "0.8.4",
-    "@tramvai/experiments": "2.51.2",
-    "@tramvai/module-cookie": "2.51.2",
-    "@tramvai/module-environment": "2.51.2",
-    "@tramvai/module-log": "2.51.2",
-    "@tramvai/tokens-child-app": "2.51.2",
-    "@tramvai/tokens-common": "2.51.2",
-    "@tramvai/tokens-render": "2.51.2",
-    "@tramvai/tokens-server-private": "2.51.2",
-    "@tramvai/types-actions-state-context": "2.51.2",
+    "@tramvai/experiments": "2.56.1",
+    "@tramvai/module-cookie": "2.56.1",
+    "@tramvai/module-environment": "2.56.1",
+    "@tramvai/module-log": "2.56.1",
+    "@tramvai/tokens-child-app": "2.56.1",
+    "@tramvai/tokens-core-private": "2.56.1",
+    "@tramvai/tokens-common": "2.56.1",
+    "@tramvai/tokens-render": "2.56.1",
+    "@tramvai/tokens-server-private": "2.56.1",
+    "@tramvai/types-actions-state-context": "2.56.1",
     "hoist-non-react-statics": "^3.3.1",
     "node-abort-controller": "^3.0.1"
   },
   "peerDependencies": {
-    "@tinkoff/dippy": "0.8.9",
+    "@tinkoff/dippy": "0.8.10",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "2.51.2",
-    "@tramvai/core": "2.51.2",
-    "@tramvai/papi": "2.51.2",
-    "@tramvai/react": "2.51.2",
-    "@tramvai/state": "2.51.2",
-    "@tramvai/tokens-metrics": "2.51.2",
-    "@tramvai/tokens-server": "2.51.2",
+    "@tramvai/cli": "2.56.1",
+    "@tramvai/core": "2.56.1",
+    "@tramvai/papi": "2.56.1",
+    "@tramvai/react": "2.56.1",
+    "@tramvai/state": "2.56.1",
+    "@tramvai/tokens-server": "2.56.1",
     "react": ">=16.14.0",
     "tslib": "^2.4.0"
   },