From 280461e85b089e54941de68cc77ae364becb877c Mon Sep 17 00:00:00 2001 From: bvmensvoort Date: Sun, 11 Jun 2023 10:42:38 +0200 Subject: [PATCH] Make errors of nodes catchable by a catch node --- src/matrix-create-room.js | 4 ++-- src/matrix-delete-event.js | 4 ++-- src/matrix-invite-room.js | 8 ++++---- src/matrix-join-room.js | 8 ++++---- src/matrix-leave-room.js | 10 +++++----- src/matrix-react.js | 10 +++++----- src/matrix-receive.js | 2 +- src/matrix-room-ban.js | 10 +++++----- src/matrix-room-invite.js | 2 +- src/matrix-room-kick.js | 10 +++++----- src/matrix-room-users.js | 4 ++-- src/matrix-send-file.js | 4 ++-- src/matrix-send-image.js | 4 ++-- src/matrix-send-message.js | 8 ++++---- 14 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/matrix-create-room.js b/src/matrix-create-room.js index d60d2b3..c954a0e 100644 --- a/src/matrix-create-room.js +++ b/src/matrix-create-room.js @@ -8,7 +8,7 @@ module.exports = function(RED) { this.server = RED.nodes.getNode(n.server); if(!this.server) { - node.error('Server must be configured on the node.'); + node.error('Server must be configured on the node.', {}); return; } @@ -41,7 +41,7 @@ module.exports = function(RED) { } if(!node.server.isConnected()) { - node.error("Matrix server connection is currently closed"); + node.error("Matrix server connection is currently closed", {}); node.send([null, msg]); } diff --git a/src/matrix-delete-event.js b/src/matrix-delete-event.js index cbb40d2..66b6afd 100644 --- a/src/matrix-delete-event.js +++ b/src/matrix-delete-event.js @@ -27,7 +27,7 @@ module.exports = function(RED) { node.on('input', function(msg) { if(!msg.eventId) { - node.error("eventId is missing"); + node.error("eventId is missing", {}); node.send([null, msg]) return; } @@ -38,7 +38,7 @@ module.exports = function(RED) { } if(!node.server.isConnected()) { - node.error("Matrix server connection is currently closed"); + node.error("Matrix server connection is currently closed", {}); node.send([null, msg]); return; } diff --git a/src/matrix-invite-room.js b/src/matrix-invite-room.js index 334cb0c..e1c5553 100644 --- a/src/matrix-invite-room.js +++ b/src/matrix-invite-room.js @@ -9,7 +9,7 @@ module.exports = function(RED) { this.roomId = n.roomId; if(!this.server) { - node.error('Server must be configured on the node.'); + node.error('Server must be configured on the node.', {}); return; } @@ -37,18 +37,18 @@ module.exports = function(RED) { node.on("input", function (msg) { if (! node.server || ! node.server.matrixClient) { - node.error("No matrix server selected"); + node.error("No matrix server selected", {}); return; } if(!node.server.isConnected()) { - node.error("Matrix server connection is currently closed"); + node.error("Matrix server connection is currently closed", {}); node.send([null, msg]); } msg.topic = node.roomId || msg.topic; if(!msg.topic) { - node.error("room must be defined in either msg.topic or in node config"); + node.error("room must be defined in either msg.topic or in node config", {}); return; } diff --git a/src/matrix-join-room.js b/src/matrix-join-room.js index bee81fd..0c4c4ba 100644 --- a/src/matrix-join-room.js +++ b/src/matrix-join-room.js @@ -24,17 +24,17 @@ module.exports = function(RED) { node.on("input", function (msg) { if (! node.server || ! node.server.matrixClient) { - node.error("No matrix server selected"); + node.error("No matrix server selected", {}); return; } if(!node.server.isConnected()) { - node.error("Matrix server connection is currently closed"); + node.error("Matrix server connection is currently closed", {}); node.send([null, msg]); } if(!msg.topic) { - node.error("Room must be specified in msg.topic"); + node.error("Room must be specified in msg.topic", {}); return; } @@ -46,7 +46,7 @@ module.exports = function(RED) { node.send([msg, null]); }) .catch(function(e){ - node.error("Error trying to join room " + msg.topic + ":" + e); + node.error("Error trying to join room " + msg.topic + ":" + e, {}); msg.error = e; node.send([null, msg]); }); diff --git a/src/matrix-leave-room.js b/src/matrix-leave-room.js index f69877d..ee5da62 100644 --- a/src/matrix-leave-room.js +++ b/src/matrix-leave-room.js @@ -11,7 +11,7 @@ module.exports = function(RED) { node.status({ fill: "red", shape: "ring", text: "disconnected" }); if (!node.server) { - node.error("No configuration node"); + node.error("No configuration node", {}); return; } @@ -25,17 +25,17 @@ module.exports = function(RED) { node.on('input', function(msg) { if (! node.server || ! node.server.matrixClient) { - node.error("No matrix server selected"); + node.error("No matrix server selected", {}); return; } if(!msg.topic) { - node.error('No room provided in msg.topic'); + node.error('No room provided in msg.topic', {}); return; } if(!node.server.isConnected()) { - node.error("Matrix server connection is currently closed"); + node.error("Matrix server connection is currently closed", {}); node.send([null, msg]); } @@ -44,7 +44,7 @@ module.exports = function(RED) { node.server.matrixClient.leave(msg.topic); node.send([msg, null]); } catch(e) { - node.error("Failed to leave room " + msg.topic + ": " + e); + node.error("Failed to leave room " + msg.topic + ": " + e, {}); msg.payload = e; node.send([null, msg]); } diff --git a/src/matrix-react.js b/src/matrix-react.js index 8da269e..26ca4cc 100644 --- a/src/matrix-react.js +++ b/src/matrix-react.js @@ -26,30 +26,30 @@ module.exports = function(RED) { node.on("input", function (msg) { if (!node.server || !node.server.matrixClient) { - node.error("No matrix server selected"); + node.error("No matrix server selected", {}); return; } if(!node.server.isConnected()) { - node.error("Matrix server connection is currently closed"); + node.error("Matrix server connection is currently closed", {}); node.send([null, msg]); } msg.topic = node.roomId || msg.topic; if(!msg.topic) { - node.error("Room must be specified in msg.topic or in configuration"); + node.error("Room must be specified in msg.topic or in configuration", {}); return; } let payload = n.reaction || msg.payload; if(!payload) { - node.error('msg.payload must be defined or the reaction configured on the node.'); + node.error('msg.payload must be defined or the reaction configured on the node.', {}); return; } let eventId = msg.referenceEventId || msg.eventId; if(!eventId) { - node.error('Either msg.referenceEventId or msg.eventId must be defined to react to a message.'); + node.error('Either msg.referenceEventId or msg.eventId must be defined to react to a message.', {}); return; } diff --git a/src/matrix-receive.js b/src/matrix-receive.js index 8e82f58..404a32f 100644 --- a/src/matrix-receive.js +++ b/src/matrix-receive.js @@ -21,7 +21,7 @@ module.exports = function(RED) { node.status({ fill: "red", shape: "ring", text: "disconnected" }); if (!node.server) { - node.error("No configuration node"); + node.error("No configuration node", {}); return; } diff --git a/src/matrix-room-ban.js b/src/matrix-room-ban.js index 0a26b74..6d6a71e 100644 --- a/src/matrix-room-ban.js +++ b/src/matrix-room-ban.js @@ -26,23 +26,23 @@ module.exports = function(RED) { node.on("input", function (msg) { if (! node.server || ! node.server.matrixClient) { - node.error("No matrix server selected"); + node.error("No matrix server selected", {}); return; } if(!node.server.isConnected()) { - node.error("Matrix server connection is currently closed"); + node.error("Matrix server connection is currently closed", {}); node.send([null, msg]); } msg.topic = node.roomId || msg.topic; if(!msg.topic) { - node.error("Room must be specified in msg.topic or in configuration"); + node.error("Room must be specified in msg.topic or in configuration", {}); return; } if(!msg.userId) { - node.error("msg.userId was not set."); + node.error("msg.userId was not set.", {}); return; } @@ -53,7 +53,7 @@ module.exports = function(RED) { node.send([msg, null]); }) .catch(function(e){ - node.error("Error trying to ban " + msg.userId + " from " + msg.topic); + node.error("Error trying to ban " + msg.userId + " from " + msg.topic, {}); msg.error = e; node.send([null, msg]); }); diff --git a/src/matrix-room-invite.js b/src/matrix-room-invite.js index 9c7edf5..1492538 100644 --- a/src/matrix-room-invite.js +++ b/src/matrix-room-invite.js @@ -9,7 +9,7 @@ module.exports = function(RED) { this.roomId = n.roomId; if(!this.server) { - node.error('Server must be configured on the node.'); + node.error('Server must be configured on the node.', {}); return; } diff --git a/src/matrix-room-kick.js b/src/matrix-room-kick.js index 5fb9d6f..13007ca 100644 --- a/src/matrix-room-kick.js +++ b/src/matrix-room-kick.js @@ -26,23 +26,23 @@ module.exports = function(RED) { node.on("input", function (msg) { if (! node.server || ! node.server.matrixClient) { - node.error("No matrix server selected"); + node.error("No matrix server selected", {}); return; } if(!node.server.isConnected()) { - node.error("Matrix server connection is currently closed"); + node.error("Matrix server connection is currently closed", {}); node.send([null, msg]); } msg.topic = node.roomId || msg.topic; if(!msg.topic) { - node.error("Room must be specified in msg.topic or in configuration"); + node.error("Room must be specified in msg.topic or in configuration", {}); return; } if(!msg.userId) { - node.error("msg.userId was not set."); + node.error("msg.userId was not set.", {}); return; } @@ -53,7 +53,7 @@ module.exports = function(RED) { node.send([msg, null]); }) .catch(function(e){ - node.error("Error trying to kick " + msg.userId + " from " + msg.topic); + node.error("Error trying to kick " + msg.userId + " from " + msg.topic, {}); msg.error = e; node.send([null, msg]); }); diff --git a/src/matrix-room-users.js b/src/matrix-room-users.js index 7d1da9b..07eb34f 100644 --- a/src/matrix-room-users.js +++ b/src/matrix-room-users.js @@ -31,13 +31,13 @@ module.exports = function(RED) { } if(!node.server.isConnected()) { - node.error("Matrix server connection is currently closed"); + node.error("Matrix server connection is currently closed", {}); node.send([null, msg]); } let roomId = node.roomId || msg.topic; if(!roomId) { - node.error("msg.topic is required. Specify in the input or configure the room ID on the node."); + node.error("msg.topic is required. Specify in the input or configure the room ID on the node.", {}); return; } diff --git a/src/matrix-send-file.js b/src/matrix-send-file.js index 92486c2..923f40c 100644 --- a/src/matrix-send-file.js +++ b/src/matrix-send-file.js @@ -31,7 +31,7 @@ module.exports = function(RED) { } if(!node.server.isConnected()) { - node.error("Matrix server connection is currently closed"); + node.error("Matrix server connection is currently closed", {}); node.send([null, msg]); } @@ -57,7 +57,7 @@ module.exports = function(RED) { } if(!msg.payload) { - node.error('msg.payload is required'); + node.error('msg.payload is required', {}); return; } diff --git a/src/matrix-send-image.js b/src/matrix-send-image.js index 9572e7a..6035310 100644 --- a/src/matrix-send-image.js +++ b/src/matrix-send-image.js @@ -31,7 +31,7 @@ module.exports = function(RED) { } if(!node.server.isConnected()) { - node.error("Matrix server connection is currently closed"); + node.error("Matrix server connection is currently closed", {}); node.send([null, msg]); } @@ -57,7 +57,7 @@ module.exports = function(RED) { } if(!msg.payload) { - node.error('msg.payload is required'); + node.error('msg.payload is required', {}); return; } diff --git a/src/matrix-send-message.js b/src/matrix-send-message.js index 30607f1..79494a7 100644 --- a/src/matrix-send-message.js +++ b/src/matrix-send-message.js @@ -71,7 +71,7 @@ module.exports = function(RED) { if(msgType === 'msg.type') { if(!msg.type) { - node.error("msg.type type is set to be passed in via msg.type but was not defined"); + node.error("msg.type type is set to be passed in via msg.type but was not defined", {}); return; } msgType = msg.type; @@ -79,7 +79,7 @@ module.exports = function(RED) { if(msgFormat === 'msg.format') { if(!msg.format) { - node.error("Message format is set to be passed in via msg.format but was not defined"); + node.error("Message format is set to be passed in via msg.format but was not defined", {}); return; } msgFormat = msg.format; @@ -91,7 +91,7 @@ module.exports = function(RED) { } if(!node.server.isConnected()) { - node.error("Matrix server connection is currently closed"); + node.error("Matrix server connection is currently closed", {}); node.send([null, msg]); return; } @@ -104,7 +104,7 @@ module.exports = function(RED) { let payload = n.message || msg.payload; if(!payload) { - node.error('msg.payload must be defined or the message configured on the node.'); + node.error('msg.payload must be defined or the message configured on the node.', {}); return; }