@tramvai/module-cache-warmup 2.70.1 → 2.72.3

package/lib/server.es.js

@@ -2,121 +2,7 @@ import { __decorate } from 'tslib';
 import { Module, provide, commandLineListTokens } from '@tramvai/core';
 import { PAPI_SERVICE } from '@tramvai/tokens-http-client';
 import { LOGGER_TOKEN, ENV_MANAGER_TOKEN } from '@tramvai/module-common';
-import { format } from '@tinkoff/url';
-import requestFactory from '@tinkoff/request-core';
-import http from '@tinkoff/request-plugin-protocol-http';
-
-const request = requestFactory([http()]);
-async function queueRequests(options) {
-    const { maxSimultaneous = 2, makeRequest, requestsOptions } = options;
-    const req = async (option) => {
-        try {
-            await makeRequest(option);
-            return {
-                option,
-                result: 'resolved',
-            };
-        }
-        catch {
-            return {
-                option,
-                result: 'rejected',
-            };
-        }
-    };
-    const queue = [];
-    const result = [];
-    for (const option of requestsOptions) {
-        const promise = req(option);
-        result.push(promise);
-        const queuedPromise = promise.then(() => {
-            const index = queue.indexOf(queuedPromise);
-            return queue.splice(index, 1);
-        });
-        queue.push(queuedPromise);
-        if (queue.length >= maxSimultaneous) {
-            // eslint-disable-next-line no-await-in-loop
-            await Promise.race(queue);
-        }
-    }
-    return Promise.all(result);
-}
-function createRequestsOptions(options) {
-    const { urls, port } = options;
-    return urls.reduce((requestOptions, url) => {
-        const ip = generateRandomIPv4Adress();
-        requestOptions.push(...options.userAgents.map((userAgent) => ({
-            url: format({
-                hostname: 'localhost',
-                port,
-                path: url.replace(/:\w+/g, '0'),
-            }),
-            headers: {
-                'User-Agent': userAgent,
-                'X-Real-IP': ip,
-            },
-        })));
-        return requestOptions;
-    }, []);
-}
-function generateRandomIPv4Adress() {
-    const from = 0;
-    const to = 255;
-    const length = 4;
-    const bytes = [];
-    for (let i = 0; i < length; i++) {
-        bytes.push(generateRandomNumberFromRange(from, to));
-    }
-    return bytes.join('.');
-}
-function generateRandomNumberFromRange(min, max) {
-    return Math.floor(Math.random() * (max - min + 1) + min);
-}
-function sendWarmUpRequest(options) {
-    return request(options);
-}
-
-const userAgents = [
-    /** Chrome on Mac OS */
-    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Safari/537.36',
-    /**  Chrome on Mobile */
-    'Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.125 Mobile Safari/537.36',
-];
-async function warmUpCache(options) {
-    const { papiService, logger, environmentManager } = options;
-    const log = logger('cache-warmup');
-    const startTimestamp = Date.now();
-    log.info("Cache warmup process 'START'");
-    try {
-        const { payload: urls } = await papiService.request({
-            path: 'bundleInfo',
-        });
-        const requestsOptions = createRequestsOptions({
-            urls,
-            port: environmentManager.get('PORT'),
-            userAgents,
-        });
-        const results = await queueRequests({
-            makeRequest: sendWarmUpRequest,
-            requestsOptions,
-            maxSimultaneous: 1,
-        });
-        const failed = results.filter((result) => result.result === 'rejected');
-        if (failed.length) {
-            log.info(`Cache warmup process 'FINISHED' with errors, failed URLs:\n${failed
-                .map((v) => v.option.path)
-                .join('\n')}`);
-        }
-        else {
-            log.info("Cache warmup process 'SUCCESS'");
-        }
-        log.info(`Cache warmup  made ${results.length} requests for ${urls.length} URLs`);
-        log.info(`Cache warmup took - ${Date.now() - startTimestamp}ms`);
-    }
-    catch (error) {
-        log.error(error, "Cache warmup process 'FAILURE'");
-    }
-}
+import { warmUpCache } from './warmup.es.js';
 
 let CacheWarmupModule = class CacheWarmupModule {
 };

package/lib/server.js

@@ -6,126 +6,7 @@ var tslib = require('tslib');
 var core = require('@tramvai/core');
 var tokensHttpClient = require('@tramvai/tokens-http-client');
 var moduleCommon = require('@tramvai/module-common');
-var url = require('@tinkoff/url');
-var requestFactory = require('@tinkoff/request-core');
-var http = require('@tinkoff/request-plugin-protocol-http');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var requestFactory__default = /*#__PURE__*/_interopDefaultLegacy(requestFactory);
-var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
-
-const request = requestFactory__default["default"]([http__default["default"]()]);
-async function queueRequests(options) {
-    const { maxSimultaneous = 2, makeRequest, requestsOptions } = options;
-    const req = async (option) => {
-        try {
-            await makeRequest(option);
-            return {
-                option,
-                result: 'resolved',
-            };
-        }
-        catch {
-            return {
-                option,
-                result: 'rejected',
-            };
-        }
-    };
-    const queue = [];
-    const result = [];
-    for (const option of requestsOptions) {
-        const promise = req(option);
-        result.push(promise);
-        const queuedPromise = promise.then(() => {
-            const index = queue.indexOf(queuedPromise);
-            return queue.splice(index, 1);
-        });
-        queue.push(queuedPromise);
-        if (queue.length >= maxSimultaneous) {
-            // eslint-disable-next-line no-await-in-loop
-            await Promise.race(queue);
-        }
-    }
-    return Promise.all(result);
-}
-function createRequestsOptions(options) {
-    const { urls, port } = options;
-    return urls.reduce((requestOptions, url$1) => {
-        const ip = generateRandomIPv4Adress();
-        requestOptions.push(...options.userAgents.map((userAgent) => ({
-            url: url.format({
-                hostname: 'localhost',
-                port,
-                path: url$1.replace(/:\w+/g, '0'),
-            }),
-            headers: {
-                'User-Agent': userAgent,
-                'X-Real-IP': ip,
-            },
-        })));
-        return requestOptions;
-    }, []);
-}
-function generateRandomIPv4Adress() {
-    const from = 0;
-    const to = 255;
-    const length = 4;
-    const bytes = [];
-    for (let i = 0; i < length; i++) {
-        bytes.push(generateRandomNumberFromRange(from, to));
-    }
-    return bytes.join('.');
-}
-function generateRandomNumberFromRange(min, max) {
-    return Math.floor(Math.random() * (max - min + 1) + min);
-}
-function sendWarmUpRequest(options) {
-    return request(options);
-}
-
-const userAgents = [
-    /** Chrome on Mac OS */
-    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Safari/537.36',
-    /**  Chrome on Mobile */
-    'Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.125 Mobile Safari/537.36',
-];
-async function warmUpCache(options) {
-    const { papiService, logger, environmentManager } = options;
-    const log = logger('cache-warmup');
-    const startTimestamp = Date.now();
-    log.info("Cache warmup process 'START'");
-    try {
-        const { payload: urls } = await papiService.request({
-            path: 'bundleInfo',
-        });
-        const requestsOptions = createRequestsOptions({
-            urls,
-            port: environmentManager.get('PORT'),
-            userAgents,
-        });
-        const results = await queueRequests({
-            makeRequest: sendWarmUpRequest,
-            requestsOptions,
-            maxSimultaneous: 1,
-        });
-        const failed = results.filter((result) => result.result === 'rejected');
-        if (failed.length) {
-            log.info(`Cache warmup process 'FINISHED' with errors, failed URLs:\n${failed
-                .map((v) => v.option.path)
-                .join('\n')}`);
-        }
-        else {
-            log.info("Cache warmup process 'SUCCESS'");
-        }
-        log.info(`Cache warmup  made ${results.length} requests for ${urls.length} URLs`);
-        log.info(`Cache warmup took - ${Date.now() - startTimestamp}ms`);
-    }
-    catch (error) {
-        log.error(error, "Cache warmup process 'FAILURE'");
-    }
-}
+var warmup = require('./warmup.js');
 
 exports.CacheWarmupModule = class CacheWarmupModule {
 };
@@ -155,7 +36,7 @@ exports.CacheWarmupModule = tslib.__decorate([
                             log.info('Skip cache warm up when mocker is enabled');
                             return;
                         }
-                        warmUpCache({ papiService, logger, environmentManager });
+                        warmup.warmUpCache({ papiService, logger, environmentManager });
                     };
                 },
                 deps: {

package/lib/utils.es.js

@@ -0,0 +1,75 @@
+import { format } from '@tinkoff/url';
+import requestFactory from '@tinkoff/request-core';
+import http from '@tinkoff/request-plugin-protocol-http';
+
+const request = requestFactory([http()]);
+async function queueRequests(options) {
+    const { maxSimultaneous = 2, makeRequest, requestsOptions } = options;
+    const req = async (option) => {
+        try {
+            await makeRequest(option);
+            return {
+                option,
+                result: 'resolved',
+            };
+        }
+        catch {
+            return {
+                option,
+                result: 'rejected',
+            };
+        }
+    };
+    const queue = [];
+    const result = [];
+    for (const option of requestsOptions) {
+        const promise = req(option);
+        result.push(promise);
+        const queuedPromise = promise.then(() => {
+            const index = queue.indexOf(queuedPromise);
+            return queue.splice(index, 1);
+        });
+        queue.push(queuedPromise);
+        if (queue.length >= maxSimultaneous) {
+            // eslint-disable-next-line no-await-in-loop
+            await Promise.race(queue);
+        }
+    }
+    return Promise.all(result);
+}
+function createRequestsOptions(options) {
+    const { urls, port } = options;
+    return urls.reduce((requestOptions, url) => {
+        const ip = generateRandomIPv4Adress();
+        requestOptions.push(...options.userAgents.map((userAgent) => ({
+            url: format({
+                hostname: 'localhost',
+                port,
+                path: url.replace(/:\w+/g, '0'),
+            }),
+            headers: {
+                'User-Agent': userAgent,
+                'X-Real-IP': ip,
+            },
+        })));
+        return requestOptions;
+    }, []);
+}
+function generateRandomIPv4Adress() {
+    const from = 0;
+    const to = 255;
+    const length = 4;
+    const bytes = [];
+    for (let i = 0; i < length; i++) {
+        bytes.push(generateRandomNumberFromRange(from, to));
+    }
+    return bytes.join('.');
+}
+function generateRandomNumberFromRange(min, max) {
+    return Math.floor(Math.random() * (max - min + 1) + min);
+}
+function sendWarmUpRequest(options) {
+    return request(options);
+}
+
+export { createRequestsOptions, queueRequests, sendWarmUpRequest };

package/lib/utils.js

@@ -0,0 +1,86 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var url = require('@tinkoff/url');
+var requestFactory = require('@tinkoff/request-core');
+var http = require('@tinkoff/request-plugin-protocol-http');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var requestFactory__default = /*#__PURE__*/_interopDefaultLegacy(requestFactory);
+var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
+
+const request = requestFactory__default["default"]([http__default["default"]()]);
+async function queueRequests(options) {
+    const { maxSimultaneous = 2, makeRequest, requestsOptions } = options;
+    const req = async (option) => {
+        try {
+            await makeRequest(option);
+            return {
+                option,
+                result: 'resolved',
+            };
+        }
+        catch {
+            return {
+                option,
+                result: 'rejected',
+            };
+        }
+    };
+    const queue = [];
+    const result = [];
+    for (const option of requestsOptions) {
+        const promise = req(option);
+        result.push(promise);
+        const queuedPromise = promise.then(() => {
+            const index = queue.indexOf(queuedPromise);
+            return queue.splice(index, 1);
+        });
+        queue.push(queuedPromise);
+        if (queue.length >= maxSimultaneous) {
+            // eslint-disable-next-line no-await-in-loop
+            await Promise.race(queue);
+        }
+    }
+    return Promise.all(result);
+}
+function createRequestsOptions(options) {
+    const { urls, port } = options;
+    return urls.reduce((requestOptions, url$1) => {
+        const ip = generateRandomIPv4Adress();
+        requestOptions.push(...options.userAgents.map((userAgent) => ({
+            url: url.format({
+                hostname: 'localhost',
+                port,
+                path: url$1.replace(/:\w+/g, '0'),
+            }),
+            headers: {
+                'User-Agent': userAgent,
+                'X-Real-IP': ip,
+            },
+        })));
+        return requestOptions;
+    }, []);
+}
+function generateRandomIPv4Adress() {
+    const from = 0;
+    const to = 255;
+    const length = 4;
+    const bytes = [];
+    for (let i = 0; i < length; i++) {
+        bytes.push(generateRandomNumberFromRange(from, to));
+    }
+    return bytes.join('.');
+}
+function generateRandomNumberFromRange(min, max) {
+    return Math.floor(Math.random() * (max - min + 1) + min);
+}
+function sendWarmUpRequest(options) {
+    return request(options);
+}
+
+exports.createRequestsOptions = createRequestsOptions;
+exports.queueRequests = queueRequests;
+exports.sendWarmUpRequest = sendWarmUpRequest;

package/lib/warmup.es.js

@@ -0,0 +1,45 @@
+import { createRequestsOptions, queueRequests, sendWarmUpRequest } from './utils.es.js';
+
+const userAgents = [
+    /** Chrome on Mac OS */
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Safari/537.36',
+    /**  Chrome on Mobile */
+    'Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.125 Mobile Safari/537.36',
+];
+async function warmUpCache(options) {
+    const { papiService, logger, environmentManager } = options;
+    const log = logger('cache-warmup');
+    const startTimestamp = Date.now();
+    log.info("Cache warmup process 'START'");
+    try {
+        const { payload: urls } = await papiService.request({
+            path: 'bundleInfo',
+        });
+        const requestsOptions = createRequestsOptions({
+            urls,
+            port: environmentManager.get('PORT'),
+            userAgents,
+        });
+        const results = await queueRequests({
+            makeRequest: sendWarmUpRequest,
+            requestsOptions,
+            maxSimultaneous: 1,
+        });
+        const failed = results.filter((result) => result.result === 'rejected');
+        if (failed.length) {
+            log.info(`Cache warmup process 'FINISHED' with errors, failed URLs:\n${failed
+                .map((v) => v.option.path)
+                .join('\n')}`);
+        }
+        else {
+            log.info("Cache warmup process 'SUCCESS'");
+        }
+        log.info(`Cache warmup  made ${results.length} requests for ${urls.length} URLs`);
+        log.info(`Cache warmup took - ${Date.now() - startTimestamp}ms`);
+    }
+    catch (error) {
+        log.error(error, "Cache warmup process 'FAILURE'");
+    }
+}
+
+export { warmUpCache };

package/lib/warmup.js

@@ -0,0 +1,49 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var utils = require('./utils.js');
+
+const userAgents = [
+    /** Chrome on Mac OS */
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Safari/537.36',
+    /**  Chrome on Mobile */
+    'Mozilla/5.0 (Linux; Android 7.0; SM-G930V Build/NRD90M) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.125 Mobile Safari/537.36',
+];
+async function warmUpCache(options) {
+    const { papiService, logger, environmentManager } = options;
+    const log = logger('cache-warmup');
+    const startTimestamp = Date.now();
+    log.info("Cache warmup process 'START'");
+    try {
+        const { payload: urls } = await papiService.request({
+            path: 'bundleInfo',
+        });
+        const requestsOptions = utils.createRequestsOptions({
+            urls,
+            port: environmentManager.get('PORT'),
+            userAgents,
+        });
+        const results = await utils.queueRequests({
+            makeRequest: utils.sendWarmUpRequest,
+            requestsOptions,
+            maxSimultaneous: 1,
+        });
+        const failed = results.filter((result) => result.result === 'rejected');
+        if (failed.length) {
+            log.info(`Cache warmup process 'FINISHED' with errors, failed URLs:\n${failed
+                .map((v) => v.option.path)
+                .join('\n')}`);
+        }
+        else {
+            log.info("Cache warmup process 'SUCCESS'");
+        }
+        log.info(`Cache warmup  made ${results.length} requests for ${urls.length} URLs`);
+        log.info(`Cache warmup took - ${Date.now() - startTimestamp}ms`);
+    }
+    catch (error) {
+        log.error(error, "Cache warmup process 'FAILURE'");
+    }
+}
+
+exports.warmUpCache = warmUpCache;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-cache-warmup",
-  "version": "2.70.1",
+  "version": "2.72.3",
   "description": "tramvai cache warmup module",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -15,20 +15,19 @@
     "directory": "packages/modules/cache-warmup"
   },
   "scripts": {
-    "build": "tramvai-build --for-publish",
-    "watch": "tsc -w",
-    "build-for-publish": "true"
+    "build": "tramvai-build --forPublish --preserveModules",
+    "watch": "tsc -w"
   },
   "dependencies": {
     "@tinkoff/request-core": "^0.9.2",
     "@tinkoff/request-plugin-protocol-http": "^0.11.6",
-    "@tinkoff/url": "0.8.4"
+    "@tinkoff/url": "0.8.5"
   },
   "peerDependencies": {
-    "@tramvai/core": "2.70.1",
-    "@tramvai/module-common": "2.70.1",
-    "@tramvai/state": "2.70.1",
-    "@tramvai/tokens-http-client": "2.70.1",
+    "@tramvai/core": "2.72.3",
+    "@tramvai/module-common": "2.72.3",
+    "@tramvai/state": "2.72.3",
+    "@tramvai/tokens-http-client": "2.72.3",
     "tslib": "^2.4.0"
   },
   "module": "lib/server.es.js",