node-red-contrib-hikvision-ultimate - npm Package Compare versions

Comparing version 1.0.37 to 1.0.38

CHANGELOG.md

@@ -7,2 +7,6 @@ <p align="center"><img src='https://raw.githubusercontent.com/Supergiovane/node-red-contrib-hikvision-ultimate/master/img/logo.png' width="40%"></p>
 <p>
+<b>Version 1.0.38</b> April 2021<br/>
+- Fidex a syntax error checking an url.<br/>
+</p>
+<p>
 <b>Version 1.0.37</b> April 2021<br/>
@@ -9,0 +13,0 @@ - Fidex an issue in the new function of picture node.<br/>

nodes/ANPR-config.js

@@ -12,4 +12,4 @@
         var node = this
-        node.debug = config.host.indexOf("banana") > -1;
-        node.host = config.host.replace("banana", "");
+        node.debug = config.host.toString().toLowerCase().indexOf("banana") > -1;
+        node.host = config.host.toString().toLowerCase().replace("banana", "");
         node.port = config.port;
@@ -16,0 +16,0 @@ node.protocol = config.protocol || "http";

nodes/Hikvision-config.js

@@ -12,4 +12,4 @@
         var node = this
-        node.debug = config.host.indexOf("banana") > -1;
-        node.host = config.host.replace("banana", "");
+        node.debug = config.host.toString().toLowerCase().indexOf("banana") > -1;
+        node.host = config.host.toString().toLowerCase().replace("banana", "");
         node.port = config.port;
@@ -314,8 +314,7 @@ node.protocol = config.protocol || "http";
                     //node.setAllClientsStatus({ fill: "green", shape: "ring", text: "Connected." });
-                } else if (response.status >= 400 && response.status < 500) {
-                    // 07/04/2021 Wrong URL
-                    _callerNode.sendPayload({ topic: _callerNode.topic || "", payload: false, wrongResponse: response.status });
                 } else {
-                    _callerNode.setNodeStatus({ fill: "red", shape: "ring", text: response.statusText || " unknown response code" });
-                    throw new Error("Error response: " + response.statusText || " unknown response code");
+                    // _callerNode.setNodeStatus({ fill: "red", shape: "ring", text: response.statusText || " unknown response code" });
+                    // // 07/04/2021 Wrong URL? Send this and is captured by picture node to try another url
+                    //  _callerNode.sendPayload({ topic: _callerNode.topic || "", payload: false, wrongResponse: response.status });
+                    // throw new Error("Error response: " + response.statusText || " unknown response code");
                 }
@@ -327,3 +326,3 @@ if (response.ok) {
                         _callerNode.sendPayload({ topic: _callerNode.topic || "", payload: true });
-                    } else if (_URL.toLowerCase().includes("/streaming/")) {
+                    } else if (_URL.toLowerCase().includes("/streaming")) {
                         body = await response.buffer(); // "data:image/png;base64," +    
@@ -333,2 +332,13 @@ //_callerNode.sendPayload({ topic: _callerNode.topic || "", payload:  body.toString("base64")});
                     }
+                } else {
+
+                    if (_URL.toLowerCase().includes("/ptzctrl/")) {
+
+                    } else if (_URL.toLowerCase().includes("/streaming")) {
+                        _callerNode.setNodeStatus({ fill: "red", shape: "ring", text: response.statusText || " unknown response code" });
+                        // 07/04/2021 Wrong URL? Send this and is captured by picture node to try another url
+                        _callerNode.sendPayload({ topic: _callerNode.topic || "", payload: false, wrongResponse: response.status });
+                    }
+                    throw new Error("Error response: " + response.statusText || " unknown response code");
+
                 }
@@ -335,0 +345,0 @@

nodes/hikvisionUltimatePicture.js

@@ -39,2 +39,3 @@
 			node.urlImage = ["/ISAPI/Streaming/channels/" + node.channelID + "01/picture", "/ISAPI/ContentMgmt/StreamingProxy/channels/" + node.channelID + "01/picture"]; // Stores all URLS the node will try to get images from
+			//node.urlImage = [ "/ISAPI/ContentMgmt/StreamingProxy/channels/" + node.channelID + "01/picture","/ISAPI/Streaming/channels/" + node.channelID + "01/picture"]; // Stores all URLS the node will try to get images from
 			
@@ -41,0 +42,0 @@ if (node.cropimage !== "" && node.cropimage.split(",").length === 4) {

package.json

 {
     "name": "node-red-contrib-hikvision-ultimate",
-    "version": "1.0.37",
+    "version": "1.0.38",
     "description": "A native set of nodes for Hikvision Cameras, Alarms, Radars etc.",
@@ -5,0 +5,0 @@ "author": "Supergiovane (https://github.com/Supergiovane)",

No alert changes

Improved metrics

Total package byte prevSize

1414922

increased by0.08%

Lines of code

1518

increased by0.53%

No dependency changes