BreizhHardware/Jellystat
1
0
Fork 0
mirror of https://github.com/BreizhHardware/Jellystat.git synced 2026-01-18 16:27:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve error messages and logging in webhook manager and scheduler and fix error when webhook is undefined

Browse Source
This commit is contained in:
Félix MARQUET
2025-04-26 11:44:44 +02:00
parent 165927fc0b
commit 193b47c4af
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
backend/classes/webhook-manager.js
View File

@@ -190,7 +190,7 @@ class WebhookManager {
const result = await dbInstance.query(query, [formattedStartDate, limit]);
return result.rows || [];
} catch (error) {
console.error(`[WEBHOOK] Erreur SQL (${contentType}):`, error.message);
console.error(`[WEBHOOK] SQL ERROR (${contentType}):`, error.message);
return [];
}
}
@@ -237,7 +237,7 @@ class WebhookManager {
stats: generalStats
};
} catch (error) {
console.error("[WEBHOOK] Erreur récupération données:", error.message);
console.error("[WEBHOOK] Error while getting data:", error.message);
throw error;
}
}
@@ -251,7 +251,7 @@ class WebhookManager {
);
if (result.rows.length === 0) {
console.error(`[WEBHOOK] Webhook ID ${webhookId} non trouvé ou désactivé`);
console.error(`[WEBHOOK] Webhook ID ${webhookId} not found or disable`);
return false;
}
@@ -263,51 +263,51 @@ class WebhookManager {
const moviesFields = data.topMovies.map((movie, index) => ({
name: `${index + 1}. ${movie.title}`,
value: `${Math.round(movie.total_minutes)} minutes • ${movie.unique_viewers} spectateurs`,
value: `${Math.round(movie.total_minutes)} minutes • ${movie.unique_viewers} viewers`,
inline: false
}));
const seriesFields = data.topSeries.map((series, index) => ({
name: `${index + 1}. ${series.title}`,
value: `${Math.round(series.total_minutes)} minutes • ${series.unique_viewers} spectateurs`,
value: `${Math.round(series.total_minutes)} minutes • ${series.unique_viewers} viewers`,
inline: false
}));
const monthlyPayload = {
content: `📊 **Rapport mensuel - ${data.period.name}**`,
content: `📊 **Monthly Report - ${data.period.name}**`,
embeds: [
{
title: "🎬 Most Watched Movies",
color: 15844367, // Orange
fields: moviesFields.length > 0 ? moviesFields : [{ name: "Aucune donnée", value: "Pas de films regardés ce mois-ci" }]
color: 15844367,
fields: moviesFields.length > 0 ? moviesFields : [{ name: "No data", value: "No movies watch this month" }]
},
{
title: "📺 Most Watched Series",
color: 5793266, // Bleu
fields: seriesFields.length > 0 ? seriesFields : [{ name: "Aucune donnée", value: "Pas de séries regardées ce mois-ci" }]
color: 5793266,
fields: seriesFields.length > 0 ? seriesFields : [{ name: "No data", value: "No Series watch this month" }]
},
{
title: "📈 General Statistics",
color: 5763719, // Vert
color: 5763719,
fields: [
{
name: "Utilisateurs actifs",
name: "Active Users",
value: `${data.stats.active_users || 0}`,
inline: true
},
{
name: "Lectures totales",
name: "Total Plays",
value: `${data.stats.total_plays || 0}`,
inline: true
},
{
name: "Heures visionnées",
name: "Total Hours Watched",
value: `${Math.round(data.stats.total_hours || 0)}`,
inline: true
}
],
footer: {
text: `Période: du ${new Date(data.period.start).toLocaleDateString('fr-FR')} au ${new Date(data.period.end).toLocaleDateString('fr-FR')}`
text: `Period: from ${new Date(data.period.start).toLocaleDateString('en-US')} to ${new Date(data.period.end).toLocaleDateString('en-US')}`
}
}
]
@@ -322,7 +322,7 @@ class WebhookManager {
timeout: 10000
});
console.log(`[WEBHOOK] Rapport mensuel envoyé avec succès via ${webhook.name}`);
console.log(`[WEBHOOK] Monthly report webhook ${webhook.name} sent successfully`);
// Update the last triggered timestamp
await dbInstance.query(
@@ -332,11 +332,11 @@ class WebhookManager {
return true;
} catch (dataError) {
console.error(`[WEBHOOK] Erreur préparation données:`, dataError.message);
console.error(`[WEBHOOK] Error while preparing the data:`, dataError.message);
return false;
}
} catch (error) {
console.error(`[WEBHOOK] Erreur lors de l'envoi du rapport mensuel:`, error.message);
console.error(`[WEBHOOK] Error while sending the monthly report:`, error.message);
return false;
}
}

5
backend/classes/webhook-scheduler.js
View File

@@ -12,7 +12,7 @@ class WebhookScheduler {
async loadScheduledWebhooks() {
try {
const webhooks = await this.webhookManager.getScheduledWebhooks();
if (webhooks) {
// Clean existing tasks
Object.values(this.cronJobs).forEach(job => job.stop());
this.cronJobs = {};
@@ -27,6 +27,9 @@ class WebhookScheduler {
});
console.log(`[WEBHOOK] Scheduled ${Object.keys(this.cronJobs).length} webhooks`);
} else {
console.log('[WEBHOOK] No scheduled webhooks found');
}
} catch (error) {
console.error('[WEBHOOK] Failed to load scheduled webhooks:', error);
}