node-red-contrib-hik-media-buffer 1.1.46 → 1.1.48

package/hik-media-buffer.js

@@ -22,9 +22,7 @@ module.exports = function(RED) {
         let isClosing = false;
         let lastTriggerTime = {};
         let nvrOnline = true;
-        
         let statoCanale = {}; 
-        let ultimoAllarmeTempo = {}; 
 
         const httpsAgent = new https.Agent({ rejectUnauthorized: false });
         
@@ -80,7 +78,7 @@ module.exports = function(RED) {
                 while ((matchBlocco = bloccoRegex.exec(xmlData)) !== null) {
                     const bloccoContenuto = matchBlocco[1];
                     
-                    const idMatch = bloccoContenuto.match(/<id>(\d+)<\/id>/i);
+                    const idMatch = bloccoContenited.match(/<id>(\d+)<\/id>/i);
                     const statusMatch = bloccoContenuto.match(/<status>([^<]+)</i);
 
                     if (idMatch && statusMatch) {
@@ -120,20 +118,21 @@ module.exports = function(RED) {
 
         const heartbeatInterval = setInterval(checkCameras, 30000);
 
-        // --- DOWNLOAD MULTIMEDIALE DA NVR CON LOGICA STRUTTURALE ORIGINALE ---
+        // --- DOWNLOAD MULTIMEDIALE BASATO SULL'ISPEZIONA REALE DELL'NVR ---
         async function downloadMedia(evento, channelID) {
             const nowTime = Date.now();
             if (!lastTriggerTime[channelID]) lastTriggerTime[channelID] = 0;
             if (nowTime - lastTriggerTime[channelID] < 5000) return; 
             lastTriggerTime[channelID] = nowTime;
 
-            // ISTANZIAMO camAuth SULL'NVR: Risolve il problema delle credenziali vuote nel vecchio blocco
             const camAuth = new AxiosDigestAuth({ username: node.user, password: node.pass });
             
             const referenceTime = new Date();
             const timestamp = Math.floor(referenceTime.getTime() / 1000);
-            const startTime = toHikDate(new Date(referenceTime.getTime() - (10 * 1000)));
-            const endTime = toHikDate(new Date(referenceTime.getTime() + (10 * 1000)));
+            
+            // Finestra temporale basata sulle date ISO
+            const startTime = toHikDate(new Date(referenceTime.getTime() - (20 * 1000)));
+            const endTime = toHikDate(new Date(referenceTime.getTime() + (20 * 1000)));
 
             node.status({fill:"yellow", shape:"dot", text:`Download Cam ${channelID}...`});
             const nomeCamera = await getCameraName(channelID);
@@ -141,12 +140,21 @@ module.exports = function(RED) {
             await new Promise(resolve => setTimeout(resolve, 6000));
             const baseUrl = `${node.protocol}://${node.host}:${node.port}/ISAPI/ContentMgmt`;
             
+            // Ricostruiamo l'evento con il case-sensitive corretto per l'NVR (FieldDetection / LineDetection)
+            let eventoNVR = "FieldDetection";
+            for (let e of EventList) {
+                if (evento.toLowerCase() === e.toLowerCase()) {
+                    eventoNVR = e;
+                    break;
+                }
+            }
+
             let output = { 
                 tipo_messaggio: "evento",
                 nome_cliente: node.name, 
                 nome_telecamera: nomeCamera, 
                 ip_telecamera: node.host, 
-                tipo_evento: evento, 
+                tipo_evento: eventoNVR, 
                 timestamp_epoch: timestamp,
                 stato_telecamera: "ONLINE",
                 channel: channelID.toString(),
@@ -155,16 +163,19 @@ module.exports = function(RED) {
             };
 
             const parsedChannel = parseInt(channelID, 10);
-            const trackVideo = (parsedChannel * 100) + 1; // Formula NVR (*100+1) 
-            const trackFoto = (parsedChannel * 100) + 3;  // Formula NVR (*100+3) 
+            const trackVideo = (parsedChannel * 100) + 1; // Canale 2 -> 201
+            const trackFoto = (parsedChannel * 100) + 3;  // Canale 2 -> 203
             
-            const tracks = [{ id: trackVideo.toString() }, { id: trackFoto.toString() }];
+            const tracks = [
+                { id: trackVideo.toString(), isFoto: false }, 
+                { id: trackFoto.toString(), isFoto: true }
+            ];
             let fileDaCancellare = [];
 
             try {
                 for (let t of tracks) {
-                    // RIPRISTINATO: Il tuo XML originale esatto con <trackIDList> e ${evento} dinamico 
-                    const searchXml = `<?xml version="1.0" encoding="utf-8"?><CMSearchDescription><searchID>LAST_EVENT</searchID><trackIDList><trackID>${t.id}</trackID></trackIDList><timeSpanList><timeSpan><startTime>${startTime}</startTime><endTime>${endTime}</endTime></timeSpan></timeSpanList><maxResults>100</maxResults><metadataList><metadataDescriptor>//recordType.meta.std-cgi.com/${evento}</metadataDescriptor></metadataList></CMSearchDescription>`;
+                    // COPIATO DALL'ISPEZIONA: Inserito <contentTypeList> e corretto metadataDescriptor proprietario hikvision
+                    const searchXml = `<?xml version="1.0" encoding="utf-8"?><CMSearchDescription><searchID>LAST_EVENT</searchID><trackIDList><trackID>${t.id}</trackID></trackIDList><timeSpanList><timeSpan><startTime>${startTime}</startTime><endTime>${endTime}</endTime></timeSpan></timeSpanList><contentTypeList><contentType>metadata</contentType></contentTypeList><maxResults>30</maxResults><metadataList><metadataDescriptor>recordType.meta.hikvision.com/${eventoNVR}</metadataDescriptor></metadataList></CMSearchDescription>`;
 
                     const resSearch = await camAuth.request({ 
                         method: 'POST', url: `${baseUrl}/search`, data: searchXml, headers: { "Content-Type": "application/xml" } 
@@ -183,8 +194,8 @@ module.exports = function(RED) {
                         });
 
                         let buffer = Buffer.from(resDown.data);
-                        if (t.id === trackFoto.toString()) {
-                            // SALVA FOTO IN LOCALE
+                        if (t.isFoto) {
+                            // SALVA FOTO TERMICA NATIVA IN LOCALE
                             const fullImgPath = path.join(baseStorage, `img_${timestamp}.jpg`);
                             fs.writeFileSync(fullImgPath, buffer);
                             output.foto_base64 = fs.readFileSync(fullImgPath, { encoding: 'base64' });
@@ -245,9 +256,7 @@ module.exports = function(RED) {
                         if (chMatch) {
                             let ev = "Unknown";
                             for (let e of EventList) { if (data.includes(e.toLowerCase())) { ev = e; break; } }
-                            
-                            if (ev === "Unknown") return; // Ignora heartbeat o altri eventi non mappati
-                            
+                            if (ev === "Unknown") return;
                             downloadMedia(ev, chMatch[1]);
                         }
                     }

package/package.json

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