node-red-contrib-hik-media-buffer 1.1.134 → 1.1.136

package/hik-media-buffer.js

@@ -32,7 +32,7 @@ module.exports = function(RED) {
 
         node.status({fill:"grey", shape:"ring", text:"Inizializzazione..."});
 
-        // --- FORMATTAZIONE DATA LOCALE (Risolve il bug delle 2 ore di differenza dell'NVR) ---
+        // --- FORMATTAZIONE DATA LOCALE ---
         function toHikSearchDate(d) {
             const pad = (num) => String(num).padStart(2, '0');
             
@@ -43,15 +43,13 @@ module.exports = function(RED) {
             const minutes = pad(d.getMinutes());
             const seconds = pad(d.getSeconds());
             
-            // Costruisce la stringa mantenendo l'ora locale del PC/Node-RED (es. 09:53:19Z)
             return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}Z`;
         }
 
-        // --- 1. PRENDE IL NOME REALE DELLA TELECAMERA DAL DIGITAL PROXY ---
+        // --- 1. PRENDE IL NOME REALE DELLA TELECAMERA ---
         async function getCameraName(channelID) {
             const nvrAuth = new AxiosDigestAuth({ username: node.user, password: node.pass });
             try {
-                // In accordo con la pag. 58 della documentazione, interroghiamo l'InputProxy del canale digitale
                 const res = await nvrAuth.request({
                     method: 'GET',
                     url: `${node.protocol}://${node.host}:${node.port}/ISAPI/ContentMgmt/InputProxy/channels/${channelID}`,
@@ -59,7 +57,6 @@ module.exports = function(RED) {
                     httpsAgent: node.protocol === "https" ? httpsAgent : undefined
                 });
                 const data = res.data.toString();
-                // Estraiamo il tag <name> nativo del canale digitale
                 const match = data.match(/<name>([^<]+)<\/name>/i);
                 if (match && match[1]) return match[1].trim();
                 return `Canale ${channelID}`;
@@ -73,7 +70,6 @@ module.exports = function(RED) {
             if (isClosing || !nvrOnline) return;
             const nvrAuth = new AxiosDigestAuth({ username: node.user, password: node.pass });
             try {
-                // Chiamata all'endpoint di status dei canali proxy (Pag. 322)
                 const res = await nvrAuth.request({ 
                     method: 'GET', 
                     url: `${node.protocol}://${node.host}:${node.port}/ISAPI/ContentMgmt/InputProxy/channels/status`,
@@ -82,7 +78,6 @@ module.exports = function(RED) {
                 });
                 
                 const xml = res.data.toString();
-                // Separiamo i singoli blocchi <InputProxyChannelStatus>
                 const channelBlocks = xml.match(/<InputProxyChannelStatus>[\s\S]*?<\/InputProxyChannelStatus>/g) || [];
                 
                 for (let block of channelBlocks) {
@@ -91,21 +86,16 @@ module.exports = function(RED) {
                     
                     if (idMatch) {
                         const ch = idMatch[1].trim();
-                        // Estraiamo lo stato online nativo (true/false)
                         const isOnline = onlineMatch ? onlineMatch[1].trim().toLowerCase() === "true" : false;
 
                         if (isOnline && statoCamera[ch] === false) {
-                            // 🌟 RECUPERO REALE DEL NOME: Usiamo getCameraName per avere il nome corretto OSD ("ufficio")
                             const nomeOnline = await getCameraName(ch);
-                            
                             node.send({ payload: { tipo_messaggio: "status", stato_telecamera: "online", nome_cliente: node.name, nome_telecamera: nomeOnline, ip_telecamera: node.host, channel: ch, msg: "Camera ripristinata" } });
                             statoCamera[ch] = true;
                         } else if (!isOnline && statoCamera[ch] === true) {
-                            // Per l'offline usiamo un fallback sul canale, dato che la cam non risponderebbe a getCameraName
                             node.send({ payload: { tipo_messaggio: "status", stato_telecamera: "offline", nome_cliente: node.name, nome_telecamera: `Camera ${ch}`, ip_telecamera: node.host, channel: ch, msg: "Camera non raggiungibile" } });
                             statoCamera[ch] = false;
                         } else if (statoCamera[ch] === undefined) {
-                            // Memorizzazione iniziale dello stato al boot
                             statoCamera[ch] = isOnline;
                         }
                     }
@@ -129,14 +119,14 @@ module.exports = function(RED) {
 
         const heartbeatInterval = setInterval(checkCameras, 15000);
 
-        // --- 3. DOWNLOAD MEDIA CON DELAY E FORMATO STRINGA CORRETTO ---
+        // --- 3. DOWNLOAD MEDIA FLUIDO (Scorciatoia Diretta da JSON) ---
         async function downloadMedia(evento, channelID) {
             const nowTime = Date.now();
             if (!lastTriggerTime[channelID]) lastTriggerTime[channelID] = 0;
             if (nowTime - lastTriggerTime[channelID] < 5000) return; 
             lastTriggerTime[channelID] = nowTime;
 
-            node.status({fill:"yellow", shape:"dot", text:`Attesa scrittura NVR (6s)...`});
+            node.status({fill:"yellow", shape:"dot", text:`Attesa (6s)...`});
             await new Promise(resolve => setTimeout(resolve, 6000));
 
             const nvrAuth = new AxiosDigestAuth({ username: node.user, password: node.pass });
@@ -147,17 +137,12 @@ module.exports = function(RED) {
             const nomeCamera = await getCameraName(channelID);
             node.status({fill:"yellow", shape:"dot", text:`Download Cam ${channelID}...`});
             
-            const inizioFinestra = new Date(referenceTime.getTime() - (10 * 1000)); 
-            const fineFinestra = new Date(referenceTime.getTime() + (10 * 1000));   
+            const inizioFinestra = new Date(referenceTime.getTime() - (20 * 1000)); 
+            const fineFinestra = new Date(referenceTime.getTime() + (20 * 1000));   
             
-            const startVideoSearch = toHikSearchDate(inizioFinestra);
-            const endVideoSearch = toHikSearchDate(fineFinestra);
-
             const startFotoSearch = inizioFinestra.toISOString().split('.')[0] + "Z";
             const endFotoSearch = fineFinestra.toISOString().split('.')[0] + "Z";
 
-            node.warn(`[DEBUG HIK] Avvio ricerca video. Canale: ${channelID}. Cerco da: ${startVideoSearch} a: ${endVideoSearch}`);
-
             let output = { 
                 tipo_messaggio: "evento",
                 nome_cliente: node.name, 
@@ -174,7 +159,7 @@ module.exports = function(RED) {
             let fileDaCancellare = [];
 
             try {
-                // 1. 📸 SCARICAMENTO IMMAGINE
+                // 1. 📸 SCARICAMENTO IMMAGINE E RECUPERO METADATI ORARI
                 const payloadFoto = {
                     "EventSearchDescription": {
                         "searchID": "C5AFEE35-B1E0-4C01-83F8-47FD77892E4A",
@@ -196,54 +181,43 @@ module.exports = function(RED) {
                     httpsAgent: node.protocol === "https" ? httpsAgent : undefined
                 });
 
-                if (resFotoSearch.data?.EventSearchResult?.Targets?.[0]?.pictureUrl) {
-                    const urlFotoGrezzo = resFotoSearch.data.EventSearchResult.Targets[0].pictureUrl;
-                    
-                    const resDownFoto = await nvrAuth.request({
-                        method: 'GET',
-                        url: urlFotoGrezzo,
-                        responseType: 'arraybuffer',
-                        httpsAgent: node.protocol === "https" ? httpsAgent : undefined
-                    });
-
-                    const fullImgPath = path.join(baseStorage, `img_${timestamp}_ch${channelID}.jpg`);
-                    fs.writeFileSync(fullImgPath, Buffer.from(resDownFoto.data));
-                    output.foto_base64 = fs.readFileSync(fullImgPath, { encoding: 'base64' });
-                    fileDaCancellare.push(fullImgPath);
-                }
-
-                // 2. 🎥 SCARICAMENTO VIDEO
-                const payloadVideoSearch = `<?xml version="1.0" encoding="utf-8"?>
-                <CMSearchDescription>
-                    <searchID>CEC13F0F-1AEA-4474-A2DA-CFFF332C7C5B</searchID>
-                    <trackList><trackID>${videoTrackID}</trackID></trackList>
-                    <timeSpanList>
-                        <timeSpan>
-                            <startTime>${startVideoSearch}</startTime>
-                            <endTime>${endVideoSearch}</endTime>
-                        </timeSpan>
-                    </timeSpanList>
-                    <maxResults>1</maxResults>
-                    <searchResultPostion>0</searchResultPostion>
-                    <metadataList><metadataDescriptor>//recordType.meta.std-cgi.com</metadataDescriptor></metadataList>
-                </CMSearchDescription>`;
-
-                const resVideoSearch = await nvrAuth.request({
-                    method: 'POST',
-                    url: `${node.protocol}://${node.host}:${node.port}/ISAPI/ContentMgmt/search`,
-                    data: payloadVideoSearch,
-                    headers: { "Content-Type": "application/xml" },
-                    httpsAgent: node.protocol === "https" ? httpsAgent : undefined
-                });
+                let targetEvento = resFotoSearch.data?.EventSearchResult?.Targets?.[0];
+                let playbackURIGrezzo = null;
+
+                if (targetEvento) {
+                    // Scarichiamo la foto normalmente
+                    if (targetEvento.pictureUrl) {
+                        const urlFotoGrezzo = targetEvento.pictureUrl;
+                        const resDownFoto = await nvrAuth.request({
+                            method: 'GET',
+                            url: urlFotoGrezzo,
+                            responseType: 'arraybuffer',
+                            httpsAgent: node.protocol === "https" ? httpsAgent : undefined
+                        });
+                        const fullImgPath = path.join(baseStorage, `img_${timestamp}_ch${channelID}.jpg`);
+                        fs.writeFileSync(fullImgPath, Buffer.from(resDownFoto.data));
+                        output.foto_base64 = fs.readFileSync(fullImgPath, { encoding: 'base64' });
+                        fileDaCancellare.push(fullImgPath);
+                    }
 
-                const xmlString = resVideoSearch.data.toString();
-                node.warn(`[DEBUG HIK] Risposta XML dell'NVR:\n${xmlString}`);
+                    // 2. 🎥 GENERAZIONE DINAMICA E DIRETTA PLAYBACK URI (Niente più ricerca XML!)
+                    if (targetEvento.startTime && targetEvento.endTime) {
+                        // Funzione interna per ripulire i dati temporali (es. 2026-07-03T13:41:25+02:00 -> 20260703T134125Z)
+                        const pulisciDataHik = (dataStr) => {
+                            let pulita = dataStr.replace(/[-:]/g, '').split('+')[0];
+                            return pulita;
+                        };
 
-                const uriMatch = xmlString.match(/<playbackURI>([\s\S]*?)<\/playbackURI>/i);
+                        const startClip = pulisciDataHik(targetEvento.startTime);
+                        const endClip = pulisciDataHik(targetEvento.endTime);
 
-                if (uriMatch && uriMatch[1]) {
-                    const playbackURIGrezzo = uriMatch[1].trim();
+                        playbackURIGrezzo = `rtsp://${node.host}:${node.port}/Streaming/tracks/${videoTrackID}/?starttime=${startClip}&endtime=${endClip}`;
+                        node.warn(`[HIK SCORCIATOIA] URI Generato: ${playbackURIGrezzo}`);
+                    }
+                }
 
+                // 3. 💾 EFFETTUIAMO LA GET DI DOWNLOAD SE ABBIAMO GENERATO L'URI
+                if (playbackURIGrezzo) {
                     const payloadDownload = `<?xml version="1.0" encoding="UTF-8"?>
                     <downloadRequest>
                         <playbackURI>${playbackURIGrezzo}</playbackURI>
@@ -251,8 +225,8 @@ module.exports = function(RED) {
 
                     const resDownVideo = await nvrAuth.request({
                         method: 'GET',
-                        url: `rtsp://192.168.62.131/Streaming/tracks/201/?starttime=2026-06-29 13:40:06&amp;endTime=2026-06-29 13:40:16Z`,
-                        //data: payloadDownload,
+                        url: `${node.protocol}://${node.host}:${node.port}/ISAPI/ContentMgmt/download`,
+                        data: payloadDownload,
                         headers: { "Content-Type": "application/xml" },
                         responseType: 'arraybuffer',
                         httpsAgent: node.protocol === "https" ? httpsAgent : undefined

package/package.json

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