node-red-contrib-hik-media-buffer 1.1.32 → 1.1.34

package/hik-media-buffer.js

@@ -22,7 +22,7 @@ module.exports = function(RED) {
 
         let streamRequest = null;
         let isClosing = false;
-        let lastTriggerTime = 0;
+        let lastTriggerTime = {};
         let nvrOnline = true;
         let statoCamera = {}; 
 
@@ -111,12 +111,16 @@ module.exports = function(RED) {
         // --- DOWNLOAD, SALVATAGGIO, CONVERSIONE E RIMOZIONE DOPO 2 MINUTI ---
         async function downloadMedia(evento, channelID) {
             const camera = node.cameras.find(c => c.channel == channelID);
-            const nomeCamera = await getCameraName(camera);
             if (!camera) return;
 
+            const nomeCamera = await getCameraName(camera);
+            
             const nowTime = Date.now();
-            if (nowTime - lastTriggerTime < 10000) return; 
-            lastTriggerTime = nowTime;
+            if(!lastTriggerTime[camera.ip]){
+                lastTriggerTime[camera.ip] = 0;
+            }
+            if (nowTime - lastTriggerTime[camera.ip] < 5000) return; 
+            lastTriggerTime[camera.ip] = nowTime;
 
             const camAuth = new AxiosDigestAuth({ username: node.user, password: node.camPass });
             const referenceTime = new Date();
@@ -241,9 +245,18 @@ module.exports = function(RED) {
                     if (data.includes("active")) {
                         const chMatch = data.match(/<channelid>(\d+)<\/channelid>/i);
                         if (chMatch) {
+                            let channelID = chMatch[1];
+
+                            // --- IL TUO CONTROLLO LOGICO ---
+                            // Se l'host di ascolto coincide con l'IP della telecamera termica (canale 2)
+                            // e la telecamera restituisce erroneamente canale 1, forziamo il canale a 2
+                            const camTermica = node.cameras.find(c => c.channel == "2");
+                            if (camTermica && node.host === camTermica.ip && channelID === "1") {
+                                channelID = "2";
+                            }
                             let ev = "Unknown";
                             for (let e of EventList) { if (data.includes(e.toLowerCase())) { ev = e; break; } }
-                            downloadMedia(ev, chMatch[1]);
+                            downloadMedia(ev, channelID);
                         }
                     }
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-hik-media-buffer",
-  "version": "1.1.32",
+  "version": "1.1.34",
   "description": "Ottiene buffer video e immagine da camere Hikvision via ISAPI",
   "keywords": [
     "node-red",