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

package/hik-media-buffer.js

@@ -11,7 +11,7 @@ module.exports = function(RED) {
         RED.nodes.createNode(this, config);
         const node = this;
         
-        node.name = config.name || "TEST"; // Nome cliente usato per le cartelle
+        node.name = config.name || "TEST";
         node.host = config.host;
         node.port = config.port || "80";
         node.protocol = config.protocol || "http";
@@ -29,12 +29,10 @@ module.exports = function(RED) {
         const httpsAgent = new https.Agent({ rejectUnauthorized: false });
         const EventList = ["FieldDetection", "LineDetection"];
 
-        // --- CONFIGURAZIONE PERCORSI STORAGE ---
+        // --- QUESTE RIGHE SERVONO PER IL SITO ---
         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 });
 
@@ -120,20 +118,18 @@ module.exports = function(RED) {
                             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" }
+                            responseType: 'arraybuffer'
                         });
 
                         let buffer = Buffer.from(resDown.data);
-
                         if (t.id === "203") {
-                            // --- SALVATAGGIO FOTO ---
+                            // --- SALVA FOTO ---
                             const fullImgPath = path.join(imgDir, `img_${timestamp}.jpg`);
                             fs.writeFileSync(fullImgPath, buffer);
-                            output.imageBuffer = buffer; // Mantengo il buffer per compatibilità
+                            output.imageBuffer = buffer;
                             output.imagePath = fullImgPath;
                         } else {
-                            // --- SALVATAGGIO VIDEO ---
+                            // --- SALVA 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`);
@@ -148,7 +144,6 @@ module.exports = function(RED) {
                                     resolve();
                                 });
                             });
-                            setTimeout(() => { if (output.videoPath && fs.existsSync(output.videoPath)) fs.unlinkSync(output.videoPath); }, 180000);
                         }
                     }
                 }
@@ -159,22 +154,16 @@ module.exports = function(RED) {
             updateNodeStatus();
         }
 
+        // --- ALERT STREAM (TUTTO COME PRIMA) ---
         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 => {
+            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;
-                }
+                if (!nvrOnline) { node.send({ payload: { status: "online", ip: node.host, msg: "NVR Online" } }); nvrOnline = true; }
                 updateNodeStatus();
-
                 response.data.on('data', (chunk) => {
                     const data = chunk.toString().toLowerCase();
                     if (data.includes("active")) {
@@ -186,24 +175,19 @@ module.exports = function(RED) {
                         }
                     }
                 });
-
                 response.data.on('error', () => handleNvrError());
                 response.data.on('end', () => !isClosing && setTimeout(startAlertStream, 5000));
             }).catch(() => handleNvrError());
         }
 
         function handleNvrError() {
-            if (nvrOnline) {
-                node.send({ payload: { status: "offline", ip: node.host, msg: "NVR Offline" } });
-                nvrOnline = false;
-            }
+            if (nvrOnline) { node.send({ payload: { status: "offline", ip: node.host, msg: "NVR Offline" } }); nvrOnline = false; }
             updateNodeStatus();
             if (!isClosing) setTimeout(startAlertStream, 10000);
         }
 
         startAlertStream();
         setTimeout(checkCameras, 2000); 
-
         node.on('close', (done) => { 
             isClosing = true; 
             clearInterval(heartbeatInterval);

package/package.json

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