mailery 0.8.1 → 0.10.0

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, a2 as FlowTrigger, m as FlowGoal, U as TemplateKind, T as TemplateDoc, l as FlowDoc, D as DeliveryWindow, R as RunnerContext, d as Mailer, a3 as QueueDriverConfig } from './null-CwXmiVLe.cjs';
-export { s as NullProvider } from './null-CwXmiVLe.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, a2 as FlowTrigger, m as FlowGoal, U as TemplateKind, T as TemplateDoc, l as FlowDoc, D as DeliveryWindow, R as RunnerContext, d as Mailer, a3 as QueueDriverConfig } from './null-CU_EApC6.cjs';
+export { s as NullProvider } from './null-CU_EApC6.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, a2 as FlowTrigger, m as FlowGoal, U as TemplateKind, T as TemplateDoc, l as FlowDoc, D as DeliveryWindow, R as RunnerContext, d as Mailer, a3 as QueueDriverConfig } from './null-CwXmiVLe.js';
-export { s as NullProvider } from './null-CwXmiVLe.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, a2 as FlowTrigger, m as FlowGoal, U as TemplateKind, T as TemplateDoc, l as FlowDoc, D as DeliveryWindow, R as RunnerContext, d as Mailer, a3 as QueueDriverConfig } from './null-CU_EApC6.js';
+export { s as NullProvider } from './null-CU_EApC6.js';
 import 'zod';
 import 'handlebars';
 import 'ioredis';

package/dist/testing.js

@@ -14195,7 +14195,25 @@ var tagInputSchema = z.object({
 var abortFlowInputSchema = z.object({
   flowSlug: slugSchema,
   externalId: externalIdSchema,
-  reason: z.string().min(1).max(200).optional()
+  reason: z.string().min(1).max(200).optional(),
+  /**
+   * Restrict the abort to runs whose trigger event carried these properties —
+   * e.g. `{ accountId }` to cancel one account's series while the same
+   * contact's other accounts keep running. Omit to abort every active run for
+   * the contact on this flow.
+   *
+   * Keys and values are both constrained because these go straight into a
+   * Mongo query. Values are primitives only: an object value like
+   * `{ $ne: null }` would reach the query as an OPERATOR and match every
+   * scoped run, turning a one-account abort into abort-everything. Hosts
+   * typically pass an id from a request body, so treat it as untrusted. The
+   * key regex likewise blocks `$`-prefixed keys and dots (a dot would silently
+   * extend the path and change match semantics).
+   */
+  matchTriggerProperties: z.record(
+    z.string().regex(/^[A-Za-z0-9_]+$/),
+    z.union([z.string(), z.number(), z.boolean(), z.null()])
+  ).optional()
 });
 var abortAllFlowsInputSchema = abortFlowInputSchema.omit({ flowSlug: true });
 var sendOneOffInputSchema = z.object({
@@ -14264,6 +14282,13 @@ var predicateSchema = z.lazy(
     z.object({ notHasTag: z.string() }),
     z.object({ fieldEquals: z.object({ field: z.string(), value: z.unknown() }) }),
     z.object({ fieldExists: z.string() }),
+    z.object({
+      triggerPropertyEquals: z.object({
+        key: z.string().min(1),
+        value: z.union([z.string(), z.number(), z.boolean(), z.null()])
+      })
+    }),
+    z.object({ triggerPropertyTruthy: z.string().min(1) }),
     z.object({
       hasFiredEvent: z.string(),
       sinceFlowStart: z.boolean().optional(),
@@ -14623,7 +14648,7 @@ var BullDriver = class _BullDriver {
   bullQueues;
   workers = null;
   bull;
-  static async create(redisConfig) {
+  static async create(redisConfig, prefix) {
     let bull;
     try {
       bull = await import('bullmq');
@@ -14632,14 +14657,22 @@ var BullDriver = class _BullDriver {
         "mailery: queue driver 'bull' requires the 'bullmq' peer dependency. Run `npm install bullmq ioredis`."
       );
     }
+    if (prefix?.includes(":")) {
+      throw new Error(
+        `mailery: queue prefix "${prefix}" must not contain ':' \u2014 BullMQ uses it as the Redis key separator.`
+      );
+    }
     const redis = isRedisLike(redisConfig) ? redisConfig : connect(redisConfig);
-    return new _BullDriver(bull, redis);
+    return new _BullDriver(bull, redis, prefix);
   }
-  constructor(bull, redis) {
+  prefix;
+  constructor(bull, redis, prefix) {
     this.bull = bull;
     this.redis = redis;
+    this.prefix = prefix;
     const opts = {
       connection: redis,
+      prefix,
       defaultJobOptions: {
         removeOnComplete: { age: 24 * 3600, count: 1e3 },
         removeOnFail: { age: 7 * 24 * 3600 }
@@ -14671,7 +14704,7 @@ var BullDriver = class _BullDriver {
   }
   async startWorkers(opts) {
     if (this.workers) return;
-    const base = { connection: this.redis };
+    const base = { connection: this.redis, prefix: this.prefix };
     const { Worker } = this.bull;
     const tick = new Worker(
       QUEUE_NAMES.tick,
@@ -14923,7 +14956,7 @@ var NoopDriver = class {
 async function createQueueDriver(config, fallbackDb) {
   switch (config.driver) {
     case "bull":
-      return BullDriver.create(config.redis);
+      return BullDriver.create(config.redis, config.prefix);
     case "agenda":
       return AgendaDriver.create({
         db: config.db ?? fallbackDb,
@@ -15346,6 +15379,12 @@ async function evaluatePredicate(predicate, ctx) {
   if ("fieldExists" in p) {
     return ctx.contact.fields[p.fieldExists] !== void 0;
   }
+  if ("triggerPropertyEquals" in p) {
+    return (ctx.run.triggerEvent?.properties ?? {})[p.triggerPropertyEquals.key] === p.triggerPropertyEquals.value;
+  }
+  if ("triggerPropertyTruthy" in p) {
+    return Boolean((ctx.run.triggerEvent?.properties ?? {})[p.triggerPropertyTruthy]);
+  }
   if ("subscriptionStatus" in p) {
     const sub = await ctx.collections.subscriptions.findOne({ externalId: ctx.contact.externalId });
     return sub?.status === p.subscriptionStatus;
@@ -16092,7 +16131,14 @@ async function handleFireEvent(run, step2, ctx) {
     await ctx.collections.events.insertOne({
       externalId: run.externalId,
       name: step2.eventName,
-      properties: step2.properties ?? {},
+      // Inherit the triggering event's properties so a handoff carries the
+      // context that identifies what the run is ABOUT (which account, order,
+      // subscription, ...). A step's `properties` are static — authored once in
+      // the flow definition — so without this a fired event can only ever say
+      // "this contact", losing the scope the originating event supplied, and
+      // the receiving flow has nothing to resolve variables against. Explicit
+      // step.properties win on conflict.
+      properties: { ...run.triggerEvent?.properties ?? {}, ...step2.properties ?? {} },
       dedupeKey,
       occurredAt: /* @__PURE__ */ new Date(),
       createdAt: /* @__PURE__ */ new Date()
@@ -17351,6 +17397,7 @@ var Mailer = class _Mailer {
    *   MAILER_MONGODB_URI                — Mongo connection string (required)
    *   MAILER_MONGODB_DB                 — database name (optional; defaults to the URI default)
    *   MAILER_REDIS_URL                  — Redis connection URL (required)
+   *   MAILER_QUEUE_PREFIX               — Redis key prefix to namespace this instance (optional)
    *   MAILER_PUBLIC_URL                 — base for tracking/unsub URLs (required)
    *   MAILER_UNSUBSCRIBE_SECRET         — HMAC key (required)
    *   MAILER_SENDER_ADDRESS             — postal address for CAN-SPAM (optional)
@@ -17399,7 +17446,11 @@ var Mailer = class _Mailer {
     }
     const defaultProvider = env.MAILER_DEFAULT_PROVIDER ?? Object.keys(providers)[0];
     const driverEnv = env.MAILER_QUEUE_DRIVER ?? "bull";
-    const queue = driverEnv === "agenda" ? { driver: "agenda" } : driverEnv === "noop" ? { driver: "noop" } : { driver: "bull", redis: { url: required("MAILER_REDIS_URL") } };
+    const queue = driverEnv === "agenda" ? { driver: "agenda" } : driverEnv === "noop" ? { driver: "noop" } : {
+      driver: "bull",
+      redis: { url: required("MAILER_REDIS_URL") },
+      prefix: env.MAILER_QUEUE_PREFIX
+    };
     return _Mailer.init({
       db,
       adapter,
@@ -17650,14 +17701,25 @@ var Mailer = class _Mailer {
    * same handler that processes the business event ("user upgraded").
    */
   async abortFlow(flowSlug, externalId, opts = {}) {
-    const parsed = abortFlowInputSchema.parse({ flowSlug, externalId, reason: opts.reason });
+    const parsed = abortFlowInputSchema.parse({
+      flowSlug,
+      externalId,
+      reason: opts.reason,
+      matchTriggerProperties: opts.matchTriggerProperties
+    });
     const flow = await this.collections.flows.findOne(
       { slug: parsed.flowSlug },
       { projection: { _id: 1 } }
     );
     if (!flow) throw new Error(`abortFlow: unknown flow slug "${parsed.flowSlug}"`);
+    const triggerMatch = Object.fromEntries(
+      Object.entries(parsed.matchTriggerProperties ?? {}).map(([k, v]) => [
+        `triggerEvent.properties.${k}`,
+        v
+      ])
+    );
     const result = await this.abortActiveRuns(
-      { externalId: parsed.externalId, flowId: flow._id },
+      { externalId: parsed.externalId, flowId: flow._id, ...triggerMatch },
       parsed.reason ? `aborted_by_host:${parsed.reason}` : "aborted_by_host"
     );
     if (result.abortedRuns > 0 || result.cancelledSends > 0) {
@@ -17665,7 +17727,9 @@ var Mailer = class _Mailer {
         actor: "host",
         action: "flow.abort",
         resource: { collection: "mailer_flow_runs", slug: parsed.flowSlug },
-        diffSummary: `abortFlow slug=${parsed.flowSlug} externalId=${parsed.externalId} runs=${result.abortedRuns} sends=${result.cancelledSends}${parsed.reason ? ` reason=${parsed.reason}` : ""}`
+        // Record the scope: without it a one-account abort and an abort-every-
+        // run-for-this-contact are indistinguishable in the audit trail.
+        diffSummary: `abortFlow slug=${parsed.flowSlug} externalId=${parsed.externalId} scope=${parsed.matchTriggerProperties ? JSON.stringify(parsed.matchTriggerProperties) : "all"} runs=${result.abortedRuns} sends=${result.cancelledSends}${parsed.reason ? ` reason=${parsed.reason}` : ""}`
       });
     }
     return result;