Compare commits

..

No commits in common. "68d5e1a205421736eec8cb545bde6960babba5a5" and "371c5ec31c33a91646149f5d545c2c2e35e79870" have entirely different histories.

4 changed files with 61 additions and 1106 deletions

1
.gitignore vendored
View File

@ -29,4 +29,3 @@ prisma/dev.db
# opencode - agentes y scripts locales (no subir a producción) # opencode - agentes y scripts locales (no subir a producción)
opencode/ opencode/
.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 type { APIRoute } from "astro";
import { appendRegistrationToSheet } from "../lib/googleSheets"; import { appendRegistrationToSheet } from "../lib/googleSheets";
import { sendEmailCf } from "../lib/email"; import { sendEmail } from "../lib/email";
export const prerender = false; export const prerender = false;
const COLUMNS = [ const COLUMNS = [
@ -106,9 +106,10 @@ export const POST: APIRoute = async ({ request }) => {
const result = await appendRegistrationToSheet(row); const result = await appendRegistrationToSheet(row);
await sendEmailCf({ await sendEmail({
nombres: formData.nombre_completo, nombres: formData.nombre,
apellidos: formData.apellido, apellidos: formData.apellido,
locale: formData.locale,
}, formData.correo, "CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_POSTULACION"); }, formData.correo, "CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_POSTULACION");
return Response.json(result); 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"; type TypeEmailData = "CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_INFO" | "CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_POSTULACION";
@ -32,75 +32,74 @@ export async function sendEmail(data: object, to: string, type: TypeEmailData) {
} }
// ═══════════════════════════════════════════════════════════════ // ═══════════════════════════════════════════════════════════════
// Cloudflare (Email Sending) // CÓDIGO COMENTADO — Cloudflare (Email Workers)
// Usar sendEmailCf() en lugar de sendEmail() (n8n/Brevo) // Descomentar para volver a Cloudflare en lugar de n8n/Brevo
// ═══════════════════════════════════════════════════════════════ // ═══════════════════════════════════════════════════════════════
const TEMPLATE_URLS: Record<TypeEmailData, { subject: string; url: string }> = { // const TEMPLATE_URLS: Record<TypeEmailData, { subject: string; url: string }> = {
CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_POSTULACION: { // CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_POSTULACION: {
subject: "Confirmación de inscripción al voluntariado", // subject: "Confirmación de inscripción al voluntariado",
url: "https://pub-910ed90860804520b9202194cf43c0a6.r2.dev/centro_del_reino_paz_y_justicia_postulacion_user.html", // url: "https://pub-910ed90860804520b9202194cf43c0a6.r2.dev/centro_del_reino_paz_y_justicia_postulacion_user.html",
}, // },
CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_INFO: { // CENTRO_DEL_REINO_PAZ_Y_JUSTICIA_INFO: {
subject: "Notificación de contacto institucional", // subject: "Notificación de contacto institucional",
url: "https://pub-910ed90860804520b9202194cf43c0a6.r2.dev/centro_del_reino_paz_y_justicia_info.html", // 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> { // async function fetchTemplate(type: TypeEmailData): Promise<string> {
const cached = TEMPLATE_CACHE.get(type); // const cached = TEMPLATE_CACHE.get(type);
if (cached) return cached; // if (cached) return cached;
const { url } = TEMPLATE_URLS[type]; // const { url } = TEMPLATE_URLS[type];
const res = await fetch(url); // const res = await fetch(url);
if (!res.ok) { // if (!res.ok) {
throw new Error(`Error descargando template ${type}: HTTP ${res.status}`); // throw new Error(`Error descargando template ${type}: HTTP ${res.status}`);
} // }
const html = await res.text(); // const html = await res.text();
TEMPLATE_CACHE.set(type, html); // TEMPLATE_CACHE.set(type, html);
return html; // return html;
} // }
function renderTemplate(template: string, data: Record<string, string>): string { // function renderTemplate(template: string, data: Record<string, string>): string {
let html = template; // let html = template;
for (const [key, value] of Object.entries(data)) { // for (const [key, value] of Object.entries(data)) {
html = html.replaceAll(new RegExp(`\\{\\{${key}\\}\\}`, "g"), value ?? ""); // html = html.replaceAll(new RegExp(`\\{\\{${key}\\}\\}`, "g"), value ?? "");
} // }
return html; // return html;
} // }
function stripHtml(html: string): string { // function stripHtml(html: string): string {
return html.replace(/<[^>]*>/g, "").replace(/\s+/g, " ").trim(); // return html.replace(/<[^>]*>/g, "").replace(/\s+/g, " ").trim();
} // }
export async function sendEmailCf(data: Record<string, string>, to: string, type: TypeEmailData) { // export async function sendEmailCf(data: Record<string, string>, to: string, type: TypeEmailData) {
const apiToken = import.meta.env.CLOUDFLARE_API_TOKEN; // const apiToken = import.meta.env.CLOUDFLARE_API_TOKEN;
const accountId = import.meta.env.CLOUDFLARE_ACCOUNT_ID; // const accountId = import.meta.env.CLOUDFLARE_ACCOUNT_ID;
const client = new Cloudflare({ apiToken }); // const client = new Cloudflare({ apiToken });
const { subject } = TEMPLATE_URLS[type]; // const { subject } = TEMPLATE_URLS[type];
const rawHtml = await fetchTemplate(type); // const rawHtml = await fetchTemplate(type);
const html = renderTemplate(rawHtml, data); // const html = renderTemplate(rawHtml, data);
const text = stripHtml(html); // const text = stripHtml(html);
const response = await client.emailSending.send({ // const response = await client.emailSending.send({
account_id: accountId, // account_id: accountId,
from: "welcome@mail.centrodelreinodepazyjusticia.com", // from: "welcome@mail.centrodelreinodepazyjusticia.com",
to, // to,
subject, // subject,
html, // html,
text, // text,
}); // });
const deliveredOrQueued = [...response.delivered, ...response.queued]; // if (!response.delivered) {
if (!deliveredOrQueued.includes(to) || response.permanent_bounces.includes(to)) { // console.error("Cloudflare email not delivered", response);
console.error("Cloudflare email not delivered", response); // throw new Error("El correo no fue entregado");
throw new Error("El correo no fue entregado"); // }
} // }
}
// ═══════════════════════════════════════════════════════════════ // ═══════════════════════════════════════════════════════════════
// ALTERNATIVA: Brevo (SDK directo) // ALTERNATIVA: Brevo (SDK directo)