@tramvai/module-page-render-mode 2.85.1 → 2.89.2

package/lib/staticPages/staticPagesService.d.ts

@@ -29,8 +29,8 @@ export declare class StaticPagesService {
     private backgroundFetchService;
     private options;
     private cache5xxResponse;
-    shouldUseCache: ShouldUseCache;
-    shouldSetToCache: ShouldSetToCache;
+    shouldUseCache: () => boolean;
+    shouldSetToCache: () => boolean;
     constructor({ getCacheKey, requestManager, response, responseManager, environmentManager, userAgent, modern, logger, cache, modifyCache, shouldUseCache, shouldSetToCache, backgroundFetchService, options, cache5xxResponse, }: {
         getCacheKey: ExtractDependencyType<typeof STATIC_PAGES_GET_CACHE_KEY_TOKEN>;
         requestManager: ExtractDependencyType<typeof REQUEST_MANAGER_TOKEN>;

package/lib/staticPages/staticPagesService.es.js

@@ -10,14 +10,18 @@ class StaticPagesService {
         this.response = response;
         this.cache = cache;
         this.modifyCache = modifyCache;
-        this.shouldUseCache = shouldUseCache;
-        this.shouldSetToCache = shouldSetToCache;
+        this.shouldUseCache = () => shouldUseCache.every((fn) => fn());
+        this.shouldSetToCache = () => shouldSetToCache.every((fn) => fn());
         this.backgroundFetchService = backgroundFetchService;
         this.options = options;
         this.cache5xxResponse = cache5xxResponse;
     }
     respond(onSuccess) {
         if (!this.hasCache()) {
+            this.log.debug({
+                event: 'no-cache',
+                key: this.key,
+            });
             return;
         }
         const { ttl } = this.options;

package/lib/staticPages/staticPagesService.js

@@ -14,14 +14,18 @@ class StaticPagesService {
         this.response = response;
         this.cache = cache;
         this.modifyCache = modifyCache;
-        this.shouldUseCache = shouldUseCache;
-        this.shouldSetToCache = shouldSetToCache;
+        this.shouldUseCache = () => shouldUseCache.every((fn) => fn());
+        this.shouldSetToCache = () => shouldSetToCache.every((fn) => fn());
         this.backgroundFetchService = backgroundFetchService;
         this.options = options;
         this.cache5xxResponse = cache5xxResponse;
     }
     respond(onSuccess) {
         if (!this.hasCache()) {
+            this.log.debug({
+                event: 'no-cache',
+                key: this.key,
+            });
             return;
         }
         const { ttl } = this.options;

package/lib/staticPages.d.ts

@@ -137,10 +137,10 @@ export declare const staticPagesProviders: (import("@tinkoff/dippy/lib/Provider"
         optional: boolean;
     };
     shouldUseCache: (() => boolean) & {
-        __type?: "base token";
+        __type?: "multi token";
     };
     shouldSetToCache: (() => boolean) & {
-        __type?: "base token";
+        __type?: "multi token";
     };
     backgroundFetchService: BackgroundFetchService & {
         __type?: "base token";
@@ -191,10 +191,10 @@ export declare const staticPagesProviders: (import("@tinkoff/dippy/lib/Provider"
         optional: boolean;
     };
     shouldUseCache: (() => boolean) & {
-        __type?: "base token";
+        __type?: "multi token";
     };
     shouldSetToCache: (() => boolean) & {
-        __type?: "base token";
+        __type?: "multi token";
     };
     backgroundFetchService: BackgroundFetchService & {
         __type?: "base token";

package/lib/staticPages.es.js

@@ -50,8 +50,9 @@ const staticPagesProviders = [
     provide({
         provide: STATIC_PAGES_OPTIONS_TOKEN,
         useValue: {
-            // @TODO: свой ttl для отдельных страниц
+            // @TODO: unique ttl per pages
             ttl: 60 * 1000,
+            // @TODO: too much, better save to file-system
             maxSize: 1000,
         },
     }),

package/lib/staticPages.js

@@ -58,8 +58,9 @@ const staticPagesProviders = [
     core.provide({
         provide: tokens.STATIC_PAGES_OPTIONS_TOKEN,
         useValue: {
-            // @TODO: свой ttl для отдельных страниц
+            // @TODO: unique ttl per pages
             ttl: 60 * 1000,
+            // @TODO: too much, better save to file-system
             maxSize: 1000,
         },
     }),

package/lib/tokens.browser.js

@@ -8,8 +8,8 @@ const PAGE_RENDER_DEFAULT_MODE = createToken('pageRenderDefaultMode');
 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');
-const STATIC_PAGES_SHOULD_SET_TO_CACHE = createToken('static pages should set to 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');

package/lib/tokens.d.ts

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

package/lib/tokens.es.js

@@ -8,8 +8,8 @@ const PAGE_RENDER_DEFAULT_MODE = createToken('pageRenderDefaultMode');
 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');
-const STATIC_PAGES_SHOULD_SET_TO_CACHE = createToken('static pages should set to 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');

package/lib/tokens.js

@@ -12,8 +12,8 @@ const PAGE_RENDER_DEFAULT_MODE = dippy.createToken('pageRenderDefaultMode');
 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');
-const STATIC_PAGES_SHOULD_SET_TO_CACHE = dippy.createToken('static pages should set to 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');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-page-render-mode",
-  "version": "2.85.1",
+  "version": "2.89.2",
   "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.85.1",
-    "@tramvai/react": "2.85.1",
-    "@tramvai/papi": "2.85.1",
-    "@tramvai/module-router": "2.85.1",
-    "@tramvai/module-client-hints": "2.85.1",
-    "@tramvai/tokens-common": "2.85.1",
-    "@tramvai/tokens-core": "2.85.1",
-    "@tramvai/tokens-render": "2.85.1",
-    "@tramvai/tokens-router": "2.85.1",
-    "@tramvai/tokens-server": "2.85.1",
-    "@tramvai/tokens-server-private": "2.85.1",
-    "@tramvai/tokens-metrics": "2.85.1",
+    "@tramvai/core": "2.89.2",
+    "@tramvai/react": "2.89.2",
+    "@tramvai/papi": "2.89.2",
+    "@tramvai/module-router": "2.89.2",
+    "@tramvai/module-client-hints": "2.89.2",
+    "@tramvai/tokens-common": "2.89.2",
+    "@tramvai/tokens-core": "2.89.2",
+    "@tramvai/tokens-render": "2.89.2",
+    "@tramvai/tokens-router": "2.89.2",
+    "@tramvai/tokens-server": "2.89.2",
+    "@tramvai/tokens-server-private": "2.89.2",
+    "@tramvai/tokens-metrics": "2.89.2",
     "prom-client": "^12.0.0",
     "react": ">=16.14.0",
     "tslib": "^2.4.0"