common-rod 1.5.3 → 1.5.7

package/index.js

@@ -136,6 +136,7 @@ function _init(callback, commonRodOpt={mongo_create_connect:true, detaillog_add_
     app.use(bodyParser.json({limit: envCommonRod.body_parser_limit}));
     app.use(bodyParser.text({type:"text/*", limit: envCommonRod.body_parser_limit}));
     
+   
     //obtainSession + assign invoke
     app.use(function obtainSession(req, res, next) {
         if(! logger.isMetrics(req) ){
@@ -159,7 +160,9 @@ function _init(callback, commonRodOpt={mongo_create_connect:true, detaillog_add_
     // })
 
     //enqueue
-    app.use( q.nq );
+    // app.use(function queueMessage(req, res, next){
+    //     q.nq(req,res,next,appRodSession);
+    // });
 
     //init before app.utils().app().const($name)
     appConf.static = require( currentAppPath + '/conf/config.json' );
@@ -393,7 +396,6 @@ function _init(callback, commonRodOpt={mongo_create_connect:true, detaillog_add_
                                     req.rodSession.error(req.sessionID,e);
                                 }
                             };
-                            
                             if(commonRodOpt.detaillog_add_output_response || 
                                 commonRodOpt.summarylog_auto_end || 
                                 req.rodSession._cbWaitFinished ){
@@ -423,13 +425,29 @@ function _init(callback, commonRodOpt={mongo_create_connect:true, detaillog_add_
                             if( logger.isDebug() ){
                                 maskCredential.incoming_request(ctrlFile.cmd, req, logger);
                                 // logger.writeApplogIncoming(req.sessionID, req);
-                            }                            
-                            ctrlFile.ctrlFile.call(req.rodSession, req, res, next);
+                            }       
+                            try {
+                                let fc = ctrlFile.ctrlFile.call(req.rodSession, req, res, next);
+                                Promise.resolve(fc).then(function(value) {
+                                    if(value instanceof Error){
+                                        next(value);
+                                    }
+                                }).catch(function(err) {
+                                    next(err);
+                                });
+                            } catch (err) {
+                                next(err)
+                            }                     
                         }
                         
                         logger.info("common-rod", `URL Mapping ${ctrlFile.method} ${ctrlFile.url} => ${ctrlFile.path}`);
                         // app[ctrlFile.method](ctrlFile.url, ctrlFile.ctrlFile);
-                        app[ctrlFile.method](ctrlFile.url, assignThis);
+
+                        //enqueue
+                        function queueMessage(req, res, next){
+                            q.nq(req,res,next,appRodSession);
+                        };
+                        app[ctrlFile.method](ctrlFile.url, queueMessage, assignThis);
                     });
                     
                 });
@@ -441,20 +459,9 @@ function _init(callback, commonRodOpt={mongo_create_connect:true, detaillog_add_
             }
             
         }
-        //ROUTE AT MATCH ( URL NOT FOUND DEFAULT)
-        app.use((req,res,next)=>{
-            q.dq(req);
-            return res.status(403).send("URL NOT FOUND");
-        });
-        //CATCH ERROR
-        app.use(function (err, req, res, next) {
-            if(req.rodSession){
-                req.rodSession.error(req.sessionID,err);
-            }else{
-                console.error(err);
-            }
-            res.status(500).send('Server Error');
-        });
+        
+        handleErrorExpress( appRodSession, q );
+        
     }
 
     function _checkFlagStart(callback, appRodSession){
@@ -904,6 +911,35 @@ function handleError(){
         logger.warn("common-rod", 'Unhandled Rejection at', reason.stack || reason);
     });
 }
+function handleErrorExpress(appRodSession, q) {
+    //ROUTE AT MATCH ( URL NOT FOUND DEFAULT)
+    app.use((req,res,next)=>{
+        q.dq(req);
+        return res.status(403).send("URL NOT FOUND");
+    });
+
+    //EXCEED LIMIT PARSER
+    app.use(function (err, req, res, next) {
+        if(err.name == 'PayloadTooLargeError'){
+            appRodSession.info( `${req.url} ${err.message}`);
+            res.status(err.status || 413);
+            res.send(err.message || 'request entity too large');
+        }else{
+            next(err);
+        }
+    });
+
+    //CATCH ERROR
+    app.use(function (err, req, res, next) {
+        if (req.rodSession) {
+            req.rodSession.error(req.sessionID, err);
+        } else {
+            console.error(err);
+        }
+        res.status(err.status || 500);
+        res.send(err.message || 'Server Error');
+    });
+}
 
 function stopServer(){
     logger.close(()=>{

package/lib/http-service2.js

@@ -46,11 +46,15 @@ function transformResponse(data) {
 	return data;
 }
 
-let defaultTransformResponse = axios.defaults.transformResponse;
+// build fn, bind this
+let defaultTransformResponse = [];
+for (var i = 0; i < axios.defaults.transformResponse.length; i++) {
+	defaultTransformResponse.push(axios.defaults.transformResponse[i].bind(axios.defaults));
+}
+
 axios.interceptors.response.use(function (response) {
 	response.rawData = response.data;
 	for (var i = 0; i < defaultTransformResponse.length; i++) {
-		
 		response.data = defaultTransformResponse[i](response.data);
 	}
 	return response;

package/lib/queue2.js

@@ -127,13 +127,13 @@ module.exports =  {
         }
         enableQ = true;
         logger = _logger;
-    }, nq : function (req,res,next) {
+    }, nq : function (req,res,next,appRodSession) {
         if(!enableQ) return next();
 
         let queueKey = [];
         let logKey = '';
         for (let index = 0; index < correlateQueueFn.length; index++) {
-            let k = correlateQueueFn[index](req, res);
+            let k = correlateQueueFn[index].call(appRodSession, req, res);
             logKey += k + '|';
             queueKey.push({
                 "key":k, 
@@ -149,7 +149,7 @@ module.exports =  {
         //     queue queueKey=${logKey}
         //     globalQueue=${globalQ}
         //     sessionQueue=${sessionQ}`);
-        logger.debug(req.sessionID,`queue queueKey=${logKey} globalQueue=${globalQ} sessionQueue=${sessionQ}`);
+        logger.debug(req.sessionID,`queue queueKey=${logKey} globalQueue=${globalQ} sessionQueue=${sessionQ} URL=${req.url}`);
         if( globalQ > queueOpt.maxGlobalQ || sessionQ > queueOpt.maxSessionQ ){
             logger.debug(req.sessionID,`exceeded queue limit`);
             return rejectQ(req,res);
@@ -158,7 +158,7 @@ module.exports =  {
         let foundQ = find(queueKey);
         if( foundQ ){
             // console.log('found');
-            logger.debug(req.sessionID,`enqueue queueKey=${logKey}`);
+            logger.debug(req.sessionID,`enqueue queueKey=${logKey} URL=${req.url}`);
             enQueue(queueKey,req,next);
             // console.log(111, queues );
 

package/lib/rodSession.js

@@ -222,6 +222,9 @@ RodSession.prototype = function () {
                             // this.debug("get cache instance mongo.collection=" + colName)
                         }
                         return this.app._rod.collection[colName];
+                    },
+                    getDb : () => {
+                        return this.db;
                     }
                 }
             }

package/lib/validateConf.js

@@ -52,7 +52,7 @@ function ipOrHost(obj, key, value){
     }else{
         //HOSTS
         // let port = resolve(key.substring(0,key.lastIndexOf("."))+".port", obj);
-        console.log(9988899);
+        // console.log(9988899);
         return true;
     }
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "common-rod",
-  "version": "1.5.3",
+  "version": "1.5.7",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
   "author": "Thanakhan Iaocharoen",
   "license": "ISC",
   "dependencies": {
-    "axios": "^0.21.1",
+    "axios": "^0.21.4",
     "body-parser": "^1.19.0",
     "cli-table": "^0.3.1",
     "commonlog-kb": "^2.3.0",
@@ -19,7 +19,7 @@
     "express": "^4.17.1",
     "js-yaml": "^3.14.0",
     "lodash": "^4.17.20",
-    "mongodb": "^3.3.2",
+    "mongodb": "^3.7.1",
     "randomstring": "^1.1.5",
     "swagger-ui-express": "^4.1.4"
   }

package/readme.md

@@ -248,3 +248,46 @@ app.correlateQueue = [function(req, res){
 }]
 ```
 ### Fixed
+
+# [1.5.4] - 2021-07-23
+Allowed this keyword for app.correlateQueue 
+### Added
+```
+app.correlateQueue = function(req, res){
+    //this.debug("log");
+    return $correlateQueue;
+}
+```
+### Changed
+### Fixed
+
+# [1.5.5] - 2021-08-01
+```
+Handle case PayloadTooLargeError(request body size bigger than pm2.commonRod.body_parser_limit)
+Handle Throw error from module
+```
+### Added
+### Changed
+### Fixed
+
+### Changed
+### Fixed
+
+# [1.5.6] - 2021-09-08
+```
+Handle case axios.defaults.transformResponse axios version 0.21.4
+```
+### Added
+### Changed
+### Fixed
+
+# [1.5.7] - 2021-12-03
+### Added
+```
+add mongo utils to get db
+
+//example
+let db = this.utils().mongo().getDb();
+```
+### Changed
+### Fixed