mailery 0.19.0 → 0.20.0

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-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 { 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-B3N6bTpc.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 ContactAdapterFactory, q as ContactTagDoc, E as EventDoc, r as FlowGoal, s as FlowRunDoc, t as FlowRunStatus, u as FlowVersionDoc, H as HealthDoc, v as HealthStatus, L as LeadDoc, w as MailerConfig, x as MailerMongoConnection, y as NullProvider, O as OutboxDoc, z as RESERVED_VAR_KEYS, G as RedisOptions, I as SegmentDefinition, J as SendDoc, K as SendStatus, Q as SenderDomainConfig, U as SenderDomainRegistry, V as SenderDomainValidation, W as SubscriptionDoc, X as SubscriptionStatus, Y as SuppressionDoc, Z as SuppressionReason, _ as TemplateKind, $ as TemplateVersionDoc, a0 as VarsAdapter, a1 as VarsResolveInfo, a2 as WebhookEventDoc, a3 as defineVars, a4 as ensureIndexes, a5 as getCollections, a6 as validateSenderDomain, a7 as varsJsonSchema } from './null-B3N6bTpc.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-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 { 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-B3N6bTpc.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 ContactAdapterFactory, q as ContactTagDoc, E as EventDoc, r as FlowGoal, s as FlowRunDoc, t as FlowRunStatus, u as FlowVersionDoc, H as HealthDoc, v as HealthStatus, L as LeadDoc, w as MailerConfig, x as MailerMongoConnection, y as NullProvider, O as OutboxDoc, z as RESERVED_VAR_KEYS, G as RedisOptions, I as SegmentDefinition, J as SendDoc, K as SendStatus, Q as SenderDomainConfig, U as SenderDomainRegistry, V as SenderDomainValidation, W as SubscriptionDoc, X as SubscriptionStatus, Y as SuppressionDoc, Z as SuppressionReason, _ as TemplateKind, $ as TemplateVersionDoc, a0 as VarsAdapter, a1 as VarsResolveInfo, a2 as WebhookEventDoc, a3 as defineVars, a4 as ensureIndexes, a5 as getCollections, a6 as validateSenderDomain, a7 as varsJsonSchema } from './null-B3N6bTpc.js';
 import { ObjectId, Db, Filter } from 'mongodb';
 import { Request, Router } from 'express';
 import Handlebars from 'handlebars';

package/dist/index.js

@@ -2482,7 +2482,7 @@ function derivePlaintext(html) {
 var PLAIN_TEXT = { noEscape: true };
 async function renderTemplate(template, ctx, opts = {}) {
   const hb = makeHandlebars(opts.helpers);
-  const subject = hb.compile(template.subject)(ctx);
+  const subject = hb.compile(template.subject, PLAIN_TEXT)(ctx).replace(/[\r\n]+/g, " ");
   const preheader = hb.compile(template.preheader)(ctx);
   let html;
   if (template.body.html) {
@@ -3894,7 +3894,7 @@ async function runDnsblChecks(ctx, opts = {}) {
   let listedCount = 0;
   async function processPair(p) {
     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" };
+    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(
@@ -3955,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") {
@@ -3984,10 +3984,17 @@ var REFUSAL_REASONS = {
   "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) {
+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"))];
@@ -5123,6 +5130,7 @@ async function processScheduledBroadcasts2(ctx) {
 }
 
 // src/server/mailer.ts
+var STORAGE_REQUIRED = "Mailer.init: give exactly one of `db` (an open Db) or `mongo` (a connection mailery opens)";
 var Mailer = class _Mailer {
   db;
   collections;
@@ -5132,6 +5140,8 @@ var Mailer = class _Mailer {
   config;
   events;
   queueDriver;
+  /** The client `Mailer.init` opened from `config.mongo`; closed by `stop()`. Null when the host gave `db`. */
+  ownedClient;
   workersStarted = false;
   runnerContext;
   constructor(args) {
@@ -5141,6 +5151,7 @@ var Mailer = class _Mailer {
     this.adapter = args.adapter;
     this.providers = args.providers;
     this.queueDriver = args.queueDriver;
+    this.ownedClient = args.ownedClient;
     this.queues = args.queueDriver.queues;
     this.events = args.events;
     this.runnerContext = {
@@ -5237,36 +5248,58 @@ var Mailer = class _Mailer {
     });
   }
   static async init(input) {
-    const config = resolveConfig(input);
-    if (!resolveProvider(config.providers, config.defaultProvider)) {
+    if (input.db == null === (input.mongo == null)) throw new Error(STORAGE_REQUIRED);
+    if (!resolveProvider(input.providers, input.defaultProvider)) {
       throw new Error(
-        `defaultProvider "${config.defaultProvider}" is not a registered provider. Registered: ${registeredProviderNames(config.providers).join(", ") || "(none)"}`
+        `defaultProvider "${input.defaultProvider}" is not a registered provider. Registered: ${registeredProviderNames(input.providers).join(", ") || "(none)"}`
       );
     }
-    if (config.defaultTransactionalProvider != null && !resolveProvider(config.providers, config.defaultTransactionalProvider)) {
+    if (input.defaultTransactionalProvider != null && !resolveProvider(input.providers, input.defaultTransactionalProvider)) {
       throw new Error(
-        `defaultTransactionalProvider "${config.defaultTransactionalProvider}" is not a registered provider. Registered: ${registeredProviderNames(config.providers).join(", ") || "(none)"}`
+        `defaultTransactionalProvider "${input.defaultTransactionalProvider}" is not a registered provider. Registered: ${registeredProviderNames(input.providers).join(", ") || "(none)"}`
       );
     }
-    if (config.varsAdapter) {
+    if (input.varsAdapter) {
       const { assertNoReservedVarKeys: assertNoReservedVarKeys2 } = await Promise.resolve().then(() => (init_vars(), vars_exports));
-      assertNoReservedVarKeys2(config.varsAdapter);
-    }
-    const collections = getCollections(config.db, config.collectionPrefix);
-    await ensureIndexes(config.db, config.collectionPrefix);
-    const queueDriver = await createQueueDriver(config.queue, config.db);
-    if (!config.workerless && config.queue.driver !== "noop") {
-      await queueDriver.scheduleRepeatingTick(config.tickIntervalSeconds);
-    }
-    return new _Mailer({
-      config,
-      db: config.db,
-      collections,
-      adapter: config.adapter,
-      providers: config.providers,
-      queueDriver,
-      events: new EventRegistry()
-    });
+      assertNoReservedVarKeys2(input.varsAdapter);
+    }
+    let ownedClient = null;
+    let db;
+    if (input.mongo) {
+      const { MongoClient } = await import('mongodb');
+      ownedClient = await MongoClient.connect(input.mongo.uri, input.mongo.clientOptions);
+      db = ownedClient.db(input.mongo.dbName);
+    } else if (input.db) {
+      db = input.db;
+    } else {
+      throw new Error(STORAGE_REQUIRED);
+    }
+    try {
+      const config = resolveConfig({
+        ...input,
+        db,
+        adapter: typeof input.adapter === "function" ? input.adapter(db) : input.adapter
+      });
+      const collections = getCollections(config.db, config.collectionPrefix);
+      await ensureIndexes(config.db, config.collectionPrefix);
+      const queueDriver = await createQueueDriver(config.queue, config.db);
+      if (!config.workerless && config.queue.driver !== "noop") {
+        await queueDriver.scheduleRepeatingTick(config.tickIntervalSeconds);
+      }
+      return new _Mailer({
+        config,
+        db: config.db,
+        collections,
+        adapter: config.adapter,
+        providers: config.providers,
+        queueDriver,
+        events: new EventRegistry(),
+        ownedClient
+      });
+    } catch (err) {
+      await ownedClient?.close();
+      throw err;
+    }
   }
   // -------------------------------------------------------------------------
   // Event registration + firing
@@ -5739,6 +5772,8 @@ var Mailer = class _Mailer {
   async stop() {
     await this.queueDriver.close();
     this.workersStarted = false;
+    await this.ownedClient?.close();
+    this.ownedClient = null;
   }
   /** Used internally by the admin router and tests; not part of the public API. */
   getRunnerContext() {
@@ -9554,7 +9589,7 @@ function unitToMs2(value, unit) {
 }
 
 // src/server/api/agent.ts
-var VERSION = "0.19.0" ;
+var VERSION = "0.20.0" ;
 var broadcastCountSchema = z.object({
   recipientCap: z.number().int().positive().max(1e7).nullable().optional()
 });
@@ -11621,7 +11656,7 @@ var DEDUPE_POLICIES = [
 ];
 
 // src/server/index.ts
-var VERSION2 = "0.19.0" ;
+var VERSION2 = "0.20.0" ;
 
 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