@rsdk/core 6.0.0-next.5 → 6.0.0-next.51

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. package/dist/config/config.const.d.ts +0 -1
  2. package/dist/config/config.const.js +0 -1
  3. package/dist/config/config.const.js.map +1 -1
  4. package/dist/exceptions/base/platform-exception.absract.d.ts +9 -0
  5. package/dist/exceptions/base/platform-exception.absract.js +5 -0
  6. package/dist/exceptions/base/platform-exception.absract.js.map +1 -1
  7. package/dist/index.d.ts +3 -1
  8. package/dist/index.js +5 -1
  9. package/dist/index.js.map +1 -1
  10. package/dist/logging/exception-severity-to-log-level.d.ts +7 -0
  11. package/dist/logging/exception-severity-to-log-level.js +22 -0
  12. package/dist/logging/exception-severity-to-log-level.js.map +1 -0
  13. package/dist/logging/index.d.ts +1 -0
  14. package/dist/logging/index.js +3 -1
  15. package/dist/logging/index.js.map +1 -1
  16. package/dist/logging/logging.interceptor.js +2 -1
  17. package/dist/logging/logging.interceptor.js.map +1 -1
  18. package/dist/platform.context.d.ts +3 -2
  19. package/dist/platform.context.js +9 -7
  20. package/dist/platform.context.js.map +1 -1
  21. package/dist/tracing/extract-tracing-headers.d.ts +9 -0
  22. package/dist/tracing/extract-tracing-headers.js +22 -0
  23. package/dist/tracing/extract-tracing-headers.js.map +1 -0
  24. package/dist/tracing/tracing.enricher.d.ts +15 -0
  25. package/dist/tracing/tracing.enricher.js +42 -0
  26. package/dist/tracing/tracing.enricher.js.map +1 -0
  27. package/dist/tracing/tracing.interceptor.js +2 -11
  28. package/dist/tracing/tracing.interceptor.js.map +1 -1
  29. package/dist/tracing/tracing.module.d.ts +5 -0
  30. package/dist/tracing/tracing.module.js +24 -0
  31. package/dist/tracing/tracing.module.js.map +1 -1
  32. package/dist/types/plugins.d.ts +6 -0
  33. package/dist/types/plugins.js.map +1 -1
  34. package/dist/types/transports.d.ts +5 -4
  35. package/dist/types/transports.js.map +1 -1
  36. package/eslint.config.cjs +3 -0
  37. package/package.json +20 -26
  38. package/src/config/config.const.ts +0 -1
  39. package/src/exceptions/base/platform-exception.absract.ts +13 -0
  40. package/src/index.ts +9 -1
  41. package/src/logging/exception-severity-to-log-level.ts +21 -0
  42. package/src/logging/index.ts +1 -0
  43. package/src/logging/logging.interceptor.ts +11 -6
  44. package/src/platform.context.ts +11 -10
  45. package/src/tracing/extract-tracing-headers.ts +27 -0
  46. package/src/tracing/tracing.enricher.ts +28 -0
  47. package/src/tracing/tracing.interceptor.ts +2 -14
  48. package/src/tracing/tracing.module.ts +30 -0
  49. package/src/types/plugins.ts +7 -0
  50. package/src/types/transports.ts +6 -4
  51. package/test/logging.interceptor.spec.ts +17 -7
@@ -9,5 +9,4 @@ export declare const ConfigTag: {
9
9
  readonly graphql: "graphql";
10
10
  readonly http: "http";
11
11
  readonly grpcServer: "grpc-server";
12
- readonly natsHemera: "nats-hemera";
13
12
  };
@@ -12,6 +12,5 @@ exports.ConfigTag = {
12
12
  graphql: 'graphql',
13
13
  http: 'http',
14
14
  grpcServer: 'grpc-server',
15
- natsHemera: 'nats-hemera',
16
15
  };
17
16
  //# sourceMappingURL=config.const.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.const.js","sourceRoot":"","sources":["../../src/config/config.const.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG;IACvB,cAAc,EAAE,gBAAgB;IAChC,OAAO,EAAE,SAAS;IAClB,aAAa,EAAE,gBAAgB;IAC/B,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,SAAS,EAAE,WAAW;IACtB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,MAAM;IACZ,UAAU,EAAE,aAAa;IACzB,UAAU,EAAE,aAAa;CACjB,CAAC"}
1
+ {"version":3,"file":"config.const.js","sourceRoot":"","sources":["../../src/config/config.const.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG;IACvB,cAAc,EAAE,gBAAgB;IAChC,OAAO,EAAE,SAAS;IAClB,aAAa,EAAE,gBAAgB;IAC/B,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,SAAS,EAAE,WAAW;IACtB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,MAAM;IACZ,UAAU,EAAE,aAAa;CACjB,CAAC"}
@@ -1,9 +1,14 @@
1
+ import type { ExceptionSeverity } from '@rsdk/common';
1
2
  export type ExceptionCode = string | number;
2
3
  export interface ExceptionsProps<T = any> {
3
4
  /**
4
5
  * Custom exception code
5
6
  */
6
7
  code?: ExceptionCode | undefined;
8
+ /**
9
+ * Severity level of exception
10
+ */
11
+ severity?: ExceptionSeverity | undefined;
7
12
  /**
8
13
  * Wrapped original error
9
14
  */
@@ -28,6 +33,10 @@ export declare abstract class PlatformException<T = any> extends Error {
28
33
  * Required!
29
34
  */
30
35
  readonly code: ExceptionCode;
36
+ /**
37
+ * Exception severity
38
+ */
39
+ readonly severity: ExceptionSeverity;
31
40
  /**
32
41
  * PlatformException has ability to wrap original errors. Such an option exists
33
42
  * in many other languages and frameworks: .NET, Java, Go etc.
@@ -16,6 +16,10 @@ class PlatformException extends Error {
16
16
  * Required!
17
17
  */
18
18
  code;
19
+ /**
20
+ * Exception severity
21
+ */
22
+ severity;
19
23
  /**
20
24
  * PlatformException has ability to wrap original errors. Such an option exists
21
25
  * in many other languages and frameworks: .NET, Java, Go etc.
@@ -36,6 +40,7 @@ class PlatformException extends Error {
36
40
  super(message);
37
41
  this.metatype = this.constructor.name;
38
42
  this.code = code;
43
+ this.severity = props?.severity ?? 'error';
39
44
  this.cause = props?.cause;
40
45
  this.details = props?.details;
41
46
  }
@@ -1 +1 @@
1
- {"version":3,"file":"platform-exception.absract.js","sourceRoot":"","sources":["../../../src/exceptions/base/platform-exception.absract.ts"],"names":[],"mappings":";;;AAmBA;;;;;GAKG;AACH,MAAsB,iBAA2B,SAAQ,KAAK;IAC5D;;OAEG;IACM,QAAQ,CAAS;IAE1B;;OAEG;IACM,IAAI,CAAgB;IAE7B;;;OAGG;IACe,KAAK,CAAsB;IAE7C;;;;OAIG;IACM,OAAO,CAAgB;IAEhC;;;;OAIG;IACH,YACE,IAAmB,EACnB,OAAe,EACf,KAAwC;QAExC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QACtC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,EAAE,KAAK,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,KAAK,EAAE,OAAO,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,EAAS;QAC5B,IACE,CAAC,EAAE;YACH,CAAC,CAAC,EAAE,YAAY,iBAAiB,CAAC;YAClC,CAAC,EAAE,CAAC,KAAK;YACT,CAAC,CAAC,EAAE,CAAC,KAAK,YAAY,KAAK,CAAC,EAC5B,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,iBAAiB,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1E,CAAC;CACF;AArDD,8CAqDC"}
1
+ {"version":3,"file":"platform-exception.absract.js","sourceRoot":"","sources":["../../../src/exceptions/base/platform-exception.absract.ts"],"names":[],"mappings":";;;AA0BA;;;;;GAKG;AACH,MAAsB,iBAA2B,SAAQ,KAAK;IAC5D;;OAEG;IACM,QAAQ,CAAS;IAE1B;;OAEG;IACM,IAAI,CAAgB;IAE7B;;OAEG;IACM,QAAQ,CAAoB;IAErC;;;OAGG;IACe,KAAK,CAAsB;IAE7C;;;;OAIG;IACM,OAAO,CAAgB;IAEhC;;;;OAIG;IACH,YACE,IAAmB,EACnB,OAAe,EACf,KAAwC;QAExC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QACtC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,KAAK,EAAE,QAAQ,IAAI,OAAO,CAAC;QAC3C,IAAI,CAAC,KAAK,GAAG,KAAK,EAAE,KAAK,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,KAAK,EAAE,OAAO,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,EAAS;QAC5B,IACE,CAAC,EAAE;YACH,CAAC,CAAC,EAAE,YAAY,iBAAiB,CAAC;YAClC,CAAC,EAAE,CAAC,KAAK;YACT,CAAC,CAAC,EAAE,CAAC,KAAK,YAAY,KAAK,CAAC,EAC5B,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,iBAAiB,CAAC,aAAa,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1E,CAAC;CACF;AA3DD,8CA2DC"}
package/dist/index.d.ts CHANGED
@@ -3,6 +3,8 @@ export { APP_SCOPE } from './app-metadata/app-metadata.const';
3
3
  export { Manifest } from './manifest/manifest';
4
4
  export { ProtocolDetector } from './transport/protocol.detector';
5
5
  export { TracingHeaderMappings, Span, NoSpan } from './tracing';
6
+ export { IngressContext, CONTEXT_ENRICHERS } from '@rsdk/actx';
7
+ export type { ContextEnricher, ContextCarrier } from '@rsdk/actx';
6
8
  export { FileSystemCheckOptions, FileSystemIndicator, PingCheckOptions, PingIndicator, } from './health/indicators.abstract';
7
9
  export { HealthChecksService } from './health/health.service';
8
10
  export { CheckSummary } from './health/types';
@@ -15,7 +17,7 @@ export { PlatformContext } from './platform.context';
15
17
  export * from './config';
16
18
  export * from './exceptions';
17
19
  export * from './exceptions.handling';
18
- export { InjectLogger, LogFormatter, LogLevel } from './logging';
20
+ export { ExceptionsSeverityToLogLevel, InjectLogger, LogFormatter, LogLevel, } from './logging';
19
21
  export { AnyMetric, Counter, Gauge, Histogram, Metric, MetricsModule, Summary, register, } from './metrics';
20
22
  export { PlatformApp } from './app/platform.app';
21
23
  export * from './types';
package/dist/index.js CHANGED
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.FsPathParser = exports.TimespanParser = exports.UrlParser = exports.StringParser = exports.SizeParser = exports.NumberParser = exports.JsonParser = exports.IntParser = exports.EnumParser = exports.BoolParser = exports.ArrayParser = exports.TracingHeaders = exports.RequestIdGenStrategy = exports.generateDefault = exports.withPrefix = exports.PlatformApp = exports.register = exports.Summary = exports.MetricsModule = exports.Metric = exports.Histogram = exports.Gauge = exports.Counter = exports.LogLevel = exports.InjectLogger = exports.PlatformContext = exports.ConfigTag = exports.CheckResult = exports.Indicator = exports.getLoggerToken = exports.HealthChecksService = exports.PingIndicator = exports.FileSystemIndicator = exports.NoSpan = exports.Span = exports.ProtocolDetector = exports.Manifest = exports.APP_SCOPE = void 0;
17
+ exports.FsPathParser = exports.TimespanParser = exports.UrlParser = exports.StringParser = exports.SizeParser = exports.NumberParser = exports.JsonParser = exports.IntParser = exports.EnumParser = exports.BoolParser = exports.ArrayParser = exports.TracingHeaders = exports.RequestIdGenStrategy = exports.generateDefault = exports.withPrefix = exports.PlatformApp = exports.register = exports.Summary = exports.MetricsModule = exports.Metric = exports.Histogram = exports.Gauge = exports.Counter = exports.LogLevel = exports.InjectLogger = exports.ExceptionsSeverityToLogLevel = exports.PlatformContext = exports.ConfigTag = exports.CheckResult = exports.Indicator = exports.getLoggerToken = exports.HealthChecksService = exports.PingIndicator = exports.FileSystemIndicator = exports.CONTEXT_ENRICHERS = exports.IngressContext = exports.NoSpan = exports.Span = exports.ProtocolDetector = exports.Manifest = exports.APP_SCOPE = void 0;
18
18
  require("./unhandled-rejection.handler");
19
19
  var app_metadata_const_1 = require("./app-metadata/app-metadata.const");
20
20
  Object.defineProperty(exports, "APP_SCOPE", { enumerable: true, get: function () { return app_metadata_const_1.APP_SCOPE; } });
@@ -25,6 +25,9 @@ Object.defineProperty(exports, "ProtocolDetector", { enumerable: true, get: func
25
25
  var tracing_1 = require("./tracing");
26
26
  Object.defineProperty(exports, "Span", { enumerable: true, get: function () { return tracing_1.Span; } });
27
27
  Object.defineProperty(exports, "NoSpan", { enumerable: true, get: function () { return tracing_1.NoSpan; } });
28
+ var actx_1 = require("@rsdk/actx");
29
+ Object.defineProperty(exports, "IngressContext", { enumerable: true, get: function () { return actx_1.IngressContext; } });
30
+ Object.defineProperty(exports, "CONTEXT_ENRICHERS", { enumerable: true, get: function () { return actx_1.CONTEXT_ENRICHERS; } });
28
31
  var indicators_abstract_1 = require("./health/indicators.abstract");
29
32
  Object.defineProperty(exports, "FileSystemIndicator", { enumerable: true, get: function () { return indicators_abstract_1.FileSystemIndicator; } });
30
33
  Object.defineProperty(exports, "PingIndicator", { enumerable: true, get: function () { return indicators_abstract_1.PingIndicator; } });
@@ -44,6 +47,7 @@ __exportStar(require("./config"), exports);
44
47
  __exportStar(require("./exceptions"), exports);
45
48
  __exportStar(require("./exceptions.handling"), exports);
46
49
  var logging_1 = require("./logging");
50
+ Object.defineProperty(exports, "ExceptionsSeverityToLogLevel", { enumerable: true, get: function () { return logging_1.ExceptionsSeverityToLogLevel; } });
47
51
  Object.defineProperty(exports, "InjectLogger", { enumerable: true, get: function () { return logging_1.InjectLogger; } });
48
52
  Object.defineProperty(exports, "LogLevel", { enumerable: true, get: function () { return logging_1.LogLevel; } });
49
53
  var metrics_1 = require("./metrics");
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yCAAuC;AAEvC,wEAA8D;AAArD,+GAAA,SAAS,OAAA;AAElB,gDAA+C;AAAtC,oGAAA,QAAQ,OAAA;AAEjB,mEAAiE;AAAxD,qHAAA,gBAAgB,OAAA;AAEzB,qCAAgE;AAAhC,+FAAA,IAAI,OAAA;AAAE,iGAAA,MAAM,OAAA;AAE5C,oEAKsC;AAHpC,0HAAA,mBAAmB,OAAA;AAEnB,oHAAA,aAAa,OAAA;AAGf,0DAA8D;AAArD,qHAAA,mBAAmB,OAAA;AAI5B,6CAAmD;AAA1C,yGAAA,cAAc,OAAA;AAEvB,6EAAkE;AAAzD,gHAAA,SAAS,OAAA;AAIlB,4CAA+C;AAAtC,sGAAA,WAAW,OAAA;AAEpB,sDAAkD;AAAzC,yGAAA,SAAS,OAAA;AAElB,uDAAqD;AAA5C,mHAAA,eAAe,OAAA;AAExB,2CAAyB;AAEzB,+CAA6B;AAE7B,wDAAsC;AAEtC,qCAAiE;AAAxD,uGAAA,YAAY,OAAA;AAAgB,mGAAA,QAAQ,OAAA;AAE7C,qCASmB;AAPjB,kGAAA,OAAO,OAAA;AACP,gGAAA,KAAK,OAAA;AACL,oGAAA,SAAS,OAAA;AACT,iGAAA,MAAM,OAAA;AACN,wGAAA,aAAa,OAAA;AACb,kGAAA,OAAO,OAAA;AACP,mGAAA,QAAQ,OAAA;AAGV,mDAAiD;AAAxC,2GAAA,WAAW,OAAA;AAEpB,0CAAwB;AAExB,4DAA0C;AAE1C,oEAAkD;AAElD,qCAKmB;AAJjB,qGAAA,UAAU,OAAA;AACV,0GAAA,eAAe,OAAA;AACf,+GAAA,oBAAoB,OAAA;AACpB,yGAAA,cAAc,OAAA;AAGhB;;GAEG;AAEH,uCAkCsB;AAjCpB,6CAA6C;AAC7C,mDAAmD;AACnD,qGAAA,WAAW,OAAA;AAEX,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,mGAAA,SAAS,OAAA;AAET,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,sGAAA,YAAY,OAAA;AAKZ,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,sGAAA,YAAY,OAAA;AAEZ,mDAAmD;AACnD,mGAAA,SAAS,OAAA;AAET,mDAAmD;AACnD,wGAAA,cAAc,OAAA;AAGhB,iDAI2B;AAHzB,2DAA2D;AAC3D,wDAAwD;AACxD,2GAAA,YAAY,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yCAAuC;AAEvC,wEAA8D;AAArD,+GAAA,SAAS,OAAA;AAElB,gDAA+C;AAAtC,oGAAA,QAAQ,OAAA;AAEjB,mEAAiE;AAAxD,qHAAA,gBAAgB,OAAA;AAEzB,qCAAgE;AAAhC,+FAAA,IAAI,OAAA;AAAE,iGAAA,MAAM,OAAA;AAE5C,mCAA+D;AAAtD,sGAAA,cAAc,OAAA;AAAE,yGAAA,iBAAiB,OAAA;AAG1C,oEAKsC;AAHpC,0HAAA,mBAAmB,OAAA;AAEnB,oHAAA,aAAa,OAAA;AAGf,0DAA8D;AAArD,qHAAA,mBAAmB,OAAA;AAI5B,6CAAmD;AAA1C,yGAAA,cAAc,OAAA;AAEvB,6EAAkE;AAAzD,gHAAA,SAAS,OAAA;AAIlB,4CAA+C;AAAtC,sGAAA,WAAW,OAAA;AAEpB,sDAAkD;AAAzC,yGAAA,SAAS,OAAA;AAElB,uDAAqD;AAA5C,mHAAA,eAAe,OAAA;AAExB,2CAAyB;AAEzB,+CAA6B;AAE7B,wDAAsC;AAEtC,qCAKmB;AAJjB,uHAAA,4BAA4B,OAAA;AAC5B,uGAAA,YAAY,OAAA;AAEZ,mGAAA,QAAQ,OAAA;AAGV,qCASmB;AAPjB,kGAAA,OAAO,OAAA;AACP,gGAAA,KAAK,OAAA;AACL,oGAAA,SAAS,OAAA;AACT,iGAAA,MAAM,OAAA;AACN,wGAAA,aAAa,OAAA;AACb,kGAAA,OAAO,OAAA;AACP,mGAAA,QAAQ,OAAA;AAGV,mDAAiD;AAAxC,2GAAA,WAAW,OAAA;AAEpB,0CAAwB;AAExB,4DAA0C;AAE1C,oEAAkD;AAElD,qCAKmB;AAJjB,qGAAA,UAAU,OAAA;AACV,0GAAA,eAAe,OAAA;AACf,+GAAA,oBAAoB,OAAA;AACpB,yGAAA,cAAc,OAAA;AAGhB;;GAEG;AAEH,uCAkCsB;AAjCpB,6CAA6C;AAC7C,mDAAmD;AACnD,qGAAA,WAAW,OAAA;AAEX,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,mGAAA,SAAS,OAAA;AAET,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,sGAAA,YAAY,OAAA;AAKZ,mDAAmD;AACnD,oGAAA,UAAU,OAAA;AAEV,mDAAmD;AACnD,sGAAA,YAAY,OAAA;AAEZ,mDAAmD;AACnD,mGAAA,SAAS,OAAA;AAET,mDAAmD;AACnD,wGAAA,cAAc,OAAA;AAGhB,iDAI2B;AAHzB,2DAA2D;AAC3D,wDAAwD;AACxD,2GAAA,YAAY,OAAA"}
@@ -0,0 +1,7 @@
1
+ import type { ExceptionSeverity } from '@rsdk/common';
2
+ import { LogLevel } from '@rsdk/logging';
3
+ /**
4
+ *
5
+ * В некоторых библиотеках severity может быть установлен самостотельно, например в typeorm он равен ERROR
6
+ */
7
+ export declare const ExceptionsSeverityToLogLevel: (severity: ExceptionSeverity) => LogLevel;
@@ -0,0 +1,22 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.ExceptionsSeverityToLogLevel = void 0;
4
+ const logging_1 = require("@rsdk/logging");
5
+ /**
6
+ *
7
+ * В некоторых библиотеках severity может быть установлен самостотельно, например в typeorm он равен ERROR
8
+ */
9
+ const ExceptionsSeverityToLogLevel = (severity) => {
10
+ switch (severity.toLowerCase()) {
11
+ case 'warn':
12
+ return logging_1.LogLevel.warn;
13
+ case 'error':
14
+ return logging_1.LogLevel.error;
15
+ case 'fatal':
16
+ return logging_1.LogLevel.fatal;
17
+ default:
18
+ return logging_1.LogLevel.error;
19
+ }
20
+ };
21
+ exports.ExceptionsSeverityToLogLevel = ExceptionsSeverityToLogLevel;
22
+ //# sourceMappingURL=exception-severity-to-log-level.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"exception-severity-to-log-level.js","sourceRoot":"","sources":["../../src/logging/exception-severity-to-log-level.ts"],"names":[],"mappings":";;;AACA,2CAAyC;AAEzC;;;GAGG;AACI,MAAM,4BAA4B,GAAG,CAC1C,QAA2B,EACjB,EAAE;IACZ,QAAQ,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC;QAC/B,KAAK,MAAM;YACT,OAAO,kBAAQ,CAAC,IAAI,CAAC;QACvB,KAAK,OAAO;YACV,OAAO,kBAAQ,CAAC,KAAK,CAAC;QACxB,KAAK,OAAO;YACV,OAAO,kBAAQ,CAAC,KAAK,CAAC;QACxB;YACE,OAAO,kBAAQ,CAAC,KAAK,CAAC;IAC1B,CAAC;AACH,CAAC,CAAC;AAbW,QAAA,4BAA4B,gCAavC"}
@@ -1,4 +1,5 @@
1
1
  export * from '@rsdk/logging';
2
+ export { ExceptionsSeverityToLogLevel } from './exception-severity-to-log-level';
2
3
  export * from './adapters';
3
4
  export * from './decorators';
4
5
  export * from './formatters';
@@ -14,8 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.LoggingCoreModule = exports.LoggerInstancesModule = exports.LOGGING_RSDK_METADATA_SCOPE = void 0;
17
+ exports.LoggingCoreModule = exports.LoggerInstancesModule = exports.LOGGING_RSDK_METADATA_SCOPE = exports.ExceptionsSeverityToLogLevel = void 0;
18
18
  __exportStar(require("@rsdk/logging"), exports);
19
+ var exception_severity_to_log_level_1 = require("./exception-severity-to-log-level");
20
+ Object.defineProperty(exports, "ExceptionsSeverityToLogLevel", { enumerable: true, get: function () { return exception_severity_to_log_level_1.ExceptionsSeverityToLogLevel; } });
19
21
  __exportStar(require("./adapters"), exports);
20
22
  __exportStar(require("./decorators"), exports);
21
23
  __exportStar(require("./formatters"), exports);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,6CAA2B;AAC3B,+CAA6B;AAC7B,+CAA6B;AAC7B,kDAAmE;AAA1D,wHAAA,2BAA2B,OAAA;AAEpC,uEAAmE;AAA1D,iIAAA,qBAAqB,OAAA;AAC9B,6DAA0D;AAAjD,wHAAA,iBAAiB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,qFAAiF;AAAxE,+IAAA,4BAA4B,OAAA;AACrC,6CAA2B;AAC3B,+CAA6B;AAC7B,+CAA6B;AAC7B,kDAAmE;AAA1D,wHAAA,2BAA2B,OAAA;AAEpC,uEAAmE;AAA1D,iIAAA,qBAAqB,OAAA;AAC9B,6DAA0D;AAAjD,wHAAA,iBAAiB,OAAA"}
@@ -19,6 +19,7 @@ const rxjs_1 = require("rxjs");
19
19
  const protocol_detector_1 = require("../transport/protocol.detector");
20
20
  const inject_logger_decorator_1 = require("./decorators/inject-logger.decorator");
21
21
  const constants_1 = require("./constants");
22
+ const exception_severity_to_log_level_1 = require("./exception-severity-to-log-level");
22
23
  const formatters_1 = require("./formatters");
23
24
  const logging_config_1 = require("./logging.config");
24
25
  /**
@@ -83,7 +84,7 @@ let LoggingInterceptor = class LoggingInterceptor {
83
84
  const request = isExcluded || !['trace', 'debug'].includes(level)
84
85
  ? requestDetails
85
86
  : '[ALREADY LOGGED]';
86
- this.logger.error(`Failed [${protocol.toUpperCase()}] ${path}`, {
87
+ this.logger.log((0, exception_severity_to_log_level_1.ExceptionsSeverityToLogLevel)(ex.severity), `Failed [${protocol.toUpperCase()}] ${path}`, {
87
88
  request,
88
89
  cause: ex,
89
90
  path,
@@ -1 +1 @@
1
- {"version":3,"file":"logging.interceptor.js","sourceRoot":"","sources":["../../src/logging/logging.interceptor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logging.interceptor.js","sourceRoot":"","sources":["../../src/logging/logging.interceptor.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ import type { INestApplication } from '@nestjs/common/interfaces';
3
3
  import type { NestApplicationOptions } from '@nestjs/common/interfaces/nest-application-options.interface';
4
4
  import type { AbstractHttpAdapter } from '@nestjs/core';
5
5
  import type { RsdkMetadataProvider } from '@rsdk/metadata';
6
+ import type { ConfigContext } from './config';
6
7
  import type { PlatformAppMetadata, PlatformExtendedOptions, PlatformOptions } from './types';
7
8
  /**
8
9
  * Агрегат для хранения опций приложения, а также методы для конфигурации и запуска приложения
@@ -59,9 +60,9 @@ export declare class PlatformContext {
59
60
  */
60
61
  getNestFactoryCreateOptions(): Promise<[
61
62
  httpAdapter: AbstractHttpAdapter,
62
- options?: NestApplicationOptions
63
+ options: NestApplicationOptions
63
64
  ]>;
65
+ getConfigContext(): Promise<ConfigContext>;
64
66
  private assertPluginCompatibility;
65
67
  private assertTransportCompatibility;
66
- private getConfigContext;
67
68
  }
@@ -110,15 +110,17 @@ class PlatformContext {
110
110
  * Производит все необходимые проверки и инициализации транспортов, не запускает приложение
111
111
  */
112
112
  async configureApp(app) {
113
- const configContext = await this.getConfigContext();
114
- const awaiter = this.httpTransport?.configureApp(app, configContext);
113
+ const awaiter = this.httpTransport?.configureApp(app, this, this.logger);
115
114
  if (awaiter instanceof Promise) {
116
115
  await awaiter;
117
116
  }
118
117
  app.enableShutdownHooks();
119
118
  const transports = this.options.transports ?? [];
120
119
  for (const transport of transports.filter(types_1.isMicroserviceTransport)) {
121
- transport.init(configContext);
120
+ const awaiter = transport.init(app);
121
+ if (awaiter instanceof Promise) {
122
+ await awaiter;
123
+ }
122
124
  const options = transport.createMicroserviceOptions();
123
125
  const microservice = app.connectMicroservice(options, {
124
126
  inheritAppConfig: true,
@@ -164,7 +166,7 @@ class PlatformContext {
164
166
  */
165
167
  async getNestFactoryCreateOptions() {
166
168
  const configContext = await this.getConfigContext();
167
- const httpAdapter = await this.httpTransport?.createAdapter(configContext);
169
+ const httpAdapter = this.httpTransport?.createAdapter(configContext);
168
170
  return [
169
171
  httpAdapter ?? new noop_http_adapter_1.NoopHttpAdapter(),
170
172
  {
@@ -174,6 +176,9 @@ class PlatformContext {
174
176
  },
175
177
  ];
176
178
  }
179
+ getConfigContext() {
180
+ return this.aggregator.getConfigContext();
181
+ }
177
182
  assertPluginCompatibility(options) {
178
183
  if (!options.plugins) {
179
184
  return;
@@ -196,9 +201,6 @@ class PlatformContext {
196
201
  }
197
202
  }
198
203
  }
199
- getConfigContext() {
200
- return this.aggregator.getConfigContext();
201
- }
202
204
  }
203
205
  exports.PlatformContext = PlatformContext;
204
206
  //# sourceMappingURL=platform.context.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"platform.context.js","sourceRoot":"","sources":["../src/platform.context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"platform.context.js","sourceRoot":"","sources":["../src/platform.context.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,9 @@
1
+ import type { GenericHeaders } from '../types';
2
+ import type { TracingHeaderMappings } from './types';
3
+ /**
4
+ * Отбирает из заголовков транспорта только трассируемые, согласно
5
+ * сконфигурированным маппингам. Для каждого маппинга берётся первое
6
+ * непустое значение среди его алиасов и кладётся под канонический ключ
7
+ * (первый алиас).
8
+ */
9
+ export declare const extractTracingHeaders: (headers: GenericHeaders, mappings: TracingHeaderMappings[]) => Record<string, string>;
@@ -0,0 +1,22 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.extractTracingHeaders = void 0;
4
+ /**
5
+ * Отбирает из заголовков транспорта только трассируемые, согласно
6
+ * сконфигурированным маппингам. Для каждого маппинга берётся первое
7
+ * непустое значение среди его алиасов и кладётся под канонический ключ
8
+ * (первый алиас).
9
+ */
10
+ const extractTracingHeaders = (headers, mappings) => {
11
+ const result = {};
12
+ for (const aliases of mappings) {
13
+ const key = aliases[0];
14
+ const value = aliases.map((alias) => headers.get(alias)).find((x) => x);
15
+ if (value) {
16
+ result[key] = value;
17
+ }
18
+ }
19
+ return result;
20
+ };
21
+ exports.extractTracingHeaders = extractTracingHeaders;
22
+ //# sourceMappingURL=extract-tracing-headers.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"extract-tracing-headers.js","sourceRoot":"","sources":["../../src/tracing/extract-tracing-headers.ts"],"names":[],"mappings":";;;AAIA;;;;;GAKG;AACI,MAAM,qBAAqB,GAAG,CACnC,OAAuB,EACvB,QAAiC,EACT,EAAE;IAC1B,MAAM,MAAM,GAA2B,EAAE,CAAC;IAE1C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACvB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAExE,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAhBW,QAAA,qBAAqB,yBAgBhC"}
@@ -0,0 +1,15 @@
1
+ import type { ContextEnricher } from '@rsdk/actx';
2
+ import type { GenericHeaders } from '../types';
3
+ import type { TracingHeaderMappings } from './types';
4
+ /**
5
+ * Обогащает контекст трассируемыми заголовками: отбирает их из `carrier`
6
+ * по сконфигурированным `HEADER_MAPPINGS` и кладёт в `TracingHeaders`,
7
+ * чтобы инструментация логгера подмешала их во все сообщения.
8
+ *
9
+ * Программный аналог `TracingInterceptor` для входов без NestJS-пайплайна.
10
+ */
11
+ export declare class TracingEnricher implements ContextEnricher {
12
+ private readonly mappings;
13
+ constructor(mappings: TracingHeaderMappings[]);
14
+ enrich(carrier: GenericHeaders): void;
15
+ }
@@ -0,0 +1,42 @@
1
+ "use strict";
2
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
7
+ };
8
+ var __metadata = (this && this.__metadata) || function (k, v) {
9
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
+ };
11
+ var __param = (this && this.__param) || function (paramIndex, decorator) {
12
+ return function (target, key) { decorator(target, key, paramIndex); }
13
+ };
14
+ Object.defineProperty(exports, "__esModule", { value: true });
15
+ exports.TracingEnricher = void 0;
16
+ const common_1 = require("@nestjs/common");
17
+ const constants_1 = require("./constants");
18
+ const extract_tracing_headers_1 = require("./extract-tracing-headers");
19
+ const tracing_actx_1 = require("./tracing.actx");
20
+ /**
21
+ * Обогащает контекст трассируемыми заголовками: отбирает их из `carrier`
22
+ * по сконфигурированным `HEADER_MAPPINGS` и кладёт в `TracingHeaders`,
23
+ * чтобы инструментация логгера подмешала их во все сообщения.
24
+ *
25
+ * Программный аналог `TracingInterceptor` для входов без NestJS-пайплайна.
26
+ */
27
+ let TracingEnricher = class TracingEnricher {
28
+ mappings;
29
+ constructor(mappings) {
30
+ this.mappings = mappings;
31
+ }
32
+ enrich(carrier) {
33
+ tracing_actx_1.TracingHeaders.set((0, extract_tracing_headers_1.extractTracingHeaders)(carrier, this.mappings));
34
+ }
35
+ };
36
+ exports.TracingEnricher = TracingEnricher;
37
+ exports.TracingEnricher = TracingEnricher = __decorate([
38
+ (0, common_1.Injectable)(),
39
+ __param(0, (0, common_1.Inject)(constants_1.HEADER_MAPPINGS)),
40
+ __metadata("design:paramtypes", [Array])
41
+ ], TracingEnricher);
42
+ //# sourceMappingURL=tracing.enricher.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"tracing.enricher.js","sourceRoot":"","sources":["../../src/tracing/tracing.enricher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AAKpD,2CAA8C;AAC9C,uEAAkE;AAClE,iDAAgD;AAGhD;;;;;;GAMG;AAEI,IAAM,eAAe,GAArB,MAAM,eAAe;IAGP;IAFnB,YAEmB,QAAiC;QAAjC,aAAQ,GAAR,QAAQ,CAAyB;IACjD,CAAC;IAEJ,MAAM,CAAC,OAAuB;QAC5B,6BAAc,CAAC,GAAG,CAAC,IAAA,+CAAqB,EAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpE,CAAC;CACF,CAAA;AATY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,eAAM,EAAC,2BAAe,CAAC,CAAA;;GAFf,eAAe,CAS3B"}
@@ -18,6 +18,7 @@ const exceptions_1 = require("../exceptions");
18
18
  const logging_1 = require("../logging");
19
19
  const protocol_detector_1 = require("../transport/protocol.detector");
20
20
  const constants_1 = require("./constants");
21
+ const extract_tracing_headers_1 = require("./extract-tracing-headers");
21
22
  const request_id_1 = require("./request-id");
22
23
  const tracing_actx_1 = require("./tracing.actx");
23
24
  const tracing_config_1 = require("./tracing.config");
@@ -54,17 +55,7 @@ let TracingInterceptor = class TracingInterceptor {
54
55
  return next.handle();
55
56
  }
56
57
  extractHeaders(ctx, extractor) {
57
- const headers = {};
58
- for (const aliases of this.mappings) {
59
- const key = aliases[0];
60
- const value = aliases
61
- .map((x) => extractor.extractHeaders(ctx).get(x))
62
- .find((x) => x);
63
- if (value) {
64
- headers[key] = value;
65
- }
66
- }
67
- return headers;
58
+ return (0, extract_tracing_headers_1.extractTracingHeaders)(extractor.extractHeaders(ctx), this.mappings);
68
59
  }
69
60
  generateRequestId(ctx, protocol) {
70
61
  const generate = (0, request_id_1.getStrategy)(ctx.getClass()) ?? request_id_1.generateDefault;
@@ -1 +1 @@
1
- {"version":3,"file":"tracing.interceptor.js","sourceRoot":"","sources":["../../src/tracing/tracing.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAKA,2CAAoD;AAGpD,8CAAkD;AAClD,wCAAmD;AACnD,sEAAkE;AAGlE,2CAAiE;AACjE,6CAA4D;AAC5D,iDAAgD;AAChD,qDAAiD;AAGjD;;;GAGG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAGe;IACT;IACW;IAC3B;IACA;IANnB,YAE4C,MAAe,EACxB,QAAiC,EACtB,UAA2C,EACtE,QAA0B,EAC1B,MAAqB;QAJI,WAAM,GAAN,MAAM,CAAS;QACxB,aAAQ,GAAR,QAAQ,CAAyB;QACtB,eAAU,GAAV,UAAU,CAAiC;QACtE,aAAQ,GAAR,QAAQ,CAAkB;QAC1B,WAAM,GAAN,MAAM,CAAe;IAErC,CAAC;IAEJ,SAAS,CAAC,GAAqB,EAAE,IAAiB;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAEjE,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,8BAAiB,CACzB,sCAAsC,QAAQ,EAAE,CACjD,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAEpD,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,cAAc,IAAI,YAAY,EAAE,CAAC;YACzD,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAE9D,6BAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAEO,cAAc,CACpB,GAAqB,EACrB,SAA6B;QAE7B,MAAM,OAAO,GAA2B,EAAE,CAAC;QAE3C,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpC,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACvB,MAAM,KAAK,GAAG,OAAO;iBAClB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBAChD,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YAElB,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACvB,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,iBAAiB,CAAC,GAAqB,EAAE,QAAgB;QAC/D,MAAM,QAAQ,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,4BAAe,CAAC;QAEhE,OAAO,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACjC,CAAC;CACF,CAAA;AA5DY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,sBAAY,EAAC,kBAAkB,CAAC,CAAA;IAChC,WAAA,IAAA,eAAM,EAAC,2BAAe,CAAC,CAAA;IACvB,WAAA,IAAA,eAAM,EAAC,6BAAiB,CAAC,CAAA;oDAA8B,GAAG;QAChC,oCAAgB;QAClB,8BAAa;GAP7B,kBAAkB,CA4D9B"}
1
+ {"version":3,"file":"tracing.interceptor.js","sourceRoot":"","sources":["../../src/tracing/tracing.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAKA,2CAAoD;AAGpD,8CAAkD;AAClD,wCAAmD;AACnD,sEAAkE;AAGlE,2CAAiE;AACjE,uEAAkE;AAClE,6CAA4D;AAC5D,iDAAgD;AAChD,qDAAiD;AAGjD;;;GAGG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAGe;IACT;IACW;IAC3B;IACA;IANnB,YAE4C,MAAe,EACxB,QAAiC,EACtB,UAA2C,EACtE,QAA0B,EAC1B,MAAqB;QAJI,WAAM,GAAN,MAAM,CAAS;QACxB,aAAQ,GAAR,QAAQ,CAAyB;QACtB,eAAU,GAAV,UAAU,CAAiC;QACtE,aAAQ,GAAR,QAAQ,CAAkB;QAC1B,WAAM,GAAN,MAAM,CAAe;IAErC,CAAC;IAEJ,SAAS,CAAC,GAAqB,EAAE,IAAiB;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAEjE,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,8BAAiB,CACzB,sCAAsC,QAAQ,EAAE,CACjD,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAEpD,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QACrD,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,cAAc,IAAI,YAAY,EAAE,CAAC;YACzD,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAE9D,6BAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAEO,cAAc,CACpB,GAAqB,EACrB,SAA6B;QAE7B,OAAO,IAAA,+CAAqB,EAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7E,CAAC;IAEO,iBAAiB,CAAC,GAAqB,EAAE,QAAgB;QAC/D,MAAM,QAAQ,GAAG,IAAA,wBAAW,EAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,4BAAe,CAAC;QAEhE,OAAO,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACjC,CAAC;CACF,CAAA;AA/CY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,sBAAY,EAAC,kBAAkB,CAAC,CAAA;IAChC,WAAA,IAAA,eAAM,EAAC,2BAAe,CAAC,CAAA;IACvB,WAAA,IAAA,eAAM,EAAC,6BAAiB,CAAC,CAAA;oDAA8B,GAAG;QAChC,oCAAgB;QAClB,8BAAa;GAP7B,kBAAkB,CA+C9B"}
@@ -11,6 +11,11 @@ export declare class TracingModule implements OnModuleInit {
11
11
  private context;
12
12
  constructor(logger: ILogger);
13
13
  static forRoot({ tracing, plugins, transports, }: PlatformOptions): DynamicModule;
14
+ /**
15
+ * Собирает список `ContextEnricher` для `IngressContext`: встроенный
16
+ * трейсинг + обогатители из плагинов.
17
+ */
18
+ private static createContextEnrichersProvider;
14
19
  /**
15
20
  * Creates a provider for header mappings configuration.
16
21
  * Combines default headers, plugin-provided headers and additional custom mappings
@@ -49,12 +49,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
49
49
  exports.TracingModule = void 0;
50
50
  const common_1 = require("@nestjs/common");
51
51
  const core_1 = require("@nestjs/core");
52
+ const actx_1 = require("@rsdk/actx");
52
53
  const common_2 = require("@rsdk/common");
53
54
  const logging_1 = require("@rsdk/logging");
54
55
  const logging_2 = require("../logging");
55
56
  const constants_1 = require("./constants");
56
57
  const tracing_actx_1 = require("./tracing.actx");
57
58
  const tracing_config_1 = require("./tracing.config");
59
+ const tracing_enricher_1 = require("./tracing.enricher");
58
60
  const tracing_interceptor_1 = require("./tracing.interceptor");
59
61
  let TracingModule = TracingModule_1 = class TracingModule {
60
62
  logger;
@@ -71,6 +73,28 @@ let TracingModule = TracingModule_1 = class TracingModule {
71
73
  { provide: core_1.APP_INTERCEPTOR, useClass: tracing_interceptor_1.TracingInterceptor },
72
74
  this.createHeaderExtractorsProvider(transports, plugins),
73
75
  this.createHeaderMappingsProvider(tracing, plugins),
76
+ tracing_enricher_1.TracingEnricher,
77
+ this.createContextEnrichersProvider(plugins),
78
+ actx_1.IngressContext,
79
+ ],
80
+ exports: [actx_1.IngressContext],
81
+ };
82
+ }
83
+ /**
84
+ * Собирает список `ContextEnricher` для `IngressContext`: встроенный
85
+ * трейсинг + обогатители из плагинов.
86
+ */
87
+ static createContextEnrichersProvider(plugins) {
88
+ const fromPlugins = [];
89
+ for (const plugin of plugins ?? []) {
90
+ fromPlugins.push(...(plugin.contextEnrichers?.() ?? []));
91
+ }
92
+ return {
93
+ provide: actx_1.CONTEXT_ENRICHERS,
94
+ inject: [tracing_enricher_1.TracingEnricher],
95
+ useFactory: (tracing) => [
96
+ tracing,
97
+ ...fromPlugins,
74
98
  ],
75
99
  };
76
100
  }
@@ -1 +1 @@
1
- {"version":3,"file":"tracing.module.js","sourceRoot":"","sources":["../../src/tracing/tracing.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,2CAAwC;AACxC,uCAA+C;AAE/C,yCAAoC;AACpC,2CAAuD;AAEvD,wCAA0C;AAG1C,2CAIqB;AACrB,iDAAgD;AAChD,qDAAiD;AACjD,+DAA2D;AAQpD,IAAM,aAAa,qBAAnB,MAAM,aAAa;IAIkC;IAHlD,KAAK,GAAoB,IAAI,CAAC;IAC9B,OAAO,GAAsB,IAAI,CAAC;IAE1C,YAA0D,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;IAE7E,MAAM,CAAC,OAAO,CAAC,EACb,OAAO,EACP,OAAO,EACP,UAAU,GACM;QAChB,OAAO;YACL,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,eAAa;YACrB,SAAS,EAAE;gBACT,EAAE,OAAO,EAAE,sBAAe,EAAE,QAAQ,EAAE,wCAAkB,EAAE;gBAC1D,IAAI,CAAC,8BAA8B,CAAC,UAAU,EAAE,OAAO,CAAC;gBACxD,IAAI,CAAC,4BAA4B,CAAC,OAAO,EAAE,OAAO,CAAC;aACpD;SACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACK,MAAM,CAAC,4BAA4B,CACzC,UAA0B,EAAE,EAC5B,OAAmC;QAEnC,MAAM,QAAQ,GAA4B,EAAE,CAAC;QAE7C,KAAK,MAAM,MAAM,IAAI,OAAO,IAAI,EAAE,EAAE,CAAC;YACnC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,CAAC;QAErD,OAAO;YACL,OAAO,EAAE,2BAAe;YACxB,MAAM,EAAE,CAAC,8BAAa,CAAC;YACvB,UAAU,EAAE,CAAC,MAAqB,EAA2B,EAAE;gBAC7D,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;oBAC1B,QAAQ,CAAC,IAAI,CAAC,8BAAkB,CAAC,CAAC;gBACpC,CAAC;gBAED,OAAO,QAAQ,CAAC;YAClB,CAAC;SACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACK,MAAM,CAAC,8BAA8B,CAC3C,UAAyC,EACzC,OAAmC;QAEnC,MAAM,UAAU,GAAG,IAAI,GAAG,EAA8B,CAAC;QAEzD,KAAK,MAAM,SAAS,IAAI,UAAU,IAAI,EAAE,EAAE,CAAC;YACzC,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,SAAS,CAAC,CAAC;QACrD,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,OAAO,IAAI,EAAE,EAAE,CAAC;YACnC,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,wBAAwB,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC;gBAC1D,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,6BAAiB,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IAC9D,CAAC;IAED,+DAA+D;IAC/D,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACjC,IAAI,CAAC;gBACH,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,wDAAa,oBAAoB,GAAC,CAAC;gBAE9D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;gBACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACrB,CAAC;YAAC,MAAM,CAAC;gBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,aAAI,EAAA;;;SAGrB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,uBAAa,CAAC,qBAAqB,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7C,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,6BAAc,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;YAElD,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBAC/B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GACvB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;gBAEjE,MAAM,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC;gBAC7B,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;YAC7B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAEvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,uBAAa,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACrC,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;gBAEvD,IAAI,EAAE,QAAQ,CAAC,KAAK,EAAE,EAAE,GAAG,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAnHY,sCAAa;wBAAb,aAAa;IADzB,IAAA,eAAM,EAAC,EAAE,CAAC;IAKI,WAAA,IAAA,sBAAY,EAAC,aAAa,CAAC,CAAA;;GAJ7B,aAAa,CAmHzB"}
1
+ {"version":3,"file":"tracing.module.js","sourceRoot":"","sources":["../../src/tracing/tracing.module.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import type { DynamicModule, MiddlewareConsumer } from '@nestjs/common';
2
+ import type { ContextEnricher } from '@rsdk/actx';
2
3
  import type { Constructor } from '@rsdk/common';
3
4
  import type { ResourceExtractor } from '@rsdk/metadata';
4
5
  import type { TracingHeaderMappings } from '../tracing';
@@ -52,4 +53,9 @@ export interface PlatformAppPlugin<T extends AppropriateTransports = Appropriate
52
53
  * Additional header mappings
53
54
  */
54
55
  additionalTracingHeaders?(): TracingHeaderMappings[];
56
+ /**
57
+ * Additional context enrichers applied at non-NestJS ingress points
58
+ * (pull consumers, queues, redis/postgres, cron) via `IngressContext`.
59
+ */
60
+ contextEnrichers?(): ContextEnricher[];
55
61
  }
@@ -1 +1 @@
1
- {"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../src/types/plugins.ts"],"names":[],"mappings":";;;AAiBO,MAAM,sBAAsB,GAAG,CACpC,CAAoB,EACyB,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,KAAK,CAAC;AAFjE,QAAA,sBAAsB,0BAE2C"}
1
+ {"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../src/types/plugins.ts"],"names":[],"mappings":";;;AAkBO,MAAM,sBAAsB,GAAG,CACpC,CAAoB,EACyB,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,KAAK,KAAK,CAAC;AAFjE,QAAA,sBAAsB,0BAE2C"}
@@ -5,7 +5,8 @@ import type { MicroserviceOptions } from '@nestjs/microservices';
5
5
  import type { Constructor } from '@rsdk/common';
6
6
  import type { ConfigContext } from '../config';
7
7
  import type { IErrorsFormatter, IErrorsSender, IErrorsTransformer } from '../exceptions.handling';
8
- import type { LogFormatter } from '../logging';
8
+ import type { ILogger, LogFormatter } from '../logging';
9
+ import type { PlatformContext } from '../platform.context';
9
10
  import type { NestModuleDefinitions } from './options';
10
11
  export interface GenericHeaders {
11
12
  get(key: string): string | undefined;
@@ -91,7 +92,7 @@ export interface IMicroserviceTransport extends ITransport {
91
92
  * Should be called before passing options
92
93
  * to app.connectMicroservice()
93
94
  */
94
- init(configContext: ConfigContext): void;
95
+ init(app: INestApplication): void | Promise<void>;
95
96
  /**
96
97
  * Additional logic that will be ran after
97
98
  * microservice is started. Most common use
@@ -111,7 +112,7 @@ export interface IHttpTransport extends IPrimaryTransport {
111
112
  /**
112
113
  * @returns AbstractHttpAdapter (from @nestjs/core)
113
114
  *
114
- * Most common are ExpressAdapter and FastifyAdater,
115
+ * Most common are ExpressAdapter and FastifyAdapter,
115
116
  * but custom adapter can be implemented if needed
116
117
  */
117
118
  createAdapter(configContext: ConfigContext): AbstractHttpAdapter;
@@ -120,7 +121,7 @@ export interface IHttpTransport extends IPrimaryTransport {
120
121
  * middleware, body parsers and other.
121
122
  * @param app INestApplication
122
123
  */
123
- configureApp(app: INestApplication, configContext: ConfigContext): Promise<void> | void;
124
+ configureApp(app: INestApplication, context: PlatformContext, logger: ILogger): Promise<void> | void;
124
125
  createHttpOptions(configContext: ConfigContext): HttpOptions;
125
126
  }
126
127
  export declare const isPrimaryTransport: (t: ITransport) => t is IPrimaryTransport;
@@ -1 +1 @@
1
- {"version":3,"file":"transports.js","sourceRoot":"","sources":["../../src/types/transports.ts"],"names":[],"mappings":";;;AAoCO,MAAM,iBAAiB,GAAG,CAAC,CAAU,EAA2B,EAAE,CACvE,OAAQ,CAAS,EAAE,UAAU,KAAK,UAAU,CAAC;AADlC,QAAA,iBAAiB,qBACiB;AA+HxC,MAAM,kBAAkB,GAAG,CAAC,CAAa,EAA0B,EAAE,CAC1E,OAAQ,CAAuB,CAAC,mBAAmB,KAAK,UAAU;IAClE,OAAQ,CAAuB,CAAC,oBAAoB,KAAK,UAAU,CAAC;AAFzD,QAAA,kBAAkB,sBAEuC;AAE/D,MAAM,eAAe,GAAG,CAAC,CAAa,EAAuB,EAAE,CACpE,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;AADhB,QAAA,eAAe,mBACC;AAEtB,MAAM,uBAAuB,GAAG,CACrC,CAAa,EACgB,EAAE,CAC/B,OAAQ,CAA4B,CAAC,yBAAyB,KAAK,UAAU,CAAC;AAHnE,QAAA,uBAAuB,2BAG4C"}
1
+ {"version":3,"file":"transports.js","sourceRoot":"","sources":["../../src/types/transports.ts"],"names":[],"mappings":";;;AAqCO,MAAM,iBAAiB,GAAG,CAAC,CAAU,EAA2B,EAAE,CACvE,OAAQ,CAAS,EAAE,UAAU,KAAK,UAAU,CAAC;AADlC,QAAA,iBAAiB,qBACiB;AAgIxC,MAAM,kBAAkB,GAAG,CAAC,CAAa,EAA0B,EAAE,CAC1E,OAAQ,CAAuB,CAAC,mBAAmB,KAAK,UAAU;IAClE,OAAQ,CAAuB,CAAC,oBAAoB,KAAK,UAAU,CAAC;AAFzD,QAAA,kBAAkB,sBAEuC;AAE/D,MAAM,eAAe,GAAG,CAAC,CAAa,EAAuB,EAAE,CACpE,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;AADhB,QAAA,eAAe,mBACC;AAEtB,MAAM,uBAAuB,GAAG,CACrC,CAAa,EACgB,EAAE,CAC/B,OAAQ,CAA4B,CAAC,yBAAyB,KAAK,UAAU,CAAC;AAHnE,QAAA,uBAAuB,2BAG4C"}
@@ -0,0 +1,3 @@
1
+ const rsdkEslint = require('@rsdk/eslint-plugin');
2
+
3
+ module.exports = rsdkEslint.createConfig({ tsconfigRootDir: __dirname });
package/package.json CHANGED
@@ -1,6 +1,7 @@
1
1
  {
2
2
  "name": "@rsdk/core",
3
- "version": "6.0.0-next.5",
3
+ "role": "library",
4
+ "version": "6.0.0-next.51",
4
5
  "description": "Nestjs based microservice chassis",
5
6
  "license": "Apache License 2.0",
6
7
  "publishConfig": {
@@ -14,41 +15,34 @@
14
15
  "prepublishOnly": "npm run build"
15
16
  },
16
17
  "dependencies": {
18
+ "@rsdk/actx": "6.0.0-next.51",
19
+ "@rsdk/autodoc.protocol": "6.0.0-next.51",
20
+ "@rsdk/common": "6.0.0-next.51",
21
+ "@rsdk/common.nestjs": "6.0.0-next.51",
22
+ "@rsdk/common.node": "6.0.0-next.51",
23
+ "@rsdk/decorators": "6.0.0-next.51",
24
+ "@rsdk/logging": "6.0.0-next.51",
25
+ "@rsdk/metadata": "6.0.0-next.51",
26
+ "@rsdk/nest-tools": "6.0.0-next.51",
27
+ "@rsdk/zones": "6.0.0-next.51",
17
28
  "dotenv": "^16.3.1",
18
- "lodash": "^4.17.21",
19
- "pino": "^8.21.0",
29
+ "pino": "^10.0.0",
20
30
  "prom-client": "^14.2.0"
21
31
  },
22
32
  "peerDependencies": {
23
- "@nestjs/common": "^10.0.0",
24
- "@nestjs/core": "^10.0.0",
25
- "@nestjs/microservices": "^10.0.0",
33
+ "@nestjs/common": "<=10.4.8",
34
+ "@nestjs/core": "<=10.4.8",
35
+ "@nestjs/microservices": "<=10.4.8",
26
36
  "@opentelemetry/api": "1.9.0",
27
- "@opentelemetry/exporter-logs-otlp-http": "0.55.0",
28
- "@rsdk/actx": "*",
29
- "@rsdk/autodoc.protocol": "*",
30
- "@rsdk/common": "*",
31
- "@rsdk/common.nestjs": "*",
32
- "@rsdk/common.node": "*",
33
- "@rsdk/decorators": "*",
34
- "@rsdk/logging": "*",
35
- "@rsdk/metadata": "*",
36
- "@rsdk/nest-tools": "*",
37
- "@rsdk/zones": "*",
38
- "pino-opentelemetry-transport": "^1.0.1",
37
+ "lodash": "^4.17.21",
39
38
  "reflect-metadata": "^0.1.12 || ^0.2.0",
40
- "rxjs": "^7.8.1"
39
+ "rxjs": "^7.8.1",
40
+ "type-fest": "^4.29.0"
41
41
  },
42
42
  "peerDependenciesMeta": {
43
43
  "@opentelemetry/api": {
44
44
  "optional": true
45
- },
46
- "@opentelemetry/exporter-logs-otlp-http": {
47
- "optional": true
48
- },
49
- "pino-opentelemetry-transport": {
50
- "optional": true
51
45
  }
52
46
  },
53
- "gitHead": "f6054a6f05b82d650f2f6fc4dc2aa5dfdd6f7cf5"
47
+ "gitHead": "a5f22993531663be98b320c69e35f5a1d5407728"
54
48
  }
@@ -9,5 +9,4 @@ export const ConfigTag = {
9
9
  graphql: 'graphql',
10
10
  http: 'http',
11
11
  grpcServer: 'grpc-server',
12
- natsHemera: 'nats-hemera',
13
12
  } as const;
@@ -1,3 +1,5 @@
1
+ import type { ExceptionSeverity } from '@rsdk/common';
2
+
1
3
  export type ExceptionCode = string | number;
2
4
 
3
5
  export interface ExceptionsProps<T = any> {
@@ -6,6 +8,11 @@ export interface ExceptionsProps<T = any> {
6
8
  */
7
9
  code?: ExceptionCode | undefined;
8
10
 
11
+ /**
12
+ * Severity level of exception
13
+ */
14
+ severity?: ExceptionSeverity | undefined;
15
+
9
16
  /**
10
17
  * Wrapped original error
11
18
  */
@@ -34,6 +41,11 @@ export abstract class PlatformException<T = any> extends Error {
34
41
  */
35
42
  readonly code: ExceptionCode;
36
43
 
44
+ /**
45
+ * Exception severity
46
+ */
47
+ readonly severity: ExceptionSeverity;
48
+
37
49
  /**
38
50
  * PlatformException has ability to wrap original errors. Such an option exists
39
51
  * in many other languages and frameworks: .NET, Java, Go etc.
@@ -60,6 +72,7 @@ export abstract class PlatformException<T = any> extends Error {
60
72
  super(message);
61
73
  this.metatype = this.constructor.name;
62
74
  this.code = code;
75
+ this.severity = props?.severity ?? 'error';
63
76
  this.cause = props?.cause;
64
77
  this.details = props?.details;
65
78
  }
package/src/index.ts CHANGED
@@ -8,6 +8,9 @@ export { ProtocolDetector } from './transport/protocol.detector';
8
8
 
9
9
  export { TracingHeaderMappings, Span, NoSpan } from './tracing';
10
10
 
11
+ export { IngressContext, CONTEXT_ENRICHERS } from '@rsdk/actx';
12
+ export type { ContextEnricher, ContextCarrier } from '@rsdk/actx';
13
+
11
14
  export {
12
15
  FileSystemCheckOptions,
13
16
  FileSystemIndicator,
@@ -37,7 +40,12 @@ export * from './exceptions';
37
40
 
38
41
  export * from './exceptions.handling';
39
42
 
40
- export { InjectLogger, LogFormatter, LogLevel } from './logging';
43
+ export {
44
+ ExceptionsSeverityToLogLevel,
45
+ InjectLogger,
46
+ LogFormatter,
47
+ LogLevel,
48
+ } from './logging';
41
49
 
42
50
  export {
43
51
  AnyMetric,
@@ -0,0 +1,21 @@
1
+ import type { ExceptionSeverity } from '@rsdk/common';
2
+ import { LogLevel } from '@rsdk/logging';
3
+
4
+ /**
5
+ *
6
+ * В некоторых библиотеках severity может быть установлен самостотельно, например в typeorm он равен ERROR
7
+ */
8
+ export const ExceptionsSeverityToLogLevel = (
9
+ severity: ExceptionSeverity,
10
+ ): LogLevel => {
11
+ switch (severity.toLowerCase()) {
12
+ case 'warn':
13
+ return LogLevel.warn;
14
+ case 'error':
15
+ return LogLevel.error;
16
+ case 'fatal':
17
+ return LogLevel.fatal;
18
+ default:
19
+ return LogLevel.error;
20
+ }
21
+ };
@@ -1,4 +1,5 @@
1
1
  export * from '@rsdk/logging';
2
+ export { ExceptionsSeverityToLogLevel } from './exception-severity-to-log-level';
2
3
  export * from './adapters';
3
4
  export * from './decorators';
4
5
  export * from './formatters';
@@ -14,6 +14,7 @@ import { ProtocolDetector } from '../transport/protocol.detector';
14
14
 
15
15
  import { InjectLogger } from './decorators/inject-logger.decorator';
16
16
  import { LOG_FORMATTERS } from './constants';
17
+ import { ExceptionsSeverityToLogLevel } from './exception-severity-to-log-level';
17
18
  import { DefaultLogFormatter, LogFormatter } from './formatters';
18
19
  import { LoggingConfig } from './logging.config';
19
20
 
@@ -96,12 +97,16 @@ export class LoggingInterceptor implements NestInterceptor {
96
97
  ? requestDetails
97
98
  : '[ALREADY LOGGED]';
98
99
 
99
- this.logger.error(`Failed [${protocol.toUpperCase()}] ${path}`, {
100
- request,
101
- cause: ex,
102
- path,
103
- zone,
104
- });
100
+ this.logger.log(
101
+ ExceptionsSeverityToLogLevel(ex.severity),
102
+ `Failed [${protocol.toUpperCase()}] ${path}`,
103
+ {
104
+ request,
105
+ cause: ex,
106
+ path,
107
+ zone,
108
+ },
109
+ );
105
110
 
106
111
  return throwError(() => ex);
107
112
  }),
@@ -169,9 +169,7 @@ export class PlatformContext {
169
169
  * Производит все необходимые проверки и инициализации транспортов, не запускает приложение
170
170
  */
171
171
  async configureApp(app: INestApplication): Promise<void> {
172
- const configContext = await this.getConfigContext();
173
-
174
- const awaiter = this.httpTransport?.configureApp(app, configContext);
172
+ const awaiter = this.httpTransport?.configureApp(app, this, this.logger);
175
173
  if (awaiter instanceof Promise) {
176
174
  await awaiter;
177
175
  }
@@ -181,7 +179,10 @@ export class PlatformContext {
181
179
  const transports = this.options.transports ?? ([] as any[]);
182
180
 
183
181
  for (const transport of transports.filter(isMicroserviceTransport)) {
184
- transport.init(configContext);
182
+ const awaiter = transport.init(app);
183
+ if (awaiter instanceof Promise) {
184
+ await awaiter;
185
+ }
185
186
 
186
187
  const options = transport.createMicroserviceOptions();
187
188
  const microservice = app.connectMicroservice(options, {
@@ -234,10 +235,10 @@ export class PlatformContext {
234
235
  * NestFactory.create(context.root, ...context.getNestFactoryCreateOptions())
235
236
  */
236
237
  async getNestFactoryCreateOptions(): Promise<
237
- [httpAdapter: AbstractHttpAdapter, options?: NestApplicationOptions]
238
+ [httpAdapter: AbstractHttpAdapter, options: NestApplicationOptions]
238
239
  > {
239
240
  const configContext = await this.getConfigContext();
240
- const httpAdapter = await this.httpTransport?.createAdapter(configContext);
241
+ const httpAdapter = this.httpTransport?.createAdapter(configContext);
241
242
 
242
243
  return [
243
244
  httpAdapter ?? new NoopHttpAdapter(),
@@ -249,6 +250,10 @@ export class PlatformContext {
249
250
  ];
250
251
  }
251
252
 
253
+ getConfigContext(): Promise<ConfigContext> {
254
+ return this.aggregator.getConfigContext();
255
+ }
256
+
252
257
  private assertPluginCompatibility(options: PlatformOptions): void {
253
258
  if (!options.plugins) {
254
259
  return;
@@ -275,8 +280,4 @@ export class PlatformContext {
275
280
  }
276
281
  }
277
282
  }
278
-
279
- private getConfigContext(): Promise<ConfigContext> {
280
- return this.aggregator.getConfigContext();
281
- }
282
283
  }
@@ -0,0 +1,27 @@
1
+ import type { GenericHeaders } from '../types';
2
+
3
+ import type { TracingHeaderMappings } from './types';
4
+
5
+ /**
6
+ * Отбирает из заголовков транспорта только трассируемые, согласно
7
+ * сконфигурированным маппингам. Для каждого маппинга берётся первое
8
+ * непустое значение среди его алиасов и кладётся под канонический ключ
9
+ * (первый алиас).
10
+ */
11
+ export const extractTracingHeaders = (
12
+ headers: GenericHeaders,
13
+ mappings: TracingHeaderMappings[],
14
+ ): Record<string, string> => {
15
+ const result: Record<string, string> = {};
16
+
17
+ for (const aliases of mappings) {
18
+ const key = aliases[0];
19
+ const value = aliases.map((alias) => headers.get(alias)).find((x) => x);
20
+
21
+ if (value) {
22
+ result[key] = value;
23
+ }
24
+ }
25
+
26
+ return result;
27
+ };
@@ -0,0 +1,28 @@
1
+ import { Inject, Injectable } from '@nestjs/common';
2
+ import type { ContextEnricher } from '@rsdk/actx';
3
+
4
+ import type { GenericHeaders } from '../types';
5
+
6
+ import { HEADER_MAPPINGS } from './constants';
7
+ import { extractTracingHeaders } from './extract-tracing-headers';
8
+ import { TracingHeaders } from './tracing.actx';
9
+ import type { TracingHeaderMappings } from './types';
10
+
11
+ /**
12
+ * Обогащает контекст трассируемыми заголовками: отбирает их из `carrier`
13
+ * по сконфигурированным `HEADER_MAPPINGS` и кладёт в `TracingHeaders`,
14
+ * чтобы инструментация логгера подмешала их во все сообщения.
15
+ *
16
+ * Программный аналог `TracingInterceptor` для входов без NestJS-пайплайна.
17
+ */
18
+ @Injectable()
19
+ export class TracingEnricher implements ContextEnricher {
20
+ constructor(
21
+ @Inject(HEADER_MAPPINGS)
22
+ private readonly mappings: TracingHeaderMappings[],
23
+ ) {}
24
+
25
+ enrich(carrier: GenericHeaders): void {
26
+ TracingHeaders.set(extractTracingHeaders(carrier, this.mappings));
27
+ }
28
+ }
@@ -12,6 +12,7 @@ import { ProtocolDetector } from '../transport/protocol.detector';
12
12
  import type { WithGenericHeaders } from '../types';
13
13
 
14
14
  import { HEADER_EXTRACTORS, HEADER_MAPPINGS } from './constants';
15
+ import { extractTracingHeaders } from './extract-tracing-headers';
15
16
  import { generateDefault, getStrategy } from './request-id';
16
17
  import { TracingHeaders } from './tracing.actx';
17
18
  import { TracingConfig } from './tracing.config';
@@ -61,20 +62,7 @@ export class TracingInterceptor implements NestInterceptor {
61
62
  ctx: ExecutionContext,
62
63
  extractor: WithGenericHeaders,
63
64
  ): Record<string, string> {
64
- const headers: Record<string, string> = {};
65
-
66
- for (const aliases of this.mappings) {
67
- const key = aliases[0];
68
- const value = aliases
69
- .map((x) => extractor.extractHeaders(ctx).get(x))
70
- .find((x) => x);
71
-
72
- if (value) {
73
- headers[key] = value;
74
- }
75
- }
76
-
77
- return headers;
65
+ return extractTracingHeaders(extractor.extractHeaders(ctx), this.mappings);
78
66
  }
79
67
 
80
68
  private generateRequestId(ctx: ExecutionContext, protocol: string): string {
@@ -7,6 +7,8 @@ import type {
7
7
  import { Module } from '@nestjs/common';
8
8
  import { APP_INTERCEPTOR } from '@nestjs/core';
9
9
  import type { ContextAPI, TraceAPI } from '@opentelemetry/api';
10
+ import type { ContextEnricher } from '@rsdk/actx';
11
+ import { CONTEXT_ENRICHERS, IngressContext } from '@rsdk/actx';
10
12
  import { text } from '@rsdk/common';
11
13
  import { ILogger, LoggerFactory } from '@rsdk/logging';
12
14
 
@@ -20,6 +22,7 @@ import {
20
22
  } from './constants';
21
23
  import { TracingHeaders } from './tracing.actx';
22
24
  import { TracingConfig } from './tracing.config';
25
+ import { TracingEnricher } from './tracing.enricher';
23
26
  import { TracingInterceptor } from './tracing.interceptor';
24
27
  import type { TracingHeaderMappings } from './types';
25
28
 
@@ -46,6 +49,33 @@ export class TracingModule implements OnModuleInit {
46
49
  { provide: APP_INTERCEPTOR, useClass: TracingInterceptor },
47
50
  this.createHeaderExtractorsProvider(transports, plugins),
48
51
  this.createHeaderMappingsProvider(tracing, plugins),
52
+ TracingEnricher,
53
+ this.createContextEnrichersProvider(plugins),
54
+ IngressContext,
55
+ ],
56
+ exports: [IngressContext],
57
+ };
58
+ }
59
+
60
+ /**
61
+ * Собирает список `ContextEnricher` для `IngressContext`: встроенный
62
+ * трейсинг + обогатители из плагинов.
63
+ */
64
+ private static createContextEnrichersProvider(
65
+ plugins: PlatformOptions['plugins'],
66
+ ): FactoryProvider {
67
+ const fromPlugins: ContextEnricher[] = [];
68
+
69
+ for (const plugin of plugins ?? []) {
70
+ fromPlugins.push(...(plugin.contextEnrichers?.() ?? []));
71
+ }
72
+
73
+ return {
74
+ provide: CONTEXT_ENRICHERS,
75
+ inject: [TracingEnricher],
76
+ useFactory: (tracing: TracingEnricher): ContextEnricher[] => [
77
+ tracing,
78
+ ...fromPlugins,
49
79
  ],
50
80
  };
51
81
  }
@@ -1,4 +1,5 @@
1
1
  import type { DynamicModule, MiddlewareConsumer } from '@nestjs/common';
2
+ import type { ContextEnricher } from '@rsdk/actx';
2
3
  import type { Constructor } from '@rsdk/common';
3
4
  import type { ResourceExtractor } from '@rsdk/metadata';
4
5
 
@@ -75,4 +76,10 @@ export interface PlatformAppPlugin<
75
76
  * Additional header mappings
76
77
  */
77
78
  additionalTracingHeaders?(): TracingHeaderMappings[];
79
+
80
+ /**
81
+ * Additional context enrichers applied at non-NestJS ingress points
82
+ * (pull consumers, queues, redis/postgres, cron) via `IngressContext`.
83
+ */
84
+ contextEnrichers?(): ContextEnricher[];
78
85
  }
@@ -14,7 +14,8 @@ import type {
14
14
  IErrorsSender,
15
15
  IErrorsTransformer,
16
16
  } from '../exceptions.handling';
17
- import type { LogFormatter } from '../logging';
17
+ import type { ILogger, LogFormatter } from '../logging';
18
+ import type { PlatformContext } from '../platform.context';
18
19
 
19
20
  import type { NestModuleDefinitions } from './options';
20
21
 
@@ -121,7 +122,7 @@ export interface IMicroserviceTransport extends ITransport {
121
122
  * Should be called before passing options
122
123
  * to app.connectMicroservice()
123
124
  */
124
- init(configContext: ConfigContext): void;
125
+ init(app: INestApplication): void | Promise<void>;
125
126
 
126
127
  /**
127
128
  * Additional logic that will be ran after
@@ -144,7 +145,7 @@ export interface IHttpTransport extends IPrimaryTransport {
144
145
  /**
145
146
  * @returns AbstractHttpAdapter (from @nestjs/core)
146
147
  *
147
- * Most common are ExpressAdapter and FastifyAdater,
148
+ * Most common are ExpressAdapter and FastifyAdapter,
148
149
  * but custom adapter can be implemented if needed
149
150
  */
150
151
  createAdapter(configContext: ConfigContext): AbstractHttpAdapter;
@@ -156,7 +157,8 @@ export interface IHttpTransport extends IPrimaryTransport {
156
157
  */
157
158
  configureApp(
158
159
  app: INestApplication,
159
- configContext: ConfigContext,
160
+ context: PlatformContext,
161
+ logger: ILogger,
160
162
  ): Promise<void> | void;
161
163
 
162
164
  createHttpOptions(configContext: ConfigContext): HttpOptions;
@@ -1,6 +1,6 @@
1
1
  import type { ExecutionContext } from '@nestjs/common';
2
2
  import type { ILogger } from '@rsdk/logging';
3
- import { DEFAULT_LEVEL } from '@rsdk/logging';
3
+ import { DEFAULT_LEVEL, LogLevel } from '@rsdk/logging';
4
4
  import { ApiZone } from '@rsdk/zones';
5
5
  import { of, throwError } from 'rxjs';
6
6
 
@@ -113,10 +113,18 @@ describe('LoggingInterceptor', () => {
113
113
  complete: () => {
114
114
  /* eslint-disable prettier/prettier */
115
115
  expect(mockLogger.debug).toHaveBeenCalledTimes(2);
116
- expect(mockLogger.debug).toHaveBeenNthCalledWith(1, '>>> Received [TEST] /test/path', expect.any(Object));
117
- expect(mockLogger.debug).toHaveBeenNthCalledWith(2, '<<< Handled [TEST] /test/path', expect.objectContaining({
118
- executionTime: expect.any(Number),
119
- }));
116
+ expect(mockLogger.debug).toHaveBeenNthCalledWith(
117
+ 1,
118
+ '>>> Received [TEST] /test/path',
119
+ expect.any(Object),
120
+ );
121
+ expect(mockLogger.debug).toHaveBeenNthCalledWith(
122
+ 2,
123
+ '<<< Handled [TEST] /test/path',
124
+ expect.objectContaining({
125
+ executionTime: expect.any(Number),
126
+ }),
127
+ );
120
128
  /* eslint-enable prettier/prettier */
121
129
 
122
130
  done();
@@ -250,7 +258,8 @@ describe('LoggingInterceptor', () => {
250
258
  .intercept(mockContext, { handle: () => throwError(() => error) })
251
259
  .subscribe({
252
260
  error: () => {
253
- expect(mockLogger.error).toHaveBeenCalledWith(
261
+ expect(mockLogger.log).toHaveBeenCalledWith(
262
+ LogLevel.error,
254
263
  'Failed [TEST] /test/path',
255
264
  expect.objectContaining({
256
265
  request: {},
@@ -276,7 +285,8 @@ describe('LoggingInterceptor', () => {
276
285
  .intercept(mockContext, { handle: () => throwError(() => error) })
277
286
  .subscribe({
278
287
  error: () => {
279
- expect(mockLogger.error).toHaveBeenCalledWith(
288
+ expect(mockLogger.log).toHaveBeenCalledWith(
289
+ LogLevel.error,
280
290
  'Failed [TEST] /test/path',
281
291
  expect.objectContaining({
282
292
  request: '[ALREADY LOGGED]',