@sima-land/isomorph 11.0.0-alpha.3 → 11.0.0-alpha.31

package/http-server/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/http-server/errors.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,QAAS,SAAQ,KAAK;IAGjC;;;OAGG;IACH,YAAY,OAAe,EAAE,UAAU,GAAG,GAAG;QAC3C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CACF;AAXD,4BAWC"}

package/http-server/handler/health-check.d.ts

@@ -1,6 +1,6 @@
 import type { Handler } from 'express';
 /**
- * Обработчик, отвечающий данными о времени работы приложения.
+ * Возвращает обработчик, отвечающий данными о времени работы приложения.
  * @return Обработчик http-запроса.
  */
 export declare function healthCheck(): Handler;

package/http-server/handler/health-check.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.healthCheck = void 0;
 /**
- * Обработчик, отвечающий данными о времени работы приложения.
+ * Возвращает обработчик, отвечающий данными о времени работы приложения.
  * @return Обработчик http-запроса.
  */
 function healthCheck() {

package/http-server/middleware/{logging.d.ts → log.d.ts}

@@ -1,10 +1,10 @@
 import type { Handler } from 'express';
 import type { BaseConfig } from '../../config/types';
-import type { Logger } from '../../logger/types';
+import type { Logger } from '../../log/types';
 /**
  * Возвращает новый middleware для логирования запросов.
  * @param config Конфиг.
  * @param logger Logger.
  * @return Middleware.
  */
-export declare function loggingMiddleware(config: BaseConfig, logger: Logger): Handler;
+export declare function logMiddleware(config: BaseConfig, logger: Logger): Handler;

package/http-server/middleware/log.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logMiddleware = void 0;
+const utils_1 = require("../utils");
+const number_1 = require("../../utils/number");
+/**
+ * Возвращает новый middleware для логирования запросов.
+ * @param config Конфиг.
+ * @param logger Logger.
+ * @return Middleware.
+ */
+function logMiddleware(config, logger) {
+    return function log(req, res, next) {
+        const start = process.hrtime.bigint();
+        const remoteIp = (0, utils_1.getXClientIp)(req);
+        // @todo перенести в пресеты?
+        const startMsg = {
+            type: 'http.request[incoming]',
+            version: config.appVersion,
+            route: req.originalUrl,
+            method: req.method,
+            remote_ip: remoteIp,
+        };
+        logger.info(startMsg);
+        res.once('finish', () => {
+            const finish = process.hrtime.bigint();
+            // @todo перенести в пресеты?
+            const finishMsg = {
+                type: 'http.response[outgoing]',
+                version: config.appVersion,
+                route: req.originalUrl,
+                method: req.method,
+                status: res.statusCode,
+                remote_ip: remoteIp,
+                latency: (0, number_1.toMilliseconds)(finish - start),
+            };
+            logger.info(finishMsg);
+        });
+        next();
+    };
+}
+exports.logMiddleware = logMiddleware;
+//# sourceMappingURL=log.js.map

package/http-server/middleware/log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/http-server/middleware/log.ts"],"names":[],"mappings":";;;AAGA,oCAAwC;AACxC,+CAAoD;AAEpD;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,MAAkB,EAAE,MAAc;IAC9D,OAAO,SAAS,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI;QAChC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,IAAA,oBAAY,EAAC,GAAG,CAAC,CAAC;QAEnC,6BAA6B;QAC7B,MAAM,QAAQ,GAA0E;YACtF,IAAI,EAAE,wBAAwB;YAC9B,OAAO,EAAE,MAAM,CAAC,UAAU;YAC1B,KAAK,EAAE,GAAG,CAAC,WAAW;YACtB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,SAAS,EAAE,QAAQ;SACpB,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEtB,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YACtB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAEvC,6BAA6B;YAC7B,MAAM,SAAS,GAA8C;gBAC3D,IAAI,EAAE,yBAAyB;gBAC/B,OAAO,EAAE,MAAM,CAAC,UAAU;gBAC1B,KAAK,EAAE,GAAG,CAAC,WAAW;gBACtB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,MAAM,EAAE,GAAG,CAAC,UAAU;gBACtB,SAAS,EAAE,QAAQ;gBACnB,OAAO,EAAE,IAAA,uBAAc,EAAC,MAAM,GAAG,KAAK,CAAC;aACxC,CAAC;YAEF,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AAnCD,sCAmCC"}

package/http-server/middleware/metrics.js

@@ -19,7 +19,7 @@ function responseMetricsMiddleware(config, metrics) {
             method: req.method,
         };
     }
-    return (req, res, next) => {
+    return function responseMetrics(req, res, next) {
         const start = process.hrtime.bigint();
         metrics.counter.inc(resolveLabels(req, res), 1);
         res.once('finish', () => {
@@ -37,7 +37,7 @@ exports.responseMetricsMiddleware = responseMetricsMiddleware;
  * @return Middleware.
  */
 function renderMetricsMiddleware(config, metrics) {
-    return (req, res, next) => {
+    return function renderMetrics(req, res, next) {
         let start;
         res.once(constants_1.RESPONSE_EVENT.renderStart, () => {
             start = process.hrtime.bigint();

package/http-server/middleware/metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/http-server/middleware/metrics.ts"],"names":[],"mappings":";;;AAGA,+CAAoD;AACpD,4CAA8C;AAG9C;;;;;GAKG;AACH,SAAgB,yBAAyB,CACvC,MAAkB,EAClB,OAGC;IAED,8DAA8D;IAC9D,SAAS,aAAa,CACpB,GAAY,EACZ,GAAa;QAEb,OAAO;YACL,OAAO,EAAE,MAAM,CAAC,UAAU;YAC1B,KAAK,EAAE,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI;YAC7B,IAAI,EAAE,GAAG,CAAC,UAAU;YACpB,MAAM,EAAE,GAAG,CAAC,MAAM;SACnB,CAAC;IACJ,CAAC;IAED,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACxB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAEtC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAEhD,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YACtB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAEvC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,IAAA,uBAAc,EAAC,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AAjCD,8DAiCC;AAED;;;;;GAKG;AACH,SAAgB,uBAAuB,CACrC,MAAkB,EAClB,OAEC;IAED,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACxB,IAAI,KAAyB,CAAC;QAE9B,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,WAAW,EAAE,GAAG,EAAE;YACxC,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,YAAY,EAAE,GAAG,EAAE;YACzC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,MAAM,KAAK,CAAC,6CAA6C,CAAC,CAAC;aAC5D;YAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAEvC,OAAO,CAAC,SAAS,CAAC,OAAO,CACvB;gBACE,OAAO,EAAE,MAAM,CAAC,UAAU;gBAC1B,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,KAAK,EAAE,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI;aAC9B,EACD,IAAA,uBAAc,EAAC,MAAM,GAAG,KAAK,CAAC,CAC/B,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AAhCD,0DAgCC"}
+{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/http-server/middleware/metrics.ts"],"names":[],"mappings":";;;AAGA,+CAAoD;AACpD,4CAA8C;AAG9C;;;;;GAKG;AACH,SAAgB,yBAAyB,CACvC,MAAkB,EAClB,OAGC;IAED,8DAA8D;IAC9D,SAAS,aAAa,CACpB,GAAY,EACZ,GAAa;QAEb,OAAO;YACL,OAAO,EAAE,MAAM,CAAC,UAAU;YAC1B,KAAK,EAAE,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI;YAC7B,IAAI,EAAE,GAAG,CAAC,UAAU;YACpB,MAAM,EAAE,GAAG,CAAC,MAAM;SACnB,CAAC;IACJ,CAAC;IAED,OAAO,SAAS,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI;QAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAEtC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAEhD,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YACtB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAEvC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,IAAA,uBAAc,EAAC,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AAjCD,8DAiCC;AAED;;;;;GAKG;AACH,SAAgB,uBAAuB,CACrC,MAAkB,EAClB,OAEC;IAED,OAAO,SAAS,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI;QAC1C,IAAI,KAAyB,CAAC;QAE9B,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,WAAW,EAAE,GAAG,EAAE;YACxC,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,YAAY,EAAE,GAAG,EAAE;YACzC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,MAAM,KAAK,CAAC,6CAA6C,CAAC,CAAC;aAC5D;YAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAEvC,OAAO,CAAC,SAAS,CAAC,OAAO,CACvB;gBACE,OAAO,EAAE,MAAM,CAAC,UAAU;gBAC1B,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,KAAK,EAAE,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI;aAC9B,EACD,IAAA,uBAAc,EAAC,MAAM,GAAG,KAAK,CAAC,CAC/B,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AAhCD,0DAgCC"}

package/http-server/middleware/tracing.d.ts

@@ -1,8 +1,14 @@
 import { Tracer } from '@opentelemetry/api';
-import type { Handler } from 'express';
+import type { Request, Handler } from 'express';
 /**
  * Возвращает новый middleware для трассировки стадий входящего запроса.
  * @param tracer Tracer.
  * @return Middleware.
  */
 export declare function tracingMiddleware(tracer: Tracer): Handler;
+/**
+ * Возвращает набор стандартных атрибутов для спана.
+ * @param req Входящий http-запрос.
+ * @return Атрибуты.
+ */
+export declare function getConventionalRequestAttrs(req: Request): Record<string, string | undefined>;

package/http-server/middleware/tracing.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tracingMiddleware = void 0;
+exports.getConventionalRequestAttrs = exports.tracingMiddleware = void 0;
 const constants_1 = require("../constants");
 const api_1 = require("@opentelemetry/api");
 /**
@@ -9,9 +9,10 @@ const api_1 = require("@opentelemetry/api");
  * @return Middleware.
  */
 function tracingMiddleware(tracer) {
-    return (req, res, next) => {
+    return function tracing(req, res, next) {
         const externalContext = api_1.propagation.extract(api_1.ROOT_CONTEXT, req.headers);
         const rootSpan = tracer.startSpan('response', undefined, externalContext);
+        rootSpan.setAttributes(getConventionalRequestAttrs(req));
         const rootContext = api_1.trace.setSpan(externalContext, rootSpan);
         res.locals.tracing = {
             rootSpan,
@@ -30,4 +31,21 @@ function tracingMiddleware(tracer) {
     };
 }
 exports.tracingMiddleware = tracingMiddleware;
+/**
+ * Возвращает набор стандартных атрибутов для спана.
+ * @param req Входящий http-запрос.
+ * @return Атрибуты.
+ */
+function getConventionalRequestAttrs(req) {
+    const result = {
+        'request.path': req.originalUrl,
+    };
+    for (const headerName in req.headers) {
+        if (headerName.toLowerCase().startsWith('simaland-')) {
+            result[headerName] = req.header(headerName);
+        }
+    }
+    return result;
+}
+exports.getConventionalRequestAttrs = getConventionalRequestAttrs;
 //# sourceMappingURL=tracing.js.map

package/http-server/middleware/tracing.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../../src/http-server/middleware/tracing.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAC9C,4CAA8E;AAG9E;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACxB,MAAM,eAAe,GAAG,iBAAW,CAAC,OAAO,CAAC,kBAAY,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;QAC1E,MAAM,WAAW,GAAG,WAAK,CAAC,OAAO,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAE7D,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG;YACnB,QAAQ;YACR,WAAW;SACZ,CAAC;QAEF,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,WAAW,EAAE,GAAG,EAAE;YACxC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,YAAY,EAAE,GAAG,EAAE;YACzC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YACtB,QAAQ,CAAC,GAAG,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AAzBD,8CAyBC"}
+{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../../src/http-server/middleware/tracing.ts"],"names":[],"mappings":";;;AAAA,4CAA8C;AAC9C,4CAA8E;AAG9E;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,OAAO,SAAS,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI;QACpC,MAAM,eAAe,GAAG,iBAAW,CAAC,OAAO,CAAC,kBAAY,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,SAAS,EAAE,eAAe,CAAC,CAAC;QAE1E,QAAQ,CAAC,aAAa,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC,CAAC;QAEzD,MAAM,WAAW,GAAG,WAAK,CAAC,OAAO,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;QAE7D,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG;YACnB,QAAQ;YACR,WAAW;SACZ,CAAC;QAEF,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,WAAW,EAAE,GAAG,EAAE;YACxC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,0BAAc,CAAC,YAAY,EAAE,GAAG,EAAE;YACzC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YACtB,QAAQ,CAAC,GAAG,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC;AA5BD,8CA4BC;AAED;;;;GAIG;AACH,SAAgB,2BAA2B,CAAC,GAAY;IACtD,MAAM,MAAM,GAAuC;QACjD,cAAc,EAAE,GAAG,CAAC,WAAW;KAChC,CAAC;IAEF,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,OAAO,EAAE;QACpC,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YACpD,MAAM,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;SAC7C;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAZD,kEAYC"}

package/http-server/template/index.js

@@ -10,20 +10,25 @@ exports.pageTemplate = (0, ejs_1.compile)(`
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title><%= title %></title>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,600,700,700i,800&display=swap&subset=cyrillic">
   <style>
     * {
-      margin: 0;
-      padding: 0;
-      border: 0;
-      outline: 0;
       box-sizing: border-box;
-      font: inherit;
-      line-height: inherit;
+    }
+    body {
+      font-family: -apple-system,BlinkMacSystemFont,'Source Sans Pro',"Segoe UI",Roboto,"Helvetica Neue",Ubuntu,Arial,sans-serif;
+      margin: 0;
     }
   </style>
+  <% if (assets.criticalCss) { %>
+    <link rel="stylesheet" href="<%= assets.criticalCss %>">
+  <% } %>
   <% if (assets.css) { %>
     <link rel="stylesheet" href="<%= assets.css %>">
   <% } %>
+  <% if (assets.criticalJs) { %>
+    <script src="<%= assets.criticalJs %>"></script>
+  <% } %>
 </head>
 <body>
   <%- markup %>

package/http-server/template/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http-server/template/index.ts"],"names":[],"mappings":";;;AAAA,6BAA8B;AAEjB,QAAA,YAAY,GAAG,IAAA,aAAO,EAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BnC,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/http-server/template/index.ts"],"names":[],"mappings":";;;AAAA,6BAA8B;AAEjB,QAAA,YAAY,GAAG,IAAA,aAAO,EAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmCnC,CAAC,CAAC"}

package/http-server/types.d.ts

@@ -7,6 +7,8 @@ export interface ResponseContext {
 export interface PageAssets {
     js: string;
     css: string;
+    criticalJs?: string;
+    criticalCss?: string;
 }
 export interface PageTemplateData {
     markup: string;

package/http-server/utils.d.ts

@@ -1,5 +1,6 @@
 import type { Request, Response } from 'express';
-import type { PageTemplate, PageTemplateData } from './types';
+import type { PageAssets, PageTemplate, PageTemplateData } from './types';
+import type { BaseConfig } from '../config/types';
 /**
  * Определяет IP входящего запроса.
  * @param req Входящий запрос.
@@ -12,19 +13,27 @@ export declare function getXClientIp(req: Request): string;
  * @return Служебные заголовки.
  */
 export declare function getServiceHeaders(req: Request): Record<string, string | undefined>;
+/**
+ * Формирует заголовки для исходящих запросов с сервера по соглашению.
+ * @todo Убрать в preset'ы?
+ * @param config Конфиг.
+ * @param request Входящий запрос.
+ * @return Заголовки для исходящих запросов.
+ */
+export declare function getRequestHeaders(config: BaseConfig, request: Request): Record<string, string>;
 export declare class PageResponse {
     private type;
     private html;
-    private assets;
+    private _meta;
+    private _assets;
     private _template;
-    static create(): PageResponse;
     static defineFormat(req: Request): PageResponse['type'];
     static defaultTemplate({ markup }: PageTemplateData): string;
     constructor();
     markup(html: string): this;
-    script(url: string): this;
-    styles(url: string): this;
+    assets(assets: PageAssets): this;
     format(type: PageResponse['type']): this;
     template(template: PageTemplate): this;
+    meta(meta: any): this;
     send(res: Response): void;
 }

package/http-server/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PageResponse = exports.getServiceHeaders = exports.getXClientIp = void 0;
+exports.PageResponse = exports.getRequestHeaders = exports.getServiceHeaders = exports.getXClientIp = void 0;
 const net_1 = require("net");
 /**
  * Определяет IP входящего запроса.
@@ -27,17 +27,24 @@ function getServiceHeaders(req) {
     return result;
 }
 exports.getServiceHeaders = getServiceHeaders;
+/**
+ * Формирует заголовки для исходящих запросов с сервера по соглашению.
+ * @todo Убрать в preset'ы?
+ * @param config Конфиг.
+ * @param request Входящий запрос.
+ * @return Заголовки для исходящих запросов.
+ */
+function getRequestHeaders(config, request) {
+    return {
+        'X-Client-Ip': getXClientIp(request),
+        'User-Agent': `simaland-${config.appName}/${config.appVersion}`,
+        Cookie: request.get('cookie') || '',
+        ...getServiceHeaders(request),
+    };
+}
+exports.getRequestHeaders = getRequestHeaders;
 /* eslint-disable require-jsdoc, jsdoc/require-jsdoc */
 class PageResponse {
-    constructor() {
-        this.type = 'html';
-        this.html = '';
-        this.assets = { js: '', css: '' };
-        this._template = PageResponse.defaultTemplate;
-    }
-    static create() {
-        return new PageResponse();
-    }
     static defineFormat(req) {
         let result = 'html';
         if ((req.header('accept') || '').toLowerCase().includes('application/json')) {
@@ -48,16 +55,18 @@ class PageResponse {
     static defaultTemplate({ markup }) {
         return markup;
     }
+    constructor() {
+        this.type = 'html';
+        this.html = '';
+        this._assets = { js: '', css: '' };
+        this._template = PageResponse.defaultTemplate;
+    }
     markup(html) {
         this.html = html;
         return this;
     }
-    script(url) {
-        this.assets.js = url;
-        return this;
-    }
-    styles(url) {
-        this.assets.css = url;
+    assets(assets) {
+        this._assets = assets;
         return this;
     }
     format(type) {
@@ -68,25 +77,41 @@ class PageResponse {
         this._template = template;
         return this;
     }
+    meta(meta) {
+        this._meta = meta;
+        return this;
+    }
     send(res) {
         const templateData = {
             type: this.type,
             markup: this.html,
-            assets: this.assets,
+            assets: this._assets,
         };
         switch (this.type) {
             case 'json': {
                 const result = {
                     markup: this._template(templateData),
-                    bundle_js: this.assets.js,
-                    bundle_css: this.assets.css,
+                    bundle_js: this._assets.js,
+                    bundle_css: this._assets.css,
+                    critical_js: this._assets.criticalJs,
+                    critical_css: this._assets.criticalCss,
+                    meta: this._meta,
                 };
                 res.json(result);
                 break;
             }
             case 'html': {
-                res.setHeader('simaland-bundle-js', this.assets.js);
-                res.setHeader('simaland-bundle-css', this.assets.css);
+                res.setHeader('simaland-bundle-js', this._assets.js);
+                res.setHeader('simaland-bundle-css', this._assets.css);
+                if (this._assets.criticalJs) {
+                    res.setHeader('simaland-critical-js', this._assets.criticalJs);
+                }
+                if (this._assets.criticalCss) {
+                    res.setHeader('simaland-critical-css', this._assets.criticalCss);
+                }
+                if (this._meta) {
+                    res.setHeader('simaland-meta', JSON.stringify(this._meta));
+                }
                 res.send(this._template(templateData));
                 break;
             }

package/http-server/utils.js.map

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

package/log/handler/pino.d.ts

@@ -0,0 +1,8 @@
+import type { LoggerEventHandler } from '../types';
+import type pino from 'pino';
+/**
+ * Возвращает новый handler для logger'а для вывода событий в терминал.
+ * @param pinoInstance Конфиг.
+ * @return Handler.
+ */
+export declare function createPinoHandler(pinoInstance: pino.Logger): LoggerEventHandler;

package/log/handler/pino.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPinoHandler = void 0;
+/**
+ * Возвращает новый handler для logger'а для вывода событий в терминал.
+ * @param pinoInstance Конфиг.
+ * @return Handler.
+ */
+function createPinoHandler(pinoInstance) {
+    return function pinoHandler(event) {
+        switch (event.type) {
+            case 'log':
+            case 'info':
+                pinoInstance.info(event.data);
+                break;
+            case 'warn':
+                pinoInstance.warn(event.data);
+                break;
+            case 'debug':
+                pinoInstance.debug(event.data);
+                break;
+            case 'error':
+                pinoInstance.error(event.data);
+                break;
+        }
+    };
+}
+exports.createPinoHandler = createPinoHandler;
+//# sourceMappingURL=pino.js.map

package/log/handler/pino.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pino.js","sourceRoot":"","sources":["../../../src/log/handler/pino.ts"],"names":[],"mappings":";;;AAGA;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,YAAyB;IACzD,OAAO,SAAS,WAAW,CAAC,KAAK;QAC/B,QAAQ,KAAK,CAAC,IAAI,EAAE;YAClB,KAAK,KAAK,CAAC;YACX,KAAK,MAAM;gBACT,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC9B,MAAM;YACR,KAAK,MAAM;gBACT,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC9B,MAAM;YACR,KAAK,OAAO;gBACV,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/B,MAAM;YACR,KAAK,OAAO;gBACV,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/B,MAAM;SACT;IACH,CAAC,CAAC;AACJ,CAAC;AAlBD,8CAkBC"}

package/log/handler/sentry.d.ts

@@ -0,0 +1,8 @@
+import type { LoggerEventHandler } from '../types';
+import type { Hub } from '@sentry/types';
+/**
+ * Возвращает новый handler для logger'а для отправки событий в Sentry.
+ * @param hubInit Sentry Hub или функция которая его вернёт.
+ * @return Handler.
+ */
+export declare function createSentryHandler(hubInit: Hub | (() => Hub)): LoggerEventHandler;

package/log/handler/sentry.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSentryHandler = void 0;
+const error_tracking_1 = require("../../error-tracking");
+/**
+ * Возвращает новый handler для logger'а для отправки событий в Sentry.
+ * @param hubInit Sentry Hub или функция которая его вернёт.
+ * @return Handler.
+ */
+function createSentryHandler(hubInit) {
+    const getHub = typeof hubInit === 'function' ? hubInit : () => hubInit;
+    return event => {
+        // ВАЖНО: каждый входящий http-запрос должен иметь свой собственный hub
+        // подробности: https://github.com/getsentry/sentry-javascript/discussions/5648
+        // поэтому если передана функция - вызываем каждый раз (внутри обработчика)
+        const hub = getHub();
+        // error
+        if (event.type === 'error') {
+            const error = event.data;
+            if (error instanceof error_tracking_1.SentryError) {
+                const { level, context, extra } = error.data;
+                hub.withScope(scope => {
+                    if (level) {
+                        scope.setLevel(level);
+                    }
+                    if (context) {
+                        const list = Array.isArray(context) ? context : [context];
+                        for (const item of list) {
+                            scope.setContext(item.key, item.data);
+                        }
+                    }
+                    if (extra) {
+                        scope.setExtra(extra.key, extra.data);
+                    }
+                    hub.captureException(error);
+                });
+            }
+            else {
+                hub.captureException(error);
+            }
+        }
+        // breadcrumb
+        if (event.data instanceof error_tracking_1.SentryBreadcrumb) {
+            const breadcrumb = event.data.data;
+            hub.addBreadcrumb(breadcrumb);
+        }
+    };
+}
+exports.createSentryHandler = createSentryHandler;
+//# sourceMappingURL=sentry.js.map

package/log/handler/sentry.js.map

@@ -0,0 +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"}

package/log/index.d.ts

@@ -0,0 +1,2 @@
+export { Logger, LoggerEvent, LoggerEventType, LoggerEventHandler } from './types';
+export { createLogger } from './logger';

package/log/index.js

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

package/log/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/log/index.ts"],"names":[],"mappings":";;;AACA,mCAAwC;AAA/B,sGAAA,YAAY,OAAA"}

package/{logger/index.js → log/logger.js}

@@ -28,4 +28,4 @@ function createLogger() {
     };
 }
 exports.createLogger = createLogger;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=logger.js.map

package/log/logger.js.map

@@ -0,0 +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"}

package/log/types.d.ts

@@ -0,0 +1,41 @@
+/**
+ * Тип события.
+ */
+export type LoggerEventType = 'error' | 'log' | 'info' | 'warn' | 'debug';
+/**
+ * Интерфейс события.
+ */
+export interface LoggerEvent {
+    type: LoggerEventType;
+    data: unknown;
+}
+/**
+ * Интерфейс функции-обработчика события.
+ */
+export interface LoggerEventHandler {
+    (event: LoggerEvent): void;
+}
+/**
+ * Интерфейс логгера.
+ * Поддерживает наиболее распространенные события жизненного цикла программы.
+ */
+export interface Logger {
+    error(data: any): void;
+    log(data: any): void;
+    info(data: any): void;
+    warn(data: any): void;
+    debug(data: any): void;
+    subscribe(handler: LoggerEventHandler): void;
+}
+/**
+ * Структура данных, которую необходимо выводить в терминал по соглашению внутри компании.
+ * @todo Убрать в preset'ы?
+ */
+export interface ConventionalFluentInfo {
+    version: string;
+    latency: number;
+    method: string;
+    remote_ip: string;
+    route: string;
+    status: number;
+}

package/{preset → log}/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/preset/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/log/types.ts"],"names":[],"mappings":""}

package/metrics/constants.d.ts

@@ -1,3 +1,6 @@
+/**
+ * Константы лейблов для метрик по соглашению.
+ */
 export declare const ConventionalLabels: {
     readonly HTTP_RESPONSE: readonly ["version", "route", "code", "method"];
     readonly SSR: readonly ["version", "route", "method"];

package/metrics/constants.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConventionalLabels = void 0;
+/**
+ * Константы лейблов для метрик по соглашению.
+ */
 exports.ConventionalLabels = {
     HTTP_RESPONSE: ['version', 'route', 'code', 'method'],
     SSR: ['version', 'route', 'method'],

package/metrics/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/metrics/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,kBAAkB,GAAG;IAChC,aAAa,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC;IACrD,GAAG,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC;CAC3B,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/metrics/constants.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,kBAAkB,GAAG;IAChC,aAAa,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC;IACrD,GAAG,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC;CAC3B,CAAC"}