@tramvai/module-page-render-mode 5.49.1 → 6.59.0

package/lib/error.es.js

@@ -1,11 +1,12 @@
 import { SilentError } from '@tinkoff/errors';
 
 class StopCommandLineRunnerError extends SilentError {
+    static errorName = 'StopCommandLineRunnerError';
+    name;
     constructor() {
         super('Prevent CommandLineRunner from execution');
         this.name = StopCommandLineRunnerError.errorName;
     }
 }
-StopCommandLineRunnerError.errorName = 'StopCommandLineRunnerError';
 
 export { StopCommandLineRunnerError };

package/lib/error.js

@@ -5,11 +5,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var errors = require('@tinkoff/errors');
 
 class StopCommandLineRunnerError extends errors.SilentError {
+    static errorName = 'StopCommandLineRunnerError';
+    name;
     constructor() {
         super('Prevent CommandLineRunner from execution');
         this.name = StopCommandLineRunnerError.errorName;
     }
 }
-StopCommandLineRunnerError.errorName = 'StopCommandLineRunnerError';
 
 exports.StopCommandLineRunnerError = StopCommandLineRunnerError;

package/lib/staticPages/backgroundFetchService.d.ts

@@ -12,12 +12,11 @@ export declare class BackgroundFetchService {
         backgroundFetchEnabled: BackgroundCacheEnabled;
     });
     enabled(): boolean;
-    revalidate({ key, path, port, deviceType, modern, }: {
+    revalidate({ key, path, port, deviceType, }: {
         key: string;
         path: string;
         port: string;
         deviceType: string;
-        modern: string;
     }): Promise<void | {
         body: string;
         headers: {

package/lib/staticPages/backgroundFetchService.es.js

@@ -3,24 +3,22 @@ import { format } from '@tinkoff/url';
 
 const userAgentByDeviceType = {
     /** Chrome on Mobile */
-    'mobile-modern': 'Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.3071.125 Mobile Safari/537.36',
-    /** Old Chrome on Mobile */
-    'mobile-default': 'Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.3071.125 Mobile Safari/537.36',
-    /** Chrome on Mac OS */
-    'desktop-modern': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.3987.87 Safari/537.36',
-    /** Old Chrome on Mac OS */
-    'desktop-default': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.3987.87 Safari/537.36',
+    mobile: 'Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.3071.125 Mobile Safari/537.36',
+    /** Chrome on Desktop */
+    desktop: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.3987.87 Safari/537.36',
 };
 class BackgroundFetchService {
+    requests = new Set();
+    log;
+    backgroundFetchEnabled;
     constructor({ logger, backgroundFetchEnabled, }) {
-        this.requests = new Set();
         this.log = logger('static-pages');
         this.backgroundFetchEnabled = backgroundFetchEnabled;
     }
     enabled() {
         return this.backgroundFetchEnabled();
     }
-    async revalidate({ key, path, port, deviceType, modern, }) {
+    async revalidate({ key, path, port, deviceType, }) {
         if (this.requests.has(key)) {
             return;
         }
@@ -37,7 +35,7 @@ class BackgroundFetchService {
         });
         return fetch(revalidateUrl, {
             headers: {
-                'User-Agent': userAgentByDeviceType[`${deviceType}-${modern}`],
+                'User-Agent': userAgentByDeviceType[`${deviceType}`],
                 'X-Tramvai-Static-Page-Revalidate': 'true',
             },
             timeout: 10000,

package/lib/staticPages/backgroundFetchService.js

@@ -11,24 +11,22 @@ var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
 
 const userAgentByDeviceType = {
     /** Chrome on Mobile */
-    'mobile-modern': 'Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.3071.125 Mobile Safari/537.36',
-    /** Old Chrome on Mobile */
-    'mobile-default': 'Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.3071.125 Mobile Safari/537.36',
-    /** Chrome on Mac OS */
-    'desktop-modern': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.3987.87 Safari/537.36',
-    /** Old Chrome on Mac OS */
-    'desktop-default': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.3987.87 Safari/537.36',
+    mobile: 'Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.3071.125 Mobile Safari/537.36',
+    /** Chrome on Desktop */
+    desktop: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.3987.87 Safari/537.36',
 };
 class BackgroundFetchService {
+    requests = new Set();
+    log;
+    backgroundFetchEnabled;
     constructor({ logger, backgroundFetchEnabled, }) {
-        this.requests = new Set();
         this.log = logger('static-pages');
         this.backgroundFetchEnabled = backgroundFetchEnabled;
     }
     enabled() {
         return this.backgroundFetchEnabled();
     }
-    async revalidate({ key, path, port, deviceType, modern, }) {
+    async revalidate({ key, path, port, deviceType, }) {
         if (this.requests.has(key)) {
             return;
         }
@@ -45,7 +43,7 @@ class BackgroundFetchService {
         });
         return fetch__default["default"](revalidateUrl, {
             headers: {
-                'User-Agent': userAgentByDeviceType[`${deviceType}-${modern}`],
+                'User-Agent': userAgentByDeviceType[`${deviceType}`],
                 'X-Tramvai-Static-Page-Revalidate': 'true',
             },
             timeout: 10000,

package/lib/staticPages/staticPagesService.d.ts

@@ -2,7 +2,6 @@ import type { ExtractDependencyType } from '@tinkoff/dippy';
 import type { USER_AGENT_TOKEN } from '@tramvai/module-client-hints';
 import type { ENV_MANAGER_TOKEN, LOGGER_TOKEN, REQUEST_MANAGER_TOKEN, RESPONSE_MANAGER_TOKEN } from '@tramvai/tokens-common';
 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_CACHE_TOKEN, STATIC_PAGES_MODIFY_CACHE, STATIC_PAGES_OPTIONS_TOKEN, STATIC_PAGES_CACHE_5xx_RESPONSE } from '../tokens';
 type ResponseManager = ExtractDependencyType<typeof RESPONSE_MANAGER_TOKEN>;
@@ -19,7 +18,6 @@ export declare class StaticPagesService {
     readonly path: string;
     readonly port: string;
     readonly deviceType: string;
-    readonly modern: string;
     private responseManager;
     private response;
     private log;
@@ -29,14 +27,13 @@ export declare class StaticPagesService {
     private options;
     private cache5xxResponse;
     shouldUseCache: () => boolean;
-    constructor({ getCacheKey, requestManager, response, responseManager, environmentManager, userAgent, modern, logger, cache, modifyCache, shouldUseCache, backgroundFetchService, options, cache5xxResponse, }: {
+    constructor({ getCacheKey, requestManager, response, responseManager, environmentManager, userAgent, logger, cache, modifyCache, shouldUseCache, backgroundFetchService, options, cache5xxResponse, }: {
         getCacheKey: ExtractDependencyType<typeof STATIC_PAGES_GET_CACHE_KEY_TOKEN>;
         requestManager: ExtractDependencyType<typeof REQUEST_MANAGER_TOKEN>;
         responseManager: ResponseManager;
         response: Response;
         environmentManager: ExtractDependencyType<typeof ENV_MANAGER_TOKEN>;
         userAgent: ExtractDependencyType<typeof USER_AGENT_TOKEN>;
-        modern: ExtractDependencyType<typeof MODERN_SATISFIES_TOKEN>;
         logger: Logger;
         cache: Cache;
         modifyCache: ModifyCache;

package/lib/staticPages/staticPagesService.es.js

@@ -2,12 +2,24 @@
 // 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, backgroundFetchService, options, cache5xxResponse, }) {
+    key;
+    path;
+    port;
+    deviceType;
+    responseManager;
+    response;
+    log;
+    cache;
+    modifyCache;
+    backgroundFetchService;
+    options;
+    cache5xxResponse;
+    shouldUseCache;
+    constructor({ getCacheKey, requestManager, response, responseManager, environmentManager, userAgent, logger, cache, modifyCache, shouldUseCache, backgroundFetchService, options, cache5xxResponse, }) {
         this.key = getCacheKey();
         this.path = requestManager.getParsedUrl().pathname;
         this.port = environmentManager.get('PORT');
         this.deviceType = userAgent.mobileOS ? 'mobile' : 'desktop';
-        this.modern = modern ? 'modern' : 'default';
         this.log = logger('static-pages');
         this.responseManager = responseManager;
         this.response = response;
@@ -80,7 +92,6 @@ class StaticPagesService {
             path: this.path,
             port: this.port,
             deviceType: this.deviceType,
-            modern: this.modern,
         })
             .then((response) => {
             if (!response) {

package/lib/staticPages/staticPagesService.js

@@ -6,12 +6,24 @@ Object.defineProperty(exports, '__esModule', { value: true });
 // 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, backgroundFetchService, options, cache5xxResponse, }) {
+    key;
+    path;
+    port;
+    deviceType;
+    responseManager;
+    response;
+    log;
+    cache;
+    modifyCache;
+    backgroundFetchService;
+    options;
+    cache5xxResponse;
+    shouldUseCache;
+    constructor({ getCacheKey, requestManager, response, responseManager, environmentManager, userAgent, logger, cache, modifyCache, shouldUseCache, backgroundFetchService, options, cache5xxResponse, }) {
         this.key = getCacheKey();
         this.path = requestManager.getParsedUrl().pathname;
         this.port = environmentManager.get('PORT');
         this.deviceType = userAgent.mobileOS ? 'mobile' : 'desktop';
-        this.modern = modern ? 'modern' : 'default';
         this.log = logger('static-pages');
         this.responseManager = responseManager;
         this.response = response;
@@ -84,7 +96,6 @@ class StaticPagesService {
             path: this.path,
             port: this.port,
             deviceType: this.deviceType,
-            modern: this.modern,
         })
             .then((response) => {
             if (!response) {

package/lib/staticPages.d.ts

@@ -53,11 +53,6 @@ export declare const staticPagesProviders: (import("@tinkoff/dippy/lib/Provider"
     userAgent: import("@tinkoff/user-agent").UserAgent & {
         __type?: "base token";
     };
-    modern: (false & {
-        __type?: "base token";
-    }) | (true & {
-        __type?: "base token";
-    });
 }, () => string> | import("@tinkoff/dippy/lib/Provider").FactoryProviderWithDeps<{
     requestManager: import("@tramvai/tokens-common").RequestManager & {
         __type?: "base token";
@@ -65,11 +60,6 @@ export declare const staticPagesProviders: (import("@tinkoff/dippy/lib/Provider"
     userAgent: import("@tinkoff/user-agent").UserAgent & {
         __type?: "base token";
     };
-    modern: (false & {
-        __type?: "base token";
-    }) | (true & {
-        __type?: "base token";
-    });
 }, () => string> | import("@tinkoff/dippy/lib/Provider").ClassProviderWithDeps<{
     requestManager: import("@tramvai/tokens-common").RequestManager & {
         __type?: "base token";
@@ -117,11 +107,6 @@ export declare const staticPagesProviders: (import("@tinkoff/dippy/lib/Provider"
     userAgent: import("@tinkoff/user-agent").UserAgent & {
         __type?: "base token";
     };
-    modern: (false & {
-        __type?: "base token";
-    }) | (true & {
-        __type?: "base token";
-    });
     logger: import("@tramvai/tokens-common").Logger & ((configOrName: string | {
         [key: string]: any;
         name: string;
@@ -168,11 +153,6 @@ export declare const staticPagesProviders: (import("@tinkoff/dippy/lib/Provider"
     userAgent: import("@tinkoff/user-agent").UserAgent & {
         __type?: "base token";
     };
-    modern: (false & {
-        __type?: "base token";
-    }) | (true & {
-        __type?: "base token";
-    });
     logger: import("@tramvai/tokens-common").Logger & ((configOrName: string | {
         [key: string]: any;
         name: string;

package/lib/staticPages.es.js

@@ -1,7 +1,6 @@
 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';
-import { MODERN_SATISFIES_TOKEN } from '@tramvai/tokens-render';
 import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 import { USER_AGENT_TOKEN } from '@tramvai/module-client-hints';
 import { SERVER_MODULE_PAPI_PRIVATE_ROUTE } from '@tramvai/tokens-server';
@@ -58,7 +57,7 @@ const staticPagesProviders = [
     }),
     provide({
         provide: STATIC_PAGES_GET_CACHE_KEY_TOKEN,
-        useFactory: ({ requestManager, userAgent, modern }) => {
+        useFactory: ({ requestManager, userAgent }) => {
             return () => {
                 const deviceType = userAgent.mobileOS ? 'mobile' : 'desktop';
                 return getCacheKey({
@@ -66,14 +65,12 @@ const staticPagesProviders = [
                     host: requestManager.getHost(),
                     path: requestManager.getParsedUrl().pathname,
                     deviceType,
-                    modern,
                 });
             };
         },
         deps: {
             requestManager: REQUEST_MANAGER_TOKEN,
             userAgent: USER_AGENT_TOKEN,
-            modern: MODERN_SATISFIES_TOKEN,
         },
     }),
     provide({
@@ -119,7 +116,6 @@ const staticPagesProviders = [
             response: FASTIFY_RESPONSE,
             environmentManager: ENV_MANAGER_TOKEN,
             userAgent: USER_AGENT_TOKEN,
-            modern: MODERN_SATISFIES_TOKEN,
             logger: LOGGER_TOKEN,
             cache: STATIC_PAGES_CACHE_TOKEN,
             modifyCache: { token: STATIC_PAGES_MODIFY_CACHE, optional: true },

package/lib/staticPages.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var core = require('@tramvai/core');
 var tokensCommon = require('@tramvai/tokens-common');
 var tokensServerPrivate = require('@tramvai/tokens-server-private');
-var tokensRender = require('@tramvai/tokens-render');
 var tokensRouter = require('@tramvai/tokens-router');
 var moduleClientHints = require('@tramvai/module-client-hints');
 var tokensServer = require('@tramvai/tokens-server');
@@ -62,7 +61,7 @@ const staticPagesProviders = [
     }),
     core.provide({
         provide: STATIC_PAGES_GET_CACHE_KEY_TOKEN,
-        useFactory: ({ requestManager, userAgent, modern }) => {
+        useFactory: ({ requestManager, userAgent }) => {
             return () => {
                 const deviceType = userAgent.mobileOS ? 'mobile' : 'desktop';
                 return cacheKey.getCacheKey({
@@ -70,14 +69,12 @@ const staticPagesProviders = [
                     host: requestManager.getHost(),
                     path: requestManager.getParsedUrl().pathname,
                     deviceType,
-                    modern,
                 });
             };
         },
         deps: {
             requestManager: tokensCommon.REQUEST_MANAGER_TOKEN,
             userAgent: moduleClientHints.USER_AGENT_TOKEN,
-            modern: tokensRender.MODERN_SATISFIES_TOKEN,
         },
     }),
     core.provide({
@@ -123,7 +120,6 @@ const staticPagesProviders = [
             response: tokensServerPrivate.FASTIFY_RESPONSE,
             environmentManager: tokensCommon.ENV_MANAGER_TOKEN,
             userAgent: moduleClientHints.USER_AGENT_TOKEN,
-            modern: tokensRender.MODERN_SATISFIES_TOKEN,
             logger: tokensCommon.LOGGER_TOKEN,
             cache: tokens.STATIC_PAGES_CACHE_TOKEN,
             modifyCache: { token: tokens.STATIC_PAGES_MODIFY_CACHE, optional: true },

package/lib/utils/cacheKey.d.ts

@@ -1,9 +1,8 @@
-export declare const getCacheKey: ({ method, host, path, deviceType, modern, }: {
+export declare const getCacheKey: ({ method, host, path, deviceType, }: {
     method: string;
     host: string;
     path: string;
     deviceType: 'desktop' | 'mobile';
-    modern: boolean;
 }) => string;
 export declare const parseCacheKey: (key: string) => string[];
 //# sourceMappingURL=cacheKey.d.ts.map

package/lib/utils/cacheKey.es.js

@@ -1,5 +1,5 @@
-const getCacheKey = ({ method, host, path, deviceType, modern, }) => {
-    return `${method}=${host}=${path}=${deviceType}=${modern ? 'modern' : 'default'}`;
+const getCacheKey = ({ method, host, path, deviceType, }) => {
+    return `${method}=${host}=${path}=${deviceType}`;
 };
 
 export { getCacheKey };

package/lib/utils/cacheKey.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const getCacheKey = ({ method, host, path, deviceType, modern, }) => {
-    return `${method}=${host}=${path}=${deviceType}=${modern ? 'modern' : 'default'}`;
+const getCacheKey = ({ method, host, path, deviceType, }) => {
+    return `${method}=${host}=${path}=${deviceType}`;
 };
 
 exports.getCacheKey = getCacheKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-page-render-mode",
-  "version": "5.49.1",
+  "version": "6.59.0",
   "description": "Enable different rendering modes for pages",
   "main": "./lib/server.js",
   "module": "./lib/server.es.js",
@@ -23,25 +23,25 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "node-fetch": "^2.6.1",
-    "@tinkoff/errors": "0.6.2",
-    "@tinkoff/url": "0.11.2"
+    "@tinkoff/errors": "0.7.1",
+    "@tinkoff/url": "0.12.1",
+    "node-fetch": "^2.6.1"
   },
   "peerDependencies": {
+    "@tinkoff/dippy": "0.12.3",
     "@tinkoff/utils": "^2.1.2",
-    "@tinkoff/dippy": "0.11.4",
-    "@tramvai/core": "5.49.1",
-    "@tramvai/react": "5.49.1",
-    "@tramvai/papi": "5.49.1",
-    "@tramvai/module-router": "5.49.1",
-    "@tramvai/module-client-hints": "5.49.1",
-    "@tramvai/tokens-common": "5.49.1",
-    "@tramvai/tokens-core": "5.49.1",
-    "@tramvai/tokens-render": "5.49.1",
-    "@tramvai/tokens-router": "5.49.1",
-    "@tramvai/tokens-server": "5.49.1",
-    "@tramvai/tokens-server-private": "5.49.1",
-    "@tramvai/tokens-metrics": "5.49.1",
+    "@tramvai/core": "6.59.0",
+    "@tramvai/module-client-hints": "6.59.0",
+    "@tramvai/module-router": "6.59.0",
+    "@tramvai/papi": "6.59.0",
+    "@tramvai/react": "6.59.0",
+    "@tramvai/tokens-common": "6.59.0",
+    "@tramvai/tokens-core": "6.59.0",
+    "@tramvai/tokens-metrics": "6.59.0",
+    "@tramvai/tokens-render": "6.59.0",
+    "@tramvai/tokens-router": "6.59.0",
+    "@tramvai/tokens-server": "6.59.0",
+    "@tramvai/tokens-server-private": "6.59.0",
     "prom-client": "^14.2.0",
     "react": ">=16.14.0",
     "tslib": "^2.4.0"