@tramvai/module-common 4.41.46 → 4.41.49

package/lib/CommonModule.browser.js

@@ -4,8 +4,7 @@ import { Module, provide, Scope, BUNDLE_LIST_TOKEN, DI_TOKEN } from '@tramvai/co
 import { EnvironmentModule } from '@tramvai/module-environment';
 import { CookieModule } from '@tramvai/module-cookie';
 import { LogModule } from '@tramvai/module-log';
-import { Hooks } from '@tinkoff/hook-runner';
-import { HOOK_TOKEN, COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ADDITIONAL_BUNDLE_TOKEN, LOGGER_TOKEN, CONTEXT_TOKEN, PUBSUB_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN } from '@tramvai/tokens-common';
+import { COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ADDITIONAL_BUNDLE_TOKEN, LOGGER_TOKEN, CONTEXT_TOKEN, PUBSUB_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN } from '@tramvai/tokens-common';
 import { BundleManager } from './bundleManager/bundleManager.browser.js';
 import { ComponentRegistry } from './componentRegistry/componentRegistry.browser.js';
 import { RequestManagerModule } from './requestManager/RequestManagerModule.browser.browser.js';
@@ -19,12 +18,14 @@ import { ActionModule } from './actions/ActionModule.browser.js';
 import { StateModule } from './state/StateModule.browser.js';
 import { CacheModule } from './cache/CacheModule.browser.js';
 import { ExecutionContextManager } from './executionContext/executionContextManager.browser.js';
+import { TramvaiHookModule } from './hook/HookModule.browser.js';
 
 let CommonModule = class CommonModule {
 };
 CommonModule = __decorate([
     Module({
         imports: [
+            TramvaiHookModule,
             CommandModule,
             EnvironmentModule,
             PubSubModule,
@@ -39,13 +40,6 @@ CommonModule = __decorate([
         ],
         providers: [
             provide({
-                // Инстанс хук системы
-                provide: HOOK_TOKEN,
-                scope: Scope.SINGLETON,
-                useClass: Hooks,
-            }),
-            provide({
-                // Регистр ui компонентов
                 provide: COMPONENT_REGISTRY_TOKEN,
                 scope: Scope.SINGLETON,
                 useClass: ComponentRegistry,
@@ -54,7 +48,6 @@ CommonModule = __decorate([
                 },
             }),
             provide({
-                // Управление бандлами, хранение и получение
                 provide: BUNDLE_MANAGER_TOKEN,
                 scope: Scope.SINGLETON,
                 useFactory: ({ additionalBundleList, ...bundleManagerDeps }) => {
@@ -77,7 +70,6 @@ CommonModule = __decorate([
                 },
             }),
             provide({
-                //  Клиентский контекст исполнения
                 provide: CONTEXT_TOKEN,
                 scope: Scope.REQUEST,
                 useFactory: createConsumerContext,

package/lib/CommonModule.es.js

@@ -4,8 +4,7 @@ import { Module, provide, Scope, BUNDLE_LIST_TOKEN, DI_TOKEN } from '@tramvai/co
 import { EnvironmentModule } from '@tramvai/module-environment';
 import { CookieModule } from '@tramvai/module-cookie';
 import { LogModule } from '@tramvai/module-log';
-import { Hooks } from '@tinkoff/hook-runner';
-import { HOOK_TOKEN, COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ADDITIONAL_BUNDLE_TOKEN, LOGGER_TOKEN, CONTEXT_TOKEN, PUBSUB_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN } from '@tramvai/tokens-common';
+import { COMPONENT_REGISTRY_TOKEN, BUNDLE_MANAGER_TOKEN, ADDITIONAL_BUNDLE_TOKEN, LOGGER_TOKEN, CONTEXT_TOKEN, PUBSUB_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_TOKEN, EXECUTION_CONTEXT_MANAGER_TOKEN } from '@tramvai/tokens-common';
 import { BundleManager } from './bundleManager/bundleManager.es.js';
 import { ComponentRegistry } from './componentRegistry/componentRegistry.es.js';
 import { RequestManagerModule } from './requestManager/RequestManagerModule.es.js';
@@ -19,12 +18,14 @@ import { ActionModule } from './actions/ActionModule.es.js';
 import { StateModule } from './state/StateModule.es.js';
 import { CacheModule } from './cache/CacheModule.es.js';
 import { ExecutionContextManager } from './executionContext/executionContextManager.es.js';
+import { TramvaiHookModule } from './hook/HookModule.es.js';
 
 let CommonModule = class CommonModule {
 };
 CommonModule = __decorate([
     Module({
         imports: [
+            TramvaiHookModule,
             CommandModule,
             EnvironmentModule,
             PubSubModule,
@@ -39,13 +40,6 @@ CommonModule = __decorate([
         ],
         providers: [
             provide({
-                // Инстанс хук системы
-                provide: HOOK_TOKEN,
-                scope: Scope.SINGLETON,
-                useClass: Hooks,
-            }),
-            provide({
-                // Регистр ui компонентов
                 provide: COMPONENT_REGISTRY_TOKEN,
                 scope: Scope.SINGLETON,
                 useClass: ComponentRegistry,
@@ -54,7 +48,6 @@ CommonModule = __decorate([
                 },
             }),
             provide({
-                // Управление бандлами, хранение и получение
                 provide: BUNDLE_MANAGER_TOKEN,
                 scope: Scope.SINGLETON,
                 useFactory: ({ additionalBundleList, ...bundleManagerDeps }) => {
@@ -77,7 +70,6 @@ CommonModule = __decorate([
                 },
             }),
             provide({
-                //  Клиентский контекст исполнения
                 provide: CONTEXT_TOKEN,
                 scope: Scope.REQUEST,
                 useFactory: createConsumerContext,

package/lib/CommonModule.js

@@ -8,7 +8,6 @@ var core = require('@tramvai/core');
 var moduleEnvironment = require('@tramvai/module-environment');
 var moduleCookie = require('@tramvai/module-cookie');
 var moduleLog = require('@tramvai/module-log');
-var hookRunner = require('@tinkoff/hook-runner');
 var tokensCommon = require('@tramvai/tokens-common');
 var bundleManager = require('./bundleManager/bundleManager.js');
 var componentRegistry = require('./componentRegistry/componentRegistry.js');
@@ -23,6 +22,7 @@ var ActionModule = require('./actions/ActionModule.js');
 var StateModule = require('./state/StateModule.js');
 var CacheModule = require('./cache/CacheModule.js');
 var executionContextManager = require('./executionContext/executionContextManager.js');
+var HookModule = require('./hook/HookModule.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -33,6 +33,7 @@ exports.CommonModule = class CommonModule {
 exports.CommonModule = tslib.__decorate([
     core.Module({
         imports: [
+            HookModule.TramvaiHookModule,
             CommandModule.CommandModule,
             moduleEnvironment.EnvironmentModule,
             PubSubModule.PubSubModule,
@@ -47,13 +48,6 @@ exports.CommonModule = tslib.__decorate([
         ],
         providers: [
             core.provide({
-                // Инстанс хук системы
-                provide: tokensCommon.HOOK_TOKEN,
-                scope: core.Scope.SINGLETON,
-                useClass: hookRunner.Hooks,
-            }),
-            core.provide({
-                // Регистр ui компонентов
                 provide: tokensCommon.COMPONENT_REGISTRY_TOKEN,
                 scope: core.Scope.SINGLETON,
                 useClass: componentRegistry.ComponentRegistry,
@@ -62,7 +56,6 @@ exports.CommonModule = tslib.__decorate([
                 },
             }),
             core.provide({
-                // Управление бандлами, хранение и получение
                 provide: tokensCommon.BUNDLE_MANAGER_TOKEN,
                 scope: core.Scope.SINGLETON,
                 useFactory: ({ additionalBundleList, ...bundleManagerDeps }) => {
@@ -85,7 +78,6 @@ exports.CommonModule = tslib.__decorate([
                 },
             }),
             core.provide({
-                //  Клиентский контекст исполнения
                 provide: tokensCommon.CONTEXT_TOKEN,
                 scope: core.Scope.REQUEST,
                 useFactory: createConsumerContext.createConsumerContext,

package/lib/actions/actionPageRunner.es.js

@@ -31,7 +31,7 @@ class ActionPageRunner {
 You can find more detailed information from "action-execution-error" logs, and find relative logs by using the same "x-request-id" header`,
                         unfinishedActions,
                     });
-                    abortController.abort();
+                    abortController.abort('Page actions were aborted because of timeout');
                     // eslint-disable-next-line @typescript-eslint/no-use-before-define
                     endChecker();
                 }, this.deps.limitTime);
@@ -92,6 +92,7 @@ You can find more detailed information from "action-execution-error" logs, and f
                                 error: new ExecutionAbortError({
                                     message: `Execution aborted in context "${contextName}"`,
                                     contextName,
+                                    reason: executionContext.abortSignal.reason,
                                 }),
                                 event: `action-execution-error`,
                                 message: `${actionName} has exceeded timeout of ${this.deps.limitTime}ms, execution results will be ignored.

package/lib/actions/actionPageRunner.js

@@ -35,7 +35,7 @@ class ActionPageRunner {
 You can find more detailed information from "action-execution-error" logs, and find relative logs by using the same "x-request-id" header`,
                         unfinishedActions,
                     });
-                    abortController.abort();
+                    abortController.abort('Page actions were aborted because of timeout');
                     // eslint-disable-next-line @typescript-eslint/no-use-before-define
                     endChecker();
                 }, this.deps.limitTime);
@@ -96,6 +96,7 @@ You can find more detailed information from "action-execution-error" logs, and f
                                 error: new errors.ExecutionAbortError({
                                     message: `Execution aborted in context "${contextName}"`,
                                     contextName,
+                                    reason: executionContext.abortSignal.reason,
                                 }),
                                 event: `action-execution-error`,
                                 message: `${actionName} has exceeded timeout of ${this.deps.limitTime}ms, execution results will be ignored.

package/lib/command/commandLineRunner.browser.js

@@ -130,7 +130,7 @@ class CommandLineRunner {
                 command: name,
             });
             // in case if any error happens during line execution results from other line handlers will not be used anyway
-            (_a = this.abortControllerByDi.get(di)) === null || _a === void 0 ? void 0 : _a.abort();
+            (_a = this.abortControllerByDi.get(di)) === null || _a === void 0 ? void 0 : _a.abort(err);
             this.throwError(err, di);
         });
     }

package/lib/command/commandLineRunner.es.js

@@ -130,7 +130,7 @@ class CommandLineRunner {
                 command: name,
             });
             // in case if any error happens during line execution results from other line handlers will not be used anyway
-            (_a = this.abortControllerByDi.get(di)) === null || _a === void 0 ? void 0 : _a.abort();
+            (_a = this.abortControllerByDi.get(di)) === null || _a === void 0 ? void 0 : _a.abort(err);
             this.throwError(err, di);
         });
     }

package/lib/command/commandLineRunner.js

@@ -134,7 +134,7 @@ class CommandLineRunner {
                 command: name,
             });
             // in case if any error happens during line execution results from other line handlers will not be used anyway
-            (_a = this.abortControllerByDi.get(di)) === null || _a === void 0 ? void 0 : _a.abort();
+            (_a = this.abortControllerByDi.get(di)) === null || _a === void 0 ? void 0 : _a.abort(err);
             this.throwError(err, di);
         });
     }

package/lib/executionContext/executionContextManager.browser.js

@@ -1,5 +1,4 @@
 import { ExecutionAbortError } from '@tinkoff/errors';
-import { AbortController } from 'node-abort-controller';
 
 const EMPTY_VALUES = {};
 const normalizeOptions = (nameOrOptions) => {

package/lib/executionContext/executionContextManager.es.js

@@ -1,5 +1,4 @@
 import { ExecutionAbortError } from '@tinkoff/errors';
-import { AbortController } from 'node-abort-controller';
 
 const EMPTY_VALUES = {};
 const normalizeOptions = (nameOrOptions) => {

package/lib/executionContext/executionContextManager.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var errors = require('@tinkoff/errors');
-var nodeAbortController = require('node-abort-controller');
 
 const EMPTY_VALUES = {};
 const normalizeOptions = (nameOrOptions) => {
@@ -21,7 +20,7 @@ class ExecutionContextManager {
                 contextName,
             });
         }
-        const abortController = new nodeAbortController.AbortController();
+        const abortController = new AbortController();
         let abortListener;
         let values = selfValues;
         if (parentContext) {

package/lib/hook/HookModule.browser.js

@@ -0,0 +1,22 @@
+import { declareModule, provide, Scope } from '@tinkoff/dippy';
+import { TAPABLE_HOOK_FACTORY_TOKEN } from '@tramvai/core';
+import { TapableHooks, Hooks } from '@tinkoff/hook-runner';
+import { HOOK_TOKEN } from '@tramvai/tokens-common';
+
+const TramvaiHookModule = declareModule({
+    name: 'TramvaiHookModule',
+    providers: [
+        provide({
+            provide: TAPABLE_HOOK_FACTORY_TOKEN,
+            scope: Scope.SINGLETON,
+            useClass: TapableHooks,
+        }),
+        provide({
+            provide: HOOK_TOKEN,
+            scope: Scope.SINGLETON,
+            useClass: Hooks,
+        }),
+    ],
+});
+
+export { TramvaiHookModule };

package/lib/hook/HookModule.d.ts

@@ -0,0 +1,4 @@
+export declare const TramvaiHookModule: import("@tinkoff/dippy/lib/modules/module.h").ModuleClass & Partial<import("@tinkoff/dippy/lib/modules/module.h").ModuleSecretParameters> & {
+    [x: string]: (...args: any[]) => import("@tinkoff/dippy").ModuleType;
+};
+//# sourceMappingURL=HookModule.d.ts.map

package/lib/hook/HookModule.es.js

@@ -0,0 +1,22 @@
+import { declareModule, provide, Scope } from '@tinkoff/dippy';
+import { TAPABLE_HOOK_FACTORY_TOKEN } from '@tramvai/core';
+import { TapableHooks, Hooks } from '@tinkoff/hook-runner';
+import { HOOK_TOKEN } from '@tramvai/tokens-common';
+
+const TramvaiHookModule = declareModule({
+    name: 'TramvaiHookModule',
+    providers: [
+        provide({
+            provide: TAPABLE_HOOK_FACTORY_TOKEN,
+            scope: Scope.SINGLETON,
+            useClass: TapableHooks,
+        }),
+        provide({
+            provide: HOOK_TOKEN,
+            scope: Scope.SINGLETON,
+            useClass: Hooks,
+        }),
+    ],
+});
+
+export { TramvaiHookModule };

package/lib/hook/HookModule.js

@@ -0,0 +1,26 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var dippy = require('@tinkoff/dippy');
+var core = require('@tramvai/core');
+var hookRunner = require('@tinkoff/hook-runner');
+var tokensCommon = require('@tramvai/tokens-common');
+
+const TramvaiHookModule = dippy.declareModule({
+    name: 'TramvaiHookModule',
+    providers: [
+        dippy.provide({
+            provide: core.TAPABLE_HOOK_FACTORY_TOKEN,
+            scope: dippy.Scope.SINGLETON,
+            useClass: hookRunner.TapableHooks,
+        }),
+        dippy.provide({
+            provide: tokensCommon.HOOK_TOKEN,
+            scope: dippy.Scope.SINGLETON,
+            useClass: hookRunner.Hooks,
+        }),
+    ],
+});
+
+exports.TramvaiHookModule = TramvaiHookModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-common",
-  "version": "4.41.46",
+  "version": "4.41.49",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -32,35 +32,34 @@
   "dependencies": {
     "@akashbabu/lfu-cache": "1.0.2",
     "@tinkoff/errors": "0.5.3",
-    "@tinkoff/hook-runner": "0.6.3",
+    "@tinkoff/hook-runner": "0.6.4",
     "@tinkoff/lru-cache-nano": "^7.9.0",
     "@tinkoff/pubsub": "0.7.3",
     "@tinkoff/url": "0.10.3",
-    "@tramvai/experiments": "4.41.46",
-    "@tramvai/module-cookie": "4.41.46",
-    "@tramvai/module-environment": "4.41.46",
-    "@tramvai/module-log": "4.41.46",
+    "@tramvai/experiments": "4.41.49",
+    "@tramvai/module-cookie": "4.41.49",
+    "@tramvai/module-environment": "4.41.49",
+    "@tramvai/module-log": "4.41.49",
     "@tramvai/safe-strings": "0.7.9",
-    "@tramvai/tokens-child-app": "4.41.46",
-    "@tramvai/tokens-common": "4.41.46",
-    "@tramvai/tokens-core-private": "4.41.46",
-    "@tramvai/tokens-metrics": "4.41.46",
-    "@tramvai/tokens-render": "4.41.46",
-    "@tramvai/tokens-router": "4.41.46",
-    "@tramvai/tokens-server-private": "4.41.46",
-    "@tramvai/types-actions-state-context": "4.41.46",
-    "hoist-non-react-statics": "^3.3.1",
-    "node-abort-controller": "^3.0.1"
+    "@tramvai/tokens-child-app": "4.41.49",
+    "@tramvai/tokens-common": "4.41.49",
+    "@tramvai/tokens-core-private": "4.41.49",
+    "@tramvai/tokens-metrics": "4.41.49",
+    "@tramvai/tokens-render": "4.41.49",
+    "@tramvai/tokens-router": "4.41.49",
+    "@tramvai/tokens-server-private": "4.41.49",
+    "@tramvai/types-actions-state-context": "4.41.49",
+    "hoist-non-react-statics": "^3.3.1"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "0.10.11",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/cli": "4.41.46",
-    "@tramvai/core": "4.41.46",
-    "@tramvai/papi": "4.41.46",
-    "@tramvai/react": "4.41.46",
-    "@tramvai/state": "4.41.46",
-    "@tramvai/tokens-server": "4.41.46",
+    "@tramvai/cli": "4.41.49",
+    "@tramvai/core": "4.41.49",
+    "@tramvai/papi": "4.41.49",
+    "@tramvai/react": "4.41.49",
+    "@tramvai/state": "4.41.49",
+    "@tramvai/tokens-server": "4.41.49",
     "react": ">=16.14.0",
     "tslib": "^2.4.0"
   },