Merge pull request #33 from AmRo045/dev

Fix health-check bug

Author: AmRo045

package.json

@@ -1,6 +1,6 @@
 {
   "name": "outline-admin",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "private": true,
   "scripts": {
     "compile": "tsc -p tsconfig.scripts.json && tscpaths -p tsconfig.scripts.tscpaths.json -s ./dist -o ./dist",

scripts/health-check.ts

@@ -25,16 +25,22 @@ async function handleUnavailableServer(server: any, errorMessage: string) {
         data: { isAvailable: false, lastCheckedAt: now, updatedAt: now }
     });
 
-    if (!healthCheck.notification) return;
+    const notificationChannel = healthCheck.notificationChannel;
+
+    if (!notificationChannel) {
+        return;
+    }
 
     if (healthCheck.notificationSentAt) {
         const msSinceLastNotification = Date.now() - new Date(healthCheck.notificationSentAt).getTime();
         const cooldownMs = healthCheck.notificationCooldown * 60_000;
 
-        if (msSinceLastNotification < cooldownMs) return;
+        if (msSinceLastNotification < cooldownMs) {
+            return;
+        }
     }
 
-    if (healthCheck.notification === HealthCheckNotificationType.Telegram && server.healthCheck.notificationConfig) {
+    if (notificationChannel.type === HealthCheckNotificationType.Telegram && notificationChannel.config) {
         try {
             logger.info("Sending Telegram notification...");
             await sendNotificationViaTelegramChannel(server, errorMessage);
@@ -142,7 +148,15 @@ async function checkServerHealth(server: any) {
 
 async function main() {
     logger.info("Loading servers from local database...");
-    const servers = await prisma.server.findMany({ include: { healthCheck: true } });
+    const servers = await prisma.server.findMany({
+        include: {
+            healthCheck: {
+                include: {
+                    notificationChannel: true
+                }
+            }
+        }
+    });
 
     logger.info("Starting health checks...");
 

src/core/definitions.ts

@@ -8,7 +8,7 @@ export enum LoggerContext {
 }
 
 export enum HealthCheckNotificationType {
-    Telegram = "telegram"
+    Telegram = "Telegram"
 }
 
 export type TelegramNotificationChannelConfig = {