chore(deps): Upgrade ms-teams-webhook dependency

Fixes #725
ptarmiganlabs · Aug 17, 2023 · 6e7814a · 6e7814a
1 parent 7a0f00d
commit 6e7814a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -83,7 +83,7 @@
         "moment": "^2.29.4",
         "moment-precise-range-plugin": "^1.3.0",
         "mqtt": "^5.0.3",
-        "ms-teams-webhook": "^1.0.4",
+        "ms-teams-webhook": "^2.0.2",
         "nodemailer": "^6.9.3",
         "nodemailer-express-handlebars": "^6.1.0",
         "npm": "^9.7.1",

diff --git a/src/config/slack_templates/failed-reload.handlebars b/src/config/slack_templates/failed-reload.handlebars
@@ -101,7 +101,7 @@
             "type": "section",
             "text": {
                 "type": "mrkdwn",
-                "text": "```{{executionDetailsConcatenated}}```"
+                "text": "```{{ executionDetailsConcatenated }}```"
             }
         },
         {
@@ -115,7 +115,7 @@
             "type": "section",
             "text": {
                 "type": "mrkdwn",
-                "text": "```{{scriptLogHead}}```"
+                "text": "```{{{ scriptLogHead }}}```"
             }
         },
         {
@@ -129,7 +129,7 @@
             "type": "section",
             "text": {
                 "type": "mrkdwn",
-                "text": "```{{scriptLogTail}}```"
+                "text": "```{{{ scriptLogTail }}}```"
             }
         }
     ]

diff --git a/src/lib/msteams_notification.js b/src/lib/msteams_notification.js
@@ -4,7 +4,6 @@ const handlebars = require('handlebars');
 const { RateLimiterMemory } = require('rate-limiter-flexible');
 
 const globals = require('../globals');
-const scriptLog = require('./scriptlog');
 
 let rateLimiterMemoryFailedReloads;
 let rateLimiterMemoryAbortedReloads;
@@ -407,7 +406,8 @@ async function sendTeams(teamsWebhookObj, teamsConfig, templateContext, msgType)
         }
 
         if (msg !== null) {
-            const res = await teamsWebhookObj.send(JSON.stringify(msg));
+            // const res = await teamsWebhookObj.send(JSON.stringify(msg));
+            const res = await teamsWebhookObj.send(msg);
             if (res !== undefined) {
                 globals.logger.debug(`TEAMSNOTIF: Result from calling TeamsApi.TeamsSend: ${res.statusText} (${res.status}): ${res.data}`);
             }
@@ -434,11 +434,17 @@ function sendReloadTaskFailureNotificationTeams(reloadParams) {
                 }
 
                 // Get script logs, if enabled in the config file
-                const scriptLogData = await scriptLog.getScriptLog(
-                    reloadParams.taskId,
-                    globals.config.get('Butler.teamsNotification.reloadTaskFailure.headScriptLogLines'),
-                    globals.config.get('Butler.teamsNotification.reloadTaskFailure.tailScriptLogLines')
-                );
+                const scriptLogData = reloadParams.scriptLog;
+
+                // Reduce script log lines to only the ones we want to send to Slack
+                scriptLogData.scriptLogHeadCount = globals.config.get('Butler.teamsNotification.reloadTaskFailure.headScriptLogLines');
+                scriptLogData.scriptLogTailCount = globals.config.get('Butler.teamsNotification.reloadTaskFailure.tailScriptLogLines');
+
+                scriptLogData.scriptLogHead = scriptLogData.scriptLogFull.slice(0, scriptLogData.scriptLogHeadCount).join('\r\n');;
+                scriptLogData.scriptLogTail = scriptLogData.scriptLogFull
+                    .slice(Math.max(scriptLogData.scriptLogFull.length - scriptLogData.scriptLogTailCount, 0))
+                    .join('\r\n');
+
                 globals.logger.debug(`TASK FAILED ALERT TEAMS: Script log data:\n${JSON.stringify(scriptLogData, null, 2)}`);
 
                 // Get Sense URLs from config file. Can be used as template fields.
@@ -561,11 +567,17 @@ function sendReloadTaskAbortedNotificationTeams(reloadParams) {
                 }
 
                 // Get script logs, if enabled in the config file
-                const scriptLogData = await scriptLog.getScriptLog(
-                    reloadParams.taskId,
-                    globals.config.get('Butler.teamsNotification.reloadTaskAborted.headScriptLogLines'),
-                    globals.config.get('Butler.teamsNotification.reloadTaskAborted.tailScriptLogLines')
-                );
+                const scriptLogData = reloadParams.scriptLog;
+
+                // Reduce script log lines to only the ones we want to send to Slack
+                scriptLogData.scriptLogHeadCount = globals.config.get('Butler.teamsNotification.reloadTaskAborted.headScriptLogLines');
+                scriptLogData.scriptLogTailCount = globals.config.get('Butler.teamsNotification.reloadTaskAborted.tailScriptLogLines');
+
+                scriptLogData.scriptLogHead = scriptLogData.scriptLogFull.slice(0, scriptLogData.scriptLogHeadCount).join('\r\n');;
+                scriptLogData.scriptLogTail = scriptLogData.scriptLogFull
+                    .slice(Math.max(scriptLogData.scriptLogFull.length - scriptLogData.scriptLogTailCount, 0))
+                    .join('\r\n');
+
                 globals.logger.debug(`TASK ABORTED ALERT TEAMS: Script log data:\n${JSON.stringify(scriptLogData, null, 2)}`);
 
                 // Get Sense URLs from config file. Can be used as template fields.