mailery 0.18.0 → 0.19.1

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { R as RunnerContext, N as NormalizedEvent, C as ContactAdapter, a as Contact, A as AdapterFilter, b as AdapterSort, M as MailProvider, S as SendArgs, c as SendResult, d as MailTesterFeedback, e as Mailer, T as TemplateDoc, F as FlowStep, f as Collections, g as FlowDoc, h as SuppressionScope, D as DeliveryWindow, i as SegmentFilter, P as Predicate } from './null-BFipn5tF.cjs';
-export { j as AuditLogDoc, B as BotFilterConfig, k as BroadcastDoc, l as BroadcastOrder, m as BroadcastPauseReason, n as BroadcastStatus, o as CircuitBreakerThresholds, p as ContactTagDoc, E as EventDoc, q as FlowGoal, r as FlowRunDoc, s as FlowRunStatus, t as FlowVersionDoc, H as HealthDoc, u as HealthStatus, L as LeadDoc, v as MailerConfig, w as NullProvider, O as OutboxDoc, x as RESERVED_VAR_KEYS, y as RedisOptions, z as SegmentDefinition, G as SendDoc, I as SendStatus, J as SenderDomainConfig, K as SenderDomainRegistry, Q as SenderDomainValidation, U as SubscriptionDoc, V as SubscriptionStatus, W as SuppressionDoc, X as SuppressionReason, Y as TemplateKind, Z as TemplateVersionDoc, _ as VarsAdapter, $ as VarsResolveInfo, a0 as WebhookEventDoc, a1 as defineVars, a2 as ensureIndexes, a3 as getCollections, a4 as validateSenderDomain, a5 as varsJsonSchema } from './null-BFipn5tF.cjs';
+import { R as RunnerContext, N as NormalizedEvent, C as ContactAdapter, a as Contact, A as AdapterFilter, b as AdapterSort, M as MailProvider, S as SendArgs, c as SendResult, d as MailTesterFeedback, e as Mailer, T as TemplateDoc, F as FlowStep, f as Collections, g as FlowDoc, h as SuppressionScope, D as DeliveryWindow, i as SegmentFilter, P as Predicate } from './null-DxTHQSrJ.cjs';
+export { j as AuditLogDoc, B as BotFilterConfig, k as BroadcastDoc, l as BroadcastOrder, m as BroadcastPauseReason, n as BroadcastStatus, o as CircuitBreakerThresholds, p as ContactTagDoc, E as EventDoc, q as FlowGoal, r as FlowRunDoc, s as FlowRunStatus, t as FlowVersionDoc, H as HealthDoc, u as HealthStatus, L as LeadDoc, v as MailerConfig, w as NullProvider, O as OutboxDoc, x as RESERVED_VAR_KEYS, y as RedisOptions, z as SegmentDefinition, G as SendDoc, I as SendStatus, J as SenderDomainConfig, K as SenderDomainRegistry, Q as SenderDomainValidation, U as SubscriptionDoc, V as SubscriptionStatus, W as SuppressionDoc, X as SuppressionReason, Y as TemplateKind, Z as TemplateVersionDoc, _ as VarsAdapter, $ as VarsResolveInfo, a0 as WebhookEventDoc, a1 as defineVars, a2 as ensureIndexes, a3 as getCollections, a4 as validateSenderDomain, a5 as varsJsonSchema } from './null-DxTHQSrJ.cjs';
 import { ObjectId, Db, Filter } from 'mongodb';
 import { Request, Router } from 'express';
 import Handlebars from 'handlebars';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { R as RunnerContext, N as NormalizedEvent, C as ContactAdapter, a as Contact, A as AdapterFilter, b as AdapterSort, M as MailProvider, S as SendArgs, c as SendResult, d as MailTesterFeedback, e as Mailer, T as TemplateDoc, F as FlowStep, f as Collections, g as FlowDoc, h as SuppressionScope, D as DeliveryWindow, i as SegmentFilter, P as Predicate } from './null-BFipn5tF.js';
-export { j as AuditLogDoc, B as BotFilterConfig, k as BroadcastDoc, l as BroadcastOrder, m as BroadcastPauseReason, n as BroadcastStatus, o as CircuitBreakerThresholds, p as ContactTagDoc, E as EventDoc, q as FlowGoal, r as FlowRunDoc, s as FlowRunStatus, t as FlowVersionDoc, H as HealthDoc, u as HealthStatus, L as LeadDoc, v as MailerConfig, w as NullProvider, O as OutboxDoc, x as RESERVED_VAR_KEYS, y as RedisOptions, z as SegmentDefinition, G as SendDoc, I as SendStatus, J as SenderDomainConfig, K as SenderDomainRegistry, Q as SenderDomainValidation, U as SubscriptionDoc, V as SubscriptionStatus, W as SuppressionDoc, X as SuppressionReason, Y as TemplateKind, Z as TemplateVersionDoc, _ as VarsAdapter, $ as VarsResolveInfo, a0 as WebhookEventDoc, a1 as defineVars, a2 as ensureIndexes, a3 as getCollections, a4 as validateSenderDomain, a5 as varsJsonSchema } from './null-BFipn5tF.js';
+import { R as RunnerContext, N as NormalizedEvent, C as ContactAdapter, a as Contact, A as AdapterFilter, b as AdapterSort, M as MailProvider, S as SendArgs, c as SendResult, d as MailTesterFeedback, e as Mailer, T as TemplateDoc, F as FlowStep, f as Collections, g as FlowDoc, h as SuppressionScope, D as DeliveryWindow, i as SegmentFilter, P as Predicate } from './null-DxTHQSrJ.js';
+export { j as AuditLogDoc, B as BotFilterConfig, k as BroadcastDoc, l as BroadcastOrder, m as BroadcastPauseReason, n as BroadcastStatus, o as CircuitBreakerThresholds, p as ContactTagDoc, E as EventDoc, q as FlowGoal, r as FlowRunDoc, s as FlowRunStatus, t as FlowVersionDoc, H as HealthDoc, u as HealthStatus, L as LeadDoc, v as MailerConfig, w as NullProvider, O as OutboxDoc, x as RESERVED_VAR_KEYS, y as RedisOptions, z as SegmentDefinition, G as SendDoc, I as SendStatus, J as SenderDomainConfig, K as SenderDomainRegistry, Q as SenderDomainValidation, U as SubscriptionDoc, V as SubscriptionStatus, W as SuppressionDoc, X as SuppressionReason, Y as TemplateKind, Z as TemplateVersionDoc, _ as VarsAdapter, $ as VarsResolveInfo, a0 as WebhookEventDoc, a1 as defineVars, a2 as ensureIndexes, a3 as getCollections, a4 as validateSenderDomain, a5 as varsJsonSchema } from './null-DxTHQSrJ.js';
 import { ObjectId, Db, Filter } from 'mongodb';
 import { Request, Router } from 'express';
 import Handlebars from 'handlebars';

package/dist/index.js

@@ -1699,11 +1699,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;
@@ -1733,7 +1733,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() }
     },
@@ -1760,7 +1760,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()
           }
@@ -1768,13 +1768,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 },
@@ -1784,12 +1792,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(
@@ -1824,7 +1832,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 },
@@ -2786,6 +2794,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(
@@ -2982,6 +2994,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);
@@ -3877,8 +3893,8 @@ async function runDnsblChecks(ctx, opts = {}) {
   }
   let listedCount = 0;
   async function processPair(p) {
-    const queryName = buildQueryName(p.target, p.targetKind, p.list.host);
-    const lookup2 = queryName ? await queryDnsbl(resolver, queryName) : { result: "error", returnCodes: [], errorMessage: "unsupported target format" };
+    const queryName = buildQueryName(p.target, p.targetKind, spamhausQueryHost(p.list.host, cfg.spamhausDqsKey));
+    const lookup2 = queryName ? await queryDnsbl(resolver, queryName, p.list.host) : { result: "error", returnCodes: [], errorMessage: "unsupported target format" };
     if (lookup2.transient) return;
     if (lookup2.result === "listed") listedCount++;
     await ctx.collections.dnsblChecks.updateOne(
@@ -3924,6 +3940,10 @@ function collectTargets(ctx, cfg) {
     ips: (cfg.dedicatedIps ?? []).filter((ip) => net.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.isIP(target);
@@ -3935,10 +3955,10 @@ function buildQueryName(target, kind, listHost) {
   return `${domain}.${listHost}`;
 }
 var TRANSIENT_DNS_CODES = /* @__PURE__ */ new Set(["ESERVFAIL", "EREFUSED", "ETIMEOUT", "ETIMEDOUT", "ECONNRESET", "ECONNREFUSED"]);
-async function queryDnsbl(resolver, query) {
+async function queryDnsbl(resolver, query, listHost) {
   try {
     const records = await resolver.resolve4(query);
-    return interpretRecords(records);
+    return interpretRecords(records, listHost);
   } catch (err) {
     const code = err?.code;
     if (code === "ENOTFOUND" || code === "ENODATA") {
@@ -3959,16 +3979,29 @@ async function queryDnsbl(resolver, query) {
     };
   }
 }
-function interpretRecords(records) {
+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, listHost) {
   if (!records || records.length === 0) {
     return { result: "clean", returnCodes: [], errorMessage: null };
   }
+  if (listHost && REGISTRABLE_ONLY_LISTS.has(listHost) && records.every((r) => r === "127.0.0.1")) {
+    return {
+      result: "error",
+      returnCodes: records,
+      errorMessage: `${listHost} refused the query (127.0.0.1): queried through a public or shared DNS resolver, or over the free query limit. Use a private resolver`
+    };
+  }
   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."));
@@ -6418,7 +6451,7 @@ async function checkDnsbl(mailer) {
       label: "DNS block-list checks",
       severity: "warn",
       message: `all ${docs.length} checks errored`,
-      hint: "Lookups against block lists are failing \u2014 usually a DNS-resolution problem on the host running mailery, or a list rate-limiting your public resolver. Verify outbound DNS works."
+      hint: "Lookups against block lists are failing \u2014 usually a DNS-resolution problem on the host running mailery, or a list refusing your public resolver (Spamhaus answers 127.255.255.254; set dnsbl.spamhausDqsKey). Verify outbound DNS works."
     };
   }
   return {
@@ -9528,7 +9561,7 @@ function unitToMs2(value, unit) {
 }
 
 // src/server/api/agent.ts
-var VERSION = "0.18.0" ;
+var VERSION = "0.19.1" ;
 var broadcastCountSchema = z.object({
   recipientCap: z.number().int().positive().max(1e7).nullable().optional()
 });
@@ -11595,7 +11628,7 @@ var DEDUPE_POLICIES = [
 ];
 
 // src/server/index.ts
-var VERSION2 = "0.18.0" ;
+var VERSION2 = "0.19.1" ;
 
 export { DEDUPE_POLICIES, DEFAULT_BOT_UA_RE, FLOW_STEP_KINDS, FlowOperationError, MIN_AGENT_TOKEN_LENGTH, Mailer, MongoContactAdapter, NullProvider, PREDICATE_KINDS, RESERVED_VAR_KEYS, SEGMENT_FILTER_KINDS, SendGridProvider, TRACKING_SIG_LENGTH, VERSION2 as VERSION, applyTracking, applyWebhookEvent, armFlow, compileMailyTemplate, compileTemplate, computeDeliveryTime, createAdminApiRouter, createAdminRouter, createAgentRouter, createPublicRouter, defaultFlowStep, defaultPredicate, defaultSegmentFilter, defineVars, derivePlaintext, disarmFlow, dispatchSend, drainPendingUnsubscribes, ensureIndexes, gateFlow, getCollections, isCanaryGate, predicateKind, processNewlyFiredEventTriggers, processOneRunStep, referencedPaths, renderForContact, renderTemplate, runTick, sendgridInboundParser, sha256Hex, signTrackingToken, signUnsubscribeToken, simulateFlow, stampWatermarkIfNull, sweepStrandedFlowRuns, ungateFlow, validateSenderDomain, varsJsonSchema, verifyTemplate, verifyTrackingToken, verifyUnsubscribeToken };
 //# sourceMappingURL=index.js.map