soajs.controller 4.0.43 → 4.0.47

package/.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 
-node_js: 12
+node_js: 16
 
 jobs:
   include:
@@ -56,9 +56,11 @@ jobs:
     - docker tag soajsorg/gateway:latest soajsorg/gateway:${MAJOR_VERSION}.x
 
     - docker push soajsorg/gateway
+    - docker push soajsorg/gateway:${PACKAGE_VERSION}
+    - docker push soajsorg/gateway:${MAJOR_VERSION}.x
     deploy:
       on:
         all_branches: true
       provider: releases
       api_key: ${GIT_TOKEN}
-      skip_cleanup: true
+      skip_cleanup: true

package/lib/parseURL.js

@@ -12,46 +12,46 @@ const url = require('url');
 
 
 module.exports = (uri, parsedUrl) => {
-    let serviceInfo = parsedUrl.pathname.split('/');
-    let service_nv = serviceInfo[1];
-    let service_n = service_nv;
-    let service_v = null;
-
-    //check if there is /v1 or v1.1 in the url
-    let matches = uri.match(/\/v[0-9]+(.[0-9]+)?\//);
-    if (matches && matches.length > 0) {
-        let hit = matches[0].replace(/\//g, '');
-        if (serviceInfo[2] === hit && serviceInfo.length > 3) {
-            service_v = hit.replace("v", '');
-            serviceInfo.splice(2, 1);
-            uri = uri.replace(matches[0], "/");
-            parsedUrl = url.parse(uri, true);
-        }
-    }
-
-    //check if there is service:1 or :1.1 in the url
-    if (!service_v) {
-        let index = service_nv.indexOf(":");
-        if (index !== -1) {
-            matches = service_nv.match(/:[0-9]+(.[0-9]+)?/);
-            if (matches && matches.length > 0) {
-                service_v = service_nv.substr(index + 1);
-            }
-            service_n = service_nv.substr(0, index);
-        }
-    }
-    let versionRequested = false;
-    if (service_v !== null){
-	    versionRequested = true;
-    }
-    return ({
-        "url": uri,
-        "parsedUrl": parsedUrl,
-        "serviceInfo": serviceInfo,
-        "service_n": service_n,
-        "service_nv": service_nv,
-        "service_v": service_v,
-	    "versionRequested": versionRequested,
-        "name": service_n
-    });
-};
+	let serviceInfo = parsedUrl.pathname.split('/');
+	let service_nv = serviceInfo[1];
+	let service_n = service_nv;
+	let service_v = null;
+	
+	//check if there is /v1 or v1.1 in the url
+	let matches = uri.match(/\/v[0-9]+(.[0-9]+)?\//);
+	if (matches && matches.length > 0) {
+		let hit = matches[0].replace(/\//g, '');
+		if (serviceInfo[2] === hit && serviceInfo.length > 3) {
+			service_v = hit.replace("v", '');
+			serviceInfo.splice(2, 1);
+			uri = uri.replace(matches[0], "/");
+			parsedUrl = url.parse(uri, true);
+		}
+	}
+	
+	//check if there is service:1 or :1.1 in the url
+	if (!service_v) {
+		let index = service_nv.indexOf(":");
+		if (index !== -1) {
+			matches = service_nv.match(/:[0-9]+(.[0-9]+)?/);
+			if (matches && matches.length > 0) {
+				service_v = service_nv.substr(index + 1);
+			}
+			service_n = service_nv.substr(0, index);
+		}
+	}
+	let versionRequested = false;
+	if (service_v !== null) {
+		versionRequested = true;
+	}
+	return ({
+		"url": uri,
+		"parsedUrl": parsedUrl,
+		"serviceInfo": serviceInfo,
+		"service_n": service_n,
+		"service_nv": service_nv,
+		"service_v": service_v,
+		"versionRequested": versionRequested,
+		"name": service_n
+	});
+};

package/modules/driver/kubernetes/model/index.js

@@ -88,4 +88,4 @@ let driver = {
 	}
 };
 
-module.exports = driver;
+module.exports = driver;

package/modules/registry/index.js

@@ -827,4 +827,4 @@ let registryModule = {
 	}
 };
 
-module.exports = registryModule;
+module.exports = registryModule;

package/mw/gotoService/proxyRequest.js

@@ -61,8 +61,10 @@ module.exports = (configuration) => {
 				req.soajs.controller.redirectedRequest = request(requestConfig);
 				req.soajs.controller.redirectedRequest.on('error', function (error) {
 					req.soajs.log.error(error.message);
-					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/simpleRTS.js

@@ -25,7 +25,7 @@ module.exports = (configuration) => {
 	 */
 	return (req, res) => {
 		preRedirect(req, res, core, function (obj) {
-			req.pause();
+			// req.pause();
 			
 			let requestOptions = url.parse(obj.uri);
 			requestOptions.headers = req.headers;
@@ -46,17 +46,19 @@ module.exports = (configuration) => {
 					serverResponse.resume();
 				});
 				req.soajs.controller.redirectedRequest.on('error', function (err) {
-					req.soajs.log.error(err.message);
-					req.soajs.controller.redirectedRequest.destroy();
-					req.soajs.controller.redirectedRequest = null;
+					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.monitorEndingReq) {
 						return req.soajs.controllerResponse(core.error.getError(135));
 					}
 				});
 				req.pipe(req.soajs.controller.redirectedRequest, {end: true});
-				req.resume();
+				// req.resume();
 			} catch (e) {
-				req.soajs.log.error(e.message + " @catch.");
+				req.soajs.log.error(e.message + " @catch");
 				if (req.soajs.controller.redirectedRequest) {
 					req.soajs.controller.redirectedRequest.destroy();
 					req.soajs.controller.redirectedRequest = null;

package/mw/mt/utils.js

@@ -756,4 +756,4 @@ let utils = {
 	}
 };
 
-module.exports = utils;
+module.exports = utils;

package/mw/url/index.js

@@ -18,7 +18,9 @@ let libParseURL = require('../../lib/parseURL');
  *
  * @returns {Function}
  */
-module.exports = () => {
+module.exports = (configuration) => {
+	let core = configuration.core;
+	
 	return (req, res, next) => {
 		if (!req.soajs) {
 			throw new TypeError('soajs mw is not started');
@@ -37,8 +39,10 @@ module.exports = () => {
 			req.query = {};
 		}
 		req.soajs.controller.serviceParams = libParseURL(req.url, parsedUrl);
-		
-		let key = req.headers.key || parsedUrl.query.key;
+		if (!req.soajs.controller.serviceParams.service_n || req.soajs.controller.serviceParams.service_n === '') {
+			return req.soajs.controllerResponse(core.error.getError(136));
+		}
+		let key = req.headers.key || req.query.key;
 		if (!req.headers.key) {
 			req.headers.key = key;
 		}
@@ -56,4 +60,4 @@ module.exports = () => {
 		}
 		return next();
 	};
-};
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "soajs.controller",
-  "description": "soajs API gateway",
-  "version": "4.0.43",
+  "description": "soajs multi tenant API gateway",
+  "version": "4.0.47",
   "author": {
     "name": "soajs team",
     "email": "team@soajs.org"
@@ -29,10 +29,10 @@
     "oauth2-server": "2.4.1",
     "path-to-regexp": "6.2.0",
     "request": "2.88.2",
-    "useragent": "2.3.0",
     "soajs.core.libs": "1.2.0",
-    "soajs.core.modules": "5.0.17",
-    "soajs.urac.driver": "3.0.19"
+    "soajs.core.modules": "5.0.20",
+    "soajs.urac.driver": "3.0.21",
+    "useragent": "2.3.0"
   },
   "devDependencies": {
     "express": "4.17.1",

package/server/controller.js

@@ -127,7 +127,7 @@ Controller.prototype.init = function (callback) {
 					
 					app.use(enhancer_mw());
 					
-					app.use(url_mw());
+					app.use(url_mw({"core": core}));
 					
 					app.use(key_mw({"provision": provision, "regEnvironment": regEnvironment}));
 					
@@ -181,8 +181,8 @@ Controller.prototype.init = function (callback) {
 						req.on("close", () => {
 							if (req.soajs.controller.redirectedRequest) {
 								req.soajs.log.info("Request closed:", req.url);
-								req.soajs.controller.redirectedRequest.destroy();
-								req.soajs.controller.redirectedRequest = null;
+								// req.soajs.controller.redirectedRequest.destroy();
+								// req.soajs.controller.redirectedRequest = null;
 							}
 						});
 					});
@@ -327,4 +327,4 @@ Controller.prototype.stop = function (registry, log, service, server, serverMain
 	});
 };
 
-module.exports = Controller;
+module.exports = Controller;

package/test/data/provision/products/dsbrd.js

@@ -276,4 +276,4 @@ let prod = {
 	]
 };
 
-module.exports = prod;
+module.exports = prod;

package/test/data/provision/resources/dash_cluster.js

@@ -27,9 +27,9 @@ let resource = {
 			batchSize: 1000
 		},
 		URLParam: {
-			bufferMaxEntries: 0
+			"useUnifiedTopology": true
 		},
 		timeConnected: 1552747598093.0
 	}
 };
-module.exports = resource;
+module.exports = resource;

package/test/integration/UC1-gateway-routes/index.js

@@ -336,4 +336,4 @@ describe("Integration for Usecase 1", function () {
 			done();
 		});
 	});
-});
+});

package/test/integration/UC1-gateway-routes/manual/http.js

@@ -0,0 +1,28 @@
+"use strict";
+
+const http = require('http');
+const options = new URL('http://www.google.com');
+console.log(options)
+let redirectedRequest = http.request(options, function (serverResponse) {
+	console.log(serverResponse.headers);
+	// serverResponse.pause();
+	serverResponse.headers['access-control-allow-origin'] = '*';
+	serverResponse.on('data', (chunk) => {
+		// console.log(`BODY: ${chunk}`);
+	});
+	serverResponse.on('end', () => {
+		console.log('No more data in response.');
+		process.exit(0);
+	});
+	// serverResponse.resume();
+});
+redirectedRequest.on('error', function (err) {
+	console.log('error');
+});
+redirectedRequest.on('socket', function (err) {
+	console.log('socket');
+});
+redirectedRequest.on('close', function (err) {
+	console.log('close');
+});
+redirectedRequest.end();

package/test/integration/UC1-gateway-routes/manual/oauth.js

@@ -0,0 +1,9 @@
+"use strict";
+
+let oauthserver = require('../oauth-service-mock.js');
+
+let oauthServers = null;
+
+oauthserver.startServer({s: {port: 4004}, m: {port: 5004}, name: "OAUTH"}, function (servers) {
+	oauthServers = servers;
+});

package/test/integration/UC1-gateway-routes/manual/test.js

@@ -0,0 +1,21 @@
+"use strict";
+
+const helper = require("../../../helper.js");
+const requester = require('../../requester');
+let localConfig = helper.requireModule('./config.js');
+
+let extKey = "3d90163cf9d6b3076ad26aa5ed58556348069258e5c6c941ee0f18448b570ad1c5c790e2d2a1989680c55f4904e2005ff5f8e71606e4aa641e67882f4210ebbc5460ff305dcb36e6ec2a2299cf0448ef60b9e38f41950ec251c1cf41f05f3ce9";
+let options = {
+	uri: 'http://127.0.0.1:' + localConfig.servicePort + '/oauth/passport/login',
+	headers: {
+		'Content-Type': 'application/json',
+		'Connection': 'keep-alive',
+		key: extKey
+	},
+	"qs": {
+		access_token: "cfb209a91b23896820f510aadbf1f4284b512123"
+	}
+};
+requester('get', options, (error, body) => {
+	console.log(body.errors)
+});

package/test/integration/UC1-gateway-routes/oauth-service-mock.js

@@ -4,53 +4,53 @@ const sApp = express();
 const mApp = express();
 
 function startServer(serverConfig, callback) {
-    let mReply = {
-        'result': true,
-        'ts': Date.now(),
-        'service': {
-            'service': serverConfig.name,
-            'type': 'rest',
-            'route': "/heartbeat"
-        }
-    };
-    let sReply = {
-        'result': true,
-        'data': {
-            'firstname': "antoine",
-            'lastname': "hage"
-        }
-    };
-
-  
-    sApp.get('/passport/login', (req, res) => res.json(sReply));
- 
-    mApp.get('/heartbeat', (req, res) => res.json(mReply));
-
-    let sAppServer = sApp.listen(serverConfig.s.port, () => console.log(`${serverConfig.name} service mock listening on port ${serverConfig.s.port}!`));
-    let mAppServer = mApp.listen(serverConfig.m.port, () => console.log(`${serverConfig.name} service mock listening on port ${serverConfig.m.port}!`));
-
-    return callback(
-        {
-            "sAppServer": sAppServer,
-            "mAppServer": mAppServer,
-            "name": serverConfig.name
-        }
-    )
+	let mReply = {
+		'result': true,
+		'ts': Date.now(),
+		'service': {
+			'service': serverConfig.name,
+			'type': 'rest',
+			'route': "/heartbeat"
+		}
+	};
+	let sReply = {
+		'result': true,
+		'data': {
+			'firstname': "antoine",
+			'lastname': "hage"
+		}
+	};
+	
+	
+	sApp.get('/passport/login', (req, res) => res.json(sReply));
+	
+	mApp.get('/heartbeat', (req, res) => res.json(mReply));
+	
+	let sAppServer = sApp.listen(serverConfig.s.port, () => console.log(`${serverConfig.name} service mock listening on port ${serverConfig.s.port}!`));
+	let mAppServer = mApp.listen(serverConfig.m.port, () => console.log(`${serverConfig.name} service mock listening on port ${serverConfig.m.port}!`));
+	
+	return callback(
+		{
+			"sAppServer": sAppServer,
+			"mAppServer": mAppServer,
+			"name": serverConfig.name
+		}
+	)
 }
 
 function killServer(config) {
-    console.log("killing server ....");
-
-    config.mAppServer.close((err) => {
-        console.log("...sAppServer: " + config.name);
-    });
-
-    config.sAppServer.close((err) => {
-        console.log("...mAppServer: " + config.name);
-    });
+	console.log("killing server ....");
+	
+	config.mAppServer.close((err) => {
+		console.log("...sAppServer: " + config.name);
+	});
+	
+	config.sAppServer.close((err) => {
+		console.log("...mAppServer: " + config.name);
+	});
 }
 
 module.exports = {
-    startServer: startServer,
-    killServer: killServer
-};
+	startServer: startServer,
+	killServer: killServer
+};

package/test/integration/requester.js

@@ -4,7 +4,7 @@ let request = require("request");
 
 function requester(method, params, cb) {
 	let requestOptions = {
-		timeout: 30000,
+		// timeout: 30000,
 		'uri': params.uri,
 		'json': params.body || true
 	};
@@ -55,4 +55,4 @@ function requester(method, params, cb) {
 	}
 }
 
-module.exports = requester;
+module.exports = requester;