sm-utility 2.2.17 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sm-utility",
-  "version": "2.2.17",
+  "version": "2.3.1",
   "description": "reusable utility codes for sm projects",
   "main": "index.js",
   "types": "./index.d.ts",
@@ -28,7 +28,7 @@
   "dependencies": {
     "@elastic/ecs-winston-format": "^1.3.1",
     "aws-sdk": "^2.1134.0",
-    "axios": "^0.23.0",
+    "axios": "^1.6.8",
     "express-winston": "^4.1.0",
     "nanoid": "^3.3.6",
     "node-xlsx": "^0.23.0",

package/request/axios-custom-client.d.ts

@@ -0,0 +1,3 @@
+import { AxiosInstance } from 'axios';
+import { CustomClientCreateApiParams } from './types';
+export declare function createApi(axiosConfig?: CustomClientCreateApiParams): AxiosInstance;

package/request/axios-custom-client.js

@@ -0,0 +1,95 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createApi = void 0;
+const axios_1 = __importDefault(require("axios"));
+const uuid_1 = require("uuid");
+const logger_1 = require("../logger");
+function createApi(axiosConfig) {
+    const axiosApi = axios_1.default.create(axiosConfig);
+    axiosApi.interceptors.request.use();
+    axiosApi.interceptors.request.use((request) => {
+        if (request === null || request === void 0 ? void 0 : request.logRequest) {
+            const { data, params, method } = request;
+            const fullUrl = getFullUrlFromConfig(request);
+            request.meta = request.meta || {};
+            request.meta.requestId = uuid_1.v4();
+            request.meta.requestStartedAt = new Date().getTime();
+            logRequest(request.meta.requestId, method, fullUrl, data, params);
+        }
+        return request;
+    }, (error) => {
+        const { config, message, response } = error;
+        const { method, meta } = config || {};
+        const fullUrl = getFullUrlFromConfig(config);
+        logError(meta === null || meta === void 0 ? void 0 : meta.requestId, method, fullUrl, response === null || response === void 0 ? void 0 : response.data, response === null || response === void 0 ? void 0 : response.status, message);
+        throw error;
+    });
+    axiosApi.interceptors.response.use((response) => {
+        var _a;
+        if ((_a = response.config) === null || _a === void 0 ? void 0 : _a.logResponse) {
+            const { status, data, config } = response;
+            const { method, meta } = config;
+            const fullUrl = getFullUrlFromConfig(config);
+            const responseTime = getResponseTimeFromConfig(config);
+            logResponse(meta === null || meta === void 0 ? void 0 : meta.requestId, method, fullUrl, data, status, responseTime);
+        }
+        return response;
+    }, (error) => {
+        const { config, message, response } = error;
+        const { method, meta } = config || {};
+        const fullUrl = getFullUrlFromConfig(config);
+        logError(meta === null || meta === void 0 ? void 0 : meta.requestId, method, fullUrl, response === null || response === void 0 ? void 0 : response.data, response === null || response === void 0 ? void 0 : response.status, message);
+        throw error;
+    });
+    return axiosApi;
+}
+exports.createApi = createApi;
+function logRequest(id, method, url, body, params) {
+    const request = {
+        ['context-id']: id,
+        url,
+        method: method === null || method === void 0 ? void 0 : method.toUpperCase(),
+        params,
+        body
+    };
+    logger_1.logger.info('sm-utility/api-request', { request });
+}
+function logResponse(id, method, url, body, status, responseTime) {
+    const response = {
+        ['context-id']: id,
+        url,
+        method: method === null || method === void 0 ? void 0 : method.toUpperCase(),
+        body,
+        status,
+        responseTime
+    };
+    logger_1.logger.info('sm-utility/api-response', { response });
+}
+function logError(id, method, url, data, status, message) {
+    const err = {
+        ['context-id']: id,
+        url,
+        method: method === null || method === void 0 ? void 0 : method.toUpperCase(),
+        data,
+        status,
+        message
+    };
+    logger_1.logger.error('sm-utility/api-error', { err });
+}
+function getResponseTimeFromConfig(config) {
+    var _a;
+    const requestStart = (_a = config === null || config === void 0 ? void 0 : config.meta) === null || _a === void 0 ? void 0 : _a.requestStartedAt;
+    let responseTime = '-';
+    if (requestStart) {
+        responseTime = String(new Date().getTime() - requestStart);
+    }
+    return responseTime + ' ms';
+}
+function getFullUrlFromConfig(config) {
+    const { baseURL, url } = config || {};
+    const fullUrl = baseURL && url ? new String().concat(baseURL, url) : '';
+    return fullUrl;
+}

package/request/index.d.ts

@@ -1,9 +1,2 @@
-import { AxiosInstance, AxiosRequestConfig } from 'axios';
-declare module 'axios' {
-    interface AxiosRequestConfig {
-        meta?: Record<string, any>;
-        logRequest?: boolean;
-        logResponse?: boolean;
-    }
-}
-export declare function createApi(axiosConfig?: Omit<AxiosRequestConfig, "meta">): AxiosInstance;
+export * from './axios-custom-client';
+export * from './types';

package/request/index.js

@@ -1,88 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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.createApi = void 0;
-const axios_1 = __importDefault(require("axios"));
-const uuid_1 = require("uuid");
-const logger_1 = require("../logger");
-function createApi(axiosConfig) {
-    const axiosApi = axios_1.default.create(axiosConfig);
-    axiosApi.interceptors.request.use((request) => {
-        if (request === null || request === void 0 ? void 0 : request.logRequest) {
-            const { data, params, method } = request;
-            const fullUrl = getFullUrlFromConfig(request);
-            request.meta = request.meta || {};
-            request.meta.requestId = uuid_1.v4();
-            request.meta.requestStartedAt = new Date().getTime();
-            logRequest(request.meta.requestId, method, fullUrl, data, params);
-        }
-        return request;
-    });
-    axiosApi.interceptors.response.use((response) => {
-        var _a;
-        if ((_a = response.config) === null || _a === void 0 ? void 0 : _a.logResponse) {
-            const { status, data, config } = response;
-            const { method, meta } = config;
-            const fullUrl = getFullUrlFromConfig(config);
-            const responseTime = getResponseTimeFromConfig(config);
-            logResponse(meta === null || meta === void 0 ? void 0 : meta.requestId, method, fullUrl, data, status, responseTime);
-        }
-        return response;
-    }, (error) => {
-        const { config, message, response } = error;
-        const { method, meta } = config;
-        const fullUrl = getFullUrlFromConfig(config);
-        logError(meta === null || meta === void 0 ? void 0 : meta.requestId, method, fullUrl, response === null || response === void 0 ? void 0 : response.data, response === null || response === void 0 ? void 0 : response.status, message);
-        throw error;
-    });
-    return axiosApi;
-}
-exports.createApi = createApi;
-function logRequest(id, method, url, body, params) {
-    const request = {
-        ['context-id']: id,
-        url,
-        method: method === null || method === void 0 ? void 0 : method.toUpperCase(),
-        params,
-        body
-    };
-    logger_1.logger.info('sm-utility/api-request', { request });
-}
-function logResponse(id, method, url, body, status, responseTime) {
-    const response = {
-        ['context-id']: id,
-        url,
-        method: method === null || method === void 0 ? void 0 : method.toUpperCase(),
-        body,
-        status,
-        responseTime
-    };
-    logger_1.logger.info('sm-utility/api-response', { response });
-}
-function logError(id, method, url, data, status, message) {
-    const err = {
-        ['context-id']: id,
-        url,
-        method: method === null || method === void 0 ? void 0 : method.toUpperCase(),
-        data,
-        status,
-        message
-    };
-    logger_1.logger.error('sm-utility/api-error', { err });
-}
-function getResponseTimeFromConfig(config) {
-    var _a;
-    const requestStart = (_a = config === null || config === void 0 ? void 0 : config.meta) === null || _a === void 0 ? void 0 : _a.requestStartedAt;
-    let responseTime = '-';
-    if (requestStart) {
-        responseTime = String(new Date().getTime() - requestStart);
-    }
-    return responseTime + ' ms';
-}
-function getFullUrlFromConfig(config) {
-    const { baseURL, url } = config;
-    const fullUrl = baseURL && url ? new String().concat(baseURL, url) : '';
-    return fullUrl;
-}
+__exportStar(require("./axios-custom-client"), exports);
+__exportStar(require("./types"), exports);

package/request/types.d.ts

@@ -0,0 +1,11 @@
+import { AxiosRequestConfig } from 'axios';
+import { createApi } from './axios-custom-client';
+declare module 'axios' {
+    interface AxiosRequestConfig {
+        meta?: Record<string, any>;
+        logRequest?: boolean;
+        logResponse?: boolean;
+    }
+}
+export declare type CustomClientCreateApiParams = Omit<AxiosRequestConfig, 'meta'>;
+export declare type AxiosInstance = ReturnType<typeof createApi>;

package/request/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });