common-rod 1.5.5 → 1.6.1

package/index.js

@@ -668,7 +668,29 @@ async function _connectMongodb(appRodSession, mongoConf){
 
     let connectionString;
     let strLog;
-    if(mongoConf.replicaSet){
+    // if(mongoConf.replicaSet){
+    //     let hosts = "";
+    //     for (let index = 0; index < mongoConf.hosts.length; index++) {
+    //         const element = mongoConf.hosts[index];
+    //         if(hosts !== "")hosts += ",";
+
+    //         hosts += element.ip;
+    //         if(element.port){
+    //             hosts += ":"+element.port ;
+    //         }else{
+    //             hosts += ":27017";
+    //         }
+    //     }
+    //     strLog = "host=" + hosts;
+    //     connectionString = `mongodb://${auth}${hosts}/${mongoConf.db}`;
+    // }else{
+    //     if(!mongoConf.port){
+    //         mongoConf.port = "27017";
+    //     }
+    //     connectionString = `mongodb://${auth}${mongoConf.ip}:${mongoConf.port}/${mongoConf.db}`;
+    //     strLog = `ip=${mongoConf.ip} port=${mongoConf.port}`;
+    // }
+    if( mongoConf.hosts !== undefined ){
         let hosts = "";
         for (let index = 0; index < mongoConf.hosts.length; index++) {
             const element = mongoConf.hosts[index];
@@ -691,13 +713,13 @@ async function _connectMongodb(appRodSession, mongoConf){
         strLog = `ip=${mongoConf.ip} port=${mongoConf.port}`;
     }
 
-
     let MongoClient = require('mongodb').MongoClient;
     let opt = mongoConf.connection_string || {};
     Object.assign( opt, {
         useNewUrlParser: true, 
         useUnifiedTopology: true,
-        poolSize: 10
+        poolSize: 10,
+        serverSelectionTimeoutMS:10000 //timeout for driver connect to mongo
     })
     
     if(mongoConf.replicaSet){

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;
@@ -305,7 +309,12 @@ async function handleError(rodSession, error, ins, optionAttribute) {
 			
 		//response = 'TIMEOUT';
 		response = ERROR_TBL.TIMEOUT;
-	}else if(error.code === 'ENOTFOUND' || error.code === 'ECONNRESET' || error.code === 'ECONNREFUSED' || error.code === 'EAI_AGAIN' ){
+	}else if(error.code === 'ENOTFOUND' || 
+		error.code === 'ECONNRESET' || 
+		error.code === 'ECONNREFUSED' || 
+		error.code === 'EAI_AGAIN' ||
+		error.code === 'ENETUNREACH'){
+			
 		rodSession.debug('receive CONNECTION_ERROR from', optionAttribute.url);
 		rodSession.summary().addErrorBlock(optionAttribute._service, optionAttribute._command, 'ret=1', 'connection error');
 		rodSession.detail().addInputResponseError(optionAttribute._service, optionAttribute._command, optionAttribute._invoke);

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;
     }
     
@@ -248,7 +248,13 @@ function validateConType(conn_type, path, obj, name){
                     "required_attr": false,
                     "required_val": false,
                     "type": "port"
-                },  {
+                }, {
+                    "config_path": `${path}.replicaSet`,
+                    "array": false,
+                    "required_attr": false,
+                    "required_val": true,
+                    "type": "string"
+                }, {
                     "config_path": `${path}.db`,
                     "array": false,
                     "required_attr": true,
@@ -276,8 +282,39 @@ function validateConType(conn_type, path, obj, name){
             ]
         };
         
-        let replicaSet = resolve(path+".replicaSet", obj);
-        if(replicaSet){
+        // let replicaSet = resolve(path+".replicaSet", obj);
+        // if(replicaSet){
+        //     schemaForMongo.schema.splice(1,2); //delete ip / port
+        //     schemaForMongo.schema.splice(1, 0, {
+        //         "config_path": `${path}.hosts`,
+        //         "array": true,
+        //         "required_attr": true,
+        //         "required_val": true,
+        //         "type": "object",
+        //     },{
+        //         "config_path": `${path}.hosts[].ip`,
+        //         "array": false,
+        //         "required_attr": true,
+        //         "required_val": true,
+        //         "type": "condition",
+        //         "condition" : validateIpOrSVC
+        //     },{
+        //         "config_path": `${path}.hosts[].port`,
+        //         "array": false,
+        //         "required_attr": false,
+        //         "required_val": false,
+        //         "type":"port"
+        //     },{
+        //         "config_path": `${path}.replicaSet`,
+        //         "array": false,
+        //         "required_attr": true,
+        //         "required_val": true,
+        //         "type":"string"
+        //     });
+        // }
+        // schema.push(schemaForMongo);
+        let hosts = resolve(path+".hosts", obj);
+        if(hosts !== undefined){
             schemaForMongo.schema.splice(1,2); //delete ip / port
             schemaForMongo.schema.splice(1, 0, {
                 "config_path": `${path}.hosts`,
@@ -298,12 +335,6 @@ function validateConType(conn_type, path, obj, name){
                 "required_attr": false,
                 "required_val": false,
                 "type":"port"
-            },{
-                "config_path": `${path}.replicaSet`,
-                "array": false,
-                "required_attr": true,
-                "required_val": true,
-                "type":"string"
             });
         }
         schema.push(schemaForMongo);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "common-rod",
-  "version": "1.5.5",
+  "version": "1.6.1",
   "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

@@ -262,8 +262,49 @@ app.correlateQueue = function(req, res){
 ### 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
+
+# [1.6.0] - 2021-12-07
 ### Added
 ### Changed
-### Fixed
+```
+change validator for mongo connection
+allow config ip,port OR host[].ip, host[].port
+```
+### Fixed
+
+# [1.6.1] - 2021-02-14
+### Added
+### Changed
+### Fixed
+```
+add error code 'ENETUNREACH' to http request error
+```