@ozdao/martyrs 0.2.489 → 0.2.491

package/dist/martyrs.es.js

@@ -1,4 +1,4 @@
-import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, L as h, p as b, M as k, q as x, H as B, r as T, s as U, t as f, u as w, S as D, v as E, w as I, x as L, y as P, z as q, A as y, B as A, D as j, U as v, E as z, G, m as H } from "./main-IVRL6IjM.js";
+import { _ as e, a as o, b as d, C as r, k as t, c as l, d as i, e as p, f as u, g as n, h as M, i as S, j as c, F as m, l as C, n as F, o as g, L as h, p as b, M as k, q as x, H as B, r as T, s as U, t as f, u as w, S as D, v as E, w as I, x as L, y as P, z as q, A as y, B as A, D as j, U as v, E as z, G, m as H } from "./main-YBlKbx0g.js";
 export {
   e as Address,
   o as Breadcrumbs,

package/dist/notifications.server.cjs

@@ -7,17 +7,53 @@ const mailing = require("./mailing-q7sR8gCV.cjs");
 const admin = require("firebase-admin");
 const path = require("path");
 const webpush = require("web-push");
-const NotificationsController = (db, wss) => {
+const NotificationsController = (db, wss, notificationService) => {
   const create = async (req, res) => {
     try {
       const notification = await db.notification.create(req.body);
-      const notificationService = notification(db, wss);
-      notificationService.processNotification(notification);
+      await notificationService.processNotification(notification);
       return res.status(201).json(notification);
     } catch (err) {
       return res.status(500).json({ message: err.message });
     }
   };
+  const createBatch = async (req, res) => {
+    console.log("=== Batch notifications endpoint ===");
+    console.log("Request body:", JSON.stringify(req.body, null, 2));
+    try {
+      const { notifications } = req.body;
+      if (!notifications || !Array.isArray(notifications)) {
+        console.error("Invalid request: notifications array is required");
+        return res.status(400).json({ message: "notifications array is required" });
+      }
+      console.log("Creating notifications count:", notifications.length);
+      const createdNotifications = await db.notification.insertMany(notifications);
+      console.log("Created notifications:", createdNotifications.map((n) => n._id));
+      setImmediate(() => {
+        Promise.allSettled(createdNotifications.map(
+          (notif) => notificationService.processNotification(notif)
+        )).then((results) => {
+          const failures = results.filter((r) => r.status === "rejected");
+          if (failures.length > 0) {
+            console.error(
+              "Batch notification processing errors:",
+              failures.map((f) => f.reason?.message || f.reason)
+            );
+          }
+          console.log(`Batch processing complete: ${results.length - failures.length}/${results.length} successful`);
+        });
+      });
+      return res.status(201).json({
+        message: "Batch notifications created",
+        count: createdNotifications.length
+      });
+    } catch (err) {
+      console.error("=== Batch notifications error ===");
+      console.error("Error:", err.message);
+      console.error("Stack:", err.stack);
+      return res.status(500).json({ message: err.message });
+    }
+  };
   const getUserNotifications = async (req, res) => {
     try {
       const userId = req.params.userId;
@@ -52,7 +88,7 @@ const NotificationsController = (db, wss) => {
   const markAllAsRead = async (req, res) => {
     try {
       const userId = req.params.userId;
-      const result = await db.notification.updateMany({ userId, status: "unread" }, { status: "read", updatedAt: Date.now() });
+      const result = await db.notification.updateMany({ userId, status: { $in: ["sent", "unread"] } }, { status: "read", updatedAt: Date.now() });
       const updatedNotifications = await db.notification.find({
         userId,
         status: "read",
@@ -134,6 +170,7 @@ const NotificationsController = (db, wss) => {
   };
   return {
     create,
+    createBatch,
     getUserNotifications,
     markAsRead,
     registerDevice,
@@ -202,10 +239,11 @@ const UserDeviceModel = (db, additionalFields = {}) => {
   schema.index({ userId: 1, deviceId: 1 }, { unique: true });
   return db.mongoose.model("UserDevice", schema);
 };
-const notificationsRoutes = (app, db, wss, origins, publicPath) => {
-  const controller = NotificationsController(db, wss);
+const notificationsRoutes = (app, db, wss, origins, publicPath, notificationService) => {
+  const controller = NotificationsController(db, wss, notificationService);
   app.get("/api/notifications/user/:userId", controller.getUserNotifications);
   app.post("/api/notifications", controller.create);
+  app.post("/api/notifications/batch", controller.createBatch);
   app.put("/api/notifications/:id/read", controller.markAsRead);
   app.put("/api/notifications/user/:userId/read-all", controller.markAllAsRead);
   app.post("/api/notifications/devices/register", controller.registerDevice);
@@ -373,7 +411,7 @@ const NotificationService = function(db, wss) {
     try {
       const userId = notification.userId.toString();
       const preferences = await db.notificationPreference.find({
-        userId
+        userId: new ObjectId(userId)
         // notificationType: notification.type
       });
       console.log("userId", userId);
@@ -393,55 +431,106 @@ const NotificationService = function(db, wss) {
         // whatsapp: sendWhatsAppNotification
       };
       const userDevices = await db.userDevice.find({
-        userId,
+        userId: new ObjectId(userId),
         isActive: true
       });
+      console.log("=== CHANNEL SELECTION DEBUG ===");
+      console.log("userDevices found:", userDevices.length);
+      console.log("userDevices:", userDevices);
+      console.log("user.email:", user.email);
+      console.log("user.phoneNumber:", user.phoneNumber);
+      console.log("preferences.length:", preferences.length);
       let channels = ["web"];
+      if (userDevices.length > 0) {
+        channels.push("push");
+        console.log("Added push channel - devices found");
+      } else {
+        console.log("No push channel - no devices found");
+      }
       if (user.email) {
         channels.push("email");
+        console.log("Added email channel");
       }
       if (user.phoneNumber) {
         channels.push("sms");
+        console.log("Added SMS channel");
       }
       if (preferences.length > 0) {
         channels = preferences.filter((pref) => pref.isEnabled).map((pref) => pref.channelType);
+        console.log("Overridden with user preferences:", channels);
       }
-      console.log("channels", channels);
+      console.log("=== FINAL CHANNELS ===", channels);
+      const channelPromises = [];
       for (const channel of channels) {
+        console.log(`=== PREPARING CHANNEL: ${channel} ===`);
         const sendFunc = channelRouters[channel];
-        if (sendFunc) {
-          try {
-            if (channel === "push") {
-              for (const device of userDevices) {
-                await sendFunc(notification, user, device);
-              }
-            } else {
-              await sendFunc(notification, user);
-            }
-            await db.notification.findByIdAndUpdate(notification._id, {
-              status: "sent",
-              updatedAt: Date.now()
-            });
-            await db.notificationLog.create({
-              notificationId: notification._id,
-              userId: notification.userId,
-              channelType: channel,
-              status: "sent",
-              sentAt: Date.now()
-            });
-          } catch (error) {
-            console.error(`Error sending ${channel} notification:`, error);
-            await db.notificationLog.create({
-              notificationId: notification._id,
-              userId: notification.userId,
-              channelType: channel,
-              status: "failed",
-              error: error.message,
-              sentAt: Date.now()
-            });
+        if (!sendFunc) {
+          channelPromises.push(Promise.resolve({
+            channel,
+            success: false,
+            error: "No send function"
+          }));
+          continue;
+        }
+        if (channel === "push") {
+          console.log(`Preparing push to ${userDevices.length} devices`);
+          for (const device of userDevices) {
+            channelPromises.push(
+              sendFunc(notification, user, device).then(() => {
+                console.log(`Push sent successfully to device ${device.deviceId}`);
+                return { channel: "push", deviceId: device.deviceId, success: true };
+              }).catch((err) => {
+                console.error(`Push failed for device ${device.deviceId}:`, err);
+                return { channel: "push", deviceId: device.deviceId, success: false, error: err.message };
+              })
+            );
+          }
+        } else {
+          channelPromises.push(
+            sendFunc(notification, user).then(() => {
+              console.log(`${channel} notification sent successfully`);
+              return { channel, success: true };
+            }).catch((err) => {
+              console.error(`${channel} notification failed:`, err);
+              return { channel, success: false, error: err.message };
+            })
+          );
+        }
+      }
+      console.log(`=== PROCESSING ${channelPromises.length} PARALLEL OPERATIONS ===`);
+      const results = await Promise.allSettled(channelPromises);
+      const logs = [];
+      const channelSuccessMap = /* @__PURE__ */ new Map();
+      results.forEach(({ status, value }) => {
+        if (status === "fulfilled" && value) {
+          const logEntry = {
+            notificationId: notification._id,
+            userId: notification.userId,
+            channelType: value.channel,
+            status: value.success ? "sent" : "failed",
+            sentAt: Date.now()
+          };
+          if (!value.success) {
+            logEntry.error = value.error;
+          }
+          logs.push(logEntry);
+          if (value.success) {
+            channelSuccessMap.set(value.channel, true);
           }
         }
+      });
+      if (logs.length > 0) {
+        setImmediate(() => db.notificationLog.insertMany(logs).catch(console.error));
+        console.log(`Scheduled ${logs.length} logs for batch insertion`);
       }
+      const hasSuccessfulSend = channelSuccessMap.size > 0;
+      console.log(`=== PROCESSING COMPLETE - Success: ${hasSuccessfulSend} ===`);
+      setImmediate(() => {
+        db.notification.findByIdAndUpdate(notification._id, {
+          status: hasSuccessfulSend ? "sent" : "failed",
+          updatedAt: Date.now()
+        }).catch(console.error);
+      });
     } catch (error) {
       console.error("Error processing notification:", error);
       await db.notification.findByIdAndUpdate(notification._id, {
@@ -513,14 +602,23 @@ function initializeNotifications(app, db, wss, origins, publicPath) {
   db.notificationPreference = NotificationPreferenceModel(db);
   db.notificationLog = NotificationLogModel(db);
   getInstance(db);
+  const notificationService = NotificationService(db, wss);
   if (app) {
-    notificationsRoutes(app, db, wss);
+    notificationsRoutes(app, db, wss, origins, publicPath, notificationService);
   }
-  const notificationService = NotificationService(db, wss);
   console.log("[DEBUG] WSS in notification init:", wss);
-  setInterval(() => {
-    notificationService.processPendingNotifications();
-  }, 6e4);
+  let isProcessing = false;
+  setInterval(async () => {
+    if (isProcessing) return;
+    isProcessing = true;
+    try {
+      await notificationService.processPendingNotifications();
+    } catch (error) {
+      console.error("Error in processPendingNotifications:", error);
+    } finally {
+      isProcessing = false;
+    }
+  }, 1e4);
 }
 const models = {
   NotificationModel,

package/dist/notifications.server.js

@@ -5,17 +5,53 @@ import { m as mailing } from "./mailing-C11EYWm-.js";
 import admin from "firebase-admin";
 import path from "path";
 import webpush from "web-push";
-const NotificationsController = (db, wss) => {
+const NotificationsController = (db, wss, notificationService) => {
   const create = async (req, res) => {
     try {
       const notification = await db.notification.create(req.body);
-      const notificationService = notification(db, wss);
-      notificationService.processNotification(notification);
+      await notificationService.processNotification(notification);
       return res.status(201).json(notification);
     } catch (err) {
       return res.status(500).json({ message: err.message });
     }
   };
+  const createBatch = async (req, res) => {
+    console.log("=== Batch notifications endpoint ===");
+    console.log("Request body:", JSON.stringify(req.body, null, 2));
+    try {
+      const { notifications } = req.body;
+      if (!notifications || !Array.isArray(notifications)) {
+        console.error("Invalid request: notifications array is required");
+        return res.status(400).json({ message: "notifications array is required" });
+      }
+      console.log("Creating notifications count:", notifications.length);
+      const createdNotifications = await db.notification.insertMany(notifications);
+      console.log("Created notifications:", createdNotifications.map((n) => n._id));
+      setImmediate(() => {
+        Promise.allSettled(createdNotifications.map(
+          (notif) => notificationService.processNotification(notif)
+        )).then((results) => {
+          const failures = results.filter((r) => r.status === "rejected");
+          if (failures.length > 0) {
+            console.error(
+              "Batch notification processing errors:",
+              failures.map((f) => f.reason?.message || f.reason)
+            );
+          }
+          console.log(`Batch processing complete: ${results.length - failures.length}/${results.length} successful`);
+        });
+      });
+      return res.status(201).json({
+        message: "Batch notifications created",
+        count: createdNotifications.length
+      });
+    } catch (err) {
+      console.error("=== Batch notifications error ===");
+      console.error("Error:", err.message);
+      console.error("Stack:", err.stack);
+      return res.status(500).json({ message: err.message });
+    }
+  };
   const getUserNotifications = async (req, res) => {
     try {
       const userId = req.params.userId;
@@ -50,7 +86,7 @@ const NotificationsController = (db, wss) => {
   const markAllAsRead = async (req, res) => {
     try {
       const userId = req.params.userId;
-      const result = await db.notification.updateMany({ userId, status: "unread" }, { status: "read", updatedAt: Date.now() });
+      const result = await db.notification.updateMany({ userId, status: { $in: ["sent", "unread"] } }, { status: "read", updatedAt: Date.now() });
       const updatedNotifications = await db.notification.find({
         userId,
         status: "read",
@@ -132,6 +168,7 @@ const NotificationsController = (db, wss) => {
   };
   return {
     create,
+    createBatch,
     getUserNotifications,
     markAsRead,
     registerDevice,
@@ -200,10 +237,11 @@ const UserDeviceModel = (db, additionalFields = {}) => {
   schema.index({ userId: 1, deviceId: 1 }, { unique: true });
   return db.mongoose.model("UserDevice", schema);
 };
-const notificationsRoutes = (app, db, wss, origins, publicPath) => {
-  const controller = NotificationsController(db, wss);
+const notificationsRoutes = (app, db, wss, origins, publicPath, notificationService) => {
+  const controller = NotificationsController(db, wss, notificationService);
   app.get("/api/notifications/user/:userId", controller.getUserNotifications);
   app.post("/api/notifications", controller.create);
+  app.post("/api/notifications/batch", controller.createBatch);
   app.put("/api/notifications/:id/read", controller.markAsRead);
   app.put("/api/notifications/user/:userId/read-all", controller.markAllAsRead);
   app.post("/api/notifications/devices/register", controller.registerDevice);
@@ -371,7 +409,7 @@ const NotificationService = function(db, wss) {
     try {
       const userId = notification.userId.toString();
       const preferences = await db.notificationPreference.find({
-        userId
+        userId: new ObjectId(userId)
         // notificationType: notification.type
       });
       console.log("userId", userId);
@@ -391,55 +429,106 @@ const NotificationService = function(db, wss) {
         // whatsapp: sendWhatsAppNotification
       };
       const userDevices = await db.userDevice.find({
-        userId,
+        userId: new ObjectId(userId),
         isActive: true
       });
+      console.log("=== CHANNEL SELECTION DEBUG ===");
+      console.log("userDevices found:", userDevices.length);
+      console.log("userDevices:", userDevices);
+      console.log("user.email:", user.email);
+      console.log("user.phoneNumber:", user.phoneNumber);
+      console.log("preferences.length:", preferences.length);
       let channels = ["web"];
+      if (userDevices.length > 0) {
+        channels.push("push");
+        console.log("Added push channel - devices found");
+      } else {
+        console.log("No push channel - no devices found");
+      }
       if (user.email) {
         channels.push("email");
+        console.log("Added email channel");
       }
       if (user.phoneNumber) {
         channels.push("sms");
+        console.log("Added SMS channel");
       }
       if (preferences.length > 0) {
         channels = preferences.filter((pref) => pref.isEnabled).map((pref) => pref.channelType);
+        console.log("Overridden with user preferences:", channels);
       }
-      console.log("channels", channels);
+      console.log("=== FINAL CHANNELS ===", channels);
+      const channelPromises = [];
       for (const channel of channels) {
+        console.log(`=== PREPARING CHANNEL: ${channel} ===`);
         const sendFunc = channelRouters[channel];
-        if (sendFunc) {
-          try {
-            if (channel === "push") {
-              for (const device of userDevices) {
-                await sendFunc(notification, user, device);
-              }
-            } else {
-              await sendFunc(notification, user);
-            }
-            await db.notification.findByIdAndUpdate(notification._id, {
-              status: "sent",
-              updatedAt: Date.now()
-            });
-            await db.notificationLog.create({
-              notificationId: notification._id,
-              userId: notification.userId,
-              channelType: channel,
-              status: "sent",
-              sentAt: Date.now()
-            });
-          } catch (error) {
-            console.error(`Error sending ${channel} notification:`, error);
-            await db.notificationLog.create({
-              notificationId: notification._id,
-              userId: notification.userId,
-              channelType: channel,
-              status: "failed",
-              error: error.message,
-              sentAt: Date.now()
-            });
+        if (!sendFunc) {
+          channelPromises.push(Promise.resolve({
+            channel,
+            success: false,
+            error: "No send function"
+          }));
+          continue;
+        }
+        if (channel === "push") {
+          console.log(`Preparing push to ${userDevices.length} devices`);
+          for (const device of userDevices) {
+            channelPromises.push(
+              sendFunc(notification, user, device).then(() => {
+                console.log(`Push sent successfully to device ${device.deviceId}`);
+                return { channel: "push", deviceId: device.deviceId, success: true };
+              }).catch((err) => {
+                console.error(`Push failed for device ${device.deviceId}:`, err);
+                return { channel: "push", deviceId: device.deviceId, success: false, error: err.message };
+              })
+            );
+          }
+        } else {
+          channelPromises.push(
+            sendFunc(notification, user).then(() => {
+              console.log(`${channel} notification sent successfully`);
+              return { channel, success: true };
+            }).catch((err) => {
+              console.error(`${channel} notification failed:`, err);
+              return { channel, success: false, error: err.message };
+            })
+          );
+        }
+      }
+      console.log(`=== PROCESSING ${channelPromises.length} PARALLEL OPERATIONS ===`);
+      const results = await Promise.allSettled(channelPromises);
+      const logs = [];
+      const channelSuccessMap = /* @__PURE__ */ new Map();
+      results.forEach(({ status, value }) => {
+        if (status === "fulfilled" && value) {
+          const logEntry = {
+            notificationId: notification._id,
+            userId: notification.userId,
+            channelType: value.channel,
+            status: value.success ? "sent" : "failed",
+            sentAt: Date.now()
+          };
+          if (!value.success) {
+            logEntry.error = value.error;
+          }
+          logs.push(logEntry);
+          if (value.success) {
+            channelSuccessMap.set(value.channel, true);
           }
         }
+      });
+      if (logs.length > 0) {
+        setImmediate(() => db.notificationLog.insertMany(logs).catch(console.error));
+        console.log(`Scheduled ${logs.length} logs for batch insertion`);
       }
+      const hasSuccessfulSend = channelSuccessMap.size > 0;
+      console.log(`=== PROCESSING COMPLETE - Success: ${hasSuccessfulSend} ===`);
+      setImmediate(() => {
+        db.notification.findByIdAndUpdate(notification._id, {
+          status: hasSuccessfulSend ? "sent" : "failed",
+          updatedAt: Date.now()
+        }).catch(console.error);
+      });
     } catch (error) {
       console.error("Error processing notification:", error);
       await db.notification.findByIdAndUpdate(notification._id, {
@@ -511,14 +600,23 @@ function initializeNotifications(app, db, wss, origins, publicPath) {
   db.notificationPreference = NotificationPreferenceModel(db);
   db.notificationLog = NotificationLogModel(db);
   getInstance(db);
+  const notificationService = NotificationService(db, wss);
   if (app) {
-    notificationsRoutes(app, db, wss);
+    notificationsRoutes(app, db, wss, origins, publicPath, notificationService);
   }
-  const notificationService = NotificationService(db, wss);
   console.log("[DEBUG] WSS in notification init:", wss);
-  setInterval(() => {
-    notificationService.processPendingNotifications();
-  }, 6e4);
+  let isProcessing = false;
+  setInterval(async () => {
+    if (isProcessing) return;
+    isProcessing = true;
+    try {
+      await notificationService.processPendingNotifications();
+    } catch (error) {
+      console.error("Error in processPendingNotifications:", error);
+    } finally {
+      isProcessing = false;
+    }
+  }, 1e4);
 }
 const models = {
   NotificationModel,