mailery 0.3.0 → 0.3.2

package/dist/index.cjs

@@ -831,6 +831,11 @@ function adaptBullQueue(q) {
   return {
     add: (name, data, opts) => q.add(name, data, opts),
     getWaitingCount: () => q.getWaitingCount(),
+    getInFlightCount: async () => {
+      const [active, waiting] = await Promise.all([q.getActiveCount(), q.getWaitingCount()]);
+      return active + waiting;
+    },
+    getDelayedCount: () => q.getDelayedCount(),
     close: () => q.close()
   };
 }
@@ -3261,43 +3266,121 @@ function createAdminRouter(mailer, opts = {}) {
 function apiRouter(mailer) {
   const r = express.Router();
   const c = mailer.collections;
-  r.get("/me", (req, res) => {
-    res.json({
-      actor: req.actor,
-      permissions: { canPublish: true, canSendBroadcasts: true, canManageSuppressions: true }
-    });
-  });
+  r.get(
+    "/me",
+    asyncHandler(async (req, res) => {
+      const [flows, templates, broadcasts, contacts, suppressions, health] = await Promise.all([
+        c.flows.estimatedDocumentCount(),
+        c.templates.estimatedDocumentCount(),
+        c.broadcasts.estimatedDocumentCount(),
+        c.subscriptions.countDocuments({ status: "subscribed" }),
+        c.suppressions.estimatedDocumentCount(),
+        c.health.findOne({ _id: "singleton" })
+      ]);
+      res.json({
+        actor: req.actor,
+        permissions: { canPublish: true, canSendBroadcasts: true, canManageSuppressions: true },
+        counts: { flows, templates, broadcasts, contacts, suppressions },
+        health: { status: health?.status ?? "healthy" },
+        providers: {
+          names: Object.keys(mailer.config.providers),
+          default: mailer.config.defaultProvider
+        }
+      });
+    })
+  );
   r.get(
     "/dashboard",
     asyncHandler(async (_req, res) => {
-      const since24h = new Date(Date.now() - 24 * 60 * 60 * 1e3);
-      const [sentTotal, deliveredCount, bouncedCount, openedCount, clickedCount] = await Promise.all([
+      const now = Date.now();
+      const HOUR = 60 * 60 * 1e3;
+      const since24h = new Date(now - 24 * HOUR);
+      const since48h = new Date(now - 48 * HOUR);
+      const [
+        sentTotal,
+        deliveredCount,
+        bouncedCount,
+        openedCount,
+        clickedCount,
+        sentPrev,
+        deliveredPrev,
+        openedPrev,
+        clickedPrev,
+        hourly
+      ] = await Promise.all([
         c.sends.countDocuments({ queuedAt: { $gt: since24h } }),
         c.sends.countDocuments({ queuedAt: { $gt: since24h }, status: "delivered" }),
         c.sends.countDocuments({ queuedAt: { $gt: since24h }, status: "bounced" }),
         c.sends.countDocuments({ queuedAt: { $gt: since24h }, openedAt: { $ne: null } }),
-        c.sends.countDocuments({ queuedAt: { $gt: since24h }, firstClickAt: { $ne: null } })
+        c.sends.countDocuments({ queuedAt: { $gt: since24h }, firstClickAt: { $ne: null } }),
+        c.sends.countDocuments({ queuedAt: { $gt: since48h, $lte: since24h } }),
+        c.sends.countDocuments({ queuedAt: { $gt: since48h, $lte: since24h }, status: "delivered" }),
+        c.sends.countDocuments({ queuedAt: { $gt: since48h, $lte: since24h }, openedAt: { $ne: null } }),
+        c.sends.countDocuments({ queuedAt: { $gt: since48h, $lte: since24h }, firstClickAt: { $ne: null } }),
+        c.sends.aggregate([
+          { $match: { queuedAt: { $gt: since24h } } },
+          {
+            $project: {
+              hour: {
+                $toInt: {
+                  $divide: [{ $subtract: [now, { $toLong: "$queuedAt" }] }, HOUR]
+                }
+              },
+              opened: { $cond: [{ $ifNull: ["$openedAt", false] }, 1, 0] }
+            }
+          },
+          { $group: { _id: "$hour", sends: { $sum: 1 }, opens: { $sum: "$opened" } } }
+        ]).toArray()
       ]);
+      const sendSeries = new Array(24).fill(0);
+      const openSeries = new Array(24).fill(0);
+      for (const row of hourly) {
+        const idx = 23 - Math.max(0, Math.min(23, row._id));
+        sendSeries[idx] = row.sends;
+        openSeries[idx] = row.opens;
+      }
+      const delta = (cur, prev) => {
+        if (prev === 0) return null;
+        return (cur - prev) / prev;
+      };
+      const rateDelta = (curN, curD, prevN, prevD) => {
+        if (prevD === 0 || curD === 0) return null;
+        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 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);
+      const lastSendError = await c.sends.findOne({ status: { $in: ["bounced", "failed"] } }, { sort: { queuedAt: -1 } });
+      const lastSendOk = await c.sends.findOne({ status: "delivered" }, { sort: { queuedAt: -1 } });
+      const providerOk = lastSendOk && lastSendError ? new Date(lastSendOk.queuedAt).getTime() >= new Date(lastSendError.queuedAt).getTime() : lastSendOk ? true : lastSendError ? false : null;
       res.json({
         kpis: {
-          sends: { value: sentTotal, delta: null },
+          sends: { value: sentTotal, delta: delta(sentTotal, sentPrev) },
           deliveredRate: {
-            value: sentTotal === 0 ? 1 : deliveredCount / sentTotal,
-            delta: null,
+            value: sentTotal === 0 ? null : deliveredCount / sentTotal,
+            delta: rateDelta(deliveredCount, sentTotal, deliveredPrev, sentPrev),
             bounced: bouncedCount
           },
-          openRate: { value: sentTotal === 0 ? 0 : openedCount / sentTotal, delta: null, exclBots: false },
-          clickRate: { value: sentTotal === 0 ? 0 : clickedCount / sentTotal, delta: null }
+          openRate: {
+            value: sentTotal === 0 ? null : openedCount / sentTotal,
+            delta: rateDelta(openedCount, sentTotal, openedPrev, sentPrev),
+            exclBots: false
+          },
+          clickRate: {
+            value: sentTotal === 0 ? null : clickedCount / sentTotal,
+            delta: rateDelta(clickedCount, sentTotal, clickedPrev, sentPrev)
+          }
         },
-        health: health ? { status: health.status, rates: health.rates } : {
-          status: "healthy",
-          rates: { hardBounceRate: 0, complaintRate: 0, combinedBounceRate: 0, failureRate: 0 }
+        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 } },
+        queue: {
+          inFlight: queueCounts?.inFlight ?? null,
+          delayed: queueCounts?.delayed ?? null,
+          providerOk,
+          providerName: mailer.config.defaultProvider
         },
-        queue: { inFlight: 0, delayed: 0, providerOk: true, providerName: mailer.config.defaultProvider },
         recentFlows,
         recentSends,
         recentAudit
@@ -3474,6 +3557,13 @@ function apiRouter(mailer) {
       );
     })
   );
+  r.get(
+    "/health/trips",
+    asyncHandler(async (_req, res) => {
+      const rows = await c.auditLog.find({ action: { $in: ["health.trip", "health.resume"] } }).sort({ occurredAt: -1 }).limit(50).toArray();
+      res.json(rows);
+    })
+  );
   r.post(
     "/health/resume",
     asyncHandler(async (req, res) => {
@@ -3997,6 +4087,28 @@ function asyncHandler(fn) {
     fn(req, res, next).catch(next);
   };
 }
+async function collectQueueCounts(mailer) {
+  const qs = Object.values(mailer.queues);
+  const sum = async (key) => {
+    let total = 0;
+    let supported = false;
+    for (const q of qs) {
+      const fn = q[key];
+      if (!fn) continue;
+      try {
+        const v = await fn.call(q);
+        if (v == null) continue;
+        total += v;
+        supported = true;
+      } catch {
+        return null;
+      }
+    }
+    return supported ? total : null;
+  };
+  const [inFlight, delayed] = await Promise.all([sum("getInFlightCount"), sum("getDelayedCount")]);
+  return { inFlight, delayed };
+}
 var PIXEL = Buffer.from(
   "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=",
   "base64"