@6thbridge/utils 1.8.3 → 1.9.0-2
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/data/rabbitmq/index.d.ts +1 -0
- package/lib/data/rabbitmq/index.js +3 -0
- package/lib/data/rabbitmq/index.js.map +1 -1
- package/lib/index.js +0 -8
- package/lib/index.js.map +1 -1
- package/lib/logger/batching.d.ts +7 -0
- package/lib/logger/batching.js +90 -0
- package/lib/logger/batching.js.map +1 -0
- package/lib/logger/batching.spec.d.ts +1 -0
- package/lib/logger/batching.spec.js +108 -0
- package/lib/logger/batching.spec.js.map +1 -0
- package/lib/logger/index.d.ts +1 -0
- package/lib/logger/index.js +5 -1
- package/lib/logger/index.js.map +1 -1
- package/lib/logger/logger-test.js +53 -24
- package/lib/logger/logger-test.js.map +1 -1
- package/lib/logger/logger.js +5 -23
- package/lib/logger/logger.js.map +1 -1
- package/lib/logger/test.spec.js +57 -0
- package/lib/logger/test.spec.js.map +1 -1
- package/lib/middlewares/express.d.ts +1 -0
- package/lib/middlewares/express.js +25 -1
- package/lib/middlewares/express.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/types/context.entity.d.ts +20 -0
- package/lib/types/context.entity.js +47 -1
- package/lib/types/context.entity.js.map +1 -1
- package/lib/utils/http.d.ts +0 -4
- package/lib/utils/http.js +8 -11
- package/lib/utils/http.js.map +1 -1
- package/lib/utils/http.spec.js +18 -0
- package/lib/utils/http.spec.js.map +1 -1
- package/package.json +6 -4
- package/readme.md +30 -102
|
@@ -18,6 +18,9 @@ const __1 = require("../../");
|
|
|
18
18
|
const lodash_1 = require("lodash");
|
|
19
19
|
const types_1 = require("../../types");
|
|
20
20
|
class RabbitMQClient {
|
|
21
|
+
static hasInstance() {
|
|
22
|
+
return RabbitMQClient.instance !== null;
|
|
23
|
+
}
|
|
21
24
|
/**
|
|
22
25
|
* Get the singleton instance of RabbitMQ
|
|
23
26
|
* @returns {RabbitMQClient} The singleton instance
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/data/rabbitmq/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;AACb,sFAKiC;AACjC,8BAA8B;AAC9B,mCAA+B;AAE/B,uCAA6G;AA8B7G,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/data/rabbitmq/index.ts"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -95,12 +95,4 @@ process.on('warning', (warning) => {
|
|
|
95
95
|
name: warning.name, stack: warning.stack,
|
|
96
96
|
});
|
|
97
97
|
});
|
|
98
|
-
process.on('SIGTERM', (signal) => {
|
|
99
|
-
logger_1.logger.warn(`SIGTERM: ${process.env.APP_NAME || signal} is shutting down`, {
|
|
100
|
-
name: signal.name,
|
|
101
|
-
});
|
|
102
|
-
setTimeout(() => {
|
|
103
|
-
process.exit(1); //mandatory (as per the Node.js docs)
|
|
104
|
-
}, 5000);
|
|
105
|
-
});
|
|
106
98
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export declare function configureLogBatching(options: {
|
|
2
|
+
batchSize?: number;
|
|
3
|
+
flushIntervalMs?: number;
|
|
4
|
+
}): void;
|
|
5
|
+
export declare function enqueueLog(payload: Record<string, any>): void;
|
|
6
|
+
export declare function flushLogs(): Promise<void>;
|
|
7
|
+
export declare function registerLoggingShutdown(): void;
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.configureLogBatching = configureLogBatching;
|
|
16
|
+
exports.enqueueLog = enqueueLog;
|
|
17
|
+
exports.flushLogs = flushLogs;
|
|
18
|
+
exports.registerLoggingShutdown = registerLoggingShutdown;
|
|
19
|
+
const axios_1 = __importDefault(require("axios"));
|
|
20
|
+
const rabbitmq_1 = require("../data/rabbitmq");
|
|
21
|
+
const http = axios_1.default.create({
|
|
22
|
+
baseURL: process.env.UTILITY_SERVICE_URL || 'http://utility-service',
|
|
23
|
+
headers: { source: 'internal' },
|
|
24
|
+
timeout: 2000,
|
|
25
|
+
});
|
|
26
|
+
let messages = [];
|
|
27
|
+
let timer;
|
|
28
|
+
let flushing = Promise.resolve();
|
|
29
|
+
let batchSize = 100;
|
|
30
|
+
let flushIntervalMs = 1000;
|
|
31
|
+
let shutdownRegistered = false;
|
|
32
|
+
function configureLogBatching(options) {
|
|
33
|
+
var _a, _b;
|
|
34
|
+
for (const value of Object.values(options)) {
|
|
35
|
+
if (!Number.isSafeInteger(value) || value <= 0)
|
|
36
|
+
throw new Error('Log batching limits must be positive integers');
|
|
37
|
+
}
|
|
38
|
+
batchSize = (_a = options.batchSize) !== null && _a !== void 0 ? _a : batchSize;
|
|
39
|
+
flushIntervalMs = (_b = options.flushIntervalMs) !== null && _b !== void 0 ? _b : flushIntervalMs;
|
|
40
|
+
}
|
|
41
|
+
function enqueueLog(payload) {
|
|
42
|
+
messages.push(payload);
|
|
43
|
+
if (messages.length >= batchSize) {
|
|
44
|
+
void flushLogs();
|
|
45
|
+
}
|
|
46
|
+
else if (!timer) {
|
|
47
|
+
timer = setTimeout(() => {
|
|
48
|
+
void flushLogs();
|
|
49
|
+
}, flushIntervalMs);
|
|
50
|
+
timer.unref();
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
function flushLogs() {
|
|
54
|
+
if (timer) {
|
|
55
|
+
clearTimeout(timer);
|
|
56
|
+
timer = undefined;
|
|
57
|
+
}
|
|
58
|
+
const batch = messages;
|
|
59
|
+
messages = [];
|
|
60
|
+
if (!batch.length)
|
|
61
|
+
return flushing;
|
|
62
|
+
// Count, timer, and manual flushes share the same send operation chain.
|
|
63
|
+
flushing = flushing.then(() => __awaiter(this, void 0, void 0, function* () {
|
|
64
|
+
const broker = rabbitmq_1.RabbitMQClient.hasInstance() ? rabbitmq_1.RabbitMQClient.getInstance() : undefined;
|
|
65
|
+
try {
|
|
66
|
+
if (broker) {
|
|
67
|
+
try {
|
|
68
|
+
yield broker.sendToQueue('platform.logs', batch, { persistent: true, timeout: 2000 });
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
catch (_a) {
|
|
72
|
+
console.error('Log queue send failed; falling back to HTTP');
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
yield http.post('/v1/logs', batch);
|
|
76
|
+
}
|
|
77
|
+
catch (error) {
|
|
78
|
+
console.error('Failed to send logs', error.message);
|
|
79
|
+
}
|
|
80
|
+
}));
|
|
81
|
+
return flushing;
|
|
82
|
+
}
|
|
83
|
+
function registerLoggingShutdown() {
|
|
84
|
+
if (shutdownRegistered)
|
|
85
|
+
return;
|
|
86
|
+
shutdownRegistered = true;
|
|
87
|
+
process.once('SIGTERM', flushLogs);
|
|
88
|
+
process.once('SIGINT', flushLogs);
|
|
89
|
+
}
|
|
90
|
+
//# sourceMappingURL=batching.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"batching.js","sourceRoot":"","sources":["../../src/logger/batching.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
jest.mock('axios', () => ({ __esModule: true, default: { create: jest.fn(() => ({ post: jest.fn().mockResolvedValue({ status: 202 }) })) } }));
|
|
13
|
+
jest.mock('../data/rabbitmq', () => ({ RabbitMQClient: { hasInstance: jest.fn().mockReturnValue(false), getInstance: jest.fn() } }));
|
|
14
|
+
describe('log array batching', () => {
|
|
15
|
+
let batching;
|
|
16
|
+
let post;
|
|
17
|
+
let rabbit;
|
|
18
|
+
let signals;
|
|
19
|
+
const broker = (sendToQueue = jest.fn().mockResolvedValue(true)) => {
|
|
20
|
+
const instance = { sendToQueue };
|
|
21
|
+
rabbit.hasInstance.mockReturnValue(true);
|
|
22
|
+
rabbit.getInstance.mockReturnValue(instance);
|
|
23
|
+
return instance;
|
|
24
|
+
};
|
|
25
|
+
beforeEach(() => {
|
|
26
|
+
jest.useFakeTimers();
|
|
27
|
+
jest.resetModules();
|
|
28
|
+
signals = { SIGTERM: process.listeners('SIGTERM'), SIGINT: process.listeners('SIGINT') };
|
|
29
|
+
batching = require('./batching');
|
|
30
|
+
rabbit = require('../data/rabbitmq').RabbitMQClient;
|
|
31
|
+
post = require('axios').default.create.mock.results[0].value.post;
|
|
32
|
+
});
|
|
33
|
+
afterEach(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
34
|
+
yield batching.flushLogs();
|
|
35
|
+
for (const signal of ['SIGTERM', 'SIGINT']) {
|
|
36
|
+
for (const listener of process.listeners(signal)) {
|
|
37
|
+
if (!signals[signal].includes(listener))
|
|
38
|
+
process.removeListener(signal, listener);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
jest.useRealTimers();
|
|
42
|
+
}));
|
|
43
|
+
it('sends the accumulated array at the count threshold', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
44
|
+
batching.configureLogBatching({ batchSize: 2 });
|
|
45
|
+
const target = broker();
|
|
46
|
+
batching.enqueueLog({ message: 'first' });
|
|
47
|
+
expect(target.sendToQueue).not.toHaveBeenCalled();
|
|
48
|
+
batching.enqueueLog({ message: 'second' });
|
|
49
|
+
yield batching.flushLogs();
|
|
50
|
+
expect(target.sendToQueue).toHaveBeenCalledWith('platform.logs', [{ message: 'first' }, { message: 'second' }], {
|
|
51
|
+
persistent: true,
|
|
52
|
+
timeout: 2000,
|
|
53
|
+
});
|
|
54
|
+
expect(target.sendToQueue).toHaveBeenCalledTimes(1);
|
|
55
|
+
}));
|
|
56
|
+
it('sends a partial array through HTTP on the timer', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
57
|
+
batching.enqueueLog({ message: 'partial' });
|
|
58
|
+
yield jest.advanceTimersByTimeAsync(1000);
|
|
59
|
+
expect(post).toHaveBeenCalledWith('/v1/logs', [{ message: 'partial' }]);
|
|
60
|
+
expect(rabbit.getInstance).not.toHaveBeenCalled();
|
|
61
|
+
}));
|
|
62
|
+
it('chooses the available broker at flush time and sends the whole array', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
63
|
+
batching.enqueueLog({ message: 'a' });
|
|
64
|
+
batching.enqueueLog({ message: 'b' });
|
|
65
|
+
const target = broker();
|
|
66
|
+
yield batching.flushLogs();
|
|
67
|
+
expect(target.sendToQueue).toHaveBeenCalledWith('platform.logs', [{ message: 'a' }, { message: 'b' }], expect.anything());
|
|
68
|
+
expect(target.sendToQueue).toHaveBeenCalledTimes(1);
|
|
69
|
+
expect(post).not.toHaveBeenCalled();
|
|
70
|
+
}));
|
|
71
|
+
it('falls back to HTTP with the same array if the broker fails', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
72
|
+
broker(jest.fn().mockRejectedValue(new Error('offline')));
|
|
73
|
+
batching.enqueueLog({ message: 'fallback' });
|
|
74
|
+
yield batching.flushLogs();
|
|
75
|
+
expect(post).toHaveBeenCalledWith('/v1/logs', [{ message: 'fallback' }]);
|
|
76
|
+
}));
|
|
77
|
+
it('waits for an active send before sending the next array', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
78
|
+
let confirm;
|
|
79
|
+
const send = jest
|
|
80
|
+
.fn()
|
|
81
|
+
.mockImplementationOnce(() => new Promise((resolve) => {
|
|
82
|
+
confirm = resolve;
|
|
83
|
+
}))
|
|
84
|
+
.mockResolvedValue(true);
|
|
85
|
+
broker(send);
|
|
86
|
+
batching.enqueueLog({ message: 'first' });
|
|
87
|
+
const first = batching.flushLogs();
|
|
88
|
+
yield Promise.resolve();
|
|
89
|
+
batching.enqueueLog({ message: 'second' });
|
|
90
|
+
const second = batching.flushLogs();
|
|
91
|
+
expect(send).toHaveBeenCalledTimes(1);
|
|
92
|
+
confirm();
|
|
93
|
+
yield Promise.all([first, second]);
|
|
94
|
+
expect(send).toHaveBeenCalledTimes(2);
|
|
95
|
+
}));
|
|
96
|
+
it('registers shutdown once, only when requested, and flushes pending logs', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
97
|
+
expect(process.listeners('SIGTERM')).toHaveLength(signals.SIGTERM.length);
|
|
98
|
+
batching.registerLoggingShutdown();
|
|
99
|
+
batching.registerLoggingShutdown();
|
|
100
|
+
expect(process.listeners('SIGTERM')).toHaveLength(signals.SIGTERM.length + 1);
|
|
101
|
+
batching.enqueueLog({ message: 'shutdown' });
|
|
102
|
+
process.listeners('SIGTERM').find((listener) => !signals.SIGTERM.includes(listener))('SIGTERM');
|
|
103
|
+
yield batching.flushLogs();
|
|
104
|
+
expect(post).toHaveBeenCalledTimes(1);
|
|
105
|
+
expect(post).toHaveBeenCalledWith('/v1/logs', [{ message: 'shutdown' }]);
|
|
106
|
+
}));
|
|
107
|
+
});
|
|
108
|
+
//# sourceMappingURL=batching.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"batching.spec.js","sourceRoot":"","sources":["../../src/logger/batching.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/logger/index.d.ts
CHANGED
package/lib/logger/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.LOG_LEVEL = void 0;
|
|
17
|
+
exports.registerLoggingShutdown = exports.flushLogs = exports.configureLogBatching = exports.LOG_LEVEL = void 0;
|
|
18
18
|
var LOG_LEVEL;
|
|
19
19
|
(function (LOG_LEVEL) {
|
|
20
20
|
LOG_LEVEL["ERROR"] = "error";
|
|
@@ -25,4 +25,8 @@ var LOG_LEVEL;
|
|
|
25
25
|
})(LOG_LEVEL || (exports.LOG_LEVEL = LOG_LEVEL = {}));
|
|
26
26
|
__exportStar(require("./null-logger"), exports);
|
|
27
27
|
__exportStar(require("./logger"), exports);
|
|
28
|
+
var batching_1 = require("./batching");
|
|
29
|
+
Object.defineProperty(exports, "configureLogBatching", { enumerable: true, get: function () { return batching_1.configureLogBatching; } });
|
|
30
|
+
Object.defineProperty(exports, "flushLogs", { enumerable: true, get: function () { return batching_1.flushLogs; } });
|
|
31
|
+
Object.defineProperty(exports, "registerLoggingShutdown", { enumerable: true, get: function () { return batching_1.registerLoggingShutdown; } });
|
|
28
32
|
//# sourceMappingURL=index.js.map
|
package/lib/logger/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logger/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,IAAY,SAMX;AAND,WAAY,SAAS;IACnB,4BAAe,CAAA;IACf,0BAAa,CAAA;IACb,0BAAa,CAAA;IACb,4BAAe,CAAA;IACf,kCAAqB,CAAA;AACvB,CAAC,EANW,SAAS,yBAAT,SAAS,QAMpB;AAgBD,gDAA8B;AAC9B,2CAAyB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logger/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,IAAY,SAMX;AAND,WAAY,SAAS;IACnB,4BAAe,CAAA;IACf,0BAAa,CAAA;IACb,0BAAa,CAAA;IACb,4BAAe,CAAA;IACf,kCAAqB,CAAA;AACvB,CAAC,EANW,SAAS,yBAAT,SAAS,QAMpB;AAgBD,gDAA8B;AAC9B,2CAAyB;AAEzB,uCAAsF;AAA7E,gHAAA,oBAAoB,OAAA;AAAE,qGAAA,SAAS,OAAA;AAAE,mHAAA,uBAAuB,OAAA"}
|
|
@@ -1,5 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
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 () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
3
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
4
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
5
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -10,31 +42,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
42
|
});
|
|
11
43
|
};
|
|
12
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
-
const logger_1 = require("./logger");
|
|
14
|
-
const utils_1 = require("../utils");
|
|
15
45
|
function testLogger() {
|
|
16
46
|
return __awaiter(this, void 0, void 0, function* () {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
});
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
warn: 1,
|
|
34
|
-
});
|
|
35
|
-
logger.out('Logging Debug Message', 'and anotheer', 'well 123', 456);
|
|
36
|
-
yield utils_1.HelperUtil.sleep(1000000000);
|
|
47
|
+
process.env.UTILITY_SERVICE_URL = process.env.UTILITY_SERVICE_URL || 'http://localhost:3034';
|
|
48
|
+
if (!process.env.UTILITY_SERVICE_URL) {
|
|
49
|
+
throw new Error('Set UTILITY_SERVICE_URL before running: UTILITY_SERVICE_URL=https://your-utility-service yarn test:logger');
|
|
50
|
+
}
|
|
51
|
+
const { Logger, configureLogBatching, flushLogs } = yield Promise.resolve().then(() => __importStar(require('./index')));
|
|
52
|
+
configureLogBatching({ batchSize: 100, flushIntervalMs: 1000 });
|
|
53
|
+
const first = new Logger({ service: 'logger-test', requestId: 'request-1' });
|
|
54
|
+
const second = new Logger({ service: 'logger-test', requestId: 'request-2' });
|
|
55
|
+
const total = 10000;
|
|
56
|
+
const started = Date.now();
|
|
57
|
+
for (let index = 0; index < total; index++) {
|
|
58
|
+
const logger = index % 2 === 0 ? first : second;
|
|
59
|
+
logger.info(`Test log ${index + 1}`, { sequence: index + 1, password: 'must-be-redacted' });
|
|
60
|
+
}
|
|
61
|
+
yield flushLogs();
|
|
62
|
+
console.log(`Queued ${total} logs and completed flushing in ${Date.now() - started}ms. Check utility-service for receipt.`);
|
|
37
63
|
});
|
|
38
64
|
}
|
|
39
|
-
testLogger()
|
|
65
|
+
testLogger().catch((error) => {
|
|
66
|
+
console.error(error.message);
|
|
67
|
+
process.exitCode = 1;
|
|
68
|
+
});
|
|
40
69
|
//# sourceMappingURL=logger-test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger-test.js","sourceRoot":"","sources":["../../src/logger/logger-test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger-test.js","sourceRoot":"","sources":["../../src/logger/logger-test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAe,UAAU;;QACvB,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,uBAAuB,CAAC;QAC7F,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,2GAA2G,CAAC,CAAC;QAC/H,CAAC;QAED,MAAM,EAAE,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,GAAG,wDAAa,SAAS,GAAC,CAAC;QAC5E,oBAAoB,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;QAC7E,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;QAE9E,MAAM,KAAK,GAAG,KAAK,CAAC;QACpB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC;YAC3C,MAAM,MAAM,GAAG,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;YAChD,MAAM,CAAC,IAAI,CAAC,YAAY,KAAK,GAAG,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,GAAG,CAAC,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAC,CAAC;QAC9F,CAAC;QACD,MAAM,SAAS,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,mCAAmC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,wCAAwC,CAAC,CAAC;IAC9H,CAAC;CAAA;AAED,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IAC3B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC"}
|
package/lib/logger/logger.js
CHANGED
|
@@ -5,17 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.logger = exports.Logger = exports.LoggerProps = void 0;
|
|
7
7
|
const index_1 = require("./index");
|
|
8
|
-
const lodash_1 = require("lodash");
|
|
9
8
|
const monitoring_1 = require("../monitoring");
|
|
10
|
-
const data_1 = require("../data");
|
|
11
9
|
const redact_1 = __importDefault(require("./redact"));
|
|
12
|
-
const
|
|
13
|
-
const _axios = axios_1.default.create({
|
|
14
|
-
baseURL: process.env.UTILITY_SERVICE_URL || 'http://utility-service',
|
|
15
|
-
headers: {
|
|
16
|
-
source: 'internal',
|
|
17
|
-
},
|
|
18
|
-
});
|
|
10
|
+
const batching_1 = require("./batching");
|
|
19
11
|
class LoggerProps {
|
|
20
12
|
constructor() {
|
|
21
13
|
this.service = process.env.APP_NAME || 'app';
|
|
@@ -45,6 +37,7 @@ class Logger {
|
|
|
45
37
|
requestSource: this.props.requestSource,
|
|
46
38
|
ip: this.props.ip,
|
|
47
39
|
url: this.props.url,
|
|
40
|
+
logsQueue: this.props.logsQueue,
|
|
48
41
|
};
|
|
49
42
|
}
|
|
50
43
|
static setMaskedFields(fields) {
|
|
@@ -67,7 +60,7 @@ class Logger {
|
|
|
67
60
|
log(level, message, data = {}, trace) {
|
|
68
61
|
var _a;
|
|
69
62
|
const result = `${level} -> ${(_a = this.props.requestId) !== null && _a !== void 0 ? _a : ''}`;
|
|
70
|
-
let payload = Object.assign(Object.assign(Object.assign({}, this.props), data), { level,
|
|
63
|
+
let payload = Object.assign(Object.assign(Object.assign({}, this.props), data), { timestamp: new Date().toISOString(), level,
|
|
71
64
|
message });
|
|
72
65
|
try {
|
|
73
66
|
payload = (0, redact_1.default)(payload, maskedFields, '[REDACTED]', { strict: false });
|
|
@@ -84,22 +77,11 @@ class Logger {
|
|
|
84
77
|
payload.stack = trace || new Error().stack;
|
|
85
78
|
this.out(this.logToRollbar(payload));
|
|
86
79
|
}
|
|
87
|
-
|
|
88
|
-
data_1.RabbitMQClient.sendToQueue(this.props.logsQueue || 'platform.logs', payload).catch((e) => {
|
|
89
|
-
console.error(e.message, payload);
|
|
90
|
-
return this.postHttp(payload);
|
|
91
|
-
});
|
|
92
|
-
this.out('====== log sent via broker =====');
|
|
93
|
-
return result;
|
|
94
|
-
}
|
|
95
|
-
this.postHttp(payload);
|
|
80
|
+
(0, batching_1.enqueueLog)(payload);
|
|
96
81
|
return result;
|
|
97
82
|
}
|
|
98
83
|
postHttp(payload) {
|
|
99
|
-
|
|
100
|
-
console.error(error.message, payload);
|
|
101
|
-
});
|
|
102
|
-
this.out('====== log sent via http =====');
|
|
84
|
+
(0, batching_1.enqueueLog)(payload);
|
|
103
85
|
return payload;
|
|
104
86
|
}
|
|
105
87
|
error(message, meta = {}, trace = '') {
|
package/lib/logger/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":"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"}
|
package/lib/logger/test.spec.js
CHANGED
|
@@ -1,4 +1,37 @@
|
|
|
1
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 () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
36
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
37
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -10,7 +43,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
43
|
};
|
|
11
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
45
|
process.env.UTILITY_SERVICE_URL = 'http://localhost:9999';
|
|
46
|
+
jest.mock('axios', () => {
|
|
47
|
+
const actual = jest.requireActual('axios');
|
|
48
|
+
return Object.assign(Object.assign({}, actual), { default: Object.assign(Object.assign({}, actual.default), { create: (config) => {
|
|
49
|
+
const client = actual.default.create(config);
|
|
50
|
+
client.post = jest.fn().mockResolvedValue({ data: true });
|
|
51
|
+
return client;
|
|
52
|
+
} }) });
|
|
53
|
+
});
|
|
13
54
|
const logger_1 = require("./logger");
|
|
55
|
+
const batching = __importStar(require("./batching"));
|
|
56
|
+
afterAll(() => batching.flushLogs());
|
|
14
57
|
describe('#test logger', function () {
|
|
15
58
|
let logger = new logger_1.Logger({
|
|
16
59
|
requestId: 'test-request-id',
|
|
@@ -21,6 +64,20 @@ describe('#test logger', function () {
|
|
|
21
64
|
it('Should Log an info', () => __awaiter(this, void 0, void 0, function* () {
|
|
22
65
|
expect(logger.info('This is an error from the package', { foo: 'bar' }, new Error().stack)).toBe('info -> test-request-id');
|
|
23
66
|
}));
|
|
67
|
+
it('adds a UTC timestamp before sending logs', () => {
|
|
68
|
+
const enqueue = jest.spyOn(batching, 'enqueueLog').mockImplementation(() => { });
|
|
69
|
+
const before = Date.now();
|
|
70
|
+
try {
|
|
71
|
+
logger.info('timestamp test');
|
|
72
|
+
const timestamp = enqueue.mock.calls[0][0].timestamp;
|
|
73
|
+
expect(new Date(timestamp).toISOString()).toBe(timestamp);
|
|
74
|
+
expect(Date.parse(timestamp)).toBeGreaterThanOrEqual(before);
|
|
75
|
+
expect(Date.parse(timestamp)).toBeLessThanOrEqual(Date.now());
|
|
76
|
+
}
|
|
77
|
+
finally {
|
|
78
|
+
enqueue.mockRestore();
|
|
79
|
+
}
|
|
80
|
+
});
|
|
24
81
|
it('Should Log a debug', () => __awaiter(this, void 0, void 0, function* () {
|
|
25
82
|
expect(logger.debug('This is an error from the package', { foo: 'bar' }, new Error().stack)).toBe('debug -> test-request-id');
|
|
26
83
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.spec.js","sourceRoot":"","sources":["../../src/logger/test.spec.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC
|
|
1
|
+
{"version":3,"file":"test.spec.js","sourceRoot":"","sources":["../../src/logger/test.spec.ts"],"names":[],"mappings":"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"}
|