mailery 0.11.0 → 0.12.1

package/dist/index.cjs

@@ -1069,6 +1069,9 @@ var QUEUE_NAMES2 = {
   send: "mailer-send",
   webhook: "mailer-webhook"
 };
+var DEFAULT_COLLECTION = "_mailerJobs";
+var DEFAULT_FAILED_RETENTION_DAYS = 7;
+var FAILED_SWEEP_INTERVAL_MS = 60 * 60 * 1e3;
 var AgendaDriver = class _AgendaDriver {
   queues;
   agenda;
@@ -1086,7 +1089,7 @@ var AgendaDriver = class _AgendaDriver {
         "mailery: queue driver 'agenda' requires the 'agenda' and '@agendajs/mongo-backend' peer dependencies. Run `npm install agenda @agendajs/mongo-backend bottleneck`."
       );
     }
-    const collectionName = opts.collectionName ?? "_mailerJobs";
+    const collectionName = opts.collectionName ?? collectionFor(opts.prefix);
     const backend = new backendMod.MongoBackend({
       mongo: opts.db,
       collection: collectionName
@@ -1096,17 +1099,29 @@ var AgendaDriver = class _AgendaDriver {
       processEvery: `${opts.processEverySeconds ?? 5} seconds`,
       defaultLockLifetime: (opts.lockLifetimeSeconds ?? 10 * 60) * 1e3,
       maxConcurrency: 50,
-      defaultConcurrency: 5
+      defaultConcurrency: 5,
+      // Drop succeeded one-shot jobs instead of retaining them forever.
+      // Agenda guards this on `!nextRunAt`, so repeating jobs survive.
+      removeOnComplete: true
     });
-    return new _AgendaDriver(agenda, agendaMod, opts.db, collectionName);
+    const retentionDays = opts.failedJobRetentionDays ?? DEFAULT_FAILED_RETENTION_DAYS;
+    try {
+      await opts.db.collection(collectionName).createIndex({ failedAt: 1 }, { sparse: true });
+    } catch (err) {
+      console.error("mailery: could not index the Agenda jobs collection on failedAt", err);
+    }
+    return new _AgendaDriver(agenda, agendaMod, opts.db, collectionName, retentionDays);
   }
   db;
   collName;
-  constructor(agenda, agendaMod, db, collectionName) {
+  failedRetentionDays;
+  sweepTimer = null;
+  constructor(agenda, agendaMod, db, collectionName, failedRetentionDays) {
     this.agenda = agenda;
     this.agendaMod = agendaMod;
     this.db = db;
     this.collName = collectionName;
+    this.failedRetentionDays = failedRetentionDays;
     this.queues = {
       tick: this.makeQueueAPI(QUEUE_NAMES2.tick),
       advance: this.makeQueueAPI(QUEUE_NAMES2.advance),
@@ -1187,9 +1202,45 @@ var AgendaDriver = class _AgendaDriver {
     if (!this.started) {
       await this.agenda.start();
       this.started = true;
+      this.startFailedJobSweep();
+    }
+  }
+  /**
+   * Agenda's auto-remove only fires on success, so failed documents would
+   * otherwise be retained forever. Runs once on worker start, then hourly.
+   */
+  startFailedJobSweep() {
+    if (this.failedRetentionDays <= 0 || this.sweepTimer) return;
+    void this.sweepFailedJobs();
+    this.sweepTimer = setInterval(() => void this.sweepFailedJobs(), FAILED_SWEEP_INTERVAL_MS);
+    this.sweepTimer.unref?.();
+  }
+  /** Delete failed, fully-retired job documents older than the retention window. */
+  async sweepFailedJobs() {
+    const cutoff = new Date(Date.now() - this.failedRetentionDays * 24 * 3600 * 1e3);
+    try {
+      const res = await this.jobsCollection().deleteMany({
+        failedAt: { $lt: cutoff },
+        // Never touch the repeating tick.
+        repeatInterval: { $in: [null, void 0] },
+        // Leave anything still scheduled for a retry, and anything a worker
+        // currently holds a lock on.
+        $and: [
+          { $or: [{ nextRunAt: null }, { nextRunAt: { $exists: false } }, { nextRunAt: { $lt: cutoff } }] },
+          { $or: [{ lockedAt: null }, { lockedAt: { $exists: false } }, { lockedAt: { $lt: cutoff } }] }
+        ]
+      });
+      return res.deletedCount ?? 0;
+    } catch (err) {
+      console.error("mailery: failed-job sweep failed", err);
+      return 0;
     }
   }
   async stopWorkers() {
+    if (this.sweepTimer) {
+      clearInterval(this.sweepTimer);
+      this.sweepTimer = null;
+    }
     if (!this.started) return;
     await this.agenda.stop();
     this.started = false;
@@ -1203,6 +1254,15 @@ var AgendaDriver = class _AgendaDriver {
     await this.stopWorkers();
   }
 };
+function collectionFor(prefix) {
+  if (!prefix) return DEFAULT_COLLECTION;
+  if (!/^[A-Za-z0-9_-]+$/.test(prefix)) {
+    throw new Error(
+      `mailery: queue prefix "${prefix}" must contain only letters, digits, '_' or '-' \u2014 it becomes part of a MongoDB collection name.`
+    );
+  }
+  return `${DEFAULT_COLLECTION}_${prefix}`;
+}
 
 // src/server/queues/noop.ts
 function noopQueueAPI() {
@@ -1239,7 +1299,9 @@ async function createQueueDriver(config, fallbackDb) {
         db: config.db ?? fallbackDb,
         processEverySeconds: config.processEverySeconds,
         lockLifetimeSeconds: config.lockLifetimeSeconds,
-        collectionName: config.collectionName
+        collectionName: config.collectionName,
+        prefix: config.prefix,
+        failedJobRetentionDays: config.failedJobRetentionDays
       });
     case "noop":
       return new NoopDriver();
@@ -3995,7 +4057,8 @@ var Mailer = class _Mailer {
    *   MAILER_MONGODB_URI                — Mongo connection string (required)
    *   MAILER_MONGODB_DB                 — database name (optional; defaults to the URI default)
    *   MAILER_REDIS_URL                  — Redis connection URL (required)
-   *   MAILER_QUEUE_PREFIX               — Redis key prefix to namespace this instance (optional)
+   *   MAILER_QUEUE_PREFIX               — namespaces this instance (optional). Bull: Redis key
+   *                                       prefix. Agenda: jobs collection suffix.
    *   MAILER_PUBLIC_URL                 — base for tracking/unsub URLs (required)
    *   MAILER_UNSUBSCRIBE_SECRET         — HMAC key (required)
    *   MAILER_SENDER_ADDRESS             — postal address for CAN-SPAM (optional)
@@ -4044,7 +4107,7 @@ var Mailer = class _Mailer {
     }
     const defaultProvider = env.MAILER_DEFAULT_PROVIDER ?? Object.keys(providers)[0];
     const driverEnv = env.MAILER_QUEUE_DRIVER ?? "bull";
-    const queue = driverEnv === "agenda" ? { driver: "agenda" } : driverEnv === "noop" ? { driver: "noop" } : {
+    const queue = driverEnv === "agenda" ? { driver: "agenda", prefix: env.MAILER_QUEUE_PREFIX } : driverEnv === "noop" ? { driver: "noop" } : {
       driver: "bull",
       redis: { url: required("MAILER_REDIS_URL") },
       prefix: env.MAILER_QUEUE_PREFIX
@@ -4709,6 +4772,40 @@ ${input.plainText}`);
       });
     }
   }
+  const offDomain = findOffDomainLinkHosts(input.html, input.fromEmail);
+  if (offDomain.majority && offDomain.hosts.length > 0) {
+    issues.push({
+      rule: "offdomain_links",
+      severity: "warning",
+      message: `Most links point away from the From domain: ${offDomain.hosts.join(", ")}.`,
+      hint: "Link domains that match the sending domain build reputation. Route links through your own domain (or a tracking subdomain of it) where you can."
+    });
+  }
+  const insecure = findInsecureLinkHosts(input.html);
+  if (insecure.length > 0) {
+    issues.push({
+      rule: "insecure_link",
+      severity: "warning",
+      message: `Link uses plain http://: ${insecure.join(", ")}.`,
+      hint: "Mixed-content links get rewritten or warned about by some clients, and http:// correlates with stale spam templates. Use https://."
+    });
+  }
+  if (countImagesMissingAlt(input.html) > 0) {
+    issues.push({
+      rule: "image_missing_alt",
+      severity: "warning",
+      message: "One or more images have no alt text.",
+      hint: "Most clients block images by default on first open. Alt text is what the recipient actually sees, and screen readers need it."
+    });
+  }
+  if (hasImageOnlyLink(input.html)) {
+    issues.push({
+      rule: "image_only_link",
+      severity: "warning",
+      message: "A link wraps an image with no accompanying text.",
+      hint: "With images blocked, an image-only call-to-action is invisible and unclickable. Add a text label inside the link."
+    });
+  }
   const linkCount = countMatches(input.html, /<a\s[^>]*\bhref\s*=/gi);
   if (linkCount > 10) {
     issues.push({
@@ -4763,6 +4860,63 @@ function hasBareUrlInVisibleText(html) {
   const stripped = html.replace(/<a\b[^>]*>.*?<\/a>/gis, " ").replace(/<style\b[^>]*>.*?<\/style>/gis, " ").replace(/<script\b[^>]*>.*?<\/script>/gis, " ").replace(/<head\b[^>]*>.*?<\/head>/gis, " ");
   return /https?:\/\/[^\s<>"']+/i.test(stripped);
 }
+function findOffDomainLinkHosts(html, fromEmail) {
+  const fromDomain = fromEmail.split("@")[1]?.toLowerCase();
+  if (!fromDomain) return { hosts: [], majority: false };
+  const hosts = /* @__PURE__ */ new Set();
+  let total = 0;
+  let off = 0;
+  for (const href of extractHrefs(html)) {
+    if (href.includes("{{")) continue;
+    const host = hostnameOf(href);
+    if (!host) continue;
+    total++;
+    if (sameSite(host, fromDomain)) continue;
+    off++;
+    hosts.add(host);
+  }
+  return { hosts: Array.from(hosts), majority: total > 0 && off * 2 > total };
+}
+function sameSite(a, b) {
+  if (a === b) return true;
+  if (a.endsWith(`.${b}`) || b.endsWith(`.${a}`)) return true;
+  return lastLabels(a) === lastLabels(b);
+}
+function lastLabels(host) {
+  return host.split(".").slice(-2).join(".");
+}
+function findInsecureLinkHosts(html) {
+  const hits = /* @__PURE__ */ new Set();
+  for (const href of extractHrefs(html)) {
+    if (!/^http:\/\//i.test(href)) continue;
+    const host = hostnameOf(href);
+    if (host) hits.add(host);
+  }
+  return Array.from(hits);
+}
+function countImagesMissingAlt(html) {
+  let missing = 0;
+  const re = /<img\b[^>]*>/gi;
+  let m;
+  while (m = re.exec(html)) {
+    const tag = m[0];
+    const alt = /\balt\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))/i.exec(tag);
+    const value = alt ? alt[1] ?? alt[2] ?? alt[3] ?? "" : "";
+    if (value.trim().length === 0) missing++;
+  }
+  return missing;
+}
+function hasImageOnlyLink(html) {
+  const re = /<a\b[^>]*>(.*?)<\/a>/gis;
+  let m;
+  while (m = re.exec(html)) {
+    const inner = m[1];
+    if (!/<img\b/i.test(inner)) continue;
+    const text = inner.replace(/<[^>]*>/g, "").replace(/&nbsp;/gi, " ").trim();
+    if (text.length === 0) return true;
+  }
+  return false;
+}
 function findSpamSignals(text) {
   const out = /* @__PURE__ */ new Set();
   for (const { pattern, phrase } of SPAM_PHRASES) {
@@ -7626,7 +7780,7 @@ var DEDUPE_POLICIES = [
 ];
 
 // src/server/index.ts
-var VERSION = "0.11.0" ;
+var VERSION = "0.12.1" ;
 
 exports.DEDUPE_POLICIES = DEDUPE_POLICIES;
 exports.FLOW_STEP_KINDS = FLOW_STEP_KINDS;