node-red-contrib-hik-media-buffer 1.1.6 → 1.1.7

package/hik-media-buffer.js

@@ -1,6 +1,9 @@
-const axiosDigest = require('axios-digest');
+const axios = require('axios');
+const AxiosDigestAuth = require('@mhoc/axios-digest-auth').default;
+const https = require('https');
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const { exec } = require('child_process');
 
 module.exports = function(RED) {
@@ -8,7 +11,7 @@ module.exports = function(RED) {
         RED.nodes.createNode(this, config);
         const node = this;
         
-        node.name = config.name || "TEST";
+        node.name = config.name || "TEST"; // Nome cliente usato per le cartelle
         node.host = config.host;
         node.port = config.port || "80";
         node.protocol = config.protocol || "http";
@@ -17,61 +20,48 @@ module.exports = function(RED) {
         node.camPass = config.camPass || config.pass;
         node.cameras = config.cameras || [];
 
+        let streamRequest = null;
         let isClosing = false;
         let lastTriggerTime = 0;
         let nvrOnline = true;
         let statoCamera = {}; 
 
+        const httpsAgent = new https.Agent({ rejectUnauthorized: false });
         const EventList = ["FieldDetection", "LineDetection"];
 
-        // --- DEFINIZIONE PERCORSI STORAGE ---
+        // --- CONFIGURAZIONE PERCORSI STORAGE ---
         const baseStorage = `C:\\Users\\APerucca\\Documents\\progetto-docker\\storage\\${node.name}`;
         const imgDir = path.join(baseStorage, "allarmi");
         const vidDir = path.join(baseStorage, "video");
 
+        // Crea le cartelle se non esistono
         if (!fs.existsSync(imgDir)) fs.mkdirSync(imgDir, { recursive: true });
         if (!fs.existsSync(vidDir)) fs.mkdirSync(vidDir, { recursive: true });
 
-        // Client Digest per NVR e Camere
-        const nvrAuth = axiosDigest(node.user, node.pass);
-
         node.status({fill:"grey", shape:"ring", text:"Inizializzazione..."});
 
         function toHikDate(d) { return d.toISOString().split('.')[0] + "Z"; }
 
-        async function getCameraName(cam) {
-            try {
-                const res = await nvrAuth.request({
-                    method: 'GET',
-                    url: `${node.protocol}://${cam.ip}:${node.port}/ISAPI/System/Video/inputs/channels/${cam.channel}`
-                });
-                const match = res.data.toString().match(/<name>([^<]+)<\/name>/);
-                return match ? match[1] : `Cam_${cam.channel}`;
-            } catch (e) {
-                return `Camera_${cam.ip}`;
-            }
-        }
-
         async function checkCameras() {
             if (isClosing) return;
             for (let cam of node.cameras) {
+                const camAuth = new AxiosDigestAuth({ username: node.user, password: node.camPass });
                 try {
-                    await nvrAuth.request({ 
+                    await camAuth.request({ 
                         method: 'GET', 
-                        url: `${node.protocol}://${cam.ip}:${node.port}/ISAPI/System/deviceInfo`
+                        url: `${node.protocol}://${cam.ip}:${node.port}/ISAPI/System/deviceInfo`,
+                        timeout: 5000,
+                        httpsAgent: node.protocol === "https" ? httpsAgent : undefined
                     });
-
                     if (statoCamera[cam.ip] === false) {
-                        const nomeOnline = await getCameraName(cam);
-                        node.send({ payload: { status: "online", nomeCliente: node.name, nome_telecamera: nomeOnline, ip: cam.ip, channel: cam.channel, msg: "Camera ripristinata" } });
+                        node.send({ payload: { status: "online", nomeCliente: node.name, ip: cam.ip, channel: cam.channel, msg: "Camera ripristinata" } });
                         statoCamera[cam.ip] = true;
                     } else if (statoCamera[cam.ip] === undefined) {
                         statoCamera[cam.ip] = true;
                     }
                 } catch (e) {
                     if (statoCamera[cam.ip] !== false) {
-                        const nomeOffline = await getCameraName(cam);
-                        node.send({ payload: { status: "offline", nomeCliente: node.name, nome_telecamera: nomeOffline, ip: cam.ip, channel: cam.channel, msg: "Camera non raggiungibile" } });
+                        node.send({ payload: { status: "offline", nomeCliente: node.name, ip: cam.ip, channel: cam.channel, msg: "Camera non raggiungibile" } });
                         statoCamera[cam.ip] = false;
                     }
                 }
@@ -100,51 +90,50 @@ module.exports = function(RED) {
             if (nowTime - lastTriggerTime < 10000) return; 
             lastTriggerTime = nowTime;
 
-            const timestamp = Math.floor(nowTime / 1000);
-            const nomeCamera = await getCameraName(camera);
+            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)));
             const endTime = toHikDate(new Date(referenceTime.getTime() + (10 * 1000)));
 
-            const camAuth = axiosDigest(node.user, node.camPass);
-            const baseUrl = `${node.protocol}://${camera.ip}:${node.port}/ISAPI/ContentMgmt`;
-
             node.status({fill:"yellow", shape:"dot", text:`Download Cam ${channelID}...`});
             await new Promise(resolve => setTimeout(resolve, 6000));
             
-            let output = { ip: camera.ip, nomeCliente: node.name, nome_telecamera: nomeCamera, channel: channelID, event: evento, videoPath: null, imagePath: null };
+            const baseUrl = `${node.protocol}://${camera.ip}:${node.port}/ISAPI/ContentMgmt`;
+            let output = { ip: camera.ip, nomeCliente: node.name, channel: channelID, event: evento, videoPath: null, imageBuffer: null, imagePath: null };
 
             try {
                 const tracks = [{ id: "201" }, { id: "203" }];
                 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>`;
-                    
-                    const resSearch = await camAuth.request({
-                        method: 'POST', url: `${baseUrl}/search`, data: searchXml,
-                        headers: { "Content-Type": "application/xml" }
+
+                    const resSearch = await camAuth.request({ 
+                        method: 'POST', url: `${baseUrl}/search`, data: searchXml, headers: { "Content-Type": "application/xml" } 
                     });
                     
-                    let xml = resSearch.data.toString().replace(/<(\/?)\w+:/g, "<$1");
+                    let xml = resSearch.data.replace(/<(\/?)\w+:/g, "<$1");
                     const uriMatch = xml.match(/<playbackURI>([^<]+)</);
 
                     if (uriMatch) {
                         const rawUri = uriMatch[1].replace(/&amp;/g, '&');
-                        const resDown = await camAuth.request({
-                            method: 'POST', // POST risolve l'errore "Invalid XML"
-                            url: `${baseUrl}/download`,
-                            data: `<?xml version="1.0" encoding="UTF-8"?><downloadRequest><playbackURI>${rawUri.replace(/&/g, '&amp;')}</playbackURI></downloadRequest>`,
+                        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: { "Content-Type": "application/xml" }
                         });
 
                         let buffer = Buffer.from(resDown.data);
+
                         if (t.id === "203") {
-                            // FOTO
+                            // --- SALVATAGGIO FOTO ---
                             const fullImgPath = path.join(imgDir, `img_${timestamp}.jpg`);
                             fs.writeFileSync(fullImgPath, buffer);
+                            output.imageBuffer = buffer; // Mantengo il buffer per compatibilità
                             output.imagePath = fullImgPath;
                         } else {
-                            // VIDEO
+                            // --- SALVATAGGIO VIDEO ---
                             if (buffer.slice(0, 4).toString() === 'IMKH') buffer = buffer.slice(40);
                             const rawPath = path.join(vidDir, `raw_${timestamp}.mp4`);
                             const fixedPath = path.join(vidDir, `hik_v_${channelID}_${timestamp}.mp4`);
@@ -172,17 +161,21 @@ module.exports = function(RED) {
 
         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`;
             
-            nvrAuth.request({ method: 'GET', url: url, responseType: 'stream' })
-            .then(res => {
+            nvrAuth.request({ 
+                method: 'GET', url: url, responseType: 'stream', 
+                httpsAgent: node.protocol === "https" ? httpsAgent : undefined
+            }).then(response => {
+                streamRequest = response;
                 if (!nvrOnline) {
                     node.send({ payload: { status: "online", ip: node.host, msg: "NVR Online" } });
                     nvrOnline = true;
                 }
                 updateNodeStatus();
 
-                res.data.on('data', (chunk) => {
+                response.data.on('data', (chunk) => {
                     const data = chunk.toString().toLowerCase();
                     if (data.includes("active")) {
                         const chMatch = data.match(/<channelid>(\d+)<\/channelid>/i);
@@ -194,8 +187,8 @@ module.exports = function(RED) {
                     }
                 });
 
-                res.data.on('error', () => handleNvrError());
-                res.data.on('end', () => !isClosing && setTimeout(startAlertStream, 5000));
+                response.data.on('error', () => handleNvrError());
+                response.data.on('end', () => !isClosing && setTimeout(startAlertStream, 5000));
             }).catch(() => handleNvrError());
         }
 
@@ -214,6 +207,7 @@ module.exports = function(RED) {
         node.on('close', (done) => { 
             isClosing = true; 
             clearInterval(heartbeatInterval);
+            if (streamRequest) streamRequest.data.destroy(); 
             done(); 
         });
     }

package/package.json

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