@sima-land/isomorph 11.0.0-alpha.33 → 11.0.0-alpha.34

package/log/handler/sentry.js.map

@@ -1 +1 @@
-{"version":3,"file":"sentry.js","sourceRoot":"","sources":["../../../src/log/handler/sentry.ts"],"names":[],"mappings":";;;AAEA,yDAAqE;AAErE;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,OAA0B;IAC5D,MAAM,MAAM,GAAG,OAAO,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC;IAEvE,OAAO,KAAK,CAAC,EAAE;QACb,uEAAuE;QACvE,+EAA+E;QAC/E,2EAA2E;QAC3E,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;QAErB,QAAQ;QACR,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC;YAEzB,IAAI,KAAK,YAAY,4BAAW,EAAE;gBAChC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;gBAE7C,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;oBACpB,IAAI,KAAK,EAAE;wBACT,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;qBACvB;oBAED,IAAI,OAAO,EAAE;wBACX,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;wBAE1D,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;4BACvB,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;yBACvC;qBACF;oBAED,IAAI,KAAK,EAAE;wBACT,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;qBACvC;oBAED,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;gBAC9B,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;aAC7B;SACF;QAED,aAAa;QACb,IAAI,KAAK,CAAC,IAAI,YAAY,iCAAgB,EAAE;YAC1C,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;YAEnC,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;SAC/B;IACH,CAAC,CAAC;AACJ,CAAC;AA/CD,kDA+CC"}
+{"version":3,"file":"sentry.js","sourceRoot":"","sources":["../../../src/log/handler/sentry.ts"],"names":[],"mappings":";;;AAEA,mCAAsD;AAEtD;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,OAA0B;IAC5D,MAAM,MAAM,GAAG,OAAO,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC;IAEvE,OAAO,KAAK,CAAC,EAAE;QACb,uEAAuE;QACvE,+EAA+E;QAC/E,2EAA2E;QAC3E,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;QAErB,QAAQ;QACR,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC;YAEzB,IAAI,KAAK,YAAY,mBAAa,EAAE;gBAClC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;gBAE7C,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;oBACpB,IAAI,KAAK,EAAE;wBACT,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;qBACvB;oBAED,IAAI,OAAO,EAAE;wBACX,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;wBAE1D,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;4BACvB,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;yBACvC;qBACF;oBAED,IAAI,KAAK,EAAE;wBACT,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;qBACvC;oBAED,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;gBAC9B,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;aAC7B;SACF;QAED,aAAa;QACb,IAAI,KAAK,CAAC,IAAI,YAAY,gBAAU,EAAE;YACpC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;YAEnC,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;SAC/B;IACH,CAAC,CAAC;AACJ,CAAC;AA/CD,kDA+CC"}

package/log/index.d.ts

@@ -1,2 +1,3 @@
-export { Logger, LoggerEvent, LoggerEventType, LoggerEventHandler } from './types';
+export { Logger, LogEvent, LogLevel, LogHandler, ErrorDetails, BreadcrumbDetails, ContextData, } from './types';
 export { createLogger } from './logger';
+export { DetailedError, Breadcrumb } from './errors';

package/log/index.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLogger = void 0;
+exports.Breadcrumb = exports.DetailedError = exports.createLogger = void 0;
 var logger_1 = require("./logger");
 Object.defineProperty(exports, "createLogger", { enumerable: true, get: function () { return logger_1.createLogger; } });
+var errors_1 = require("./errors");
+Object.defineProperty(exports, "DetailedError", { enumerable: true, get: function () { return errors_1.DetailedError; } });
+Object.defineProperty(exports, "Breadcrumb", { enumerable: true, get: function () { return errors_1.Breadcrumb; } });
 //# sourceMappingURL=index.js.map

package/log/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/log/index.ts"],"names":[],"mappings":";;;AACA,mCAAwC;AAA/B,sGAAA,YAAY,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/log/index.ts"],"names":[],"mappings":";;;AAUA,mCAAwC;AAA/B,sGAAA,YAAY,OAAA;AACrB,mCAAqD;AAA5C,uGAAA,aAAa,OAAA;AAAE,oGAAA,UAAU,OAAA"}

package/log/logger.js

@@ -8,14 +8,12 @@ exports.createLogger = void 0;
 function createLogger() {
     const handlers = [];
     // eslint-disable-next-line require-jsdoc, jsdoc/require-jsdoc
-    function createMethod(type) {
-        return function (data) {
-            const event = { type, data };
-            for (const handler of handlers) {
-                handler(event);
-            }
-        };
-    }
+    const createMethod = (type) => (data) => {
+        const event = { type, data };
+        for (const handler of handlers) {
+            handler(event);
+        }
+    };
     return {
         log: createMethod('log'),
         info: createMethod('info'),

package/log/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/log/logger.ts"],"names":[],"mappings":";;;AAEA;;;GAGG;AACH,SAAgB,YAAY;IAC1B,MAAM,QAAQ,GAAyB,EAAE,CAAC;IAE1C,8DAA8D;IAC9D,SAAS,YAAY,CAAC,IAAqB;QACzC,OAAO,UAAU,IAAS;YACxB,MAAM,KAAK,GAAgB,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YAC1C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC9B,OAAO,CAAC,KAAK,CAAC,CAAC;aAChB;QACH,CAAC,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC;QACxB,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;QAC1B,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;QAC1B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;QAC5B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;QAE5B,SAAS,EAAE,OAAO,CAAC,EAAE;YACnB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;KACF,CAAC;AACJ,CAAC;AAxBD,oCAwBC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/log/logger.ts"],"names":[],"mappings":";;;AAEA;;;GAGG;AACH,SAAgB,YAAY;IAC1B,MAAM,QAAQ,GAAiB,EAAE,CAAC;IAElC,8DAA8D;IAC9D,MAAM,YAAY,GAAG,CAAC,IAAc,EAAE,EAAE,CAAC,CAAC,IAAS,EAAE,EAAE;QACrD,MAAM,KAAK,GAAa,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAEvC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,OAAO,CAAC,KAAK,CAAC,CAAC;SAChB;IACH,CAAC,CAAC;IAEF,OAAO;QACL,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC;QACxB,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;QAC1B,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;QAC1B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;QAC5B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;QAE5B,SAAS,EAAE,OAAO,CAAC,EAAE;YACnB,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;KACF,CAAC;AACJ,CAAC;AAvBD,oCAuBC"}

package/log/types.d.ts

@@ -1,22 +1,23 @@
+import type { SeverityLevel, Context, Extra, Breadcrumb } from '@sentry/types';
 /**
  * Тип события.
  */
-export type LoggerEventType = 'error' | 'log' | 'info' | 'warn' | 'debug';
+export type LogLevel = 'error' | 'log' | 'info' | 'warn' | 'debug';
 /**
  * Интерфейс события.
  */
-export interface LoggerEvent {
-    type: LoggerEventType;
+export interface LogEvent {
+    type: LogLevel;
     data: unknown;
 }
 /**
  * Интерфейс функции-обработчика события.
  */
-export interface LoggerEventHandler {
-    (event: LoggerEvent): void;
+export interface LogHandler {
+    (event: LogEvent): void;
 }
 /**
- * Интерфейс логгера.
+ * Logger.
  * Поддерживает наиболее распространенные события жизненного цикла программы.
  */
 export interface Logger {
@@ -25,11 +26,33 @@ export interface Logger {
     info(data: any): void;
     warn(data: any): void;
     debug(data: any): void;
-    subscribe(handler: LoggerEventHandler): void;
+    subscribe(handler: LogHandler): void;
 }
+/**
+ * Контекст ошибки.
+ */
+export interface ContextData {
+    key: string;
+    data: Context | null;
+}
+/**
+ * Детали ошибки.
+ */
+export interface ErrorDetails {
+    level?: SeverityLevel;
+    context?: ContextData | ContextData[];
+    extra?: {
+        key: string;
+        data: Extra | null;
+    };
+}
+/**
+ * Детали хлебной крошки.
+ */
+export type BreadcrumbDetails = Breadcrumb;
 /**
  * Структура данных, которую необходимо выводить в терминал по соглашению внутри компании.
- * @todo Убрать в preset'ы?
+ * @todo Убрать в preset'ы.
  */
 export interface ConventionalFluentInfo {
     version: string;

package/metrics/node.d.ts

@@ -1,4 +1,3 @@
-import { Application } from 'express';
 import * as PromClient from 'prom-client';
 import { ConventionalLabels } from './constants';
 /**
@@ -12,11 +11,6 @@ export interface DefaultNodeMetrics {
     /** Гистограмма длительности SSR. */
     renderDuration: PromClient.Histogram<typeof ConventionalLabels.SSR[number]>;
 }
-/**
- * Возвращает новое express-приложение, настроенное для выдачи информации о метриках.
- * @return Приложение.
- */
-export declare function createMetricsHttpApp(): Application;
 /**
  * Возвращает набор готовых метрик по умолчанию для приложений.
  * @todo Возможно стоит унести это в пресет.

package/metrics/node.js

@@ -22,29 +22,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDefaultMetrics = exports.createMetricsHttpApp = void 0;
-const express_1 = __importDefault(require("express"));
+exports.createDefaultMetrics = void 0;
 const PromClient = __importStar(require("prom-client"));
 const constants_1 = require("./constants");
-/**
- * Возвращает новое express-приложение, настроенное для выдачи информации о метриках.
- * @return Приложение.
- */
-function createMetricsHttpApp() {
-    const app = (0, express_1.default)();
-    PromClient.collectDefaultMetrics();
-    app.get('/', async function (req, res) {
-        const metrics = await PromClient.register.metrics();
-        res.setHeader('Content-Type', PromClient.register.contentType);
-        res.send(metrics);
-    });
-    return app;
-}
-exports.createMetricsHttpApp = createMetricsHttpApp;
 /**
  * Возвращает набор готовых метрик по умолчанию для приложений.
  * @todo Возможно стоит унести это в пресет.

package/metrics/node.js.map

@@ -1 +1 @@
-{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/metrics/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA+C;AAC/C,wDAA0C;AAC1C,2CAAiD;AAgBjD;;;GAGG;AACH,SAAgB,oBAAoB;IAClC,MAAM,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;IAEtB,UAAU,CAAC,qBAAqB,EAAE,CAAC;IAEnC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,WAAW,GAAG,EAAE,GAAG;QACnC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QAEpD,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC/D,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC;AAbD,oDAaC;AAED;;;;GAIG;AACH,SAAgB,oBAAoB;IAClC,OAAO;QACL,YAAY,EAAE,IAAI,UAAU,CAAC,OAAO,CAAC;YACnC,IAAI,EAAE,oBAAoB;YAC1B,IAAI,EAAE,6BAA6B;YACnC,UAAU,EAAE,8BAAkB,CAAC,aAAa;SAC7C,CAAC;QACF,gBAAgB,EAAE,IAAI,UAAU,CAAC,SAAS,CAAC;YACzC,IAAI,EAAE,2BAA2B;YACjC,IAAI,EAAE,0CAA0C;YAChD,UAAU,EAAE,8BAAkB,CAAC,aAAa;YAC5C,OAAO,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC;SACtD,CAAC;QACF,cAAc,EAAE,IAAI,UAAU,CAAC,SAAS,CAAC;YACvC,IAAI,EAAE,oBAAoB;YAC1B,IAAI,EAAE,oBAAoB;YAC1B,UAAU,EAAE,8BAAkB,CAAC,GAAG;YAClC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC;SACjD,CAAC;KACH,CAAC;AACJ,CAAC;AApBD,oDAoBC"}
+{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/metrics/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA0C;AAC1C,2CAAiD;AAgBjD;;;;GAIG;AACH,SAAgB,oBAAoB;IAClC,OAAO;QACL,YAAY,EAAE,IAAI,UAAU,CAAC,OAAO,CAAC;YACnC,IAAI,EAAE,oBAAoB;YAC1B,IAAI,EAAE,6BAA6B;YACnC,UAAU,EAAE,8BAAkB,CAAC,aAAa;SAC7C,CAAC;QACF,gBAAgB,EAAE,IAAI,UAAU,CAAC,SAAS,CAAC;YACzC,IAAI,EAAE,2BAA2B;YACjC,IAAI,EAAE,0CAA0C;YAChD,UAAU,EAAE,8BAAkB,CAAC,aAAa;YAC5C,OAAO,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC;SACtD,CAAC;QACF,cAAc,EAAE,IAAI,UAAU,CAAC,SAAS,CAAC;YACvC,IAAI,EAAE,oBAAoB;YAC1B,IAAI,EAAE,oBAAoB;YAC1B,UAAU,EAAE,8BAAkB,CAAC,GAAG;YAClC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC;SACjD,CAAC;KACH,CAAC;AACJ,CAAC;AApBD,oDAoBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sima-land/isomorph",
-  "version": "11.0.0-alpha.33",
+  "version": "11.0.0-alpha.34",
   "description": "Tiny framework for fast start frontend microservices",
   "author": "www.sima-land.ru team",
   "license": "Apache-2.0",
@@ -18,52 +18,57 @@
     "node": ">=16.15.1"
   },
   "devDependencies": {
+    "@babel/core": "^7.22.5",
+    "@babel/preset-env": "^7.22.5",
+    "@babel/preset-react": "^7.22.5",
+    "@babel/preset-typescript": "^7.22.5",
     "@sima-land/linters": "^2.1.5",
-    "@swc/jest": "^0.2.22",
     "@testing-library/react": "^12.1.3",
-    "@types/ejs": "^3.1.1",
-    "@types/express": "^4.17.13",
+    "@types/ejs": "^3.1.2",
+    "@types/express": "^4.17.17",
     "@types/jest": "^28.1.7",
     "@types/jsesc": "^3.0.1",
-    "@types/lodash": "^4.14.184",
+    "@types/lodash": "^4.14.194",
     "@types/react": "^17.0.40",
     "@types/react-dom": "^17.0.13",
-    "@types/webpack": "^5.28.0",
-    "husky": "^8.0.1",
+    "@types/webpack": "^5.28.1",
+    "babel-jest": "^29.5.0",
+    "husky": "^8.0.3",
     "jest": "^28.1.3",
     "jest-environment-jsdom": "^28.1.3",
     "typescript": "^4.9.4"
   },
   "dependencies": {
     "@humanwhocodes/env": "^2.2.2",
-    "@opentelemetry/api": "^1.3.0",
-    "@opentelemetry/exporter-jaeger": "^1.8.0",
-    "@opentelemetry/instrumentation": "^0.34.0",
-    "@opentelemetry/instrumentation-express": "^0.32.0",
-    "@opentelemetry/instrumentation-http": "^0.34.0",
-    "@opentelemetry/resources": "^1.8.0",
-    "@opentelemetry/sdk-trace-base": "^1.8.0",
-    "@opentelemetry/sdk-trace-node": "^1.8.0",
-    "@opentelemetry/semantic-conventions": "^1.8.0",
-    "@sentry/browser": "^7.32.1",
-    "@sentry/node": "^7.32.1",
-    "dotenv": "^16.0.0",
-    "ejs": "^3.1.8",
-    "express": "^4.17.3",
+    "@krutoo/fetch-tools": "^0.0.7",
+    "@opentelemetry/api": "^1.4.1",
+    "@opentelemetry/exporter-prometheus": "^0.38.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.39.1",
+    "@opentelemetry/propagator-jaeger": "^1.12.0",
+    "@opentelemetry/resources": "^1.12.0",
+    "@opentelemetry/sdk-metrics": "^1.12.0",
+    "@opentelemetry/sdk-trace-base": "^1.12.0",
+    "@opentelemetry/sdk-trace-node": "^1.12.0",
+    "@opentelemetry/semantic-conventions": "^1.12.0",
+    "@sentry/browser": "^7.51.2",
+    "@sentry/node": "^7.51.2",
+    "dotenv": "^16.0.3",
+    "ejs": "^3.1.9",
+    "express": "^4.18.2",
     "jsesc": "^3.0.2",
     "middleware-axios": "^2.1.5",
-    "pino": "^8.7.0",
+    "pino": "^8.14.1",
     "pino-pretty": "^9.1.1",
-    "prom-client": "^14.0.1",
-    "webpack": "^5.74.0"
+    "prom-client": "^14.2.0",
+    "webpack": "^5.82.0"
   },
   "peerDependencies": {
-    "@reduxjs/toolkit": "^1.9.1",
-    "axios": "^1.2.0-alpha.1",
+    "@reduxjs/toolkit": "^1.9.5",
+    "axios": "^1.4.0",
     "lodash": "^4.17.21",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-redux": "^8.0.2",
-    "redux-saga": "^1.2.1"
+    "react-redux": "^8.0.5",
+    "redux-saga": "^1.2.3"
   }
 }

package/preset/browser/index.d.ts

@@ -1,9 +1,16 @@
 import { Resolve, Preset } from '../../di';
+import { ConfigSource } from '../../config';
 import { Logger } from '../../log';
 import { BridgeClientSide } from '../../utils/ssr';
-import { StrictMap, KnownHttpApiKey } from '../parts/types';
+import { StrictMap, KnownHttpApiKey, PresetTuner } from '../parts/types';
 import { HttpClientFactory } from '../../http-client/types';
-export declare function PresetBrowser(): Preset;
+/**
+ * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов в браузере.
+ * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.
+ * @return Preset.
+ */
+export declare function PresetBrowser(customize?: PresetTuner): Preset;
+export declare function provideConfigSource(): ConfigSource;
 export declare function provideLogger(resolve: Resolve): Logger;
 export declare function provideBridgeClientSide(resolve: Resolve): BridgeClientSide<unknown>;
 export declare function provideKnownHttpApiHosts(resolve: Resolve): StrictMap<KnownHttpApiKey>;

package/preset/browser/index.js

@@ -1,42 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.provideHttpClientFactory = exports.provideKnownHttpApiHosts = exports.provideBridgeClientSide = exports.provideLogger = exports.PresetBrowser = void 0;
+exports.provideHttpClientFactory = exports.provideKnownHttpApiHosts = exports.provideBridgeClientSide = exports.provideLogger = exports.provideConfigSource = exports.PresetBrowser = void 0;
 /* eslint-disable require-jsdoc, jsdoc/require-jsdoc  */
 const di_1 = require("../../di");
 const tokens_1 = require("../../tokens");
-const browser_1 = require("../../config/browser");
+const config_1 = require("../../config");
 const log_1 = require("../../log");
 const sentry_1 = require("../../log/handler/sentry");
-const browser_2 = require("@sentry/browser");
+const browser_1 = require("@sentry/browser");
 const middleware_axios_1 = require("middleware-axios");
 const ssr_1 = require("../../utils/ssr");
 const utils_1 = require("../parts/utils");
 const log_2 = require("../../http-client/middleware/log");
 const providers_1 = require("../parts/providers");
-function PresetBrowser() {
-    return (0, di_1.createPreset)([
-        [tokens_1.KnownToken.Config.source, browser_1.createConfigSource],
-        [tokens_1.KnownToken.Config.base, providers_1.provideBaseConfig],
-        [tokens_1.KnownToken.logger, provideLogger],
-        [tokens_1.KnownToken.sagaMiddleware, providers_1.provideSagaMiddleware],
-        [tokens_1.KnownToken.Http.Client.factory, provideHttpClientFactory],
-        [tokens_1.KnownToken.Http.Client.LogMiddleware.handler, providers_1.provideHttpClientLogHandler],
-        [tokens_1.KnownToken.SsrBridge.clientSide, provideBridgeClientSide],
-        [tokens_1.KnownToken.Http.Api.knownHosts, provideKnownHttpApiHosts],
-    ]);
+/**
+ * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов в браузере.
+ * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.
+ * @return Preset.
+ */
+function PresetBrowser(customize) {
+    // ВАЖНО: используем .set() вместо аргумента defaults функции createPreset из-за скорости
+    const preset = (0, di_1.createPreset)();
+    preset.set(tokens_1.KnownToken.Config.source, provideConfigSource);
+    preset.set(tokens_1.KnownToken.Config.base, providers_1.provideBaseConfig);
+    preset.set(tokens_1.KnownToken.logger, provideLogger);
+    preset.set(tokens_1.KnownToken.sagaMiddleware, providers_1.provideSagaMiddleware);
+    preset.set(tokens_1.KnownToken.Http.Client.factory, provideHttpClientFactory);
+    preset.set(tokens_1.KnownToken.Http.Client.Middleware.Log.handler, providers_1.provideHttpClientLogHandler);
+    preset.set(tokens_1.KnownToken.SsrBridge.clientSide, provideBridgeClientSide);
+    preset.set(tokens_1.KnownToken.Http.Api.knownHosts, provideKnownHttpApiHosts);
+    if (customize) {
+        customize({ override: preset.set.bind(preset) });
+    }
+    return preset;
 }
 exports.PresetBrowser = PresetBrowser;
+function provideConfigSource() {
+    return (0, config_1.createConfigSource)(process.env);
+}
+exports.provideConfigSource = provideConfigSource;
 function provideLogger(resolve) {
     const source = resolve(tokens_1.KnownToken.Config.source);
-    const client = new browser_2.BrowserClient({
-        transport: browser_2.makeFetchTransport,
-        stackParser: browser_2.defaultStackParser,
+    const client = new browser_1.BrowserClient({
+        transport: browser_1.makeFetchTransport,
+        stackParser: browser_1.defaultStackParser,
         dsn: source.require('PUBLIC_SENTRY_DSN'),
         release: source.require('SENTRY_RELEASE'),
         environment: source.require('PUBLIC_SENTRY_ENVIRONMENT'),
-        integrations: [...browser_2.defaultIntegrations],
+        integrations: [...browser_1.defaultIntegrations],
     });
-    const hub = new browser_2.Hub(client);
+    const hub = new browser_1.Hub(client);
     hub.setTag('url', window.location.href);
     const logger = (0, log_1.createLogger)();
     logger.subscribe((0, sentry_1.createSentryHandler)(hub));
@@ -59,10 +72,10 @@ function provideKnownHttpApiHosts(resolve) {
 }
 exports.provideKnownHttpApiHosts = provideKnownHttpApiHosts;
 function provideHttpClientFactory(resolve) {
-    const logHandler = resolve(tokens_1.KnownToken.Http.Client.LogMiddleware.handler);
+    const logHandler = resolve(tokens_1.KnownToken.Http.Client.Middleware.Log.handler);
     return function createHttpClient(config = {}) {
         const client = (0, middleware_axios_1.create)(config);
-        client.use(utils_1.HttpStatus.createMiddleware());
+        client.use(utils_1.HttpStatus.axiosMiddleware());
         client.use((0, log_2.logMiddleware)(logHandler));
         return client;
     };

package/preset/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/browser/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/browser/index.ts"],"names":[],"mappings":"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"}

package/preset/node/{response.d.ts → handler.d.ts}

@@ -3,19 +3,22 @@ import type { PageTemplate } from '../../http-server/types';
 import type { Handler } from 'express';
 import { Application, Preset, Resolve } from '../../di';
 import { HttpClientFactory } from '../../http-client/types';
+import { PresetTuner } from '../parts/types';
 /**
  * Возвращает preset с зависимостями по умолчанию для работы в рамках ответа на http-запрос.
+ * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.
+ * @todo Возможно стоит переименовать в PresetPageHandler.
  * @return Preset.
  */
-export declare function PresetResponse(): Preset;
+export declare function PresetHandler(customize?: PresetTuner): Preset;
 export declare function provideHttpClientFactory(resolve: Resolve): HttpClientFactory;
 export declare function provideRender(resolve: Resolve): (element: JSX.Element) => string;
 export declare function provideTemplate(resolve: Resolve): PageTemplate;
 export declare function provideMain(resolve: Resolve): VoidFunction;
-export declare function provideParams(resolve: Resolve): Record<string, unknown>;
+export declare function provideSpecificParams(resolve: Resolve): Record<string, unknown>;
 /**
  * Возвращает express-handler, создающий дочернее di-приложение при запросе.
- * @param appFactory Фабрика di-приложения запроса.
+ * @param getApp Должна вернуть di-приложения запроса.
  * @return Обработчик.
  */
-export declare function HandlerProvider(appFactory: () => Application): (resolve: Resolve) => Handler;
+export declare function HandlerProvider(getApp: () => Application): (resolve: Resolve) => Handler;

package/preset/node/{response.js → handler.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HandlerProvider = exports.provideParams = exports.provideMain = exports.provideTemplate = exports.provideRender = exports.provideHttpClientFactory = exports.PresetResponse = void 0;
+exports.HandlerProvider = exports.provideSpecificParams = exports.provideMain = exports.provideTemplate = exports.provideRender = exports.provideHttpClientFactory = exports.PresetHandler = void 0;
 const di_1 = require("../../di");
 const tokens_1 = require("../../tokens");
 const server_1 = require("react-dom/server");
@@ -17,28 +17,38 @@ const providers_1 = require("../parts/providers");
 const utils_2 = require("../parts/utils");
 /**
  * Возвращает preset с зависимостями по умолчанию для работы в рамках ответа на http-запрос.
+ * @param customize Получит функцию с помощью которой можно переопределить предустановленные провайдеры.
+ * @todo Возможно стоит переименовать в PresetPageHandler.
  * @return Preset.
  */
-function PresetResponse() {
-    return (0, di_1.createPreset)([
-        [tokens_1.KnownToken.sagaMiddleware, providers_1.provideSagaMiddleware],
-        [tokens_1.KnownToken.Response.builder, () => new utils_1.PageResponse()],
-        [tokens_1.KnownToken.Response.render, provideRender],
-        [tokens_1.KnownToken.Response.template, provideTemplate],
-        [tokens_1.KnownToken.Response.main, provideMain],
-        [tokens_1.KnownToken.Response.params, provideParams],
-        [tokens_1.KnownToken.Http.Client.factory, provideHttpClientFactory],
-        [tokens_1.KnownToken.Http.Client.LogMiddleware.handler, providers_1.provideHttpClientLogHandler],
-    ]);
+function PresetHandler(customize) {
+    // ВАЖНО: используем .set() вместо аргумента defaults функции createPreset из-за скорости
+    const preset = (0, di_1.createPreset)();
+    // saga
+    preset.set(tokens_1.KnownToken.sagaMiddleware, providers_1.provideSagaMiddleware);
+    // http client
+    preset.set(tokens_1.KnownToken.Http.Client.factory, provideHttpClientFactory);
+    preset.set(tokens_1.KnownToken.Http.Client.Middleware.Log.handler, providers_1.provideHttpClientLogHandler);
+    // http handler
+    preset.set(tokens_1.KnownToken.Http.Handler.main, provideMain);
+    preset.set(tokens_1.KnownToken.Http.Handler.Request.specificParams, provideSpecificParams);
+    preset.set(tokens_1.KnownToken.Http.Handler.Response.builder, () => new utils_1.PageResponse());
+    preset.set(tokens_1.KnownToken.Http.Handler.Response.Page.assets, () => ({ js: '', css: '' }));
+    preset.set(tokens_1.KnownToken.Http.Handler.Response.Page.template, provideTemplate);
+    preset.set(tokens_1.KnownToken.Http.Handler.Response.Page.render, provideRender);
+    if (customize) {
+        customize({ override: preset.set.bind(preset) });
+    }
+    return preset;
 }
-exports.PresetResponse = PresetResponse;
+exports.PresetHandler = PresetHandler;
 function provideHttpClientFactory(resolve) {
     // @todo а что если привести все зависимости к виду:
     // const getAppConfig = resolve.lazy(KnownToken.Config.base);
     const appConfig = resolve(tokens_1.KnownToken.Config.base);
     const tracer = resolve(tokens_1.KnownToken.Tracing.tracer);
-    const context = resolve(tokens_1.KnownToken.Response.context);
-    const logHandler = resolve(tokens_1.KnownToken.Http.Client.LogMiddleware.handler);
+    const context = resolve(tokens_1.KnownToken.Http.Handler.context);
+    const logHandler = resolve(tokens_1.KnownToken.Http.Client.Middleware.Log.handler);
     // @todo добавить при необходимости (но тогда в логе будет значительно больше ошибок)
     // const controller = new AbortController();
     // context.res.on('finish', () => {
@@ -52,7 +62,7 @@ function provideHttpClientFactory(resolve) {
                 ...config.headers,
             },
         });
-        client.use(utils_2.HttpStatus.createMiddleware());
+        client.use(utils_2.HttpStatus.axiosMiddleware());
         client.use((0, tracing_1.tracingMiddleware)(tracer, context.res.locals.tracing.rootContext));
         client.use((0, log_1.logMiddleware)(logHandler));
         client.use((0, headers_1.passHeadersMiddleware)(context.req, {
@@ -64,7 +74,7 @@ function provideHttpClientFactory(resolve) {
 }
 exports.provideHttpClientFactory = provideHttpClientFactory;
 function provideRender(resolve) {
-    const { res } = resolve(tokens_1.KnownToken.Response.context);
+    const { res } = resolve(tokens_1.KnownToken.Http.Handler.context);
     return function render(element) {
         res.emit(constants_1.RESPONSE_EVENT.renderStart);
         const result = (0, server_1.renderToString)(element);
@@ -83,18 +93,20 @@ function provideTemplate(resolve) {
 }
 exports.provideTemplate = provideTemplate;
 function provideMain(resolve) {
-    const context = resolve(tokens_1.KnownToken.Response.context);
-    const assets = resolve(tokens_1.KnownToken.Response.assets);
-    const prepare = resolve(tokens_1.KnownToken.Response.prepare);
-    const render = resolve(tokens_1.KnownToken.Response.render);
-    const template = resolve(tokens_1.KnownToken.Response.template);
     const logger = resolve(tokens_1.KnownToken.logger);
-    const builder = resolve(tokens_1.KnownToken.Response.builder);
+    const context = resolve(tokens_1.KnownToken.Http.Handler.context);
+    const assets = resolve(tokens_1.KnownToken.Http.Handler.Response.Page.assets);
+    const prepare = resolve(tokens_1.KnownToken.Http.Handler.Response.Page.prepare);
+    const render = resolve(tokens_1.KnownToken.Http.Handler.Response.Page.render);
+    const template = resolve(tokens_1.KnownToken.Http.Handler.Response.Page.template);
+    const builder = resolve(tokens_1.KnownToken.Http.Handler.Response.builder);
+    const getAssets = typeof assets === 'function' ? assets : () => assets;
     return async function main() {
         try {
+            // @todo это билдер ответа но в ответе может не быть markup, assets и тд, подумать и переделать
             builder
                 .markup(await render(await prepare()))
-                .assets(assets)
+                .assets(await getAssets())
                 .format(utils_1.PageResponse.defineFormat(context.req))
                 .template(template)
                 .send(context.res);
@@ -117,8 +129,8 @@ function provideMain(resolve) {
     };
 }
 exports.provideMain = provideMain;
-function provideParams(resolve) {
-    const context = resolve(tokens_1.KnownToken.Response.context);
+function provideSpecificParams(resolve) {
+    const context = resolve(tokens_1.KnownToken.Http.Handler.context);
     try {
         const headerValue = context.req.header('simaland-params');
         /**
@@ -132,22 +144,22 @@ function provideParams(resolve) {
         return {};
     }
 }
-exports.provideParams = provideParams;
+exports.provideSpecificParams = provideSpecificParams;
 /**
  * Возвращает express-handler, создающий дочернее di-приложение при запросе.
- * @param appFactory Фабрика di-приложения запроса.
+ * @param getApp Должна вернуть di-приложения запроса.
  * @return Обработчик.
  */
-function HandlerProvider(appFactory) {
+function HandlerProvider(getApp) {
     return function provider(resolve) {
         const parent = resolve(di_1.CURRENT_APP);
         return function handler(req, res, next) {
-            const app = appFactory();
+            const app = getApp();
             app.attach(parent);
-            app.bind(tokens_1.KnownToken.Response.context).toValue({ req, res, next });
-            app.get(tokens_1.KnownToken.Response.main)();
+            app.bind(tokens_1.KnownToken.Http.Handler.context).toValue({ req, res, next });
+            app.get(tokens_1.KnownToken.Http.Handler.main)();
         };
     };
 }
 exports.HandlerProvider = HandlerProvider;
-//# sourceMappingURL=response.js.map
+//# sourceMappingURL=handler.js.map

package/preset/node/handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/preset/node/handler.ts"],"names":[],"mappings":"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"}