update async function parallelRequest(multiParams,cmd,node)

sumatek
1 parent 113ef081
Showing 1 changed file with 25 additions and 46 deletions Show diff stats
ais-structure/src/modules/helper/connection.js
@@ -3,8 +3,10 @@ var cfg = require(&#39;../../config/config.js&#39;).get(env);
 var stats = require('../helper/stats.js'); 
 var request = require('request');
 var messageSOAP = require('../helper/messageSOAP.js'); 
+
 var connection = [];
+
 connection.requestSoapToSPW = async function (soap,cmd,myMethod) {
     var params = {
@@ -27,30 +29,21 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
     if(params.method == "GET")
     {
         var genUrl = getUrl(params);
-        genUrl.push(genUrl[0]);        
+        genUrl.push(genUrl[0].replace("8080","8081"));        
         if(genUrl.length > 1)
         {
             // console.log("multi Send");
             var multiSend = [];
-            var loopData = {};
             for(var i=0;i<genUrl.length;i++)
-            {
-                loopData.url = genUrl[i];
-                loopData.method = params.method;
-                multiSend.push(loopData);
-
-                // console.log("Url["+i+"] : "+loopData.url);                
-            }
-
-            parallelRequest(multiSend,cmd,cfg.service.D01.Name); 
+                multiSend.push({url:genUrl[i],method:params.method});
+        
+            var parallelRes = await parallelRequest(multiSend,cmd,cfg.service.D01.Name); 
             var dataRes = {};
             for(var i=0;i<multiSend.length;i++)
             {
                 // console.log("start loop");
-                // var loopRes = await asyncRequest(multiSend[i],cmd,cfg.service.D01.Name);
-                
-                // var loopRes = parallelRequest(multiSend[i],cmd,cfg.service.D01.Name); 
+                var loopRes = parallelRes[i];
                 if(loopRes.response)
                 {
@@ -125,58 +118,44 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
 };
-function parallelRequest(multiParams,cmd,node)
+async function parallelRequest(multiParams,cmd,node)
 {
+   
+    var promises = [];
+
     for(var i=0;i<multiParams.length;i++)
+        promises.push(asyncRequest (multiParams[i],cmd,node));
+
+    var res = await Promise.all(promises);
+    for(var i=0;i<res.length;i++)
     {
-        stats.sendRequest(node,cmd);
-        console.log("Start "+i+" Url  : "+multiParams[i].url);
-        console.log("Start "+i+"Time : "+new Date().toISOString());        
-        request(multiParams[i], function (error, response, body) {            
-            if (error) {
-                console.log("error");
-                console.log("End : "+new Date().toISOString());
-                stats.reciveResponse(node,cmd,"Error");
-                // resolve({
-                //     'body'  : body,
-                //     'err'   : error
-                // });
-                // console.log(error);
-            } else {
-                console.log("normal");                
-                console.log("End "+i+" : "+new Date().toISOString());
-                // stats.reciveResponse(node,cmd,"Success");
-                // resolve({
-                //     'body'      : body,
-                //     'response'  : response
-                // });
+        if(!res[i].err)
+            stats.reciveResponse(node,cmd,"Success");
-                // console.log(response);
-            }
-        });
-    }   
+    }
+
+
+    return res;
 }
 function asyncRequest (params = {},cmd,node) {
-    // console.log(params);
-    console.log("Start : "+new Date().toISOString());
+    
+    // console.log("Start : "+new Date().toISOString());
     return new Promise((resolve, reject) => {
         request(params, function (error, response, body) {
             stats.sendRequest(node,cmd);
             if (error) {
-                // console.log("error");
-                console.log("Start : "+new Date());
+                
                 stats.reciveResponse(node,cmd,"Error");
                 resolve({
                     'body'  : body,
                     'err'   : error
                 });
             } else {
-                // console.log("normal");                
-                console.log("End : "+new Date().toISOString());
+               
                 // stats.reciveResponse(node,cmd,"Success");
                 resolve({
                     'body'      : body,