asksuite-translate-json-object - npm Package Compare versions

Comparing version 0.0.7-development to 0.0.8-development

lib/service/google.js

@@ -7,4 +7,2 @@ var translateService;
 var map
-var cont = 0;
-
 var url = {}
@@ -14,91 +12,75 @@
 	url = urls;
-	client = request.createClient(url.url);
-	map = new Map();
-}
 
+	var client = request.createClient(url.url);
 
-// eslint-disable-next-line max-params
-function translateObject(language, key, destObj, keysArray, valuesArray) {
+}
 
 
-	return new Promise(function (resolve, reject) {
+function initMap() {
 
-		if (map.get(JSON.stringify(valuesArray))) {
 
-			var res = map.get(JSON.stringify(valuesArray))
 
-			for (var i = 0; i < keysArray.length; i++) {
-				destObj[key][keysArray[i]] = res[i];
-			}
+		return new Promise(function (resolve, reject) {
 
-			resolve(destObj);
+			if (!map) {
 
-		} else {
+				map = new Map();
 
-			client = request.createClient(url.url, {timeout: 10000});
-			client.post('translate/' + language, valuesArray)
-				.then(function (result) {
+				var client = request.createClient(url.url);
+				client.get('translates').then(function (results) {
 
-					var res = result.body;
 
-					map.set(JSON.stringify(valuesArray), res)
+					results.body.forEach(item => {
+						console.log(item.ptBR);
+						map.set(item.ptBR, item);
+					});
+					resolve();
 
-					for (var i = 0; i < keysArray.length; i++) {
-						destObj[key][keysArray[i]] = res[i];
-					}
+				});
+			}else{
+				resolve();
+			}
+		})
 
-					resolve(destObj);
 
-				}).catch(function (err) {
-				console.log("deu erro 1");
-				// reject(err);
+}
 
 
-				if (cont > 20){
-					cont = 0;
-				}
+// eslint-disable-next-line max-params
+ function  translateObject(language, key, destObj, keysArray, valuesArray) {
 
-				setTimeout(function () {
-					client = request.createClient(url.url, {timeout: 10000});
-					client.post('translate/' + language, valuesArray)
-						.then(function (result) {
 
-							var res = result.body;
+	return new Promise( async function (resolve, reject) {
 
-							map.set(JSON.stringify(valuesArray), res)
 
-							for (var i = 0; i < keysArray.length; i++) {
-								destObj[key][keysArray[i]] = res[i];
-							}
+		for (var i = 0; i < keysArray.length; i++) {
 
-							resolve(destObj);
-						}).catch(error => {
-						console.log("deu erro 2");
+			let value = valuesArray[i];
 
-						client = request.createClient(url.url);
-						client.post('translate/' + language, valuesArray)
-							.then(function (result) {
+			let languageMAP = {
+				"pt-br": "ptBR",
+				"en": "enUS",
+				"es": "es"
+			};
 
-								var res = result.body;
+			let valor = map.get(value)[languageMAP[language]];
 
-								map.set(JSON.stringify(valuesArray), res)
 
-								for (var i = 0; i < keysArray.length; i++) {
-									destObj[key][keysArray[i]] = res[i];
-								}
+			console.log("VALOR", valor);
 
-								resolve(destObj);
-							}).catch(error => {
-							console.log("deu erro 3");
-							resolve(destObj);
+			if (valor){
 
-						})
+				destObj[key][keysArray[i]] = valor;
 
-					})
-				}, 500 * cont++)
+			}else{
+				var client = request.createClient(url.url);
+				let bodyData = await	client.post('translate/' + language, [value]);
+			//	console.log(bodyData);
+				destObj[key][keysArray[i]] = 	bodyData.body[0];
 
+			}
 
-			})
 		}
 
+		resolve(destObj);
 
@@ -112,3 +94,2 @@ });
 
-	console.log("entrei aqui")
 
@@ -131,3 +112,4 @@ return new Promise(function (resolve, reject) {
 	object: translateObject,
-	string: translateString
+	string: translateString,
+	initMap: initMap
 };

lib/translate-json-object.js

@@ -30,7 +30,5 @@ var _ = require('lodash');
 
-
 		setting = options || {};
 
 
-
 		if (!setting.url && !setting.yandexApiKey && !setting.msKey) {
@@ -145,21 +143,19 @@ console.warn(constant.ERROR.MISSING_TOKEN);
 		return new Promise(function (resolve, reject) {
-			Promise.map(promises, function(promise) {
-				// Promise.map awaits for returned promises as well.
-				return translateSrv.object(promise.language, promise.key, promise.dest, promise.keysArray, promise.valuesArray)
-			}, {concurrency: 20}).then(function(res) {
-				if (ARRAY_ROOT_TYPE) {
-					resolve(destObj.ROOT.arrayType);
-				} else {
-					resolve(destObj.ROOT);
-				}
-			}).catch(error => {
 
-				console.log(error)
-				console.log("deu erro ao traduri")
-			})
-		});
+			translateSrv.initMap().then(function () {
+				Promise.map(promises, function (promise) {
+					// Promise.map awaits for returned promises as well.
+					return translateSrv.object(promise.language, promise.key, promise.dest, promise.keysArray, promise.valuesArray)
+				}, {concurrency: 25}).then(function (res) {
+					if (ARRAY_ROOT_TYPE) {
+						resolve(destObj.ROOT.arrayType);
+					} else {
+						resolve(destObj.ROOT);
+					}
+				}).catch(error => {
 
+				})
+			});
+		})
 
-
-
 	}
@@ -166,0 +162,0 @@

package.json

 {
   "name": "asksuite-translate-json-object",
-  "version": "0.0.7-development",
+  "version": "0.0.8-development",
   "description": "Translate a JSON object to any language via google or yandex translate API",
@@ -5,0 +5,0 @@ "main": "lib/translate-json-object.js",

No alert changes

Worsened metrics

Total package byte prevSize

28710

decreased by-2.48%

Lines of code

610

decreased by-2.71%

No dependency changes