@6thbridge/utils 1.9.0-1 → 1.9.0-2

package/lib/logger/batching.js

@@ -0,0 +1,90 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.configureLogBatching = configureLogBatching;
+exports.enqueueLog = enqueueLog;
+exports.flushLogs = flushLogs;
+exports.registerLoggingShutdown = registerLoggingShutdown;
+const axios_1 = __importDefault(require("axios"));
+const rabbitmq_1 = require("../data/rabbitmq");
+const http = axios_1.default.create({
+    baseURL: process.env.UTILITY_SERVICE_URL || 'http://utility-service',
+    headers: { source: 'internal' },
+    timeout: 2000,
+});
+let messages = [];
+let timer;
+let flushing = Promise.resolve();
+let batchSize = 100;
+let flushIntervalMs = 1000;
+let shutdownRegistered = false;
+function configureLogBatching(options) {
+    var _a, _b;
+    for (const value of Object.values(options)) {
+        if (!Number.isSafeInteger(value) || value <= 0)
+            throw new Error('Log batching limits must be positive integers');
+    }
+    batchSize = (_a = options.batchSize) !== null && _a !== void 0 ? _a : batchSize;
+    flushIntervalMs = (_b = options.flushIntervalMs) !== null && _b !== void 0 ? _b : flushIntervalMs;
+}
+function enqueueLog(payload) {
+    messages.push(payload);
+    if (messages.length >= batchSize) {
+        void flushLogs();
+    }
+    else if (!timer) {
+        timer = setTimeout(() => {
+            void flushLogs();
+        }, flushIntervalMs);
+        timer.unref();
+    }
+}
+function flushLogs() {
+    if (timer) {
+        clearTimeout(timer);
+        timer = undefined;
+    }
+    const batch = messages;
+    messages = [];
+    if (!batch.length)
+        return flushing;
+    // Count, timer, and manual flushes share the same send operation chain.
+    flushing = flushing.then(() => __awaiter(this, void 0, void 0, function* () {
+        const broker = rabbitmq_1.RabbitMQClient.hasInstance() ? rabbitmq_1.RabbitMQClient.getInstance() : undefined;
+        try {
+            if (broker) {
+                try {
+                    yield broker.sendToQueue('platform.logs', batch, { persistent: true, timeout: 2000 });
+                    return;
+                }
+                catch (_a) {
+                    console.error('Log queue send failed; falling back to HTTP');
+                }
+            }
+            yield http.post('/v1/logs', batch);
+        }
+        catch (error) {
+            console.error('Failed to send logs', error.message);
+        }
+    }));
+    return flushing;
+}
+function registerLoggingShutdown() {
+    if (shutdownRegistered)
+        return;
+    shutdownRegistered = true;
+    process.once('SIGTERM', flushLogs);
+    process.once('SIGINT', flushLogs);
+}
+//# sourceMappingURL=batching.js.map

package/lib/logger/batching.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"batching.js","sourceRoot":"","sources":["../../src/logger/batching.ts"],"names":[],"mappings":"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"}

package/lib/logger/batching.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/logger/batching.spec.js

@@ -0,0 +1,108 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+jest.mock('axios', () => ({ __esModule: true, default: { create: jest.fn(() => ({ post: jest.fn().mockResolvedValue({ status: 202 }) })) } }));
+jest.mock('../data/rabbitmq', () => ({ RabbitMQClient: { hasInstance: jest.fn().mockReturnValue(false), getInstance: jest.fn() } }));
+describe('log array batching', () => {
+    let batching;
+    let post;
+    let rabbit;
+    let signals;
+    const broker = (sendToQueue = jest.fn().mockResolvedValue(true)) => {
+        const instance = { sendToQueue };
+        rabbit.hasInstance.mockReturnValue(true);
+        rabbit.getInstance.mockReturnValue(instance);
+        return instance;
+    };
+    beforeEach(() => {
+        jest.useFakeTimers();
+        jest.resetModules();
+        signals = { SIGTERM: process.listeners('SIGTERM'), SIGINT: process.listeners('SIGINT') };
+        batching = require('./batching');
+        rabbit = require('../data/rabbitmq').RabbitMQClient;
+        post = require('axios').default.create.mock.results[0].value.post;
+    });
+    afterEach(() => __awaiter(void 0, void 0, void 0, function* () {
+        yield batching.flushLogs();
+        for (const signal of ['SIGTERM', 'SIGINT']) {
+            for (const listener of process.listeners(signal)) {
+                if (!signals[signal].includes(listener))
+                    process.removeListener(signal, listener);
+            }
+        }
+        jest.useRealTimers();
+    }));
+    it('sends the accumulated array at the count threshold', () => __awaiter(void 0, void 0, void 0, function* () {
+        batching.configureLogBatching({ batchSize: 2 });
+        const target = broker();
+        batching.enqueueLog({ message: 'first' });
+        expect(target.sendToQueue).not.toHaveBeenCalled();
+        batching.enqueueLog({ message: 'second' });
+        yield batching.flushLogs();
+        expect(target.sendToQueue).toHaveBeenCalledWith('platform.logs', [{ message: 'first' }, { message: 'second' }], {
+            persistent: true,
+            timeout: 2000,
+        });
+        expect(target.sendToQueue).toHaveBeenCalledTimes(1);
+    }));
+    it('sends a partial array through HTTP on the timer', () => __awaiter(void 0, void 0, void 0, function* () {
+        batching.enqueueLog({ message: 'partial' });
+        yield jest.advanceTimersByTimeAsync(1000);
+        expect(post).toHaveBeenCalledWith('/v1/logs', [{ message: 'partial' }]);
+        expect(rabbit.getInstance).not.toHaveBeenCalled();
+    }));
+    it('chooses the available broker at flush time and sends the whole array', () => __awaiter(void 0, void 0, void 0, function* () {
+        batching.enqueueLog({ message: 'a' });
+        batching.enqueueLog({ message: 'b' });
+        const target = broker();
+        yield batching.flushLogs();
+        expect(target.sendToQueue).toHaveBeenCalledWith('platform.logs', [{ message: 'a' }, { message: 'b' }], expect.anything());
+        expect(target.sendToQueue).toHaveBeenCalledTimes(1);
+        expect(post).not.toHaveBeenCalled();
+    }));
+    it('falls back to HTTP with the same array if the broker fails', () => __awaiter(void 0, void 0, void 0, function* () {
+        broker(jest.fn().mockRejectedValue(new Error('offline')));
+        batching.enqueueLog({ message: 'fallback' });
+        yield batching.flushLogs();
+        expect(post).toHaveBeenCalledWith('/v1/logs', [{ message: 'fallback' }]);
+    }));
+    it('waits for an active send before sending the next array', () => __awaiter(void 0, void 0, void 0, function* () {
+        let confirm;
+        const send = jest
+            .fn()
+            .mockImplementationOnce(() => new Promise((resolve) => {
+            confirm = resolve;
+        }))
+            .mockResolvedValue(true);
+        broker(send);
+        batching.enqueueLog({ message: 'first' });
+        const first = batching.flushLogs();
+        yield Promise.resolve();
+        batching.enqueueLog({ message: 'second' });
+        const second = batching.flushLogs();
+        expect(send).toHaveBeenCalledTimes(1);
+        confirm();
+        yield Promise.all([first, second]);
+        expect(send).toHaveBeenCalledTimes(2);
+    }));
+    it('registers shutdown once, only when requested, and flushes pending logs', () => __awaiter(void 0, void 0, void 0, function* () {
+        expect(process.listeners('SIGTERM')).toHaveLength(signals.SIGTERM.length);
+        batching.registerLoggingShutdown();
+        batching.registerLoggingShutdown();
+        expect(process.listeners('SIGTERM')).toHaveLength(signals.SIGTERM.length + 1);
+        batching.enqueueLog({ message: 'shutdown' });
+        process.listeners('SIGTERM').find((listener) => !signals.SIGTERM.includes(listener))('SIGTERM');
+        yield batching.flushLogs();
+        expect(post).toHaveBeenCalledTimes(1);
+        expect(post).toHaveBeenCalledWith('/v1/logs', [{ message: 'shutdown' }]);
+    }));
+});
+//# sourceMappingURL=batching.spec.js.map

package/lib/logger/batching.spec.js.map

@@ -0,0 +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

@@ -20,3 +20,4 @@ export interface LoggerInterface {
 }
 export * from './null-logger';
 export * from './logger';
+export { configureLogBatching, flushLogs, registerLoggingShutdown } from './batching';

package/lib/logger/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LOG_LEVEL = void 0;
+exports.registerLoggingShutdown = exports.flushLogs = exports.configureLogBatching = exports.LOG_LEVEL = void 0;
 var LOG_LEVEL;
 (function (LOG_LEVEL) {
     LOG_LEVEL["ERROR"] = "error";
@@ -25,4 +25,8 @@ var LOG_LEVEL;
 })(LOG_LEVEL || (exports.LOG_LEVEL = LOG_LEVEL = {}));
 __exportStar(require("./null-logger"), exports);
 __exportStar(require("./logger"), exports);
+var batching_1 = require("./batching");
+Object.defineProperty(exports, "configureLogBatching", { enumerable: true, get: function () { return batching_1.configureLogBatching; } });
+Object.defineProperty(exports, "flushLogs", { enumerable: true, get: function () { return batching_1.flushLogs; } });
+Object.defineProperty(exports, "registerLoggingShutdown", { enumerable: true, get: function () { return batching_1.registerLoggingShutdown; } });
 //# sourceMappingURL=index.js.map

package/lib/logger/index.js.map

@@ -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"}
+{"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"}

package/lib/logger/logger-test.js

@@ -1,5 +1,37 @@
 "use strict";
-//ts-node test.ts
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,31 +42,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("./logger");
-const utils_1 = require("../utils");
 function testLogger() {
     return __awaiter(this, void 0, void 0, function* () {
-        const logger = new logger_1.Logger({
-            requestId: '123',
-            requestClientId: 'client-id',
-            contextClientId: 'context-client-id',
-            level: 'info',
-        });
-        logger.info('Another info message', {
-            info: 1,
-        });
-        logger.critical('Another critical message', {
-            critical: 1,
-        });
-        logger.error('Another error message', {
-            error: 1,
-        }, 'stack trace here');
-        logger.warn('Another warn message', {
-            warn: 1,
-        });
-        logger.out('Logging Debug Message', 'and anotheer', 'well 123', 456);
-        yield utils_1.HelperUtil.sleep(1000000000);
+        process.env.UTILITY_SERVICE_URL = process.env.UTILITY_SERVICE_URL || 'http://localhost:3034';
+        if (!process.env.UTILITY_SERVICE_URL) {
+            throw new Error('Set UTILITY_SERVICE_URL before running: UTILITY_SERVICE_URL=https://your-utility-service yarn test:logger');
+        }
+        const { Logger, configureLogBatching, flushLogs } = yield Promise.resolve().then(() => __importStar(require('./index')));
+        configureLogBatching({ batchSize: 100, flushIntervalMs: 1000 });
+        const first = new Logger({ service: 'logger-test', requestId: 'request-1' });
+        const second = new Logger({ service: 'logger-test', requestId: 'request-2' });
+        const total = 10000;
+        const started = Date.now();
+        for (let index = 0; index < total; index++) {
+            const logger = index % 2 === 0 ? first : second;
+            logger.info(`Test log ${index + 1}`, { sequence: index + 1, password: 'must-be-redacted' });
+        }
+        yield flushLogs();
+        console.log(`Queued ${total} logs and completed flushing in ${Date.now() - started}ms. Check utility-service for receipt.`);
     });
 }
-testLogger();
+testLogger().catch((error) => {
+    console.error(error.message);
+    process.exitCode = 1;
+});
 //# sourceMappingURL=logger-test.js.map

package/lib/logger/logger-test.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger-test.js","sourceRoot":"","sources":["../../src/logger/logger-test.ts"],"names":[],"mappings":";AAAA,iBAAiB;;;;;;;;;;;AAEjB,qCAAkC;AAClC,oCAAoC;AAEpC,SAAe,UAAU;;QACvB,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC;YACxB,SAAS,EAAE,KAAK;YAChB,eAAe,EAAE,WAAW;YAC5B,eAAe,EAAE,mBAAmB;YACpC,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAClC,IAAI,EAAE,CAAC;SACR,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,0BAA0B,EAAE;YAC1C,QAAQ,EAAE,CAAC;SACZ,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CACV,uBAAuB,EACvB;YACE,KAAK,EAAE,CAAC;SACT,EACD,kBAAkB,CACnB,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAClC,IAAI,EAAE,CAAC;SACR,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;QACrE,MAAM,kBAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;CAAA;AAED,UAAU,EAAE,CAAC"}
+{"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

@@ -5,17 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logger = exports.Logger = exports.LoggerProps = void 0;
 const index_1 = require("./index");
-const lodash_1 = require("lodash");
 const monitoring_1 = require("../monitoring");
-const data_1 = require("../data");
 const redact_1 = __importDefault(require("./redact"));
-const axios_1 = __importDefault(require("axios"));
-const _axios = axios_1.default.create({
-    baseURL: process.env.UTILITY_SERVICE_URL || 'http://utility-service',
-    headers: {
-        source: 'internal',
-    },
-});
+const batching_1 = require("./batching");
 class LoggerProps {
     constructor() {
         this.service = process.env.APP_NAME || 'app';
@@ -26,6 +18,9 @@ exports.LoggerProps = LoggerProps;
 const maskedFields = [
     'client-secret',
     'authorization',
+    'api-key',
+    'pin',
+    'security-pin',
     'x-api-key',
     'password'
 ];
@@ -42,6 +37,7 @@ class Logger {
             requestSource: this.props.requestSource,
             ip: this.props.ip,
             url: this.props.url,
+            logsQueue: this.props.logsQueue,
         };
     }
     static setMaskedFields(fields) {
@@ -64,7 +60,7 @@ class Logger {
     log(level, message, data = {}, trace) {
         var _a;
         const result = `${level} -> ${(_a = this.props.requestId) !== null && _a !== void 0 ? _a : ''}`;
-        let payload = Object.assign(Object.assign(Object.assign({}, this.props), data), { level,
+        let payload = Object.assign(Object.assign(Object.assign({}, this.props), data), { timestamp: new Date().toISOString(), level,
             message });
         try {
             payload = (0, redact_1.default)(payload, maskedFields, '[REDACTED]', { strict: false });
@@ -81,22 +77,11 @@ class Logger {
             payload.stack = trace || new Error().stack;
             this.out(this.logToRollbar(payload));
         }
-        if (!(0, lodash_1.isEmpty)(this.broker)) {
-            data_1.RabbitMQClient.sendToQueue(this.props.logsQueue || 'platform.logs', payload).catch((e) => {
-                console.error(e.message, payload);
-                return this.postHttp(payload);
-            });
-            this.out('====== log sent via broker =====');
-            return result;
-        }
-        this.postHttp(payload);
+        (0, batching_1.enqueueLog)(payload);
         return result;
     }
     postHttp(payload) {
-        _axios.post('/v1/logs', payload).catch((error) => {
-            console.error(error.message, payload);
-        });
-        this.out('====== log sent via http =====');
+        (0, batching_1.enqueueLog)(payload);
         return payload;
     }
     error(message, meta = {}, trace = '') {

package/lib/logger/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger/logger.ts"],"names":[],"mappings":"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"}

package/lib/logger/redact.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = redact;
 // Yoinked from lodash to save dependencies
 function isObject(value) {
     const type = typeof value;
@@ -65,5 +66,4 @@ function redact(target, keywords, replaceVal, config) {
         }, {});
     }
 }
-exports.default = redact;
 //# sourceMappingURL=redact.js.map

package/lib/logger/redact.js.map

@@ -1 +1 @@
-{"version":3,"file":"redact.js","sourceRoot":"","sources":["../../src/logger/redact.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"redact.js","sourceRoot":"","sources":["../../src/logger/redact.ts"],"names":[],"mappings":"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"}

package/lib/logger/test.spec.js

@@ -1,4 +1,37 @@
 'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,7 +43,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 process.env.UTILITY_SERVICE_URL = 'http://localhost:9999';
+jest.mock('axios', () => {
+    const actual = jest.requireActual('axios');
+    return Object.assign(Object.assign({}, actual), { default: Object.assign(Object.assign({}, actual.default), { create: (config) => {
+                const client = actual.default.create(config);
+                client.post = jest.fn().mockResolvedValue({ data: true });
+                return client;
+            } }) });
+});
 const logger_1 = require("./logger");
+const batching = __importStar(require("./batching"));
+afterAll(() => batching.flushLogs());
 describe('#test logger', function () {
     let logger = new logger_1.Logger({
         requestId: 'test-request-id',
@@ -21,6 +64,20 @@ describe('#test logger', function () {
     it('Should Log an info', () => __awaiter(this, void 0, void 0, function* () {
         expect(logger.info('This is an error from the package', { foo: 'bar' }, new Error().stack)).toBe('info -> test-request-id');
     }));
+    it('adds a UTC timestamp before sending logs', () => {
+        const enqueue = jest.spyOn(batching, 'enqueueLog').mockImplementation(() => { });
+        const before = Date.now();
+        try {
+            logger.info('timestamp test');
+            const timestamp = enqueue.mock.calls[0][0].timestamp;
+            expect(new Date(timestamp).toISOString()).toBe(timestamp);
+            expect(Date.parse(timestamp)).toBeGreaterThanOrEqual(before);
+            expect(Date.parse(timestamp)).toBeLessThanOrEqual(Date.now());
+        }
+        finally {
+            enqueue.mockRestore();
+        }
+    });
     it('Should Log a debug', () => __awaiter(this, void 0, void 0, function* () {
         expect(logger.debug('This is an error from the package', { foo: 'bar' }, new Error().stack)).toBe('debug -> test-request-id');
     }));

package/lib/logger/test.spec.js.map

@@ -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,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"}
+{"version":3,"file":"test.spec.js","sourceRoot":"","sources":["../../src/logger/test.spec.ts"],"names":[],"mappings":"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"}

package/lib/middlewares/common.js

@@ -9,7 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonMiddleware = exports.unless = exports.emptyMiddleware = exports.AUTHENTICATION_TYPES = void 0;
+exports.CommonMiddleware = exports.AUTHENTICATION_TYPES = void 0;
+exports.emptyMiddleware = emptyMiddleware;
+exports.unless = unless;
 const types_1 = require("../types");
 const lodash_1 = require("lodash");
 const logger_1 = require("../logger");
@@ -30,7 +32,6 @@ function emptyMiddleware(req, res, next) {
     logger_1.logger.out("Passing through an empty Middleware");
     return next();
 }
-exports.emptyMiddleware = emptyMiddleware;
 function unless(middlewareName, paths, middleware) {
     if (!middleware)
         return emptyMiddleware;
@@ -47,17 +48,16 @@ function unless(middlewareName, paths, middleware) {
         return middleware(req, res, next);
     };
 }
-exports.unless = unless;
 class CommonMiddleware {
     static processAuthorizationCheck(req) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c, _d, _e;
             // const clientId = req.headers.client_id || req.headers["client-id"] || req.cookies.bridge_client_id;
-            const clientId = req.headers['client-id'] || req.headers['request-client-id'] || req.cookies['request-client-id'];
+            const clientId = ((_a = req.headers) === null || _a === void 0 ? void 0 : _a['client-id']) || ((_b = req.headers) === null || _b === void 0 ? void 0 : _b['request-client-id']) || ((_c = req.cookies) === null || _c === void 0 ? void 0 : _c['request-client-id']);
             //request-client is who is making the request.
             //context-client is the client we are we working on. this is for clients that have sub clients
             const payload = {
-                domain: (_a = (req.headers['origin'] || req.headers['referer'])) === null || _a === void 0 ? void 0 : _a.split('/')[2],
+                domain: (_d = (req.headers['origin'] || req.headers['referer'])) === null || _d === void 0 ? void 0 : _d.split('/')[2],
                 secret: (req.headers.secret || req.headers['client-secret']),
                 requestClientId: clientId,
                 contextClientId: req.body.clientId || req.headers['context-client-id'] || clientId,
@@ -74,7 +74,7 @@ class CommonMiddleware {
                 payload.contextClientId = req.query.clientId;
             }
             // let token = req.headers["authorization"]|| req.body.token || req.cookies.bridge_auth;
-            let token = req.headers['authorization'] || req.body.token || ((_b = req.cookies) === null || _b === void 0 ? void 0 : _b['auth-token']);
+            let token = req.headers['authorization'] || req.body.token || ((_e = req.cookies) === null || _e === void 0 ? void 0 : _e['auth-token']);
             if (token && token !== 'undefined') {
                 payload.token = token.replace('Bearer ', '');
             }