fix: respect brief opt-out and report channel delivery failures
This commit is contained in:
@@ -0,0 +1,51 @@
|
||||
/** Delivery accounting shared by scheduled and administrator-triggered briefs. */
|
||||
export function createBriefSender({ store, buildBrief, text, html, telegramConfigured, sendTelegram, emailConfigured, sendEmail, warn = console.warn }) {
|
||||
return async function sendBrief(tenderGetir) {
|
||||
const tenders = await tenderGetir();
|
||||
const r = { kullanici:0, gonderilen:0, bos:0, hata:0, kapali:0, kanalsiz:0,
|
||||
kanallar:{ telegram:{denenen:0,kabul:0,hata:0}, email:{denenen:0,kabul:0,hata:0} } };
|
||||
for (const user of store.listUsers()) {
|
||||
r.kullanici++;
|
||||
let accepted = false, failed = false;
|
||||
try {
|
||||
// Manual runs must also honor the recipient's opt-out.
|
||||
if (store.getData(user.email, 'brief')?.kapali) { r.kapali++; continue; }
|
||||
const brief = buildBrief(user.email, tenders);
|
||||
if (brief.bos) { r.bos++; continue; }
|
||||
const channels = [];
|
||||
const telegram = store.getData(user.email, 'telegram');
|
||||
if (telegramConfigured() && telegram?.chatId) channels.push({
|
||||
name:'telegram', send:() => sendTelegram(telegram.chatId, text(brief).slice(0,3900)),
|
||||
valid:receipt => receipt === true,
|
||||
});
|
||||
if (emailConfigured()) channels.push({
|
||||
name:'email', send:() => sendEmail({ to:user.email, subject:`İhaleist — Haftalık Brief (${brief.hafta})`, html:html(brief), text:text(brief) }),
|
||||
valid:receipt => typeof receipt?.id === 'string' && Boolean(receipt.id.trim()),
|
||||
});
|
||||
if (!channels.length) r.kanalsiz++;
|
||||
for (const channel of channels) {
|
||||
// An earlier channel can await the network while the user disables briefs.
|
||||
if (store.getData(user.email, 'brief')?.kapali) { r.kapali++; break; }
|
||||
const counts = r.kanallar[channel.name];
|
||||
counts.denenen++;
|
||||
try {
|
||||
const receipt = await channel.send();
|
||||
if (!channel.valid(receipt)) throw new Error('Sağlayıcı gönderimi doğrulamadı.');
|
||||
counts.kabul++;
|
||||
accepted = true;
|
||||
} catch (error) {
|
||||
counts.hata++;
|
||||
failed = true;
|
||||
warn('[brief]', user.email, channel.name, error.message);
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
failed = true;
|
||||
warn('[brief]', user.email, error.message);
|
||||
}
|
||||
if (accepted) r.gonderilen++;
|
||||
if (failed) r.hata++;
|
||||
}
|
||||
return r;
|
||||
};
|
||||
}
|
||||
+5
-22
@@ -3,6 +3,7 @@
|
||||
// Telegram (bağlıysa) + e-posta. Son gönderim data/brief-son.json'da tutulur;
|
||||
// saatlik kontrol, haftada bir gönderim (node-cron yok, setInterval).
|
||||
import fs from 'node:fs';
|
||||
import { createBriefSender } from './brief-delivery.mjs';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import * as store from './user-store.mjs';
|
||||
@@ -69,28 +70,10 @@ export function briefHtml(b) {
|
||||
<p style="margin-top:20px;font-size:12px;color:#94a3b8">Bu brief her Pazartesi gönderilir; Bildirimler sekmesinden kapatabilirsiniz.</p></div>`;
|
||||
}
|
||||
|
||||
export async function haftalikBriefGonder(tenderGetir, { zorla = false } = {}) {
|
||||
const tenders = await tenderGetir();
|
||||
const r = { kullanici: 0, gonderilen: 0, bos: 0, hata: 0 };
|
||||
for (const u of store.listUsers()) {
|
||||
r.kullanici++;
|
||||
try {
|
||||
const tercih = store.getData(u.email, 'brief');
|
||||
if (tercih && tercih.kapali && !zorla) continue;
|
||||
const b = briefOlustur(u.email, tenders);
|
||||
if (b.bos) { r.bos++; continue; }
|
||||
const tg = store.getData(u.email, 'telegram');
|
||||
let gitti = false;
|
||||
if (telegramConfigured() && tg?.chatId) gitti = await sendTelegram(tg.chatId, briefMetni(b).slice(0, 3900)).then(() => true).catch(() => false);
|
||||
if (emailConfigured()) gitti = (await sendEmail({ to: u.email, subject: `İhaleist — Haftalık Brief (${b.hafta})`, html: briefHtml(b), text: briefMetni(b) }).then(() => true).catch(() => false)) || gitti;
|
||||
if (gitti) r.gonderilen++;
|
||||
} catch (e) {
|
||||
r.hata++;
|
||||
console.warn('[brief]', u.email, e.message);
|
||||
}
|
||||
}
|
||||
return r;
|
||||
}
|
||||
export const haftalikBriefGonder = createBriefSender({
|
||||
store, buildBrief:briefOlustur, text:briefMetni, html:briefHtml,
|
||||
telegramConfigured, sendTelegram, emailConfigured, sendEmail,
|
||||
});
|
||||
|
||||
export function briefScheduleKey(now = new Date()) {
|
||||
const tr = new Date(now.getTime() + 3 * 3600000);
|
||||
|
||||
+2
-2
@@ -1537,8 +1537,8 @@ const server = http.createServer(async (req, res) => {
|
||||
if (url.pathname === '/api/admin/brief/gonder' && req.method === 'POST') {
|
||||
const user = userFromAuthHeader(req.headers['authorization']);
|
||||
if (!user?.isAdmin) return json(res, 403, { success: false, error: 'yetki yok' });
|
||||
const r = await haftalikBriefGonder(async () => (await tendersPayload()).tenders, { zorla: url.searchParams.get('zorla') === '1' });
|
||||
return json(res, 200, { success: true, ...r });
|
||||
const r = await haftalikBriefGonder(async () => (await tendersPayload()).tenders);
|
||||
return json(res, 200, { success: r.hata === 0, partial: r.hata > 0 && r.gonderilen > 0, ...r });
|
||||
}
|
||||
if ((url.pathname === '/api/ai/belge-sor' || url.pathname === '/api/ai/teklif-denetim' || url.pathname === '/api/ai/teklif-taslak') && req.method === 'POST') {
|
||||
const user = userFromAuthHeader(req.headers['authorization']);
|
||||
|
||||
Reference in New Issue
Block a user