node-red-contrib-hik-media-buffer 1.1.21 → 1.1.22

package/hik-media-buffer.js

@@ -1,4 +1,5 @@
 const axios = require('axios');
+const AxiosDigestAuth = require('@mhoc/axios-digest-auth').default;
 const https = require('https');
 const fs = require('fs');
 const path = require('path');
@@ -27,69 +28,59 @@ module.exports = function(RED) {
 
         const httpsAgent = new https.Agent({ rejectUnauthorized: false });
         const EventList = ["FieldDetection", "LineDetection"];
+
+        // --- CARTELLA TEMPORANEA SUL PC DEL CLIENTE ---
         const baseStorage = path.join(os.tmpdir(), "hik_temp_media");
-        
         if (!fs.existsSync(baseStorage)) fs.mkdirSync(baseStorage, { recursive: true });
 
         node.status({fill:"grey", shape:"ring", text:"Inizializzazione..."});
 
         function toHikDate(d) { return d.toISOString().split('.')[0] + "Z"; }
 
-        // --- HELPER CENTRALIZZATO PER GLI HEADERS DI AUTENTICAZIONE ---
-        // È QUI che si concentra la flessibilità richiesta dal tuo capo!
-        function getAuthHeaders() {
-            // SCENARIO ATTUALE: Basic Auth standard (o se integrerai un calcolatore Digest custom)
-            // Axios gestisce nativamente la Basic Auth codificandola in Base64 nell'header
-            const tokenBase64 = Buffer.from(`${node.user}:${node.camPass}`).toString('base64');
-            
-            return {
-                "Authorization": `Basic ${tokenBase64}`, // <-- OGGI: Usiamo Basic/Digest
-                // "Authorization": `Bearer ${node.futuroToken}`, // <-- DOMANI: Basterà scommentare questo!
-                "Content-Type": "application/xml"
-            };
-        }
-
         // --- PRENDE IL NOME DELLA TELECAMERA ---
         async function getCameraName(cam) {
+            const camAuth = new AxiosDigestAuth({ 
+                username: node.user, 
+                password: node.camPass 
+            });
+
             try {
-                const res = await axios({
+                const res = await camAuth.request({
                     method: 'GET',
                     url: `${node.protocol}://${cam.ip}:${node.port}/ISAPI/System/Video/inputs/channels/${cam.channel}/overlays/channelNameOverlay`,
                     timeout: 5000,
-                    headers: getAuthHeaders(),
                     httpsAgent: node.protocol === "https" ? httpsAgent : undefined
                 });
+
                 const data = res.data.toString();
                 const match = data.match(/<name>([^<]+)<\/name>/i);
-                return match && match[1] ? match[1].trim() : `Canale_${cam.channel}`;
-            } catch (e) { return `Camera_${cam.ip}`; }
+                
+                if (match && match[1]) {
+                    return match[1].trim();
+                } else {
+                    return `Canale_${cam.channel}`;
+                }
+
+            } catch (e) {
+                return `Camera_${cam.ip}`; 
+            }
         }
 
         // --- CONTROLLO STATUS CAMERE ---
         async function checkCameras() {
             if (isClosing) return;
             for (let cam of node.cameras) {
+                const camAuth = new AxiosDigestAuth({ username: node.user, password: node.camPass });
                 try {
-                    await axios({ 
+                    await camAuth.request({ 
                         method: 'GET', 
                         url: `${node.protocol}://${cam.ip}:${node.port}/ISAPI/System/deviceInfo`,
                         timeout: 5000,
-                        headers: getAuthHeaders(),
                         httpsAgent: node.protocol === "https" ? httpsAgent : undefined
                     });
                     if (statoCamera[cam.ip] === false) {
                         const nomeOnline = await getCameraName(cam);
-                        
-                        node.send({ 
-                            payload: { 
-                                tipo_messaggio: "status", 
-                                nome_cliente: node.name, 
-                                nome_telecamera: nomeOnline, 
-                                ip_telecamera: cam.ip, 
-                                channel: cam.channel, 
-                                stato_telecamera: "ONLINE",
-                            } 
-                        });
+                        node.send({ payload: { tipo_messaggio: "status", stato_telecamera: "online", nome_cliente: node.name, nome_telecamera: nomeOnline, ip_telecamera: cam.ip, channel: cam.channel, msg: "Camera ripristinata" } });
                         statoCamera[cam.ip] = true;
                     } else if (statoCamera[cam.ip] === undefined) {
                         statoCamera[cam.ip] = true;
@@ -97,17 +88,7 @@ module.exports = function(RED) {
                 } catch (e) {
                     if (statoCamera[cam.ip] !== false) {
                         const nomeOffline = await getCameraName(cam);
-                        
-                        node.send({ 
-                            payload: { 
-                                tipo_messaggio: "status", 
-                                nome_cliente: node.name, 
-                                nome_telecamera: nomeOffline, 
-                                ip_telecamera: cam.ip, 
-                                channel: cam.channel, 
-                                stato_telecamera: "OFFLINE",
-                            } 
-                        });
+                        node.send({ payload: { tipo_messaggio: "status", stato_telecamera: "offline", nome_cliente: node.name, nome_telecamera: nomeOffline, ip_telecamera: cam.ip, channel: cam.channel, msg: "Camera non raggiungibile" } });
                         statoCamera[cam.ip] = false;
                     }
                 }
@@ -128,7 +109,7 @@ module.exports = function(RED) {
 
         const heartbeatInterval = setInterval(checkCameras, 30000);
 
-        // --- DOWNLOAD, SALVATAGGIO, CONVERSIONE E PULIZIA ---
+        // --- 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);
@@ -138,6 +119,7 @@ module.exports = function(RED) {
             if (nowTime - lastTriggerTime < 10000) return; 
             lastTriggerTime = nowTime;
 
+            const camAuth = new AxiosDigestAuth({ username: node.user, password: node.camPass });
             const referenceTime = new Date();
             const timestamp = Math.floor(referenceTime.getTime() / 1000);
             const startTime = toHikDate(new Date(referenceTime.getTime() - (10 * 1000)));
@@ -148,6 +130,7 @@ module.exports = function(RED) {
             
             const baseUrl = `${node.protocol}://${camera.ip}:${node.port}/ISAPI/ContentMgmt`;
             
+            // Prepariamo la struttura del payload per Python
             let output = { 
                 tipo_messaggio: "evento",
                 nome_cliente: node.name, 
@@ -161,6 +144,7 @@ module.exports = function(RED) {
                 video_base64: null 
             };
 
+            // Teniamo traccia dei percorsi per poterli cancellare tra 2 minuti
             let fileDaCancellare = [];
 
             try {
@@ -168,13 +152,8 @@ module.exports = function(RED) {
                 for (let t of tracks) {
                     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>`;
 
-                    // Usiamo Axios puro con gli header dinamici
-                    const resSearch = await axios({ 
-                        method: 'POST', 
-                        url: `${baseUrl}/search`, 
-                        data: searchXml, 
-                        headers: getAuthHeaders(),
-                        httpsAgent: node.protocol === "https" ? httpsAgent : undefined
+                    const resSearch = await camAuth.request({ 
+                        method: 'POST', url: `${baseUrl}/search`, data: searchXml, headers: { "Content-Type": "application/xml" } 
                     });
                     
                     let xml = resSearch.data.replace(/<(\/?)\w+:/g, "<$1");
@@ -182,28 +161,32 @@ module.exports = function(RED) {
 
                     if (uriMatch) {
                         const rawUri = uriMatch[1].replace(/&amp;/g, '&');
-                        
-                        const resDown = await axios({ 
+                        const resDown = await camAuth.request({ 
                             method: 'GET',
                             url: `${baseUrl}/download`, 
                             data: `<?xml version="1.0" encoding="UTF-8"?><downloadRequest><playbackURI>${rawUri.replace(/&/g, '&amp;')}</playbackURI></downloadRequest>`, 
-                            responseType: 'arraybuffer',
-                            headers: getAuthHeaders(),
-                            httpsAgent: node.protocol === "https" ? httpsAgent : undefined
+                            responseType: 'arraybuffer'
                         });
 
                         let buffer = Buffer.from(resDown.data);
                         if (t.id === "203") {
+                            // --- SALVA FOTO IN LOCALE COME PRIMA ---
                             const fullImgPath = path.join(baseStorage, `img_${timestamp}.jpg`);
                             fs.writeFileSync(fullImgPath, buffer);
+                            
+                            // La convertiamo subito in testo per il payload
                             output.foto_base64 = fs.readFileSync(fullImgPath, { encoding: 'base64' });
+                            
+                            // Registriamo il file per la distruzione futura
                             fileDaCancellare.push(fullImgPath);
                         } else {
+                            // --- SALVA VIDEO IN LOCALE COME PRIMA ---
                             if (buffer.slice(0, 4).toString() === 'IMKH') buffer = buffer.slice(40);
                             const rawPath = path.join(baseStorage, `raw_${timestamp}.mp4`);
                             const fixedPath = path.join(baseStorage, `hik_v_${channelID}_${timestamp}.mp4`);
                             fs.writeFileSync(rawPath, buffer);
                             
+                            // Eseguiamo ffmpeg localmente sul PC del cliente
                             await new Promise((resolve) => {
                                 exec(`ffmpeg -y -i "${rawPath}" -c copy -movflags +faststart "${fixedPath}"`, (err) => {
                                     if (!err && fs.existsSync(fixedPath)) {
@@ -220,19 +203,26 @@ module.exports = function(RED) {
                     }
                 }
 
-                node.send({ payload: output });
-                
-                if (fileDaCancellare.length > 0) {
+                // Spediamo il pacchetto completo verso l'HTTP Request tramite Node-RED
+                if (output.foto_base64 || output.video_base64) {
+                    node.send({ payload: output });
+                    
+                    // --- TIMER RIGIDO A 2 MINUTI PER LA PULIZIA DEL DISCO ---
                     setTimeout(() => {
                         for (let file of fileDaCancellare) {
-                            try { if (fs.existsSync(file)) fs.unlinkSync(file); } catch (err) {}
+                            try {
+                                if (fs.existsSync(file)) {
+                                    fs.unlinkSync(file);
+                                }
+                            } catch (err) {
+                                node.error(`Errore durante la pulizia del file temporaneo ${file}: ${err.message}`);
+                            }
                         }
-                    }, 120000);
+                    }, 120000); // 120.000 ms = 2 minuti esatti
                 }
 
             } catch (e) {
-                node.error(`Errore Download Cam ${channelID} (${e.message}). Invio allarme base.`);
-                node.send({ payload: output });
+                node.error(`Errore Download Cam ${channelID}: ${e.message}`);
             }
             updateNodeStatus();
         }
@@ -240,30 +230,12 @@ module.exports = function(RED) {
         // --- ALERT STREAM ---
         function startAlertStream() {
             if (isClosing) return;
+            const nvrAuth = new AxiosDigestAuth({ username: node.user, password: node.pass });
             const url = `${node.protocol}://${node.host}:${node.port}/ISAPI/Event/notification/alertStream`;
-            
-            axios({ 
-                method: 'GET', 
-                url: url, 
-                responseType: 'stream', 
-                headers: getAuthHeaders(),
-                httpsAgent: node.protocol === "https" ? httpsAgent : undefined 
-            })
+            nvrAuth.request({ method: 'GET', url: url, responseType: 'stream', httpsAgent: node.protocol === "https" ? httpsAgent : undefined })
             .then(response => {
                 streamRequest = response;
-                if (!nvrOnline) { 
-                    const timestamp = Math.floor(Date.now() / 1000);
-                    node.send({ 
-                        payload: { 
-                            tipo_messaggio: "status", 
-                            nome_cliente: node.name, 
-                            ip: node.host, 
-                            tipo_evento: "CAMBIO STATO",
-                            stato_telecamera: "ONLINE", 
-                        } 
-                    }); 
-                    nvrOnline = true; 
-                }
+                if (!nvrOnline) { node.send({ payload: { tipo_messaggio: "status", stato_telecamera: "online", ip: node.host, msg: "NVR Online", nome_cliente: node.name } }); nvrOnline = true; }
                 updateNodeStatus();
                 response.data.on('data', (chunk) => {
                     const data = chunk.toString().toLowerCase();
@@ -282,18 +254,7 @@ module.exports = function(RED) {
         }
 
         function handleNvrError() {
-            if (nvrOnline) { 
-                node.send({ 
-                    payload: { 
-                        tipo_messaggio: "status", 
-                        nome_cliente: node.name, 
-                        ip: node.host, 
-                        tipo_evento: "CAMBIO STATO",
-                        stato_telecamera: "OFFLINE", 
-                    } 
-                }); 
-                nvrOnline = false; 
-            }
+            if (nvrOnline) { node.send({ payload: { tipo_messaggio: "status", stato_telecamera: "offline", ip: node.host, msg: "NVR Offline", nome_cliente: node.name } }); 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.21",
+  "version": "1.1.22",
   "description": "Ottiene buffer video e immagine da camere Hikvision via ISAPI",
   "keywords": [
     "node-red",