data-primals-engine 1.4.3 → 1.5.1

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");
@@ -157,56 +159,6 @@ export async function onInit(defaultEngine) {
 
     // Triggers
 
-    Event.Listen("OnValidateModelStructure", async (modelStructure) =>{
-
-        const objectKeys = Object.keys(modelStructure);
-
-        if( objectKeys.find(o => !["name", "_user", "icon", "history", "locked", "_id", "description", "maxRequestData", "fields"].includes(o)) ){
-            throw new Error(i18n.t('api.model.invalidStructure'));
-        }
-
-        // Vérification du type de name
-        if (typeof modelStructure.name !== 'string' || !modelStructure.name) {
-            throw new Error(i18n.t("api.validate.requiredFieldString", ["name"]));
-        }
-
-        // Vérification du type de description
-        if (typeof modelStructure.description !== 'string') {
-            throw new Error(i18n.t("api.validate.fieldString", ["description"]));
-        }
-
-        // Vérification de la présence et du type du tableau fields
-        if (!Array.isArray(modelStructure.fields)) {
-            throw new Error(i18n.t('api.validate.fieldArray', ["fields"]));
-        }
-
-        // Vérification de chaque champ dans le tableau fields
-        for (const field of modelStructure.fields) {
-            validateField(field);
-        }
-
-        if (modelStructure.constraints) {
-            if (!Array.isArray(modelStructure.constraints)) {
-                throw new Error('Model "constraints" property must be an array.');
-            }
-            const fieldNames = new Set(modelStructure.fields.map(f => f.name));
-            for (const constraint of modelStructure.constraints) {
-                if (constraint.type === 'unique') {
-                    if (!constraint.name || !Array.isArray(constraint.keys) || constraint.keys.length === 0) {
-                        throw new Error('Unique constraint must have a "name" and a non-empty "keys" array.');
-                    }
-                    for (const key of constraint.keys) {
-                        if (!fieldNames.has(key)) {
-                            throw new Error(`Constraint key "${key}" in constraint "${constraint.name}" does not exist as a field in the model.`);
-                        }
-                    }
-                }
-            }
-        }
-
-        return true; // La structure du modèle est valide
-    }, "event", "system");
-
 }
 
 
@@ -220,8 +172,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;
 
@@ -324,13 +277,13 @@ export async function handleDemoInitialization(req, res) {
 
         logger.info(`[Demo Init] Installing dynamically generated pack with models: [${models.join(', ')}].`);
 
+        // Create and install pack
+        const result = await installPack(packToInstall, user, req.query.lang || 'en');
+
         await sequential(packs.map(p => {
             return () => installPack(p, user, req.query.lang || 'en');
         }));
 
-        // Create and install pack
-        const result = await installPack(packToInstall, user, req.query.lang || 'en');
-
         if (result.success || result.modifiedCount > 0) {
 
             await Event.Trigger('OnDemoUserAdded', "event", "system", req.me.username);