node-red-contrib-hik-media-buffer 1.1.72 → 1.1.74

package/hik-media-buffer.js

@@ -123,7 +123,7 @@ module.exports = function(RED) {
             if (nowTime - lastTriggerTime[camera.ip] < 5000) return; 
             lastTriggerTime[camera.ip] = nowTime;
 
-            const camAuth = new AxiosDigestAuth({ username: node.user, password: node.camPass });
+            const camAuth = new AxiosDigestAuth({ username: node.user, password: node.pass });
             const referenceTime = new Date();
             const timestamp = Math.floor(referenceTime.getTime() / 1000);
             const startTime = toHikDate(new Date(referenceTime.getTime() - (10 * 1000)));
@@ -132,7 +132,7 @@ module.exports = function(RED) {
             node.status({fill:"yellow", shape:"dot", text:`Download Cam ${channelID}...`});
             await new Promise(resolve => setTimeout(resolve, 6000));
             
-            const baseUrl = `${node.protocol}://${camera.ip}:${node.port}/ISAPI/ContentMgmt`;
+            const baseUrl = `${node.protocol}://${node.host}:${node.port}/ISAPI/ContentMgmt`;
             
             // struttura del payload per Python
             let output = { 
@@ -156,8 +156,13 @@ module.exports = function(RED) {
                 const trackI = (channelID*100+3).toString();
                 const tracks = [{ id: trackV }, { id: trackI }];
                 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>`;
+                    if(t.id==trackV){
+                        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>`;
 
+                    } else{
+                        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.hikvision.com/${evento}</metadataDescriptor></metadataList></CMSearchDescription>`;
+                    }
+                    
                     const resSearch = await camAuth.request({ 
                         method: 'POST', url: `${baseUrl}/search`, data: searchXml, headers: { "Content-Type": "application/xml" } 
                     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-hik-media-buffer",
-  "version": "1.1.72",
+  "version": "1.1.74",
   "description": "Ottiene buffer video e immagine da camere Hikvision via ISAPI",
   "keywords": [
     "node-red",
@@ -22,7 +22,6 @@
   "dependencies": {
     "@mhoc/axios-digest-auth": "^0.8.0",
     "axios": "^1.6.0",
-    "node-red-contrib-hik-media-buffer": "^1.1.59",
     "xml2js": "^0.6.2"
   }
 }