node-red-contrib-hik-media-buffer 1.1.2 → 1.1.4

package/hik-media-buffer.js

@@ -44,15 +44,24 @@ module.exports = function(RED) {
 
         async function hikRequest(options) {
             const { method, url, data, responseType, user, pass, headers = {} } = options;
+            
+            // Assicuriamoci che data sia una stringa se stiamo mandando XML
+            const body = (typeof data === 'object') ? JSON.stringify(data) : data;
+
             const res = await urllib.request(url, {
                 method: method,
                 digestAuth: `${user}:${pass}`,
-                content: data,
-                headers: headers,
+                content: body, 
+                headers: {
+                    'Content-Type': 'application/xml', // Questo dice alla telecamera: "Leggi l'XML"
+                    'Accept': '*/*',
+                    ...headers
+                },
                 dataType: responseType === 'arraybuffer' ? 'buffer' : 'text',
                 timeout: 15000,
                 rejectUnauthorized: false
             });
+            
             return res;
         }
 
@@ -149,23 +158,33 @@ module.exports = function(RED) {
                     if (uriMatch) {
                         const rawUri = uriMatch[1].replace(/&/g, '&');
                         const resDown = await hikRequest({
-                            method: 'GET', url: `${baseUrl}/download`,
+                            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
+                            responseType: 'arraybuffer',
+                            user: node.user,
+                            pass: node.camPass
                         });
 
                         let buffer = Buffer.from(resDown.data);
+
                         if (t.id === "203") {
-                            // SALVATAGGIO IMMAGINE FISICO
+                            // --- LOGICA FOTO (IDENTICA ALLA TUA) ---
+                            output.imageBuffer = buffer;
+
+                            // AGGIUNTA: Salviamo fisicamente il file per il sito
                             const imgFileName = `img_${timestamp}.jpg`;
                             const fullImgPath = path.join(imgDir, imgFileName);
-                            fs.writeFileSync(fullImgPath, buffer);
-                            output.imageBuffer = buffer;
-                            output.imagePath = fullImgPath; // Passiamo il path fisico
+                            fs.writeFileSync(fullImgPath, buffer); 
+                            output.imagePath = fullImgPath;
+
                         } else {
+                            // --- LOGICA VIDEO (IDENTICA ALLA TUA) ---
                             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`);
+                            
                             fs.writeFileSync(rawPath, buffer);
                             
                             await new Promise((resolve) => {
@@ -173,10 +192,14 @@ module.exports = function(RED) {
                                     if (!err) {
                                         output.videoPath = fixedPath;
                                         try { fs.unlinkSync(rawPath); } catch(e) {}
-                                    } else { output.videoPath = rawPath; }
+                                    } else { 
+                                        output.videoPath = rawPath; 
+                                    }
                                     resolve();
                                 });
                             });
+                            
+                            setTimeout(() => { if (output.videoPath && fs.existsSync(output.videoPath)) fs.unlinkSync(output.videoPath); }, 180000);
                         }
                     }
                 }

package/package.json

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