soajs.controller 4.2.20 → 4.2.31

package/mw/awarenessEnv/custom.js

@@ -8,10 +8,10 @@
  * found in the LICENSE file at the root of this repository
  */
 
-const request = require('request');
 const async = require('async');
 
 const registryModule = require("./../../modules/registry");
+const { checkStatus } = require("../../lib/request.js");
 
 let gatewayServiceName = null;
 let regEnvironment = (process.env.SOAJS_ENV || "dev");
@@ -34,7 +34,7 @@ let fetchControllerHosts = function (core, log, next) {
 		setTimeout(() => {
 			fetchControllerHosts(core, log);
 		}, registry.serviceConfig.awareness.autoRelaodRegistry);
-		
+
 		if (next && typeof next === "function") {
 			next();
 		}
@@ -43,7 +43,7 @@ let fetchControllerHosts = function (core, log, next) {
 
 let awareness_healthCheck = function (core, log) {
 	registry = registryModule.get();
-	
+
 	let resume = () => {
 		if (controllerHosts && Array.isArray(controllerHosts) && controllerHosts.length > 0) {
 			let controllerPort = registry.services.controller.port;
@@ -53,7 +53,7 @@ let awareness_healthCheck = function (core, log) {
 						serviceAwarenessObj[sObj.env] = {};
 					}
 					if (!serviceAwarenessObj[sObj.env][sObj.name]) {
-						serviceAwarenessObj[sObj.env][sObj.name] = {"healthy": {}, "indexes": {}, "latest": 1};
+						serviceAwarenessObj[sObj.env][sObj.name] = { "healthy": {}, "indexes": {}, "latest": 1 };
 					}
 					if (!serviceAwarenessObj[sObj.env][sObj.name].healthy[sObj.version]) {
 						serviceAwarenessObj[sObj.env][sObj.name].healthy[sObj.version] = [];
@@ -61,17 +61,18 @@ let awareness_healthCheck = function (core, log) {
 					if (!serviceAwarenessObj[sObj.env][sObj.name].indexes[sObj.version]) {
 						serviceAwarenessObj[sObj.env][sObj.name].indexes[sObj.version] = 0;
 					}
-					request({
-						'uri': 'http://' + sObj.ip + ':' + (controllerPort + registry.serviceConfig.ports.maintenanceInc) + '/heartbeat'
-					}, function (error, response) {
-						if (serviceAwarenessObj[sObj.env][sObj.name].latest < sObj.version) {
-							serviceAwarenessObj[sObj.env][sObj.name].latest = sObj.version;
-						}
-						if (!error && response.statusCode === 200) {
+
+					if (serviceAwarenessObj[sObj.env][sObj.name].latest < sObj.version) {
+						serviceAwarenessObj[sObj.env][sObj.name].latest = sObj.version;
+					}
+					checkStatus('http://' + sObj.ip + ':' + (controllerPort + registry.serviceConfig.ports.maintenanceInc) + '/heartbeat')
+						.then(() => {
 							if (serviceAwarenessObj[sObj.env][sObj.name].healthy[sObj.version].indexOf(sObj.ip) === -1) {
 								serviceAwarenessObj[sObj.env][sObj.name].healthy[sObj.version].push(sObj.ip);
 							}
-						} else {
+							callback();
+						})
+						.catch(() => {
 							if (serviceAwarenessObj[sObj.env][sObj.name].healthy[sObj.version].indexOf(sObj.ip) !== -1) {
 								//TODO: if we guarantee uniqueness we will not need the for loop
 								for (let ii = 0; ii < serviceAwarenessObj[sObj.env][sObj.name].healthy[sObj.version].length; ii++) {
@@ -80,9 +81,30 @@ let awareness_healthCheck = function (core, log) {
 									}
 								}
 							}
-						}
-						callback();
-					});
+							callback();
+						});
+					// request({
+					// 	'uri': 'http://' + sObj.ip + ':' + (controllerPort + registry.serviceConfig.ports.maintenanceInc) + '/heartbeat'
+					// }, function (error, response) {
+					// 	if (serviceAwarenessObj[sObj.env][sObj.name].latest < sObj.version) {
+					// 		serviceAwarenessObj[sObj.env][sObj.name].latest = sObj.version;
+					// 	}
+					// 	if (!error && response.statusCode === 200) {
+					// 		if (serviceAwarenessObj[sObj.env][sObj.name].healthy[sObj.version].indexOf(sObj.ip) === -1) {
+					// 			serviceAwarenessObj[sObj.env][sObj.name].healthy[sObj.version].push(sObj.ip);
+					// 		}
+					// 	} else {
+					// 		if (serviceAwarenessObj[sObj.env][sObj.name].healthy[sObj.version].indexOf(sObj.ip) !== -1) {
+					// 			//TODO: if we guarantee uniqueness we will not need the for loop
+					// 			for (let ii = 0; ii < serviceAwarenessObj[sObj.env][sObj.name].healthy[sObj.version].length; ii++) {
+					// 				if (serviceAwarenessObj[sObj.env][sObj.name].healthy[sObj.version][ii] === sObj.ip) {
+					// 					serviceAwarenessObj[sObj.env][sObj.name].healthy[sObj.version].splice(ii, 1);
+					// 				}
+					// 			}
+					// 		}
+					// 	}
+					// 	callback();
+					// });
 				}, function (err) {
 					if (err) {
 						log.warn('Unable to build awareness ENV structure for controllers: ' + err);
@@ -93,13 +115,13 @@ let awareness_healthCheck = function (core, log) {
 			awareness_healthCheck(core, log);
 		}, registry.serviceConfig.awareness.healthCheckInterval);
 	};
-	
+
 	if (timeLoaded !== registry.timeLoaded) {
 		fetchControllerHosts(core, log, resume);
 	} else {
 		resume();
 	}
-	
+
 	timeLoaded = registry.timeLoaded;
 };
 
@@ -123,7 +145,7 @@ function roundRobin() {
 			env = arguments[2];
 			break;
 	}
-	
+
 	env = env || regEnvironment;
 	s = gatewayServiceName;
 	if (env && s && serviceAwarenessObj[env] && serviceAwarenessObj[env][s] && serviceAwarenessObj[env][s].healthy) {

package/mw/gotoService/index.js

@@ -18,29 +18,29 @@ const gtw_keyACL = require("./../soajsRoutes/keyACL/index.js");
 module.exports = (configuration) => {
 	let provision = configuration.provision;
 	let core = configuration.core;
-	
+
 	let soajs_keyACL = gtw_keyACL({
 		"provision": provision,
 		"serviceName": configuration.serviceName,
 		"serviceVersion": configuration.serviceVersion,
 		"core": core
 	});
-	
+
 	let extractBuildParameters = require("./lib/extractBuildParameters.js");
-	
+
 	let simpleRTS = require("./simpleRTS.js")(configuration);
 	let redirectToService = require("./redirectToService.js")(configuration);
 	let proxyRequest = require("./proxyRequest.js")(configuration);
 	let roaming = require("./roaming.js")(configuration);
-	
-	
+
+
 	return (req, res, next) => {
 		let serviceInfo = req.soajs.controller.serviceParams.serviceInfo;
 		let parsedUrl = req.soajs.controller.serviceParams.parsedUrl;
 		let service_nv = req.soajs.controller.serviceParams.service_nv;
 		let service_n = req.soajs.controller.serviceParams.service_n;
 		let service_v = req.soajs.controller.serviceParams.service_v;
-		
+
 		//check if route is soajs/acl then you also need to bypass the exctract Build Param BL
 		let url_keyACL = (serviceInfo[1] === 'soajs' && serviceInfo[2] === 'acl');
 		if (url_keyACL) {
@@ -62,7 +62,7 @@ module.exports = (configuration) => {
 					pathname: parsedUrl.pathname
 				};
 			}
-			
+
 			extractBuildParameters(req, service_n, service_nv, service_v, proxyInfo, parsedUrl.path, core, function (error, parameters) {
 				if (error) {
 					if (error.message) {
@@ -73,35 +73,36 @@ module.exports = (configuration) => {
 					req.soajs.log.debug(req.headers);
 					return req.soajs.controllerResponse(core.error.getError(130));
 				}
-				
+
 				if (!parameters) {
 					req.soajs.log.fatal("Service [" + service_n + "] URL [" + req.url + "] couldn't be matched to a service or the service entry in registry is missing [port || hosts]");
 					if (req && req.soajs &&
 						req.soajs.registry &&
-						req.soajs.registry.services) {
+						req.soajs.registry.services &&
+						req.soajs.registry.services[service_n]) {
 						req.soajs.log.debug(req.soajs.registry.services[service_n]);
 					}
 					req.soajs.log.debug(req.headers);
 					return req.soajs.controllerResponse(core.error.getError(130));
 				}
-				
+
 				for (let param in parameters) {
 					if (Object.hasOwnProperty.call(parameters, param)) {
 						req.soajs.controller.serviceParams[param] = parameters[param];
 					}
 				}
-				
+
 				let set_gotoservice = () => {
-					
+
 					let passportLogin = false;
 					if (serviceInfo[1] === "oauth") {
 						if (serviceInfo[2] === "passport" && serviceInfo[3] === "login") {
 							passportLogin = true;
 						}
 					}
-					
+
 					let soajsroaming = req.get("soajsroaming");
-					
+
 					if (passportLogin) {
 						req.soajs.controller.gotoservice = simpleRTS;
 					} else if (soajsroaming) {
@@ -112,13 +113,13 @@ module.exports = (configuration) => {
 						req.soajs.controller.gotoservice = redirectToService;
 					}
 				};
-				
+
 				if (parameters.extKeyRequired) {
 					let key = req.headers.key || parsedUrl.query.key;
 					if (!key) {
 						return req.soajs.controllerResponse(core.error.getError(132));
 					}
-					
+
 					core.key.getInfo(key, req.soajs.registry.serviceConfig.key, function (err) {
 						if (err) {
 							req.soajs.log.warn(err.message);

package/mw/gotoService/lib/preRedirect.js

@@ -11,7 +11,7 @@
 
 const get = (p, o) => p.reduce((xs, x) => (xs && xs[x]) ? xs[x] : null, o);
 
-const request = require('request');
+const { checkStatus } = require("../../../lib/request.js");
 
 /**
  *
@@ -70,16 +70,12 @@ module.exports = (req, res, core, cb) => {
 						uri = 'http://' + host + ':' + maintenancePort + path;
 					}
 					req.soajs.log.info("heartbeat @: " + uri);
-					request({
-						'uri': uri,
-						'headers': req.headers
-					}, function (error, response) {
-						let resContentType = res.getHeader('content-type');
-						//let isStream = false;
-						if (resContentType) {
-							isStream = resContentType.match(/stream/i);
-						}
-						if (!error && response.statusCode === 200) {
+					checkStatus(uri)
+						.then(() => {
+							let resContentType = res.getHeader('content-type');
+							if (resContentType) {
+								isStream = resContentType.match(/stream/i);
+							}
 							if (isStream) {
 								req.soajs.controller.renewalCount--;
 								req.soajs.log.info('Stream detected for [' + req.url + ']. Connection will remain open ...');
@@ -87,7 +83,8 @@ module.exports = (req, res, core, cb) => {
 								req.soajs.log.info('... able to renew request for ', requestTO, 'seconds');
 								res.setTimeout(timeToRenew, renewReqMonitor);
 							}
-						} else {
+						})
+						.catch(() => {
 							req.soajs.controller.monitorEndingReq = true;
 							req.soajs.log.error(restServiceParams_msg + ' - Service heartbeat is not responding');
 							if (req.soajs.controller.redirectedRequest) {
@@ -95,8 +92,7 @@ module.exports = (req, res, core, cb) => {
 								req.soajs.controller.redirectedRequest = null;
 							}
 							return req.soajs.controllerResponse(core.error.getError(133));
-						}
-					});
+						});
 				} else {
 					if (req.soajs.controller.redirectedRequest) {
 						req.soajs.log.info("Request aborted: " + req.soajs.controller.renewalCount + " ", req.url);

package/mw/gotoService/proxyRequest.js

@@ -9,14 +9,15 @@
  */
 
 const registryModule = require("./../../modules/registry");
-const request = require('request');
+const { proxyRequest } = require("../../lib/request.js");
+const querystring = require('querystring');
 
 module.exports = (configuration) => {
 	let core = configuration.core;
-	
+
 	let regEnvironment = (process.env.SOAJS_ENV || "dev");
 	regEnvironment = regEnvironment.toLowerCase();
-	
+
 	/**
 	 * load controller information for remote requested environment and proxy the request to its controller.
 	 *
@@ -28,67 +29,69 @@ module.exports = (configuration) => {
 	 */
 	let proxyRequestToRemoteEnv = (req, res, next, remoteENV, remoteExtKey, requestedRoute) => {
 		let triggerProxy = (myUri, requestTO) => {
-			let requestConfig = {
-				'uri': myUri,
-				'method': req.method,
-				'timeout': requestTO * 1000,
-				'jar': false,
-				'headers': req.headers
-			};
-			
+			let requestConfig = {};
+			try {
+				const urlObj = new URL(myUri);
+				let queryParams = {};
+				//add query params
+				if (req.query && Object.keys(req.query).length > 0) {
+					queryParams = req.query;
+					delete queryParams.proxyRoute;
+					delete queryParams.__env;
+				}
+				const queryString = querystring.stringify(queryParams);
+				const fullPath = urlObj.pathname + (queryString ? `?${queryString}` : '');
+
+				requestConfig = {
+					"hostname": urlObj.hostname,
+					"port": urlObj.port,
+					"path": fullPath, // Use the full path with query parameters
+					"method": req.method.toUpperCase(),
+					'timeout': requestTO * 1000,
+					'headers': req.headers
+				};
+			} catch (error) {
+				req.soajs.log.error(error.message);
+				return req.soajs.controllerResponse(core.error.getError(135));
+			}
+
 			requestConfig.headers.soajs_roaming = regEnvironment;
-			
+
 			if (remoteExtKey) {
 				//add remote ext key in headers
 				requestConfig.headers.key = remoteExtKey;
 			} else {
 				delete requestConfig.headers.key;
 			}
-			
-			//add remaining query params
-			if (req.query && Object.keys(req.query).length > 0) {
-				requestConfig.qs = req.query;
-				delete requestConfig.qs.proxyRoute;
-				delete requestConfig.qs.__env;
-			}
-			
+
 			delete requestConfig.headers.host;
-			
+
 			req.soajs.log.debug(requestConfig);
-			
-			try {
-				//proxy request
-				req.soajs.controller.redirectedRequest = request(requestConfig);
-				req.soajs.controller.redirectedRequest.on('error', function (error) {
+
+			const extraOptions = {
+				"fetchProxReq": (proxyReq) => {
+					req.soajs.controller.redirectedRequest = proxyReq;
+				}
+			};
+
+			proxyRequest(req, res, requestConfig, extraOptions)
+				.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));
 				});
-				
-				if (req.method === 'POST' || req.method === 'PUT' || req.method === 'PATCH' || req.method === 'DELETE') {
-					req.pipe(req.soajs.controller.redirectedRequest).pipe(res);
-				} else {
-					req.soajs.controller.redirectedRequest.pipe(res);
-				}
-				
-			} catch (e) {
-				req.soajs.log.error(e.message);
-				if (req.soajs.controller.redirectedRequest) {
-					req.soajs.controller.redirectedRequest.destroy();
-					req.soajs.controller.redirectedRequest = null;
-				}
-				return req.soajs.controllerResponse(core.error.getError(135));
-			}
 		};
+
 		if (!remoteENV) {
 			triggerProxy(requestedRoute, 30);
 		}
 		else {
 			//get remote env registry
-			registryModule.loadByEnv({"envCode": remoteENV}, function (err, reg) {
+			registryModule.loadByEnv({ "envCode": remoteENV }, function (err, reg) {
 				if (err) {
 					req.soajs.log.error(err.message);
 					return req.soajs.controllerResponse(core.error.getError(207));
@@ -103,13 +106,13 @@ module.exports = (configuration) => {
 					}
 					//formulate request and pipe
 					let myUri = reg.protocol + '://' + (reg.apiPrefix ? reg.apiPrefix + "." : "") + reg.domain + ':' + reg.port + requestedRoute;
-					
+
 					triggerProxy(myUri, requestTO);
 				}
 			});
 		}
 	};
-	
+
 	/**
 	 * function that finds if this tenant has a dashboard access extkey for requested env code
 	 * @param {Object} tenant
@@ -119,10 +122,10 @@ module.exports = (configuration) => {
 	let findExtKeyForEnvironment = (tenant, env) => {
 		let key = null;
 		tenant.applications.forEach(function (oneApplication) {
-			
+
 			//loop in tenant keys
 			oneApplication.keys.forEach(function (oneKey) {
-				
+
 				//loop in tenant ext keys
 				oneKey.extKeys.forEach(function (oneExtKey) {
 					//get the ext key for the request environment who also has dashboardAccess true
@@ -135,7 +138,7 @@ module.exports = (configuration) => {
 		});
 		return key;
 	};
-	
+
 	/**
 	 * function that fetches a tenant record from core.provision
 	 * @param {string} tCode
@@ -144,14 +147,14 @@ module.exports = (configuration) => {
 	let getOriginalTenantRecord = (tCode, cb) => {
 		core.provision.getTenantByCode(tCode, cb);
 	};
-	
+
 	return (req, res, next) => {
 		/*
 		 get ext key for remote env requested
 		 */
 		let tenant = req.soajs.tenant;
 		let parsedUrl = req.soajs.controller.serviceParams.parsedUrl;
-		
+
 		let remoteENV = req.headers.__env;
 		if (parsedUrl.query && parsedUrl.query.__env) {
 			remoteENV = parsedUrl.query.__env;
@@ -164,12 +167,12 @@ module.exports = (configuration) => {
 		if (parsedUrl.query && parsedUrl.query.proxyRoute) {
 			requestedRoute = decodeURIComponent(parsedUrl.query.proxyRoute);
 		}
-		
+
 		//stop if no requested path was found
 		if (!requestedRoute) {
 			return req.soajs.controllerResponse(core.error.getError(139));
 		}
-		
+
 		if (remoteENV) {
 			req.soajs.log.debug("attempting to redirect to: " + requestedRoute + " in " + remoteENV + " Environment.");
 		} else {
@@ -177,7 +180,7 @@ module.exports = (configuration) => {
 		}
 		let tCode = null;
 		let tExtKey = null;
-		
+
 		if (parsedUrl.query) {
 			if (parsedUrl.query.tCode) {
 				tCode = parsedUrl.query.tCode;
@@ -196,10 +199,10 @@ module.exports = (configuration) => {
 				if (error) {
 					return req.soajs.controllerResponse(core.error.getError(139)); //todo: make sure we have set the correct error code number
 				}
-				
+
 				//get extKey for remote environment for this tenant
 				let remoteExtKey = findExtKeyForEnvironment(originalTenant, remoteENV);
-				
+
 				//no key found
 				if (!remoteExtKey) {
 					req.soajs.log.fatal("No remote key found for tenant: " + tCode + " in environment: " + remoteENV);
@@ -208,7 +211,7 @@ module.exports = (configuration) => {
 					//proceed with proxying the request
 					proxyRequestToRemoteEnv(req, res, next, remoteENV, remoteExtKey, requestedRoute);
 				}
-				
+
 			});
 		}
 		else {