@bkmj/node-red-contrib-odbcmj 2.1.4 → 2.2.1

package/README.md

@@ -105,4 +105,4 @@ When streaming is active, each output message will contain:
 -   A `msg.odbc_stream` object with metadata for tracking progress:
     -   `index`: The starting index of the current chunk (e.g., 0, 100, 200...).
     -   `count`: The number of rows in the current chunk.
-    -   `complete`: A boolean that is `true` only on the very last message of the stream (or if the result set was empty), and `false` otherwise. This is useful for triggering a downstream action once all rows have been processed.
+    -   `complete`: A boolean that is `true` only on the very last message, and `false` otherwise. The last payload will always be an empty array.  This is useful for triggering a downstream action once all rows have been processed.

package/odbc.html

@@ -71,12 +71,36 @@
 
             $('#node-config-test-connection').on('click', function() {
                 var button = $(this);
+                var connectionMode = $("#node-config-input-connectionMode").val();
+
+                if (connectionMode === 'structured') {
+                    var server = $("#node-config-input-server").val().trim();
+                    if (!server) {
+                        RED.notify("Le champ 'Server' est requis pour le test.", {type: "warning", timeout: 3000});
+                        return;
+                    }
+                } else { 
+                    var connStr = $("#node-config-input-connectionString").val().trim();
+                    if (!connStr) {
+                        RED.notify("La chaîne de connexion est requise pour le test.", {type: "warning", timeout: 3000});
+                        return; 
+                    }
+                    // Nouvelle validation :
+                    // Elle est invalide SEULEMENT si elle ne contient PAS de DSN ET qu'elle ne respecte PAS l'ancien critère pour les chaînes DSN-less.
+                    var isDsnString = /DSN=[^;]+/i.test(connStr);
+                    var isDriverBasedString = /DRIVER=\{.+?\}/i.test(connStr) && /(SERVER|DATABASE|UID|PWD)=/i.test(connStr); // Un peu plus complet
+
+                    if (!isDsnString && !isDriverBasedString) {
+                         RED.notify("La chaîne de connexion semble invalide ou incomplète (ex: DSN=value; ou DRIVER={...};SERVER=...;).", {type: "warning", timeout: 4000});
+                         return;
+                    }
+                }
+
                 var originalText = "Test Connection";
                 var icon = button.find("i");
                 icon.removeClass('fa-bolt').addClass('fa-spinner fa-spin');
                 button.text(' Testing...').prop('disabled', true);
                 
-                var connectionMode = $("#node-config-input-connectionMode").val();
                 var configData = {
                     connectionMode: connectionMode,
                     dbType: $("#node-config-input-dbType").val(),
@@ -272,7 +296,6 @@
             outputObj: { value: "payload" },
             streaming: { value: false },
             streamChunkSize: { value: 1, validate: RED.validators.number() },
-            // Nouveaux `defaults` pour les Typed Inputs
             querySource: { value: "query", required: false },
             querySourceType: { value: "msg", required: false },
             paramsSource: { value: "parameters", required: false },
@@ -295,7 +318,6 @@
                 $(".stream-options").toggle(this.checked);
             }).trigger("change");
 
-            // Initialisation des Typed Inputs
             $("#node-input-querySource").typedInput({
                 default: 'msg',
                 typeField: "#node-input-querySourceType",
@@ -414,7 +436,7 @@ Executes a query against a configured ODBC data source.
 ### Properties
 
 - **Connection**: The `odbc config` node to use.
-- **Query (fallback)**: A static SQL query to run if the "Query Source" does not provide one. Can contain Mustache syntax (e.g., `{{{payload.id}}}`).
+- **Query (fallback)**: A static SQL query to run if the "Query (fallback)" does not provide one. Can contain Mustache syntax (e.g., `{{{payload.id}}}`).
 - **Result to**: The `msg` property where the query result will be stored. Default: `payload`.
 
 ### Streaming Results
@@ -425,10 +447,18 @@ For queries that return a large number of rows, streaming prevents high memory u
 - **`Chunk Size`**: The number of rows to include in each output message. A value of `1` means one message will be sent for every single row.
 
 #### Streaming Output Format
-When streaming is active, each output message will contain:
-- A payload (or the configured output property) containing an array of rows for the current chunk.
-- A `msg.odbc_stream` object with metadata for tracking progress:
-    - `index`: The starting index of the current chunk (e.g., 0, 100, 200...).
-    - `count`: The number of rows in the current chunk.
-    - `complete`: A boolean that is `true` only on the very last message of the stream, useful for triggering a final action.
+When streaming is active, the node sends messages in sequence:
+
+1.  **Data Messages**: One or more messages where the payload (or the configured output property) contains an array of rows for the current chunk. For these messages, `msg.odbc_stream.complete` will be **`false`**.
+
+2.  **Completion Message**: A single, final message indicating the end of the stream. For this message:
+    -   The payload will be an **empty array `[]`**.
+    -   `msg.odbc_stream.complete` will be **`true`**.
+
+The `msg.odbc_stream` object contains metadata for tracking:
+-   `index`: The starting index of the current chunk. For the completion message, this will be the total number of rows processed.
+-   `count`: The number of rows in the chunk. This will be `0` for the completion message.
+-   `complete`: The boolean flag (`true`/`false`).
+
+This pattern ensures you can reliably trigger a final action (like closing a file or calculating an aggregate) only when the message with `complete: true` is received.
 </script>

package/odbc.js

@@ -12,7 +12,6 @@ module.exports = function (RED) {
         
         this.credentials = RED.nodes.getCredentials(this.id);
 
-        // Cette fonction est maintenant cruciale pour le mode streaming
         this._buildConnectionString = function() {
             if (this.config.connectionMode === 'structured') {
                 if (!this.config.dbType || !this.config.server) {
@@ -119,19 +118,69 @@ module.exports = function (RED) {
     });
 
     RED.httpAdmin.post("/odbc_config/:id/test", RED.auth.needsPermission("odbc.write"), async function(req, res) {
-        // ... (Pas de changement dans cette section)
-    });
+        const tempConfig = req.body;
+
+        const buildTestConnectionString = () => {
+            if (tempConfig.connectionMode === 'structured') {
+                if (!tempConfig.dbType || !tempConfig.server) {
+                    throw new Error("En mode structuré, le type de base de données et le serveur sont requis.");
+                }
+                let driver;
+                let parts = [];
+                switch (tempConfig.dbType) {
+                    case 'sqlserver': driver = 'ODBC Driver 17 for SQL Server'; break;
+                    case 'postgresql': driver = 'PostgreSQL Unicode'; break;
+                    case 'mysql': driver = 'MySQL ODBC 8.0 Unicode Driver'; break;
+                    default: driver = tempConfig.driver || ''; break;
+                }
+                if(driver) parts.unshift(`DRIVER={${driver}}`);
+                parts.push(`SERVER=${tempConfig.server}`);
+                if (tempConfig.database) parts.push(`DATABASE=${tempConfig.database}`);
+                if (tempConfig.user) parts.push(`UID=${tempConfig.user}`);
+                if (tempConfig.password) parts.push(`PWD=${tempConfig.password}`);
+                return parts.join(';');
+            } else {
+                let connStr = tempConfig.connectionString || "";
+                if (!connStr) {
+                    throw new Error("La chaîne de connexion ne peut pas être vide.");
+                }
+                return connStr;
+            }
+        };
+
+        let connection;
+        try {
+            const testConnectionString = buildTestConnectionString();
+            
+            // ==============================================================
+            // LIGNE DE DÉBOGAGE AJOUTÉE
+            // ==============================================================
+            console.log("[ODBC Test] Attempting to connect with string:", testConnectionString);
+            // ==============================================================
 
+            const connectionOptions = {
+                connectionString: testConnectionString,
+                loginTimeout: 10
+            };
+            connection = await odbcModule.connect(connectionOptions);
+            res.sendStatus(200);
+        } catch (err) {
+            console.error("[ODBC Test] Connection failed:", err); // Ajout d'un log d'erreur
+            res.status(500).send(err.message || "Erreur inconnue durant le test.");
+        } finally {
+            if (connection) {
+                await connection.close();
+            }
+        }
+    });
 
-// --- ODBC Query Node ---
+    // --- ODBC Query Node ---
     function odbc(config) {
         RED.nodes.createNode(this, config);
         this.config = config;
         this.poolNode = RED.nodes.getNode(this.config.connection);
         this.name = this.config.name;
-        // La logique de retry complexe est temporairement retirée pour stabiliser le noeud.
 
-        // Cette fonction reste inchangée
         this.enhanceError = (error, query, params, defaultMessage = "Query error") => {
             const queryContext = (() => {
                 let s = "";
@@ -153,11 +202,9 @@ module.exports = function (RED) {
             if (params) finalError.params = params;
             return finalError;
         };
-        
-        // Cette fonction reste presque inchangée, elle est maintenant appelée depuis on("input")
+
         this.executeQueryAndProcess = async (dbConnection, queryString, queryParams, msg) => {
             const result = await dbConnection.query(queryString, queryParams);
-
             if (typeof result === "undefined") { throw new Error("Query returned undefined."); }
             const newMsg = RED.util.cloneMessage(msg);
             const otherParams = {};
@@ -198,148 +245,132 @@ module.exports = function (RED) {
             if (Object.keys(otherParams).length) { newMsg.odbc = otherParams; }
             return newMsg;
         };
-
-        // =================================================================
-        // NOUVELLE IMPLEMENTATION DU STREAMING
-        // =================================================================
+        
         this.executeStreamQuery = async (dbConnection, queryString, queryParams, msg, send) => {
-        const chunkSize = parseInt(this.config.streamChunkSize) || 1;
-        // La taille du fetch peut être optimisée, mais restons simple pour la clarté.
-        const fetchSize = chunkSize > 50 ? 50 : chunkSize;
-        let cursor;
-
-        try {
-            cursor = await dbConnection.query(queryString, queryParams, { cursor: true, fetchSize: fetchSize });
-            this.status({ fill: "blue", shape: "dot", text: "streaming rows..." });
-
-            let rowCount = 0;
-            let chunk = [];
-
-            // Boucle infinie qui sera rompue de l'intérieur
-            while (true) {
-                const rows = await cursor.fetch();
-
-                // 1. VÉRIFIER D'ABORD LA FIN DU FLUX
-                if (!rows || rows.length === 0) {
-                    // Le flux de la base de données est terminé.
-                    // Le contenu actuel de `chunk` est le tout dernier lot.
-                    if (chunk.length > 0) {
-                        const newMsg = RED.util.cloneMessage(msg);
-                        objPath.set(newMsg, this.config.outputObj, chunk);
-                        // C'est le message final, donc `complete` est TRUE.
-                        newMsg.odbc_stream = { index: rowCount - chunk.length, count: chunk.length, complete: true };
-                        send(newMsg);
-                    } else if (rowCount === 0) {
-                        // Gérer le cas où la requête ne retourne aucune ligne.
-                        const newMsg = RED.util.cloneMessage(msg);
-                        objPath.set(newMsg, this.config.outputObj, []);
-                        newMsg.odbc_stream = { index: 0, count: 0, complete: true };
-                        send(newMsg);
+            const chunkSize = parseInt(this.config.streamChunkSize) || 1;
+            const fetchSize = chunkSize > 100 ? 100 : chunkSize;
+            let cursor;
+        
+            try {
+                cursor = await dbConnection.query(queryString, queryParams, { cursor: true, fetchSize: fetchSize });
+                this.status({ fill: "blue", shape: "dot", text: "streaming rows..." });
+        
+                let rowCount = 0;
+                let chunk = [];
+        
+                while (true) {
+                    const rows = await cursor.fetch();
+                    if (!rows || rows.length === 0) {
+                        break;
                     }
-                    // Quitter la boucle car il n'y a plus rien à faire.
-                    break;
-                }
-
-                // 2. S'IL Y A DES LIGNES, LES TRAITER
-                for (const row of rows) {
-                    rowCount++;
-                    chunk.push(row);
-                    if (chunk.length >= chunkSize) {
-                        const newMsg = RED.util.cloneMessage(msg);
-                        objPath.set(newMsg, this.config.outputObj, chunk);
-                        // Ce lot n'est pas le dernier, donc `complete` est FALSE.
-                        newMsg.odbc_stream = { index: rowCount - chunk.length, count: chunk.length, complete: false };
-                        send(newMsg);
-                        // Vider le lot pour le prochain remplissage.
-                        chunk = [];
+        
+                    for (const row of rows) {
+                        rowCount++;
+                        chunk.push(row);
+                        if (chunk.length >= chunkSize) {
+                            const newMsg = RED.util.cloneMessage(msg);
+                            objPath.set(newMsg, this.config.outputObj, chunk);
+                            newMsg.odbc_stream = { index: rowCount - chunk.length, count: chunk.length, complete: false };
+                            send(newMsg);
+                            chunk = [];
+                        }
                     }
                 }
-            } // Fin de la boucle while
-
-            this.status({ fill: "green", shape: "dot", text: `success (${rowCount} rows)` });
-
-        } finally {
-            if (cursor) {
-                await cursor.close();
+        
+                if (chunk.length > 0) {
+                    const newMsg = RED.util.cloneMessage(msg);
+                    objPath.set(newMsg, this.config.outputObj, chunk);
+                    newMsg.odbc_stream = { index: rowCount - chunk.length, count: chunk.length, complete: false };
+                    send(newMsg);
+                }
+        
+                const finalMsg = RED.util.cloneMessage(msg);
+                objPath.set(finalMsg, this.config.outputObj, []);
+                finalMsg.odbc_stream = { index: rowCount, count: 0, complete: true };
+                send(finalMsg);
+        
+                this.status({ fill: "green", shape: "dot", text: `success (${rowCount} rows)` });
+        
+            } finally {
+                if (cursor) {
+                    await cursor.close();
+                }
             }
-        }
-    };
+        };
 
-        // =================================================================
-        // NOUVELLE LOGIQUE D'ENTREE UNIFIEE
-        // =================================================================
         this.on("input", async (msg, send, done) => {
             if (!this.poolNode) {
-                const err = new Error("ODBC Config node not properly configured.");
-                this.status({ fill: "red", shape: "ring", text: "No config node" });
-                done(err);
-                return;
+                return done(new Error("ODBC Config node not properly configured."));
             }
-
-            let connection;
-            try {
-                this.status({ fill: "blue", shape: "dot", text: "preparing..." });
+    
+            const execute = async (connection) => {
                 this.config.outputObj = this.config.outputObj || "payload";
-
-                // Obtenir la requête et les paramètres
+                
                 const querySourceType = this.config.querySourceType || 'msg';
                 const querySource = this.config.querySource || 'query';
                 const paramsSourceType = this.config.paramsSourceType || 'msg';
                 const paramsSource = this.config.paramsSource || 'parameters';
-
-                const currentQueryParams = await new Promise((resolve) => {
-                    RED.util.evaluateNodeProperty(paramsSource, paramsSourceType, this, msg, (err, value) => resolve(err ? undefined : value));
-                });
-
-                let currentQueryString = await new Promise((resolve) => {
-                     RED.util.evaluateNodeProperty(querySource, querySourceType, this, msg, (err, value) => resolve(err ? undefined : (value || this.config.query || "")));
-                });
                 
-                if (!currentQueryString) { throw new Error("No query to execute"); }
+                const params = await new Promise(resolve => RED.util.evaluateNodeProperty(paramsSource, paramsSourceType, this, msg, (err, val) => resolve(err ? undefined : val)));
+                let query = await new Promise(resolve => RED.util.evaluateNodeProperty(querySource, querySourceType, this, msg, (err, val) => resolve(err ? undefined : (val || this.config.query || ""))));
                 
-                const isPreparedStatement = currentQueryParams || (currentQueryString && currentQueryString.includes("?"));
-                if (!isPreparedStatement && currentQueryString) {
-                    currentQueryString = mustache.render(currentQueryString, msg);
+                if (!query) throw new Error("No query to execute");
+    
+                const isPreparedStatement = params || (query && query.includes("?"));
+                if (!isPreparedStatement && query) {
+                    query = mustache.render(query, msg);
                 }
                 
-                // Obtenir une connexion du pool
-                this.status({ fill: "yellow", shape: "dot", text: "connecting..." });
-                connection = await this.poolNode.connect();
                 this.status({ fill: "blue", shape: "dot", text: "executing..." });
-
                 if (this.config.streaming) {
-                    await this.executeStreamQuery(connection, currentQueryString, currentQueryParams, msg, send);
+                    await this.executeStreamQuery(connection, query, params, msg, send);
                 } else {
-                    const newMsg = await this.executeQueryAndProcess(connection, currentQueryString, currentQueryParams, msg);
+                    const newMsg = await this.executeQueryAndProcess(connection, query, params, msg);
                     this.status({ fill: "green", shape: "dot", text: "success" });
                     send(newMsg);
                 }
-                
-                // Si tout s'est bien passé, on appelle done() sans erreur
-                done();
-
-            } catch (err) {
-                const finalError = this.enhanceError(err, null, null, "Query Execution Failed");
-                this.status({ fill: "red", shape: "ring", text: "query error" });
-                done(finalError); // On passe l'erreur à done() pour que Node-RED la gère
-
-            } finally {
-                if (connection) {
+            };
+    
+            let connectionFromPool;
+            try {
+                this.status({ fill: "yellow", shape: "dot", text: "connecting..." });
+                connectionFromPool = await this.poolNode.connect();
+                await execute(connectionFromPool);
+                return done();
+            } catch (poolError) {
+                this.warn(`First attempt with pooled connection failed: ${poolError.message}`);
+                if (this.poolNode.config.retryFreshConnection) {
+                    this.warn("Attempting retry with a fresh connection.");
+                    this.status({ fill: "yellow", shape: "dot", text: "Retrying (fresh)..." });
+                    let freshConnection;
                     try {
-                        await connection.close();
-                    } catch (closeErr) {
-                        this.warn(`Failed to close DB connection: ${closeErr.message}`);
+                        const freshConnectConfig = this.poolNode.getFreshConnectionConfig();
+                        freshConnection = await odbcModule.connect(freshConnectConfig);
+                        this.log("Fresh connection established for retry.");
+                        await execute(freshConnection);
+                        this.log("Query successful with fresh connection. Resetting pool.");
+                        await this.poolNode.resetPool();
+                        return done();
+                    } catch (freshError) {
+                        this.status({ fill: "red", shape: "ring", text: "retry failed" });
+                        return done(this.enhanceError(freshError, null, null, "Retry with fresh connection also failed"));
+                    } finally {
+                        if (freshConnection) await freshConnection.close();
                     }
+                } else {
+                    this.status({ fill: "red", shape: "ring", text: "query error" });
+                    return done(this.enhanceError(poolError));
                 }
+            } finally {
+                if (connectionFromPool) await connectionFromPool.close();
             }
         });
         
         this.on("close", (done) => {
             this.status({});
-            // La logique de fermeture du pool est déjà dans le noeud de config
             done();
         });
-
+    
         if (this.poolNode) {
             this.status({ fill: "green", shape: "dot", text: "ready" });
         } else {
@@ -347,6 +378,6 @@ module.exports = function (RED) {
             this.warn("ODBC Config node not found or not deployed.");
         }
     }
-
+    
     RED.nodes.registerType("odbc", odbc);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bkmj/node-red-contrib-odbcmj",
-  "version": "2.1.4",
+  "version": "2.2.1",
   "description": "A powerful Node-RED node to connect to any ODBC data source, with connection pooling, advanced retry logic, and result streaming.",
   "keywords": [
     "node-red",