@odla-ai/chapter 0.59.1 → 0.60.0

package/dist/worker/index.d.cts

@@ -122,7 +122,7 @@ interface ChapterCopy {
         availability: TextFields<"loading" | "loadFailed" | "saved" | "title" | "days" | "startHour" | "endHour" | "slotMinutes" | "minNoticeHours" | "windowDays" | "timezone" | "summaryTemplate" | "save"> & {
             dayLabels: readonly string[];
         };
-        email: TextFields<"loading" | "loadFailed" | "saved" | "sent" | "testFailed" | "delivery" | "notificationAddress" | "replyTo" | "fromName" | "fromNameHint" | "debugInbox" | "debugInboxHint" | "sendTest" | "enabled" | "subject" | "body" | "save" | "sendLog" | "sentColumn" | "templateColumn" | "statusColumn" | "toColumn" | "failed" | "redirected" | "delivered">;
+        email: TextFields<"loading" | "loadFailed" | "saved" | "sent" | "testFailed" | "delivery" | "notificationAddress" | "replyTo" | "fromName" | "fromNameHint" | "spamRisk" | "debugInbox" | "debugInboxHint" | "sendTest" | "enabled" | "subject" | "body" | "save" | "sendLog" | "sentColumn" | "templateColumn" | "statusColumn" | "toColumn" | "failed" | "redirected" | "delivered">;
         meetings: TextFields<"loading" | "loadFailed" | "cancelConfirm" | "newStartPrompt" | "parseFailed" | "agenda" | "empty" | "unknown" | "drift" | "meet" | "reschedule" | "cancel">;
         admission: TextFields<"title" | "description" | "email" | "decision" | "expires" | "note" | "waive" | "require" | "add" | "ledger" | "loading" | "consumed" | "revoked" | "expired" | "active" | "local" | "parent" | "revoke">;
         network: AdminNetworkCopy;

package/dist/worker/index.d.ts

@@ -122,7 +122,7 @@ interface ChapterCopy {
         availability: TextFields<"loading" | "loadFailed" | "saved" | "title" | "days" | "startHour" | "endHour" | "slotMinutes" | "minNoticeHours" | "windowDays" | "timezone" | "summaryTemplate" | "save"> & {
             dayLabels: readonly string[];
         };
-        email: TextFields<"loading" | "loadFailed" | "saved" | "sent" | "testFailed" | "delivery" | "notificationAddress" | "replyTo" | "fromName" | "fromNameHint" | "debugInbox" | "debugInboxHint" | "sendTest" | "enabled" | "subject" | "body" | "save" | "sendLog" | "sentColumn" | "templateColumn" | "statusColumn" | "toColumn" | "failed" | "redirected" | "delivered">;
+        email: TextFields<"loading" | "loadFailed" | "saved" | "sent" | "testFailed" | "delivery" | "notificationAddress" | "replyTo" | "fromName" | "fromNameHint" | "spamRisk" | "debugInbox" | "debugInboxHint" | "sendTest" | "enabled" | "subject" | "body" | "save" | "sendLog" | "sentColumn" | "templateColumn" | "statusColumn" | "toColumn" | "failed" | "redirected" | "delivered">;
         meetings: TextFields<"loading" | "loadFailed" | "cancelConfirm" | "newStartPrompt" | "parseFailed" | "agenda" | "empty" | "unknown" | "drift" | "meet" | "reschedule" | "cancel">;
         admission: TextFields<"title" | "description" | "email" | "decision" | "expires" | "note" | "waive" | "require" | "add" | "ledger" | "loading" | "consumed" | "revoked" | "expired" | "active" | "local" | "parent" | "revoke">;
         network: AdminNetworkCopy;

package/dist/worker/index.js

@@ -1719,6 +1719,47 @@ function planDelivery(input) {
   return { deliver: true, transport, to, subject, text: text10, redirected: redirect };
 }
 
+// src/email-html.ts
+var URL_RE = /https?:\/\/[^\s<>"')\]]+[^\s<>"').,;:!?\]]/g;
+function escapeHtml(s) {
+  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
+function lineHtml(line) {
+  let out = "", last = 0;
+  for (const match of line.matchAll(URL_RE)) {
+    out += escapeHtml(line.slice(last, match.index));
+    const url = escapeHtml(match[0]);
+    out += `<a href="${url}">${url}</a>`;
+    last = match.index + match[0].length;
+  }
+  return out + escapeHtml(line.slice(last));
+}
+function textToHtml(text10) {
+  const paragraphs = text10.replace(/\r\n/g, "\n").trim().split(/\n{2,}/).filter((paragraph) => paragraph.trim());
+  const body = paragraphs.map((paragraph) => `<p>${paragraph.split("\n").map(lineHtml).join("<br>\n")}</p>`).join("\n");
+  return `<!doctype html>
+<html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width"></head>
+<body style="margin:0;padding:24px 16px;background:#ffffff;color:#1a1a1a;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Helvetica,Arial,sans-serif;font-size:16px;line-height:1.5">
+${body}
+</body></html>`;
+}
+
+// src/email-deliverability.ts
+var ADMINISTRATOR_AUDIENCE = /^(?:administrator|admin|team|operator|owner|staff)s?$/i;
+function isRecipientFacing(event2) {
+  return !event2 || !ADMINISTRATOR_AUDIENCE.test(event2.audience.trim());
+}
+function listUnsubscribeHeader(replyTo) {
+  const address = replyTo.trim();
+  if (!/^[^\s@,;<>?]+@[^\s@,;<>?]+\.[^\s@,;<>?]+$/.test(address)) return void 0;
+  return `<mailto:${address}?subject=${encodeURIComponent("unsubscribe")}>`;
+}
+function deliverabilityHeaders(input) {
+  if (!isRecipientFacing(input.event)) return void 0;
+  const value = listUnsubscribeHeader(input.replyTo);
+  return value ? { "List-Unsubscribe": value } : void 0;
+}
+
 // src/notify.ts
 import { validateEmailCopy as validateEmailCopy2 } from "@odla-ai/crm";
 
@@ -1990,11 +2031,16 @@ async function sendTemplated(deps, input) {
   if (decision.transport === "log-only") return { sent: true };
   let messageId;
   try {
+    const text10 = String(row2.body);
+    const html = deps.renderHtml === false ? void 0 : (deps.renderHtml ?? textToHtml)(text10);
+    const headers = deliverabilityHeaders({ event: event2, replyTo: input.group.replyTo });
     const response = await deps.sender.send({
       from: fromAddress(deps.from, input.group.fromName),
       to: [decision.to],
       subject: String(row2.subject),
-      text: String(row2.body),
+      text: text10,
+      ...html ? { html } : {},
+      ...headers ? { headers } : {},
       replyTo: input.group.replyTo
     });
     if (!response || typeof response.messageId !== "string" || !response.messageId) throw new Error("missing delivery receipt");
@@ -12463,6 +12509,84 @@ import { getConfig, saveConfig, validateEmailCopy as validateEmailCopy4 } from "
 
 // src/email-readiness.ts
 import { isEmailTierName as isEmailTierName2, validateEmailCopy as validateEmailCopy3 } from "@odla-ai/crm";
+
+// src/email-spam-signals.ts
+var TRIGGER_PHRASES = [
+  "act now",
+  "click here",
+  "limited time",
+  "guaranteed",
+  "risk-free",
+  "risk free",
+  "no obligation",
+  "100% free",
+  "winner",
+  "congratulations",
+  "urgent",
+  "double your",
+  "earn money",
+  "make money",
+  "cash bonus",
+  "once in a lifetime",
+  "exclusive deal",
+  "order now",
+  "buy now",
+  "this is not spam",
+  "dear friend",
+  "dear customer"
+];
+var SUBJECT_TRIGGERS = ["free", ...TRIGGER_PHRASES];
+var DEV_HOSTS = /(?:^|\.)(?:workers\.dev|pages\.dev|localhost|ngrok(?:-free)?\.app|trycloudflare\.com)$/i;
+var SHORTENERS = /^(?:bit\.ly|tinyurl\.com|t\.co|goo\.gl|ow\.ly|is\.gd|buff\.ly|rebrand\.ly|cutt\.ly|tiny\.cc|shorturl\.at|rb\.gy)$/i;
+var URL_RE2 = /https?:\/\/[^\s<>"')\]]+/g;
+var strip = (s) => s.replace(/\{\{\w+\}\}/g, " ");
+var words = (s) => strip(s).split(/\s+/).filter(Boolean);
+var phraseIn = (phrases, haystack) => phrases.find((phrase) => new RegExp(`(?:^|[^a-z0-9])${phrase.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(?![a-z0-9])`, "i").test(haystack));
+function emailSpamSignals(copy) {
+  const subject = typeof copy.subject === "string" ? copy.subject : "";
+  const text10 = typeof copy.text === "string" ? copy.text : "";
+  const out = [];
+  const letters = strip(subject).replace(/[^A-Za-z]/g, "");
+  const shouting = letters.length >= 6 && letters.replace(/[^A-Z]/g, "").length / letters.length > 0.5 || words(subject).some((word) => /^[A-Z]{4,}$/.test(word.replace(/[^A-Za-z]/g, "")));
+  if (shouting) out.push({ code: "subject-caps", message: "The subject shouts in capital letters. Filters read that as a spam signal; use sentence case." });
+  if (/[!?]{2,}|!\s*$/.test(subject)) out.push({ code: "subject-punctuation", message: "Repeated or trailing exclamation marks in the subject are a classic spam signal." });
+  if (/^\s*(?:re|fw|fwd)\s*:/i.test(subject)) out.push({ code: "subject-fake-reply", message: "A subject that starts like a reply or forward reads as a spoof when the recipient never wrote first." });
+  const subjectHit = phraseIn(SUBJECT_TRIGGERS, strip(subject));
+  if (subjectHit) out.push({ code: "subject-trigger-words", message: `The subject uses "${subjectHit}", a word filters weight against the sender.` });
+  const bodyHit = phraseIn(TRIGGER_PHRASES, strip(text10));
+  if (bodyHit) out.push({ code: "body-trigger-words", message: `The body uses "${bodyHit}", a phrase filters weight against the sender.` });
+  if (/(?:^|\s)[A-Z]{3,}(?:\s+[A-Z]{3,}){2,}(?=\s|$)/.test(strip(text10))) out.push({ code: "body-caps", message: "The body shouts a run of capitalised words; use sentence case." });
+  if (/!{2,}/.test(text10)) out.push({ code: "body-punctuation", message: "Repeated exclamation marks in the body are a classic spam signal." });
+  const urls = [...text10.matchAll(URL_RE2)].map((match) => match[0]);
+  const hosts = urls.map((url) => {
+    try {
+      return new URL(url).hostname;
+    } catch {
+      return "";
+    }
+  });
+  if (urls.some((url) => /^http:\/\//i.test(url))) out.push({ code: "link-insecure", message: "A link uses http:// instead of https://. Filters flag insecure links." });
+  if (hosts.some((host) => DEV_HOSTS.test(host) || /^\d+\.\d+\.\d+\.\d+$/.test(host))) out.push({ code: "link-origin", message: "A link points at a development host (workers.dev, pages.dev, localhost or a raw IP). Link to the site's own domain." });
+  if (hosts.some((host) => SHORTENERS.test(host))) out.push({ code: "link-shortener", message: "A link uses a URL shortener, which hides the destination and is heavily abused. Link to the real address." });
+  if (new Set(urls).size > 5) out.push({ code: "link-many", message: "The body has more than five links. Keep lifecycle mail to the one or two the reader needs." });
+  if (urls.length && words(text10).length < 20) out.push({ code: "body-link-only", message: "The body is little more than a link. Say what the reader is being sent and why before the address." });
+  return out;
+}
+function emailSenderWarnings(input) {
+  const out = [];
+  const from = (input.fromEmail ?? "").trim().toLowerCase().replace(/^.*<([^>]+)>.*$/, "$1");
+  const reply = (input.replyTo ?? "").trim().toLowerCase();
+  const domain = (address) => address.split("@")[1] ?? "";
+  if (/^(?:no-?reply|do-?not-?reply|donotreply)(?:[+.-][^@]*)?@/.test(from)) {
+    out.push({ code: "sender-no-reply", message: "Mail is sent from a no-reply address. Gmail's sender guidelines advise against it; send from a monitored address so replies and unsubscribe requests reach someone." });
+  }
+  if (domain(from) && domain(reply) && domain(from) !== domain(reply)) {
+    out.push({ code: "reply-to-domain", message: `Replies go to ${domain(reply)} while mail is sent from ${domain(from)}. A Reply-To on another domain is a mild spam signal; prefer an address on the sending domain.` });
+  }
+  return out;
+}
+
+// src/email-readiness.ts
 function validateEmailReadiness(input) {
   const issues = [];
   for (const key3 of Object.keys(input.templates)) if (!input.events[key3]) {
@@ -12487,9 +12611,15 @@ ${template.text ?? ""}`.matchAll(/\{\{(\w+)\}\}/g)].map((match) => match[1]);
     }
     if (event2.requiresTier && input.tiersUnavailable) problems.push({ code: "tiers-unavailable", message: "Tier names are unavailable; delivery checks will block unresolved memberships." });
     else if (event2.requiresTier && noTierNames) problems.push({ code: "tiers-missing", message: "Configure the membership tier names needed by this event." });
-    return { ...event2, key: key3, status: template?.enabled === false ? "disabled" : problems.length ? "blocked" : "ready", issues: problems };
+    return {
+      ...event2,
+      key: key3,
+      status: template?.enabled === false ? "disabled" : problems.length ? "blocked" : "ready",
+      issues: problems,
+      warnings: template ? emailSpamSignals(template) : []
+    };
   });
-  return { checkedAt: input.now ?? Date.now(), events, issues };
+  return { checkedAt: input.now ?? Date.now(), events, issues, warnings: emailSenderWarnings(input.sender ?? {}) };
 }
 
 // src/email-admin-config.ts
@@ -12515,7 +12645,14 @@ async function emailSettings(db, ctx, env) {
     }
   }
   const groupValues = Object.fromEntries(["refundPolicyText", "commitmentText", "normsText"].map((key3) => [key3, str2(group?.[key3])]));
-  const validation = validateEmailReadiness({ events, templates: stored, groupValues, tiers: hub ? void 0 : tiers, tiersUnavailable });
+  const validation = validateEmailReadiness({
+    events,
+    templates: stored,
+    groupValues,
+    tiers: hub ? void 0 : tiers,
+    tiersUnavailable,
+    sender: { fromEmail: env.EMAIL_FROM ?? null, replyTo: str2(group?.replyTo) }
+  });
   return { group, events, data: {
     groupId: ctx.chapter.id,
     name: ctx.chapter.name,
@@ -12569,7 +12706,8 @@ async function updateEmailSettings(db, ctx, env, body) {
       { t: "update", ns: "groups", id: id7, attrs: { commitmentText, normsText, notificationEmail, replyTo, debugEmail, fromName } }
     ]);
   }
-  return json({ ok: true });
+  const warnings = Object.fromEntries(Object.entries(clean).map(([key3, template]) => [key3, emailSpamSignals(template)]).filter(([, found]) => found.length));
+  return json({ ok: true, warnings });
 }
 
 // src/worker-routes-admin-comms.ts