fintalk-pkg 2.3.14 → 2.3.15

package/base/FlowControl.js

@@ -1,4 +1,4 @@
-const logger = require("./Logger");
+const logger = require("ton-logger")
 
 let controller = null; 
 
@@ -65,133 +65,15 @@ module.exports.redirect = (url) => {
     };
 };
 
-function logLambda(statusCode, resBody, forceBody) {
-
-    if(controller != null) {
-
-        var start = controller.start;
-        var method = controller.event.httpMethod != null ? controller.event.httpMethod : "";
-        var userAgent = "";
-        var consumerIp = "";
-
-        if(controller.event != null && controller.event.headers != null) {
-            userAgent = controller.event.headers["User-Agent"] != null ? controller.event.headers["User-Agent"] : "";
-        }
-
-        if(controller.event != null && controller.event.requestContext != null && controller.event.requestContext.identity != null && controller.event.requestContext.identity.sourceIp != null) {
-            consumerIp = controller.event.requestContext.identity.sourceIp;
-        }
-
-        let resLength = 0;
-        if(resBody != null) {
-            if(typeof resBody !== "string") {
-                resBody = JSON.stringify(resBody, Object.getOwnPropertyNames(resBody));
-            }
-            resLength = Buffer.byteLength(resBody);
-        }
-
-        if(resBody == null || (statusCode == 200 && !forceBody)) {
-            resBody = {};
-        }
-
-        let logObj = {
-            httpLog : controller.http,
-            date : start,
-            duration : new Date - start,
-            method : method,
-            statusCode : statusCode,
-            path : controller.event.path != null ? controller.event.path : "",
-            resBody : resBody,
-            resLength : resLength,
-            query : controller.event.queryStringParameters != null ? controller.event.queryStringParameters : {},
-            body : controller.event.body != null ? controller.event.body : {},
-            header: controller.event.headers != null ? controller.event.headers : {},
-            userAgent: userAgent,
-            consumerIp : consumerIp,
-            sendToDataLake : true
-        };
-
-        if(controller.warmup) {
-            logObj.warmup = controller.warmup;
-        }
-
-        if(controller.coldStart) {
-            logObj.coldStart = controller.coldStart;
-        }
-
-        logger.log(JSON.stringify(logObj), true, false);
-
-    }
-
+function logLambda(statusCode, resBody, _) {
+    logger.info({
+        message: 'Lambda response',
+        statusCode,
+        response: resBody
+    })
 }
 
 module.exports.setEnvVariables = async function(names, paths) {
-    // const { SSM } = require("@aws-sdk/client-ssm-node");
-    // const ssm = new SSM({ region: "us-east-1" });
-
-    // let namesToQuery = [];
-    // let query = [];
-    // let request;
-    // let values;
-
-    // if (names != null) {
-
-    //     var cache = false;
-       
-    //     Object.keys(names).forEach(function (item) {
-    //         if (process.env[item]) {
-    //             cache = true;
-    //         }
-    //         namesToQuery.push(names[item]);
-    //     });
-
-    //     if (cache) 
-    //         return;
-
-    //     let query = {
-    //         "Names": namesToQuery,
-    //         "WithDecryption": false,
-    //     };
-
-    //     let request = await ssm.getParameters(query);
-    //     let values = request.Parameters;
-
-    //     for (let i = 0; i < values.length; i++) {
-    //         const element = values[i];
-
-    //         for (let j = 0; j < Object.keys(names).length; j++) {
-    //             const iName = Object.keys(names)[j];
-    //             if(names[iName] == element.Name) {
-    //                 process.env[iName] = element.Value;
-    //                 break;
-    //             }
-                
-    //         }
-            
-    //     }
-    // }
-
-    // if (paths != null) {
-    //     for (let i = 0; i < Object.keys(paths).length; i++) {
-    //         const path = Object.keys(paths)[i];
-
-    //         //TEF_MUNDIPAGG-PK
-    //         query = {
-    //             "Path": paths[path],
-    //             "WithDecryption": false,
-    //         };
-            
-    //         request = await ssm.getParametersByPath(query).promise();
-    //         values = request.Parameters;
-
-    //         for (let j = 0; j < values.length; j++) {
-    //             const element = values[j];
-    //             const name = path + "_" + element.Name.substring(element.Name.lastIndexOf("/") + 1, element.Name.length).toUpperCase();
-    //             process.env[name] = element.Value;
-    //         }
-            
-    //     }
-    // }
 
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fintalk-pkg",
-  "version": "2.3.14",
+  "version": "2.3.15",
   "description": "Common code between projects",
   "main": "index.js",
   "scripts": {
@@ -25,7 +25,8 @@
   },
   "dependencies": {
     "dotenv": "^6.2.0",
-    "dynamoose": "^2.3.0"
+    "dynamoose": "^2.3.0",
+    "ton-logger": "~1.1.2"
   },
   "pre-commit": {
     "run": [