@gregoriusrippenstein/node-red-contrib-introspection 0.15.7 → 0.15.9

package/nodes/60-client-code.html

@@ -19,6 +19,9 @@ function handleClientCodeFrontend(event,data){if("execfunc"==data.msg){let doSen
       format: {
         value: "javascript"
       },
+      removereqres: {
+        value: false
+      },
       rules: {
           value: [{ t: "default", p: "payload", pt: "msg", to: "", tot: "str" }]
       }
@@ -117,7 +120,7 @@ function handleClientCodeFrontend(event,data){if("execfunc"==data.msg){let doSen
       tabs.activateTab("client-code-tabs-code-editor");
 
 
-      $('#node-inpclientcode-defaults-container').css('min-height', '150px').css('min-width', '450px').editableList({
+      $('#node-inpclientcode-defaults-container').css('max-height', '70vh').css('min-width', '15vw').editableList({
         addItem: function (container, i, opt) {
           var rule = opt;
           if (!rule.hasOwnProperty('t')) {
@@ -293,7 +296,7 @@ function handleClientCodeFrontend(event,data){if("execfunc"==data.msg){let doSen
       }
 
       // footer
-      height -= 40;
+      height -= 42;
       
       var editorRow = $("#dialog-form #client-code-tabs-code-editor>div.node-text-editor-row");
       height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
@@ -375,7 +378,17 @@ function handleClientCodeFrontend(event,data){if("execfunc"==data.msg){let doSen
               id="node-input-clientcode-editor" ></div>
       </div>
 
-      <input type="hidden" id="node-input-clientcode" autofocus="autofocus">
+      <input type="hidden" id="node-input-clientcode" autofocus="autofocus"></input>
+
+      <div class="form-row">
+        <input type="checkbox" id="node-input-removereqres"
+                           style="display:inline-block; width:35px; vertical-align:baseline;">
+        <label style="display: inline-block; width: 40%;"
+                   for="node-input-removereqres">
+              <i class="fa fa-filter"></i>
+              <span>Remove <code>msg.res</code> and <code>msg.req</code>?</span>
+            </label>        
+      </div>
     </div>
 
   </div>
@@ -420,7 +433,7 @@ Functionality:
     over the code defined in the node itself.
 
     <p>
-      Handling of Default Values
+      <b>Handling of Default Values</b>
     <p>
       Each default value can either be default, overwrite or fixed:
       <li>
@@ -429,8 +442,15 @@ Functionality:
         <ul><b>Fixed</b> - the default value is always used, ignoring whether the value is already set or not on the msg object. This is useful for constants or JSONata expressions - see loop counter below.</ul>
       </li>
     <p>
-      Loop counters using jsonata
+      <b>Loop counters using jsonata</b>
     <p>
       One usage of the default values is as an loop counter for messages going around and around. To define a loopcounter which is only defined on the msg object, define a default value <code>loopcounter</code> with the following JSONata code <code>$filter([$$.loopcounter,0,0], function ($v) { $exists($v) })[0] + 1</code> ($filter returns a single value if the array only contains one value else it returns an array).
-      
+
+    <p>
+      <b>Remove msg.req and msg.res</b>
+    <p>
+      The <code>msg.req</code> and <code>msg.res</code> can cause <code>Converting circular structure to JSON</code> errors when the message is passed to the ClientCode node. To avoid this from happening, remove these attributes from the message before passing the message to the node. 
+    <p>
+      <b>Node:</b> activating this implies that a http response following this ClientCode node will not work.      
+    <p>
 </script>

package/nodes/60-client-code.js

@@ -11,16 +11,17 @@ module.exports = function (RED) {
 
   function msgTracerOnReceiveHook(evnt) {
     try {
-      let nde = RED.nodes.getNode(evnt.destination.id)
-
-      nde.status({ fill: "green", shape: "ring", text: "msg received" })
-      setTimeout(() => { nde.status({}) }, 1000)
-
       RED.comms.publish("msgtracer:node-received",
         RED.util.encodeObject({
           nodeid: evnt.destination.id
         })
       )
+
+      let nde = RED.nodes.getNode(evnt.destination.id)
+      if (nde) {
+        nde.status({ fill: "green", shape: "ring", text: "msg received" })
+        setTimeout(() => { nde.status({}) }, 1000)
+      }
     } catch (ex) {
       console.error(ex)
     }
@@ -30,6 +31,12 @@ module.exports = function (RED) {
     try {
       let nde = RED.nodes.getNode(evnt.destination.id)
 
+      if (!nde) {
+        console.log(`MsgTracer: ignoring event, node '${evnt.destination.id}' not found`)
+        console.log(evnt)
+        return
+      }
+
       // don't publish debug messages for junctions because they 
       // cause errors in handleDebugMessages in the client.
       if (nde.type == "junction") { return }
@@ -107,15 +114,24 @@ module.exports = function (RED) {
     });
 
     node.on("input", function (msg, send, done) {
+      // these cause an circular "Converting circular structure to JSON" error when 
+      // encoding to JSON, so remove them before doing the JSONification.
+      if (cfg.removereqres) {
+        delete msg.req
+        delete msg.res
+      }
+
       // msg object may cause problem if there are circular references, so
       // do a pre-stringify before erroring out.
       try {
         JSON.stringify(msg)
       } catch (e) {
+        // overwrite msg because calling node.error(..) will failure with the same error!!!
+        // worse still, it will fail silently and cause Node-RED to stop.
         msg = `[Error in JSON.stringify(msg)]\n${e}\n[End Error]\n`
         node.error(e)
       }
-
+      
       let defaultValues = {}
       
       let stupidLoop = (ruleIdx) => {
@@ -157,7 +173,14 @@ module.exports = function (RED) {
         }
       }
 
-      stupidLoop(0)
+      try {
+        stupidLoop(0)
+      } catch(e) {
+        // overwrite msg because calling node.error(..) will failure with the same error!!!
+        // worse still, it will fail silently and cause Node-RED to stop.
+        msg = `[Error in JSON.stringify(msg)]\n${e}\n[End Error]\n`
+        node.error(e)
+      }
     });
   }
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gregoriusrippenstein/node-red-contrib-introspection",
-  "version": "0.15.7",
+  "version": "0.15.9",
   "dependencies": {
     "got": "^13",
     "uglify-js": "^3.17.4",