node-red-contrib-hik-media-buffer 1.1.90 → 1.1.91

package/hik-media-buffer.js

@@ -144,14 +144,19 @@ module.exports = function(RED) {
                         searchXml = `<?xml version="1.0" encoding="utf-8"?><CMSearchDescription><searchID>23D1C3CB-8C68-41C0-8A89-2BCF5765B5D2</searchID><trackIDList><trackID>${t.id}</trackID></trackIDList><timeSpanList><timeSpan><startTime>${startTime}</startTime><endTime>${endTime}</endTime></timeSpan></timeSpanList><contentTypeList><contentType>metadata</contentType></contentTypeList><maxResults>30</maxResults><searchResultPostion>0</searchResultPostion><metadataList><metadataDescriptor>recordType.meta.hikvision.com/${evento}</metadataDescriptor></metadataList></CMSearchDescription>`.trim();
                     }
                     
-                    // Chiamata cURL nativa del sistema operativo: se lo fa Chrome, lo fa anche cURL senza fallire sul Digest
+                    // Salviamo l'XML su un file temporaneo per non far incazzare la shell con i caratteri < e >
+                    const tempXmlPath = path.join(baseStorage, `search_${t.id}_${timestamp}.xml`);
+                    fs.writeFileSync(tempXmlPath, searchXml, 'utf8');
+
+                    node.warn(`[DEBUG] Eseguo ricerca traccia ${t.id} tramite cURL via file temporaneo...`);
+
+                    // Usiamo -d "@path" così cURL si legge il file da solo senza passare i simboli alla shell
                     const targetUrl = `${node.protocol}://${node.host}:${node.port}/ISAPI/ContentMgmt/search`;
-                    const curlCommand = `curl -s -X POST --digest -u "${node.user}:${node.pass}" -H "Content-Type: application/xml; charset=UTF-8" -d '${searchXml}' "${targetUrl}"`;
+                    const curlCommand = `curl -s -X POST --digest -u "${node.user}:${node.pass}" -H "Content-Type: application/xml; charset=UTF-8" -d "@${tempXmlPath}" "${targetUrl}"`;
 
                     let xmlResponse = await new Promise((resolve) => {
                         exec(curlCommand, (err, stdout, stderr) => {
                             if (err) {
-                                // STAMPIAMO IL VERO ERRORE DI LINUX/MIKROTIK
                                 node.error(`[CRASH cURL]: ${err.message} | STDERR: ${stderr}`);
                                 resolve(null);
                             } else {
@@ -160,7 +165,9 @@ module.exports = function(RED) {
                         });
                     });
 
-                    // >>> AGGIUNGI QUESTE RIGHE DI LOG QUI PER VEDERE COSA COZZO RISPONDE <<<
+                    // Cancelliamo subito il file XML temporaneo di ricerca
+                    try { if (fs.existsSync(tempXmlPath)) fs.unlinkSync(tempXmlPath); } catch(e){}
+
                     node.warn(`[DEBUG NVR RESP] Risposta grezza per traccia ${t.id}:`);
                     node.warn(xmlResponse); 
 
@@ -176,18 +183,25 @@ module.exports = function(RED) {
                         const rawUri = uriMatch[1].replace(/&amp;/g, '&');
                         const downXml = `<?xml version="1.0" encoding="UTF-8"?><downloadRequest><playbackURI>${rawUri.replace(/&/g, '&amp;')}</playbackURI></downloadRequest>`.trim();
                         
+                        // Facciamo lo stesso giochetto del file temporaneo anche per il download
+                        const tempDownXmlPath = path.join(baseStorage, `down_${t.id}_${timestamp}.xml`);
+                        fs.writeFileSync(tempDownXmlPath, downXml, 'utf8');
+
                         const fullImgPath = path.join(baseStorage, `img_${timestamp}.jpg`);
                         const rawPath = path.join(baseStorage, `raw_${timestamp}.mp4`);
                         const targetFilePath = (t.id === trackI) ? fullImgPath : rawPath;
 
-                        // cURL gestisce anche il download binario immenso salvando direttamente su file (-o)
                         const downUrl = `${node.protocol}://${node.host}:${node.port}/ISAPI/ContentMgmt/download`;
-                        const curlDownCommand = `curl -s -X POST --digest -u "${node.user}:${node.pass}" -H "Content-Type: application/xml; charset=UTF-8" -d '${downXml}' "${downUrl}" -o "${targetFilePath}"`;
+                        const curlDownCommand = `curl -s -X POST --digest -u "${node.user}:${node.pass}" -H "Content-Type: application/xml; charset=UTF-8" -d "@${tempDownXmlPath}" "${downUrl}" -o "${targetFilePath}"`;
 
+                        node.warn(`[DEBUG] Eseguo download traccia ${t.id} tramite cURL via file temporaneo...`);
                         await new Promise((resolve) => {
                             exec(curlDownCommand, () => resolve());
                         });
 
+                        // Cancelliamo il file XML del download
+                        try { if (fs.existsSync(tempDownXmlPath)) fs.unlinkSync(tempDownXmlPath); } catch(e){}
+
                         if (fs.existsSync(targetFilePath) && fs.statSync(targetFilePath).size > 0) {
                             if (t.id === trackI) {
                                 output.foto_base64 = fs.readFileSync(fullImgPath, { encoding: 'base64' });

package/package.json

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