data-primals-engine 1.6.0 → 1.6.2-rc1

package/src/i18n.js

@@ -5,6 +5,10 @@ import LanguageDetector from "i18next-browser-languagedetector";
 export const translations = {
     fr: {
         translation: {
+
+            "model_audience": "Audiences",
+            "model_deal": "Opportunités",
+
             "relationField.select.title": "Sélectionner {{modelName}}",
             "btns.validate": "Valider",
             "btns.create": "Créer",
@@ -1318,6 +1322,8 @@ export const translations = {
     },
     en: {
         translation: {
+            "model_audience": "Audiences",
+            "model_deal": "Opportunities",
             "relationField.select.title": "Select {{modelName}}",
             "btns.validate": "Validate",
             "btns.create": "Create",
@@ -2627,6 +2633,8 @@ export const translations = {
     },
     es: {
         translation: {
+            "model_audience": "Audiencias",
+            "model_deal": "Oportunidades",
             "relationField.select.title": "Seleccionar {{modelName}}",
             "btns.validate": "Validar",
             "btns.create": "Crear",
@@ -3973,6 +3981,10 @@ export const translations = {
     },
     pt: {
         translation: {
+
+            "model_audience": "Públicos",
+            "model_campaign": "Campanhas de marketing",
+            "model_deal": "Oportunidades",
             "relationField.select.title": "Selecionar {{modelName}}",
             "btns.validate": "Validar",
             "btns.create": "Criar",
@@ -4125,6 +4137,8 @@ export const translations = {
     },
     de: {
         translation: {
+            "model_audience": "Zielgruppen",
+            "model_deal": "Möglichkeiten",
             "relationField.select.title": "{{modelName}} auswählen",
             "btns.validate": "Validieren",
             "btns.create": "Erstellen",
@@ -5424,7 +5438,6 @@ export const translations = {
             "field_endpoint_isPublic_hint": "Se selezionato, questo endpoint sarà accessibile senza autenticazione. Lo script verrà eseguito con i permessi del proprietario dell'endpoint.",
             "field_endpoint_code": "Codice da eseguire",
             "field_endpoint_code_hint": "Lo script da eseguire. Deve restituire un valore o un oggetto che sarà la risposta JSON.",
-            "model_env": "Variabili d'Ambiente (env)",
             "datatable.advancedFilter.title": "Filtro avanzato (MongoDB)",
             "datatable.advancedFilter.desc": "Crea i tuoi filtri avanzati da zero, utilizzando gli operatori di aggregazione di MongoDB disponibili qui.",
             "editData": "Modifica in {{0}}",
@@ -5696,6 +5709,10 @@ export const translations = {
             "model_channel": "Canali di notifica",
             "model_message": "Messaggi",
             "model_kpi": "Indicatori KPI",
+            "model_env": "Variabili d'Ambiente (env)",
+            "model_audience": "Pubblici",
+            "model_deal": "Opportunità",
+
             "field_permission_name": "Nome",
             "field_permission_description": "Descrizione",
 
@@ -6628,6 +6645,9 @@ export const translations = {
     },
     cs: {
         translation: {
+            "model_audience": "Publika",
+            "model_campaign": "Marketingové kampaně",
+            "model_deal": "Příležitosti",
             "relationField.select.title": "Vybrat {{modelName}}",
             "btns.validate": "Ověřit",
             "btns.create": "Vytvořit",
@@ -7553,6 +7573,8 @@ export const translations = {
     },
     ru: {
         translation: {
+            "model_audience": "Аудитории",
+            "model_deal": "Возможности",
             "relationField.select.title": "Выбрать {{modelName}}",
             "btns.validate": "Проверить",
             "btns.create": "Создать",
@@ -8832,6 +8854,8 @@ export const translations = {
     },
     ar: {
         translation: {
+            "model_audience": "الجماهير",
+            "model_deal": "الفرص",
             "relationField.select.title": "اختر {{modelName}}",
             "btns.validate": "تحقق",
             "btns.create": "إنشاء",
@@ -8901,7 +8925,7 @@ export const translations = {
             "field_endpoint_code": "الكود المنفذ",
             "field_endpoint_code_hint": "السكريبت الذي سيتم تنفيذه. يجب أن يعيد قيمة أو كائنًا سيكون استجابة JSON.",
             "model_env": "متغيرات البيئة (env)",
-            
+
             "datatable.advancedFilter.title": "مرشح متقدم (MongoDB)",
             "datatable.advancedFilter.desc": "أنشئ مرشحاتك المتقدمة من الصفر، باستخدام عوامل تجميع MongoDB المتوفرة هنا",
             "editData": "تعديل في {{0}}",
@@ -10156,6 +10180,8 @@ export const translations = {
     },
     sv: {
         translation: {
+            "model_audience": "Målgrupper",
+            "model_deal": "Möjligheter",
             "relationField.select.title": "Välj {{modelName}}",
             "btns.validate": "Validera",
             "btns.create": "Skapa",
@@ -11316,7 +11342,7 @@ export const translations = {
             "no": "Nej",
             "true": "Sant",
             "false": "Falskt",
-            
+
 
             "assistant.type": "Skriv ditt meddelande...",
             "assistant.welcome": "Hej! Hur kan jag hjälpa dig med din data?",
@@ -11383,6 +11409,10 @@ export const translations = {
     },
     el: {
         translation: {
+            "model_audience": "Κοινά",
+            "model_deal": "Ευκαιρίες",
+            "model_endpoint": "Τελικά σημεία",
+            "model_env": "Μεταβλητές Περιβάλλοντος",
             "relationField.select.title": "Επιλογή {{modelName}}",
             "btns.validate": "Επικύρωση",
             "btns.create": "Δημιουργία",
@@ -12586,6 +12616,8 @@ export const translations = {
     },
     fa: {
         translation: {
+            "model_audience": "مخاطبان",
+            "model_deal": "فرصت‌ها",
             "relationField.select.title": "{{modelName}} را انتخاب کنید",
             "btns.validate": "اعتبارسنجی",
             "btns.create": "ایجاد",

package/src/index.js

@@ -7,6 +7,7 @@ export { Config } from './config.js';
 export { event_on, event_trigger, event_off } from './core.js';
 export { Event } from './events.js';
 
+export { hasPermission, middlewareAuthenticator, getEnv, getSmtpConfig } from "./modules/user.js"
 export { sendSseToUser } from './modules/data/data.routes.js';
 
 export { UserProvider } from './providers.js';

package/src/modules/data/data.operations.js

@@ -459,6 +459,12 @@ export const dataTypes = {
     }
 };
 
+const userStorageCache = new NodeCache({
+    stdTTL: 600, // 10 minutes
+    checkperiod: 120,
+    useClones: false
+});
+
 
 
 let engine, logger;
@@ -466,6 +472,29 @@ export function onInit(defaultEngine) {
     engine = defaultEngine;
     logger = engine.getComponent(Logger);
 
+    // Précalculer périodiquement l'utilisation du stockage pour chaque utilisateur
+    const updateUserStorageUsage = async () => {
+        logger.debug('[Storage] Starting periodic user storage calculation...');
+        try {
+            const usersCollection = getCollection('users');
+            const users = await usersCollection.find({}, { projection: { username: 1 } }).toArray();
+
+            for (const user of users) {
+                try {
+                    const usage = await calculateTotalUserStorageUsage(user);
+                    userStorageCache.set(user.username, usage);
+                } catch (userError) {
+                    logger.error(`[Storage] Failed to calculate storage for user ${user.username}:`, userError);
+                }
+            }
+            logger.debug(`[Storage] User storage calculation finished for ${users.length} users.`);
+        } catch (e) {
+            logger.error('[Storage] Error during periodic user storage calculation:', e);
+        }
+    };
+
+    setInterval(updateUserStorageUsage, 300000); // Toutes les 5 minutes
+    updateUserStorageUsage(); // Lancer une première fois au démarrage
     // Nettoyer périodiquement les relations obsolètes
     setInterval(() => {
         // Nettoyer les relations pour les clés qui n'existent plus
@@ -990,8 +1019,11 @@ async function checkLimits(datas, model, collection, me) {
     const userStorageLimit = await engine.userProvider.getUserStorageLimit(me);
 
     // Vérification des limites utilisateur
-    const currentStorageUsage = await calculateTotalUserStorageUsage(me);
-    if (currentStorageUsage + incomingDataSize > userStorageLimit) {
+    let currentStorageUsage = userStorageCache.get(me.username);
+    if (currentStorageUsage === undefined) {
+        currentStorageUsage = await calculateTotalUserStorageUsage(me); // Fallback si le cache est vide
+    }
+    if ((currentStorageUsage || 0) + incomingDataSize > userStorageLimit) {
         throw new Error(i18n.t("api.data.storageLimitExceeded", {
             limit: Math.round(userStorageLimit / megabytes)
         }));
@@ -1074,7 +1106,7 @@ const internalEditOrPatchData = async (modelName, filter, data, files, user, isP
         const updatePushData = {};
  
         for (const key in data) {
-            if (key.startsWith('_')) continue;
+            if (key.startsWith('_') && !['_env', '_pack'].includes(key)) continue;
  
             if (isPlainObject(data[key]) && data[key].$push !== undefined) {
                 // C'est une opération $push
@@ -1251,6 +1283,43 @@ const internalEditOrPatchData = async (modelName, filter, data, files, user, isP
             }
         }
 
+        // 8. Vérification des limites de stockage avant la mise à jour
+        const originalDocsSize = calculateDataSize(existingDocs);
+        const finalStateForSize = existingDocs.map(doc => {
+            const updatedDoc = { ...doc, ...updateSetData };
+            for (const fieldName in updatePushData) {
+                let itemsToAdd;
+                const pushValue = updatePushData[fieldName];
+                if (isPlainObject(pushValue) && pushValue.$each) {
+                    itemsToAdd = pushValue.$each;
+                } else if (Array.isArray(pushValue)) {
+                    itemsToAdd = pushValue;
+                } else {
+                    itemsToAdd = [pushValue];
+                }
+                if (!Array.isArray(updatedDoc[fieldName])) {
+                    updatedDoc[fieldName] = [];
+                }
+                updatedDoc[fieldName].push(...itemsToAdd);
+            }
+            return updatedDoc;
+        });
+
+        const finalDocsSize = calculateDataSize(finalStateForSize);
+        const sizeDelta = finalDocsSize - originalDocsSize;
+
+        if (sizeDelta > 0) {
+            const userStorageLimit = await engine.userProvider.getUserStorageLimit(user);
+            const currentStorageUsage = await calculateTotalUserStorageUsage(user);
+            if (currentStorageUsage + sizeDelta > userStorageLimit) {
+                throw new Error(i18n.t("api.data.storageLimitExceeded", { limit: Math.round(userStorageLimit / megabytes) }));
+            }
+            const serverCapacity = await checkServerCapacity(sizeDelta);
+            if (!serverCapacity.isSufficient) {
+                throw new Error(i18n.t("api.data.serverStorageFull"));
+            }
+        }
+
         // 8. Calcul du nouveau hash en simulant l'état final
         const finalStateForHash = { ...existingDocs[0], ...updateSetData };
         for (const fieldName in updatePushData) {
@@ -1694,7 +1763,8 @@ const generateCacheKey = (query, user) => {
             filter: query.filter,
             depth: query.depth,
             autoExpand: query.autoExpand,
-            pack: query.pack
+            pack: query.pack,
+            env: query.env
         },
         user: user.username
     };
@@ -1710,7 +1780,7 @@ const searchCache = new NodeCache({
 });
 
 export const searchData = async (query, user) => {
-    const {page, limit, sort, model, pipelinesPosition, pipelines: customPipelines = [], ids, timeout, pack} = query;
+    const {page, limit, sort, model, pipelinesPosition, pipelines: customPipelines = [], ids, timeout, pack, env} = query;
 
     if (user && user.username !== 'demo' && isLocalUser(user) && (
         !await hasPermission(["API_ADMIN", "API_SEARCH_DATA", "API_SEARCH_DATA_" + model], user) ||
@@ -2162,8 +2232,18 @@ export const searchData = async (query, user) => {
             }
         }
 
+        let envMatchStage;
+        if (env === 'production') {
+            envMatchStage = {$match: {$or: [{'_env': 'production'}, {'_env': {$exists: false}}]}};
+        } else if (env) {
+            envMatchStage = {$match: {'_env': env}};
+        } else {
+            envMatchStage = {$match: {'_env': {$exists: false}}};
+        }
+
         return pipelines.concat(
             [
+                envMatchStage,
                 {$match: {'_pack': pack ? pack : {$exists: false}}},
                 {$match: {$expr: dataNoRelation}}
             ],
@@ -3128,6 +3208,7 @@ export async function installPack(packIdentifier, user = null, lang = 'en', opti
             delete docForInsert._temp_pack_id;
 
             if (user) docForInsert._user = username;
+            
             docForInsert._model = modelName;
             docForInsert._hash = getFieldValueHash(modelDefForHash, docForInsert);
 
@@ -3136,6 +3217,8 @@ export async function installPack(packIdentifier, user = null, lang = 'en', opti
                 _hash: docForInsert._hash,
                 _model: modelName
             };
+
+            if (docForInsert._env) existingQuery._env = docForInsert._env;
             if (user) existingQuery._user = username;
 
             const existingDoc = await collection.findOne(existingQuery, {projection: {_id: 1}});
@@ -3159,6 +3242,9 @@ export async function installPack(packIdentifier, user = null, lang = 'en', opti
                 const result = await collection.insertMany(finalDocsToInsert, {ordered: false});
                 summary.datas.inserted += result.insertedCount;
 
+                // Invalider le cache pour le modèle qui vient d'être modifié
+                invalidateModelCache(modelName);
+
                 docsToInsert.forEach((doc, index) => {
                     if (result.insertedIds[index]) {
                         tempIdToNewIdMap[doc._temp_pack_id_for_mapping] = result.insertedIds[index];

package/src/modules/user.js

@@ -108,7 +108,7 @@ export async function onInit(defaultEngine) {
  * @returns {Promise<Set<string>>} Un Set contenant les noms de toutes les permissions actives.
  * @private
  */
-export async function getUserActivePermissions(user) {
+export async function getUserActivePermissions(user, env = null) {
     const datasCollection = await getCollectionForUser(user);
     const now = new Date();
     const activePermissions = new Set();
@@ -139,12 +139,17 @@ export async function getUserActivePermissions(user) {
     // --- ÉTAPE 2: Appliquer les exceptions de permission ---
     const exceptions = await datasCollection.aggregate([
         {
-            $match: {
+            $match: { // Filtre de base pour les exceptions de l'utilisateur
                 _model: "userPermission",
-                user: user._id, // Pas besoin de convertir en ObjectId si c'est déjà une string
-                $or: [
-                    { expiresAt: { $exists: false } },
-                    { expiresAt: { $gt: now } }
+                user: user._id,
+                $and: [ // Filtre sur l'environnement et l'expiration
+                    {
+                        $or: [ // La permission est soit globale, soit spécifique à l'environnement demandé
+                            { env: { $exists: false } },
+                            { env: env }
+                        ]
+                    },
+                    { $or: [{ expiresAt: { $exists: false } }, { expiresAt: { $gt: now } }] }
                 ]
             }
         },
@@ -193,7 +198,7 @@ export async function getUserActivePermissions(user) {
  * @param {object} user - L'objet utilisateur authentifié.
  * @returns {Promise<boolean>} - True si l'utilisateur a la permission, sinon false.
  */
-export async function hasPermission(permissionNames, user) {
+export async function hasPermission(permissionNames, user, env = null) {
     // Garde la compatibilité pour les utilisateurs non-locaux (ex: système)
     if (!isLocalUser(user)) {
         const userRoles = new Set(user.roles || []);
@@ -209,10 +214,10 @@ export async function hasPermission(permissionNames, user) {
         }
 
         // 1. Obtenir l'ensemble final et à jour des permissions de l'utilisateur
-        const activePermissions = await getUserActivePermissions(user);
+        const activePermissions = await getUserActivePermissions(user, env);
 
         // 2. Vérifier si au moins une des permissions requises est dans l'ensemble des permissions actives
-        return requiredPermissions.some(pName => activePermissions.has(pName));
+        return requiredPermissions.some(pName => activePermissions.has(pName)) || false;
 
     } catch (e) {
         logger.error("Erreur lors de la vérification des permissions :", e);

package/src/modules/workflow.js

@@ -1380,10 +1380,7 @@ export async function triggerWorkflows(triggerData, user, eventType) {
         }
     }
 
-    return new Promise((resolve) => setTimeout(async () => {
-        await trigger(triggerData, user, eventType);
-        resolve();
-    }, 0));
+    return trigger(triggerData, user, eventType);
 }
 /**
  * Processes a workflowRun instance step-by-step.