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

package/hik-media-buffer.js

@@ -10,7 +10,7 @@ module.exports = function(RED) {
         RED.nodes.createNode(this, config);
         const node = this;
         
-        node.name = config.name;
+        node.name = config.name || "TEST";
         node.host = config.host;
         node.port = config.port || "80";
         node.protocol = config.protocol || "http";
@@ -19,23 +19,31 @@ module.exports = function(RED) {
         node.camPass = config.camPass || config.pass;
         node.cameras = config.cameras || [];
 
+        // --- DEFINIZIONE PERCORSI PROGETTO ---
+        // Puntiamo direttamente alla cartella del tuo progetto Docker
+        const baseStorage = `C:\\Users\\APerucca\\Documents\\progetto-docker\\storage\\${node.name}`;
+        const imgDir = path.join(baseStorage, "allarmi");
+        const vidDir = path.join(baseStorage, "video");
+
+        // Creazione cartelle se non esistono
+        [imgDir, vidDir].forEach(dir => {
+            if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+        });
+
         let streamRequest = null;
         let isClosing = false;
         let lastTriggerTime = 0;
         let nvrOnline = true;
         let statoCamera = {}; 
 
-        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"; }
 
-        // --- 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}`,
@@ -45,8 +53,6 @@ module.exports = function(RED) {
                 timeout: 15000,
                 rejectUnauthorized: false
             });
-
-            // Urllib restituisce i dati in .data
             return res;
         }
 
@@ -117,6 +123,7 @@ module.exports = function(RED) {
 
             const nomeCamera = await getCameraName(camera);
             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)));
 
@@ -124,28 +131,16 @@ 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, nomeCliente: node.name, nome_telecamera: nomeCamera, 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, imagePath: 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"?>
-<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 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 hikRequest({
-                        method: 'POST',
-                        url: `${baseUrl}/search`,
-                        data: searchXml,
-                        headers: { "Content-Type": "application/xml" },
-                        user: node.user,
-                        pass: node.camPass
+                        method: 'POST', url: `${baseUrl}/search`, data: searchXml,
+                        headers: { "Content-Type": "application/xml" }, user: node.user, pass: node.camPass
                     });
                     
                     let xml = resSearch.data.toString().replace(/<(\/?)\w+:/g, "<$1");
@@ -154,7 +149,7 @@ module.exports = function(RED) {
                     if (uriMatch) {
                         const rawUri = uriMatch[1].replace(/&amp;/g, '&');
                         const resDown = await hikRequest({
-                            method: 'GET',
+                            method: 'GET', 
                             url: `${baseUrl}/download`,
                             data: `<?xml version="1.0" encoding="UTF-8"?><downloadRequest><playbackURI>${rawUri.replace(/&/g, '&amp;')}</playbackURI></downloadRequest>`,
                             responseType: 'arraybuffer',
@@ -163,12 +158,24 @@ module.exports = function(RED) {
                         });
 
                         let buffer = Buffer.from(resDown.data);
+
                         if (t.id === "203") {
+                            // --- 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.imagePath = fullImgPath;
+
                         } else {
+                            // --- LOGICA VIDEO (IDENTICA ALLA TUA) ---
                             if (buffer.slice(0, 4).toString() === 'IMKH') buffer = buffer.slice(40);
-                            const rawPath = path.join(tempDir, `raw_${Date.now()}.mp4`);
-                            const fixedPath = path.join(tempDir, `hik_v_${channelID}_${Date.now()}.mp4`);
+                            
+                            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) => {
@@ -176,21 +183,25 @@ 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);
                         }
                     }
                 }
-                if (output.imageBuffer || output.videoPath) node.send({ payload: output });
+                if (output.imagePath || output.videoPath) node.send({ payload: output });
             } catch (e) {
                 node.error(`Errore Download Cam ${channelID}: ${e.message}`);
             }
             updateNodeStatus();
         }
 
+        // --- GESTIONE NVR ALERT STREAM ---
         function startAlertStream() {
             if (isClosing) return;
             const url = `${node.protocol}://${node.host}:${node.port}/ISAPI/Event/notification/alertStream`;

package/package.json

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