Merge branch 'master' into dev

node-red · May 14, 2024 · 56fe280 · 56fe280
2 parents e1c36d2 + f55ee6e
commit 56fe280
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.js b/packages/node_modules/@node-red/nodes/core/function/10-function.js
@@ -374,7 +374,7 @@ module.exports = function(RED) {
                         iniOpt.breakOnSigint = true;
                     }
                 }
-                node.script = vm.createScript(functionText, createVMOpt(node, ""));
+                node.script = new vm.Script(functionText, createVMOpt(node, ""));
                 if (node.fin && (node.fin !== "")) {
                     var finText = `(function () {
                         var node = {
@@ -438,10 +438,9 @@ module.exports = function(RED) {
 
                             //store the error in msg to be used in flows
                             msg.error = err;
-
-                            var line = 0;
-                            var errorMessage;
                             if (stack.length > 0) {
+                                let line = 0;
+                                let errorMessage;
                                 while (line < stack.length && stack[line].indexOf("ReferenceError") !== 0) {
                                     line++;
                                 }
@@ -455,11 +454,13 @@ module.exports = function(RED) {
                                         errorMessage += " (line "+lineno+", col "+cha+")";
                                     }
                                 }
+                                if (errorMessage) {
+                                    err.message = errorMessage
+                                }
                             }
-                            if (!errorMessage) {
-                                errorMessage = err.toString();
-                            }
-                            done(errorMessage);
+                            // Pass the whole error object so any additional properties
+                            // (such as cause) are preserved
+                            done(err);
                         }
                         else if (typeof err === "string") {
                             done(err);

diff --git a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
@@ -678,6 +678,9 @@ class Flow {
                 if (logMessage.hasOwnProperty('stack')) {
                     errorMessage.error.stack = logMessage.stack;
                 }
+                if (logMessage.hasOwnProperty('cause')) {
+                    errorMessage.error.cause = logMessage.cause;
+                }
                 targetCatchNode.receive(errorMessage);
                 handled = true;
             });

diff --git a/test/nodes/core/function/10-function_spec.js b/test/nodes/core/function/10-function_spec.js
@@ -390,7 +390,8 @@ describe('function node', function() {
                     msg.should.have.property('level', helper.log().ERROR);
                     msg.should.have.property('id', 'n1');
                     msg.should.have.property('type', 'function');
-                    msg.should.have.property('msg', 'ReferenceError: retunr is not defined (line 2, col 1)');
+                    msg.should.have.property('msg')
+                    msg.msg.message.should.equal('ReferenceError: retunr is not defined (line 2, col 1)');
                     done();
                 } catch(err) {
                     done(err);
@@ -659,7 +660,8 @@ describe('function node', function() {
                 msg.should.have.property('level', helper.log().ERROR);
                 msg.should.have.property('id', name);
                 msg.should.have.property('type', 'function');
-                msg.should.have.property('msg', 'Error: Callback must be a function');
+                msg.should.have.property('msg')
+                msg.msg.message.should.equal('Callback must be a function');
                 done();
             }
             catch (e) {