nextrans-logger 0.1.15 → 0.2.5

package/.editorconfig

@@ -0,0 +1,10 @@
+root = true
+
+[*.{ts, js}]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*]
+quote_type = single

package/.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+  "editor.tabSize": 2,
+  "prettier.singleQuote": true,
+  "javascript.preferences.quoteStyle": "single",
+  "typescript.preferences.quoteStyle": "single"
+}

package/lib/index.cjs

@@ -7,8 +7,12 @@ require('dotenv').config();
 const winston_1 = require("winston");
 const winston_cloudwatch_1 = __importDefault(require("winston-cloudwatch"));
 const winston_slack_webhook_transport_1 = __importDefault(require("winston-slack-webhook-transport"));
+function sanitizePolicyData(string) {
+    return string.replace(/("amount|name|beneficiary_name")(.*?)(\,)/g, '$1: "******",');
+}
 function replaceAnsi(data) {
-    return data.replace(/[\u001b\u009b][[()#;?]*(?:\d{1,4}(?:;\d{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '');
+    const ansiiCodePattern = /[\u001b\u009b][[()#;?]*(?:\d{1,4}(?:;\d{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
+    return data.replace(ansiiCodePattern, '');
 }
 function formatMessage(log, env) {
     var _a, _b, _c;
@@ -46,12 +50,14 @@ function formatMessage(log, env) {
         message.push(log === null || log === void 0 ? void 0 : log.options);
     }
     const output = message
-        .map((data) => (typeof data === 'object' ? '\n```' + JSON.stringify(data, null, '\t') + '```' : `${data}`))
+        .map((data) => typeof data === 'object'
+        ? '\n```' + JSON.stringify(data, null, '\t') + '```'
+        : `${data}`)
         .join(' ');
-    return output;
+    return sanitizePolicyData(output);
 }
 class Logging {
-    constructor({ enable = false, slackWebhook, cloudwatchOption, env = 'DEVELOPMENT' }) {
+    constructor({ enable = false, slackWebhook, cloudwatchOption, env = 'DEVELOPMENT', }) {
         this.env = 'DEVELOPMENT';
         this.enable = false;
         this.env = env;
@@ -60,18 +66,22 @@ class Logging {
             this.slackWebhook = slackWebhook;
         if (cloudwatchOption && enable)
             this.cloudwatchOption = cloudwatchOption;
+        this.setLog();
     }
     lineFormat(log) {
         return formatMessage(log, this.env).replace(/`/g, '');
     }
-    formatPrint() {
-        return winston_1.format.combine(winston_1.format.colorize({ all: true, colors: { info: 'green', error: 'red', warn: 'yellow' } }), winston_1.format.errors({ stack: true }), winston_1.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), winston_1.format.printf((log) => this.lineFormat(log)));
+    formatPrint(...formats) {
+        return winston_1.format.combine(winston_1.format.errors({ stack: true }), winston_1.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), winston_1.format.printf((log) => this.lineFormat(log)), ...formats);
     }
-    log() {
+    setLog() {
         var _a, _b, _c, _d;
         const transportsData = [
             new winston_1.transports.Console({
-                format: winston_1.format.combine(winston_1.format.colorize(), this.formatPrint()),
+                format: this.formatPrint(winston_1.format.colorize({
+                    all: true,
+                    colors: { info: 'green', error: 'red', warn: 'yellow' },
+                })),
                 handleExceptions: true,
                 level: 'debug',
             }),
@@ -81,10 +91,14 @@ class Logging {
                 level,
                 webhookUrl: this.slackWebhook,
                 formatter: (log) => ({
-                    text: `:sos: ${replaceAnsi(formatMessage(log, this.env))}`,
+                    text: `:sos: ${formatMessage(log, this.env)}`,
                 }),
+                emitAxiosErrors: true,
+                handleRejections: false,
             });
-            transportsData.push(slack('error'));
+            transportsData.push(slack('error').on('error', () => {
+                console.log('Error when send slack message');
+            }));
         }
         const log = (0, winston_1.createLogger)({
             format: this.formatPrint(),
@@ -112,7 +126,82 @@ class Logging {
             };
             log.add(cloudwatch());
         }
-        return log;
+        this.log = log;
+    }
+    format(args) {
+        return args
+            .map((arg) => {
+            try {
+                if (arg instanceof Error) {
+                    let logString = arg.message;
+                    logString += '\n';
+                    logString += '```' + (arg === null || arg === void 0 ? void 0 : arg.stack) + '```';
+                    return logString;
+                }
+                // @ts-ignore
+                if (typeof (arg === null || arg === void 0 ? void 0 : arg.status) === 'number') {
+                    return JSON.stringify({
+                        // @ts-ignore
+                        status: arg.status,
+                        // @ts-ignore
+                        data: arg.data,
+                    }, null, '\t');
+                }
+                if (typeof arg === 'object') {
+                    return JSON.stringify(arg, null, '\t');
+                }
+                if (typeof arg === 'number') {
+                    return arg.toString();
+                }
+                if (typeof arg === 'string') {
+                    return arg;
+                }
+                return undefined;
+            }
+            catch (err) {
+                return undefined;
+            }
+        })
+            .filter((d) => typeof d === 'string')
+            .join(': ');
+    }
+    error(...args) {
+        if (!this.log)
+            this.setLog();
+        if (process.env.NODE_ENV !== 'test') {
+            this.log.error(this.format(args));
+        }
+    }
+    info(...args) {
+        if (!this.log)
+            this.setLog();
+        if (process.env.NODE_ENV !== 'test') {
+            this.log.info(this.format(args));
+        }
+    }
+    warning(...args) {
+        if (!this.log)
+            this.setLog();
+        if (process.env.NODE_ENV !== 'test') {
+            this.log.warning(this.format(args));
+        }
+    }
+    warn(...args) {
+        if (!this.log)
+            this.setLog();
+        if (process.env.NODE_ENV !== 'test') {
+            this.log.warn(this.format(args));
+        }
+    }
+    debug(...args) {
+        if (!this.log)
+            this.setLog();
+        if (process.env.NODE_ENV !== 'test') {
+            this.log.debug(this.format(args));
+        }
+        else {
+            return this.format(args);
+        }
     }
 }
 exports.default = Logging;

package/lib/index.d.ts

@@ -1,3 +1,5 @@
+import * as logform from 'logform';
+import winston from 'winston';
 import { LogObject } from 'winston-cloudwatch';
 export type ErrorType = 'error' | 'info' | 'warn' | 'debug';
 export interface CloudwatchOptions {
@@ -20,8 +22,15 @@ export default class Logging {
     protected enable: boolean;
     protected slackWebhook?: string;
     protected cloudwatchOption?: CloudwatchOptions;
-    constructor({ enable, slackWebhook, cloudwatchOption, env }: LoggingOptions);
+    protected log: winston.Logger;
+    constructor({ enable, slackWebhook, cloudwatchOption, env, }: LoggingOptions);
     protected lineFormat(log: LogObject): string;
-    protected formatPrint(): import("logform").Format;
-    log(): import("winston").Logger;
+    protected formatPrint(...formats: logform.Format[]): logform.Format;
+    protected setLog(): void;
+    protected format(args: unknown[]): string;
+    error(...args: unknown[]): void;
+    info(...args: unknown[]): void;
+    warning(...args: unknown[]): void;
+    warn(...args: unknown[]): void;
+    debug(...args: unknown[]): string | undefined;
 }

package/lib/index.js

@@ -2,8 +2,12 @@ require('dotenv').config();
 import { createLogger, format, transports } from 'winston';
 import WinstonCloudwatch from 'winston-cloudwatch';
 import SlackHook from 'winston-slack-webhook-transport';
+function sanitizePolicyData(string) {
+    return string.replace(/("amount|name|beneficiary_name")(.*?)(\,)/g, '$1: "******",');
+}
 function replaceAnsi(data) {
-    return data.replace(/[\u001b\u009b][[()#;?]*(?:\d{1,4}(?:;\d{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '');
+    const ansiiCodePattern = /[\u001b\u009b][[()#;?]*(?:\d{1,4}(?:;\d{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
+    return data.replace(ansiiCodePattern, '');
 }
 function formatMessage(log, env) {
     const message = [];
@@ -40,33 +44,40 @@ function formatMessage(log, env) {
         message.push(log?.options);
     }
     const output = message
-        .map((data) => (typeof data === 'object' ? '\n```' + JSON.stringify(data, null, '\t') + '```' : `${data}`))
+        .map((data) => typeof data === 'object'
+        ? '\n```' + JSON.stringify(data, null, '\t') + '```'
+        : `${data}`)
         .join(' ');
-    return output;
+    return sanitizePolicyData(output);
 }
 export default class Logging {
     env = 'DEVELOPMENT';
     enable = false;
     slackWebhook;
     cloudwatchOption;
-    constructor({ enable = false, slackWebhook, cloudwatchOption, env = 'DEVELOPMENT' }) {
+    log;
+    constructor({ enable = false, slackWebhook, cloudwatchOption, env = 'DEVELOPMENT', }) {
         this.env = env;
         this.enable = enable;
         if (slackWebhook && enable)
             this.slackWebhook = slackWebhook;
         if (cloudwatchOption && enable)
             this.cloudwatchOption = cloudwatchOption;
+        this.setLog();
     }
     lineFormat(log) {
         return formatMessage(log, this.env).replace(/`/g, '');
     }
-    formatPrint() {
-        return format.combine(format.colorize({ all: true, colors: { info: 'green', error: 'red', warn: 'yellow' } }), format.errors({ stack: true }), format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), format.printf((log) => this.lineFormat(log)));
+    formatPrint(...formats) {
+        return format.combine(format.errors({ stack: true }), format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), format.printf((log) => this.lineFormat(log)), ...formats);
     }
-    log() {
+    setLog() {
         const transportsData = [
             new transports.Console({
-                format: format.combine(format.colorize(), this.formatPrint()),
+                format: this.formatPrint(format.colorize({
+                    all: true,
+                    colors: { info: 'green', error: 'red', warn: 'yellow' },
+                })),
                 handleExceptions: true,
                 level: 'debug',
             }),
@@ -76,10 +87,14 @@ export default class Logging {
                 level,
                 webhookUrl: this.slackWebhook,
                 formatter: (log) => ({
-                    text: `:sos: ${replaceAnsi(formatMessage(log, this.env))}`,
+                    text: `:sos: ${formatMessage(log, this.env)}`,
                 }),
+                emitAxiosErrors: true,
+                handleRejections: false,
             });
-            transportsData.push(slack('error'));
+            transportsData.push(slack('error').on('error', () => {
+                console.log('Error when send slack message');
+            }));
         }
         const log = createLogger({
             format: this.formatPrint(),
@@ -104,6 +119,81 @@ export default class Logging {
             });
             log.add(cloudwatch());
         }
-        return log;
+        this.log = log;
+    }
+    format(args) {
+        return args
+            .map((arg) => {
+            try {
+                if (arg instanceof Error) {
+                    let logString = arg.message;
+                    logString += '\n';
+                    logString += '```' + arg?.stack + '```';
+                    return logString;
+                }
+                // @ts-ignore
+                if (typeof arg?.status === 'number') {
+                    return JSON.stringify({
+                        // @ts-ignore
+                        status: arg.status,
+                        // @ts-ignore
+                        data: arg.data,
+                    }, null, '\t');
+                }
+                if (typeof arg === 'object') {
+                    return JSON.stringify(arg, null, '\t');
+                }
+                if (typeof arg === 'number') {
+                    return arg.toString();
+                }
+                if (typeof arg === 'string') {
+                    return arg;
+                }
+                return undefined;
+            }
+            catch (err) {
+                return undefined;
+            }
+        })
+            .filter((d) => typeof d === 'string')
+            .join(': ');
+    }
+    error(...args) {
+        if (!this.log)
+            this.setLog();
+        if (process.env.NODE_ENV !== 'test') {
+            this.log.error(this.format(args));
+        }
+    }
+    info(...args) {
+        if (!this.log)
+            this.setLog();
+        if (process.env.NODE_ENV !== 'test') {
+            this.log.info(this.format(args));
+        }
+    }
+    warning(...args) {
+        if (!this.log)
+            this.setLog();
+        if (process.env.NODE_ENV !== 'test') {
+            this.log.warning(this.format(args));
+        }
+    }
+    warn(...args) {
+        if (!this.log)
+            this.setLog();
+        if (process.env.NODE_ENV !== 'test') {
+            this.log.warn(this.format(args));
+        }
+    }
+    debug(...args) {
+        if (!this.log)
+            this.setLog();
+        if (process.env.NODE_ENV !== 'test') {
+            this.log.debug(this.format(args));
+        }
+        else {
+            return this.format(args);
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nextrans-logger",
-	"version": "0.1.15",
+	"version": "0.2.5",
 	"description": "Logging for nextrans app service",
 	"main": "lib/index.cjs",
 	"module": "lib/index.js",
@@ -14,11 +14,12 @@
 	"author": "nextrans-team",
 	"license": "ISC",
 	"dependencies": {
-		"@aws-sdk/client-cloudwatch-logs": "^3.290.0",
+		"@aws-sdk/client-cloudwatch-logs": "^3.347.0",
 		"moment": "^2.29.4",
 		"winston": "^3.8.2",
 		"winston-cloudwatch": "^6.1.1",
-		"winston-slack-webhook-transport": "^2.2.3"
+		"winston-slack-webhook-transport": "^2.2.3",
+		"axios": "^1.5.0"
 	},
 	"devDependencies": {
 		"@types/jest": "^29.4.0",