mailery 0.19.0 → 0.20.0

package/dist/testing.d.cts

@@ -1,6 +1,6 @@
 import { Db } from 'mongodb';
-import { C as ContactAdapter, a as Contact, A as AdapterFilter, b as AdapterSort, M as MailProvider, S as SendArgs, c as SendResult, N as NormalizedEvent, F as FlowStep, a6 as FlowTrigger, q as FlowGoal, Y as TemplateKind, T as TemplateDoc, g as FlowDoc, D as DeliveryWindow, R as RunnerContext, e as Mailer, a7 as QueueDriverConfig } from './null-DxTHQSrJ.cjs';
-export { w as NullProvider } from './null-DxTHQSrJ.cjs';
+import { C as ContactAdapter, a as Contact, A as AdapterFilter, b as AdapterSort, M as MailProvider, S as SendArgs, c as SendResult, N as NormalizedEvent, F as FlowStep, a8 as FlowTrigger, r as FlowGoal, _ as TemplateKind, T as TemplateDoc, g as FlowDoc, D as DeliveryWindow, R as RunnerContext, e as Mailer, a9 as QueueDriverConfig } from './null-B3N6bTpc.cjs';
+export { y as NullProvider } from './null-B3N6bTpc.cjs';
 import 'zod';
 import 'handlebars';
 import 'ioredis';
@@ -257,7 +257,7 @@ interface TestMailerOptions {
     /** Call `mailer.startWorkers()` after init. Requires a non-noop `queue`. */
     startWorkers?: boolean;
     /** Override Mailer config (excluding required fields the harness fills in). */
-    config?: Partial<Omit<Parameters<typeof Mailer.init>[0], 'db' | 'adapter' | 'queue' | 'providers' | 'defaultProvider'>>;
+    config?: Partial<Omit<Parameters<typeof Mailer.init>[0], 'db' | 'mongo' | 'adapter' | 'queue' | 'providers' | 'defaultProvider'>>;
 }
 interface SeedContactOptions {
     /** Also create a `subscribed` subscription row. Default true. */

package/dist/testing.d.ts

@@ -1,6 +1,6 @@
 import { Db } from 'mongodb';
-import { C as ContactAdapter, a as Contact, A as AdapterFilter, b as AdapterSort, M as MailProvider, S as SendArgs, c as SendResult, N as NormalizedEvent, F as FlowStep, a6 as FlowTrigger, q as FlowGoal, Y as TemplateKind, T as TemplateDoc, g as FlowDoc, D as DeliveryWindow, R as RunnerContext, e as Mailer, a7 as QueueDriverConfig } from './null-DxTHQSrJ.js';
-export { w as NullProvider } from './null-DxTHQSrJ.js';
+import { C as ContactAdapter, a as Contact, A as AdapterFilter, b as AdapterSort, M as MailProvider, S as SendArgs, c as SendResult, N as NormalizedEvent, F as FlowStep, a8 as FlowTrigger, r as FlowGoal, _ as TemplateKind, T as TemplateDoc, g as FlowDoc, D as DeliveryWindow, R as RunnerContext, e as Mailer, a9 as QueueDriverConfig } from './null-B3N6bTpc.js';
+export { y as NullProvider } from './null-B3N6bTpc.js';
 import 'zod';
 import 'handlebars';
 import 'ioredis';
@@ -257,7 +257,7 @@ interface TestMailerOptions {
     /** Call `mailer.startWorkers()` after init. Requires a non-noop `queue`. */
     startWorkers?: boolean;
     /** Override Mailer config (excluding required fields the harness fills in). */
-    config?: Partial<Omit<Parameters<typeof Mailer.init>[0], 'db' | 'adapter' | 'queue' | 'providers' | 'defaultProvider'>>;
+    config?: Partial<Omit<Parameters<typeof Mailer.init>[0], 'db' | 'mongo' | 'adapter' | 'queue' | 'providers' | 'defaultProvider'>>;
 }
 interface SeedContactOptions {
     /** Also create a `subscribed` subscription row. Default true. */

package/dist/testing.js

@@ -16125,7 +16125,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) {
@@ -17510,7 +17510,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(
@@ -17571,10 +17571,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") {
@@ -17600,10 +17600,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"))];
@@ -18457,6 +18464,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;
@@ -18466,6 +18474,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) {
@@ -18475,6 +18485,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 = {
@@ -18571,36 +18582,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: MongoClient2 } = await import('mongodb');
+      ownedClient = await MongoClient2.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
@@ -19073,6 +19106,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() {