b

Dockerfile

@@ -11,7 +11,6 @@ COPY . .
 
 ENV PORT=7860
 ENV DATA_DIR=/data
-ENV SMTP_PROXY=http://nginx:2587
 EXPOSE 7860
 
 VOLUME ["/data"]

nginx-smtp.conf

@@ -1,8 +0,0 @@
-stream {
-    server {
-        listen 2587;
-        proxy_pass smtp-relay.brevo.com:587;
-        proxy_connect_timeout 30s;
-        proxy_timeout 60s;
-    }
-}

server.js

@@ -4,7 +4,6 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import express from "express";
 import { firefox } from "playwright";
-import nodemailer from "nodemailer";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -27,6 +26,7 @@ const SECRETS = [
   "SMTP_PASS",
   "FROM_EMAIL",
   "TO_EMAIL",
+  "BREVO_API_KEY",
 ];
 
 app.get("/hello", (req, res) => {
@@ -68,14 +68,6 @@ function fetchSecret(key) {
   });
 }
 
-async function getSmtpConfig() {
-  const [host, port, user, pass, from, to] = await Promise.all(
-    SECRETS.map(fetchSecret),
-  );
-
-  return { host, port: Number(port), user, pass, from, to };
-}
-
 function readState() {
   try {
     return JSON.parse(fs.readFileSync(STATE_FILE, "utf8"));
@@ -88,38 +80,61 @@ function writeState(state) {
   fs.writeFileSync(STATE_FILE, JSON.stringify(state, null, 2));
 }
 
-const SMTP_PROXY = process.env.SMTP_PROXY || "";
+async function sendEmailViaApi(subject, body) {
+  log("Fetching email config...");
+  const [from, to, apiKey] = await Promise.all([
+    fetchSecret("FROM_EMAIL"),
+    fetchSecret("TO_EMAIL"),
+    fetchSecret("BREVO_API_KEY"),
+  ]);
+  log(`Sending via Brevo API (from=${from}, to=${to})`);
+
+  const payload = JSON.stringify({
+    sender: { email: from },
+    to: [{ email: to }],
+    subject,
+    textContent: body,
+  });
+
+  return new Promise((resolve, reject) => {
+    const req = https.request(
+      {
+        hostname: "api.brevo.com",
+        port: 443,
+        path: "/v3/smtp/email",
+        method: "POST",
+        headers: {
+          "api-key": apiKey,
+          "Content-Type": "application/json",
+          "Content-Length": Buffer.byteLength(payload),
+        },
+      },
+      (res) => {
+        let data = "";
+        res.on("data", (c) => (data += c));
+        res.on("end", () => {
+          if (res.statusCode === 201 || res.statusCode === 200) {
+            log("Email sent via Brevo API");
+            resolve();
+          } else {
+            reject(new Error(`Brevo API ${res.statusCode}: ${data}`));
+          }
+        });
+      },
+    );
+    req.on("error", reject);
+    req.write(payload);
+    req.end();
+  });
+}
 
 async function sendEmail(subject, body) {
-  log("Fetching SMTP config...");
-  const cfg = await getSmtpConfig();
-  log(`SMTP config loaded (host=${cfg.host}, port=${cfg.port}, from=${cfg.from}, to=${cfg.to})`);
-
-  const opts = {
-    host: cfg.host,
-    port: cfg.port,
-    secure: cfg.port === 465,
-    auth: { user: cfg.user, pass: cfg.pass },
-    connectionTimeout: 30000,
-    greetingTimeout: 30000,
-    socketTimeout: 60000,
-  };
-  if (SMTP_PROXY) {
-    opts.proxy = SMTP_PROXY;
-    log(`Using SMTP proxy: ${SMTP_PROXY}`);
+  try {
+    await sendEmailViaApi(subject, body);
+  } catch (error) {
+    err(`Failed to send email: ${error.message}`);
+    throw error;
   }
-
-  const transporter = nodemailer.createTransport(opts);
-
-  log("Sending email...");
-  const result = await transporter.sendMail({
-    from: cfg.from,
-    to: cfg.to,
-    subject,
-    text: body,
-  });
-  log(`Email sent (messageId=${result.messageId})`);
-  return result;
 }
 
 function valuesChanged(oldVals, newVals) {

test-email.mjs

@@ -1,36 +1,52 @@
-import https from "node:https";
-
 const API_BASE = "https://maxxcarl-keyvault.hf.space/secrets";
 const API_KEY = "Azure@123";
-const SECRETS = ["SMTP_HOST","SMTP_PORT","SMTP_USER","SMTP_PASS","FROM_EMAIL","TO_EMAIL"];
 
-function fetchSecret(key) {
+const { request } = await import("node:https");
+
+function fetchSecret(k) {
   return new Promise((resolve, reject) => {
-    https.get(`${API_BASE}/${key}`, { headers: { "X-API-Key": API_KEY } }, res => {
-      let data = "";
-      res.on("data", c => data += c);
-      res.on("end", () => resolve(JSON.parse(data).value));
-    }).on("error", reject);
+    const url = `${API_BASE}/${k}`;
+    request(url, { headers: { "X-API-Key": API_KEY, accept: "application/json" } }, (res) => {
+      let d = "";
+      res.on("data", (c) => d += c);
+      res.on("end", () => resolve(JSON.parse(d).value));
+    }).on("error", reject).end();
   });
 }
 
-const [host, port, user, pass, from, to] = await Promise.all(SECRETS.map(fetchSecret));
-
-const { createTransport } = await import("nodemailer");
-const t = createTransport({
-  host, port: Number(port), secure: false,
-  auth: { user, pass },
-  connectionTimeout: 15000, greetingTimeout: 15000,
-});
+const [from, to, apiKey] = await Promise.all([
+  fetchSecret("FROM_EMAIL"),
+  fetchSecret("TO_EMAIL"),
+  fetchSecret("BREVO_API_KEY"),
+]);
 
-await t.verify();
-console.log("SMTP connection OK, sending...");
+console.log(`from=${from} to=${to} apiKey=${apiKey.substring(0, 10)}...`);
 
-await t.sendMail({
-  from, to,
-  subject: "Test from local machine",
-  text: `If you see this, SMTP works!\n\nhost=${host} port=${port} user=${user}`,
+const payload = JSON.stringify({
+  sender: { email: from },
+  to: [{ email: to }],
+  subject: "API Test",
+  textContent: "Sent via Brevo REST API",
 });
 
-console.log("Email sent!");
-process.exit(0);
+const req = request({
+  hostname: "api.brevo.com",
+  port: 443,
+  path: "/v3/smtp/email",
+  method: "POST",
+  headers: {
+    "api-key": apiKey,
+    "Content-Type": "application/json",
+    "Content-Length": Buffer.byteLength(payload),
+  },
+}, (res) => {
+  let d = "";
+  res.on("data", (c) => d += c);
+  res.on("end", () => {
+    console.log(res.statusCode, d.substring(0, 200));
+    process.exit(res.statusCode === 201 || res.statusCode === 200 ? 0 : 1);
+  });
+});
+req.on("error", (e) => { console.error(e.message); process.exit(1); });
+req.write(payload);
+req.end();