@6thbridge/utils 1.0.9 → 1.0.10
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/lib/logger/logger.d.ts +1 -1
- package/lib/logger/logger.js +1 -1
- package/lib/logger/logger.js.map +1 -1
- package/lib/logger/redact.js +2 -16
- package/lib/logger/redact.js.map +1 -1
- package/lib/logger/test.spec.js +1 -1
- package/lib/logger/test.spec.js.map +1 -1
- package/lib/monitoring/index.d.ts +6 -0
- package/lib/monitoring/index.js +32 -23
- package/lib/monitoring/index.js.map +1 -1
- package/lib/monitoring/rollbar.d.ts +5 -1
- package/lib/monitoring/rollbar.js +18 -11
- package/lib/monitoring/rollbar.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
package/lib/logger/logger.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export declare class Logger implements LoggerInterface {
|
|
|
15
15
|
private props;
|
|
16
16
|
private broker?;
|
|
17
17
|
private readonly meta;
|
|
18
|
-
static
|
|
18
|
+
static setMaskedFields(fields: string[]): string[];
|
|
19
19
|
constructor(props: LoggerProps, broker?: RabbitMQClient | undefined);
|
|
20
20
|
configureLogger(prop: any): LoggerProps;
|
|
21
21
|
setBroker(broker: RabbitMQClient): void;
|
package/lib/logger/logger.js
CHANGED
package/lib/logger/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAmD;AACnD,mCAA+B;AAC/B,8CAAsC;AAEtC,oCAAkC;AAClC,kCAAuC;AACvC,sDAA8B;AAE9B,MAAM,MAAM,GAAG,gBAAQ,CAAC,gBAAgB,CAAC;IACrC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,wBAAwB;IACpE,OAAO,EAAE;QACL,MAAM,EAAE,UAAU;KACrB;CACJ,CAAC,CAAC;AAEH,MAAa,WAAW;IAAxB;QACI,YAAO,GAAY,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,KAAK,CAAC;QAMjD,cAAS,GAAY,eAAe,CAAC;IAGzC,CAAC;CAAA;AAVD,kCAUC;AAED,MAAM,YAAY,GAAa,EAAE,CAAC;AAElC,MAAa,MAAM;IAEf,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":"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"}
|
package/lib/logger/redact.js
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
4
|
-
const lodash_1 = require("lodash");
|
|
5
3
|
// Yoinked from lodash to save dependencies
|
|
6
4
|
function isObject(value) {
|
|
7
5
|
const type = typeof value;
|
|
@@ -53,12 +51,12 @@ function redact(target, keywords, replaceVal, config) {
|
|
|
53
51
|
// Redact each value of the array.
|
|
54
52
|
return target.map(val => redact(val, keywords, replaceVal, config));
|
|
55
53
|
}
|
|
56
|
-
else
|
|
54
|
+
else {
|
|
57
55
|
return Object.keys(target).reduce((newObj, key) => {
|
|
58
56
|
const isMatch = isKeywordMatch(keywords, key, strict, partial);
|
|
59
57
|
if (isMatch) {
|
|
60
58
|
newObj[key] = typeof replaceVal === 'function'
|
|
61
|
-
? replaceVal(target[key], key) : replaceVal || '[
|
|
59
|
+
? replaceVal(target[key], key) : replaceVal || '[REDACTED]';
|
|
62
60
|
}
|
|
63
61
|
else {
|
|
64
62
|
newObj[key] = redact(target[key], keywords, replaceVal, config);
|
|
@@ -66,18 +64,6 @@ function redact(target, keywords, replaceVal, config) {
|
|
|
66
64
|
return newObj;
|
|
67
65
|
}, {});
|
|
68
66
|
}
|
|
69
|
-
// Redaction only works on arrays, plain objects, and primitives.
|
|
70
|
-
if (ignoreUnknown) {
|
|
71
|
-
// ignore the unknown type instead of throwing an error
|
|
72
|
-
return target;
|
|
73
|
-
}
|
|
74
|
-
else {
|
|
75
|
-
let targetType = typeof target;
|
|
76
|
-
if (targetType === 'object' && !(0, lodash_1.isPlainObject)(target)) {
|
|
77
|
-
targetType += ' (not plain)';
|
|
78
|
-
}
|
|
79
|
-
throw new Error(`Unsupported value type for redaction: ${targetType}`);
|
|
80
|
-
}
|
|
81
67
|
}
|
|
82
68
|
exports.default = redact;
|
|
83
69
|
//# sourceMappingURL=redact.js.map
|
package/lib/logger/redact.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redact.js","sourceRoot":"","sources":["../../src/logger/redact.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"redact.js","sourceRoot":"","sources":["../../src/logger/redact.ts"],"names":[],"mappings":"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"}
|
package/lib/logger/test.spec.js
CHANGED
|
@@ -34,7 +34,7 @@ describe('#test logger', function () {
|
|
|
34
34
|
expect(logger.exception(new Error('custom error'), { foo: 'bar' })).toBe('error -> test-request-id');
|
|
35
35
|
}));
|
|
36
36
|
it("should redact", () => __awaiter(this, void 0, void 0, function* () {
|
|
37
|
-
logger_1.Logger.
|
|
37
|
+
logger_1.Logger.setMaskedFields(["password"]);
|
|
38
38
|
const logged = logger.info("This is an error from the package", { password: "sensitive", innerLayer: { password: "sensitive2", arrayLayer: [{ password: "sensitive3" }] } }, new Error().stack);
|
|
39
39
|
expect(logged).toBe('info -> test-request-id');
|
|
40
40
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.spec.js","sourceRoot":"","sources":["../../src/logger/test.spec.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;AACb,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,uBAAuB,CAAC;AAE1D,qCAAkC;AAElC,QAAQ,CAAC,cAAc,EAAE;IACvB,IAAI,MAAM,GAAW,IAAI,eAAM,CAAC;QAC9B,SAAS,EAAE,iBAAiB;KAC7B,CAAC,CAAC;IAEH,EAAE,CAAC,qBAAqB,EAAE,GAAS,EAAE;QACnC,MAAM,CACJ,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CACrF,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACrC,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,oBAAoB,EAAE,GAAS,EAAE;QAClC,MAAM,CACJ,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CACpF,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACpC,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,oBAAoB,EAAE,GAAS,EAAE;QAClC,MAAM,CACJ,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CACrF,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACrC,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAS,EAAE;QACjC,MAAM,CACJ,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CACpF,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACpC,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,uBAAuB,EAAE,GAAS,EAAE;QACrC,MAAM,CACJ,MAAM,CAAC,QAAQ,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CACxF,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IACxC,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAS,EAAE;QACnD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CACtE,0BAA0B,CAC3B,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,eAAe,EAAE,GAAQ,EAAE;QAC5B,eAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"test.spec.js","sourceRoot":"","sources":["../../src/logger/test.spec.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;AACb,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,uBAAuB,CAAC;AAE1D,qCAAkC;AAElC,QAAQ,CAAC,cAAc,EAAE;IACvB,IAAI,MAAM,GAAW,IAAI,eAAM,CAAC;QAC9B,SAAS,EAAE,iBAAiB;KAC7B,CAAC,CAAC;IAEH,EAAE,CAAC,qBAAqB,EAAE,GAAS,EAAE;QACnC,MAAM,CACJ,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CACrF,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACrC,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,oBAAoB,EAAE,GAAS,EAAE;QAClC,MAAM,CACJ,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CACpF,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACpC,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,oBAAoB,EAAE,GAAS,EAAE;QAClC,MAAM,CACJ,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CACrF,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACrC,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAS,EAAE;QACjC,MAAM,CACJ,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CACpF,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACpC,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,uBAAuB,EAAE,GAAS,EAAE;QACrC,MAAM,CACJ,MAAM,CAAC,QAAQ,CAAC,mCAAmC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CACxF,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IACxC,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,GAAS,EAAE;QACnD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CACtE,0BAA0B,CAC3B,CAAC;IACJ,CAAC,CAAA,CAAC,CAAC;IAEH,EAAE,CAAC,eAAe,EAAE,GAAQ,EAAE;QAC5B,eAAM,CAAC,eAAe,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QAErC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,EAAC,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,EAAC,QAAQ,EAAE,YAAY,EAAC,CAAC,EAAC,EAAC,EAAE,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;QAC3L,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACjD,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AxiosInstance, AxiosStatic } from 'axios';
|
|
2
|
+
import { RollbarUtil } from './rollbar';
|
|
2
3
|
type MonitoredAxiosOptions = {
|
|
3
4
|
apitoolkitApiKey: string;
|
|
4
5
|
urlWildcard?: string;
|
|
@@ -9,4 +10,9 @@ type MonitoredAxiosOptions = {
|
|
|
9
10
|
};
|
|
10
11
|
export declare function getMonitoredAxios(options: MonitoredAxiosOptions): AxiosInstance;
|
|
11
12
|
export declare function reportAxiosError(error: any): Promise<void>;
|
|
13
|
+
export declare class Monitoring {
|
|
14
|
+
static rollbar: import("rollbar") | null;
|
|
15
|
+
static getRollbarInstance: typeof RollbarUtil.getRollbarInstance;
|
|
16
|
+
static getMonitoredAxios(options: MonitoredAxiosOptions): AxiosInstance;
|
|
17
|
+
}
|
|
12
18
|
export { rollbar, getRollbarInstance } from "./rollbar";
|
package/lib/monitoring/index.js
CHANGED
|
@@ -32,31 +32,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.getRollbarInstance = exports.rollbar = exports.reportAxiosError = exports.getMonitoredAxios = void 0;
|
|
35
|
+
exports.getRollbarInstance = exports.rollbar = exports.Monitoring = exports.reportAxiosError = exports.getMonitoredAxios = void 0;
|
|
36
36
|
const apitoolkit_express_1 = __importStar(require("apitoolkit-express"));
|
|
37
37
|
const logger_1 = require("../logger/logger");
|
|
38
38
|
const utils_1 = require("../utils");
|
|
39
|
+
const rollbar_1 = require("./rollbar");
|
|
39
40
|
let apitoolkit;
|
|
40
41
|
function getMonitoredAxios(options) {
|
|
41
|
-
|
|
42
|
-
const axiosInstance = options.axiosInstance || utils_1.HttpUtil.getAxiosInstance();
|
|
43
|
-
if (!options.apitoolkitApiKey)
|
|
44
|
-
return axiosInstance;
|
|
45
|
-
if (!apitoolkit)
|
|
46
|
-
apitoolkit = apitoolkit_express_1.default.NewClient({ apiKey: options.apitoolkitApiKey });
|
|
47
|
-
options.redactRequestBody = options.redactRequestBody || [];
|
|
48
|
-
options.redactResponseBody = options.redactResponseBody || [];
|
|
49
|
-
if ((_a = options === null || options === void 0 ? void 0 : options.redactResponseBody) === null || _a === void 0 ? void 0 : _a.length) {
|
|
50
|
-
options.redactResponseBody = options.redactResponseBody.map((field) => `$.${field}`);
|
|
51
|
-
// console.log("redactResponseBody", options.redactResponseBody);
|
|
52
|
-
}
|
|
53
|
-
if ((_b = options === null || options === void 0 ? void 0 : options.redactRequestBody) === null || _b === void 0 ? void 0 : _b.length) {
|
|
54
|
-
// console.log("redactRequestBody", options?.redactRequestBody);
|
|
55
|
-
options.redactRequestBody = options.redactRequestBody.map((field) => `$.${field}`);
|
|
56
|
-
// console.log("after redactRequestBody", options.redactRequestBody);
|
|
57
|
-
}
|
|
58
|
-
//@ts-ignore
|
|
59
|
-
return apitoolkit.observeAxios(axiosInstance, options.urlWildcard, options.redactHeaders, options.redactRequestBody, options.redactResponseBody);
|
|
42
|
+
return Monitoring.getMonitoredAxios(options);
|
|
60
43
|
}
|
|
61
44
|
exports.getMonitoredAxios = getMonitoredAxios;
|
|
62
45
|
function reportAxiosError(error) {
|
|
@@ -70,7 +53,33 @@ function reportAxiosError(error) {
|
|
|
70
53
|
});
|
|
71
54
|
}
|
|
72
55
|
exports.reportAxiosError = reportAxiosError;
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
56
|
+
class Monitoring {
|
|
57
|
+
static getMonitoredAxios(options) {
|
|
58
|
+
var _a, _b;
|
|
59
|
+
const axiosInstance = options.axiosInstance || utils_1.HttpUtil.getAxiosInstance();
|
|
60
|
+
if (!options.apitoolkitApiKey)
|
|
61
|
+
return axiosInstance;
|
|
62
|
+
if (!apitoolkit)
|
|
63
|
+
apitoolkit = apitoolkit_express_1.default.NewClient({ apiKey: options.apitoolkitApiKey });
|
|
64
|
+
options.redactRequestBody = options.redactRequestBody || [];
|
|
65
|
+
options.redactResponseBody = options.redactResponseBody || [];
|
|
66
|
+
if ((_a = options === null || options === void 0 ? void 0 : options.redactResponseBody) === null || _a === void 0 ? void 0 : _a.length) {
|
|
67
|
+
options.redactResponseBody = options.redactResponseBody.map((field) => `$.${field}`);
|
|
68
|
+
// console.log("redactResponseBody", options.redactResponseBody);
|
|
69
|
+
}
|
|
70
|
+
if ((_b = options === null || options === void 0 ? void 0 : options.redactRequestBody) === null || _b === void 0 ? void 0 : _b.length) {
|
|
71
|
+
// console.log("redactRequestBody", options?.redactRequestBody);
|
|
72
|
+
options.redactRequestBody = options.redactRequestBody.map((field) => `$.${field}`);
|
|
73
|
+
// console.log("after redactRequestBody", options.redactRequestBody);
|
|
74
|
+
}
|
|
75
|
+
//@ts-ignore
|
|
76
|
+
return apitoolkit.observeAxios(axiosInstance, options.urlWildcard, options.redactHeaders, options.redactRequestBody, options.redactResponseBody);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
exports.Monitoring = Monitoring;
|
|
80
|
+
Monitoring.rollbar = rollbar_1.RollbarUtil.rollbar;
|
|
81
|
+
Monitoring.getRollbarInstance = rollbar_1.RollbarUtil.getRollbarInstance;
|
|
82
|
+
var rollbar_2 = require("./rollbar");
|
|
83
|
+
Object.defineProperty(exports, "rollbar", { enumerable: true, get: function () { return rollbar_2.rollbar; } });
|
|
84
|
+
Object.defineProperty(exports, "getRollbarInstance", { enumerable: true, get: function () { return rollbar_2.getRollbarInstance; } });
|
|
76
85
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/monitoring/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,yEAA6D;AAC7D,6CAA0C;AAC1C,oCAAkC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/monitoring/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,yEAA6D;AAC7D,6CAA0C;AAC1C,oCAAkC;AAClC,uCAAwC;AAWxC,IAAI,UAAsB,CAAC;AAC3B,SAAgB,iBAAiB,CAAC,OAA8B;IAC9D,OAAO,UAAU,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;AAC/C,CAAC;AAFD,8CAEC;AAED,SAAsB,gBAAgB,CAAC,KAAU;;QAC/C,IAAI,CAAC;YACH,IAAA,gCAAW,EAAC,KAAK,CAAC,CAAC;QACrB,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,eAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;CAAA;AAND,4CAMC;AAGD,MAAa,UAAU;IAGrB,MAAM,CAAC,iBAAiB,CAAC,OAA8B;;QACrD,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,gBAAQ,CAAC,gBAAgB,EAAE,CAAC;QAE3E,IAAI,CAAC,OAAO,CAAC,gBAAgB;YAAE,OAAO,aAAa,CAAC;QAEpD,IAAI,CAAC,UAAU;YAAE,UAAU,GAAG,4BAAU,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAEzF,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,IAAI,EAAE,CAAC;QAC5D,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,EAAE,CAAC;QAE9D,IAAI,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,0CAAE,MAAM,EAAE,CAAC;YACxC,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;YACrF,iEAAiE;QACnE,CAAC;QAED,IAAI,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,0CAAE,MAAM,EAAE,CAAC;YACvC,gEAAgE;YAChE,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;YACnF,qEAAqE;QACvE,CAAC;QAED,YAAY;QACZ,OAAO,UAAU,CAAC,YAAY,CAC5B,aAAoB,EACpB,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,kBAAkB,CAC3B,CAAC;IACJ,CAAC;;AAhCH,gCAiCC;AAhCQ,kBAAO,GAAG,qBAAW,CAAC,OAAO,CAAC;AAC9B,6BAAkB,GAAG,qBAAW,CAAC,kBAAkB,CAAC;AAiC7D,qCAAqD;AAA7C,kGAAA,OAAO,OAAA;AAAE,6GAAA,kBAAkB,OAAA"}
|
|
@@ -12,4 +12,8 @@ interface RollbarConfig {
|
|
|
12
12
|
}
|
|
13
13
|
declare let rollbar: Rollbar | null;
|
|
14
14
|
declare function getRollbarInstance(config: RollbarConfig): Rollbar | null;
|
|
15
|
-
export
|
|
15
|
+
export declare class RollbarUtil {
|
|
16
|
+
static rollbar: Rollbar | null;
|
|
17
|
+
static getRollbarInstance(config: RollbarConfig): Rollbar | null;
|
|
18
|
+
}
|
|
19
|
+
export { rollbar, getRollbarInstance, };
|
|
@@ -3,21 +3,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getRollbarInstance = exports.rollbar = void 0;
|
|
6
|
+
exports.getRollbarInstance = exports.rollbar = exports.RollbarUtil = void 0;
|
|
7
7
|
const rollbar_1 = __importDefault(require("rollbar"));
|
|
8
8
|
let rollbar;
|
|
9
9
|
function getRollbarInstance(config) {
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
return RollbarUtil.getRollbarInstance(config);
|
|
11
|
+
}
|
|
12
|
+
exports.getRollbarInstance = getRollbarInstance;
|
|
13
|
+
class RollbarUtil {
|
|
14
|
+
static getRollbarInstance(config) {
|
|
15
|
+
var _a, _b, _c;
|
|
16
|
+
if (rollbar)
|
|
17
|
+
return rollbar;
|
|
18
|
+
if (!config || !config.accessToken) {
|
|
19
|
+
console.log(' =========== Rollbar Config/Access Token in missing =============', config);
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
22
|
+
config.accessToken = config.accessToken || process.env.ROLLBAR_ACCESS_TOKEN;
|
|
23
|
+
const isProduction = config.env === 'production';
|
|
24
|
+
exports.rollbar = rollbar = new rollbar_1.default(Object.assign(Object.assign({}, config.rawRollbarConfig), { accessToken: config.accessToken, captureUncaught: true, captureUnhandledRejections: true, autoInstrument: (_b = (_a = config.rawRollbarConfig) === null || _a === void 0 ? void 0 : _a.autoInstrument) !== null && _b !== void 0 ? _b : isProduction, enabled: true, environment: config.environment, payload: { environment: config.environment, service: (_c = config.service) !== null && _c !== void 0 ? _c : process.env.APP_NAME } }));
|
|
12
25
|
return rollbar;
|
|
13
|
-
if (!config || !config.accessToken) {
|
|
14
|
-
console.log(' =========== Rollbar Config/Access Token in missing =============', config);
|
|
15
|
-
return null;
|
|
16
26
|
}
|
|
17
|
-
config.accessToken = config.accessToken || process.env.ROLLBAR_ACCESS_TOKEN;
|
|
18
|
-
const isProduction = config.env === 'production';
|
|
19
|
-
exports.rollbar = rollbar = new rollbar_1.default(Object.assign(Object.assign({}, config.rawRollbarConfig), { accessToken: config.accessToken, captureUncaught: true, captureUnhandledRejections: true, autoInstrument: (_b = (_a = config.rawRollbarConfig) === null || _a === void 0 ? void 0 : _a.autoInstrument) !== null && _b !== void 0 ? _b : isProduction, enabled: true, environment: config.environment, payload: { environment: config.environment, service: (_c = config.service) !== null && _c !== void 0 ? _c : process.env.APP_NAME } }));
|
|
20
|
-
return rollbar;
|
|
21
27
|
}
|
|
22
|
-
exports.
|
|
28
|
+
exports.RollbarUtil = RollbarUtil;
|
|
29
|
+
RollbarUtil.rollbar = rollbar;
|
|
23
30
|
//# sourceMappingURL=rollbar.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rollbar.js","sourceRoot":"","sources":["../../src/monitoring/rollbar.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAgB9B,IAAI,OAAuB,CAAC;AAE5B,SAAS,kBAAkB,CAAC,MAAqB
|
|
1
|
+
{"version":3,"file":"rollbar.js","sourceRoot":"","sources":["../../src/monitoring/rollbar.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAgB9B,IAAI,OAAuB,CAAC;AAE5B,SAAS,kBAAkB,CAAC,MAAqB;IAC/C,OAAO,WAAW,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;AAChD,CAAC;AAkCC,gDAAkB;AAjCpB,MAAa,WAAW;IAGtB,MAAM,CAAC,kBAAkB,CAAC,MAAqB;;QAC7C,IAAI,OAAO;YAAE,OAAO,OAAO,CAAC;QAE5B,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,mEAAmE,EAAE,MAAM,CAAC,CAAC;YAEzF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;QAE5E,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,KAAK,YAAY,CAAC;QAEjD,kBAAA,OAAO,GAAG,IAAI,iBAAO,iCAChB,MAAM,CAAC,gBAAgB,KAC1B,WAAW,EAAE,MAAM,CAAC,WAAW,EAC/B,eAAe,EAAE,IAAI,EACrB,0BAA0B,EAAE,IAAI,EAChC,cAAc,EAAE,MAAA,MAAA,MAAM,CAAC,gBAAgB,0CAAE,cAAc,mCAAI,YAAY,EACvE,OAAO,EAAE,IAAI,EACb,WAAW,EAAE,MAAM,CAAC,WAAW,EAC/B,OAAO,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,OAAO,EAAE,MAAA,MAAM,CAAC,OAAO,mCAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAC7F,CAAC;QAEH,OAAO,OAAO,CAAC;IACjB,CAAC;;AA5BH,kCA6BC;AA5BQ,mBAAO,GAAG,OAAO,CAAC"}
|