mailery 0.16.6 → 0.16.7

package/dist/testing.d.cts

@@ -1,6 +1,6 @@
 import { Db } from 'mongodb';
-import { C as ContactAdapter, a as Contact, A as AdapterFilter, M as MailProvider, S as SendArgs, b as SendResult, N as NormalizedEvent, F as FlowStep, a3 as FlowTrigger, n as FlowGoal, V as TemplateKind, T as TemplateDoc, f as FlowDoc, D as DeliveryWindow, R as RunnerContext, d as Mailer, a4 as QueueDriverConfig } from './null-CDlseQxO.cjs';
-export { t as NullProvider } from './null-CDlseQxO.cjs';
+import { C as ContactAdapter, a as Contact, A as AdapterFilter, M as MailProvider, S as SendArgs, b as SendResult, N as NormalizedEvent, F as FlowStep, a3 as FlowTrigger, n as FlowGoal, V as TemplateKind, T as TemplateDoc, f as FlowDoc, D as DeliveryWindow, R as RunnerContext, d as Mailer, a4 as QueueDriverConfig } from './null-oKPS74Gr.cjs';
+export { t as NullProvider } from './null-oKPS74Gr.cjs';
 import 'zod';
 import 'handlebars';
 import 'ioredis';

package/dist/testing.d.ts

@@ -1,6 +1,6 @@
 import { Db } from 'mongodb';
-import { C as ContactAdapter, a as Contact, A as AdapterFilter, M as MailProvider, S as SendArgs, b as SendResult, N as NormalizedEvent, F as FlowStep, a3 as FlowTrigger, n as FlowGoal, V as TemplateKind, T as TemplateDoc, f as FlowDoc, D as DeliveryWindow, R as RunnerContext, d as Mailer, a4 as QueueDriverConfig } from './null-CDlseQxO.js';
-export { t as NullProvider } from './null-CDlseQxO.js';
+import { C as ContactAdapter, a as Contact, A as AdapterFilter, M as MailProvider, S as SendArgs, b as SendResult, N as NormalizedEvent, F as FlowStep, a3 as FlowTrigger, n as FlowGoal, V as TemplateKind, T as TemplateDoc, f as FlowDoc, D as DeliveryWindow, R as RunnerContext, d as Mailer, a4 as QueueDriverConfig } from './null-oKPS74Gr.js';
+export { t as NullProvider } from './null-oKPS74Gr.js';
 import 'zod';
 import 'handlebars';
 import 'ioredis';

package/dist/testing.js

@@ -14276,6 +14276,15 @@ var unsubscribeInputSchema = z.object({
   source: z.string().max(256).default("manual"),
   notes: z.string().max(1024).optional()
 });
+var resubscribeInputSchema = z.object({
+  externalId: externalIdSchema,
+  /** `marketing` clears marketing + all-scope opt-outs; `all` clears every scope. */
+  scope: z.enum(["marketing", "all"]).default("marketing"),
+  source: z.string().min(1).max(256),
+  consentTimestamp: z.date().optional(),
+  consentIp: z.string().optional(),
+  consentUserAgent: z.string().optional()
+});
 var suppressInputSchema = z.object({
   email: emailSchema,
   scope: unsubscribeScopeSchema,
@@ -14773,6 +14782,15 @@ function signDoiToken(payload, secret) {
 }
 
 // src/server/unsubscribe.ts
+async function clearUnsubscribeSuppressions(collections, email, scope) {
+  const scopes = scope === "all" ? ["all", "marketing", "transactional"] : ["marketing", "all"];
+  const result = await collections.suppressions.deleteMany({
+    email,
+    reason: "unsubscribed",
+    scope: { $in: scopes }
+  });
+  return result.deletedCount ?? 0;
+}
 async function applyUnsubscribe(collections, input, now = /* @__PURE__ */ new Date()) {
   const normalized = input.email;
   await collections.suppressions.updateOne(
@@ -18146,6 +18164,38 @@ var Mailer = class _Mailer {
       }
     }
   }
+  /**
+   * An explicit opt-in from a contact who unsubscribed before.
+   *
+   * `upsertSubscription` alone is not enough: an unsubscribe also writes a
+   * `mailer_suppressions` row, and the suppression check runs at enqueue
+   * time regardless of subscription status — so a contact re-subscribed
+   * through `upsertSubscription` reads as subscribed while every send comes
+   * back `suppressed`. This clears the opt-out rows (only those: a bounce or
+   * complaint is not the contact's to reverse), then upserts the subscription
+   * through the normal path, double opt-in included.
+   *
+   * Deliberately a separate method rather than a side effect of
+   * `upsertSubscription`, so a backfill or a model hook that re-upserts every
+   * account cannot silently resurrect addresses that opted out.
+   */
+  async resubscribe(input) {
+    const parsed = resubscribeInputSchema.parse(input);
+    const contact = await this.adapter.getById(parsed.externalId);
+    if (!contact) throw new Error(`adapter has no contact for externalId ${parsed.externalId}`);
+    const removedSuppressions = await clearUnsubscribeSuppressions(this.collections, contact.email, parsed.scope);
+    const { scope: _scope, ...subscription } = parsed;
+    await this.upsertSubscription(subscription);
+    if (removedSuppressions > 0) {
+      await this.audit({
+        actor: `host:${parsed.source}`,
+        action: "contact.resubscribe",
+        resource: { collection: "mailer_suppressions", id: parsed.externalId },
+        diffSummary: `${contact.email}: removed ${removedSuppressions} unsubscribed suppression${removedSuppressions === 1 ? "" : "s"} (${parsed.scope})`
+      });
+    }
+    return { removedSuppressions };
+  }
   /**
    * The writes live in `server/unsubscribe.ts` so the pending-unsubscribe
    * drain (INVARIANT 8) replays a journaled opt-out through exactly this path