node-red-contrib-hik-media-buffer 1.1.116 → 1.1.118

package/hik-media-buffer.js

@@ -27,28 +27,29 @@ module.exports = function(RED) {
         const httpsAgent = new https.Agent({ rejectUnauthorized: false });
         const EventList = ["FieldDetection", "LineDetection"];
 
-        // CARTELLA TEMPORANEA 
         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"; }
+        function toHikSearchDate(d) {
+            return d.toISOString().split('.')[0] + "Z";
+        }
 
-        // --- PRENDE IL NOME REALE DELLA TELECAMERA DALL'NVR ---
+        // --- 1. PRENDE IL NOME REALE DELLA TELECAMERA DAL DIGITAL PROXY ---
         async function getCameraNameFromNVR(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/System/Video/inputs/channels/${channelID}`,
+                    url: `${node.protocol}://${node.host}:${node.port}/ISAPI/ContentMgmt/InputProxy/channels/${channelID}`,
                     timeout: 5000,
                     httpsAgent: node.protocol === "https" ? httpsAgent : undefined
                 });
-
                 const data = res.data.toString();
-                // Cerchiamo il tag channelName che contiene il nome impostato sull'NVR
-                const match = data.match(/<channelName>([^<]+)<\/channelName>/i);
+                // 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}`;
             } catch (e) {
@@ -56,30 +57,31 @@ module.exports = function(RED) {
             }
         }
 
-        // --- CONTROLLO STATUS CAMERE (ONLINE/OFFLINE) INTERROGANDO L'NVR ---
+        // --- 2. CONTROLLO STATUS CAMERE AUTOMATICO (Senza 403) ---
         async function checkCameras() {
             if (isClosing || !nvrOnline) return;
             const nvrAuth = new AxiosDigestAuth({ username: node.user, password: node.pass });
             try {
+                // Interroghiamo l'elenco proxy di tutti i canali digitali (Pag. 58 della documentazione)
                 const res = await nvrAuth.request({ 
                     method: 'GET', 
-                    url: `${node.protocol}://${node.host}:${node.port}/ISAPI/System/Video/inputs/channels`,
+                    url: `${node.protocol}://${node.host}:${node.port}/ISAPI/ContentMgmt/InputProxy/channels`,
                     timeout: 8000,
                     httpsAgent: node.protocol === "https" ? httpsAgent : undefined
                 });
                 
                 const xml = res.data.toString();
-                const channelBlocks = xml.match(/<VideoInputChannel>[\s\S]*?<\/VideoInputChannel>/g) || [];
+                // Estraiamo i singoli blocchi di canali digitali (InputProxyChannel)
+                const channelBlocks = xml.match(/<InputProxyChannel>[\s\S]*?<\/InputProxyChannel>/g) || [];
                 
                 for (let block of channelBlocks) {
                     const idMatch = block.match(/<id>(\d+)<\/id>/i);
-                    // Hikvision usa il tag <online> true/false per lo stato della telecamera IP accoppiata
-                    const onlineMatch = block.match(/<online>([^<]+)<\/online>/i) || block.match(/<onLine>([^<]+)<\/onLine>/i);
+                    // Standard Hikvision: estraiamo il tag <online> (true/false)
+                    const onlineMatch = block.match(/<online>([^<]+)<\/online>/i);
                     
                     if (idMatch) {
                         const ch = idMatch[1];
-                        // Se il tag dice true è online, altrimenti se dice false (o manca) è offline
-                        const isOnline = onlineMatch ? onlineMatch[1].trim().toLowerCase() === "true" : true;
+                        const isOnline = onlineMatch ? onlineMatch[1].trim().toLowerCase() === "true" : false;
                         
                         if (isOnline && statoCamera[ch] === false) {
                             const nomeOnline = await getCameraNameFromNVR(ch);
@@ -94,7 +96,7 @@ module.exports = function(RED) {
                     }
                 }
             } catch (e) {
-                node.error(`Errore durante il check delle camere: ${e.message}`);
+                node.error(`Errore nel check diagnostico: ${e.message}`);
             }
             updateNodeStatus();
         }
@@ -112,25 +114,29 @@ module.exports = function(RED) {
 
         const heartbeatInterval = setInterval(checkCameras, 30000);
 
-        // --- DOWNLOAD CON URL E BODY SECONDO SPECIFICHE ---
+        // --- 3. DOWNLOAD MEDIA CON DELAY E FORMATO STRINGA CORRETTO ---
         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)...`});
+            await new Promise(resolve => setTimeout(resolve, 6000));
+
             const nvrAuth = new AxiosDigestAuth({ username: node.user, password: node.pass });
             const referenceTime = new Date();
             const timestamp = Math.floor(referenceTime.getTime() / 1000);
             
             const videoTrackID = (parseInt(channelID) * 100) + 1; 
-
-            // Recupera il nome reale prima di inviare l'allarme
             const nomeCamera = await getCameraNameFromNVR(channelID);
             node.status({fill:"yellow", shape:"dot", text:`Download Cam ${channelID}...`});
             
-            const startSearchStr = referenceTime.toISOString().split('T')[0] + "T00:00:00 01:00";
-            const endSearchStr = referenceTime.toISOString().split('T')[0] + "T23:59:59 01:00";
+            const inizioFinestra = new Date(referenceTime.getTime() - (2 * 60 * 1000)); 
+            const fineFinestra = new Date(referenceTime.getTime() + (1 * 60 * 1000));   
+            
+            const startSearchStr = toHikSearchDate(inizioFinestra);
+            const endSearchStr = toHikSearchDate(fineFinestra);
 
             let output = { 
                 tipo_messaggio: "evento",
@@ -148,16 +154,13 @@ module.exports = function(RED) {
             let fileDaCancellare = [];
 
             try {
-                // 1. SCARICAMENTO IMMAGINE
+                // 1. 📸 SCARICAMENTO IMMAGINE
                 const payloadFoto = {
                     "EventSearchDescription": {
                         "searchID": "C5AFEE35-B1E0-4C01-83F8-47FD77892E4A",
                         "searchResultPosition": 0,
-                        "maxResults": 30,
-                        "timeSpanList": [{
-                            "startTime": startSearchStr,
-                            "endTime": endSearchStr
-                        }],
+                        "maxResults": 1,
+                        "timeSpanList": [{ "startTime": startSearchStr, "endTime": endSearchStr }],
                         "type": "all",
                         "channels": [parseInt(channelID)],
                         "eventType": "behavior",
@@ -189,21 +192,18 @@ module.exports = function(RED) {
                     fileDaCancellare.push(fullImgPath);
                 }
 
-                // 2. SCARICAMENTO VIDEO
-                const startVideoSearch = referenceTime.toISOString().split('T')[0] + "T00:00:00Z";
-                const endVideoSearch = referenceTime.toISOString().split('T')[0] + "T23:59:59Z";
-
+                // 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>
+                            <startTime>${startSearchStr}</startTime>
+                            <endTime>${endSearchStr}</endTime>
                         </timeSpan>
                     </timeSpanList>
-                    <maxResults>100</maxResults>
+                    <maxResults>1</maxResults>
                     <searchResultPostion>0</searchResultPostion>
                     <metadataList><metadataDescriptor>//recordType.meta.std-cgi.com</metadataDescriptor></metadataList>
                 </CMSearchDescription>`;
@@ -259,12 +259,9 @@ module.exports = function(RED) {
 
                 if (output.foto_base64 || output.video_base64) {
                     node.send({ payload: output });
-                    
                     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) {}
                         }
                     }, 120000);
                 }

package/package.json

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