data-primals-engine 1.2.3 → 1.2.5

package/server.js

@@ -8,7 +8,7 @@ import {Config, Engine, BenchmarkTool, GameObject, Logger} from "./src/index.js"
 import sirv from "sirv";
 import express from "express";
 
-Config.Set("modules", ["mongodb", "data", "file", "bucket", "workflow","user", "assistant", "swagger"])
+Config.Set("modules", ["data", "mongodb", "file", "bucket", "workflow","user", "assistant", "swagger"])
 Config.Set("middlewares", []);
 
 const bench = GameObject.Create("Benchmark");
@@ -30,7 +30,7 @@ if (process.argv.length === 3) {
 const port = process.env.PORT || 7633;
 engine.start(port, async (r) => {
     const logger = engine.getComponent(Logger);
-    console.log("Server started on port" + port);
+    console.log("Server started on port " + port);
     timer.stop();
 
 });

package/src/data.js

@@ -405,6 +405,14 @@ export function conditionToApiSearchFilter(condition) {
 
 
 export const getFieldValueHash = (model, data) => {
+    // Prioritize composite unique constraints if they exist
+    const uniqueConstraints = model.constraints?.filter(c => c.type === 'unique') || [];
+
+    if (uniqueConstraints.length > 0) {
+        // Combine keys from all unique constraints to create a truly unique hash.
+        const constraintKeys = [...new Set(uniqueConstraints.flatMap(c => c.keys))];
+        return getObjectHash(data, constraintKeys, 'constraint');
+    }
     const uniqueFields = model.fields.filter(f => f.unique).map(m => m.name);
     const fs = model.fields.map(m => m.name);
     const fields = ['_model', '_user', ...(uniqueFields.length ? uniqueFields : fs)];

package/src/email.js

@@ -75,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, installAllPacks, 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();
         });
 
@@ -239,4 +279,3 @@ export const Engine = {
         return engine;
     }
 }
-

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;
     }
 };

package/src/modules/data/data.core.js

@@ -0,0 +1,17 @@
+import NodeCache from "node-cache";
+
+export const modelsCache = new NodeCache( { stdTTL: 100, checkperiod: 120 } );
+
+export const mongoDBWhitelist = [
+    "$$NOW", "$in", "$eq", "$gt", "$gte", "$in", "$lt", "$lte", "$ne", "$nin", "$type", "$size",
+    "$and", "$not", "$nor", "$or", "$regexMatch", "$find", "$elemMatch", "$filter", "$toString", "$toObjectId",
+    "$concat",
+    '$add', '$subtract', '$multiply', '$divide', '$mod', '$pow', "$sqrt",
+    "$rand",
+    "$abs", '$sin', '$cos', '$tan', '$asin', '$acos', '$atan',
+    "$toDate", "$toBool", "$toString", "$toInt", "$toDouble",
+    "$dateDiff", "$dateSubtract", "$dateAdd", "$dateToString",
+    '$year', '$month', '$week', '$dayOfMonth', '$dayOfWeek', '$dayOfYear', '$hour', '$minute', '$second', '$millisecond'
+];
+export let importJobs = {};
+