@tramvai/module-page-render-mode 2.90.0 → 2.92.0

package/lib/browser.js

@@ -1,7 +1,7 @@
 import { declareModule } from '@tramvai/core';
 import { ForceCSRModule } from './ForceCSRModule.browser.js';
 import { sharedProviders } from './shared.browser.js';
-export { PAGE_RENDER_DEFAULT_FALLBACK_COMPONENT, PAGE_RENDER_DEFAULT_MODE, PAGE_RENDER_FALLBACK_COMPONENT_PREFIX, PAGE_RENDER_WRAPPER_TYPE, STATIC_PAGES_BACKGROUND_FETCH_ENABLED, STATIC_PAGES_CACHE_5xx_RESPONSE, STATIC_PAGES_CACHE_TOKEN, STATIC_PAGES_COMMAND_LINE, STATIC_PAGES_MODIFY_CACHE, STATIC_PAGES_OPTIONS_TOKEN, STATIC_PAGES_SHOULD_SET_TO_CACHE, STATIC_PAGES_SHOULD_USE_CACHE } from './tokens.browser.js';
+export { PAGE_RENDER_DEFAULT_FALLBACK_COMPONENT, PAGE_RENDER_DEFAULT_MODE, PAGE_RENDER_FALLBACK_COMPONENT_PREFIX, PAGE_RENDER_WRAPPER_TYPE, STATIC_PAGES_BACKGROUND_FETCH_ENABLED, STATIC_PAGES_CACHE_5xx_RESPONSE, STATIC_PAGES_CACHE_TOKEN, STATIC_PAGES_COMMAND_LINE, STATIC_PAGES_MODIFY_CACHE, STATIC_PAGES_OPTIONS_TOKEN, STATIC_PAGES_SHOULD_USE_CACHE } from './tokens.browser.js';
 
 // @todo: перенести в @tramvai/module-render
 const PageRenderModeModule = declareModule({

package/lib/server.es.js

@@ -2,7 +2,7 @@ import { declareModule } from '@tramvai/core';
 import { ForceCSRModule } from './ForceCSRModule.es.js';
 import { sharedProviders } from './shared.es.js';
 import { staticPagesProviders } from './staticPages.es.js';
-export { PAGE_RENDER_DEFAULT_FALLBACK_COMPONENT, PAGE_RENDER_DEFAULT_MODE, PAGE_RENDER_FALLBACK_COMPONENT_PREFIX, PAGE_RENDER_WRAPPER_TYPE, STATIC_PAGES_BACKGROUND_FETCH_ENABLED, STATIC_PAGES_CACHE_5xx_RESPONSE, STATIC_PAGES_CACHE_TOKEN, STATIC_PAGES_COMMAND_LINE, STATIC_PAGES_MODIFY_CACHE, STATIC_PAGES_OPTIONS_TOKEN, STATIC_PAGES_SHOULD_SET_TO_CACHE, STATIC_PAGES_SHOULD_USE_CACHE } from './tokens.es.js';
+export { PAGE_RENDER_DEFAULT_FALLBACK_COMPONENT, PAGE_RENDER_DEFAULT_MODE, PAGE_RENDER_FALLBACK_COMPONENT_PREFIX, PAGE_RENDER_WRAPPER_TYPE, STATIC_PAGES_BACKGROUND_FETCH_ENABLED, STATIC_PAGES_CACHE_5xx_RESPONSE, STATIC_PAGES_CACHE_TOKEN, STATIC_PAGES_COMMAND_LINE, STATIC_PAGES_MODIFY_CACHE, STATIC_PAGES_OPTIONS_TOKEN, STATIC_PAGES_SHOULD_USE_CACHE } from './tokens.es.js';
 
 // @todo: перенести в @tramvai/module-render
 const PageRenderModeModule = declareModule({

package/lib/server.js

@@ -25,6 +25,5 @@ exports.STATIC_PAGES_CACHE_TOKEN = tokens.STATIC_PAGES_CACHE_TOKEN;
 exports.STATIC_PAGES_COMMAND_LINE = tokens.STATIC_PAGES_COMMAND_LINE;
 exports.STATIC_PAGES_MODIFY_CACHE = tokens.STATIC_PAGES_MODIFY_CACHE;
 exports.STATIC_PAGES_OPTIONS_TOKEN = tokens.STATIC_PAGES_OPTIONS_TOKEN;
-exports.STATIC_PAGES_SHOULD_SET_TO_CACHE = tokens.STATIC_PAGES_SHOULD_SET_TO_CACHE;
 exports.STATIC_PAGES_SHOULD_USE_CACHE = tokens.STATIC_PAGES_SHOULD_USE_CACHE;
 exports.PageRenderModeModule = PageRenderModeModule;

package/lib/staticPages/staticPagesService.d.ts

@@ -4,12 +4,11 @@ import type { ENV_MANAGER_TOKEN, LOGGER_TOKEN, REQUEST_MANAGER_TOKEN, RESPONSE_M
 import type { FASTIFY_RESPONSE } from '@tramvai/tokens-server-private';
 import type { MODERN_SATISFIES_TOKEN } from '@tramvai/tokens-render';
 import type { STATIC_PAGES_BACKGROUND_FETCH_SERVICE, STATIC_PAGES_GET_CACHE_KEY_TOKEN } from '../staticPages';
-import type { STATIC_PAGES_SHOULD_USE_CACHE, STATIC_PAGES_SHOULD_SET_TO_CACHE, STATIC_PAGES_CACHE_TOKEN, STATIC_PAGES_MODIFY_CACHE, STATIC_PAGES_OPTIONS_TOKEN, STATIC_PAGES_CACHE_5xx_RESPONSE } from '../tokens';
+import type { STATIC_PAGES_SHOULD_USE_CACHE, STATIC_PAGES_CACHE_TOKEN, STATIC_PAGES_MODIFY_CACHE, STATIC_PAGES_OPTIONS_TOKEN, STATIC_PAGES_CACHE_5xx_RESPONSE } from '../tokens';
 type ResponseManager = ExtractDependencyType<typeof RESPONSE_MANAGER_TOKEN>;
 type Response = ExtractDependencyType<typeof FASTIFY_RESPONSE>;
 type Logger = ExtractDependencyType<typeof LOGGER_TOKEN>;
 type ShouldUseCache = ExtractDependencyType<typeof STATIC_PAGES_SHOULD_USE_CACHE>;
-type ShouldSetToCache = ExtractDependencyType<typeof STATIC_PAGES_SHOULD_SET_TO_CACHE>;
 type BackgroundFetchService = ExtractDependencyType<typeof STATIC_PAGES_BACKGROUND_FETCH_SERVICE>;
 type Cache = ExtractDependencyType<typeof STATIC_PAGES_CACHE_TOKEN>;
 type ModifyCache = ExtractDependencyType<typeof STATIC_PAGES_MODIFY_CACHE> | null;
@@ -30,8 +29,7 @@ export declare class StaticPagesService {
     private options;
     private cache5xxResponse;
     shouldUseCache: () => boolean;
-    shouldSetToCache: () => boolean;
-    constructor({ getCacheKey, requestManager, response, responseManager, environmentManager, userAgent, modern, logger, cache, modifyCache, shouldUseCache, shouldSetToCache, backgroundFetchService, options, cache5xxResponse, }: {
+    constructor({ getCacheKey, requestManager, response, responseManager, environmentManager, userAgent, modern, logger, cache, modifyCache, shouldUseCache, backgroundFetchService, options, cache5xxResponse, }: {
         getCacheKey: ExtractDependencyType<typeof STATIC_PAGES_GET_CACHE_KEY_TOKEN>;
         requestManager: ExtractDependencyType<typeof REQUEST_MANAGER_TOKEN>;
         responseManager: ResponseManager;
@@ -43,16 +41,15 @@ export declare class StaticPagesService {
         cache: Cache;
         modifyCache: ModifyCache;
         shouldUseCache: ShouldUseCache;
-        shouldSetToCache: ShouldSetToCache;
         backgroundFetchService: BackgroundFetchService;
         options: Options;
         cache5xxResponse: Cache5xxResponse;
     });
     respond(onSuccess: () => void): void;
-    saveResponse(): void;
     revalidate(): Promise<void>;
     private hasCache;
     private getCache;
     private setCache;
+    private cacheOutdated;
 }
 export {};

package/lib/staticPages/staticPagesService.es.js

@@ -1,5 +1,8 @@
+// It is critical to ignore cached Set-Cookie header and use fresh one from current request
+// COMMAND_LINE_EXECUTION_END_TOKEN with fresh server timings will not works for responses from cache
+const HEADERS_BLACKLIST = ['Set-Cookie', 'server-timing'];
 class StaticPagesService {
-    constructor({ getCacheKey, requestManager, response, responseManager, environmentManager, userAgent, modern, logger, cache, modifyCache, shouldUseCache, shouldSetToCache, backgroundFetchService, options, cache5xxResponse, }) {
+    constructor({ getCacheKey, requestManager, response, responseManager, environmentManager, userAgent, modern, logger, cache, modifyCache, shouldUseCache, backgroundFetchService, options, cache5xxResponse, }) {
         this.key = getCacheKey();
         this.path = requestManager.getParsedUrl().pathname;
         this.port = environmentManager.get('PORT');
@@ -11,7 +14,6 @@ class StaticPagesService {
         this.cache = cache;
         this.modifyCache = modifyCache;
         this.shouldUseCache = () => shouldUseCache.every((fn) => fn());
-        this.shouldSetToCache = () => shouldSetToCache.every((fn) => fn());
         this.backgroundFetchService = backgroundFetchService;
         this.options = options;
         this.cache5xxResponse = cache5xxResponse;
@@ -24,20 +26,28 @@ class StaticPagesService {
             });
             return;
         }
-        const { ttl } = this.options;
         let cacheEntry = this.getCache();
         if (Array.isArray(this.modifyCache)) {
             cacheEntry = this.modifyCache.reduce((result, modifier) => {
                 return modifier(result);
             }, cacheEntry);
         }
-        const { updatedAt, status, headers, body } = cacheEntry;
-        const isOutdated = updatedAt + ttl <= Date.now();
+        const { status, headers, body } = cacheEntry;
+        const isOutdated = this.cacheOutdated(cacheEntry);
+        const currentHeaders = this.responseManager.getHeaders();
         if (!isOutdated) {
             this.log.debug({
                 event: 'cache-hit',
                 key: this.key,
             });
+            HEADERS_BLACKLIST.forEach((header) => {
+                if (headers[header]) {
+                    delete headers[header];
+                }
+                if (currentHeaders[header]) {
+                    headers[header] = currentHeaders[header];
+                }
+            });
             this.response
                 .header('content-type', 'text/html')
                 .header('X-Tramvai-Static-Page-From-Cache', 'true')
@@ -53,28 +63,17 @@ class StaticPagesService {
             });
         }
     }
-    saveResponse() {
-        if (!this.cache5xxResponse() && this.responseManager.getStatus() >= 500) {
-            this.log.debug({
-                event: 'cache-set-5xx',
-                key: this.key,
-            });
-            return;
-        }
-        this.log.debug({
-            event: 'cache-set',
-            key: this.key,
-        });
-        this.setCache({
-            status: this.responseManager.getStatus(),
-            headers: this.responseManager.getHeaders(),
-            body: this.responseManager.getBody(),
-        });
-    }
     async revalidate() {
         if (!this.backgroundFetchService.enabled()) {
             return;
         }
+        if (this.hasCache()) {
+            const cacheEntry = this.getCache();
+            const isOutdated = this.cacheOutdated(cacheEntry);
+            if (!isOutdated) {
+                return;
+            }
+        }
         await this.backgroundFetchService
             .revalidate({
             key: this.key,
@@ -88,6 +87,10 @@ class StaticPagesService {
                 return;
             }
             if (!this.cache5xxResponse() && response.status >= 500) {
+                this.log.debug({
+                    event: 'cache-set-5xx',
+                    key: this.key,
+                });
                 return;
             }
             this.setCache(response);
@@ -100,6 +103,10 @@ class StaticPagesService {
         return this.cache.get(this.path).get(this.key);
     }
     setCache(cacheEntry) {
+        this.log.debug({
+            event: 'cache-set',
+            key: this.key,
+        });
         if (!this.cache.has(this.path)) {
             this.cache.set(this.path, new Map());
         }
@@ -108,6 +115,12 @@ class StaticPagesService {
             updatedAt: Date.now(),
         });
     }
+    cacheOutdated(cacheEntry) {
+        const { ttl } = this.options;
+        const { updatedAt } = cacheEntry;
+        const isOutdated = updatedAt + ttl <= Date.now();
+        return isOutdated;
+    }
 }
 
 export { StaticPagesService };

package/lib/staticPages/staticPagesService.js

@@ -2,8 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+// It is critical to ignore cached Set-Cookie header and use fresh one from current request
+// COMMAND_LINE_EXECUTION_END_TOKEN with fresh server timings will not works for responses from cache
+const HEADERS_BLACKLIST = ['Set-Cookie', 'server-timing'];
 class StaticPagesService {
-    constructor({ getCacheKey, requestManager, response, responseManager, environmentManager, userAgent, modern, logger, cache, modifyCache, shouldUseCache, shouldSetToCache, backgroundFetchService, options, cache5xxResponse, }) {
+    constructor({ getCacheKey, requestManager, response, responseManager, environmentManager, userAgent, modern, logger, cache, modifyCache, shouldUseCache, backgroundFetchService, options, cache5xxResponse, }) {
         this.key = getCacheKey();
         this.path = requestManager.getParsedUrl().pathname;
         this.port = environmentManager.get('PORT');
@@ -15,7 +18,6 @@ class StaticPagesService {
         this.cache = cache;
         this.modifyCache = modifyCache;
         this.shouldUseCache = () => shouldUseCache.every((fn) => fn());
-        this.shouldSetToCache = () => shouldSetToCache.every((fn) => fn());
         this.backgroundFetchService = backgroundFetchService;
         this.options = options;
         this.cache5xxResponse = cache5xxResponse;
@@ -28,20 +30,28 @@ class StaticPagesService {
             });
             return;
         }
-        const { ttl } = this.options;
         let cacheEntry = this.getCache();
         if (Array.isArray(this.modifyCache)) {
             cacheEntry = this.modifyCache.reduce((result, modifier) => {
                 return modifier(result);
             }, cacheEntry);
         }
-        const { updatedAt, status, headers, body } = cacheEntry;
-        const isOutdated = updatedAt + ttl <= Date.now();
+        const { status, headers, body } = cacheEntry;
+        const isOutdated = this.cacheOutdated(cacheEntry);
+        const currentHeaders = this.responseManager.getHeaders();
         if (!isOutdated) {
             this.log.debug({
                 event: 'cache-hit',
                 key: this.key,
             });
+            HEADERS_BLACKLIST.forEach((header) => {
+                if (headers[header]) {
+                    delete headers[header];
+                }
+                if (currentHeaders[header]) {
+                    headers[header] = currentHeaders[header];
+                }
+            });
             this.response
                 .header('content-type', 'text/html')
                 .header('X-Tramvai-Static-Page-From-Cache', 'true')
@@ -57,28 +67,17 @@ class StaticPagesService {
             });
         }
     }
-    saveResponse() {
-        if (!this.cache5xxResponse() && this.responseManager.getStatus() >= 500) {
-            this.log.debug({
-                event: 'cache-set-5xx',
-                key: this.key,
-            });
-            return;
-        }
-        this.log.debug({
-            event: 'cache-set',
-            key: this.key,
-        });
-        this.setCache({
-            status: this.responseManager.getStatus(),
-            headers: this.responseManager.getHeaders(),
-            body: this.responseManager.getBody(),
-        });
-    }
     async revalidate() {
         if (!this.backgroundFetchService.enabled()) {
             return;
         }
+        if (this.hasCache()) {
+            const cacheEntry = this.getCache();
+            const isOutdated = this.cacheOutdated(cacheEntry);
+            if (!isOutdated) {
+                return;
+            }
+        }
         await this.backgroundFetchService
             .revalidate({
             key: this.key,
@@ -92,6 +91,10 @@ class StaticPagesService {
                 return;
             }
             if (!this.cache5xxResponse() && response.status >= 500) {
+                this.log.debug({
+                    event: 'cache-set-5xx',
+                    key: this.key,
+                });
                 return;
             }
             this.setCache(response);
@@ -104,6 +107,10 @@ class StaticPagesService {
         return this.cache.get(this.path).get(this.key);
     }
     setCache(cacheEntry) {
+        this.log.debug({
+            event: 'cache-set',
+            key: this.key,
+        });
         if (!this.cache.has(this.path)) {
             this.cache.set(this.path, new Map());
         }
@@ -112,6 +119,12 @@ class StaticPagesService {
             updatedAt: Date.now(),
         });
     }
+    cacheOutdated(cacheEntry) {
+        const { ttl } = this.options;
+        const { updatedAt } = cacheEntry;
+        const isOutdated = updatedAt + ttl <= Date.now();
+        return isOutdated;
+    }
 }
 
 exports.StaticPagesService = StaticPagesService;

package/lib/staticPages.d.ts

@@ -139,9 +139,6 @@ export declare const staticPagesProviders: (import("@tinkoff/dippy/lib/Provider"
     shouldUseCache: (() => boolean) & {
         __type?: "multi token";
     };
-    shouldSetToCache: (() => boolean) & {
-        __type?: "multi token";
-    };
     backgroundFetchService: BackgroundFetchService & {
         __type?: "base token";
     };
@@ -193,9 +190,6 @@ export declare const staticPagesProviders: (import("@tinkoff/dippy/lib/Provider"
     shouldUseCache: (() => boolean) & {
         __type?: "multi token";
     };
-    shouldSetToCache: (() => boolean) & {
-        __type?: "multi token";
-    };
     backgroundFetchService: BackgroundFetchService & {
         __type?: "base token";
     };

package/lib/staticPages.es.js

@@ -1,4 +1,3 @@
-import isEmpty from '@tinkoff/utils/is/empty';
 import { createToken, provide, Scope, commandLineListTokens, DI_TOKEN } from '@tramvai/core';
 import { CREATE_CACHE_TOKEN, REQUEST_MANAGER_TOKEN, LOGGER_TOKEN, RESPONSE_MANAGER_TOKEN, ENV_MANAGER_TOKEN } from '@tramvai/tokens-common';
 import { FASTIFY_RESPONSE } from '@tramvai/tokens-server-private';
@@ -9,7 +8,7 @@ import { SERVER_MODULE_PAPI_PRIVATE_ROUTE } from '@tramvai/tokens-server';
 import { METRICS_MODULE_TOKEN } from '@tramvai/tokens-metrics';
 import { createPapiMethod } from '@tramvai/papi';
 import { StopCommandLineRunnerError } from './error.es.js';
-import { STATIC_PAGES_CACHE_TOKEN, STATIC_PAGES_OPTIONS_TOKEN, STATIC_PAGES_SHOULD_SET_TO_CACHE, STATIC_PAGES_SHOULD_USE_CACHE, STATIC_PAGES_BACKGROUND_FETCH_ENABLED, STATIC_PAGES_CACHE_5xx_RESPONSE, STATIC_PAGES_MODIFY_CACHE, STATIC_PAGES_COMMAND_LINE, PAGE_RENDER_DEFAULT_MODE } from './tokens.es.js';
+import { STATIC_PAGES_CACHE_TOKEN, STATIC_PAGES_OPTIONS_TOKEN, STATIC_PAGES_SHOULD_USE_CACHE, STATIC_PAGES_BACKGROUND_FETCH_ENABLED, STATIC_PAGES_CACHE_5xx_RESPONSE, STATIC_PAGES_MODIFY_CACHE, STATIC_PAGES_COMMAND_LINE, PAGE_RENDER_DEFAULT_MODE } from './tokens.es.js';
 import { getPageRenderMode } from './utils/getPageRenderMode.es.js';
 import { getCacheKey } from './utils/cacheKey.es.js';
 import { BackgroundFetchService } from './staticPages/backgroundFetchService.es.js';
@@ -76,17 +75,6 @@ const staticPagesProviders = [
             modern: MODERN_SATISFIES_TOKEN,
         },
     }),
-    provide({
-        provide: STATIC_PAGES_SHOULD_SET_TO_CACHE,
-        useFactory: ({ requestManager }) => {
-            return () => {
-                return isEmpty(requestManager.getCookies());
-            };
-        },
-        deps: {
-            requestManager: REQUEST_MANAGER_TOKEN,
-        },
-    }),
     provide({
         provide: STATIC_PAGES_SHOULD_USE_CACHE,
         useFactory: ({ requestManager }) => {
@@ -112,7 +100,7 @@ const staticPagesProviders = [
     }),
     provide({
         provide: STATIC_PAGES_BACKGROUND_FETCH_SERVICE,
-        scope: Scope.REQUEST,
+        scope: Scope.SINGLETON,
         useClass: BackgroundFetchService,
         deps: {
             logger: LOGGER_TOKEN,
@@ -135,7 +123,6 @@ const staticPagesProviders = [
             cache: STATIC_PAGES_CACHE_TOKEN,
             modifyCache: { token: STATIC_PAGES_MODIFY_CACHE, optional: true },
             shouldUseCache: STATIC_PAGES_SHOULD_USE_CACHE,
-            shouldSetToCache: STATIC_PAGES_SHOULD_SET_TO_CACHE,
             backgroundFetchService: STATIC_PAGES_BACKGROUND_FETCH_SERVICE,
             options: STATIC_PAGES_OPTIONS_TOKEN,
             cache5xxResponse: STATIC_PAGES_CACHE_5xx_RESPONSE,
@@ -184,12 +171,7 @@ const staticPagesProviders = [
                 if (!isStaticPage) {
                     return;
                 }
-                if (staticPagesService.shouldSetToCache()) {
-                    staticPagesService.saveResponse();
-                }
-                else {
-                    staticPagesService.revalidate();
-                }
+                staticPagesService.revalidate();
             };
         },
         deps: {

package/lib/staticPages.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var isEmpty = require('@tinkoff/utils/is/empty');
 var core = require('@tramvai/core');
 var tokensCommon = require('@tramvai/tokens-common');
 var tokensServerPrivate = require('@tramvai/tokens-server-private');
@@ -19,10 +18,6 @@ var cacheKey = require('./utils/cacheKey.js');
 var backgroundFetchService = require('./staticPages/backgroundFetchService.js');
 var staticPagesService = require('./staticPages/staticPagesService.js');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(isEmpty);
-
 const STATIC_PAGES_BACKGROUND_FETCH_SERVICE = core.createToken();
 const STATIC_PAGES_GET_CACHE_KEY_TOKEN = core.createToken();
 const STATIC_PAGES_CACHE_HIT_METRIC_TOKEN = core.createToken();
@@ -84,17 +79,6 @@ const staticPagesProviders = [
             modern: tokensRender.MODERN_SATISFIES_TOKEN,
         },
     }),
-    core.provide({
-        provide: tokens.STATIC_PAGES_SHOULD_SET_TO_CACHE,
-        useFactory: ({ requestManager }) => {
-            return () => {
-                return isEmpty__default["default"](requestManager.getCookies());
-            };
-        },
-        deps: {
-            requestManager: tokensCommon.REQUEST_MANAGER_TOKEN,
-        },
-    }),
     core.provide({
         provide: tokens.STATIC_PAGES_SHOULD_USE_CACHE,
         useFactory: ({ requestManager }) => {
@@ -120,7 +104,7 @@ const staticPagesProviders = [
     }),
     core.provide({
         provide: STATIC_PAGES_BACKGROUND_FETCH_SERVICE,
-        scope: core.Scope.REQUEST,
+        scope: core.Scope.SINGLETON,
         useClass: backgroundFetchService.BackgroundFetchService,
         deps: {
             logger: tokensCommon.LOGGER_TOKEN,
@@ -143,7 +127,6 @@ const staticPagesProviders = [
             cache: tokens.STATIC_PAGES_CACHE_TOKEN,
             modifyCache: { token: tokens.STATIC_PAGES_MODIFY_CACHE, optional: true },
             shouldUseCache: tokens.STATIC_PAGES_SHOULD_USE_CACHE,
-            shouldSetToCache: tokens.STATIC_PAGES_SHOULD_SET_TO_CACHE,
             backgroundFetchService: STATIC_PAGES_BACKGROUND_FETCH_SERVICE,
             options: tokens.STATIC_PAGES_OPTIONS_TOKEN,
             cache5xxResponse: tokens.STATIC_PAGES_CACHE_5xx_RESPONSE,
@@ -192,12 +175,7 @@ const staticPagesProviders = [
                 if (!isStaticPage) {
                     return;
                 }
-                if (staticPagesService.shouldSetToCache()) {
-                    staticPagesService.saveResponse();
-                }
-                else {
-                    staticPagesService.revalidate();
-                }
+                staticPagesService.revalidate();
             };
         },
         deps: {

package/lib/tokens.browser.js

@@ -9,11 +9,10 @@ const PAGE_RENDER_WRAPPER_TYPE = createToken('pageRenderWrapperType');
 const PAGE_RENDER_DEFAULT_FALLBACK_COMPONENT = createToken('pageRenderDefaultFallbackComponent');
 const STATIC_PAGES_CACHE_TOKEN = createToken('static pages cache');
 const STATIC_PAGES_SHOULD_USE_CACHE = createToken('static pages should use cache', { multi: true });
-const STATIC_PAGES_SHOULD_SET_TO_CACHE = createToken('static pages should set to cache', { multi: true });
 const STATIC_PAGES_BACKGROUND_FETCH_ENABLED = createToken('static pages can fetch page');
 const STATIC_PAGES_OPTIONS_TOKEN = createToken('static pages options');
 const STATIC_PAGES_COMMAND_LINE = createToken('static pages command line');
 const STATIC_PAGES_MODIFY_CACHE = createToken('static pages modify cache', { multi: true });
 const STATIC_PAGES_CACHE_5xx_RESPONSE = createToken('static pages cache 5xx response');
 
-export { PAGE_RENDER_DEFAULT_FALLBACK_COMPONENT, PAGE_RENDER_DEFAULT_MODE, PAGE_RENDER_FALLBACK_COMPONENT_PREFIX, PAGE_RENDER_WRAPPER_TYPE, STATIC_PAGES_BACKGROUND_FETCH_ENABLED, STATIC_PAGES_CACHE_5xx_RESPONSE, STATIC_PAGES_CACHE_TOKEN, STATIC_PAGES_COMMAND_LINE, STATIC_PAGES_MODIFY_CACHE, STATIC_PAGES_OPTIONS_TOKEN, STATIC_PAGES_SHOULD_SET_TO_CACHE, STATIC_PAGES_SHOULD_USE_CACHE };
+export { PAGE_RENDER_DEFAULT_FALLBACK_COMPONENT, PAGE_RENDER_DEFAULT_MODE, PAGE_RENDER_FALLBACK_COMPONENT_PREFIX, PAGE_RENDER_WRAPPER_TYPE, STATIC_PAGES_BACKGROUND_FETCH_ENABLED, STATIC_PAGES_CACHE_5xx_RESPONSE, STATIC_PAGES_CACHE_TOKEN, STATIC_PAGES_COMMAND_LINE, STATIC_PAGES_MODIFY_CACHE, STATIC_PAGES_OPTIONS_TOKEN, STATIC_PAGES_SHOULD_USE_CACHE };

package/lib/tokens.d.ts

@@ -48,9 +48,6 @@ export declare const STATIC_PAGES_CACHE_TOKEN: Cache<Map<string, StaticPagesCach
 export declare const STATIC_PAGES_SHOULD_USE_CACHE: (() => boolean) & {
     __type?: "multi token";
 };
-export declare const STATIC_PAGES_SHOULD_SET_TO_CACHE: (() => boolean) & {
-    __type?: "multi token";
-};
 export declare const STATIC_PAGES_BACKGROUND_FETCH_ENABLED: (() => boolean) & {
     __type?: "base token";
 };

package/lib/tokens.es.js

@@ -9,11 +9,10 @@ const PAGE_RENDER_WRAPPER_TYPE = createToken('pageRenderWrapperType');
 const PAGE_RENDER_DEFAULT_FALLBACK_COMPONENT = createToken('pageRenderDefaultFallbackComponent');
 const STATIC_PAGES_CACHE_TOKEN = createToken('static pages cache');
 const STATIC_PAGES_SHOULD_USE_CACHE = createToken('static pages should use cache', { multi: true });
-const STATIC_PAGES_SHOULD_SET_TO_CACHE = createToken('static pages should set to cache', { multi: true });
 const STATIC_PAGES_BACKGROUND_FETCH_ENABLED = createToken('static pages can fetch page');
 const STATIC_PAGES_OPTIONS_TOKEN = createToken('static pages options');
 const STATIC_PAGES_COMMAND_LINE = createToken('static pages command line');
 const STATIC_PAGES_MODIFY_CACHE = createToken('static pages modify cache', { multi: true });
 const STATIC_PAGES_CACHE_5xx_RESPONSE = createToken('static pages cache 5xx response');
 
-export { PAGE_RENDER_DEFAULT_FALLBACK_COMPONENT, PAGE_RENDER_DEFAULT_MODE, PAGE_RENDER_FALLBACK_COMPONENT_PREFIX, PAGE_RENDER_WRAPPER_TYPE, STATIC_PAGES_BACKGROUND_FETCH_ENABLED, STATIC_PAGES_CACHE_5xx_RESPONSE, STATIC_PAGES_CACHE_TOKEN, STATIC_PAGES_COMMAND_LINE, STATIC_PAGES_MODIFY_CACHE, STATIC_PAGES_OPTIONS_TOKEN, STATIC_PAGES_SHOULD_SET_TO_CACHE, STATIC_PAGES_SHOULD_USE_CACHE };
+export { PAGE_RENDER_DEFAULT_FALLBACK_COMPONENT, PAGE_RENDER_DEFAULT_MODE, PAGE_RENDER_FALLBACK_COMPONENT_PREFIX, PAGE_RENDER_WRAPPER_TYPE, STATIC_PAGES_BACKGROUND_FETCH_ENABLED, STATIC_PAGES_CACHE_5xx_RESPONSE, STATIC_PAGES_CACHE_TOKEN, STATIC_PAGES_COMMAND_LINE, STATIC_PAGES_MODIFY_CACHE, STATIC_PAGES_OPTIONS_TOKEN, STATIC_PAGES_SHOULD_USE_CACHE };

package/lib/tokens.js

@@ -13,7 +13,6 @@ const PAGE_RENDER_WRAPPER_TYPE = dippy.createToken('pageRenderWrapperType');
 const PAGE_RENDER_DEFAULT_FALLBACK_COMPONENT = dippy.createToken('pageRenderDefaultFallbackComponent');
 const STATIC_PAGES_CACHE_TOKEN = dippy.createToken('static pages cache');
 const STATIC_PAGES_SHOULD_USE_CACHE = dippy.createToken('static pages should use cache', { multi: true });
-const STATIC_PAGES_SHOULD_SET_TO_CACHE = dippy.createToken('static pages should set to cache', { multi: true });
 const STATIC_PAGES_BACKGROUND_FETCH_ENABLED = dippy.createToken('static pages can fetch page');
 const STATIC_PAGES_OPTIONS_TOKEN = dippy.createToken('static pages options');
 const STATIC_PAGES_COMMAND_LINE = dippy.createToken('static pages command line');
@@ -30,5 +29,4 @@ exports.STATIC_PAGES_CACHE_TOKEN = STATIC_PAGES_CACHE_TOKEN;
 exports.STATIC_PAGES_COMMAND_LINE = STATIC_PAGES_COMMAND_LINE;
 exports.STATIC_PAGES_MODIFY_CACHE = STATIC_PAGES_MODIFY_CACHE;
 exports.STATIC_PAGES_OPTIONS_TOKEN = STATIC_PAGES_OPTIONS_TOKEN;
-exports.STATIC_PAGES_SHOULD_SET_TO_CACHE = STATIC_PAGES_SHOULD_SET_TO_CACHE;
 exports.STATIC_PAGES_SHOULD_USE_CACHE = STATIC_PAGES_SHOULD_USE_CACHE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-page-render-mode",
-  "version": "2.90.0",
+  "version": "2.92.0",
   "description": "Enable different rendering modes for pages",
   "main": "./lib/server.js",
   "module": "./lib/server.es.js",
@@ -30,18 +30,18 @@
   "peerDependencies": {
     "@tinkoff/utils": "^2.1.2",
     "@tinkoff/dippy": "0.8.15",
-    "@tramvai/core": "2.90.0",
-    "@tramvai/react": "2.90.0",
-    "@tramvai/papi": "2.90.0",
-    "@tramvai/module-router": "2.90.0",
-    "@tramvai/module-client-hints": "2.90.0",
-    "@tramvai/tokens-common": "2.90.0",
-    "@tramvai/tokens-core": "2.90.0",
-    "@tramvai/tokens-render": "2.90.0",
-    "@tramvai/tokens-router": "2.90.0",
-    "@tramvai/tokens-server": "2.90.0",
-    "@tramvai/tokens-server-private": "2.90.0",
-    "@tramvai/tokens-metrics": "2.90.0",
+    "@tramvai/core": "2.92.0",
+    "@tramvai/react": "2.92.0",
+    "@tramvai/papi": "2.92.0",
+    "@tramvai/module-router": "2.92.0",
+    "@tramvai/module-client-hints": "2.92.0",
+    "@tramvai/tokens-common": "2.92.0",
+    "@tramvai/tokens-core": "2.92.0",
+    "@tramvai/tokens-render": "2.92.0",
+    "@tramvai/tokens-router": "2.92.0",
+    "@tramvai/tokens-server": "2.92.0",
+    "@tramvai/tokens-server-private": "2.92.0",
+    "@tramvai/tokens-metrics": "2.92.0",
     "prom-client": "^12.0.0",
     "react": ">=16.14.0",
     "tslib": "^2.4.0"