sm-utility 1.1.0 → 1.2.0

package/logger/index.js

@@ -1,4 +1,9 @@
 "use strict";
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -15,6 +20,10 @@ catch (_a) {
     throw Error('Logger configs could not be found on app root\'s directory.');
 }
 function formatReqResLog(info) {
+    // in case the info itself is not from a request/response pair
+    if (!info.meta || (info === null || info === void 0 ? void 0 : info.meta.req)) {
+        return JSON.stringify(info);
+    }
     var level = info.level, _a = info.meta, req = _a.req, res = _a.res, responseTime = _a.responseTime;
     var logData = Object.assign({}, { req: req, res: res, responseTime: responseTime + "ms" });
     return level + " - [" + req.method + "] " + req.url + ": " + JSON.stringify(logData);
@@ -55,8 +64,9 @@ function getSplitedRouteParts(route) {
     return filteredParts;
 }
 function createLoggerMiddleware() {
-    express_winston_1.default.requestWhitelist.push("body");
-    express_winston_1.default.responseWhitelist.push("body");
+    var _a, _b;
+    (_a = express_winston_1.default.requestWhitelist).push.apply(_a, __spreadArray(["body"], configs.requestWhitelist || []));
+    (_b = express_winston_1.default.responseWhitelist).push.apply(_b, __spreadArray(["body"], configs.responseWhitelist || []));
     return express_winston_1.default.logger({
         statusLevels: true,
         transports: [
@@ -64,7 +74,7 @@ function createLoggerMiddleware() {
         ],
         requestFilter: filterRequestHeaders(configs.confidentialHeaders || []),
         ignoreRoute: routeFilter,
-        format: winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.printf(formatReqResLog))
+        format: winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.printf(formatReqResLog)),
     });
 }
 function createErrorLoggerMiddleware() {

package/logger/types.d.ts

@@ -4,4 +4,6 @@ export interface ILoggerConfigs {
     file: winston.transports.FileTransportOptions;
     confidentialHeaders?: string[];
     ignoredRoutes?: string[];
+    requestWhitelist?: string[];
+    responseWhitelist?: string[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sm-utility",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "reusable utility codes for sm projects",
   "main": "index.js",
   "types": "index.d.ts",

package/request/index.js

@@ -9,11 +9,12 @@ var uuid_1 = require("uuid");
 function createApi(config) {
     var axiosApi = axios_1.default.create(config);
     axiosApi.interceptors.request.use(function (request) {
-        var url = request.url, data = request.data, params = request.params, method = request.method;
+        var data = request.data, params = request.params, method = request.method;
+        var fullUrl = getFullUrlFromConfig(request);
         request.meta = request.meta || {};
         request.meta.requestId = uuid_1.v4();
         request.meta.requestStartedAt = new Date().getTime();
-        logApiInfo(request.meta.requestId, 'Request', method, url, {
+        logApiInfo(request.meta.requestId, 'Request', method, fullUrl, {
             data: data,
             params: params,
         });
@@ -21,9 +22,10 @@ function createApi(config) {
     });
     axiosApi.interceptors.response.use(function (response) {
         var status = response.status, data = response.data, config = response.config;
-        var method = config.method, url = config.url, meta = config.meta;
+        var method = config.method, meta = config.meta;
+        var fullUrl = getFullUrlFromConfig(config);
         var responseTime = getResponseTimeFromConfig(config);
-        logApiInfo(meta === null || meta === void 0 ? void 0 : meta.requestId, 'Response', method, url, {
+        logApiInfo(meta === null || meta === void 0 ? void 0 : meta.requestId, 'Response', method, fullUrl, {
             status: status,
             data: data,
             responseTime: responseTime,
@@ -31,15 +33,16 @@ function createApi(config) {
         return response;
     }, function (error) {
         var config = error.config, message = error.message, response = error.response;
-        var method = config.method, url = config.url, meta = config.meta;
+        var method = config.method, meta = config.meta;
+        var fullUrl = getFullUrlFromConfig(config);
         var responseTime = getResponseTimeFromConfig(config);
-        logApiInfo(meta === null || meta === void 0 ? void 0 : meta.requestId, 'Error', method, url, {
+        logApiInfo(meta === null || meta === void 0 ? void 0 : meta.requestId, 'Error', method, fullUrl, {
             status: response === null || response === void 0 ? void 0 : response.status,
             message: message,
             data: response === null || response === void 0 ? void 0 : response.data,
             responseTime: responseTime,
         });
-        return error;
+        throw error;
     });
     return axiosApi;
 }
@@ -57,3 +60,8 @@ function getResponseTimeFromConfig(config) {
     }
     return responseTime + ' ms';
 }
+function getFullUrlFromConfig(config) {
+    var baseURL = config.baseURL, url = config.url;
+    var fullUrl = baseURL && url ? new String().concat(baseURL, url) : '';
+    return fullUrl;
+}