mailery 0.3.2 → 0.4.0

package/dist/index.js

@@ -3265,13 +3265,13 @@ function apiRouter(mailer) {
       ]);
       res.json({
         actor: req.actor,
-        permissions: { canPublish: true, canSendBroadcasts: true, canManageSuppressions: true },
         counts: { flows, templates, broadcasts, contacts, suppressions },
-        health: { status: health?.status ?? "healthy" },
+        health: { status: health?.status ?? null },
         providers: {
           names: Object.keys(mailer.config.providers),
           default: mailer.config.defaultProvider
-        }
+        },
+        broadcastConfirmationThreshold: mailer.config.broadcastConfirmationThreshold
       });
     })
   );
@@ -3334,7 +3334,9 @@ function apiRouter(mailer) {
         return curN / curD - prevN / prevD;
       };
       const health = await c.health.findOne({ _id: "singleton" });
-      const recentFlows = await c.flows.find({ enabled: true }).limit(5).toArray();
+      const recentFlowsRaw = await c.flows.find({ enabled: true }).limit(5).toArray();
+      const flowStatsMap = await computeFlowStats(mailer);
+      const recentFlows = recentFlowsRaw.map((f) => ({ ...f, stats: flowStatsMap.get(f.slug) ?? emptyFlowStats() }));
       const recentSends = await c.sends.find().sort({ queuedAt: -1 }).limit(6).toArray();
       const recentAudit = await c.auditLog.find().sort({ occurredAt: -1 }).limit(5).toArray();
       const queueCounts = await collectQueueCounts(mailer);
@@ -3351,8 +3353,7 @@ function apiRouter(mailer) {
           },
           openRate: {
             value: sentTotal === 0 ? null : openedCount / sentTotal,
-            delta: rateDelta(openedCount, sentTotal, openedPrev, sentPrev),
-            exclBots: false
+            delta: rateDelta(openedCount, sentTotal, openedPrev, sentPrev)
           },
           clickRate: {
             value: sentTotal === 0 ? null : clickedCount / sentTotal,
@@ -3360,7 +3361,16 @@ function apiRouter(mailer) {
           }
         },
         series: { hourly: { sends: sendSeries, opens: openSeries } },
-        health: health ? { status: health.status, rates: health.rates } : { status: "healthy", rates: { hardBounceRate: 0, complaintRate: 0, combinedBounceRate: 0, failureRate: 0 } },
+        health: {
+          status: health?.status ?? null,
+          rates: health?.rates ?? null,
+          thresholds: {
+            hardBounceRatePctTrip: mailer.config.circuitBreaker.hardBounceRatePctTrip,
+            complaintRatePctTrip: mailer.config.circuitBreaker.complaintRatePctTrip,
+            combinedBounceRatePctTrip: mailer.config.circuitBreaker.combinedBounceRatePctTrip,
+            failedToSendRatePctDegrade: mailer.config.circuitBreaker.failedToSendRatePctDegrade
+          }
+        },
         queue: {
           inFlight: queueCounts?.inFlight ?? null,
           delayed: queueCounts?.delayed ?? null,
@@ -3377,7 +3387,8 @@ function apiRouter(mailer) {
     "/flows",
     asyncHandler(async (_req, res) => {
       const flows = await c.flows.find().sort({ updatedAt: -1 }).toArray();
-      res.json(flows);
+      const stats = await computeFlowStats(mailer);
+      res.json(flows.map((f) => ({ ...f, stats: stats.get(f.slug) ?? emptyFlowStats() })));
     })
   );
   r.get(
@@ -3385,7 +3396,8 @@ function apiRouter(mailer) {
     asyncHandler(async (req, res) => {
       const flow = await c.flows.findOne({ slug: req.params.slug });
       if (!flow) return res.status(404).json({ error: "not_found" });
-      return res.json(flow);
+      const stats = (await computeFlowStats(mailer, flow.slug)).get(flow.slug) ?? emptyFlowStats();
+      return res.json({ ...flow, stats });
     })
   );
   r.post(
@@ -3420,7 +3432,8 @@ function apiRouter(mailer) {
     "/templates",
     asyncHandler(async (_req, res) => {
       const templates = await c.templates.find().sort({ updatedAt: -1 }).toArray();
-      res.json(templates);
+      const stats = await computeTemplateStats(mailer);
+      res.json(templates.map((t) => ({ ...t, stats: stats.get(t.slug) ?? emptyTemplateStats() })));
     })
   );
   r.get(
@@ -3428,14 +3441,16 @@ function apiRouter(mailer) {
     asyncHandler(async (req, res) => {
       const template = await c.templates.findOne({ slug: req.params.slug });
       if (!template) return res.status(404).json({ error: "not_found" });
-      return res.json(template);
+      const stats = (await computeTemplateStats(mailer, template.slug)).get(template.slug) ?? emptyTemplateStats();
+      return res.json({ ...template, stats });
     })
   );
   r.get(
     "/broadcasts",
     asyncHandler(async (_req, res) => {
       const broadcasts = await c.broadcasts.find().sort({ createdAt: -1 }).toArray();
-      res.json(broadcasts);
+      const stats = await computeBroadcastStats(mailer);
+      res.json(broadcasts.map((b) => ({ ...b, stats: stats.get(String(b._id)) ?? emptyBroadcastStats() })));
     })
   );
   r.get(
@@ -3443,7 +3458,8 @@ function apiRouter(mailer) {
     asyncHandler(async (req, res) => {
       const broadcast = await c.broadcasts.findOne({ slug: req.params.slug });
       if (!broadcast) return res.status(404).json({ error: "not_found" });
-      return res.json(broadcast);
+      const stats = (await computeBroadcastStats(mailer, broadcast._id)).get(String(broadcast._id)) ?? emptyBroadcastStats();
+      return res.json({ ...broadcast, stats });
     })
   );
   r.get(
@@ -3451,8 +3467,20 @@ function apiRouter(mailer) {
     asyncHandler(async (req, res) => {
       const cursor = typeof req.query.cursor === "string" ? req.query.cursor : void 0;
       const limit = Math.min(Number(req.query.limit ?? 50), 200);
-      const { contacts, nextCursor } = await mailer.adapter.query({}, { limit, cursor });
-      res.json({ contacts, nextCursor });
+      const [{ contacts, nextCursor }, counts] = await Promise.all([
+        mailer.adapter.query({}, { limit, cursor }),
+        (async () => {
+          const rows = await c.subscriptions.aggregate([{ $group: { _id: "$status", n: { $sum: 1 } } }]).toArray();
+          const out = { subscribed: 0, pending_doi: 0, unsubscribed: 0, bounced: 0, complained: 0 };
+          let total = 0;
+          for (const r2 of rows) {
+            if (r2._id) out[r2._id] = r2.n;
+            total += r2.n;
+          }
+          return { ...out, total };
+        })()
+      ]);
+      res.json({ contacts, nextCursor, counts });
     })
   );
   r.get(
@@ -3531,16 +3559,18 @@ function apiRouter(mailer) {
     "/health",
     asyncHandler(async (_req, res) => {
       const h = await c.health.findOne({ _id: "singleton" });
-      res.json(
-        h ?? {
-          _id: "singleton",
-          status: "healthy",
-          windowStartedAt: new Date(Date.now() - 60 * 60 * 1e3),
-          windowDurationMs: 60 * 60 * 1e3,
-          counters: { sent: 0, delivered: 0, bounced: 0, hardBounced: 0, softBounced: 0, complained: 0, failedToSend: 0 },
-          rates: { bounceRate: 0, hardBounceRate: 0, complaintRate: 0, failureRate: 0 }
-        }
-      );
+      const cb = mailer.config.circuitBreaker;
+      const thresholds = {
+        hardBounceRatePctTrip: cb.hardBounceRatePctTrip,
+        complaintRatePctTrip: cb.complaintRatePctTrip,
+        combinedBounceRatePctTrip: cb.combinedBounceRatePctTrip,
+        failedToSendRatePctDegrade: cb.failedToSendRatePctDegrade
+      };
+      if (!h) {
+        res.json({ status: null, rates: null, counters: null, thresholds });
+        return;
+      }
+      res.json({ ...h, thresholds });
     })
   );
   r.get(
@@ -3883,6 +3913,9 @@ function apiRouter(mailer) {
         html = compiled.html;
         plainText = compiled.plainText;
       } else {
+        if (!tpl.body?.html) {
+          return res.status(409).json({ error: "not_published", message: "Template has not been published yet." });
+        }
         html = tpl.body.html;
         plainText = tpl.body.plainText;
       }
@@ -4014,8 +4047,15 @@ function apiRouter(mailer) {
         if (f.kind === "hasTag") hostFilter.hasTag = f.tag;
         if (f.kind === "fieldEquals") hostFilter.fieldEquals = { field: f.field, value: f.value };
       }
-      const stageA = await mailer.adapter.count(hostFilter);
-      return res.json({ stageA, stageB: stageA, afterSuppression: stageA, computedMs: Date.now() - t0 });
+      const hasMailerFilters = segmentDefinition.filters.some(
+        (f) => ["subscriptionStatus", "firedEvent", "notFiredEvent", "notHasTag", "opened", "notOpened", "subscribedAfter", "subscribedBefore"].includes(f.kind)
+      );
+      const upperBound = await mailer.adapter.count(hostFilter);
+      return res.json({
+        upperBound,
+        approximate: hasMailerFilters,
+        computedMs: Date.now() - t0
+      });
     })
   );
   r.post(
@@ -4095,6 +4135,119 @@ async function collectQueueCounts(mailer) {
   const [inFlight, delayed] = await Promise.all([sum("getInFlightCount"), sum("getDelayedCount")]);
   return { inFlight, delayed };
 }
+function emptyFlowStats() {
+  return { activeRuns: 0, completedRuns: 0, sendsLast7Days: 0, sendsTotal: 0 };
+}
+async function computeFlowStats(mailer, slugFilter) {
+  const out = /* @__PURE__ */ new Map();
+  const match = slugFilter ? { flowSlug: slugFilter } : {};
+  const runRows = await mailer.collections.flowRuns.aggregate([
+    { $match: match },
+    { $group: { _id: { flowSlug: "$flowSlug", status: "$status" }, count: { $sum: 1 } } }
+  ]).toArray();
+  for (const row of runRows) {
+    const slug = row._id.flowSlug;
+    if (!slug) continue;
+    const cur = out.get(slug) ?? emptyFlowStats();
+    if (row._id.status === "active") cur.activeRuns += row.count;
+    else if (row._id.status === "completed") cur.completedRuns += row.count;
+    out.set(slug, cur);
+  }
+  const sevenDaysAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1e3);
+  const sendRows = await mailer.collections.sends.aggregate([
+    { $match: { flowRunId: { $ne: null } } },
+    {
+      $lookup: {
+        from: mailer.collections.flowRuns.collectionName,
+        localField: "flowRunId",
+        foreignField: "_id",
+        as: "run",
+        pipeline: slugFilter ? [{ $match: { flowSlug: slugFilter } }, { $project: { flowSlug: 1 } }] : [{ $project: { flowSlug: 1 } }]
+      }
+    },
+    { $unwind: "$run" },
+    {
+      $group: {
+        _id: "$run.flowSlug",
+        total: { $sum: 1 },
+        last7: { $sum: { $cond: [{ $gte: ["$queuedAt", sevenDaysAgo] }, 1, 0] } }
+      }
+    }
+  ]).toArray();
+  for (const row of sendRows) {
+    if (!row._id) continue;
+    const cur = out.get(row._id) ?? emptyFlowStats();
+    cur.sendsTotal = row.total;
+    cur.sendsLast7Days = row.last7;
+    out.set(row._id, cur);
+  }
+  return out;
+}
+function emptyTemplateStats() {
+  return { sent: 0, opened: 0, clicked: 0, bounced: 0, sentLast7Days: 0, lastSentAt: null };
+}
+async function computeTemplateStats(mailer, slugFilter) {
+  const out = /* @__PURE__ */ new Map();
+  const match = {};
+  if (slugFilter) match.templateSlug = slugFilter;
+  const sevenDaysAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1e3);
+  const rows = await mailer.collections.sends.aggregate([
+    { $match: match },
+    {
+      $group: {
+        _id: "$templateSlug",
+        sent: { $sum: 1 },
+        opened: { $sum: { $cond: [{ $ifNull: ["$openedAt", false] }, 1, 0] } },
+        clicked: { $sum: { $cond: [{ $ifNull: ["$firstClickAt", false] }, 1, 0] } },
+        bounced: { $sum: { $cond: [{ $eq: ["$status", "bounced"] }, 1, 0] } },
+        sentLast7Days: { $sum: { $cond: [{ $gte: ["$queuedAt", sevenDaysAgo] }, 1, 0] } },
+        lastSentAt: { $max: "$queuedAt" }
+      }
+    }
+  ]).toArray();
+  for (const row of rows) {
+    if (!row._id) continue;
+    out.set(row._id, {
+      sent: row.sent,
+      opened: row.opened,
+      clicked: row.clicked,
+      bounced: row.bounced,
+      sentLast7Days: row.sentLast7Days,
+      lastSentAt: row.lastSentAt ?? null
+    });
+  }
+  return out;
+}
+function emptyBroadcastStats() {
+  return { delivered: 0, opened: 0, clicked: 0, bounced: 0 };
+}
+async function computeBroadcastStats(mailer, idFilter) {
+  const out = /* @__PURE__ */ new Map();
+  const match = { broadcastId: { $ne: null } };
+  if (idFilter) match.broadcastId = idFilter;
+  const rows = await mailer.collections.sends.aggregate([
+    { $match: match },
+    {
+      $group: {
+        _id: "$broadcastId",
+        delivered: { $sum: { $cond: [{ $eq: ["$status", "delivered"] }, 1, 0] } },
+        opened: { $sum: { $cond: [{ $ifNull: ["$openedAt", false] }, 1, 0] } },
+        clicked: { $sum: { $cond: [{ $ifNull: ["$firstClickAt", false] }, 1, 0] } },
+        bounced: { $sum: { $cond: [{ $eq: ["$status", "bounced"] }, 1, 0] } }
+      }
+    }
+  ]).toArray();
+  for (const row of rows) {
+    if (!row._id) continue;
+    out.set(String(row._id), {
+      delivered: row.delivered,
+      opened: row.opened,
+      clicked: row.clicked,
+      bounced: row.bounced
+    });
+  }
+  return out;
+}
 var PIXEL = Buffer.from(
   "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=",
   "base64"