@sima-land/isomorph 11.0.0-alpha.2 → 11.0.0-alpha.5

package/config/{index.js → base.js}

@@ -17,4 +17,4 @@ function createBaseConfig(source) {
     };
 }
 exports.createBaseConfig = createBaseConfig;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=base.js.map

package/config/base.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/config/base.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,MAAoB;IACnD,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAEjD,OAAO;QACL,GAAG;QACH,OAAO;QACP,UAAU;KACX,CAAC;AACJ,CAAC;AAVD,4CAUC"}

package/di/application.d.ts

@@ -0,0 +1,6 @@
+import type { Application, Token } from './types';
+/**
+ * Токен, с помощью которого можно достать из приложения само приложение.
+ */
+export declare const CURRENT_APP: Token<never>;
+export declare function createApplication(): Application;

package/{container → di}/application.js

@@ -1,8 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Application = void 0;
-const _1 = require(".");
-class Application {
+exports.createApplication = exports.CURRENT_APP = void 0;
+const errors_1 = require("./errors");
+const token_1 = require("./token");
+const container_1 = require("./container");
+/**
+ * Токен, с помощью которого можно достать из приложения само приложение.
+ */
+exports.CURRENT_APP = (0, token_1.createToken)('application/self');
+class ApplicationImplementation {
     constructor() {
         this.providers = new Map();
         this.presets = [];
@@ -22,7 +28,7 @@ class Application {
             return this.getContainer().get(token);
         }
         catch (error) {
-            if (error instanceof _1.NothingBoundError && this.parent) {
+            if (error instanceof errors_1.NothingBoundError && this.parent) {
                 return this.parent.get(token);
             }
             else {
@@ -37,8 +43,8 @@ class Application {
         return this.container;
     }
     configureContainer() {
-        const container = (0, _1.createContainer)();
-        container.set(Application.self, () => this);
+        const container = (0, container_1.createContainer)();
+        container.set(exports.CURRENT_APP, () => this);
         for (const preset of this.presets) {
             preset.apply(this);
         }
@@ -58,6 +64,8 @@ class Application {
         fn(...tokens.map(token => this.get(token)));
     }
 }
-exports.Application = Application;
-Application.self = (0, _1.createToken)('application/self');
+function createApplication() {
+    return new ApplicationImplementation();
+}
+exports.createApplication = createApplication;
 //# sourceMappingURL=application.js.map

package/di/application.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"application.js","sourceRoot":"","sources":["../../src/di/application.ts"],"names":[],"mappings":";;;AAWA,qCAA6C;AAC7C,mCAAsC;AACtC,2CAA8C;AAE9C;;GAEG;AACU,QAAA,WAAW,GAAG,IAAA,mBAAW,EAAC,kBAAkB,CAAC,CAAC;AAE3D,MAAM,yBAAyB;IAM7B;QACE,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,IAAI,CAAI,KAAe;QACrB,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,EAAE;gBACf,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;YACD,UAAU,EAAE,QAAQ,CAAC,EAAE;gBACrB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACtC,CAAC;SACF,CAAC;IACJ,CAAC;IAED,GAAG,CAAI,KAAe;QACpB,IAAI;YACF,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACvC;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,0BAAiB,IAAI,IAAI,CAAC,MAAM,EAAE;gBACrD,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aAC/B;iBAAM;gBACL,MAAM,KAAK,CAAC;aACb;SACF;IACH,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;SAC5C;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEO,kBAAkB;QACxB,MAAM,SAAS,GAAG,IAAA,2BAAe,GAAE,CAAC;QAEpC,SAAS,CAAC,GAAG,CAAC,mBAAW,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAEvC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YACjC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACpB;QAED,MAAM,OAAO,GAAY,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAElD,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE;YAC9C,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;SAC/C;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,MAAmB;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,CACJ,MAAmB,EACnB,EAA0C;QAE1C,EAAE,CAAC,GAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAS,CAAC,CAAC;IACvD,CAAC;CACF;AAED,SAAgB,iBAAiB;IAC/B,OAAO,IAAI,yBAAyB,EAAE,CAAC;AACzC,CAAC;AAFD,8CAEC"}

package/di/container.d.ts

@@ -0,0 +1,6 @@
+import type { Container } from './types';
+/**
+ * Возвращает новый DI-контейнер.
+ * @return DI-контейнер.
+ */
+export declare function createContainer(): Container;

package/di/container.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createContainer = void 0;
+const errors_1 = require("./errors");
+class ContainerImplementation {
+    constructor() {
+        this.cache = new Map();
+        this.registry = new Map();
+    }
+    set(token, provider) {
+        this.registry.set(token._key, provider);
+    }
+    get(token) {
+        return this.resolve(token, []);
+    }
+    resolve(token, chain) {
+        if (chain.includes(token)) {
+            throw new errors_1.CircularDependencyError([...chain, token]);
+        }
+        else {
+            chain.push(token);
+        }
+        if (this.cache.has(token._key)) {
+            return this.cache.get(token._key);
+        }
+        else if (this.registry.has(token._key)) {
+            const provider = this.registry.get(token._key);
+            if (typeof provider !== 'function') {
+                throw new Error('Provider is not a function');
+            }
+            const value = provider(otherToken => this.resolve(otherToken, chain));
+            // всегда как singleton
+            this.cache.set(token._key, value);
+            return value;
+        }
+        else {
+            throw new errors_1.NothingBoundError(token._key);
+        }
+    }
+}
+/**
+ * Возвращает новый DI-контейнер.
+ * @return DI-контейнер.
+ */
+function createContainer() {
+    return new ContainerImplementation();
+}
+exports.createContainer = createContainer;
+//# sourceMappingURL=container.js.map

package/di/container.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"container.js","sourceRoot":"","sources":["../../src/di/container.ts"],"names":[],"mappings":";;;AAEA,qCAAsE;AAEtE,MAAM,uBAAuB;IAI3B;QACE,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAAe,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAyB,CAAC;IACnD,CAAC;IAED,GAAG,CAAI,KAAe,EAAE,QAAqB;QAC3C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,GAAG,CAAI,KAAe;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACjC,CAAC;IAEO,OAAO,CAAI,KAAe,EAAE,KAAmB;QACrD,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACzB,MAAM,IAAI,gCAAuB,CAAC,CAAC,GAAG,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;SACtD;aAAM;YACL,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACnB;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACnC;aAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAE/C,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;aAC/C;YAED,MAAM,KAAK,GAAG,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;YAEtE,uBAAuB;YACvB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAElC,OAAO,KAAK,CAAC;SACd;aAAM;YACL,MAAM,IAAI,0BAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACzC;IACH,CAAC;CACF;AAED;;;GAGG;AACH,SAAgB,eAAe;IAC7B,OAAO,IAAI,uBAAuB,EAAE,CAAC;AACvC,CAAC;AAFD,0CAEC"}

package/di/errors.d.ts

@@ -0,0 +1,21 @@
+import type { Token } from './types';
+/**
+ * Ошибка, сообщающая, что в контейнере нет сервиса по заданному ключу.
+ */
+export declare class NothingBoundError extends Error {
+    /**
+     * Конструктор.
+     * @param key Ключ целевой зависимости.
+     */
+    constructor(key: symbol);
+}
+/**
+ * Ошибка, сообщающая, что обнаружена циклическая зависимость.
+ */
+export declare class CircularDependencyError extends Error {
+    /**
+     * Конструктор.
+     * @param trace Список токенов, в котором обнаружен цикл.
+     */
+    constructor(trace: Token<any>[]);
+}

package/di/errors.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CircularDependencyError = exports.NothingBoundError = void 0;
+/**
+ * Ошибка, сообщающая, что в контейнере нет сервиса по заданному ключу.
+ */
+class NothingBoundError extends Error {
+    /**
+     * Конструктор.
+     * @param key Ключ целевой зависимости.
+     */
+    constructor(key) {
+        super(`Nothing bound to ${String(key)}`);
+        this.name = 'NothingBoundError';
+    }
+}
+exports.NothingBoundError = NothingBoundError;
+/**
+ * Ошибка, сообщающая, что обнаружена циклическая зависимость.
+ */
+class CircularDependencyError extends Error {
+    /**
+     * Конструктор.
+     * @param trace Список токенов, в котором обнаружен цикл.
+     */
+    constructor(trace) {
+        const names = trace.map(token => String(token._key)).join(' >> ');
+        super(`Circular dependency found, trace: ${names}`);
+        this.name = 'CircularDependencyError';
+    }
+}
+exports.CircularDependencyError = CircularDependencyError;
+//# sourceMappingURL=errors.js.map

package/di/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/di/errors.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,iBAAkB,SAAQ,KAAK;IAC1C;;;OAGG;IACH,YAAY,GAAW;QACrB,KAAK,CAAC,oBAAoB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AATD,8CASC;AAED;;GAEG;AACH,MAAa,uBAAwB,SAAQ,KAAK;IAChD;;;OAGG;IACH,YAAY,KAAmB;QAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClE,KAAK,CAAC,qCAAqC,KAAK,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;IACxC,CAAC;CACF;AAVD,0DAUC"}

package/di/index.d.ts

@@ -0,0 +1,6 @@
+export { Token, Resolve, Provider, Container, Application, Preset } from './types';
+export { NothingBoundError, CircularDependencyError } from './errors';
+export { createToken } from './token';
+export { createContainer } from './container';
+export { createPreset } from './preset';
+export { createApplication, CURRENT_APP } from './application';

package/di/index.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CURRENT_APP = exports.createApplication = exports.createPreset = exports.createContainer = exports.createToken = exports.CircularDependencyError = exports.NothingBoundError = void 0;
+var errors_1 = require("./errors");
+Object.defineProperty(exports, "NothingBoundError", { enumerable: true, get: function () { return errors_1.NothingBoundError; } });
+Object.defineProperty(exports, "CircularDependencyError", { enumerable: true, get: function () { return errors_1.CircularDependencyError; } });
+var token_1 = require("./token");
+Object.defineProperty(exports, "createToken", { enumerable: true, get: function () { return token_1.createToken; } });
+var container_1 = require("./container");
+Object.defineProperty(exports, "createContainer", { enumerable: true, get: function () { return container_1.createContainer; } });
+var preset_1 = require("./preset");
+Object.defineProperty(exports, "createPreset", { enumerable: true, get: function () { return preset_1.createPreset; } });
+var application_1 = require("./application");
+Object.defineProperty(exports, "createApplication", { enumerable: true, get: function () { return application_1.createApplication; } });
+Object.defineProperty(exports, "CURRENT_APP", { enumerable: true, get: function () { return application_1.CURRENT_APP; } });
+//# sourceMappingURL=index.js.map

package/di/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/di/index.ts"],"names":[],"mappings":";;;AACA,mCAAsE;AAA7D,2GAAA,iBAAiB,OAAA;AAAE,iHAAA,uBAAuB,OAAA;AACnD,iCAAsC;AAA7B,oGAAA,WAAW,OAAA;AACpB,yCAA8C;AAArC,4GAAA,eAAe,OAAA;AACxB,mCAAwC;AAA/B,sGAAA,YAAY,OAAA;AACrB,6CAA+D;AAAtD,gHAAA,iBAAiB,OAAA;AAAE,0GAAA,WAAW,OAAA"}

package/{preset/index.d.ts → di/preset.d.ts}

@@ -1,7 +1,9 @@
-import type { Preset, PresetEntry } from './types';
+import type { Provider, Token, Preset } from './types';
+declare type PresetEntry<T = any> = [Token<T>, Provider<T>];
 /**
  * Возвращает новый "preset" приложения - набор предустановленных компонентов которые можно переопределять.
  * @param defaults Предустановленные зависимости.
  * @return Preset.
  */
 export declare function createPreset(defaults: PresetEntry[]): Preset;
+export {};

package/{preset/index.js → di/preset.js}

@@ -22,4 +22,4 @@ function createPreset(defaults) {
     return preset;
 }
 exports.createPreset = createPreset;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=preset.js.map

package/di/preset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../src/di/preset.ts"],"names":[],"mappings":";;;AAIA;;;;GAIG;AACH,SAAgB,YAAY,CAAC,QAAuB;IAClD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAA4B,QAAQ,CAAC,CAAC;IAE9D,MAAM,MAAM,GAAG;QACb,QAAQ,EAAE,CAAI,KAAe,EAAE,QAAqB,EAAE,EAAE;YACtD,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAC9B,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,KAAK,EAAE,CAAC,GAAgB,EAAE,EAAE;YAC1B,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,QAAQ,EAAE;gBACxC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;aACtC;QACH,CAAC;KACF,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAjBD,oCAiBC"}

package/di/token.d.ts

@@ -0,0 +1,7 @@
+import { Token } from './types';
+/**
+ * Возвращает новый токен.
+ * @param name Имя токена для отладки в случае ошибок.
+ * @return Токен.
+ */
+export declare function createToken<T = never>(name?: string): Token<T>;

package/di/token.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createToken = void 0;
+/**
+ * Возвращает новый токен.
+ * @param name Имя токена для отладки в случае ошибок.
+ * @return Токен.
+ */
+function createToken(name) {
+    const key = Symbol(name);
+    return {
+        _key: key,
+        _resolve: source => source.get(key),
+    };
+}
+exports.createToken = createToken;
+//# sourceMappingURL=token.js.map

package/di/token.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/di/token.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACH,SAAgB,WAAW,CAAY,IAAa;IAClD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAEzB,OAAO;QACL,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;KACpC,CAAC;AACJ,CAAC;AAPD,kCAOC"}

package/di/types.d.ts

@@ -0,0 +1,32 @@
+export interface Token<T> {
+    readonly _key: symbol;
+    readonly _resolve: (registry: Map<symbol, any>) => T;
+}
+export interface Resolve {
+    <T>(token: Token<T>): T;
+}
+export interface Provider<T> {
+    (resolve: Resolve): T;
+}
+export interface Container {
+    set: <T = never>(token: Token<T>, provider: Provider<T>) => void;
+    get: Resolve;
+}
+export interface Binding<T> {
+    toValue: (value: T) => void;
+    toProvider: (provider: Provider<T>) => void;
+}
+export declare type ExtractType<T extends readonly Token<any>[]> = {
+    [index in keyof T]: T[index] extends T[number] ? ReturnType<T[index]['_resolve']> : never;
+};
+export interface Application {
+    preset(preset: Preset): void;
+    attach(parent: Application): void;
+    bind<T>(token: Token<T>): Binding<T>;
+    get<T>(token: Token<T>): T;
+    invoke<Tokens extends readonly Token<any>[]>(tokens: [...Tokens], fn: (...args: ExtractType<Tokens>) => void): void;
+}
+export interface Preset {
+    override: <T>(token: Token<T>, provider: Provider<T>) => this;
+    apply: (app: Application) => void;
+}

package/{preset → di}/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/di/types.ts"],"names":[],"mappings":""}

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

@@ -1,8 +1,14 @@
-import type { Tracer } from '../../tracer/types';
-import type { Handler } from 'express';
+import { Tracer } from '@opentelemetry/api';
+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");
 /**
@@ -12,6 +12,7 @@ function tracingMiddleware(tracer) {
     return (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,4CAAsE;AAItE;;;;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,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;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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sima-land/isomorph",
-  "version": "11.0.0-alpha.2",
+  "version": "11.0.0-alpha.5",
   "description": "Tiny framework for fast start frontend microservices",
   "author": "www.sima-land.ru team",
   "license": "Apache-2.0",
@@ -22,6 +22,7 @@
     "@types/ejs": "^3.1.1",
     "@types/express": "^4.17.13",
     "@types/jest": "^27.4.1",
+    "@types/jsesc": "^3.0.1",
     "@types/lodash": "^4.14.182",
     "@types/react": "^17.0.40",
     "@types/react-dom": "^17.0.13",
@@ -32,7 +33,7 @@
   },
   "dependencies": {
     "@humanwhocodes/env": "^2.2.0",
-    "@opentelemetry/api": "^1.0.4",
+    "@opentelemetry/api": "^1.1.0",
     "@opentelemetry/exporter-jaeger": "^1.0.1",
     "@opentelemetry/instrumentation": "^0.27.0",
     "@opentelemetry/instrumentation-express": "^0.28.0",
@@ -46,6 +47,7 @@
     "dotenv": "^16.0.0",
     "ejs": "^3.1.8",
     "express": "^4.17.3",
+    "jsesc": "^3.0.2",
     "middleware-axios": "^2.1.2",
     "pino": "^7.9.1",
     "pino-pretty": "^7.5.4",

package/preset/browser/index.d.ts

@@ -0,0 +1 @@
+export declare function PresetBrowser(): import("../../di").Preset;

package/preset/browser/index.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PresetBrowser = void 0;
+/* eslint-disable require-jsdoc, jsdoc/require-jsdoc  */
+const di_1 = require("../../di");
+const tokens_1 = require("../../tokens");
+const base_1 = require("../../config/base");
+const browser_1 = require("../../config/browser");
+const browser_2 = require("../../error-tracker/browser");
+const logger_1 = require("../../logger");
+const sentry_1 = require("../../logger/handler/sentry");
+const saga_runner_1 = require("../../saga-runner");
+const browser_3 = require("@sentry/browser");
+function PresetBrowser() {
+    return (0, di_1.createPreset)([
+        [tokens_1.KnownToken.Config.source, browser_1.createConfigSource],
+        [tokens_1.KnownToken.Config.base, provideBaseConfig],
+        [tokens_1.KnownToken.logger, provideLogger],
+        [tokens_1.KnownToken.sagaRunner, provideSagaRunner],
+    ]);
+}
+exports.PresetBrowser = PresetBrowser;
+function provideBaseConfig(resolve) {
+    const source = resolve(tokens_1.KnownToken.Config.source);
+    return (0, base_1.createBaseConfig)(source);
+}
+function provideLogger(resolve) {
+    const source = resolve(tokens_1.KnownToken.Config.source);
+    // @todo брать клиент и библиотеку из di-контейнера
+    const sentry = (0, browser_2.createSentryLib)({
+        dsn: source.get('SENTRY_CLIENT_DSN'),
+        release: source.get('SENTRY_RELEASE'),
+        environment: source.get('SENTRY_ENVIRONMENT'),
+        integrations: browser_3.defaultIntegrations,
+    });
+    const logger = (0, logger_1.createLogger)();
+    logger.subscribe((0, sentry_1.createSentryHandler)(sentry));
+    return logger;
+}
+function provideSagaRunner(resolve) {
+    const logger = resolve(tokens_1.KnownToken.logger);
+    return (0, saga_runner_1.createSagaRunner)(logger);
+}
+//# sourceMappingURL=index.js.map

package/preset/browser/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/browser/index.ts"],"names":[],"mappings":";;;AAAA,wDAAwD;AACxD,iCAAiD;AACjD,yCAA0C;AAC1C,4CAAqD;AACrD,kDAA0D;AAC1D,yDAA8D;AAC9D,yCAA4C;AAC5C,wDAAkE;AAClE,mDAAqD;AACrD,6CAAsD;AAKtD,SAAgB,aAAa;IAC3B,OAAO,IAAA,iBAAY,EAAC;QAClB,CAAC,mBAAU,CAAC,MAAM,CAAC,MAAM,EAAE,4BAAkB,CAAC;QAC9C,CAAC,mBAAU,CAAC,MAAM,CAAC,IAAI,EAAE,iBAAiB,CAAC;QAC3C,CAAC,mBAAU,CAAC,MAAM,EAAE,aAAa,CAAC;QAClC,CAAC,mBAAU,CAAC,UAAU,EAAE,iBAAiB,CAAC;KAC3C,CAAC,CAAC;AACL,CAAC;AAPD,sCAOC;AAED,SAAS,iBAAiB,CAAC,OAAgB;IACzC,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEjD,OAAO,IAAA,uBAAgB,EAAC,MAAM,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,aAAa,CAAC,OAAgB;IACrC,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEjD,mDAAmD;IACnD,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC;QAC7B,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC;QACpC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC;QACrC,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC;QAC7C,YAAY,EAAE,6BAAmB;KAClC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,qBAAY,GAAE,CAAC;IAE9B,MAAM,CAAC,SAAS,CAAC,IAAA,4BAAmB,EAAC,MAAM,CAAC,CAAC,CAAC;IAE9C,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAgB;IACzC,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAU,CAAC,MAAM,CAAC,CAAC;IAE1C,OAAO,IAAA,8BAAgB,EAAC,MAAM,CAAC,CAAC;AAClC,CAAC"}

package/preset/node/index.d.ts

@@ -1,9 +1,10 @@
-import type { Preset } from '../types';
-import type { Provider } from '../../container/types';
 import type { BaseConfig } from '../../config/types';
 import type { Logger } from '../../logger/types';
 import type { Tracer } from '@opentelemetry/api';
 import type { DefaultMiddleware } from '../../http-server/types';
+import { Provider, Preset } from '../../di';
+import { BasicTracerProvider, SpanExporter } from '@opentelemetry/tracing';
+import { Resource } from '@opentelemetry/resources';
 /**
  * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов на Node.js.
  * @return Preset.
@@ -12,4 +13,7 @@ export declare function PresetNode(): Preset;
 export declare const provideBaseConfig: Provider<BaseConfig>;
 export declare const provideLogger: Provider<Logger>;
 export declare const provideTracer: Provider<Tracer>;
+export declare const provideSpanExporter: Provider<SpanExporter>;
+export declare const provideTracerProvider: Provider<BasicTracerProvider>;
+export declare const provideTracerProviderResource: Provider<Resource>;
 export declare const provideDefaultMiddleware: Provider<DefaultMiddleware>;

package/preset/node/index.js

@@ -3,51 +3,58 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.provideDefaultMiddleware = exports.provideTracer = exports.provideLogger = exports.provideBaseConfig = exports.PresetNode = void 0;
+exports.provideDefaultMiddleware = exports.provideTracerProviderResource = exports.provideTracerProvider = exports.provideSpanExporter = exports.provideTracer = exports.provideLogger = exports.provideBaseConfig = exports.PresetNode = void 0;
+const di_1 = require("../../di");
+const tracing_1 = require("@opentelemetry/tracing");
 const tokens_1 = require("../../tokens");
-const __1 = require("..");
 const node_1 = require("../../config/node");
-const config_1 = require("../../config");
+const base_1 = require("../../config/base");
 const logger_1 = require("../../logger");
-const node_2 = require("../../tracer/node");
 const console_1 = require("../../logger/handler/console");
 const sentry_1 = require("../../logger/handler/sentry");
-const node_3 = require("../../error-tracker/node");
+const node_2 = require("../../error-tracker/node");
 const logging_1 = require("../../http-server/middleware/logging");
-const tracing_1 = require("../../http-server/middleware/tracing");
+const tracing_2 = require("../../http-server/middleware/tracing");
 const metrics_1 = require("../../http-server/middleware/metrics");
-const node_4 = require("../../metrics/node");
+const node_3 = require("../../metrics/node");
 const exporter_jaeger_1 = require("@opentelemetry/exporter-jaeger");
 const middleware_axios_1 = require("middleware-axios");
 const express_1 = __importDefault(require("express"));
-const node_5 = require("@sentry/node");
+const node_4 = require("@sentry/node");
+const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
+const propagator_jaeger_1 = require("@opentelemetry/propagator-jaeger");
+const utils_1 = require("../../tracing/utils");
 /**
  * Возвращает preset с зависимостями по умолчанию для frontend-микросервисов на Node.js.
  * @return Preset.
  */
 function PresetNode() {
-    return (0, __1.createPreset)([
+    return (0, di_1.createPreset)([
         [tokens_1.KnownToken.Config.source, node_1.createConfigSource],
         [tokens_1.KnownToken.Config.base, exports.provideBaseConfig],
         [tokens_1.KnownToken.logger, exports.provideLogger],
-        [tokens_1.KnownToken.tracer, exports.provideTracer],
+        [tokens_1.KnownToken.Tracing.tracer, exports.provideTracer],
+        [tokens_1.KnownToken.Tracing.spanExporter, exports.provideSpanExporter],
+        [tokens_1.KnownToken.Tracing.tracerProvider, exports.provideTracerProvider],
+        [tokens_1.KnownToken.Tracing.tracerProviderResource, exports.provideTracerProviderResource],
         [tokens_1.KnownToken.Http.Client.factory, () => middleware_axios_1.create],
         [tokens_1.KnownToken.Http.Server.factory, () => express_1.default],
         [tokens_1.KnownToken.Http.Server.Defaults.middleware, exports.provideDefaultMiddleware],
-        [tokens_1.KnownToken.Metrics.httpApp, node_4.createMetricsHttpApp],
+        [tokens_1.KnownToken.Metrics.httpApp, node_3.createMetricsHttpApp],
     ]);
 }
 exports.PresetNode = PresetNode;
 const provideBaseConfig = resolve => {
     const source = resolve(tokens_1.KnownToken.Config.source);
-    return (0, config_1.createBaseConfig)(source);
+    return (0, base_1.createBaseConfig)(source);
 };
 exports.provideBaseConfig = provideBaseConfig;
 const provideLogger = resolve => {
     const source = resolve(tokens_1.KnownToken.Config.source);
     const config = resolve(tokens_1.KnownToken.Config.base);
-    const sentry = (0, node_3.createSentryLib)({
-        dsn: source.get('SENTRY_DSN'),
+    // @todo брать клиент и библиотеку из контейнера
+    const sentry = (0, node_2.createSentryLib)({
+        dsn: source.get('SENTRY_SERVER_DSN'),
         release: source.get('SENTRY_RELEASE'),
         environment: source.get('SENTRY_ENVIRONMENT'),
     });
@@ -58,22 +65,47 @@ const provideLogger = resolve => {
 };
 exports.provideLogger = provideLogger;
 const provideTracer = resolve => {
+    const config = resolve(tokens_1.KnownToken.Config.base);
+    const provider = resolve(tokens_1.KnownToken.Tracing.tracerProvider);
+    return provider.getTracer(config.appName, config.appVersion);
+};
+exports.provideTracer = provideTracer;
+const provideSpanExporter = resolve => {
     const source = resolve(tokens_1.KnownToken.Config.source);
     const exporter = new exporter_jaeger_1.JaegerExporter({
-        endpoint: source.require('JAEGER_ENDPOINT'),
+        host: source.require('JAEGER_AGENT_HOST'),
+        port: parseInt(source.require('JAEGER_AGENT_PORT')) || undefined,
     });
-    return (0, node_2.createTracer)(resolve(tokens_1.KnownToken.Config.base), exporter);
+    return exporter;
 };
-exports.provideTracer = provideTracer;
+exports.provideSpanExporter = provideSpanExporter;
+const provideTracerProvider = resolve => {
+    const exporter = resolve(tokens_1.KnownToken.Tracing.spanExporter);
+    const resource = resolve(tokens_1.KnownToken.Tracing.tracerProviderResource);
+    const provider = new sdk_trace_node_1.NodeTracerProvider({
+        resource,
+    });
+    provider.addSpanProcessor(new tracing_1.BatchSpanProcessor(exporter)); // @todo разобраться с as any
+    provider.register({
+        propagator: new propagator_jaeger_1.JaegerPropagator(),
+    });
+    return provider; // @todo разобраться с as any
+};
+exports.provideTracerProvider = provideTracerProvider;
+const provideTracerProviderResource = resolve => {
+    const config = resolve(tokens_1.KnownToken.Config.base);
+    return (0, utils_1.getConventionalResource)(config);
+};
+exports.provideTracerProviderResource = provideTracerProviderResource;
 const provideDefaultMiddleware = resolve => {
     const config = resolve(tokens_1.KnownToken.Config.base);
     const logger = resolve(tokens_1.KnownToken.logger);
-    const tracer = resolve(tokens_1.KnownToken.tracer);
-    const metrics = (0, node_4.createDefaultMetrics)();
+    const tracer = resolve(tokens_1.KnownToken.Tracing.tracer);
+    const metrics = (0, node_3.createDefaultMetrics)();
     return {
-        start: [node_5.Handlers.requestHandler()],
+        start: [node_4.Handlers.requestHandler()],
         logging: [(0, logging_1.loggingMiddleware)(config, logger)],
-        tracing: [(0, tracing_1.tracingMiddleware)(tracer)],
+        tracing: [(0, tracing_2.tracingMiddleware)(tracer)],
         metrics: [
             (0, metrics_1.responseMetricsMiddleware)(config, {
                 counter: metrics.requestCount,
@@ -83,7 +115,7 @@ const provideDefaultMiddleware = resolve => {
                 histogram: metrics.renderDuration,
             }),
         ],
-        finish: [node_5.Handlers.errorHandler()],
+        finish: [node_4.Handlers.errorHandler()],
     };
 };
 exports.provideDefaultMiddleware = provideDefaultMiddleware;