mailery 0.16.1 → 0.16.4

package/dist/index.cjs

@@ -287,6 +287,7 @@ var init_webhook_tolerance = __esm({
 var sendgrid_exports = {};
 __export(sendgrid_exports, {
   SendGridProvider: () => exports.SendGridProvider,
+  normalizeSendGridMessageId: () => normalizeSendGridMessageId,
   normalizeWebhookVerificationKey: () => normalizeWebhookVerificationKey
 });
 function normalizeWebhookVerificationKey(input) {
@@ -316,13 +317,18 @@ ${PEM_FOOTER}
   }
   return pem;
 }
+function normalizeSendGridMessageId(raw) {
+  const id = String(raw ?? "");
+  const marker = /\.(?:filter|recvd)\S*$/i.exec(id);
+  return marker ? id.slice(0, marker.index) : id;
+}
 function normalizeSendGridEvent(e) {
   const type = mapEventType(e.event);
   if (!type) return null;
   return {
     type,
     providerEventId: String(e.sg_event_id ?? e["smtp-id"] ?? `${e.event}-${e.timestamp}-${e.email}`),
-    providerMessageId: String(e.sg_message_id ?? e["smtp-id"] ?? ""),
+    providerMessageId: e.sg_message_id != null ? normalizeSendGridMessageId(e.sg_message_id) : String(e["smtp-id"] ?? ""),
     email: String(e.email ?? "").toLowerCase(),
     occurredAt: new Date(Number(e.timestamp) * 1e3),
     details: {
@@ -1759,11 +1765,20 @@ async function processWebhookBacklog(ctx, opts = {}) {
     }
   }
 }
+async function findSendForEvent(event, ctx) {
+  if (event.providerMessageId) {
+    const byId = await ctx.collections.sends.findOne({ providerMessageId: event.providerMessageId });
+    if (byId) return byId;
+  }
+  if (!event.email) return null;
+  return ctx.collections.sends.findOne({ emailAtSend: event.email, sentAt: { $ne: null } }, { sort: { sentAt: -1 } });
+}
+function webhookEventsForMessageId(providerMessageId) {
+  const escaped = providerMessageId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return { $or: [{ providerMessageId }, { providerMessageId: { $regex: `^${escaped}\\.` } }] };
+}
 async function applyWebhookEvent(event, ctx) {
-  const send = await ctx.collections.sends.findOne(
-    event.providerMessageId ? { $or: [{ providerMessageId: event.providerMessageId }, { emailAtSend: event.email }] } : { emailAtSend: event.email },
-    { sort: { queuedAt: -1 } }
-  );
+  const send = await findSendForEvent(event, ctx);
   switch (event.type) {
     case "delivered":
       if (send) {
@@ -6517,7 +6532,7 @@ function createAdminApiRouter(mailer, opts = {}) {
       if (!mongodb.ObjectId.isValid(id)) return res.status(400).json({ error: "bad_id" });
       const send = await c.sends.findOne({ _id: new mongodb.ObjectId(id) });
       if (!send) return res.status(404).json({ error: "not_found" });
-      const events = send.providerMessageId ? await c.webhookEvents.find({ providerMessageId: send.providerMessageId }).sort({ receivedAt: -1 }).limit(100).toArray() : [];
+      const events = send.providerMessageId ? await c.webhookEvents.find(webhookEventsForMessageId(send.providerMessageId)).sort({ receivedAt: -1 }).limit(100).toArray() : [];
       return res.json({ send, webhookEvents: events });
     })
   );
@@ -8256,7 +8271,7 @@ function unitToMs2(value, unit) {
 }
 
 // src/server/api/agent.ts
-var VERSION = "0.16.1" ;
+var VERSION = "0.16.4" ;
 var MIN_AGENT_TOKEN_LENGTH = 24;
 function createAgentRouter(mailer, opts) {
   if (!opts || !Array.isArray(opts.tokens) || opts.tokens.length === 0) {
@@ -8459,7 +8474,7 @@ function createAgentRouter(mailer, opts) {
         if (reached || Date.now() - started >= timeoutMs) break;
         await sleep2(1e3);
       }
-      const webhookEvents = send.providerMessageId ? await c.webhookEvents.find({ providerMessageId: send.providerMessageId }).sort({ receivedAt: 1 }).limit(100).toArray() : [];
+      const webhookEvents = send.providerMessageId ? await c.webhookEvents.find(webhookEventsForMessageId(send.providerMessageId)).sort({ receivedAt: 1 }).limit(100).toArray() : [];
       res.json({ reached, target, waitedMs: Date.now() - started, send: sendSummary(send), webhookEvents });
     })
   );
@@ -9505,7 +9520,7 @@ function createPublicRouter(mailer, opts = {}) {
       logger.error?.({ err, sendId: id }, "mailery: open pixel update failed");
     }
   }));
-  router.get("/click/:sendId/:linkId{/:sig}", wrap(logger, async (req, res) => {
+  router.get(["/click/:sendId/:linkId/:sig", "/click/:sendId/:linkId"], wrap(logger, async (req, res) => {
     const { sendId: sendIdStr, linkId, sig } = req.params;
     if (!mongodb.ObjectId.isValid(sendIdStr)) return res.status(400).end();
     const sendId = new mongodb.ObjectId(sendIdStr);
@@ -9956,7 +9971,7 @@ var DEDUPE_POLICIES = [
 ];
 
 // src/server/index.ts
-var VERSION2 = "0.16.1" ;
+var VERSION2 = "0.16.4" ;
 
 exports.DEDUPE_POLICIES = DEDUPE_POLICIES;
 exports.DEFAULT_BOT_UA_RE = DEFAULT_BOT_UA_RE;