soajs.controller 4.2.37 → 4.2.39

package/README.md

@@ -38,6 +38,7 @@ Enabling CORS allows different domains to communicate with SOAJS via its gateway
 More information on the Controller is available on the website section [Controller](https://soajsorg.atlassian.net/wiki/x/loAwb)
 
 
+
 ### License
 *Copyright SOAJS All Rights Reserved.*
 

package/lib/request.js

@@ -18,6 +18,7 @@ function checkStatus(uri) {
         const req = http.get(uri, (res) => {
             if (res.statusCode === 200) {
                 onResponse = true;
+                res.resume();
                 resolve(res.statusCode === 200); // Resolve with true if 200, false otherwise
             }
             // res.on('data', () => { }); // Consume data to avoid issues (important!)
@@ -28,12 +29,12 @@ function checkStatus(uri) {
                     return reject(err);
                 }
             });
-            res.on('close', () => {
-                if (!onResponse) {
-                    onResponse = true;
-                    return reject(new Error("Closed"));
-                }
-            });
+            // res.on('close', () => {
+            //     if (!onResponse) {
+            //         onResponse = true;
+            //         return reject(new Error("Closed"));
+            //     }
+            // });
         });
 
         req.on('error', (err) => {
@@ -42,19 +43,26 @@ function checkStatus(uri) {
                 return reject(err);
             }
         });
-        req.on('close', () => {
+        // req.on('close', () => {
+        //     if (!onResponse) {
+        //         onResponse = true;
+        //         return reject(new Error("Closed"));
+        //     }
+        // });
+
+        req.setTimeout(5000, () => {
+            req.destroy();
             if (!onResponse) {
                 onResponse = true;
-                return reject(new Error("Closed"));
+                return reject(new Error('Request timed out'));
             }
         });
 
-
         req.end();
     });
 }
 
-function httpRequestLight({ uri, data = null, method = 'GET', headers = null, json = true }) {
+function httpRequestLight({ uri, data = null, method = 'GET', headers = null, json = true, timeout = 8000 }) {
     return new Promise((resolve, reject) => {
         let onResponse = false;
         let options = {};
@@ -96,6 +104,8 @@ function httpRequestLight({ uri, data = null, method = 'GET', headers = null, js
 
         req.on('response', (res) => { // Listen for the 'response' event
             if (res.statusCode < 200 || res.statusCode >= 300) {
+                onResponse = true;
+                res.resume();
                 return reject(new Error(`Status Code: ${res.statusCode}`));
             }
 
@@ -106,7 +116,6 @@ function httpRequestLight({ uri, data = null, method = 'GET', headers = null, js
             });
 
             res.on('end', () => {
-
                 if (!onResponse) {
                     onResponse = true;
                     try {
@@ -145,6 +154,17 @@ function httpRequestLight({ uri, data = null, method = 'GET', headers = null, js
             }
         });
 
+        // Handle request timeout
+        req.on('timeout', () => {
+            req.destroy(); // IMPORTANT: Forcefully end the request
+            if (!onResponse) {
+                onResponse = true;
+                return reject(new Error('Request timed out'));
+            }
+        });
+        // Set the timeout on the request
+        req.setTimeout(timeout);
+
         if (data) {
             req.write(requestDataString);
         }
@@ -153,7 +173,7 @@ function httpRequestLight({ uri, data = null, method = 'GET', headers = null, js
     });
 }
 
-function httpRequest({ uri, data = null, body = null, qs = null, method = 'GET', headers = null, json = true }) {
+function httpRequest({ uri, data = null, body = null, qs = null, method = 'GET', headers = null, json = true, timeout = 8000 }) {
     return new Promise((resolve, reject) => {
         data = data || body; // to be compatible with request package
 
@@ -270,6 +290,17 @@ function httpRequest({ uri, data = null, body = null, qs = null, method = 'GET',
             }
         });
 
+        // Handle request timeout
+        req.on('timeout', () => {
+            req.destroy(); // IMPORTANT: Forcefully end the request
+            if (!onResponse) {
+                onResponse = true;
+                return reject(new Error('Request timed out'));
+            }
+        });
+        // Set the timeout on the request
+        req.setTimeout(timeout);
+
         if (data) {
             req.write(requestDataString);
         }
@@ -288,7 +319,7 @@ function proxyRequest(req, res, options, extraOptions = {}) {
         } else {
             proxyReq = http.request(options);
         }
-        
+
         if (extraOptions && extraOptions.fetchProxReq) {
             extraOptions.fetchProxReq(proxyReq);
         }

package/mw/awareness/ha.js

@@ -240,7 +240,7 @@ let ha = {
 				return cb(hostname);
 			} else {
 				if (process.env.SOAJS_DEPLOY_HA === 'kubernetes' && serviceName && version) {
-					serviceName += "-v" + version + "-service";
+					// serviceName += "-v" + version + "-service";
 					return cb(env + "-" + serviceName + "-v" + version + "-service");
 				} else {
 					lib.getHostFromAPI(serviceName, version, cb);

package/mw/gotoService/proxyRequest.js

@@ -79,10 +79,10 @@ module.exports = (configuration) => {
 				.then(() => { })
 				.catch((error) => {
 					req.soajs.log.error(error.message);
-					// if (req.soajs.controller.redirectedRequest) {
-					// 	req.soajs.controller.redirectedRequest.destroy();
-					// 	req.soajs.controller.redirectedRequest = null;
-					// }
+					if (req.soajs.controller.redirectedRequest) {
+						req.soajs.controller.redirectedRequest.destroy();
+						req.soajs.controller.redirectedRequest = null;
+					}
 					return req.soajs.controllerResponse(core.error.getError(135));
 				});
 		};

package/mw/gotoService/redirectToService.js

@@ -220,10 +220,10 @@ module.exports = (configuration) => {
 				})
 				.catch((err) => {
 					req.soajs.log.error(err.message + ' with [' + restServiceParams.name + (restServiceParams.version ? ('@' + restServiceParams.version) : '') + ']');
-					// if (req.soajs.controller.redirectedRequest) {
-					// 	req.soajs.controller.redirectedRequest.destroy();
-					// 	req.soajs.controller.redirectedRequest = null;
-					// }
+					if (req.soajs.controller.redirectedRequest) {
+						req.soajs.controller.redirectedRequest.destroy();
+						req.soajs.controller.redirectedRequest = null;
+					}
 					if (!req.soajs.controller.monitorEndingReq) {
 						req.soajs.controllerResponse(core.error.getError(135));
 					}

package/mw/gotoService/simpleRTS.js

@@ -60,10 +60,10 @@ module.exports = (configuration) => {
 				})
 				.catch((err) => {
 					req.soajs.log.error(err.code, err.message);
-					// if (req.soajs.controller.redirectedRequest) {
-					// 	req.soajs.controller.redirectedRequest.destroy();
-					// 	req.soajs.controller.redirectedRequest = null;
-					// }
+					if (req.soajs.controller.redirectedRequest) {
+						req.soajs.controller.redirectedRequest.destroy();
+						req.soajs.controller.redirectedRequest = null;
+					}
 					if (!req.soajs.controller.monitorEndingReq) {
 						return req.soajs.controllerResponse(core.error.getError(135));
 					}

package/mw/mt/index.js

@@ -325,6 +325,7 @@ module.exports = (configuration) => {
 																injectObj.awareness.interConnect.push(item);
 															} else {
 																req.soajs.log.debug(serviceName + " interConnect failed to fetch latestVersion for [" + item.name + "]");
+																injectObj.awareness.interConnect.push(item);
 															}
 															return callback();
 														});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.controller",
   "description": "soajs multi tenant API gateway",
-  "version": "4.2.37",
+  "version": "4.2.39",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"