@tramvai/module-render 4.26.1 → 4.26.2

package/lib/resourcesInliner/externalFilesHelper.d.ts

@@ -1,3 +1,3 @@
-export declare const getFileContentLength: (url: string) => Promise<string>;
+export declare const getFileContentLength: (url: string) => Promise<string | undefined>;
 export declare const getFile: (url: string) => Promise<string | undefined>;
 //# sourceMappingURL=externalFilesHelper.d.ts.map

package/lib/resourcesInliner/externalFilesHelper.es.js

@@ -1,24 +1,36 @@
-import fetch from 'node-fetch';
+import http from 'http';
+import https from 'https';
+import requestFactory from '@tinkoff/request-core';
+import httpPlugin, { getHeaders } from '@tinkoff/request-plugin-protocol-http';
 
+const options = {
+    keepAlive: true,
+    scheduling: 'lifo',
+};
+const agent = {
+    http: new http.Agent(options),
+    https: new https.Agent(options),
+};
+const request = requestFactory([httpPlugin({ agent })]);
 const thirtySeconds = 1000 * 30;
 const getFileContentLength = async (url) => {
-    const info = await fetch(url, {
-        method: 'HEAD',
+    var _a;
+    const response = request({
+        url,
+        httpMethod: 'HEAD',
         timeout: thirtySeconds,
         headers: { 'x-tramvai-service-name': 'RESOURCE_INLINER' },
     });
-    return info.headers.get('content-length');
+    await response;
+    return (_a = getHeaders(response)['content-length']) !== null && _a !== void 0 ? _a : undefined;
 };
 const getFile = async (url) => {
-    const fileResponse = await fetch(url, {
+    const fileResponse = await request({
+        url,
         timeout: thirtySeconds,
         headers: { 'x-tramvai-service-name': 'RESOURCE_INLINER' },
     });
-    if (fileResponse.ok) {
-        const file = await fileResponse.text();
-        return file;
-    }
-    return undefined;
+    return fileResponse !== null && fileResponse !== void 0 ? fileResponse : undefined;
 };
 
 export { getFile, getFileContentLength };

package/lib/resourcesInliner/externalFilesHelper.js

@@ -2,31 +2,46 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var fetch = require('node-fetch');
+var http = require('http');
+var https = require('https');
+var requestFactory = require('@tinkoff/request-core');
+var httpPlugin = require('@tinkoff/request-plugin-protocol-http');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
+var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
+var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
+var requestFactory__default = /*#__PURE__*/_interopDefaultLegacy(requestFactory);
+var httpPlugin__default = /*#__PURE__*/_interopDefaultLegacy(httpPlugin);
 
+const options = {
+    keepAlive: true,
+    scheduling: 'lifo',
+};
+const agent = {
+    http: new http__default["default"].Agent(options),
+    https: new https__default["default"].Agent(options),
+};
+const request = requestFactory__default["default"]([httpPlugin__default["default"]({ agent })]);
 const thirtySeconds = 1000 * 30;
 const getFileContentLength = async (url) => {
-    const info = await fetch__default["default"](url, {
-        method: 'HEAD',
+    var _a;
+    const response = request({
+        url,
+        httpMethod: 'HEAD',
         timeout: thirtySeconds,
         headers: { 'x-tramvai-service-name': 'RESOURCE_INLINER' },
     });
-    return info.headers.get('content-length');
+    await response;
+    return (_a = httpPlugin.getHeaders(response)['content-length']) !== null && _a !== void 0 ? _a : undefined;
 };
 const getFile = async (url) => {
-    const fileResponse = await fetch__default["default"](url, {
+    const fileResponse = await request({
+        url,
         timeout: thirtySeconds,
         headers: { 'x-tramvai-service-name': 'RESOURCE_INLINER' },
     });
-    if (fileResponse.ok) {
-        const file = await fileResponse.text();
-        return file;
-    }
-    return undefined;
+    return fileResponse !== null && fileResponse !== void 0 ? fileResponse : undefined;
 };
 
 exports.getFile = getFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-render",
-  "version": "4.26.1",
+  "version": "4.26.2",
   "description": "",
   "browser": "lib/browser.js",
   "main": "lib/server.js",
@@ -26,13 +26,15 @@
     "@tinkoff/layout-factory": "0.5.1",
     "@tinkoff/errors": "0.5.1",
     "@tinkoff/url": "0.10.1",
-    "@tinkoff/user-agent": "0.6.81",
-    "@tramvai/module-client-hints": "4.26.1",
-    "@tramvai/module-router": "4.26.1",
-    "@tramvai/react": "4.26.1",
+    "@tinkoff/user-agent": "0.6.82",
+    "@tinkoff/request-core": "^0.9.2",
+    "@tinkoff/request-plugin-protocol-http": "^0.12.1",
+    "@tramvai/module-client-hints": "4.26.2",
+    "@tramvai/module-router": "4.26.2",
+    "@tramvai/react": "4.26.2",
     "@tramvai/safe-strings": "0.7.2",
-    "@tramvai/tokens-render": "4.26.1",
-    "@tramvai/experiments": "4.26.1",
+    "@tramvai/tokens-render": "4.26.2",
+    "@tramvai/experiments": "4.26.2",
     "@types/loadable__server": "^5.12.6",
     "node-fetch": "^2.6.1"
   },
@@ -40,14 +42,14 @@
     "@tinkoff/dippy": "0.10.8",
     "@tinkoff/utils": "^2.1.2",
     "@tinkoff/react-hooks": "0.3.1",
-    "@tramvai/cli": "4.26.1",
-    "@tramvai/core": "4.26.1",
-    "@tramvai/module-common": "4.26.1",
-    "@tramvai/state": "4.26.1",
-    "@tramvai/test-helpers": "4.26.1",
-    "@tramvai/tokens-common": "4.26.1",
-    "@tramvai/tokens-router": "4.26.1",
-    "@tramvai/tokens-server-private": "4.26.1",
+    "@tramvai/cli": "4.26.2",
+    "@tramvai/core": "4.26.2",
+    "@tramvai/module-common": "4.26.2",
+    "@tramvai/state": "4.26.2",
+    "@tramvai/test-helpers": "4.26.2",
+    "@tramvai/tokens-common": "4.26.2",
+    "@tramvai/tokens-router": "4.26.2",
+    "@tramvai/tokens-server-private": "4.26.2",
     "express": "^4.17.1",
     "prop-types": "^15.6.2",
     "react": ">=16.14.0",

package/tests.js

@@ -11,7 +11,10 @@ var toArray = require('@tinkoff/utils/array/toArray');
 require('@tinkoff/utils/is/undefined');
 require('@tinkoff/utils/is/empty');
 require('@tinkoff/url');
-require('node-fetch');
+var http = require('http');
+var https = require('https');
+var requestFactory = require('@tinkoff/request-core');
+var httpPlugin = require('@tinkoff/request-plugin-protocol-http');
 require('@tinkoff/utils/string/startsWith');
 var dippy = require('@tinkoff/dippy');
 require('@tramvai/safe-strings');
@@ -27,6 +30,10 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
 var toArray__default = /*#__PURE__*/_interopDefaultLegacy(toArray);
+var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
+var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
+var requestFactory__default = /*#__PURE__*/_interopDefaultLegacy(requestFactory);
+var httpPlugin__default = /*#__PURE__*/_interopDefaultLegacy(httpPlugin);
 
 class ResourcesRegistry {
     constructor({ resourceInliner }) {
@@ -61,6 +68,16 @@ class ResourcesRegistry {
     }
 }
 
+const options = {
+    keepAlive: true,
+    scheduling: 'lifo',
+};
+const agent = {
+    http: new http__default["default"].Agent(options),
+    https: new https__default["default"].Agent(options),
+};
+requestFactory__default["default"]([httpPlugin__default["default"]({ agent })]);
+
 const TRAMVAI_CLI_ASSETS_PREFIX = `${process.env.TRAMVAI_CLI_ASSETS_PREFIX}`;
 process.env.NODE_ENV === 'development' &&
     (process.env.ASSETS_PREFIX === 'static' || !process.env.ASSETS_PREFIX)