Discord webhooks

.github/actions/deploy/action.yaml

@@ -15,6 +15,8 @@ inputs:
   database_password:
     required: true
     type: string
+  discord_webhook_url:
+    type: string
   mail_host:
     required: true
     type: string
@@ -85,6 +87,7 @@ runs:
           CLOUDFLARE_DNS_API_TOKEN=${{ inputs.cloudflare_api_key }} \
           DATABASE_URL=${{ inputs.database_url }} \
           DATABASE_PASSWORD=${{ inputs.database_password }} \
+          DISCORD_WEBHOOK_URL=${{ inputs.discord_webhook_url }} \
           REDIS_URL=${{ inputs.redis_url }} \
           MAIL_HOST=${{ inputs.mail_host }} \
           MAIL_PORT=${{ inputs.mail_port }} \
@@ -136,6 +139,7 @@ runs:
           CLOUDFLARE_DNS_API_TOKEN=${{ inputs.cloudflare_api_key }} \
           DATABASE_URL=${{ inputs.database_url }} \
           DATABASE_PASSWORD=${{ inputs.database_password }} \
+          DISCORD_WEBHOOK_URL=${{ inputs.discord_webhook_url }} \
           REDIS_URL=${{ inputs.redis_url }} \
           MAIL_HOST=${{ inputs.mail_host }} \
           MAIL_PORT=${{ inputs.mail_port }} \

.github/workflows/build-and-deploy.yaml

@@ -128,6 +128,7 @@ jobs:
           cloudflare_api_key: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           database_password: ${{ secrets.DATABASE_PASSWORD }}
           database_url: ${{ secrets.DATABASE_URL }}
+          discord_webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }}
           mail_host: ${{ secrets.MAIL_HOST }}
           mail_password: ${{ secrets.MAIL_PASSWORD }}
           mail_port: ${{ secrets.MAIL_PORT }}

apps/backend/src/routes/auth/mail.ts

@@ -9,7 +9,7 @@ import { isError, isSuccess } from '@dundring/utils';
 import * as express from 'express';
 import {
   mailService,
-  slackService,
+  monitoringService,
   userService,
   validationService,
 } from '../../services';
@@ -68,7 +68,7 @@ router.post<
     const fitnessData = await userService.getUserFitnessData(userId);
     const ftp = isSuccess(fitnessData)
       ? fitnessData.data.ftp
-      : slackService.logAndReturn(
+      : monitoringService.logAndReturn(
           `user [${userId}] does not have any fitnessData stored. Returning {ftp: 200}`,
           200
         );

apps/backend/src/routes/auth/strava.ts

@@ -8,7 +8,7 @@ import {
 import { isError, isSuccess } from '@dundring/utils';
 import * as express from 'express';
 import {
-  slackService,
+  monitoringService,
   stravaService,
   userService,
   validationService,
@@ -61,7 +61,7 @@ router.post<
     const fitnessData = await userService.getUserFitnessData(userId);
     const ftp = isSuccess(fitnessData)
       ? fitnessData.data.ftp
-      : slackService.logAndReturn(
+      : monitoringService.logAndReturn(
           `user [${userId}] does not have any fitnessData stored. Returning {ftp: 200}`,
           200
         );

apps/backend/src/routes/feedback/index.ts

@@ -1,13 +1,13 @@
 import { FeedbackRequestBody } from '@dundring/types';
 import * as express from 'express';
-import { slackService } from '../../services';
+import { monitoringService } from '../../services';
 import { success } from '@dundring/utils';
 
 const router = express.Router();
 
 router.post<null, {}, FeedbackRequestBody>('/', (req, res) => {
   const { mail, message } = req.body;
-  slackService.log(`*Feedback${mail ? ` from ${mail}` : ''}*\n${message}`);
+  monitoringService.log(`*Feedback${mail ? ` from ${mail}` : ''}*\n${message}`);
   res.send(success({}));
 });
 

apps/backend/src/services/groupSessionService.ts

@@ -9,7 +9,7 @@ import {
   WebSocketResponse,
 } from '@dundring/types';
 import { generateRandomString, isSuccess } from '@dundring/utils';
-import { slackService } from '.';
+import { monitoringService } from '.';
 import * as redis from '../redis';
 import * as websocket from '../websocket';
 
@@ -83,7 +83,7 @@ export const createRoom = async (
       id: roomId,
       members: [user.username],
     };
-    slackService.logRoomCreation(user.username, roomId);
+    monitoringService.logRoomCreation(user.username, roomId);
     redis.createRoom(roomId, user);
     return { type: 'created-group-session', room };
   }
@@ -102,7 +102,7 @@ export const joinRoom = async (roomId: string, member: Member) => {
       type: 'joined-group-session',
       room,
     };
-    slackService.logRoomJoin(member.username, roomId);
+    monitoringService.logRoomJoin(member.username, roomId);
 
     // TODO: This is not needed as a broadcast is done to everyone including the sender
     websocket.sendMessage(member.username, response);
@@ -132,9 +132,9 @@ export const leaveRoom = async (username: string, roomId: string) => {
     const usersLeftInRoom = leaveRoomStatus.data;
 
     if (usersLeftInRoom === 0) {
-      slackService.logRoomDeletion(username, roomId);
+      monitoringService.logRoomDeletion(username, roomId);
     } else {
-      slackService.logRoomLeave(username, roomId);
+      monitoringService.logRoomLeave(username, roomId);
 
       const membersInRoom = await redis.getRoomMembers(roomId);
 

apps/backend/src/services/index.ts

@@ -1,6 +1,6 @@
 import * as groupSessionService from './groupSessionService';
 import * as mailService from './mailService';
-import * as slackService from './slackService';
+import * as monitoringService from './monitoringService';
 import * as stravaService from './stravaService';
 import * as userService from './userService';
 import * as validationService from './validationService';
@@ -9,7 +9,7 @@ import * as workoutService from './workoutService';
 export {
   groupSessionService,
   mailService,
-  slackService,
+  monitoringService,
   stravaService,
   userService,
   validationService,

apps/backend/src/services/slackService.ts → apps/backend/src/services/monitoringService.ts

@@ -32,41 +32,73 @@ const sendSlackMessage = (message: string) => {
   }
 };
 
+const getDiscordUrl = (): string | null => {
+  const url = process.env.DISCORD_WEBHOOK_URL;
+
+  if (!url) return null;
+
+  return url;
+};
+
+const sendDiscordMessage = (message: string) => {
+  const url = getDiscordUrl();
+
+  if (process.env.NODE_ENV !== 'production') {
+    console.log(`[discord]: ${message}`);
+    return;
+  }
+
+  if (!url) return;
+
+  try {
+    fetch(url, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ content: message }),
+    });
+  } catch (e) {
+    console.error('[sendSlackMessage]:', e);
+  }
+};
+
 export const logActivityUpload = (activityId: number) => {
   const message = `New upload: www.strava.com/activities/${activityId}`;
-  sendSlackMessage(message);
+  log(message);
 };
 
 export const logUserCreation = (user: { username: string; mail: string }) => {
   const message = `New user: *${user.username}* (${user.mail})`;
-  sendSlackMessage(message);
+  log(message);
 };
 
 export const logRoomJoin = (username: string, roomId: string) => {
   const message = `*${username}* joined group session with id *#${roomId}*`;
-  sendSlackMessage(message);
+  log(message);
 };
 
 export const logRoomCreation = (username: string, roomId: string) => {
   const message = `*${username}* created group session with id *#${roomId}*`;
-  sendSlackMessage(message);
+  log(message);
 };
 
 export const logRoomLeave = (username: string, roomId: string) => {
   const message = `*${username}* left group session with id *#${roomId}*.`;
-  sendSlackMessage(message);
+  log(message);
 };
 
 export const logRoomDeletion = (username: string, roomId: string) => {
   const message = `*${username}* left group session with id *#${roomId}*. No more users in group session; deleting it.`;
-  sendSlackMessage(message);
+  log(message);
 };
 
 export const logAndReturn = <T>(message: string, data: T) => {
-  sendSlackMessage(message);
+  log(message);
   return data;
 };
 
 export const log = (message: string) => {
   sendSlackMessage(message);
+  sendDiscordMessage(message);
 };

apps/backend/src/services/stravaService.ts

@@ -7,7 +7,7 @@ import {
 import { error, isSuccess, success } from '@dundring/utils';
 import fetch from 'node-fetch';
 import * as FormData from 'form-data';
-import { slackService } from './index';
+import { monitoringService } from './index';
 
 require('dotenv').config();
 
@@ -91,7 +91,7 @@ export const uploadFileToStrava = async (
 
           if (stravaUploadResponse) {
             if (isSuccess(stravaUploadResponse)) {
-              slackService.logActivityUpload(
+              monitoringService.logActivityUpload(
                 stravaUploadResponse.data.activity_id
               );
             }

apps/backend/src/services/userService.ts

@@ -3,7 +3,7 @@ import { Scopes, UserCreationStrava } from '@dundring/types';
 require('dotenv').config();
 import * as db from '../db';
 import { isSuccess } from '@dundring/utils';
-import { slackService } from '.';
+import { monitoringService } from '.';
 
 export const getUser = async (query: { username: string } | { id: string }) =>
   db.getUser(query);
@@ -14,7 +14,7 @@ export const updateUser = async (
 ) => {
   const ret = await db.updateUser(userId, data);
   if (isSuccess(ret)) {
-    slackService.log(
+    monitoringService.log(
       `User *${ret.data.id}* updated profile ${
         data.username ? `username=*${data.username}* ` : ''
       }${data.ftp ? `ftp=*${data.ftp}*` : ''}`
@@ -40,7 +40,7 @@ export const createUserFromStrava = async (body: UserCreationStrava) => {
   const ret = await db.createStravaUserWithRandomUsername(body);
   if (isSuccess(ret)) {
     const athleteId = ret.data.stravaAuthentication?.athleteId;
-    slackService.log(
+    monitoringService.log(
       `New user: *${ret.data.id}* created with Strava: athlete id: https://strava.com/athletes/${athleteId}`
     );
   }
@@ -50,7 +50,7 @@ export const createUserFromStrava = async (body: UserCreationStrava) => {
 export const createUserFromMail = async (mail: string) => {
   const ret = await db.createMailUserWithRandomUsername(mail);
   if (isSuccess(ret)) {
-    slackService.log(
+    monitoringService.log(
       `New user: *${ret.data.id}* created with mail: ${ret.data.mailAuthentication?.mail}`
     );
   }