mailery 0.18.0 → 0.19.0

package/dist/{null-BFipn5tF.d.cts → null-DxTHQSrJ.d.cts}

@@ -623,6 +623,15 @@ interface DnsblConfig {
     dedicatedIps?: string[];
     /** Hours between automatic runs. Default 24. Set to 0 to disable scheduled runs. */
     intervalHours?: number;
+    /**
+     * Spamhaus Data Query Service key (free at spamhaus.com for low volume).
+     * Spamhaus refuses queries that arrive through public or shared resolvers —
+     * Google, Cloudflare, and cloud VPC resolvers such as AWS's — answering
+     * 127.255.255.254 instead of a verdict. With a key, every `*.spamhaus.org`
+     * list is queried as `<key>.<zone>.dq.spamhaus.net`, which answers from
+     * anywhere. Rows and the UI keep the public list name; the key is never stored.
+     */
+    spamhausDqsKey?: string;
 }
 interface MailTesterConfig {
     /** API key from your Mail-Tester paid plan. */
@@ -944,7 +953,7 @@ interface MailerConfig {
     getAdminActor?: (req: any) => string;
     onCircuitBreakerTrip?: (info: {
         reason: string;
-        rates: Record<string, number>;
+        rates: Record<string, number | null>;
     }) => Promise<void> | void;
     onSendFailure?: (info: {
         send: any;
@@ -1424,11 +1433,15 @@ interface HealthDoc {
         complained: number;
         failedToSend: number;
     };
+    /**
+     * Bounce/complaint rates are per send in the window; failureRate is failed
+     * attempts over all attempts. Null when the window has no denominator yet.
+     */
     rates: {
-        bounceRate: number;
-        hardBounceRate: number;
-        complaintRate: number;
-        failureRate: number;
+        bounceRate: number | null;
+        hardBounceRate: number | null;
+        complaintRate: number | null;
+        failureRate: number | null;
     };
     status: HealthStatus;
     trippedAt: Date | null;

package/dist/{null-BFipn5tF.d.ts → null-DxTHQSrJ.d.ts}

@@ -623,6 +623,15 @@ interface DnsblConfig {
     dedicatedIps?: string[];
     /** Hours between automatic runs. Default 24. Set to 0 to disable scheduled runs. */
     intervalHours?: number;
+    /**
+     * Spamhaus Data Query Service key (free at spamhaus.com for low volume).
+     * Spamhaus refuses queries that arrive through public or shared resolvers —
+     * Google, Cloudflare, and cloud VPC resolvers such as AWS's — answering
+     * 127.255.255.254 instead of a verdict. With a key, every `*.spamhaus.org`
+     * list is queried as `<key>.<zone>.dq.spamhaus.net`, which answers from
+     * anywhere. Rows and the UI keep the public list name; the key is never stored.
+     */
+    spamhausDqsKey?: string;
 }
 interface MailTesterConfig {
     /** API key from your Mail-Tester paid plan. */
@@ -944,7 +953,7 @@ interface MailerConfig {
     getAdminActor?: (req: any) => string;
     onCircuitBreakerTrip?: (info: {
         reason: string;
-        rates: Record<string, number>;
+        rates: Record<string, number | null>;
     }) => Promise<void> | void;
     onSendFailure?: (info: {
         send: any;
@@ -1424,11 +1433,15 @@ interface HealthDoc {
         complained: number;
         failedToSend: number;
     };
+    /**
+     * Bounce/complaint rates are per send in the window; failureRate is failed
+     * attempts over all attempts. Null when the window has no denominator yet.
+     */
     rates: {
-        bounceRate: number;
-        hardBounceRate: number;
-        complaintRate: number;
-        failureRate: number;
+        bounceRate: number | null;
+        hardBounceRate: number | null;
+        complaintRate: number | null;
+        failureRate: number | null;
     };
     status: HealthStatus;
     trippedAt: Date | null;

package/dist/testing.cjs

@@ -15416,11 +15416,11 @@ var ZERO_COUNTERS = {
   complained: 0,
   failedToSend: 0
 };
-var ZERO_RATES = {
-  bounceRate: 0,
-  hardBounceRate: 0,
-  complaintRate: 0,
-  failureRate: 0
+var EMPTY_RATES = {
+  bounceRate: null,
+  hardBounceRate: null,
+  complaintRate: null,
+  failureRate: null
 };
 async function recordHealthCounter(ctx, counter2, dims, by = 1) {
   const windowMs = ctx.config.circuitBreaker.windowMinutes * 60 * 1e3;
@@ -15450,7 +15450,7 @@ async function upsertCounter(ctx, _id, senderDomain, kind, counter2, by, windowM
         trippedAt: null,
         trippedReason: null,
         manuallyResumedAt: null,
-        rates: { ...ZERO_RATES }
+        rates: { ...EMPTY_RATES }
       },
       $set: { updatedAt: /* @__PURE__ */ new Date() }
     },
@@ -15477,7 +15477,7 @@ async function evaluateHealth(ctx) {
             windowStartedAt: /* @__PURE__ */ new Date(),
             windowDurationMs: windowMs,
             counters: { ...ZERO_COUNTERS },
-            rates: { ...ZERO_RATES },
+            rates: { ...EMPTY_RATES },
             status: "healthy",
             updatedAt: /* @__PURE__ */ new Date()
           }
@@ -15485,13 +15485,21 @@ async function evaluateHealth(ctx) {
       );
       continue;
     }
-    const c = doc.counters;
-    const total = c.sent || 1;
+    const c = { ...ZERO_COUNTERS, ...doc.counters };
+    const perSent = (n) => c.sent > 0 ? n / c.sent : null;
+    const attempts = c.sent + c.failedToSend;
     const rates = {
-      bounceRate: c.bounced / total,
-      hardBounceRate: c.hardBounced / total,
-      complaintRate: c.complained / total,
-      failureRate: c.failedToSend / total
+      bounceRate: perSent(c.bounced),
+      hardBounceRate: perSent(c.hardBounced),
+      complaintRate: perSent(c.complained),
+      // Failed attempts over all attempts, so it stays within 0–100%.
+      failureRate: attempts > 0 ? c.failedToSend / attempts : null
+    };
+    const pct2 = {
+      bounce: (rates.bounceRate ?? 0) * 100,
+      hardBounce: (rates.hardBounceRate ?? 0) * 100,
+      complaint: (rates.complaintRate ?? 0) * 100,
+      failure: (rates.failureRate ?? 0) * 100
     };
     await ctx.collections.health.updateOne(
       { _id: doc._id },
@@ -15501,12 +15509,12 @@ async function evaluateHealth(ctx) {
     if (c.sent < cb.minSendsBeforeEval) continue;
     if (doc.status === "tripped") continue;
     let trippedReason = null;
-    if (rates.hardBounceRate * 100 >= cb.hardBounceRatePctTrip) {
-      trippedReason = `hard bounce rate ${(rates.hardBounceRate * 100).toFixed(2)}% >= ${cb.hardBounceRatePctTrip}%`;
-    } else if (rates.complaintRate * 100 >= cb.complaintRatePctTrip) {
-      trippedReason = `complaint rate ${(rates.complaintRate * 100).toFixed(2)}% >= ${cb.complaintRatePctTrip}%`;
-    } else if (rates.bounceRate * 100 >= cb.combinedBounceRatePctTrip) {
-      trippedReason = `combined bounce rate ${(rates.bounceRate * 100).toFixed(2)}% >= ${cb.combinedBounceRatePctTrip}%`;
+    if (pct2.hardBounce >= cb.hardBounceRatePctTrip) {
+      trippedReason = `hard bounce rate ${pct2.hardBounce.toFixed(2)}% >= ${cb.hardBounceRatePctTrip}%`;
+    } else if (pct2.complaint >= cb.complaintRatePctTrip) {
+      trippedReason = `complaint rate ${pct2.complaint.toFixed(2)}% >= ${cb.complaintRatePctTrip}%`;
+    } else if (pct2.bounce >= cb.combinedBounceRatePctTrip) {
+      trippedReason = `combined bounce rate ${pct2.bounce.toFixed(2)}% >= ${cb.combinedBounceRatePctTrip}%`;
     }
     if (trippedReason) {
       const result = await ctx.collections.health.updateOne(
@@ -15541,7 +15549,7 @@ async function evaluateHealth(ctx) {
       }
       continue;
     }
-    if (rates.failureRate * 100 >= cb.failedToSendRatePctDegrade) {
+    if (pct2.failure >= cb.failedToSendRatePctDegrade) {
       if (doc.status !== "degraded") {
         await ctx.collections.health.updateOne(
           { _id: doc._id },
@@ -16444,6 +16452,10 @@ async function dispatchSend(sendId, ctx) {
     await markFailed(send._id, "contact_missing", ctx);
     return;
   }
+  if (!send.emailAtSend?.trim() || !contact.email?.trim()) {
+    await markFailed(send._id, "no_recipient: the contact has no email address", ctx);
+    return;
+  }
   const run = send.flowRunId ? await ctx.collections.flowRuns.findOne({ _id: send.flowRunId }) : null;
   if (run && run.status === "exited" && run.exitReason?.startsWith("aborted_by_host")) {
     await ctx.collections.sends.updateOne(
@@ -16640,6 +16652,10 @@ async function processOneRunStep(runId, ctx) {
     await exitFlowRun(run, "contact_missing", ctx);
     return;
   }
+  if (!contact.email?.trim()) {
+    await exitFlowRun(run, "contact_no_email", ctx);
+    return;
+  }
   const sub = await ctx.collections.subscriptions.findOne({ externalId: run.externalId });
   if (sub && sub.status !== "subscribed") {
     await exitFlowRun(run, sub.status, ctx);
@@ -17508,7 +17524,7 @@ async function runDnsblChecks(ctx, opts = {}) {
   }
   let listedCount = 0;
   async function processPair(p) {
-    const queryName = buildQueryName(p.target, p.targetKind, p.list.host);
+    const queryName = buildQueryName(p.target, p.targetKind, spamhausQueryHost(p.list.host, cfg.spamhausDqsKey));
     const lookup2 = queryName ? await queryDnsbl(resolver, queryName) : { result: "error", returnCodes: [], errorMessage: "unsupported target format" };
     if (lookup2.transient) return;
     if (lookup2.result === "listed") listedCount++;
@@ -17555,6 +17571,10 @@ function collectTargets(ctx, cfg) {
     ips: (cfg.dedicatedIps ?? []).filter((ip) => net__default.default.isIP(ip) !== 0)
   };
 }
+function spamhausQueryHost(listHost, dqsKey) {
+  const zone = dqsKey ? /^([a-z0-9-]+)\.spamhaus\.org$/i.exec(listHost)?.[1] : void 0;
+  return zone ? `${dqsKey}.${zone}.dq.spamhaus.net` : listHost;
+}
 function buildQueryName(target, kind, listHost) {
   if (kind === "ip") {
     const v = net__default.default.isIP(target);
@@ -17590,16 +17610,22 @@ async function queryDnsbl(resolver, query) {
     };
   }
 }
+var REFUSAL_REASONS = {
+  "127.255.255.252": "malformed query name for this list",
+  "127.255.255.254": "queried through a public or shared DNS resolver, which Spamhaus blocks. Set dnsbl.spamhausDqsKey (free Spamhaus DQS key) or use a private resolver",
+  "127.255.255.255": "this resolver has exceeded the free query limit"
+};
 function interpretRecords(records) {
   if (!records || records.length === 0) {
     return { result: "clean", returnCodes: [], errorMessage: null };
   }
   const errorish = records.filter((r) => r.startsWith("127.255.255."));
   if (errorish.length === records.length) {
+    const reasons = [...new Set(records.map((r) => REFUSAL_REASONS[r] ?? "unrecognised refusal code"))];
     return {
       result: "error",
       returnCodes: records,
-      errorMessage: `list returned reserved code(s): ${records.join(", ")}`
+      errorMessage: `not a listing \u2014 the list refused the query (${records.join(", ")}): ${reasons.join("; ")}`
     };
   }
   const listed = records.filter((r) => r.startsWith("127.") && !r.startsWith("127.255.255."));