Merge pull request 'main' (#73) from main into staging
Deploy cdrdpyj / deploy (push) Successful in 41s Details

Reviewed-on: #73
This commit is contained in:
Esteban Paz 2026-08-02 16:21:01 +00:00
commit 68d5e1a205
4 changed files with 1106 additions and 61 deletions

1
.gitignore vendored
View File

@ -29,3 +29,4 @@ prisma/dev.db
# opencode - agentes y scripts locales (no subir a producción)
opencode/
.opencode/
docs/

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
import type { APIRoute } from "astro";
import { appendRegistrationToSheet } from "../lib/googleSheets";
import { sendEmail } from "../lib/email";
import { sendEmailCf } from "../lib/email";
export const prerender = false;
const COLUMNS = [
@ -106,10 +106,9 @@ export const POST: APIRoute = async ({ request }) => {
const result = await appendRegistrationToSheet(row);
await sendEmail({
nombres: formData.nombre,
await sendEmailCf({
nombres: formData.nombre_completo,
apellidos: formData.apellido,
locale: formData.locale,
}, formData.correo, "CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_POSTULACION");
return Response.json(result);

View File

@ -1,4 +1,4 @@
// import Cloudflare from "cloudflare";
import Cloudflare from "cloudflare";
type TypeEmailData = "CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_INFO" | "CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_POSTULACION";
@ -32,74 +32,75 @@ export async function sendEmail(data: object, to: string, type: TypeEmailData) {
}
// ═══════════════════════════════════════════════════════════════
// CÓDIGO COMENTADO — Cloudflare (Email Workers)
// Descomentar para volver a Cloudflare en lugar de n8n/Brevo
// Cloudflare (Email Sending)
// Usar sendEmailCf() en lugar de sendEmail() (n8n/Brevo)
// ═══════════════════════════════════════════════════════════════
// const TEMPLATE_URLS: Record<TypeEmailData, { subject: string; url: string }> = {
// CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_POSTULACION: {
// subject: "Confirmación de inscripción al voluntariado",
// url: "https://pub-910ed90860804520b9202194cf43c0a6.r2.dev/centro_del_reino_paz_y_justicia_postulacion_user.html",
// },
// CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_INFO: {
// subject: "Notificación de contacto institucional",
// url: "https://pub-910ed90860804520b9202194cf43c0a6.r2.dev/centro_del_reino_paz_y_justicia_info.html",
// },
// };
const TEMPLATE_URLS: Record<TypeEmailData, { subject: string; url: string }> = {
CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_POSTULACION: {
subject: "Confirmación de inscripción al voluntariado",
url: "https://pub-910ed90860804520b9202194cf43c0a6.r2.dev/centro_del_reino_paz_y_justicia_postulacion_user.html",
},
CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_INFO: {
subject: "Notificación de contacto institucional",
url: "https://pub-910ed90860804520b9202194cf43c0a6.r2.dev/centro_del_reino_paz_y_justicia_info.html",
},
};
// const TEMPLATE_CACHE = new Map<string, string>();
const TEMPLATE_CACHE = new Map<string, string>();
// async function fetchTemplate(type: TypeEmailData): Promise<string> {
// const cached = TEMPLATE_CACHE.get(type);
// if (cached) return cached;
async function fetchTemplate(type: TypeEmailData): Promise<string> {
const cached = TEMPLATE_CACHE.get(type);
if (cached) return cached;
// const { url } = TEMPLATE_URLS[type];
// const res = await fetch(url);
// if (!res.ok) {
// throw new Error(`Error descargando template ${type}: HTTP ${res.status}`);
// }
const { url } = TEMPLATE_URLS[type];
const res = await fetch(url);
if (!res.ok) {
throw new Error(`Error descargando template ${type}: HTTP ${res.status}`);
}
// const html = await res.text();
// TEMPLATE_CACHE.set(type, html);
// return html;
// }
const html = await res.text();
TEMPLATE_CACHE.set(type, html);
return html;
}
// function renderTemplate(template: string, data: Record<string, string>): string {
// let html = template;
// for (const [key, value] of Object.entries(data)) {
// html = html.replaceAll(new RegExp(`\\{\\{${key}\\}\\}`, "g"), value ?? "");
// }
// return html;
// }
function renderTemplate(template: string, data: Record<string, string>): string {
let html = template;
for (const [key, value] of Object.entries(data)) {
html = html.replaceAll(new RegExp(`\\{\\{${key}\\}\\}`, "g"), value ?? "");
}
return html;
}
// function stripHtml(html: string): string {
// return html.replace(/<[^>]*>/g, "").replace(/\s+/g, " ").trim();
// }
function stripHtml(html: string): string {
return html.replace(/<[^>]*>/g, "").replace(/\s+/g, " ").trim();
}
// export async function sendEmailCf(data: Record<string, string>, to: string, type: TypeEmailData) {
// const apiToken = import.meta.env.CLOUDFLARE_API_TOKEN;
// const accountId = import.meta.env.CLOUDFLARE_ACCOUNT_ID;
export async function sendEmailCf(data: Record<string, string>, to: string, type: TypeEmailData) {
const apiToken = import.meta.env.CLOUDFLARE_API_TOKEN;
const accountId = import.meta.env.CLOUDFLARE_ACCOUNT_ID;
// const client = new Cloudflare({ apiToken });
// const { subject } = TEMPLATE_URLS[type];
// const rawHtml = await fetchTemplate(type);
// const html = renderTemplate(rawHtml, data);
// const text = stripHtml(html);
const client = new Cloudflare({ apiToken });
const { subject } = TEMPLATE_URLS[type];
const rawHtml = await fetchTemplate(type);
const html = renderTemplate(rawHtml, data);
const text = stripHtml(html);
// const response = await client.emailSending.send({
// account_id: accountId,
// from: "welcome@mail.centrodelreinodepazyjusticia.com",
// to,
// subject,
// html,
// text,
// });
const response = await client.emailSending.send({
account_id: accountId,
from: "welcome@mail.centrodelreinodepazyjusticia.com",
to,
subject,
html,
text,
});
// if (!response.delivered) {
// console.error("Cloudflare email not delivered", response);
// throw new Error("El correo no fue entregado");
// }
// }
const deliveredOrQueued = [...response.delivered, ...response.queued];
if (!deliveredOrQueued.includes(to) || response.permanent_bounces.includes(to)) {
console.error("Cloudflare email not delivered", response);
throw new Error("El correo no fue entregado");
}
}
// ═══════════════════════════════════════════════════════════════
// ALTERNATIVA: Brevo (SDK directo)