@tramvai/module-child-app 5.15.3 → 5.16.2

package/lib/shared/child/singletonProviders.browser.js

@@ -71,11 +71,21 @@ const getChildProviders = (appDi, loadableStats) => {
             provide: DISPATCHER_CONTEXT_TOKEN,
             scope: Scope.REQUEST,
             useFactory: ({ dispatcher, middlewares, initialState, parentAllowedStores }) => {
-                const parentDispatcherContext = appDi
-                    .get(optional(ASYNC_LOCAL_STORAGE_TOKEN))
-                    ?.getStore()
-                    ?.tramvaiRequestDi?.get(DISPATCHER_CONTEXT_TOKEN) ??
-                    appDi.get(DISPATCHER_CONTEXT_TOKEN);
+                const parentDispatcherContext = typeof window !== 'undefined'
+                    ? // ALS is not existing on the client,
+                        // also if we resolve `DISPATCHER_CONTEXT_TOKEN` from Root DI in the server-side,
+                        // it will lead to memory leak (with circular dependency) because of reducers event handlers:
+                        // RootDi.recordValues -> DispatcherContext.storeInstances -> ReducerStore.listeners -> listener.this -> ChildDispatcherContext.parentDispatcherContext -> DispatcherContext
+                        appDi.get(DISPATCHER_CONTEXT_TOKEN)
+                    : appDi
+                        .get(optional(ASYNC_LOCAL_STORAGE_TOKEN))
+                        ?.getStore()
+                        ?.tramvaiRequestDi?.get(DISPATCHER_CONTEXT_TOKEN);
+                if (!parentDispatcherContext) {
+                    // this should not happen because we add subscribtion to root execution context abortSignal
+                    // for Child Apps command line runner, and this token will not be resolved
+                    throw Error('Cannot find DispatcherContext for current request, unexpected critical error');
+                }
                 return new ChildDispatcherContext({
                     dispatcher,
                     // context will be set later by the CONTEXT_TOKEN

package/lib/shared/child/singletonProviders.es.js

@@ -71,11 +71,21 @@ const getChildProviders = (appDi, loadableStats) => {
             provide: DISPATCHER_CONTEXT_TOKEN,
             scope: Scope.REQUEST,
             useFactory: ({ dispatcher, middlewares, initialState, parentAllowedStores }) => {
-                const parentDispatcherContext = appDi
-                    .get(optional(ASYNC_LOCAL_STORAGE_TOKEN))
-                    ?.getStore()
-                    ?.tramvaiRequestDi?.get(DISPATCHER_CONTEXT_TOKEN) ??
-                    appDi.get(DISPATCHER_CONTEXT_TOKEN);
+                const parentDispatcherContext = typeof window !== 'undefined'
+                    ? // ALS is not existing on the client,
+                        // also if we resolve `DISPATCHER_CONTEXT_TOKEN` from Root DI in the server-side,
+                        // it will lead to memory leak (with circular dependency) because of reducers event handlers:
+                        // RootDi.recordValues -> DispatcherContext.storeInstances -> ReducerStore.listeners -> listener.this -> ChildDispatcherContext.parentDispatcherContext -> DispatcherContext
+                        appDi.get(DISPATCHER_CONTEXT_TOKEN)
+                    : appDi
+                        .get(optional(ASYNC_LOCAL_STORAGE_TOKEN))
+                        ?.getStore()
+                        ?.tramvaiRequestDi?.get(DISPATCHER_CONTEXT_TOKEN);
+                if (!parentDispatcherContext) {
+                    // this should not happen because we add subscribtion to root execution context abortSignal
+                    // for Child Apps command line runner, and this token will not be resolved
+                    throw Error('Cannot find DispatcherContext for current request, unexpected critical error');
+                }
                 return new ChildDispatcherContext({
                     dispatcher,
                     // context will be set later by the CONTEXT_TOKEN

package/lib/shared/child/singletonProviders.js

@@ -79,11 +79,21 @@ const getChildProviders = (appDi, loadableStats) => {
             provide: tokensCommon.DISPATCHER_CONTEXT_TOKEN,
             scope: core.Scope.REQUEST,
             useFactory: ({ dispatcher, middlewares, initialState, parentAllowedStores }) => {
-                const parentDispatcherContext = appDi
-                    .get(core.optional(tokensCommon.ASYNC_LOCAL_STORAGE_TOKEN))
-                    ?.getStore()
-                    ?.tramvaiRequestDi?.get(tokensCommon.DISPATCHER_CONTEXT_TOKEN) ??
-                    appDi.get(tokensCommon.DISPATCHER_CONTEXT_TOKEN);
+                const parentDispatcherContext = typeof window !== 'undefined'
+                    ? // ALS is not existing on the client,
+                        // also if we resolve `DISPATCHER_CONTEXT_TOKEN` from Root DI in the server-side,
+                        // it will lead to memory leak (with circular dependency) because of reducers event handlers:
+                        // RootDi.recordValues -> DispatcherContext.storeInstances -> ReducerStore.listeners -> listener.this -> ChildDispatcherContext.parentDispatcherContext -> DispatcherContext
+                        appDi.get(tokensCommon.DISPATCHER_CONTEXT_TOKEN)
+                    : appDi
+                        .get(core.optional(tokensCommon.ASYNC_LOCAL_STORAGE_TOKEN))
+                        ?.getStore()
+                        ?.tramvaiRequestDi?.get(tokensCommon.DISPATCHER_CONTEXT_TOKEN);
+                if (!parentDispatcherContext) {
+                    // this should not happen because we add subscribtion to root execution context abortSignal
+                    // for Child Apps command line runner, and this token will not be resolved
+                    throw Error('Cannot find DispatcherContext for current request, unexpected critical error');
+                }
                 return new state.ChildDispatcherContext({
                     dispatcher,
                     // context will be set later by the CONTEXT_TOKEN

package/lib/shared/command.browser.js

@@ -1,16 +1,37 @@
-import { COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
+import { isSilentError } from '@tinkoff/errors';
+import { COMMAND_LINE_RUNNER_TOKEN, provide } from '@tramvai/core';
+import { ROOT_EXECUTION_CONTEXT_TOKEN } from '@tramvai/tokens-common';
 
 class CommandLineRunner {
-    constructor({ logger, rootCommandLineRunner, diManager, }) {
+    constructor({ logger, rootCommandLineRunner, diManager, commandLineExecutionContext, }) {
         this.log = logger('child-app:command-line-runner');
         this.rootCommandLineRunner = rootCommandLineRunner;
         this.diManager = diManager;
+        this.commandLineExecutionContext = commandLineExecutionContext;
     }
     async run(type, status, config) {
         const di = this.diManager.getChildDi(config);
+        const executionContext = this.commandLineExecutionContext();
         if (!di) {
             return;
         }
+        // Root App command line can be aborted before Child App command line run,
+        // for example in case of sync `RedirectFoundError` in page action (`resolvePageDeps` command),
+        // we need to prevent Child Apps preloading (also on `resolvePageDeps` command)
+        if (executionContext?.abortSignal?.aborted ||
+            (typeof window === 'undefined' && !executionContext)) {
+            this.log.error({
+                event: 'host-exection-context-aborted',
+                message: `Child App command line run was prevented from executing because ${executionContext?.abortSignal?.aborted
+                    ? 'host command line was aborted'
+                    : 'execution context is already destroyed'}`,
+                reason: executionContext?.abortSignal.reason,
+                type,
+                status,
+                childApp: { name: config.name, version: config.version, tag: config.tag },
+            });
+            return;
+        }
         try {
             const commandLineRunner = di.get({ token: COMMAND_LINE_RUNNER_TOKEN, optional: true });
             if (commandLineRunner && commandLineRunner !== this.rootCommandLineRunner) {
@@ -18,12 +39,21 @@ class CommandLineRunner {
                 // for now just reuse metrics implementation from root as otherwise it fails after attempt to create metrics instance with the same name
                 // @ts-ignore
                 commandLineRunner.metricsInstance = this.rootCommandLineRunner.metricsInstance;
+                // provide current Root App execution context as Child App root execution context
+                if (executionContext) {
+                    di.register(provide({
+                        provide: ROOT_EXECUTION_CONTEXT_TOKEN,
+                        useValue: executionContext,
+                    }));
+                }
                 await commandLineRunner.run(type, status, [], di);
             }
         }
         catch (error) {
             if (error.code !== 'E_STUB') {
-                this.log.error({
+                this.log[
+                // for example, we don't need to log Child App run as failed in case of RedirectFoundError
+                isSilentError(error) || (error.reason && isSilentError(error.reason)) ? 'debug' : 'error']({
                     event: 'run-failed',
                     error,
                     type,

package/lib/shared/command.d.ts

@@ -1,15 +1,18 @@
 import type { CommandLineDescription, CommandLines } from '@tramvai/core';
 import { COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
 import type { ChildAppCommandLineRunner, ChildAppDiManager, ChildAppFinalConfig } from '@tramvai/tokens-child-app';
-import type { LOGGER_TOKEN } from '@tramvai/tokens-common';
+import type { COMMAND_LINE_EXECUTION_CONTEXT_TOKEN } from '@tramvai/tokens-common';
+import { type LOGGER_TOKEN } from '@tramvai/tokens-common';
 export declare class CommandLineRunner implements ChildAppCommandLineRunner {
     private readonly log;
     private readonly rootCommandLineRunner;
     private readonly diManager;
-    constructor({ logger, rootCommandLineRunner, diManager, }: {
+    private readonly commandLineExecutionContext;
+    constructor({ logger, rootCommandLineRunner, diManager, commandLineExecutionContext, }: {
         logger: typeof LOGGER_TOKEN;
         rootCommandLineRunner: typeof COMMAND_LINE_RUNNER_TOKEN;
         diManager: ChildAppDiManager;
+        commandLineExecutionContext: typeof COMMAND_LINE_EXECUTION_CONTEXT_TOKEN;
     });
     run(type: keyof CommandLines, status: keyof CommandLineDescription, config: ChildAppFinalConfig): Promise<void>;
 }

package/lib/shared/command.es.js

@@ -1,16 +1,37 @@
-import { COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
+import { isSilentError } from '@tinkoff/errors';
+import { COMMAND_LINE_RUNNER_TOKEN, provide } from '@tramvai/core';
+import { ROOT_EXECUTION_CONTEXT_TOKEN } from '@tramvai/tokens-common';
 
 class CommandLineRunner {
-    constructor({ logger, rootCommandLineRunner, diManager, }) {
+    constructor({ logger, rootCommandLineRunner, diManager, commandLineExecutionContext, }) {
         this.log = logger('child-app:command-line-runner');
         this.rootCommandLineRunner = rootCommandLineRunner;
         this.diManager = diManager;
+        this.commandLineExecutionContext = commandLineExecutionContext;
     }
     async run(type, status, config) {
         const di = this.diManager.getChildDi(config);
+        const executionContext = this.commandLineExecutionContext();
         if (!di) {
             return;
         }
+        // Root App command line can be aborted before Child App command line run,
+        // for example in case of sync `RedirectFoundError` in page action (`resolvePageDeps` command),
+        // we need to prevent Child Apps preloading (also on `resolvePageDeps` command)
+        if (executionContext?.abortSignal?.aborted ||
+            (typeof window === 'undefined' && !executionContext)) {
+            this.log.error({
+                event: 'host-exection-context-aborted',
+                message: `Child App command line run was prevented from executing because ${executionContext?.abortSignal?.aborted
+                    ? 'host command line was aborted'
+                    : 'execution context is already destroyed'}`,
+                reason: executionContext?.abortSignal.reason,
+                type,
+                status,
+                childApp: { name: config.name, version: config.version, tag: config.tag },
+            });
+            return;
+        }
         try {
             const commandLineRunner = di.get({ token: COMMAND_LINE_RUNNER_TOKEN, optional: true });
             if (commandLineRunner && commandLineRunner !== this.rootCommandLineRunner) {
@@ -18,12 +39,21 @@ class CommandLineRunner {
                 // for now just reuse metrics implementation from root as otherwise it fails after attempt to create metrics instance with the same name
                 // @ts-ignore
                 commandLineRunner.metricsInstance = this.rootCommandLineRunner.metricsInstance;
+                // provide current Root App execution context as Child App root execution context
+                if (executionContext) {
+                    di.register(provide({
+                        provide: ROOT_EXECUTION_CONTEXT_TOKEN,
+                        useValue: executionContext,
+                    }));
+                }
                 await commandLineRunner.run(type, status, [], di);
             }
         }
         catch (error) {
             if (error.code !== 'E_STUB') {
-                this.log.error({
+                this.log[
+                // for example, we don't need to log Child App run as failed in case of RedirectFoundError
+                isSilentError(error) || (error.reason && isSilentError(error.reason)) ? 'debug' : 'error']({
                     event: 'run-failed',
                     error,
                     type,

package/lib/shared/command.js

@@ -2,19 +2,40 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var errors = require('@tinkoff/errors');
 var core = require('@tramvai/core');
+var tokensCommon = require('@tramvai/tokens-common');
 
 class CommandLineRunner {
-    constructor({ logger, rootCommandLineRunner, diManager, }) {
+    constructor({ logger, rootCommandLineRunner, diManager, commandLineExecutionContext, }) {
         this.log = logger('child-app:command-line-runner');
         this.rootCommandLineRunner = rootCommandLineRunner;
         this.diManager = diManager;
+        this.commandLineExecutionContext = commandLineExecutionContext;
     }
     async run(type, status, config) {
         const di = this.diManager.getChildDi(config);
+        const executionContext = this.commandLineExecutionContext();
         if (!di) {
             return;
         }
+        // Root App command line can be aborted before Child App command line run,
+        // for example in case of sync `RedirectFoundError` in page action (`resolvePageDeps` command),
+        // we need to prevent Child Apps preloading (also on `resolvePageDeps` command)
+        if (executionContext?.abortSignal?.aborted ||
+            (typeof window === 'undefined' && !executionContext)) {
+            this.log.error({
+                event: 'host-exection-context-aborted',
+                message: `Child App command line run was prevented from executing because ${executionContext?.abortSignal?.aborted
+                    ? 'host command line was aborted'
+                    : 'execution context is already destroyed'}`,
+                reason: executionContext?.abortSignal.reason,
+                type,
+                status,
+                childApp: { name: config.name, version: config.version, tag: config.tag },
+            });
+            return;
+        }
         try {
             const commandLineRunner = di.get({ token: core.COMMAND_LINE_RUNNER_TOKEN, optional: true });
             if (commandLineRunner && commandLineRunner !== this.rootCommandLineRunner) {
@@ -22,12 +43,21 @@ class CommandLineRunner {
                 // for now just reuse metrics implementation from root as otherwise it fails after attempt to create metrics instance with the same name
                 // @ts-ignore
                 commandLineRunner.metricsInstance = this.rootCommandLineRunner.metricsInstance;
+                // provide current Root App execution context as Child App root execution context
+                if (executionContext) {
+                    di.register(core.provide({
+                        provide: tokensCommon.ROOT_EXECUTION_CONTEXT_TOKEN,
+                        useValue: executionContext,
+                    }));
+                }
                 await commandLineRunner.run(type, status, [], di);
             }
         }
         catch (error) {
             if (error.code !== 'E_STUB') {
-                this.log.error({
+                this.log[
+                // for example, we don't need to log Child App run as failed in case of RedirectFoundError
+                errors.isSilentError(error) || (error.reason && errors.isSilentError(error.reason)) ? 'debug' : 'error']({
                     event: 'run-failed',
                     error,
                     type,

package/lib/shared/providers.browser.js

@@ -1,7 +1,7 @@
 import { Scope, DI_TOKEN, optional } from '@tinkoff/dippy';
 import { provide, commandLineListTokens, COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
 import { CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLUTION_CONFIGS_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLVE_BASE_URL_TOKEN, CHILD_APP_SINGLETON_DI_MANAGER_TOKEN, CHILD_APP_LOADER_TOKEN, CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN, CHILD_APP_CONTRACT_MANAGER, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, HOST_PROVIDED_CONTRACTS, CHILD_APP_ERROR_BOUNDARY_TOKEN } from '@tramvai/tokens-child-app';
-import { COMBINE_REDUCERS, LOGGER_TOKEN, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN, COMPONENT_REGISTRY_TOKEN, LIMIT_ACTION_GLOBAL_TIME_RUN, ACTION_CONDITIONALS } from '@tramvai/tokens-common';
+import { COMBINE_REDUCERS, LOGGER_TOKEN, ENV_MANAGER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN, COMPONENT_REGISTRY_TOKEN, LIMIT_ACTION_GLOBAL_TIME_RUN, ACTION_CONDITIONALS } from '@tramvai/tokens-common';
 import { EXTEND_RENDER } from '@tramvai/tokens-render';
 import { ROUTER_TOKEN, PAGE_SERVICE_TOKEN, LINK_PREFETCH_MANAGER_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
 import { SingletonDiManager } from './singletonDi.browser.js';
@@ -143,6 +143,7 @@ const sharedProviders = [
             logger: LOGGER_TOKEN,
             rootCommandLineRunner: COMMAND_LINE_RUNNER_TOKEN,
             diManager: CHILD_APP_DI_MANAGER_TOKEN,
+            commandLineExecutionContext: COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
         },
     }),
     provide({

package/lib/shared/providers.es.js

@@ -1,7 +1,7 @@
 import { Scope, DI_TOKEN, optional } from '@tinkoff/dippy';
 import { provide, commandLineListTokens, COMMAND_LINE_RUNNER_TOKEN } from '@tramvai/core';
 import { CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLUTION_CONFIGS_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLVE_BASE_URL_TOKEN, CHILD_APP_SINGLETON_DI_MANAGER_TOKEN, CHILD_APP_LOADER_TOKEN, CHILD_APP_ROOT_DI_ACCESS_MODE_TOKEN, CHILD_APP_CONTRACT_MANAGER, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, HOST_PROVIDED_CONTRACTS, CHILD_APP_ERROR_BOUNDARY_TOKEN } from '@tramvai/tokens-child-app';
-import { COMBINE_REDUCERS, LOGGER_TOKEN, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN, COMPONENT_REGISTRY_TOKEN, LIMIT_ACTION_GLOBAL_TIME_RUN, ACTION_CONDITIONALS } from '@tramvai/tokens-common';
+import { COMBINE_REDUCERS, LOGGER_TOKEN, ENV_MANAGER_TOKEN, COMMAND_LINE_EXECUTION_CONTEXT_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN, COMPONENT_REGISTRY_TOKEN, LIMIT_ACTION_GLOBAL_TIME_RUN, ACTION_CONDITIONALS } from '@tramvai/tokens-common';
 import { EXTEND_RENDER } from '@tramvai/tokens-render';
 import { ROUTER_TOKEN, PAGE_SERVICE_TOKEN, LINK_PREFETCH_MANAGER_TOKEN, ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN } from '@tramvai/tokens-router';
 import { SingletonDiManager } from './singletonDi.es.js';
@@ -143,6 +143,7 @@ const sharedProviders = [
             logger: LOGGER_TOKEN,
             rootCommandLineRunner: COMMAND_LINE_RUNNER_TOKEN,
             diManager: CHILD_APP_DI_MANAGER_TOKEN,
+            commandLineExecutionContext: COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
         },
     }),
     provide({

package/lib/shared/providers.js

@@ -147,6 +147,7 @@ const sharedProviders = [
             logger: tokensCommon.LOGGER_TOKEN,
             rootCommandLineRunner: core.COMMAND_LINE_RUNNER_TOKEN,
             diManager: tokensChildApp.CHILD_APP_DI_MANAGER_TOKEN,
+            commandLineExecutionContext: tokensCommon.COMMAND_LINE_EXECUTION_CONTEXT_TOKEN,
         },
     }),
     core.provide({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "5.15.3",
+  "version": "5.16.2",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
@@ -33,23 +33,24 @@
     "@tinkoff/env-validators": "0.4.2",
     "@tinkoff/module-loader-client": "0.7.3",
     "@tinkoff/module-loader-server": "0.8.4",
-    "@tramvai/module-common": "5.15.3",
+    "@tramvai/module-common": "5.16.2",
     "@tinkoff/url": "0.11.2",
-    "@tramvai/child-app-core": "5.15.3",
+    "@tinkoff/errors": "0.6.2",
+    "@tramvai/child-app-core": "5.16.2",
     "@tramvai/safe-strings": "0.8.4",
-    "@tramvai/tokens-child-app": "5.15.3"
+    "@tramvai/tokens-child-app": "5.16.2"
   },
   "devDependencies": {},
   "peerDependencies": {
     "@tinkoff/dippy": "0.11.3",
-    "@tinkoff/router": "0.5.51",
+    "@tinkoff/router": "0.5.54",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "5.15.3",
-    "@tramvai/state": "5.15.3",
-    "@tramvai/react": "5.15.3",
-    "@tramvai/tokens-common": "5.15.3",
-    "@tramvai/tokens-render": "5.15.3",
-    "@tramvai/tokens-router": "5.15.3",
+    "@tramvai/core": "5.16.2",
+    "@tramvai/state": "5.16.2",
+    "@tramvai/react": "5.16.2",
+    "@tramvai/tokens-common": "5.16.2",
+    "@tramvai/tokens-render": "5.16.2",
+    "@tramvai/tokens-router": "5.16.2",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "object-assign": "^4.1.1",