node-red-contrib-hik-media-buffer 1.0.19 → 1.1.1

package/hik-media-buffer.js

@@ -1,5 +1,4 @@
-const axios = require('axios');
-const AxiosDigestAuth = require('@mhoc/axios-digest-auth').default;
+const urllib = require('urllib'); 
 const https = require('https');
 const fs = require('fs');
 const path = require('path');
@@ -11,57 +10,83 @@ module.exports = function(RED) {
         RED.nodes.createNode(this, config);
         const node = this;
         
-        // --- ASSEGNAZIONE PROPRIETÀ AL NODO ---
+        node.name = config.name;
         node.host = config.host;
         node.port = config.port || "80";
         node.protocol = config.protocol || "http";
         node.user = config.user;
         node.pass = config.pass;
-        node.camPass = config.camPass || config.pass; // Usa pass dell'NVR se quella cam specifica non c'è
+        node.camPass = config.camPass || config.pass;
         node.cameras = config.cameras || [];
-        // --------------------------------------
 
         let streamRequest = null;
         let isClosing = false;
         let lastTriggerTime = 0;
-        
-        // Stati di connessione
         let nvrOnline = true;
-        let statoCamera = {}; // Memorizza lo stato { "IP": true/false }
+        let statoCamera = {}; 
 
-        const httpsAgent = new https.Agent({ rejectUnauthorized: false });
         const tempDir = os.tmpdir();
         const EventList = ["FieldDetection", "LineDetection"];
 
         node.status({fill:"grey", shape:"ring", text:"Inizializzazione..."});
 
         function toHikDate(d) { return d.toISOString().split('.')[0] + "Z"; }
-   
-        // --- CONTROLLO SE LE TELECAMERE SONO ONLINE ---
+
+        // --- HELPER AGGIORNATO: Solo Urllib con Digest ---
+        async function hikRequest(options) {
+            const { method, url, data, responseType, user, pass, headers = {} } = options;
+            
+            const res = await urllib.request(url, {
+                method: method,
+                digestAuth: `${user}:${pass}`,
+                content: data,
+                headers: headers,
+                dataType: responseType === 'arraybuffer' ? 'buffer' : 'text',
+                timeout: 15000,
+                rejectUnauthorized: false
+            });
+
+            // Urllib restituisce i dati in .data
+            return res;
+        }
+
+        async function getCameraName(cam) {
+            try {
+                const res = await hikRequest({
+                    method: 'GET',
+                    url: `${node.protocol}://${cam.ip}:${node.port}/ISAPI/System/Video/inputs/channels/${cam.channel}`,
+                    user: node.user,
+                    pass: node.camPass
+                });
+                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 camAuth.request({ 
+                    await hikRequest({ 
                         method: 'GET', 
                         url: `${node.protocol}://${cam.ip}:${node.port}/ISAPI/System/deviceInfo`,
-                        timeout: 5000,
-                        httpsAgent: node.protocol === "https" ? httpsAgent : undefined
+                        user: node.user,
+                        pass: node.camPass
                     });
 
                     if (statoCamera[cam.ip] === false) {
-                        node.send({ payload: { status: "online", ip: cam.ip, channel: cam.channel, msg: "Camera ripristinata" } });
+                        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" } });
                         statoCamera[cam.ip] = true;
                     } else if (statoCamera[cam.ip] === undefined) {
                         statoCamera[cam.ip] = true;
                     }
                 } catch (e) {
                     if (statoCamera[cam.ip] !== false) {
-                        node.send({ payload: { status: "offline", ip: cam.ip, channel: cam.channel, msg: "Camera non raggiungibile" } });
+                        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" } });
                         statoCamera[cam.ip] = false;
                     }
                 }
@@ -82,7 +107,6 @@ module.exports = function(RED) {
 
         const heartbeatInterval = setInterval(checkCameras, 30000);
 
-        // --- FUNZIONE DOWNLOAD ---
         async function downloadMedia(evento, channelID) {
             const camera = node.cameras.find(c => c.channel == channelID);
             if (!camera) return;
@@ -91,10 +115,7 @@ module.exports = function(RED) {
             if (nowTime - lastTriggerTime < 10000) return; 
             lastTriggerTime = nowTime;
 
-            const camAuth = new AxiosDigestAuth({ 
-                username: node.user, 
-                password: node.camPass 
-            });
+            const nomeCamera = await getCameraName(camera);
             const referenceTime = new Date();
             const startTime = toHikDate(new Date(referenceTime.getTime() - (10 * 1000)));
             const endTime = toHikDate(new Date(referenceTime.getTime() + (10 * 1000)));
@@ -103,9 +124,10 @@ module.exports = function(RED) {
             await new Promise(resolve => setTimeout(resolve, 6000));
             
             const baseUrl = `${node.protocol}://${camera.ip}:${node.port}/ISAPI/ContentMgmt`;
-            let output = { ip: camera.ip, channel: channelID, event: evento, videoPath: null, imageBuffer: null };
+            let output = { ip: camera.ip, nomeCliente: node.name, nome_telecamera: nomeCamera, channel: channelID, event: evento, videoPath: null, imageBuffer: null };
 
             try {
+                // RIPRISTINATA LA TUA LOGICA DEI TRACKS
                 const tracks = [{ name: "termicoV", id: "201" }, { name: "termico", id: "203" }];
                 for (let t of tracks) {
                     const searchXml = `<?xml version="1.0" encoding="utf-8"?>
@@ -114,26 +136,30 @@ module.exports = function(RED) {
     <trackIDList><trackID>${t.id}</trackID></trackIDList>
     <timeSpanList><timeSpan><startTime>${startTime}</startTime><endTime>${endTime}</endTime></timeSpan></timeSpanList>
     <maxResults>100</maxResults>
-    <searchResultPostion>0</searchResultPostion>
     <metadataList><metadataDescriptor>//recordType.meta.std-cgi.com/${evento}</metadataDescriptor></metadataList>
 </CMSearchDescription>`;
-
-                    const resSearch = await camAuth.request({ 
+                    
+                    const resSearch = await hikRequest({
                         method: 'POST',
-                        url: `${baseUrl}/search`, 
-                        data: searchXml, 
-                        headers: { "Content-Type": "application/xml" } 
+                        url: `${baseUrl}/search`,
+                        data: searchXml,
+                        headers: { "Content-Type": "application/xml" },
+                        user: node.user,
+                        pass: node.camPass
                     });
                     
-                    let xml = resSearch.data.replace(/<(\/?)\w+:/g, "<$1");
+                    let xml = resSearch.data.toString().replace(/<(\/?)\w+:/g, "<$1");
                     const uriMatch = xml.match(/<playbackURI>([^<]+)</);
 
                     if (uriMatch) {
                         const rawUri = uriMatch[1].replace(/&amp;/g, '&');
-                        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'
+                        const resDown = await hikRequest({
+                            method: 'GET',
+                            url: `${baseUrl}/download`,
+                            data: `<?xml version="1.0" encoding="UTF-8"?><downloadRequest><playbackURI>${rawUri.replace(/&/g, '&amp;')}</playbackURI></downloadRequest>`,
+                            responseType: 'arraybuffer',
+                            user: node.user,
+                            pass: node.camPass
                         });
 
                         let buffer = Buffer.from(resDown.data);
@@ -144,6 +170,7 @@ module.exports = function(RED) {
                             const rawPath = path.join(tempDir, `raw_${Date.now()}.mp4`);
                             const fixedPath = path.join(tempDir, `hik_v_${channelID}_${Date.now()}.mp4`);
                             fs.writeFileSync(rawPath, buffer);
+                            
                             await new Promise((resolve) => {
                                 exec(`ffmpeg -y -i "${rawPath}" -c copy -movflags +faststart "${fixedPath}"`, (err) => {
                                     if (!err) {
@@ -164,27 +191,24 @@ module.exports = function(RED) {
             updateNodeStatus();
         }
 
-        // --- GESTIONE NVR 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`;
             
-            nvrAuth.request({ 
-                method: 'GET', url: url, responseType: 'stream', 
-                httpsAgent: node.protocol === "https" ? httpsAgent : undefined
-            }).then(response => {
-                streamRequest = response;
+            urllib.request(url, {
+                method: 'GET',
+                digestAuth: `${node.user}:${node.pass}`,
+                streaming: true,
+                timeout: 60000,
+                rejectUnauthorized: false
+            }).then(res => {
                 if (!nvrOnline) {
                     node.send({ payload: { status: "online", ip: node.host, msg: "NVR Online" } });
                     nvrOnline = true;
                 }
                 updateNodeStatus();
 
-                response.data.on('data', (chunk) => {
+                res.res.on('data', (chunk) => {
                     const data = chunk.toString().toLowerCase();
                     if (data.includes("active")) {
                         const chMatch = data.match(/<channelid>(\d+)<\/channelid>/i);
@@ -196,8 +220,8 @@ module.exports = function(RED) {
                     }
                 });
 
-                response.data.on('error', () => handleNvrError());
-                response.data.on('end', () => !isClosing && setTimeout(startAlertStream, 5000));
+                res.res.on('error', () => handleNvrError());
+                res.res.on('end', () => !isClosing && setTimeout(startAlertStream, 5000));
             }).catch(() => handleNvrError());
         }
 
@@ -216,7 +240,6 @@ 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.0.19",
+  "version": "1.1.1",
   "description": "Ottiene buffer video e immagine da camere Hikvision via ISAPI",
   "keywords": [
     "node-red",