@plusscommunities/pluss-newsletter-aws 2.0.8-beta.1 → 2.0.8-beta.2

package/newsletterChanged.js

@@ -65,14 +65,17 @@ const setUnsentNotification = (update) => {
   return;
 };
 
-const checkSendNotifications = async (update) => {
-  if (!update.Notification) return; // no notification
-  if (update.UnsentNotification !== "X") return; // already sent notification
-  if (update.UnixTimestamp > moment.utc().valueOf()) return; // publish date is later
+const checkSendNotifications = (update) => {
+  return new Promise(() => {
+    if (!update.Notification) return; // no notification
+    if (update.UnsentNotification !== "X") return; // already sent notification
+    if (update.UnixTimestamp > moment.utc().valueOf()) return; // publish date is later
 
-  try {
     if (update.Private) {
-      await publishNotifications(
+      update.Tagged.map((user) => {
+        return user.userId;
+      });
+      publishNotifications(
         update.Tagged.map((user) => {
           return user.userId;
         }),
@@ -86,34 +89,24 @@ const checkSendNotifications = async (update) => {
       return;
     }
 
-    const audience = await getAudience(
+    getAudience(
       update.Site,
       update.AudienceType,
       update.AudienceTypeSelection
-    );
-
-    await publishNotifications(
-      audience.map((u) => {
-        return u.id;
-      }),
-      values.notificationNewsletterPublished,
-      update.Site,
-      update.RowId,
-      update,
-      true
-    );
-
-    setUnsentNotification(update);
-  } catch (error) {
-    console.error("checkSendNotifications error:", {
-      newsletterId: update.RowId,
-      site: update.Site,
-      error: error.message,
-      stack: error.stack,
+    ).then((audience) => {
+      publishNotifications(
+        audience.map((u) => {
+          return u.id;
+        }),
+        values.notificationNewsletterPublished,
+        update.Site,
+        update.RowId,
+        update,
+        true
+      );
+      setUnsentNotification(update);
     });
-    // Re-throw to ensure Lambda marks this as failed for proper retry handling
-    throw error;
-  }
+  });
 };
 
 const logAnalytics = (post) => {
@@ -126,11 +119,10 @@ const logAnalytics = (post) => {
   );
 };
 
-module.exports.newsletterChanged = async (event, context, callback) => {
+module.exports.newsletterChanged = (event, context, callback) => {
   console.log("newsletter changed");
 
-  // Process records sequentially to ensure proper error handling and stream checkpoint management
-  for (const record of event.Records) {
+  event.Records.forEach((record) => {
     console.log("Stream record: ", JSON.stringify(record));
 
     let site;
@@ -153,20 +145,7 @@ module.exports.newsletterChanged = async (event, context, callback) => {
       }
 
       site = data.Site;
-
-      // Stream-level deduplication: Skip if notification already sent
-      if (data.UnsentNotification !== "X") {
-        console.log({
-          action: "newsletterChanged",
-          message: "Notification already sent, skipping duplicate stream event",
-          newsletterId: data.RowId,
-          unsentFlag: data.UnsentNotification,
-        });
-      } else {
-        // Await notification sending to ensure Lambda doesn't exit prematurely
-        await checkSendNotifications(data);
-      }
-
+      checkSendNotifications(data);
       logAnalytics(data);
     } else if (record.eventName == "MODIFY") {
       console.log("MODIFY");
@@ -214,5 +193,5 @@ module.exports.newsletterChanged = async (event, context, callback) => {
     }
 
     logUpdate(site, values.updateKey);
-  }
+  });
 };

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-newsletter-aws",
-  "version": "2.0.8-beta.1",
+  "version": "2.0.8-beta.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1506,9 +1506,9 @@
       }
     },
     "@plusscommunities/pluss-core-aws": {
-      "version": "2.0.23-beta.2",
-      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-2.0.23-beta.2.tgz",
-      "integrity": "sha512-ZCWDvQirCZ6PDq8j27hgm8rjAwpDZupix5c50709SGHG10Melv4uMHM1o0q4KbYBysBvCHMubWtUhDBtDdakow==",
+      "version": "2.0.23-beta.3",
+      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-2.0.23-beta.3.tgz",
+      "integrity": "sha512-oBdo29f2w34LXzMa3I0rZJ9TxuSzshRd4Ky7AU/Rnx5jTkSMvd3p0EHsJNUEX5HEukdXItiZmor3tbFxxAilGg==",
       "requires": {
         "@aws/dynamodb-auto-marshaller": "^0.7.1",
         "amazon-cognito-identity-js": "^2.0.19",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-newsletter-aws",
-  "version": "2.0.8-beta.1",
+  "version": "2.0.8-beta.2",
   "description": "Extension package to enable newsletter on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -24,7 +24,7 @@
   "license": "ISC",
   "dependencies": {
     "@aws/dynamodb-auto-marshaller": "^0.7.1",
-    "@plusscommunities/pluss-core-aws": "2.0.23-beta.2",
+    "@plusscommunities/pluss-core-aws": "2.0.23-beta.3",
     "amazon-cognito-identity-js": "^2.0.19",
     "axios": "^1.6.8",
     "aws-sdk": "^2.1591.0",

package/watchNewsletter.js

@@ -27,13 +27,13 @@ const setUnsentNotification = (update) => {
   return;
 };
 
-const sendNotifications = (update) => {
-  return new Promise(() => {
+const sendNotifications = async (update) => {
+  if (!update.Notification) return; // no notification
+  if (update.UnsentNotification !== "X") return; // already sent notification
+
+  try {
     if (update.Private) {
-      update.Tagged.map((user) => {
-        return user.userId;
-      });
-      publishNotifications(
+      await publishNotifications(
         update.Tagged.map((user) => {
           return user.userId;
         }),
@@ -47,24 +47,35 @@ const sendNotifications = (update) => {
       return;
     }
 
-    getAudience(
+    const audience = await getAudience(
       update.Site,
       update.AudienceType,
       update.AudienceTypeSelection
-    ).then((audience) => {
-      publishNotifications(
-        audience.map((u) => {
-          return u.id;
-        }),
-        values.notificationNewsletterPublished,
-        update.Site,
-        update.RowId,
-        update,
-        true
-      );
-      setUnsentNotification(update);
+    );
+
+    await publishNotifications(
+      audience.map((u) => {
+        return u.id;
+      }),
+      values.notificationNewsletterPublished,
+      update.Site,
+      update.RowId,
+      update,
+      true
+    );
+
+    setUnsentNotification(update);
+  } catch (error) {
+    console.error("sendNotifications error:", {
+      newsletterId: update.RowId,
+      site: update.Site,
+      title: update.Title,
+      error: error.message,
+      stack: error.stack,
     });
-  });
+    // Don't re-throw - allow other newsletters to process
+    // But log the failure so we can investigate
+  }
 };
 
 const fixActivityLog = async (post, startTime) => {
@@ -197,14 +208,21 @@ module.exports.watchNewsletter = async (event, context, callback) => {
   };
   console.log("running query");
   console.log(query);
-  indexQuery(values.tableNameNewsletterEntries, query).then((res) => {
-    res.Items.forEach((update) => {
-      console.log(
-        `sending notifications for ${update.RowId} - ${update.Title}`
-      );
-      sendNotifications(update);
-    });
-  });
+
+  // Wait for query to complete
+  const res = await indexQuery(values.tableNameNewsletterEntries, query);
+
+  console.log(`Found ${res.Items.length} newsletters to send notifications for`);
+
+  // Process newsletters sequentially to ensure each completes before next starts
+  for (const update of res.Items) {
+    console.log(
+      `sending notifications for ${update.RowId} - ${update.Title}`
+    );
+
+    // Wait for each newsletter's notifications to complete
+    await sendNotifications(update);
+  }
 
   await checkFixLog(startTime);
 };