Fix expand srv json

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@kakadu-dev/nodejs-ijson-microservices",
-	"version": "1.5.0",
+	"version": "1.5.1",
 	"description": "Package for create microservice architecture based on NodeJS. ",
 	"keywords": [
 		"node",

src/Gateway.js

@@ -54,6 +54,11 @@ class Gateway
 		serviceParams: {},
 	};
 
+	/**
+	 * @type {boolean} srv ijson expanded
+	 */
+	srvExpand = false;
+
 	/**
 	 * @type {function(msg: string)}
 	 *
@@ -142,6 +147,20 @@ class Gateway
 		return this.myInstance;
 	}
 
+	/**
+	 * Get ijson host
+	 *
+	 * @return {Promise<string>}
+	 */
+	async getIjsonHost() {
+		if (!this.srvExpand) {
+			this.options.ijson = await ExpandSrv(this.options.ijson);
+			this.srvExpand     = true;
+		}
+
+		return this.options.ijson;
+	}
+
 	/**
 	 * Handle gateway request
 	 *
@@ -274,7 +293,8 @@ class Gateway
 			},
 		}, reqParams);
 
-		return axios.post(`${this.options.ijson}/${name}`, new MjRequest(params), config);
+		return this.getIjsonHost()
+				   .then(ijsonHost => axios.post(`${ijsonHost}/${name}`, new MjRequest(params), config));
 	}
 
 	/**
@@ -298,9 +318,8 @@ class Gateway
 					  || (({ name, port, version, env }) => console.info(`${name} gateway started on: ` +
 																		 `${port} port. Version: ${version} (${env})`));
 
-		ExpandSrv(this.options.ijson)
-			.then(ijsonHost => {
-				this.options.ijson = ijsonHost;
+		this.getIjsonHost()
+			.then(() => {
 				this.app.listen(this.options.port, () => clbck(this.options));
 			})
 			.catch(console.error);

src/Microservice.js

@@ -37,6 +37,11 @@ class Microservice
 		requestTimeout: 1000 * 60 * 5, // 5 min
 	};
 
+	/**
+	 * @type {boolean} srv ijson expanded
+	 */
+	srvExpand = false;
+
 	/**
 	 * @type {Object}
 	 *
@@ -144,6 +149,20 @@ class Microservice
 		return this;
 	}
 
+	/**
+	 * Get ijson host
+	 *
+	 * @return {Promise<string>}
+	 */
+	async getIjsonHost() {
+		if (!this.srvExpand) {
+			this.options.ijson = await ExpandSrv(this.options.ijson);
+			this.srvExpand     = true;
+		}
+
+		return this.options.ijson;
+	}
+
 	/**
 	 * Send request to service
 	 *
@@ -167,13 +186,14 @@ class Microservice
 			},
 		}));
 
-		let response = {};
-		const time   = Date.now();
+		let response   = {};
+		const time     = Date.now();
+		const jsonHost = await this.getIjsonHost();
 
 		try {
 			this.logDriver(() => `    --> Request (${service} - ${request.getId()}): ${JSON.stringify(request)}`, 2, request.getId());
 
-			response = (await axios.post(`${this.options.ijson}/${service}`, request, {
+			response = (await axios.post(`${jsonHost}/${service}`, request, {
 				timeout: this.options.requestTimeout,
 				...requestConfig,
 			})).data;
@@ -256,7 +276,7 @@ class Microservice
 		try {
 			const resp = await axios.request({
 				url:       isFirstTask ? `/${this.name}` : null,
-				baseURL:   this.options.ijson,
+				baseURL:   await this.getIjsonHost(),
 				method:    'post',
 				data:      response,
 				httpAgent: this.httpAgent,
@@ -294,7 +314,6 @@ class Microservice
 					  || (({ version, env }) => console.info(`${this.name} microservice started. ` +
 															 `Version: ${version} (${env})`));
 
-		this.options.ijson = await ExpandSrv(this.options.ijson);
 		clbck(this.options);
 
 		let request;