node-red-contrib-hik-media-buffer 1.1.69 → 1.1.71

package/hik-media-buffer.js

@@ -32,6 +32,11 @@ module.exports = function(RED) {
 
         node.status({fill:"grey", shape:"ring", text:"Inizializzazione..."});
 
+        function toHikDate(d) {
+            const pad = (num) => String(num).padStart(2, '0');
+            return `${d.getUTCFullYear()}-${pad(d.getUTCMonth()+1)}-${pad(d.getUTCDate())}T${pad(d.getUTCHours())}:${pad(d.getUTCMinutes())}:${pad(d.getUTCSeconds())}Z`;
+        }
+
         async function getCameraName(channelID) {
             const nvrAuth = new AxiosDigestAuth({ username: node.user, password: node.pass });
             try {
@@ -105,11 +110,8 @@ module.exports = function(RED) {
 
         const heartbeatInterval = setInterval(checkCameras, 30000);
 
-        // --- STRATEGIA DI DOWNLOAD MULTIMEDIALE 100% JSON + FFMPEG EXTRACTION ---
-        // --- STRATEGIA DI DOWNLOAD MULTIMEDIALE 100% JSON + FFMPEG EXTRACTION ---
-        // --- STRATEGIA DI DOWNLOAD MULTIMEDIALE CON DOPPIO FALLBACK ORARIO (LOCALE / UTC) ---
         async function downloadMedia(evento, channelID) {
-            node.warn(`[warn] [hik-media-buffer:test] [TRIGGER] Ricevuto evento. Evento: ${evento}, Canale originario: ${channelID}`);
+            node.warn(`[TRIGGER] Ricevuto evento. Evento: ${evento}, Canale originario: ${channelID}`);
             
             const nowTime = Date.now();
             if (!lastTriggerTime[channelID]) lastTriggerTime[channelID] = 0;
@@ -120,27 +122,16 @@ module.exports = function(RED) {
             const referenceTime = new Date();
             const timestamp = Math.floor(referenceTime.getTime() / 1000);
             
-            // FUNZIONE 1: FORMATTO IN ORA LOCALE (Es. 2026-06-09T14:30:00)
-            const formatLocaleDate = (d) => {
-                const pad = (num) => String(num).padStart(2, '0');
-                return `${d.getFullYear()}-${pad(d.getMonth()+1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
-            };
-
-            // FUNZIONE 2: FORMATTO IN ORA UTC (Es. 2026-06-09T12:30:00Z)
-            const formatUtcDate = (d) => {
-                const pad = (num) => String(num).padStart(2, '0');
-                return `${d.getUTCFullYear()}-${pad(d.getUTCMonth()+1)}-${pad(d.getUTCDate())}T${pad(d.getUTCHours())}:${pad(d.getUTCMinutes())}:${pad(d.getUTCSeconds())}Z`;
-            };
+            const startTime = toHikDate(new Date(referenceTime.getTime() - (30 * 1000)));
+            const endTime = toHikDate(new Date(referenceTime.getTime() + (5 * 1000)));
 
             node.status({fill:"yellow", shape:"dot", text:`Download Cam ${channelID}...`});
             const nomeCamera = await getCameraName(channelID);
             
-            // Aspettiamo 8 secondi per dare tempo all'Hard Disk di scrivere l'indice
-            node.warn(`[warn] [hik-media-buffer:test] Attesa scrittura indice Hard Disk (8s)...`);
             await new Promise(resolve => setTimeout(resolve, 8000));
             
             const baseUrl = `${node.protocol}://${node.host}:${node.port}/ISAPI/ContentMgmt`;
-            const evMinuscolo = evento.toLowerCase(); 
+            let evMinuscolo = evento.toLowerCase();
 
             let output = { 
                 tipo_messaggio: "evento",
@@ -156,85 +147,37 @@ module.exports = function(RED) {
             };
 
             const parsedChannel = parseInt(channelID, 10);
-            let fileDaCancellare = [];
-            let videoUriMatch = null;
-
-            // --- TENTATIVO 1: RICERCA IN ORA LOCALE (La più probabile per i dischi NVR) ---
-            const startLocale = formatLocaleDate(new Date(referenceTime.getTime() - (120 * 1000)));
-            const endLocale = formatLocaleDate(new Date(referenceTime.getTime() + (30 * 1000)));
             
-            node.warn(`[warn] [hik-media-buffer:test] [TENTATIVO 1] Ricerca video in Ora Locale: ${startLocale} -> ${endLocale}`);
-            
-            const trackVideoId = (parsedChannel * 100) + 1;
-
-            let payloadLocale = {
+            // Query JSON Pulita e Blindata (Ancorata al Canale Reale dell'NVR)
+            const searchJsonPayload = {
                 "EventSearchDescription": {
                     "searchID": "BA80CAF2-A1E5-42E3-8624-529C3D6665D7",
                     "searchResultPosition": 0,
                     "maxResults": 10,
-                    "timeSpanList": [{"startTime": startLocale, "endTime": endLocale}],
+                    "timeSpanList": [{ "startTime": startTime, "endTime": endTime }],
                     "type": "all",
-                    "channels": [trackVideoId],
+                    "channels": [parsedChannel],
                     "eventType": "behavior",
-                    "behavior": {"behaviorEventType": evMinuscolo}
+                    "behavior": { "behaviorEventType": "all" }
                 }
             };
 
+            let fileDaCancellare = [];
+
             try {
-                let resLocale = await camAuth.request({
+                const resSearchVideo = await camAuth.request({
                     method: 'POST',
                     url: `${baseUrl}/eventRecordSearch?format=json`,
-                    data: payloadLocale,
-                    headers: { "Content-Type": "application/json" },
-                    timeout: 5000
+                    data: searchJsonPayload,
+                    headers: { "Content-Type": "application/json" }
                 });
-                let dataStr = JSON.stringify(resLocale.data);
-                videoUriMatch = dataStr.match(/rtsp:\/\/[^"]+/i) || dataStr.match(/\/ISAPI\/ContentMgmt\/download[^"]+/i);
-            } catch (e) {
-                node.warn(`[warn] [hik-media-buffer:test] Tentativo 1 fallito o timeout: ${e.message}`);
-            }
 
-            // --- TENTATIVO 2: FALLBACK IN ORA UTC (Se il primo tentativo è andato a vuoto) ---
-            if (!videoUriMatch) {
-                const startUtc = formatUtcDate(new Date(referenceTime.getTime() - (120 * 1000)));
-                const endUtc = formatUtcDate(new Date(referenceTime.getTime() + (30 * 1000)));
+                const resDataStr = JSON.stringify(resSearchVideo.data);
+                const videoUriMatch = resDataStr.match(/rtsp:\/\/[^"]+/i) || resDataStr.match(/\/ISAPI\/ContentMgmt\/download[^"]+/i);
                 
-                node.warn(`[warn] [hik-media-buffer:test] [TENTATIVO 2] Video locale non trovato. Provo Fallback in Ora UTC: ${startUtc} -> ${endUtc}`);
-                
-                let payloadUtc = {
-                    "EventSearchDescription": {
-                        "searchID": "BA80CAF2-A1E5-42E3-8624-529C3D6665D7",
-                        "searchResultPosition": 0,
-                        "maxResults": 10,
-                        "timeSpanList": [{"startTime": startUtc, "endTime": endUtc}],
-                        "type": "all",
-                        "channels": [trackVideoId],
-                        "eventType": "behavior",
-                        "behavior": {"behaviorEventType": evMinuscolo}
-                    }
-                };
-
-                try {
-                    let resUtc = await camAuth.request({
-                        method: 'POST',
-                        url: `${baseUrl}/eventRecordSearch?format=json`,
-                        data: payloadUtc,
-                        headers: { "Content-Type": "application/json" },
-                        timeout: 5000
-                    });
-                    let dataStr = JSON.stringify(resUtc.data);
-                    videoUriMatch = dataStr.match(/rtsp:\/\/[^"]+/i) || dataStr.match(/\/ISAPI\/ContentMgmt\/download[^"]+/i);
-                } catch (e) {
-                    node.error(`[error] [hik-media-buffer:test] Errore critico anche nel Fallback UTC: ${e.message}`);
-                }
-            }
-
-            // --- PROCESSO DI SCARICAMENTO SE UNA DELLE DUE QUERIES HA TROVATO IL VIDEO ---
-            if (videoUriMatch) {
-                let rawVideoUri = videoUriMatch[0].replace(/\\/g, '');
-                node.warn(`[warn] [hik-media-buffer:test] [FOUND] Trovato playbackURI video: ${rawVideoUri}`);
-                
-                try {
+                if (videoUriMatch) {
+                    let rawVideoUri = videoUriMatch[0].replace(/\\/g, '');
+                    
                     const resDownVideo = await camAuth.request({ 
                         method: 'GET',
                         url: `${baseUrl}/download`, 
@@ -252,51 +195,39 @@ module.exports = function(RED) {
                     fs.writeFileSync(rawPath, videoBuffer);
                     fileDaCancellare.push(rawPath);
                     
-                    node.warn(`[warn] [hik-media-buffer:test] Esecuzione FFMPEG (Estrazione JPG + FastStart MP4)...`);
                     await new Promise((resolve) => {
                         exec(`ffmpeg -y -i "${rawPath}" -ss 00:00:01 -vframes 1 "${extractedImgPath}" -c copy -movflags +faststart "${fixedPath}"`, (err) => {
                             if (!err) {
                                 if (fs.existsSync(extractedImgPath)) {
                                     output.foto_base64 = fs.readFileSync(extractedImgPath, { encoding: 'base64' });
                                     fileDaCancellare.push(extractedImgPath);
-                                    node.warn(`[warn] [hik-media-buffer:test] Snapshot FOTO estratto con successo.`);
                                 }
                                 if (fs.existsSync(fixedPath)) {
                                     output.video_base64 = fs.readFileSync(fixedPath, { encoding: 'base64' });
                                     fileDaCancellare.push(fixedPath);
-                                    node.warn(`[warn] [hik-media-buffer:test] Video MP4 indicizzato con successo.`);
                                 }
                             } else {
-                                node.warn(`[warn] [hik-media-buffer:test] Errore FFMPEG, uso file grezzo: ${err.message}`);
                                 output.video_base64 = fs.readFileSync(rawPath, { encoding: 'base64' });
                             }
                             resolve();
                         });
                     });
-                } catch (downErr) {
-                    node.error(`[error] [hik-media-buffer:test] Errore durante il download fisico del file: ${downErr.message}`);
                 }
-            } else {
-                node.warn(`[warn] [hik-media-buffer:test] [NOT FOUND] Il video non è stato trovato in nessuna delle due finestre temporali (Locale/UTC). Verificare se l'NVR sta effettivamente registrando l'evento.`);
+            } catch (videoErr) {
+                node.error(`[ERROR] Errore esecuzione: ${videoErr.message}`);
             }
 
-            // --- SPEDIZIONE PAYLOAD VERSO PYTHON ---
             if (output.foto_base64 || output.video_base64) {
-                node.warn(`[warn] [hik-media-buffer:test] Spedizione payload multimediale completata con successo!`);
                 node.send({ payload: output });
-                
                 setTimeout(() => {
                     for (let file of fileDaCancellare) {
                         try { if (fs.existsSync(file)) fs.unlinkSync(file); } catch (err) {}
                     }
-                }, 120000);
-            } else {
-                node.warn(`[warn] [hik-media-buffer:test] Nessun pacchetto inviato a Node-RED.`);
+                }, 60000);
             }
             updateNodeStatus();
         }
 
-        // --- ALERT STREAM ---
         function startAlertStream() {
             if (isClosing) return;
             const nvrAuth = new AxiosDigestAuth({ username: node.user, password: node.pass });
@@ -305,7 +236,7 @@ module.exports = function(RED) {
             nvrAuth.request({ method: 'GET', url: url, responseType: 'stream', httpsAgent: node.protocol === "https" ? httpsAgent : undefined })
             .then(response => {
                 streamRequest = response;
-                if (!nvrOnline) { node.send({ payload: { tipo_messaggio: "status", stato_telecamera: "online", ip: node.host, msg: "NVR Online", nome_cliente: node.name } }); nvrOnline = true; }
+                if (!nvrOnline) { nvrOnline = true; }
                 updateNodeStatus();
                 
                 response.data.on('data', (chunk) => {
@@ -327,7 +258,7 @@ module.exports = function(RED) {
         }
 
         function handleNvrError() {
-            if (nvrOnline) { node.send({ payload: { tipo_messaggio: "status", stato_telecamera: "offline", ip: node.host, msg: "NVR Offline", nome_cliente: node.name } }); nvrOnline = false; }
+            nvrOnline = false;
             updateNodeStatus();
             if (!isClosing) setTimeout(startAlertStream, 10000);
         }

package/package.json

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