data-primals-engine 1.4.3 → 1.5.0

package/src/email.js

@@ -3,6 +3,7 @@ import nodemailer from "nodemailer";
 import juice from "juice";
 import {Event} from "./events.js";
 import {emailDefaultConfig} from "./constants.js";
+import {Config} from "./config.js";
 
 // Le transporteur par défaut, utilisé si aucune config spécifique n'est fournie.
 const defaultTransporter = nodemailer.createTransport({
@@ -45,12 +46,14 @@ const createTransporter = (smtpConfig) => {
  * @param {string|null} tpl - Le template HTML à utiliser.
  */
 export const sendEmail = async (email = "", data, smtpConfig = null, lang, tpl = null) => {
-    const contactEmail = smtpConfig ? (smtpConfig.from || emailDefaultConfig.from) :"Our company <noreply@ourdomain.tld>";
+
+    const cfg = Config.Get('emailDefaultConfig', emailDefaultConfig);
+    const contactEmail = smtpConfig ? (smtpConfig.from || cfg.from) :"Our company <noreply@ourdomain.tld>";
     const emails = Array.isArray(email) ? email : [email];
     if (emails.length === 0) return false;
 
     // Choisir le transporteur à utiliser
-    const transporter = smtpConfig ? createTransporter(smtpConfig||emailDefaultConfig) : defaultTransporter;
+    const transporter = smtpConfig ? createTransporter(smtpConfig||cfg) : defaultTransporter;
 
     Event.Listen("OnEmailTemplate", (data, lang) => data.content, "event", "system");
 

package/src/engine.js

@@ -7,7 +7,7 @@ import process from "process";
 import {
     cookiesSecret,
     databasePoolSize,
-    dbName,
+    dbName as dbNameBase,
     tlsAllowInvalidCertificates, tlsAllowInvalidHostnames
 } from "./constants.js";
 import http from "http";
@@ -32,7 +32,7 @@ import {createModel, deleteModels, getModels, installAllPacks} from "./modules/d
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-
+let dbName = Config.Get('dbName', dbNameBase);
 let caFile, certFile, keyFile;
 try {
     if (process.env.CA_CERT)
@@ -127,7 +127,9 @@ export const Engine = {
             uploadDir: process.cwd()+'/uploads/tmp',
             multiples: true // req.files to be arrays of files
         }));
-        app.use(cookieParser(process.env.COOKIES_SECRET || cookiesSecret));
+
+        const cs = Config.Get('cookieSecret', process.env.COOKIES_SECRET || cookiesSecret)
+        app.use(cookieParser(cs));
         app.use(requestIp.mw())
 
         engine.use = (...args) => {

package/src/filter.js

@@ -36,12 +36,14 @@ const evaluateSingleCondition = (currentModelDef, condition, formData, allModels
 
     // Gestion des opérateurs d'agrégation (commencent par $)
     const operator = Object.keys(condition)[0];
-    if (operator === '$eq' && Array.isArray(condition[operator])) {
-        // Cas spécial pour {$eq: ['$field', value]}
+    if ((operator === '$eq' || operator === '$ne') && Array.isArray(condition[operator])) {
+        // Cas spécial pour {$op: ['$field', value]}
         const [fieldPath, expectedValue] = condition[operator];
         if (typeof fieldPath === 'string' && fieldPath.startsWith('$')) {
             const fieldName = fieldPath.substring(1); // Enlève le $ devant
-            return formData[fieldName] == expectedValue;
+            const actualValue = formData[fieldName];
+            if (operator === '$eq') return actualValue == expectedValue;
+            if (operator === '$ne') return actualValue != expectedValue;
         }
     }
 

package/src/modules/assistant/assistant.js

@@ -12,6 +12,7 @@ import {maxAIReflectiveSteps} from "../../constants.js";
 import {providers} from "./constants.js";
 import {ChatDeepSeek} from "@langchain/deepseek";
 import {ChatAnthropic} from "@langchain/anthropic";
+import {Config} from "../../config.js";
 
 let logger = null;
 
@@ -356,7 +357,8 @@ async function handleChatRequest(message, history, provider, context, user, conf
 
 
     // --- BOUCLE DE RAISONNEMENT ET D'EXÉCUTION D'OUTILS ---
-    for (let i = 0; i < maxAIReflectiveSteps; i++) {
+    const m = Config.Get('maxAIReflectiveSteps', maxAIReflectiveSteps);
+    for (let i = 0; i < m; i++) {
         logger.debug(`[Assistant] Tour de boucle ${i + 1}. Invocation de l'IA...`);
 
         const response = await llm.invoke(conversationHistory);

package/src/modules/bucket.js

@@ -13,6 +13,7 @@ import {sendEmail} from "../email.js";
 import {throttleMiddleware} from "../middlewares/throttle.js";
 import {getCollectionForUser} from "./mongodb.js";
 import {safeAssignObject} from "../core.js";
+import {Config} from "../config.js";
 
 const restoreRequests = {};
 
@@ -47,15 +48,6 @@ export const requestRestore = async (user, lang) => {
     }
 };
 
-const getDefaultS3Config = () => {
-    return {
-        accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY, // Utiliser la clé déchiffrée
-        region: process.env.AWS_REGION || awsDefaultConfig.region,
-        bucketName: process.env.AWS_BUCKET || awsDefaultConfig.bucketName
-    };
-}
-
 /**
  * Récupère la configuration S3 depuis les variables d'environnement de l'utilisateur en base de données.
  * @param {object} user - L'objet utilisateur.
@@ -98,12 +90,16 @@ async function _getUserS3ConfigFromDb(user) {
  * @returns {Promise<object>} - L'objet de configuration S3 final.
  */
 export async function getUserS3Config(user) {
+
+    const adc = awsDefaultConfig;
+    const dc = Config.Get('awsDefaultConfig', {});
+
     // 1. Récupérer la configuration globale par défaut
     const defaultConfig = {
-        accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-        secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-        region: process.env.AWS_REGION || awsDefaultConfig.region,
-        bucketName: process.env.AWS_BUCKET_NAME || awsDefaultConfig.bucketName
+        accessKeyId: dc.accessKeyId || process.env.AWS_ACCESS_KEY_ID,
+        secretAccessKey: dc.secretAccessKey || process.env.AWS_SECRET_ACCESS_KEY,
+        region: dc.region || process.env.AWS_REGION || adc.region,
+        bucketName: dc.bucketName || process.env.AWS_BUCKET_NAME || adc.bucketName
     };
 
     // 2. Récupérer la configuration spécifique de l'utilisateur
@@ -243,13 +239,14 @@ export const getS3Stream = (s3Config, s3Key) => {
     return s3.getObject(params).createReadStream();
 };
 
-const throttle = throttleMiddleware(maxBytesPerSecondThrottleData);
-
 let engine, logger;
 export async function onInit(defaultEngine) {
     engine = defaultEngine;
     logger = engine.getComponent(Logger);
 
+    const m = Config.Get('maxBytesPerSecondThrottleData', maxBytesPerSecondThrottleData);
+    const throttle = throttleMiddleware(m);
+
     const userMiddlewares = await engine.userProvider.getMiddlewares();
     engine.post('/api/backup/request-restore', [throttle, middlewareAuthenticator, userInitiator, ...userMiddlewares], async (req, res) => {
         const user = req.me; // Assuming you have user authentication middleware

package/src/modules/data/data.backup.js

@@ -153,7 +153,8 @@ export const loadFromDump = async (user, options = {}) => {
         }
 
         // --- EXÉCUTION DE MONGORESTORE ---
-        const restoreSourceDir = path.join(tmpRestoreDir, dbName);
+        const d = Config.Get('dbName', dbName);
+        const restoreSourceDir = path.join(tmpRestoreDir, d);
         if (!fs.existsSync(restoreSourceDir)) {
             throw new Error(`Restore source directory (${restoreSourceDir}) not found.`);
         }
@@ -161,15 +162,15 @@ export const loadFromDump = async (user, options = {}) => {
         let command;
         const args = [
             '--uri', dbUrl,
-            '--db', dbName
+            '--db', d
         ];
 
         if (modelsOnly) {
-            args.push('--nsInclude', `${dbName}.models`);
+            args.push('--nsInclude', `${d}.models`);
         } else {
             // mongorestore accepte plusieurs fois l'option --nsInclude
-            args.push('--nsInclude', `${dbName}.datas`);
-            args.push('--nsInclude', `${dbName}.models`);
+            args.push('--nsInclude', `${d}.datas`);
+            args.push('--nsInclude', `${d}.models`);
         }
         // Le répertoire source est le dernier argument
         args.push(restoreSourceDir);
@@ -242,6 +243,8 @@ export const dumpUserData = async (user) => {
         const backupFrequency = await engine.userProvider.getBackupFrequency(user);
         logger.info(`Fréquence de sauvegarde : ${backupFrequency}.`);
 
+
+        const d = Config.Get('dbName', dbName);
         const collections = await MongoDatabase.listCollections().toArray();
         for (const collection of collections) {
             const collsToBackup = [await getUserCollectionName(user), 'models'];
@@ -249,7 +252,7 @@ export const dumpUserData = async (user) => {
                 const query = {_user: user.username};
                 const args = [
                     '--uri', dbUrl,
-                    '--db', dbName,
+                    '--db', d,
                     '--out', localTempDumpDir,
                     '--collection', collection.name,
                     '--query', JSON.stringify(query)
@@ -258,9 +261,9 @@ export const dumpUserData = async (user) => {
                 await execFileAsync('mongodump', args);
             }
         }
-        const dumpSourceDir = path.join(localTempDumpDir, dbName);
+        const dumpSourceDir = path.join(localTempDumpDir, d);
         if (fs.existsSync(dumpSourceDir)) {
-            await tar.create({gzip: true, file: localArchivePath, C: localTempDumpDir}, [dbName]);
+            await tar.create({gzip: true, file: localArchivePath, C: localTempDumpDir}, [d]);
             logger.info(`Archive de sauvegarde locale créée : ${localArchivePath}`);
         } else {
             logger.warn(`Le répertoire de dump ${dumpSourceDir} était vide. Aucune archive n'a créée.`);

package/src/modules/data/data.js

@@ -2,7 +2,7 @@ import {Logger} from "../../gameObject.js";
 import {mkdir} from 'node:fs/promises';
 import {onInit as historyInit} from "./data.history.js";
 import {isDemoUser, isLocalUser} from "../../data.js";
-import {install, maxRequestData, storageSafetyMargin} from "../../constants.js";
+import {install, maxAlertsPerUser, maxRequestData, storageSafetyMargin} from "../../constants.js";
 import {createCollection, getCollection} from "../mongodb.js";
 import path from "node:path";
 import {isGUID, sequential} from "../../core.js";
@@ -22,6 +22,7 @@ import {validateField, onInit as validationInit} from "./data.validation.js";
 import {cancelAlerts, scheduleAlerts, onInit as scheduleInit} from "./data.scheduling.js";
 import {deleteData, installPack, onInit as operationsInit} from "./data.operations.js";
 import {jobDumpUserData, onInit as backupInit} from "./data.backup.js";
+import {Config} from "../../config.js";
 
 let engine;
 let logger;
@@ -54,7 +55,8 @@ export async function onInit(defaultEngine) {
 
     let modelsCollection, datasCollection, filesCollection, packsCollection, magnetsCollection, historyCollection;
 
-    if( install ) {
+    const i = Config.Get('install', install);
+    if( i ) {
         datasCollection = await createCollection("datas");
         historyCollection = await createCollection("history");
         filesCollection = await createCollection("files");
@@ -220,8 +222,9 @@ export async function checkServerCapacity(incomingDataSize = 0) {
         const diskSpace = await checkDiskSpace(DATA_STORAGE_PATH);
         const { free, size } = diskSpace;
 
+        const storageMargin = Config.Get('storageSafetyMargin', storageSafetyMargin);
         // Limite maximale d'utilisation du disque (ex: 90% de la taille totale)
-        const maxAllowedUsage = size * storageSafetyMargin;
+        const maxAllowedUsage = size * storageMargin;
         const currentUsage = size - free;
         const projectedUsage = currentUsage + incomingDataSize;