Version 0.38.1 (#946)

- fix: DSN matching for cases where Envelope is not sent in SMTP result

Author: wp99cp

package.json

@@ -1,6 +1,6 @@
 {
   "name": "conveniat27",
-  "version": "0.38.0",
+  "version": "0.38.1",
   "description": "The official website of conveniat27",
   "license": "MIT",
   "author": "Cyrill Püntener v/o JPG (cyrill.puentener@cevi.ch)",

src/features/payload-cms/payload-cms/collections/outgoing-emails.ts

@@ -151,5 +151,14 @@ export const OutgoingEmails: CollectionConfig = {
         },
       ],
     },
+    {
+      name: 'createdAt',
+      type: 'date',
+      index: true,
+      admin: {
+        readOnly: true,
+        position: 'sidebar',
+      },
+    },
   ],
 };

src/features/payload-cms/payload-cms/tasks/fetch-smtp-bounces.ts

@@ -309,41 +309,119 @@ export const fetchSmtpBouncesTask: TaskConfig<'fetchSmtpBounces'> = {
 
         try {
           const rawEmail = await pop3.RETR(messageId);
-          const parsedEmail = await simpleParser(String(rawEmail));
+          const rawEmailString = String(rawEmail);
+          const parsedEmail = await simpleParser(rawEmailString);
 
+          const { isSuccess, dsnString } = determineDeliveryStatus(parsedEmail);
           const envId = getOriginalEnvelopeId(parsedEmail);
 
+          let matched = false;
+
           // Standard Payload ID length check (24 chars for ObjectID)
-          if (envId?.length === 24) {
-            const { isSuccess, dsnString } = determineDeliveryStatus(parsedEmail);
-            const matched = await updateTrackingRecords(
+          if (typeof envId === 'string' && envId.length === 24) {
+            matched = await updateTrackingRecords(
               payload,
               envId,
               isSuccess,
               dsnString,
-              String(rawEmail),
+              rawEmailString,
             );
+          }
 
-            if (matched) {
-              logger.info(`Processed bounce for submission/outgoing email ${envId} successfully.`);
+          // Fallback matching if Original-Envelope-Id matching fails or doesn't exist
+          if (!matched) {
+            const possibleIds = new Set<string>();
 
-              // Only delete if successfully processed and matches an ID in our database
-              await pop3.DELE(messageId);
+            const textForRegex = typeof parsedEmail.text === 'string' ? parsedEmail.text : '';
 
-              // Clear failure tracking if successful
-              if (trackingRecord?.id !== undefined) {
-                await payload.delete({
-                  collection: 'smtp-bounce-mail-tracking',
-                  id: trackingRecord.id,
+            const extractMatches = (regex: RegExp, sourceString: string): void => {
+              let m;
+              // reset regex state if global
+              regex.lastIndex = 0;
+              while ((m = regex.exec(sourceString)) !== null) {
+                if (m[1] !== undefined) possibleIds.add(m[1].trim());
+              }
+            };
+
+            // Normalize extracted IDs by removing angle brackets and domain parts for robust comparison
+            const messageIdRegex = /Message-ID:\s*<?([^@>\s]+)/gi;
+            extractMatches(messageIdRegex, rawEmailString);
+            extractMatches(messageIdRegex, textForRegex);
+
+            const queuedRegex = /queued as\s*([a-zA-Z0-9_-]+)/gi;
+            extractMatches(queuedRegex, rawEmailString);
+            extractMatches(queuedRegex, textForRegex);
+
+            const postfixRegex = /X-Postfix-Queue-ID:\s*([a-zA-Z0-9_-]+)/gi;
+            extractMatches(postfixRegex, rawEmailString);
+            extractMatches(postfixRegex, textForRegex);
+
+            // Also check the Received header that contains the Queue ID before sending
+            const receivedRegex = /with ESMTPSA id\s*([a-zA-Z0-9_-]+)/gi;
+            extractMatches(receivedRegex, rawEmailString);
+
+            const extractedIds = [...possibleIds];
+
+            if (extractedIds.length > 0) {
+              // Scan recent outgoing emails (up to 1000, within the last 30 days) for these IDs in their smtpResults
+              const thirtyDaysAgo = new Date();
+              thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30);
+
+              const recentOutgoing = await payload.find({
+                collection: 'outgoing-emails',
+                where: {
+                  createdAt: {
+                    greater_than_equal: thirtyDaysAgo.toISOString(),
+                  },
+                },
+                limit: 1000,
+                sort: '-createdAt',
+              });
+
+              for (const outgoingDocument of recentOutgoing.docs) {
+                const stringifiedResults = JSON.stringify(outgoingDocument.smtpResults ?? []);
+                const foundMatch = extractedIds.some((id) => {
+                  // Only match if the ID appears as a complete token, not as a substring
+                  const regex = new RegExp(
+                    `\\b${id.replaceAll(/[.*+?^${}()|[\\]\\\\]/g, String.raw`\\$&`)}\\b`,
+                  );
+                  return regex.test(stringifiedResults);
                 });
+
+                if (foundMatch) {
+                  matched = await updateTrackingRecords(
+                    payload,
+                    String(outgoingDocument.id),
+                    isSuccess,
+                    dsnString,
+                    rawEmailString,
+                  );
+
+                  if (matched) {
+                    logger.info(
+                      `Fallback processed bounce for outgoing email ${String(outgoingDocument.id)} using ID(s) ${extractedIds.join(',')}`,
+                    );
+                    break;
+                  }
+                }
               }
-            } else {
-              logger.info(
-                `Ignored message ${messageId} as envId ${envId} was not found in this instance.`,
-              );
+            }
+          }
+          if (matched) {
+            // Only delete if successfully processed and matches an ID in our database
+            await pop3.DELE(messageId);
+
+            // Clear failure tracking if successful
+            if (trackingRecord?.id !== undefined) {
+              await payload.delete({
+                collection: 'smtp-bounce-mail-tracking',
+                id: trackingRecord.id,
+              });
             }
           } else {
-            logger.info(`Ignored message ${messageId} as it lacks our expected ID format.`);
+            logger.info(
+              `Ignored message ${messageId} as envId ${envId} and fallback IDs were not found in this instance.`,
+            );
           }
         } catch (error: unknown) {
           // We isolate individual message failures so the loop continues

src/features/payload-cms/payload-types.ts

@@ -2572,8 +2572,8 @@ export interface OutgoingEmail {
     | boolean
     | null;
   rawDsnEmail?: string | null;
-  updatedAt: string;
   createdAt: string;
+  updatedAt: string;
 }
 /**
  * This is a collection of automatically created search results. These results are used by the global site search and will be updated automatically as documents in the CMS are created or updated.
@@ -3961,8 +3961,8 @@ export interface OutgoingEmailsSelect<T extends boolean = true> {
   smtpResults?: T;
   rawSmtpResults?: T;
   rawDsnEmail?: T;
-  updatedAt?: T;
   createdAt?: T;
+  updatedAt?: T;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema