data-primals-engine 1.2.2 → 1.2.4

package/src/defaultModels.js

@@ -543,19 +543,6 @@ export const defaultModels = {
             { name: 'createdAt', type: 'datetime', required: true }
         ]
     },
-    campaign: {
-        name: 'campaign',
-        "description": "",
-        fields: [
-            { name: 'name', type: 'string_t', required: true },
-            { name: 'description', type: 'richtext' },
-            { name: 'startDate', type: 'datetime' },
-            { name: 'endDate', type: 'datetime' },
-            { name: 'type', type: 'enum', items: ['email', 'sms', 'advertisement', 'promotion'] },
-            { name: 'status', type: 'enum', items: ['planified', 'in_progress', 'finished', 'cancelled'] },
-            { name: 'budget', type: 'number' }
-        ]
-    },
     review: {
         name: "review",
         "description": "",
@@ -1014,7 +1001,7 @@ export const defaultModels = {
             { name: 'owner', type: 'relation', relation: 'user', required: false },
             { name: 'startedAt', type: 'datetime', required: true, hint: "Timestamp when the workflow run began." },
             { name: 'completedAt', type: 'datetime', hint: "Timestamp when the workflow run finished (successfully or failed)." },
-            { name: 'error', type: 'string', maxlength: 4096, hint: "Error message if the workflow run failed." }
+            { name: 'log', type: 'string', maxlength: 4096, hint: "Error message if the workflow run failed." }
         ]
     },
     dashboard:{

package/src/email.js

@@ -6,12 +6,12 @@ import {emailDefaultConfig} from "./constants.js";
 
 // Le transporteur par défaut, utilisé si aucune config spécifique n'est fournie.
 const defaultTransporter = nodemailer.createTransport({
-    host: "mail.smtp2go.com",
-    port: 587,
+    host: process.env.SMTP_HOST,
+    port: process.env.SMTP_PORT || 587,
     secure: false,
     auth: {
-        user: process.env.MAIL_USER,
-        pass: process.env.MAIL_PASS
+        user: process.env.SMTP_USER,
+        pass: process.env.SMTP_PASS
     }
 });
 
@@ -52,7 +52,9 @@ export const sendEmail = async (email = "", data, smtpConfig = null, lang, tpl =
     // Choisir le transporteur à utiliser
     const transporter = smtpConfig ? createTransporter(smtpConfig||emailDefaultConfig) : defaultTransporter;
 
-    if (tpl === null) tpl = Event.Trigger("sendEmail:template", "system", "calls", data, lang);
+    Event.Listen("OnEmailTemplate", (data, lang) => data.content, "event", "system");
+
+    if (tpl === null) tpl = Event.Trigger("OnEmailTemplate", "event", "system", data, lang);
     let html = tpl;
     try {
         html = juice(tpl);
@@ -73,9 +75,9 @@ export const sendEmail = async (email = "", data, smtpConfig = null, lang, tpl =
 
     try {
         await Promise.all(sendPromises);
-        console.log(`Email(s) envoyé(s) avec succès à: ${emails.join(', ')}`);
+        console.log(`Email(s) sent successfully to : ${emails.join(', ')}`);
     } catch (error) {
-        console.error("Erreur lors de l'envoi d'un ou plusieurs emails :", error);
+        console.error("Error when sending to one ore more emails :", error);
         // Vous pouvez relancer l'erreur si vous voulez que l'appelant la gère
         throw error;
     }

package/src/engine.js

@@ -13,13 +13,15 @@ import {
 import http from "http";
 import cookieParser from "cookie-parser";
 import requestIp from 'request-ip';
-import {createModel, deleteModels, getModels, validateModelStructure} from "./modules/data.js";
+import {createModel, deleteModels, getModels, installAllPacks, validateModelStructure} from "./modules/data/data.js";
 import {defaultModels} from "./defaultModels.js";
 import {DefaultUserProvider} from "./providers.js";
 import formidableMiddleware from 'express-formidable';
 import sirv from "sirv";
 import * as tls from "node:tls";
 import {Event} from "./events.js";
+import path from "node:path";
+import {isPathRelativeTo, isValidPath} from "./core.js";
 
 // Constants
 const isProduction = process.env.NODE_ENV === 'production'
@@ -49,23 +51,35 @@ const isTlsActive = !(!process.env.TLS || ["0", "false"].includes(process.env.TL
 const clientOptions = {
     maxPoolSize: databasePoolSize
 };
-// On ajoute les options TLS si elles sont activées
+
+// We add TLS options if enabled
 if (isTlsActive) {
     clientOptions.tls = true;
-    // Chemin vers le certificat de l'autorité de certification (pour faire confiance au serveur)
-    if (process.env.CA_CERT) {
-        clientOptions.tlsCAFile = process.env.CA_CERT;
-    }
-    // Chemin vers le certificat et la clé du CLIENT (pour que le serveur vous fasse confiance)
-    if (process.env.CERT_KEY) {
-        clientOptions.tlsCertificateKeyFile = process.env.CERT_KEY;
+
+    // is mTLS ? (client certificate required instead of password)
+    if (process.env.CERT) {
+        clientOptions.secureContext = tls.createSecureContext({
+            ca: fs.readFileSync(process.env.CA_CERT),
+            cert: fs.readFileSync(process.env.CERT),
+            key: fs.readFileSync(process.env.CERT_KEY)
+        });
+    }else {
+        // Path to the authority certificate
+        if (process.env.CA_CERT) {
+            clientOptions.tlsCAFile = process.env.CA_CERT;
+        }
+        // Path to the certificate key
+        if (process.env.CERT_KEY) {
+            clientOptions.tlsCertificateKeyFile = process.env.CERT_KEY;
+        }
     }
-    // Options pour le développement (à utiliser avec prudence)
     if (tlsAllowInvalidCertificates) {
         clientOptions.tlsAllowInvalidCertificates = true;
+        console.warn("🚨 [SECURITY WARNING] tlsAllowInvalidCertificates is ON. Server certificate will not be validated.");
     }
     if (tlsAllowInvalidHostnames) {
         clientOptions.tlsAllowInvalidHostnames = true;
+        console.warn("🚨 [SECURITY WARNING] tlsAllowInvalidHostnames is ON. Server hostname will not be validated.");
     }
 }
 
@@ -143,18 +157,44 @@ export const Engine = {
             }
         };
 
-        await Promise.all(Config.Get('modules', []).map(async module => {
+        await Promise.all(Config.Get('modules', []).map(async moduleIdentifier => {
             try {
-                if( fs.existsSync(module) ){
-                    return await importModule(module);
-                }else {
-                    return await importModule('./modules/' + module + ".js");
+                let moduleDir;
+                const moduleName = path.basename(moduleIdentifier);
+
+                const directPath = path.resolve(moduleIdentifier);
+                let isDir = fs.existsSync(directPath) && fs.statSync(directPath).isDirectory();
+                if (isDir) {
+                    moduleDir = directPath;
+                    if (!fs.existsSync(moduleDir) || !fs.statSync(moduleDir).isDirectory()) {
+                        logger.warn(`Le dossier du module est introuvable pour l'identifiant : '${moduleIdentifier}'. Chemin cherché : '${moduleDir}'.`);
+                        return null;
+                    }
+                } else {
+                    moduleDir = path.resolve('./src/modules', moduleIdentifier);
+                }
+
+                let moduleEntryPoint;
+                const jsPath = moduleDir+'.js';
+                const indexJsPath = path.join(moduleDir, 'index.js');
+                const moduleJsPath = path.join(moduleDir, `${moduleName}.js`);
+
+                if (fs.existsSync(jsPath)) {
+                    moduleEntryPoint = 'file://'+jsPath;
+                } else if (fs.existsSync(indexJsPath)) {
+                    moduleEntryPoint = 'file://'+indexJsPath;
+                } else if (fs.existsSync(moduleJsPath)) {
+                    moduleEntryPoint = 'file://'+moduleJsPath;
                 }
-            } catch (e){
-                logger.info('ERROR at loading module '+ module, e.stack);
+
+                return await importModule(moduleEntryPoint);
+            } catch (e) {
+                logger.error(`Échec du chargement du module '${moduleIdentifier}':`, e.stack);
+                return null;
             }
-        })).then(async e => {
-            engine._modules = e;
+        })).then(async results => {
+            // On filtre les modules qui n'ont pas pu être chargés
+            engine._modules = results.filter(Boolean);
             return Promise.resolve();
         });
 
@@ -175,6 +215,7 @@ export const Engine = {
             server.listen(port);
 
             await setupInitialModels();
+            await installAllPacks();
 
             if (cb)
                 await cb();
@@ -238,4 +279,3 @@ export const Engine = {
         return engine;
     }
 }
-

package/src/events.js

@@ -60,7 +60,7 @@ export const Event = {
         }
         return ret;
     },
-    Listen: (name = "", callback = () => {}, system = "priority", layer = "medium") => {
+    Listen: (name = "", callback, system = "priority", layer = "medium") => {
         const validSystems = Object.keys(eventLayerSystems); // Récupération des clés pour une vérification plus performante
         if (!validSystems.includes(system)) {
             throw new Error(`System '${system}' does not exist. Valid systems are: ${validSystems.join(', ')}`); // Message d'erreur plus informatif

package/src/filter.js

@@ -0,0 +1,221 @@
+/**
+ * Evaluates a single condition against form data.
+ * @param {object} currentModelDef - The definition of the current model.
+ * @param {object} condition - The condition to evaluate.
+ * @param {object} formData - The form data.
+ * @param {object[]} allModels - An array of all model definitions.
+ * @param {object} user - The current user.
+ * @returns {boolean} - True if the condition is met, false otherwise.
+ */
+const evaluateSingleCondition = (currentModelDef, condition, formData, allModels, user) => {
+    // Condition est directement un filtre MongoDB, donc on l'applique
+    // en utilisant les opérateurs et les valeurs qu'il contient.
+
+    if (!condition || typeof condition !== 'object') {
+        console.warn("[Client Eval] Condition is not an object:", condition);
+        return true; // Permissive default
+    }
+
+    // Si la condition est de la forme {field: value}, on la transforme en {$eq: value}
+    if (!Object.keys(condition)[0].startsWith('$') && typeof condition[Object.keys(condition)[0]] !== 'object') {
+        const fieldName = Object.keys(condition)[0];
+        const value = condition[fieldName];
+        return evaluateSingleCondition(currentModelDef, {[fieldName]: {$eq: value}}, formData, allModels, user);
+    }
+
+    // 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]}
+        const [fieldPath, expectedValue] = condition[operator];
+        if (typeof fieldPath === 'string' && fieldPath.startsWith('$')) {
+            const fieldName = fieldPath.substring(1); // Enlève le $ devant
+            return formData[fieldName] == expectedValue;
+        }
+    }
+
+    // Si la condition contient des opérateurs logiques, on les gère ici
+    if (condition.$and || condition.$or || condition.$not || condition.$nor) {
+        console.warn("[Client Eval] Condition logique détectée dans evaluateSingleCondition, ce n'est pas attendu. Devrait être géré par isConditionMet.");
+        return true; // Permissive default
+    }
+
+    if (condition.$find) {
+        const fieldName = Object.keys(condition)[0];
+        const fieldValue = formData[fieldName];
+        const findCondition = condition.$find;
+
+        if (!Array.isArray(fieldValue)) return false;
+
+        return fieldValue.some(item => {
+            // Gestion spéciale pour la syntaxe $eq: ["$$this.field", value]
+            if (findCondition.$eq && Array.isArray(findCondition.$eq)) {
+                const [fieldPath, value] = findCondition.$eq;
+                if (fieldPath.startsWith("$$this.")) {
+                    const fieldToCheck = fieldPath.replace("$$this.", "");
+                    return item[fieldToCheck] == value;
+                }
+            }
+
+            // Sinon, évaluation normale
+            const tempData = { ...item };
+            return evaluateSingleCondition(currentModelDef, findCondition, tempData, allModels, user);
+        });
+    }
+
+    // Si la condition contient un opérateur $exists, on le gère ici
+    if (condition.$exists !== undefined) {
+        const fieldName = Object.keys(condition)[0]; // Récupérer le nom du champ
+        const shouldExist = condition.$exists; // Récupérer la valeur de $exists (true ou false)
+        const exists = Object.prototype.hasOwnProperty.call(formData, fieldName) && formData[fieldName] !== undefined && formData[fieldName] !== null;
+        return exists === shouldExist;
+    }
+
+    // Si la condition contient un opérateur $find, on le gère ici
+    if (condition.$find) {
+        // Récupérer le nom du champ
+        const fieldName = Object.keys(condition)[0];
+        const fieldValue = formData[fieldName];
+        try {
+            // Assuming evaluateSingleCondition handles $find
+            return evaluateSingleCondition(currentModelDef, condition.$find, formData, allModels, user);
+        } catch (error) {
+            console.error("Error evaluating $find condition:", condition, error);
+            return false;
+        }
+    }
+
+    // Récupérer le nom du champ et la condition
+    const fieldName = Object.keys(condition)[0];
+    const fieldValue = condition[fieldName];
+
+    // Récupérer la définition du champ
+    const fieldDef = currentModelDef?.fields.find(f => f.name === fieldName);
+
+    // Si la définition du champ n'est pas trouvée, on retourne true
+    if (!fieldDef) {
+        console.warn(`[Client Eval] Field definition not found for field: ${fieldName}`);
+        return true; // Permissive default
+    }
+
+    let targetValue = formData[fieldName];
+    let processedConditionValue = fieldValue;
+
+    // 1. Handle $exists (on the first field)
+    // 2. Convert condition value based on operator's expected input type
+    const fieldType = fieldDef?.type; // Type of the first field
+
+    try {
+        processedConditionValue = convertValueType(fieldValue, fieldType);
+    } catch (e) {
+        logClientEvalWarning(`Error converting value type: ${e.message}`, condition);
+        return false;
+    }
+
+    return evaluateComparison(fieldValue, targetValue, processedConditionValue, condition);
+
+    function logClientEvalWarning(message, details) {
+        console.warn(`[Client Eval] ${message}:`, details);
+    }
+
+    function convertValueType(value, inputType) {
+        switch (inputType) {
+        case 'number':
+            const numValue = parseFloat(value);
+            if (isNaN(numValue)) {
+                throw new Error(`Invalid number value: ${value}`);
+            }
+            return numValue;
+        case 'boolean':
+            return String(value).toLowerCase() === 'true';
+        case 'csv':
+            return String(value).split(',').map(item => item.trim()).filter(Boolean);
+        case 'text':
+        default:
+            return String(value);
+        }
+    }
+
+    function evaluateComparison(operator, targetValue, processedConditionValue, condition) {
+        try {
+            switch (typeof operator === 'object' ? Object.keys(operator)[0] : null) {
+            case '$eq': return targetValue == processedConditionValue;
+            case '$ne': return targetValue != processedConditionValue;
+            case '$gt': return targetValue > processedConditionValue;
+            case '$lt': return targetValue < processedConditionValue;
+            case '$gte': return targetValue >= processedConditionValue;
+            case '$lte': return targetValue <= processedConditionValue;
+            case '$regex':
+                if (typeof targetValue !== 'string') return false;
+                if (typeof processedConditionValue !== 'string') return false;
+                try {
+                    const regex = new RegExp(processedConditionValue, 'i');
+                    return regex.test(targetValue);
+                } catch (e) {
+                    logClientEvalWarning(`Invalid regex pattern: ${processedConditionValue}`, condition);
+                    return false;
+                }
+            case '$in':
+                return Array.isArray(processedConditionValue) && processedConditionValue.includes(String(targetValue));
+            case '$nin':
+                return !Array.isArray(processedConditionValue) || !processedConditionValue.includes(String(targetValue));
+            default:
+                logClientEvalWarning(`Unhandled operator in client evaluation logic: ${operator}`, condition);
+                return true; // Permissive default
+            }
+        } catch (evalError) {
+            logClientEvalWarning(`Error during client condition evaluation: ${operator}, targetValue=${targetValue}, processedConditionValue=${processedConditionValue}`, condition);
+            return false;
+        }
+    }
+};
+
+export const isConditionMet = (model, cond, formData, allModels, user) => {
+    const condition = cond;
+
+    if (!condition) return true;
+
+    // Cas 1: Condition simple {field: value} → transformée en {field: {$eq: value}}
+    if (typeof condition === 'object' && !Array.isArray(condition)) {
+        const keys = Object.keys(condition);
+        if (keys.length === 1 && !keys[0].startsWith('$') &&
+            typeof condition[keys[0]] !== 'object') {
+            const simpleCondition = {
+                [keys[0]]: {$eq: condition[keys[0]]}
+            };
+            return evaluateSingleCondition(model, simpleCondition, formData, allModels, user);
+        }
+    }
+
+    // Cas 2: Opérateurs logiques ($and, $or, $not, $nor)
+    if (condition.$and && Array.isArray(condition.$and)) {
+        if (condition.$and.length === 0) return true;
+        return condition.$and.every(sub => isConditionMet(model, sub, formData, allModels, user));
+    }
+
+    if (condition.$or && Array.isArray(condition.$or)) {
+        if (condition.$or.length === 0) return false;
+        return condition.$or.some(sub => isConditionMet(model, sub, formData, allModels, user));
+    }
+
+    if (condition.$not) {
+        return !isConditionMet(model, condition.$not, formData, allModels, user);
+    }
+
+    if (condition.$nor && Array.isArray(condition.$nor)) {
+        if (condition.$nor.length === 0) return true;
+        return !condition.$nor.some(sub => isConditionMet(model, sub, formData, allModels, user));
+    }
+
+    // Cas 3: Syntaxe d'agrégation {$eq: ['$field', value]}
+    if (Object.keys(condition).length === 1) {
+        const operator = Object.keys(condition)[0];
+        if (operator.startsWith('$') && operator !== '$find' &&
+            Array.isArray(condition[operator])) {
+            return evaluateSingleCondition(model, condition, formData, allModels, user);
+        }
+    }
+
+    // Cas 4: Tous les autres cas (conditions normales avec opérateurs)
+    return evaluateSingleCondition(model, condition, formData, allModels, user);
+};

package/src/index.js

@@ -10,6 +10,6 @@ export { UserProvider } from './providers.js';
 
 // --- Database & Data Modules ---
 export { datasCollection, filesCollection, modelsCollection, packsCollection } from './modules/mongodb.js';
-export { searchData, insertData, editData, exportData, importData, scheduleAlerts, cancelAlerts, validateModelStructure, installPack, jobDumpUserData, loadFromDump, dumpUserData, validateRestoreRequest, patchData, deleteData, createModel, editModel, deleteModels, getModel, getModels } from './modules/data.js';
+export { searchData, insertData, editData, exportData, importData, scheduleAlerts, cancelAlerts, validateModelStructure, installPack, jobDumpUserData, loadFromDump, dumpUserData, validateRestoreRequest, patchData, deleteData, createModel, editModel, deleteModels, getModel, getModels } from './modules/data/index.js';
 
 

package/src/middlewares/middleware-mongodb.js

@@ -60,7 +60,6 @@ function _sanitize(target, options) {
 
         if( (key === 'regex' && obj.input) || key === '$regex' ){
             obj[key] = new RegExp(val, "ui");
-            console.log('regex san', obj[key]);
         }
         else if (!wl.includes(key) && regex.test(key)) {
             isSanitized = true;

package/src/modules/assistant.js

@@ -1,11 +1,9 @@
-// server/src/modules/assistant.js
-
 import { getCollectionForUser, modelsCollection } from "./mongodb.js";
 import { Logger } from "../gameObject.js";
 import { ChatOpenAI } from "@langchain/openai";
 import { ChatGoogleGenerativeAI } from "@langchain/google-genai";
 import { HumanMessage, SystemMessage } from "@langchain/core/messages";
-import {searchData,  patchData, deleteData, insertData} from "./data.js";
+import {searchData,  patchData, deleteData, insertData} from "./data/index.js";
 import { getDataAsString } from "../data.js";
 import i18n from "../../src/i18n.js";
 import {generateLimiter} from "./user.js";

package/src/modules/bucket.js

@@ -3,7 +3,7 @@ import AWS from "aws-sdk";
 import fs from "node:fs";
 import path from "node:path";
 import {decryptValue, encryptValue} from "../data.js";
-import {loadFromDump, validateRestoreRequest} from "./data.js";
+import {loadFromDump, validateRestoreRequest} from "./data/index.js";
 import {Logger} from "../gameObject.js";
 import {middlewareAuthenticator, userInitiator} from "./user.js";
 import {awsDefaultConfig, maxBytesPerSecondThrottleData} from "../constants.js";
@@ -117,7 +117,6 @@ export async function getUserS3Config(user) {
             bucketName: userConfig.bucketName || defaultConfig.bucketName
         };
     }
-    console.log({defaultConfig})
     return defaultConfig;
 }
 const getS3Client = (s3Config) => {
@@ -212,9 +211,9 @@ export const deleteFromS3 = async (s3Config, remoteFilename) => {
 
     try {
         await s3.deleteObject(params).promise();
-        console.log(`Fichier supprimé avec succès de S3 : ${bucketPath}`);
+        console.log(`File successfully removed from S3 : ${bucketPath}`);
     } catch (err) {
-        console.error("Erreur lors de la suppression sur S3 :", err);
+        console.error("Error when deleting S3 file :", err);
         throw err;
     }
 };