@yrpri/api 9.0.139 → 9.0.141

package/services/models/ac_translation_cache.cjs

@@ -1,7 +1,7 @@
 "use strict";
 const { Translate } = require("@google-cloud/translate").v2;
 const farmhash = require("farmhash");
-const log = require("../utils/logger.cjs");
+const log = require("../../utils/logger.cjs");
 const PAIRWISE_API_HOST = process.env.PAIRWISE_API_HOST;
 const PAIRWISE_USERNAME = process.env.PAIRWISE_USERNAME;
 const PAIRWISE_PASSWORD = process.env.PAIRWISE_PASSWORD;
@@ -57,7 +57,7 @@ module.exports = (sequelize, DataTypes) => {
                     headers: defaultHeader,
                 });
                 if (!choiceResponse.ok) {
-                    console.error("Failed to fetch answers");
+                    log.error("Failed to fetch answers");
                     return null;
                 }
                 const choice = await choiceResponse.json();
@@ -67,7 +67,7 @@ module.exports = (sequelize, DataTypes) => {
                         return data["content"];
                     }
                     catch (error) {
-                        console.error("Failed to parse choice data", error);
+                        log.error("Failed to parse choice data", error);
                         return null;
                     }
                 }
@@ -81,7 +81,7 @@ module.exports = (sequelize, DataTypes) => {
                     headers: defaultHeader,
                 });
                 if (!questionResponse.ok) {
-                    console.error("Failed to fetch question");
+                    log.error("Failed to fetch question");
                     return null;
                 }
                 const question = await questionResponse.json();
@@ -180,13 +180,13 @@ module.exports = (sequelize, DataTypes) => {
                             ? modelInstance.public_data.transcript.text
                             : null;
                     default:
-                        console.error("No valid textType for translation");
+                        log.error("No valid textType for translation");
                         return null;
                 }
             }
         }
         catch (error) {
-            console.error("Failed to get content to translate", error);
+            log.error("Failed to get content to translate", error);
             return null;
         }
     };
@@ -432,7 +432,7 @@ module.exports = (sequelize, DataTypes) => {
                         let languageInfo = {};
                         for (let i = 0; i < textsToTranslate.length; i += chunkSize) {
                             const chunk = textsToTranslate.slice(i, i + chunkSize);
-                            console.log("Calling Google Translate...");
+                            log.info("Calling Google Translate...");
                             const [translatedChunk, info] = await translateAPI.translate(chunk, targetLanguage);
                             translatedStrings.push(...translatedChunk);
                             if (i === 0) {
@@ -469,13 +469,13 @@ module.exports = (sequelize, DataTypes) => {
                 });
             }
             catch (error) {
-                console.error("Failed to get translation from Google", error);
+                log.error("Failed to get translation from Google", error);
             }
             if (!translateAPI) {
                 callback("No translation API");
                 return;
             }
-            console.log("Calling Google Translate...");
+            log.info("Calling Google Translate...");
             translateAPI
                 .translate(contentToTranslate, targetLanguage)
                 .then((results) => {
@@ -621,7 +621,7 @@ module.exports = (sequelize, DataTypes) => {
             }
         }
         catch (error) {
-            console.error("Failed to translate with LLM", error);
+            log.error("Failed to translate with LLM", error);
             callback(error);
         }
     };
@@ -630,7 +630,7 @@ module.exports = (sequelize, DataTypes) => {
             callback("No LLM to translate with");
             return;
         }
-        console.log(`contentToTranslate ${contentToTranslate}`);
+        log.info(`contentToTranslate ${contentToTranslate}`);
         if (!AcTranslationCache.llmTranslation) {
             const { YpLlmTranslation } = await import("../llms/llmTranslation.js");
             AcTranslationCache.llmTranslation = new YpLlmTranslation();

package/services/scripts/analytics/setup_all_plausible_goals.cjs

@@ -1,13 +1,14 @@
 "use strict";
 const { addAllPlausibleGoals } = require("../../engine/analytics/plausible/manager");
+const log = require("../../../utils/logger.cjs");
 (async function () {
     try {
         await addAllPlausibleGoals();
-        console.log("All done");
+        log.info("All done");
         process.exit();
     }
     catch (error) {
-        console.error(error);
+        log.error(error);
         process.exit();
     }
 })();

package/services/scripts/fix_old_delayed_notifications.js

@@ -1,6 +1,6 @@
 var models = require('../../models/index.cjs');
 var async = require('async');
-var log = require('../utils/logger.cjs');
+var log = require('../../utils/logger.cjs');
 var _ = require('lodash');
 var moment = require('moment');
 var i18n = require('../utils/i18n.cjs');
@@ -31,12 +31,12 @@ models.User.findAll({
                 }).then(function (newDelayedNotification) {
                     async.eachSeries(delayedNotifications, function (delayedNotification, delayedNotificationSeriesCallback) {
                         async.eachSeries(delayedNotification.AcNotifications, function (notification, notificationSeriesCallback) {
-                            console.error("NOTID:" + notification.id);
+                            log.error("NOTID:" + notification.id);
                             latestNotification = notification;
                             newDelayedNotification.addAcNotification(notification).then(function () {
                                 notificationSeriesCallback();
                             }).catch(function (error) {
-                                console.error("COULD NOT SAVE NOTIFICATION - COULD NOT SAVE NOTIFICATION - COULD NOT SAVE NOTIFICATION - COULD NOT SAVE NOTIFICATION - COULD NOT SAVE NOTIFICATION");
+                                log.error("COULD NOT SAVE NOTIFICATION - COULD NOT SAVE NOTIFICATION - COULD NOT SAVE NOTIFICATION - COULD NOT SAVE NOTIFICATION - COULD NOT SAVE NOTIFICATION");
                                 notificationSeriesCallback();
                             });
                         }, function (error) {

package/services/scripts/kue_status.js

@@ -1,5 +1,5 @@
 var kue = require('kue'), url = require('url');
-var log = require('../utils/logger.cjs');
+var log = require('../../utils/logger.cjs');
 var toJson = require('../utils/to_json.cjs');
 var airbrake = null;
 if (process.env.AIRBRAKE_PROJECT_ID) {
@@ -14,16 +14,16 @@ var queue = kue.createQueue({
     "socket_keepalive": true
 });
 queue.watchStuckJobs(1000);
-console.log("active");
-queue.activeCount(console.log);
-console.log("inactiveCount");
-queue.inactiveCount(console.log);
-console.log("failedCount");
-queue.failedCount(console.log);
-console.log("delayedCount");
-queue.delayedCount(console.log);
-console.log("completeCount");
-queue.completeCount(console.log);
+log.info("active");
+queue.activeCount(log.info);
+log.info("inactiveCount");
+queue.inactiveCount(log.info);
+log.info("failedCount");
+queue.failedCount(log.info);
+log.info("delayedCount");
+queue.delayedCount(log.info);
+log.info("completeCount");
+queue.completeCount(log.info);
 setTimeout(function () {
     process.exit();
 }, 5000);

package/services/scripts/kue_watch_stuck_jobs.js

@@ -1,5 +1,5 @@
 var kue = require('kue'), url = require('url');
-var log = require('../utils/logger.cjs');
+var log = require('../../utils/logger.cjs');
 var email = require('./email.js');
 var activity = require('./activity.js');
 var toJson = require('../utils/to_json.cjs');
@@ -15,10 +15,10 @@ var queue = kue.createQueue({
     redis: redisUrl,
     "socket_keepalive": true
 });
-queue.activeCount(console.log);
-queue.inactiveCount(console.log);
-queue.failedCount(console.log);
-queue.delayedCount(console.log);
-queue.completeCount(console.log);
+queue.activeCount(log.info);
+queue.inactiveCount(log.info);
+queue.failedCount(log.info);
+queue.delayedCount(log.info);
+queue.completeCount(log.info);
 module.exports = queue;
 export {};

package/services/scripts/translation_clear_language.js

@@ -10,22 +10,22 @@ if (objectType === "point") {
         attributes: ['id', 'language']
     }).then((result) => {
         if (result) {
-            console.log(`Clearing current point language of ${result.language}`);
+            log.info(`Clearing current point language of ${result.language}`);
             result.set('language', null);
             result.save().then(function () {
-                console.log(`Cleared language for point ${result.id}`);
+                log.info(`Cleared language for point ${result.id}`);
                 process.exit();
             }).catch((error) => {
-                console.error(error);
+                log.error(error);
                 process.exit();
             });
         }
         else {
-            console.warn("Not found: " + indexKey);
+            log.warn("Not found: " + indexKey);
             process.exit();
         }
     }).catch((error) => {
-        console.error(error);
+        log.error(error);
         process.exit();
     });
 }
@@ -37,22 +37,22 @@ else if (objectType === "group") {
         attributes: ['id', 'language']
     }).then((result) => {
         if (result) {
-            console.log(`Clearing current group language of ${result.language}`);
+            log.info(`Clearing current group language of ${result.language}`);
             result.set('language', null);
             result.save().then(function () {
-                console.log(`Cleared language for group ${result.id}`);
+                log.info(`Cleared language for group ${result.id}`);
                 process.exit();
             }).catch((error) => {
-                console.error(error);
+                log.error(error);
                 process.exit();
             });
         }
         else {
-            console.warn("Not found: " + indexKey);
+            log.warn("Not found: " + indexKey);
             process.exit();
         }
     }).catch((error) => {
-        console.error(error);
+        log.error(error);
         process.exit();
     });
 }
@@ -64,22 +64,22 @@ else if (objectType === "community") {
         attributes: ['id', 'language']
     }).then((result) => {
         if (result) {
-            console.log(`Clearing current community language of ${result.language}`);
+            log.info(`Clearing current community language of ${result.language}`);
             result.set('language', null);
             result.save().then(function () {
-                console.log(`Cleared language for community ${result.id}`);
+                log.info(`Cleared language for community ${result.id}`);
                 process.exit();
             }).catch((error) => {
-                console.error(error);
+                log.error(error);
                 process.exit();
             });
         }
         else {
-            console.warn("Not found: " + indexKey);
+            log.warn("Not found: " + indexKey);
             process.exit();
         }
     }).catch((error) => {
-        console.error(error);
+        log.error(error);
         process.exit();
     });
 }
@@ -91,27 +91,27 @@ else if (objectType === "domain") {
         attributes: ['id', 'language']
     }).then((result) => {
         if (result) {
-            console.log(`Clearing current domain language of ${result.language}`);
+            log.info(`Clearing current domain language of ${result.language}`);
             result.set('language', null);
             result.save().then(function () {
-                console.log(`Cleared language for domain ${result.id}`);
+                log.info(`Cleared language for domain ${result.id}`);
                 process.exit();
             }).catch((error) => {
-                console.error(error);
+                log.error(error);
                 process.exit();
             });
         }
         else {
-            console.warn("Not found: " + indexKey);
+            log.warn("Not found: " + indexKey);
             process.exit();
         }
     }).catch((error) => {
-        console.error(error);
+        log.error(error);
         process.exit();
     });
 }
 else {
-    console.log("No object type selected");
+    log.info("No object type selected");
     process.exit();
 }
 export {};

package/services/scripts/translation_delete.js

@@ -9,19 +9,19 @@ models.AcTranslationCache.findOne({
 }).then((result) => {
     if (result) {
         result.destroy().then(function () {
-            console.log(`Deleted ${result.index_key} to ${result.content}`);
+            log.info(`Deleted ${result.index_key} to ${result.content}`);
             process.exit();
         }).catch((error) => {
-            console.error(error);
+            log.error(error);
             process.exit();
         });
     }
     else {
-        console.warn("Not found: " + indexKey);
+        log.warn("Not found: " + indexKey);
         process.exit();
     }
 }).catch((error) => {
-    console.error(error);
+    log.error(error);
     process.exit();
 });
 export {};

package/services/scripts/translation_replace_text_from_url.js

@@ -37,7 +37,7 @@ const searchAndReplaceTranslation = (textType, id, content, done) => {
             if (newContent !== result.content) {
                 result.set('content', newContent);
                 result.save().then(() => {
-                    console.log(`Updated ${result.index_key} to ${result.content}`);
+                    log.info(`Updated ${result.index_key} to ${result.content}`);
                     done();
                 }).catch(error => {
                     done(error);
@@ -48,7 +48,7 @@ const searchAndReplaceTranslation = (textType, id, content, done) => {
             }
         }
         else {
-            console.warn("Not found: " + indexKey);
+            log.warn("Not found: " + indexKey);
             done();
         }
     }).catch((error) => {
@@ -173,8 +173,8 @@ async.series([
     },
 ], error => {
     if (error)
-        console.error(error);
-    console.log(`All done with ${changeCount} changes`);
+        log.error(error);
+    log.info(`All done with ${changeCount} changes`);
     process.exit();
 });
 export {};

package/services/scripts/translation_update.js

@@ -10,19 +10,19 @@ models.AcTranslationCache.findOne({
     if (result) {
         result.set('content', textToReplace);
         result.save().then(function () {
-            console.log(`Updated ${result.index_key} to ${result.content}`);
+            log.info(`Updated ${result.index_key} to ${result.content}`);
             process.exit();
         }).catch((error) => {
-            console.error(error);
+            log.error(error);
             process.exit();
         });
     }
     else {
-        console.warn("Not found: " + indexKey);
+        log.warn("Not found: " + indexKey);
         process.exit();
     }
 }).catch((error) => {
-    console.error(error);
+    log.error(error);
     process.exit();
 });
 export {};

package/services/scripts/translations_list.js

@@ -10,18 +10,18 @@ models.AcTranslationCache.findAll({
 }).then((results) => {
     if (results && results.length > 0) {
         results.forEach((item) => {
-            console.log(`${item.index_key} - ${item.content}`);
-            console.log(`--------------------------------------`);
-            console.log("");
+            log.info(`${item.index_key} - ${item.content}`);
+            log.info(`--------------------------------------`);
+            log.info("");
         });
     }
     else {
-        console.warn("No results found");
+        log.warn("No results found");
         process.exit();
     }
     process.exit();
 }).catch((error) => {
-    console.error(error);
+    log.error(error);
     process.exit();
 });
 export {};

package/services/utils/airbrake.cjs

@@ -1,4 +1,5 @@
 "use strict";
+const log = require('../../utils/logger.cjs');
 if (process.env.AIRBRAKE_PROJECT_ID) {
     const Airbrake = require('@airbrake/node');
     let airBrake = null;
@@ -11,7 +12,7 @@ if (process.env.AIRBRAKE_PROJECT_ID) {
     }
     catch (error) {
         airBrake = null;
-        console.error(error);
+        log.error(error);
     }
     module.exports = airBrake;
 }

package/services/utils/redisConnection.cjs

@@ -1,5 +1,6 @@
 "use strict";
 const redis = require("redis");
+const log = require('../../utils/logger.cjs');
 let redisClient;
 if (process.env.REDIS_URL) {
     let redisUrl = process.env.REDIS_URL;
@@ -21,9 +22,9 @@ if (process.env.REDIS_URL) {
 else {
     redisClient = redis.createClient({ legacyMode: true });
 }
-redisClient.on("error", (err) => console.error("Backend Redis client error", err));
-redisClient.on("connect", () => console.log("Backend Redis client is connect"));
-redisClient.on("reconnecting", () => console.log("Backend  Redis client is reconnecting"));
-redisClient.on("ready", () => console.log("Backend Redis client is ready"));
-redisClient.connect().catch(console.error);
+redisClient.on("error", (err) => log.error("Backend Redis client error", err));
+redisClient.on("connect", () => log.info("Backend Redis client is connect"));
+redisClient.on("reconnecting", () => log.info("Backend  Redis client is reconnecting"));
+redisClient.on("ready", () => log.info("Backend Redis client is ready"));
+redisClient.connect().catch(log.error);
 module.exports = redisClient;

package/services/utils/translation_helpers.cjs

@@ -5,6 +5,7 @@ const _ = require("lodash");
 const fs = require("fs");
 const request = require("request");
 const farmhash = require("farmhash");
+const log = require('../../utils/logger.cjs');
 const fixTargetLocale = (itemTargetLocale) => {
     let targetLocale = itemTargetLocale.replace("_", "-");
     if (targetLocale !== "sr-latin" &&
@@ -19,7 +20,7 @@ const fixTargetLocale = (itemTargetLocale) => {
 };
 const addItem = (targetLocale, items, textType, id, content, done) => {
     if (!content) {
-        console.log(`No content for ${textType} ${id}`);
+        log.info(`No content for ${textType} ${id}`);
         done();
     }
     else {
@@ -42,7 +43,7 @@ const addItem = (targetLocale, items, textType, id, content, done) => {
             done();
         })
             .catch((error) => {
-            console.error(error);
+            log.error(error);
             done(error);
         });
     }

package/services/utils/updateAllLocalesFromEn.js

@@ -4,6 +4,7 @@ import * as fs from "fs";
 import * as path from "path";
 import { promisify } from "util";
 import { YpLanguages } from "../../utils/ypLanguages.js";
+import log from "../../utils/loggerTs.js";
 const readFilePromise = promisify(fs.readFile);
 const writeFilePromise = promisify(fs.writeFile);
 export class YpLocaleTranslation {
@@ -39,17 +40,17 @@ export class YpLocaleTranslation {
         for (const localeDir of localeDirs) {
             if (localeDir === "en")
                 continue; // Skip English since it's the base
-            console.log(`Processing locale: ${localeDir}`);
+            log.info(`Processing locale: ${localeDir}`);
             const translationFilePath = path.join(localesDir, localeDir, "translation.json");
             let translation = await this.loadJsonFile(translationFilePath);
             translation = this.updateWithMissingKeys(baseTranslation, translation);
-            console.log(`Updated translation for ${localeDir}:`);
+            log.info(`Updated translation for ${localeDir}:`);
             const missingTranslations = this.extractMissingTranslations(baseTranslation, translation);
             // Chunk the missing translations
             const chunks = this.chunkArray(missingTranslations, 15);
-            console.log(`Missing translations for ${localeDir}:`, missingTranslations, chunks);
+            log.info(`Missing translations for ${localeDir}:`, missingTranslations, chunks);
             for (const chunk of chunks) {
-                //console.log(`Translating chunk: ${JSON.stringify(chunk)}`); // Log the chunk before translation
+                //log.info(`Translating chunk: ${JSON.stringify(chunk)}`); // Log the chunk before translation
                 // Prepare the texts for translation
                 const textsToTranslate = chunk.map((key) => this.getValueByPath(translation, key));
                 // Call your translateUITexts method
@@ -60,14 +61,14 @@ export class YpLocaleTranslation {
                         this.setValueAtPath(translation, key, translations[index]);
                     }
                 });
-                //console.log(`Chunk after translation: ${JSON.stringify(chunk)}`); // Log the chunk after translation
-                console.log(`Updated translation for ${localeDir}:`);
+                //log.info(`Chunk after translation: ${JSON.stringify(chunk)}`); // Log the chunk after translation
+                log.info(`Updated translation for ${localeDir}:`);
                 await writeFilePromise(translationFilePath, JSON.stringify(translation, null, 2));
             }
         }
     }
     setValueAtPath(obj, path, value) {
-        //console.log(`Setting value at path: ${path} to '${value}'`); // Debugging log
+        //log.info(`Setting value at path: ${path} to '${value}'`); // Debugging log
         const keys = path.split(".");
         let current = obj;
         for (let i = 0; i < keys.length - 1; i++) {
@@ -91,14 +92,14 @@ export class YpLocaleTranslation {
                 if (typeof base[key] === "object" && base[key] !== null) {
                     // If the base key is an object, ensure the target has a corresponding object
                     if (!target.hasOwnProperty(key) || typeof target[key] !== "object" || target[key] === null) {
-                        console.log(`Creating missing object at path: ${newPath.join(".")}`);
+                        log.info(`Creating missing object at path: ${newPath.join(".")}`);
                         target[key] = {}; // Initialize missing object
                     }
                     updateRecursively(base[key], target[key], newPath); // Recurse into objects
                 }
                 else if (!target.hasOwnProperty(key) || target[key] === "" || target[key] === null) {
                     // If the key is missing or empty in the target, update it from the base
-                    console.log(`Updating missing or empty key at path: ${newPath.join(".")}`);
+                    log.info(`Updating missing or empty key at path: ${newPath.join(".")}`);
                     target[key] = base[key];
                 }
                 // No action needed for non-empty, non-object fields; they're already present and not empty
@@ -174,14 +175,14 @@ Your ${language} website backend texts JSON output:`;
     }
     async translateUITexts(languageIsoCode, textsToTranslate) {
         try {
-            console.log(`translateTexts: ${JSON.stringify(textsToTranslate)} ${languageIsoCode}`);
+            log.info(`translateTexts: ${JSON.stringify(textsToTranslate)} ${languageIsoCode}`);
             const languageName = YpLanguages.getEnglishName(languageIsoCode) ||
                 languageIsoCode;
-            console.log("LANGUAGE NAME:", languageName);
+            log.info("LANGUAGE NAME:", languageName);
             return await this.callLlm(languageName, textsToTranslate);
         }
         catch (error) {
-            console.error("Error in getAnswerIdeas:", error);
+            log.error("Error in getAnswerIdeas:", error);
             return undefined;
         }
     }
@@ -201,16 +202,16 @@ Your ${language} website backend texts JSON output:`;
         let running = true;
         while (running) {
             try {
-                console.log(`Messages ${retries}:`, messages);
+                log.info(`Messages ${retries}:`, messages);
                 const results = await this.openaiClient.chat.completions.create({
                     model: this.modelName,
                     messages,
                     max_tokens: this.maxTokens,
                     temperature: this.temperature,
                 });
-                console.log("Results:", results);
+                log.info("Results:", results);
                 const textJson = results.choices[0].message.content;
-                console.log("Text JSON:", textJson);
+                log.info("Text JSON:", textJson);
                 if (textJson) {
                     let cleanText = textJson;
                     // Detect and remove markdown code block syntax if present
@@ -220,10 +221,10 @@ Your ${language} website backend texts JSON output:`;
                     let translationData = [];
                     try {
                         translationData = JSON.parse(jsonrepair(cleanText));
-                        console.log("Parsed Translation Data:", translationData);
+                        log.info("Parsed Translation Data:", translationData);
                     }
                     catch (error) {
-                        console.error("Error parsing cleaned text as JSON:", error);
+                        log.error("Error parsing cleaned text as JSON:", error);
                     }
                     if (translationData) {
                         running = false;
@@ -235,10 +236,10 @@ Your ${language} website backend texts JSON output:`;
                 }
             }
             catch (error) {
-                console.error("Error:", error);
+                log.error("Error:", error);
                 retries++;
                 if (retries > maxRetries) {
-                    console.error("Max retries reached");
+                    log.error("Max retries reached");
                     running = false;
                     return undefined;
                 }

package/services/utils/updateLocaleFolders.js

@@ -1,6 +1,7 @@
 import { YpLanguages } from "../../utils/ypLanguages.js";
 import fs from "fs/promises";
 import path from "path";
+import log from "../../utils/loggerTs.js";
 const ensureAllLocaleFoldersAreCreated = async () => {
     const localesPath = path.join(process.cwd(), "locales");
     try {
@@ -12,23 +13,23 @@ const ensureAllLocaleFoldersAreCreated = async () => {
                 .then(() => true)
                 .catch(() => false);
             if (!pathExists) {
-                console.log("Creating ---->:", localePath);
+                log.info("Creating ---->:", localePath);
                 await fs.mkdir(localePath, { recursive: true });
                 await fs.writeFile(path.join(localePath, "translation.json"), "{}");
             }
             else {
-                console.log("Path exists:", localePath);
+                log.info("Path exists:", localePath);
             }
         }
-        console.log("Locale folders and files have been created successfully.");
+        log.info("Locale folders and files have been created successfully.");
     }
     catch (error) {
-        console.error("Error creating locale folders:", error);
+        log.error("Error creating locale folders:", error);
     }
 };
 async function main() {
     await ensureAllLocaleFoldersAreCreated();
 }
 main()
-    .then(() => console.log("I have updated the locale folders."))
-    .catch((error) => console.error("Error in main:", error));
+    .then(() => log.info("I have updated the locale folders."))
+    .catch((error) => log.error("Error in main:", error));

package/services/workers/activity.cjs

@@ -1,7 +1,7 @@
 "use strict";
 // https://gist.github.com/mojodna/1251812
 const models = require("../../models/index.cjs");
-const log = require('../utils/logger.cjs');
+const log = require('../../utils/logger.cjs');
 const toJson = require('../utils/to_json.cjs');
 const async = require('async');
 let airbrake = null;