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

package/hik-media-buffer.js

@@ -1,20 +1,15 @@
-const axios = require('axios');
+const urllib = require('urllib'); 
 const https = require('https');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const { exec } = require('child_process');
 
-// --- STRATEGIA SWITCH: DEFINIZIONE MODALITÀ ---
-// Valori possibili: 'digest', 'basic', 'bearer'
-const AUTH_MODE = 'digest'; 
-
 module.exports = function(RED) {
     function HikMediaBufferNode(config) {
         RED.nodes.createNode(this, config);
         const node = this;
         
-        // --- ASSEGNAZIONE PROPRIETÀ ---
         node.name = config.name;
         node.host = config.host;
         node.port = config.port || "80";
@@ -30,7 +25,6 @@ module.exports = function(RED) {
         let nvrOnline = true;
         let statoCamera = {}; 
 
-        const httpsAgent = new https.Agent({ rejectUnauthorized: false });
         const tempDir = os.tmpdir();
         const EventList = ["FieldDetection", "LineDetection"];
 
@@ -38,7 +32,24 @@ module.exports = function(RED) {
 
         function toHikDate(d) { return d.toISOString().split('.')[0] + "Z"; }
 
-        // --- PRENDE IL NOME DELLA TELECAMERA ---
+        // --- 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({
@@ -47,40 +58,13 @@ module.exports = function(RED) {
                     user: node.user,
                     pass: node.camPass
                 });
-                const match = res.data.match(/<name>([^<]+)<\/name>/);
+                const match = res.data.toString().match(/<name>([^<]+)<\/name>/);
                 return match ? match[1] : `Cam_${cam.channel}`;
             } catch (e) {
-                return `Camera_${cam.ip}`; // Fallback se la camera è già offline
+                return `Camera_${cam.ip}`;
             }
         }
 
-        // --- HELPER UNICO PER LE CHIAMATE (STRATEGIA SWITCH) ---
-        async function hikRequest(options) {
-            const { method, url, data, responseType, user, pass, headers = {} } = options;
-            
-            const requestConfig = {
-                method,
-                url,
-                data,
-                responseType: responseType || 'data',
-                httpsAgent: node.protocol === "https" ? httpsAgent : undefined,
-                timeout: 10000,
-                headers: { ...headers }
-            };
-
-            // LOGICA DI AUTENTICAZIONE
-            if (AUTH_MODE === 'digest' || AUTH_MODE === 'basic') {
-                // Axios gestisce Basic/Digest internamente se configurato così:
-                requestConfig.auth = { username: user, password: pass };
-            } else if (AUTH_MODE === 'bearer') {
-                // Esempio per Token futuro
-                requestConfig.headers['Authorization'] = `Bearer ${node.context().get('myToken')}`;
-            }
-
-            return axios(requestConfig);
-        }
-
-        // --- CONTROLLO ONLINE TELECAMERE ---
         async function checkCameras() {
             if (isClosing) return;
             for (let cam of node.cameras) {
@@ -123,17 +107,15 @@ module.exports = function(RED) {
 
         const heartbeatInterval = setInterval(checkCameras, 30000);
 
-        // --- FUNZIONE DOWNLOAD MEDIA ---
         async function downloadMedia(evento, channelID) {
             const camera = node.cameras.find(c => c.channel == channelID);
-            const nomeCamera = await getCameraName(camera);
-
             if (!camera) return;
 
             const nowTime = Date.now();
             if (nowTime - lastTriggerTime < 10000) return; 
             lastTriggerTime = nowTime;
 
+            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)));
@@ -145,6 +127,7 @@ module.exports = function(RED) {
             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"?>
@@ -165,7 +148,7 @@ module.exports = function(RED) {
                         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) {
@@ -208,26 +191,24 @@ module.exports = function(RED) {
             updateNodeStatus();
         }
 
-        // --- GESTIONE NVR ALERT STREAM ---
         function startAlertStream() {
             if (isClosing) return;
             const url = `${node.protocol}://${node.host}:${node.port}/ISAPI/Event/notification/alertStream`;
             
-            hikRequest({
+            urllib.request(url, {
                 method: 'GET',
-                url: url,
-                responseType: 'stream',
-                user: node.user,
-                pass: node.pass
-            }).then(response => {
-                streamRequest = response;
+                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);
@@ -239,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());
         }
 
@@ -259,7 +240,6 @@ module.exports = function(RED) {
         node.on('close', (done) => { 
             isClosing = true; 
             clearInterval(heartbeatInterval);
-            if (streamRequest && streamRequest.data) streamRequest.data.destroy(); 
             done(); 
         });
     }

package/package.json

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