refactor: trim environment variables and enhance error logging in Telegram broadcast

This commit is contained in:
sebseb7
2025-08-02 12:07:04 +02:00
parent 2d020b47b5
commit a64c95f54d

View File

@@ -42,16 +42,18 @@ const localDownloadFile = process.env.SMB_LOCAL_DOWNLOAD_FILE;
// Admin Telegram Broadcast (env-configured) // Admin Telegram Broadcast (env-configured)
const BASE_URL = process.env.BASE_URL; const BASE_URL = (process.env.BASE_URL || '').trim();
const ADMIN_API_KEY = process.env.ADMIN_API_KEY; const ADMIN_API_KEY = (process.env.ADMIN_API_KEY || '').trim();
async function sendTelegramBroadcast(target, message) { async function sendTelegramBroadcast(target, message) {
try { try {
if (!BASE_URL || !ADMIN_API_KEY) { if (!BASE_URL || !ADMIN_API_KEY) {
console.warn('Skipping admin broadcast: missing BASE_URL or ADMIN_API_KEY'); console.warn('Skipping admin broadcast: missing BASE_URL or ADMIN_API_KEY', { hasBaseUrl: !!BASE_URL, hasKey: !!ADMIN_API_KEY });
return null; return null;
} }
const endpoint = `${BASE_URL.replace(/\/$/, '')}/api/admin/telegram/broadcast`; const endpoint = `${BASE_URL.replace(/\/$/, '')}/api/admin/telegram/broadcast`;
console.log(`Broadcast → ${endpoint} target=${target}`);
const res = await fetch(endpoint, { const res = await fetch(endpoint, {
method: 'POST', method: 'POST',
headers: { headers: {
@@ -60,11 +62,18 @@ async function sendTelegramBroadcast(target, message) {
}, },
body: JSON.stringify({ target, message }), body: JSON.stringify({ target, message }),
}); });
let bodyText = '';
try { bodyText = await res.text(); } catch {}
if (!res.ok) { if (!res.ok) {
const err = await res.json().catch(() => ({})); let parsed;
throw new Error(`Broadcast failed: ${res.status} ${res.statusText} ${err.error || ''}`); try { parsed = JSON.parse(bodyText); } catch {}
const detail = parsed && parsed.error ? parsed.error : (bodyText ? bodyText.slice(0, 300) : '');
throw new Error(`Broadcast failed: ${res.status} ${res.statusText} - ${detail}`);
} }
return res.json();
return bodyText ? JSON.parse(bodyText) : {};
} catch (e) { } catch (e) {
console.error('Admin broadcast error:', e.message); console.error('Admin broadcast error:', e.message);
return null; return null;