@node-red/nodes 4.1.5 → 4.1.6

package/core/common/lib/debug/debug-utils.js

@@ -392,12 +392,28 @@ RED.debug = (function() {
         if (o) { stack.push(o); }
         if (!busy && (stack.length > 0)) {
             busy = true;
-            processDebugMessage(stack.shift());
-            setTimeout(function() {
-                busy = false;
-                handleDebugMessage();
-            }, 15);  // every 15mS = 66 times a second
-            if (stack.length > numMessages) { stack = stack.splice(-numMessages); }
+            const message = stack.shift()
+            // call any preDebugLog hooks, allowing them to modify the message or block it from being displayed
+            RED.hooks.trigger('debugPreProcessMessage', { message }).then(result => {
+                if (result === false) {
+                    return false; // A hook returned false - halt processing of this message
+                }
+                return processDebugMessage(message);
+            }).then(processArtifacts => {
+                if (processArtifacts === false) {
+                    return false; // A hook returned false - halt processing of this message
+                }
+                const { message, element, payload } = processArtifacts || {};
+                return RED.hooks.trigger('debugPostProcessMessage', { message, element, payload });
+            }).catch(err => {
+                console.error("Error in debug process message hooks", err);
+            }).finally(() => {
+                setTimeout(function() {
+                    busy = false;
+                    handleDebugMessage();
+                }, 15);  // every 15mS = 66 times a second
+                if (stack.length > numMessages) { stack = stack.splice(-numMessages); }
+            })
         }
     }
 
@@ -519,10 +535,13 @@ RED.debug = (function() {
             sourceId: sourceNode && sourceNode.id,
             rootPath: path,
             nodeSelector: config.messageSourceClick,
-            enablePinning: true
+            enablePinning: true,
+            tools: o.tools // permit preDebugLog hooks to add extra tools to the <debugMessage> element
         });
         // Do this in a separate step so the element functions aren't stripped
         debugMessage.appendTo(el);
+        // add the meta row tools container, even if there are no tools, so that the postProcessDebugMessage hook can add tools
+        const tools = $('<span class="red-ui-debug-msg-tools button-group"></span>').appendTo(metaRow)
         // NOTE: relying on function error to have a "type" that all other msgs don't
         if (o.hasOwnProperty("type") && (o.type === "function")) {
             var errorLvlType = 'error';
@@ -534,7 +553,6 @@ RED.debug = (function() {
             msg.addClass('red-ui-debug-msg-level-' + errorLvl);
             $('<span class="red-ui-debug-msg-topic">function : (' + errorLvlType + ')</span>').appendTo(metaRow);
         } else {
-            var tools = $('<span class="red-ui-debug-msg-tools button-group"></span>').appendTo(metaRow);
             var filterMessage = $('<button class="red-ui-button red-ui-button-small"><i class="fa fa-caret-down"></i></button>').appendTo(tools);
             filterMessage.on("click", function(e) {
                 e.preventDefault();
@@ -590,6 +608,14 @@ RED.debug = (function() {
         if (atBottom) {
             messageList.scrollTop(sbc.scrollHeight);
         }
+
+        // return artifacts to permit postProcessDebugMessage hooks to modify the message element, access the
+        // processed payload or otherwise modify the message after it has been generated.
+        return {
+            message: o, // original debug message object, useful for any hook that might have tagged additional info onto it
+            element: msg, // the top-level element for this debug message
+            payload // the reconstructed debug message
+        }
     }
 
     function clearMessageList(clearFilter, filteredOnly) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "4.1.5",
+    "version": "4.1.6",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -15,9 +15,9 @@
         }
     ],
     "dependencies": {
-        "acorn": "8.15.0",
-        "acorn-walk": "8.3.4",
-        "ajv": "8.17.1",
+        "acorn": "8.16.0",
+        "acorn-walk": "8.3.5",
+        "ajv": "8.18.0",
         "body-parser": "1.20.4",
         "cheerio": "1.0.0-rc.10",
         "content-type": "1.0.5",
@@ -35,7 +35,7 @@
         "is-utf8": "0.2.1",
         "js-yaml": "4.1.1",
         "media-typer": "1.1.0",
-        "mqtt": "5.11.0",
+        "mqtt": "5.15.0",
         "multer": "2.0.2",
         "mustache": "4.2.0",
         "node-watch": "0.7.4",