@riocrypto/common-server 1.0.1894 → 1.0.1896

package/build/services/logger.d.ts

@@ -1,10 +1,13 @@
 import { Logger } from "winston";
 declare class LoggerService {
+    private static instance;
     private logger;
-    constructor();
+    private constructor();
     private maskValue;
     private maskSensitiveData;
+    private requestMethodFilter;
     getLogger(): Logger;
+    static getInstance(): LoggerService;
     initLogger(): Promise<void>;
 }
 declare const loggerService: LoggerService;

package/build/services/logger.js

@@ -1,4 +1,27 @@
 "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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __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) {
@@ -8,14 +31,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const common_1 = require("@riocrypto/common");
 const winston_1 = require("winston");
 class LoggerService {
     constructor() {
         this.maskSensitiveData = (0, winston_1.format)((info) => {
+            var _a, _b, _c, _d, _e, _f;
             // Mask sensitive headers
-            if (info.meta && info.meta.req && info.meta.req.headers) {
+            if ((_b = (_a = info.meta) === null || _a === void 0 ? void 0 : _a.req) === null || _b === void 0 ? void 0 : _b.headers) {
                 const headers = info.meta.req.headers;
                 const headerKeysToMask = [
                     "x-api-key",
@@ -24,7 +58,7 @@ class LoggerService {
                 ];
                 headerKeysToMask.forEach((key) => {
                     if (headers[key]) {
-                        headers[key] = this.maskValue(headers[key]); // Use maskValue function
+                        headers[key] = this.maskValue(headers[key]);
                     }
                 });
                 // Mask cookies specifically
@@ -33,20 +67,23 @@ class LoggerService {
                         .split("; ")
                         .map((cookie) => {
                         const [key, value] = cookie.split("=");
-                        if (key === "accessToken" ||
-                            key === "adminAccessToken" ||
-                            key === "refreshToken" ||
-                            key === "adminRefreshToken" ||
-                            key === "phoneVerifiedJWT") {
-                            return `${key}=${this.maskValue(value)}`; // Mask the sensitive cookie
+                        const sensitiveCookies = [
+                            "accessToken",
+                            "adminAccessToken",
+                            "refreshToken",
+                            "adminRefreshToken",
+                            "phoneVerifiedJWT",
+                        ];
+                        if (sensitiveCookies.includes(key)) {
+                            return `${key}=${this.maskValue(value)}`;
                         }
-                        return cookie; // Return unmodified if not sensitive
+                        return cookie;
                     })
                         .join("; ");
                 }
             }
             // Mask sensitive request body fields
-            if (info.meta && info.meta.req && info.meta.req.body) {
+            if ((_d = (_c = info.meta) === null || _c === void 0 ? void 0 : _c.req) === null || _d === void 0 ? void 0 : _d.body) {
                 const requestBodyFieldsToMask = [
                     "password",
                     "newPassword",
@@ -56,21 +93,33 @@ class LoggerService {
                 ];
                 requestBodyFieldsToMask.forEach((field) => {
                     if (info.meta.req.body.hasOwnProperty(field)) {
-                        info.meta.req.body[field] = this.maskValue(info.meta.req.body[field]); // Use maskValue function
+                        info.meta.req.body[field] = this.maskValue(info.meta.req.body[field]);
                     }
                 });
             }
             // Mask sensitive response body fields
-            if (info.meta && info.meta.res && info.meta.res.body) {
-                const responseBodyFieldsToMask = ["secret", "value"];
+            if ((_f = (_e = info.meta) === null || _e === void 0 ? void 0 : _e.res) === null || _f === void 0 ? void 0 : _f.body) {
+                const responseBodyFieldsToMask = ["secret", "sensitiveValue"];
                 responseBodyFieldsToMask.forEach((field) => {
                     if (info.meta.res.body.hasOwnProperty(field)) {
-                        info.meta.res.body[field] = this.maskValue(info.meta.res.body[field]); // Use maskValue function
+                        info.meta.res.body[field] = this.maskValue(info.meta.res.body[field]);
                     }
                 });
             }
             return info;
         });
+        this.requestMethodFilter = (0, winston_1.format)((info) => {
+            var _a, _b;
+            const allowedMethods = ((_a = process.env.LOG_METHODS) === null || _a === void 0 ? void 0 : _a.split(",")) || [
+                "POST",
+                "PATCH",
+                "DELETE",
+            ];
+            if (((_b = info.meta) === null || _b === void 0 ? void 0 : _b.req) && allowedMethods.includes(info.meta.req.method)) {
+                return info;
+            }
+            return false; // Filter out logs for other methods
+        });
         this.logger = null;
     }
     maskValue(value) {
@@ -80,35 +129,43 @@ class LoggerService {
     }
     getLogger() {
         if (!this.logger) {
-            return null;
+            throw new Error("Logger has not been initialized. Please call initLogger() first.");
         }
         return this.logger;
     }
+    static getInstance() {
+        if (!LoggerService.instance) {
+            LoggerService.instance = new LoggerService();
+        }
+        return LoggerService.instance;
+    }
     initLogger() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (process.env.RIO_ENV === common_1.RioEnv.Production) {
-                const { getWinsonTransport } = yield require("@hyperdx/node-opentelemetry");
+            try {
+                const logLevel = "info";
+                const HyperDX = yield Promise.resolve().then(() => __importStar(require("@hyperdx/node-opentelemetry")));
                 this.logger = (0, winston_1.createLogger)({
-                    level: "info",
-                    format: winston_1.format.combine(winston_1.format.timestamp(), this.maskSensitiveData(), winston_1.format.json(), winston_1.format.prettyPrint()),
+                    level: logLevel,
+                    format: winston_1.format.combine(winston_1.format.colorize(), winston_1.format.timestamp(), this.maskSensitiveData(), this.requestMethodFilter(), winston_1.format.printf((_a) => {
+                        var { timestamp, level, message } = _a, meta = __rest(_a, ["timestamp", "level", "message"]);
+                        return `${timestamp} [${level}]: ${message} ${JSON.stringify(meta)}`;
+                    })),
                     transports: [
                         new winston_1.transports.Console(),
-                        getWinsonTransport("info", {
-                            apiKey: process.env.HYPERDX_API_KEY,
-                            service: process.env.OTEL_SERVICE_NAME,
+                        // @ts-ignore
+                        HyperDX.getWinstonTransport("info", {
+                            // Send logs info and above
+                            detectResources: true,
                         }),
                     ],
                 });
             }
-            else {
-                this.logger = (0, winston_1.createLogger)({
-                    level: "error",
-                    format: winston_1.format.combine(winston_1.format.timestamp(), this.maskSensitiveData(), winston_1.format.json(), winston_1.format.metadata(), winston_1.format.prettyPrint()),
-                    transports: [new winston_1.transports.Console()],
-                });
+            catch (error) {
+                console.error("Failed to initialize logger:", error);
+                // Handle the error as needed
             }
         });
     }
 }
-const loggerService = new LoggerService();
+const loggerService = LoggerService.getInstance();
 exports.default = loggerService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common-server",
-  "version": "1.0.1894",
+  "version": "1.0.1896",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",