@sima-land/isomorph 11.0.0-alpha.8 → 11.0.0-alpha.9
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.
- package/error-tracker/types.d.ts +1 -7
- package/error-tracker/utils.js +0 -1
- package/error-tracker/utils.js.map +1 -1
- package/http-client/middleware/logging.js +8 -6
- package/http-client/middleware/logging.js.map +1 -1
- package/logger/handler/console.d.ts +1 -1
- package/logger/handler/console.js +8 -1
- package/logger/handler/console.js.map +1 -1
- package/logger/handler/sentry.d.ts +3 -3
- package/logger/handler/sentry.js +6 -8
- package/logger/handler/sentry.js.map +1 -1
- package/package.json +1 -1
- package/preset/browser/index.js +5 -6
- package/preset/browser/index.js.map +1 -1
- package/preset/node/index.js +10 -10
- package/preset/node/index.js.map +1 -1
- package/error-tracker/browser.d.ts +0 -8
- package/error-tracker/browser.js +0 -40
- package/error-tracker/browser.js.map +0 -1
- package/error-tracker/node.d.ts +0 -8
- package/error-tracker/node.js +0 -40
- package/error-tracker/node.js.map +0 -1
package/error-tracker/types.d.ts
CHANGED
|
@@ -1,10 +1,4 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type { withScope as withScopeBrowser } from '@sentry/browser';
|
|
3
|
-
import type { withScope as withScopeNode } from '@sentry/node';
|
|
4
|
-
export interface SentryLib {
|
|
5
|
-
client: Client;
|
|
6
|
-
withScope: typeof withScopeBrowser | typeof withScopeNode;
|
|
7
|
-
}
|
|
1
|
+
import type { Severity, Context, Extra, Breadcrumb } from '@sentry/types';
|
|
8
2
|
export interface SentryErrorData {
|
|
9
3
|
level?: Severity;
|
|
10
4
|
context?: {
|
package/error-tracker/utils.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/error-tracker/utils.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,WAAY,SAAQ,KAAK;IAGpC;;;OAGG;IACH,YAAY,OAAe,EAAE,OAAwB,EAAE;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/error-tracker/utils.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,WAAY,SAAQ,KAAK;IAGpC;;;OAGG;IACH,YAAY,OAAe,EAAE,OAAwB,EAAE;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAXD,kCAWC;AAED;;GAEG;AACH,MAAa,gBAAgB;IAG3B;;OAEG;IACH,YAAY,IAA0B;QACpC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AATD,4CASC"}
|
|
@@ -14,16 +14,15 @@ const types_1 = require("@sentry/types");
|
|
|
14
14
|
*/
|
|
15
15
|
function loggingMiddleware(logger) {
|
|
16
16
|
return async function (config, next, defaults) {
|
|
17
|
-
const { baseURL, url, method = '
|
|
17
|
+
const { baseURL, url, method = 'get', params, data } = { ...defaults, ...config };
|
|
18
18
|
const readyMethod = method.toUpperCase();
|
|
19
|
-
const readyURL = baseURL ? `${baseURL.replace(/\/$/, '')}
|
|
19
|
+
const readyURL = baseURL ? `${baseURL.replace(/\/$/, '')}/${url}` : url;
|
|
20
20
|
try {
|
|
21
21
|
logger.info(new utils_1.SentryBreadcrumb({
|
|
22
22
|
category: 'http.request',
|
|
23
23
|
type: 'http',
|
|
24
24
|
data: {
|
|
25
25
|
url: readyURL,
|
|
26
|
-
status_code: 'FETCHING',
|
|
27
26
|
method: readyMethod,
|
|
28
27
|
params,
|
|
29
28
|
},
|
|
@@ -45,15 +44,18 @@ function loggingMiddleware(logger) {
|
|
|
45
44
|
catch (error) {
|
|
46
45
|
if (axios_1.default.isAxiosError(error)) {
|
|
47
46
|
const statusCode = error.response?.status || 'UNKNOWN';
|
|
48
|
-
logger.error(new utils_1.SentryError(
|
|
47
|
+
logger.error(new utils_1.SentryError(`HTTP request failed with status code ${statusCode}`, {
|
|
49
48
|
level: severityFromStatus(error.response?.status),
|
|
50
49
|
context: {
|
|
51
50
|
key: 'Request details',
|
|
52
51
|
data: {
|
|
53
52
|
url,
|
|
54
53
|
baseURL,
|
|
55
|
-
method,
|
|
56
|
-
headers
|
|
54
|
+
method: readyMethod,
|
|
55
|
+
headers: {
|
|
56
|
+
...config.headers,
|
|
57
|
+
...defaults.headers[readyMethod.toLowerCase()],
|
|
58
|
+
},
|
|
57
59
|
params,
|
|
58
60
|
data,
|
|
59
61
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../src/http-client/middleware/logging.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAG1B,qDAA0E;AAC1E,yCAAyC;AAEzC;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,OAAO,KAAK,WAAW,MAAM,EAAE,IAAI,EAAE,QAAQ;QAC3C,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../src/http-client/middleware/logging.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAG1B,qDAA0E;AAC1E,yCAAyC;AAEzC;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,MAAc;IAC9C,OAAO,KAAK,WAAW,MAAM,EAAE,IAAI,EAAE,QAAQ;QAC3C,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,QAAQ,EAAE,GAAG,MAAM,EAAE,CAAC;QAClF,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QAExE,IAAI;YACF,MAAM,CAAC,IAAI,CACT,IAAI,wBAAgB,CAAC;gBACnB,QAAQ,EAAE,cAAc;gBACxB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE;oBACJ,GAAG,EAAE,QAAQ;oBACb,MAAM,EAAE,WAAW;oBACnB,MAAM;iBACP;gBACD,KAAK,EAAE,gBAAQ,CAAC,IAAI;aACrB,CAAC,CACH,CAAC;YAEF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;YAEpC,MAAM,CAAC,IAAI,CACT,IAAI,wBAAgB,CAAC;gBACnB,QAAQ,EAAE,eAAe;gBACzB,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE;oBACJ,GAAG,EAAE,QAAQ;oBACb,WAAW,EAAE,QAAQ,CAAC,MAAM;oBAC5B,MAAM,EAAE,WAAW;oBACnB,MAAM;iBACP;gBACD,KAAK,EAAE,gBAAQ,CAAC,IAAI;aACrB,CAAC,CACH,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAC7B,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,EAAE,MAAM,IAAI,SAAS,CAAC;gBAEvD,MAAM,CAAC,KAAK,CACV,IAAI,mBAAW,CAAC,wCAAwC,UAAU,EAAE,EAAE;oBACpE,KAAK,EAAE,kBAAkB,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC;oBACjD,OAAO,EAAE;wBACP,GAAG,EAAE,iBAAiB;wBACtB,IAAI,EAAE;4BACJ,GAAG;4BACH,OAAO;4BACP,MAAM,EAAE,WAAW;4BACnB,OAAO,EAAE;gCACP,GAAG,MAAM,CAAC,OAAO;gCACjB,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAmC,CAAC;6BAChF;4BACD,MAAM;4BACN,IAAI;yBACL;qBACF;iBACF,CAAC,CACH,CAAC;gBAEF,MAAM,CAAC,IAAI,CACT,IAAI,wBAAgB,CAAC;oBACnB,QAAQ,EAAE,eAAe;oBACzB,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE;wBACJ,GAAG,EAAE,QAAQ;wBACb,WAAW,EAAE,UAAU;wBACvB,MAAM,EAAE,WAAW;wBACnB,MAAM;qBACP;oBACD,KAAK,EAAE,gBAAQ,CAAC,KAAK;iBACtB,CAAC,CACH,CAAC;aACH;YAED,8DAA8D;YAC9D,MAAM,KAAK,CAAC;SACb;IACH,CAAC,CAAC;AACJ,CAAC;AA9ED,8CA8EC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,MAA0B;IAC3D,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG;QAChE,CAAC,CAAC,gBAAQ,CAAC,IAAI;QACf,CAAC,CAAC,gBAAQ,CAAC,KAAK,CAAC;AACrB,CAAC;AAJD,gDAIC"}
|
|
@@ -21,11 +21,18 @@ function createConsoleHandler(config) {
|
|
|
21
21
|
},
|
|
22
22
|
}
|
|
23
23
|
: (0, pino_pretty_1.default)({ colorize: true }));
|
|
24
|
-
return function (event) {
|
|
24
|
+
return function handler(event) {
|
|
25
25
|
switch (event.type) {
|
|
26
|
+
case 'log':
|
|
26
27
|
case 'info':
|
|
27
28
|
logger.info(event.data);
|
|
28
29
|
break;
|
|
30
|
+
case 'warn':
|
|
31
|
+
logger.warn(event.data);
|
|
32
|
+
break;
|
|
33
|
+
case 'debug':
|
|
34
|
+
logger.debug(event.data);
|
|
35
|
+
break;
|
|
29
36
|
case 'error':
|
|
30
37
|
logger.error(event.data);
|
|
31
38
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../src/logger/handler/console.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../src/logger/handler/console.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAwB;AACxB,8DAAqC;AAErC;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,MAAkB;IACrD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,KAAK,YAAY,CAAC;IAE3C,MAAM,MAAM,GAAG,IAAA,cAAI,EACjB,MAAM;QACJ,CAAC,CAAC;YACE,UAAU,EAAE;gBACV,0DAA0D;gBAC1D,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;aACnC;SACF;QACH,CAAC,CAAC,IAAA,qBAAU,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CACnC,CAAC;IAEF,OAAO,SAAS,OAAO,CAAC,KAAK;QAC3B,QAAQ,KAAK,CAAC,IAAI,EAAE;YAClB,KAAK,KAAK,CAAC;YACX,KAAK,MAAM;gBACT,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACxB,MAAM;YACR,KAAK,MAAM;gBACT,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACxB,MAAM;YACR,KAAK,OAAO;gBACV,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACzB,MAAM;YACR,KAAK,OAAO;gBACV,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACzB,MAAM;SACT;IACH,CAAC,CAAC;AACJ,CAAC;AA/BD,oDA+BC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type { SentryLib } from '../../error-tracker/types';
|
|
2
1
|
import type { LoggerEventHandler } from '../types';
|
|
2
|
+
import type { Hub } from '@sentry/types';
|
|
3
3
|
/**
|
|
4
4
|
* Возвращает новый handler для logger'а для отправки событий в Sentry.
|
|
5
|
-
* @param
|
|
5
|
+
* @param hub Набор данных для работы с Sentry.
|
|
6
6
|
* @return Handler.
|
|
7
7
|
*/
|
|
8
|
-
export declare function createSentryHandler(
|
|
8
|
+
export declare function createSentryHandler(hub: Hub): LoggerEventHandler;
|
package/logger/handler/sentry.js
CHANGED
|
@@ -4,17 +4,17 @@ exports.createSentryHandler = void 0;
|
|
|
4
4
|
const utils_1 = require("../../error-tracker/utils");
|
|
5
5
|
/**
|
|
6
6
|
* Возвращает новый handler для logger'а для отправки событий в Sentry.
|
|
7
|
-
* @param
|
|
7
|
+
* @param hub Набор данных для работы с Sentry.
|
|
8
8
|
* @return Handler.
|
|
9
9
|
*/
|
|
10
|
-
function createSentryHandler(
|
|
10
|
+
function createSentryHandler(hub) {
|
|
11
11
|
return event => {
|
|
12
12
|
// error
|
|
13
13
|
if (event.type === 'error') {
|
|
14
14
|
const error = event.data;
|
|
15
15
|
if (error instanceof utils_1.SentryError) {
|
|
16
16
|
const { level, context, extra } = error.data;
|
|
17
|
-
|
|
17
|
+
hub.withScope(scope => {
|
|
18
18
|
if (level) {
|
|
19
19
|
scope.setLevel(level);
|
|
20
20
|
}
|
|
@@ -24,19 +24,17 @@ function createSentryHandler(sentry) {
|
|
|
24
24
|
if (extra) {
|
|
25
25
|
scope.setExtra(extra.key, extra.data);
|
|
26
26
|
}
|
|
27
|
-
|
|
27
|
+
hub.captureException(error);
|
|
28
28
|
});
|
|
29
29
|
}
|
|
30
30
|
else {
|
|
31
|
-
|
|
31
|
+
hub.captureException(error);
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
// breadcrumb
|
|
35
35
|
if (event.data instanceof utils_1.SentryBreadcrumb) {
|
|
36
36
|
const breadcrumb = event.data.data;
|
|
37
|
-
|
|
38
|
-
scope.addBreadcrumb(breadcrumb);
|
|
39
|
-
});
|
|
37
|
+
hub.addBreadcrumb(breadcrumb);
|
|
40
38
|
}
|
|
41
39
|
};
|
|
42
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sentry.js","sourceRoot":"","sources":["../../../src/logger/handler/sentry.ts"],"names":[],"mappings":";;;AAEA,qDAA0E;AAE1E;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"sentry.js","sourceRoot":"","sources":["../../../src/logger/handler/sentry.ts"],"names":[],"mappings":";;;AAEA,qDAA0E;AAE1E;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,GAAQ;IAC1C,OAAO,KAAK,CAAC,EAAE;QACb,QAAQ;QACR,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;YAC1B,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC;YAEzB,IAAI,KAAK,YAAY,mBAAW,EAAE;gBAChC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;gBAE7C,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;oBACpB,IAAI,KAAK,EAAE;wBACT,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;qBACvB;oBAED,IAAI,OAAO,EAAE;wBACX,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;qBAC7C;oBAED,IAAI,KAAK,EAAE;wBACT,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;qBACvC;oBAED,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;gBAC9B,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;aAC7B;SACF;QAED,aAAa;QACb,IAAI,KAAK,CAAC,IAAI,YAAY,wBAAgB,EAAE;YAC1C,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;YAEnC,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;SAC/B;IACH,CAAC,CAAC;AACJ,CAAC;AApCD,kDAoCC"}
|
package/package.json
CHANGED
package/preset/browser/index.js
CHANGED
|
@@ -6,11 +6,10 @@ const di_1 = require("../../di");
|
|
|
6
6
|
const tokens_1 = require("../../tokens");
|
|
7
7
|
const base_1 = require("../../config/base");
|
|
8
8
|
const browser_1 = require("../../config/browser");
|
|
9
|
-
const browser_2 = require("../../error-tracker/browser");
|
|
10
9
|
const logger_1 = require("../../logger");
|
|
11
10
|
const sentry_1 = require("../../logger/handler/sentry");
|
|
12
11
|
const saga_runner_1 = require("../../saga-runner");
|
|
13
|
-
const
|
|
12
|
+
const browser_2 = require("@sentry/browser");
|
|
14
13
|
const middleware_axios_1 = require("middleware-axios");
|
|
15
14
|
function PresetBrowser() {
|
|
16
15
|
return (0, di_1.createPreset)([
|
|
@@ -28,15 +27,15 @@ function provideBaseConfig(resolve) {
|
|
|
28
27
|
}
|
|
29
28
|
function provideLogger(resolve) {
|
|
30
29
|
const source = resolve(tokens_1.KnownToken.Config.source);
|
|
31
|
-
|
|
32
|
-
const sentry = (0, browser_2.createSentryLib)({
|
|
30
|
+
const client = new browser_2.BrowserClient({
|
|
33
31
|
dsn: source.require('SENTRY_CLIENT_DSN'),
|
|
34
32
|
release: source.require('SENTRY_RELEASE'),
|
|
35
33
|
environment: source.require('SENTRY_ENVIRONMENT'),
|
|
36
|
-
integrations:
|
|
34
|
+
integrations: [...browser_2.defaultIntegrations],
|
|
37
35
|
});
|
|
36
|
+
const hub = new browser_2.Hub(client);
|
|
38
37
|
const logger = (0, logger_1.createLogger)();
|
|
39
|
-
logger.subscribe((0, sentry_1.createSentryHandler)(
|
|
38
|
+
logger.subscribe((0, sentry_1.createSentryHandler)(hub));
|
|
40
39
|
return logger;
|
|
41
40
|
}
|
|
42
41
|
function provideSagaRunner(resolve) {
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,yCAA4C;AAC5C,wDAAkE;AAClE,mDAAqD;AACrD,6CAA0E;AAI1E,uDAA0C;AAE1C,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;QAC1C,CAAC,mBAAU,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,yBAAM,CAAC;KAC/C,CAAC,CAAC;AACL,CAAC;AARD,sCAQC;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,MAAM,MAAM,GAAG,IAAI,uBAAa,CAAC;QAC/B,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC;QACxC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC;QACzC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC;QACjD,YAAY,EAAE,CAAC,GAAG,6BAAmB,CAAC;KACvC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,MAAM,CAAC,CAAC;IAE5B,MAAM,MAAM,GAAG,IAAA,qBAAY,GAAE,CAAC;IAE9B,MAAM,CAAC,SAAS,CAAC,IAAA,4BAAmB,EAAC,GAAG,CAAC,CAAC,CAAC;IAE3C,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.js
CHANGED
|
@@ -12,15 +12,14 @@ const base_1 = require("../../config/base");
|
|
|
12
12
|
const logger_1 = require("../../logger");
|
|
13
13
|
const console_1 = require("../../logger/handler/console");
|
|
14
14
|
const sentry_1 = require("../../logger/handler/sentry");
|
|
15
|
-
const node_2 = require("../../error-tracker/node");
|
|
16
15
|
const logging_1 = require("../../http-server/middleware/logging");
|
|
17
16
|
const tracing_2 = require("../../http-server/middleware/tracing");
|
|
18
17
|
const metrics_1 = require("../../http-server/middleware/metrics");
|
|
19
|
-
const
|
|
18
|
+
const node_2 = require("../../metrics/node");
|
|
20
19
|
const exporter_jaeger_1 = require("@opentelemetry/exporter-jaeger");
|
|
21
20
|
const middleware_axios_1 = require("middleware-axios");
|
|
22
21
|
const express_1 = __importDefault(require("express"));
|
|
23
|
-
const
|
|
22
|
+
const node_3 = require("@sentry/node");
|
|
24
23
|
const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
|
|
25
24
|
const propagator_jaeger_1 = require("@opentelemetry/propagator-jaeger");
|
|
26
25
|
const utils_1 = require("../../tracing/utils");
|
|
@@ -40,7 +39,7 @@ function PresetNode() {
|
|
|
40
39
|
[tokens_1.KnownToken.Http.Client.factory, () => middleware_axios_1.create],
|
|
41
40
|
[tokens_1.KnownToken.Http.Server.factory, () => express_1.default],
|
|
42
41
|
[tokens_1.KnownToken.Http.Server.Defaults.middleware, exports.provideDefaultMiddleware],
|
|
43
|
-
[tokens_1.KnownToken.Metrics.httpApp,
|
|
42
|
+
[tokens_1.KnownToken.Metrics.httpApp, node_2.createMetricsHttpApp],
|
|
44
43
|
]);
|
|
45
44
|
}
|
|
46
45
|
exports.PresetNode = PresetNode;
|
|
@@ -52,15 +51,16 @@ exports.provideBaseConfig = provideBaseConfig;
|
|
|
52
51
|
const provideLogger = resolve => {
|
|
53
52
|
const source = resolve(tokens_1.KnownToken.Config.source);
|
|
54
53
|
const config = resolve(tokens_1.KnownToken.Config.base);
|
|
55
|
-
|
|
56
|
-
const sentry = (0, node_2.createSentryLib)({
|
|
54
|
+
const client = new node_3.NodeClient({
|
|
57
55
|
dsn: source.require('SENTRY_SERVER_DSN'),
|
|
58
56
|
release: source.require('SENTRY_RELEASE'),
|
|
59
57
|
environment: source.require('SENTRY_ENVIRONMENT'),
|
|
58
|
+
integrations: [...node_3.defaultIntegrations],
|
|
60
59
|
});
|
|
60
|
+
const hub = new node_3.Hub(client);
|
|
61
61
|
const logger = (0, logger_1.createLogger)();
|
|
62
62
|
logger.subscribe((0, console_1.createConsoleHandler)(config));
|
|
63
|
-
logger.subscribe((0, sentry_1.createSentryHandler)(
|
|
63
|
+
logger.subscribe((0, sentry_1.createSentryHandler)(hub));
|
|
64
64
|
return logger;
|
|
65
65
|
};
|
|
66
66
|
exports.provideLogger = provideLogger;
|
|
@@ -101,9 +101,9 @@ const provideDefaultMiddleware = resolve => {
|
|
|
101
101
|
const config = resolve(tokens_1.KnownToken.Config.base);
|
|
102
102
|
const logger = resolve(tokens_1.KnownToken.logger);
|
|
103
103
|
const tracer = resolve(tokens_1.KnownToken.Tracing.tracer);
|
|
104
|
-
const metrics = (0,
|
|
104
|
+
const metrics = (0, node_2.createDefaultMetrics)();
|
|
105
105
|
return {
|
|
106
|
-
start: [
|
|
106
|
+
start: [node_3.Handlers.requestHandler()],
|
|
107
107
|
logging: [(0, logging_1.loggingMiddleware)(config, logger)],
|
|
108
108
|
tracing: [(0, tracing_2.tracingMiddleware)(tracer)],
|
|
109
109
|
metrics: [
|
|
@@ -115,7 +115,7 @@ const provideDefaultMiddleware = resolve => {
|
|
|
115
115
|
histogram: metrics.renderDuration,
|
|
116
116
|
}),
|
|
117
117
|
],
|
|
118
|
-
finish: [
|
|
118
|
+
finish: [node_3.Handlers.errorHandler()],
|
|
119
119
|
};
|
|
120
120
|
};
|
|
121
121
|
exports.provideDefaultMiddleware = provideDefaultMiddleware;
|
package/preset/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/node/index.ts"],"names":[],"mappings":";;;;;;AAKA,iCAA0D;AAC1D,oDAA+F;AAC/F,yCAAmD;AACnD,4CAAuD;AACvD,4CAAqD;AACrD,yCAA4C;AAC5C,0DAAoE;AACpE,wDAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/preset/node/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import type { SentryLib } from './types';
|
|
2
|
-
import * as Sentry from '@sentry/browser';
|
|
3
|
-
/**
|
|
4
|
-
* Возвращает новый набор из клиента Sentry и функций из пакета Sentry.
|
|
5
|
-
* @param options Опции создания клиента.
|
|
6
|
-
* @return Новый набор из клиента Sentry и функций из пакета Sentry.
|
|
7
|
-
*/
|
|
8
|
-
export declare function createSentryLib(options: Sentry.BrowserOptions): SentryLib;
|
package/error-tracker/browser.js
DELETED
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.createSentryLib = void 0;
|
|
27
|
-
const Sentry = __importStar(require("@sentry/browser"));
|
|
28
|
-
/**
|
|
29
|
-
* Возвращает новый набор из клиента Sentry и функций из пакета Sentry.
|
|
30
|
-
* @param options Опции создания клиента.
|
|
31
|
-
* @return Новый набор из клиента Sentry и функций из пакета Sentry.
|
|
32
|
-
*/
|
|
33
|
-
function createSentryLib(options) {
|
|
34
|
-
return {
|
|
35
|
-
client: new Sentry.BrowserClient(options),
|
|
36
|
-
withScope: Sentry.withScope,
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
exports.createSentryLib = createSentryLib;
|
|
40
|
-
//# sourceMappingURL=browser.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/error-tracker/browser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAA0C;AAE1C;;;;GAIG;AACH,SAAgB,eAAe,CAAC,OAA8B;IAC5D,OAAO;QACL,MAAM,EAAE,IAAI,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC;QACzC,SAAS,EAAE,MAAM,CAAC,SAAS;KAC5B,CAAC;AACJ,CAAC;AALD,0CAKC"}
|
package/error-tracker/node.d.ts
DELETED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import type { SentryLib } from './types';
|
|
2
|
-
import * as Sentry from '@sentry/node';
|
|
3
|
-
/**
|
|
4
|
-
* Возвращает новый набор из клиента Sentry и функций из пакета Sentry.
|
|
5
|
-
* @param options Опции создания клиента.
|
|
6
|
-
* @return Новый набор из клиента Sentry и функций из пакета Sentry.
|
|
7
|
-
*/
|
|
8
|
-
export declare function createSentryLib(options: Sentry.NodeOptions): SentryLib;
|
package/error-tracker/node.js
DELETED
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.createSentryLib = void 0;
|
|
27
|
-
const Sentry = __importStar(require("@sentry/node"));
|
|
28
|
-
/**
|
|
29
|
-
* Возвращает новый набор из клиента Sentry и функций из пакета Sentry.
|
|
30
|
-
* @param options Опции создания клиента.
|
|
31
|
-
* @return Новый набор из клиента Sentry и функций из пакета Sentry.
|
|
32
|
-
*/
|
|
33
|
-
function createSentryLib(options) {
|
|
34
|
-
return {
|
|
35
|
-
client: new Sentry.NodeClient(options),
|
|
36
|
-
withScope: Sentry.withScope,
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
exports.createSentryLib = createSentryLib;
|
|
40
|
-
//# sourceMappingURL=node.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/error-tracker/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qDAAuC;AAEvC;;;;GAIG;AACH,SAAgB,eAAe,CAAC,OAA2B;IACzD,OAAO;QACL,MAAM,EAAE,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC;QACtC,SAAS,EAAE,MAAM,CAAC,SAAS;KAC5B,CAAC;AACJ,CAAC;AALD,0CAKC"}
|