@infuro/cms-core 1.0.64 → 1.0.66

package/dist/{chunk-OJAYCNE5.js → chunk-NV5IRHI3.js}

@@ -1,5 +1,5 @@
 import { queueWhatsApp } from './chunk-GWDI752Q.js';
-import { notificationTriggerEmitter } from './chunk-AYWDQFJZ.js';
+import { notifyLog, logFcmToken, maskNotifyEmail, maskNotifyPhone, notificationTriggerEmitter } from './chunk-FLUF2GZH.js';
 import { sesRegionSupportsSmtp, sesSmtpHost, EmailService, renderLayout } from './chunk-6YOQ7G5O.js';
 import { queueEmail } from './chunk-TU23GJPJ.js';
 import { mergeEmailLayoutCompanyDetails } from './chunk-YRCKEGL2.js';
@@ -217,7 +217,8 @@ async function loadOrderNotificationContexts(orderId, deps) {
   const contact = {
     name: metaBuyerName || rawContact.name,
     email: metaBuyerEmail || metaCheckoutEmail || rawContact.email,
-    phone: rawContact.phone
+    phone: rawContact.phone,
+    userId: rawContact.userId ?? null
   };
   const currency = String(o.currency ?? "INR");
   const siteUrl = resolvePublicSiteUrl();
@@ -1400,12 +1401,6 @@ var ORDER_NOTIFICATION_DEFAULTS = {
 
 // src/lib/order-notification-dispatcher.ts
 var initialized = false;
-function maskPhone2(raw) {
-  const digits = String(raw ?? "").replace(/\D/g, "");
-  if (digits.length <= 4) return "(none)";
-  return `***${digits.slice(-4)}`;
-}
-__name(maskPhone2, "maskPhone");
 async function getSettingsGroup(dataSource, entityMap, group) {
   if (!entityMap.configs) return {};
   const rows = await dataSource.getRepository(entityMap.configs).find({
@@ -1508,7 +1503,17 @@ async function loadBoundTemplate(triggerKey, channel, audienceType = "customers"
         enabled: true
       }
     }).catch(() => null);
-    if (!template) {
+    let resolvedTemplate = template;
+    if (!resolvedTemplate && (channel === "mobile" || channel === "push")) {
+      resolvedTemplate = await dataSource.getRepository(entityMap.message_templates).findOne({
+        where: {
+          id: templateId,
+          deleted: false,
+          enabled: true
+        }
+      }).catch(() => null);
+    }
+    if (!resolvedTemplate) {
       const defChannel = ORDER_NOTIFICATION_DEFAULTS[channel];
       const def = defChannel ? defChannel[triggerKey] : null;
       if (def) {
@@ -1533,7 +1538,7 @@ async function loadBoundTemplate(triggerKey, channel, audienceType = "customers"
       });
       return null;
     }
-    return template;
+    return resolvedTemplate;
   } catch (err) {
     const defChannel = ORDER_NOTIFICATION_DEFAULTS[channel];
     const def = defChannel ? defChannel[triggerKey] : null;
@@ -1615,11 +1620,26 @@ async function sendPushNotificationForTrigger(triggerKey, orderId, audienceType,
   if (!template) {
     template = await loadBoundTemplate(triggerKey, "push", audienceType, dataSource, entityMap);
   }
-  if (!template || !template.body) return;
+  if (!template || !template.body) {
+    notifyLog.skip("PUSH", "no mobile/push template or empty body", {
+      triggerKey,
+      orderId,
+      audienceType,
+      targetId
+    });
+    return;
+  }
   const rawTitle = template.subject?.trim() || "Order Notification";
   const title = applyTemplateVars(rawTitle, variables);
   const body = applyTemplateVars(template.body, variables);
-  if (!entityMap.user_device_tokens) return;
+  if (!entityMap.user_device_tokens) {
+    notifyLog.skip("PUSH", "user_device_tokens entity not registered", {
+      triggerKey,
+      orderId,
+      audienceType
+    });
+    return;
+  }
   const tokenRepo = dataSource.getRepository(entityMap.user_device_tokens);
   let targetTokens = [];
   try {
@@ -1654,19 +1674,67 @@ async function sendPushNotificationForTrigger(triggerKey, orderId, audienceType,
       });
     }
   } catch (err) {
-    console.error("[order-notifications] Error querying device tokens for push", err);
+    notifyLog.error("PUSH", "device token query failed", {
+      triggerKey,
+      orderId,
+      audienceType,
+      targetId,
+      error: err instanceof Error ? err.message : String(err)
+    });
     return;
   }
-  for (const t of targetTokens) {
-    if (t.token?.trim()) {
-      await sendFcmPushNotification(dataSource, entityMap, {
-        token: t.token.trim(),
-        title,
-        body,
-        data: {
-          orderId: String(orderId),
-          triggerKey
-        }
+  const tokens = targetTokens.map((t) => t.token?.trim()).filter(Boolean);
+  notifyLog.push("sending", {
+    triggerKey,
+    orderId,
+    audienceType,
+    targetId,
+    title,
+    tokenCount: tokens.length,
+    fcmTokens: tokens.map((t) => logFcmToken(t))
+  });
+  if (tokens.length === 0) {
+    notifyLog.skip("PUSH", "no active FCM tokens for target", {
+      triggerKey,
+      orderId,
+      audienceType,
+      targetId,
+      hint: "App must POST /api/user-device-tokens after login"
+    });
+    return;
+  }
+  for (const token of tokens) {
+    notifyLog.push("FCM target", {
+      triggerKey,
+      orderId,
+      audienceType,
+      targetId,
+      fcmToken: logFcmToken(token)
+    });
+    const res = await sendFcmPushNotification(dataSource, entityMap, {
+      token,
+      title,
+      body,
+      data: {
+        orderId: String(orderId),
+        triggerKey
+      }
+    });
+    if (res.success) {
+      notifyLog.push("FCM sent", {
+        triggerKey,
+        orderId,
+        audienceType,
+        fcmToken: logFcmToken(token),
+        messageId: res.messageId ?? null
+      });
+    } else {
+      notifyLog.error("PUSH", "FCM send failed", {
+        triggerKey,
+        orderId,
+        audienceType,
+        fcmToken: logFcmToken(token),
+        error: res.error ?? "unknown"
       });
     }
   }
@@ -1810,7 +1878,15 @@ function formatBodyForEmailHtml(body) {
 __name(formatBodyForEmailHtml, "formatBodyForEmailHtml");
 async function sendEmailForTrigger(triggerKey, orderId, audienceType, variables, contactEmail, dataSource, entityMap, getCms) {
   const template = await loadBoundTemplate(triggerKey, "email", audienceType, dataSource, entityMap);
-  if (!template) return;
+  if (!template) {
+    notifyLog.skip("EMAIL", "no bound/default email template", {
+      triggerKey,
+      orderId,
+      audienceType,
+      to: maskNotifyEmail(contactEmail)
+    });
+    return;
+  }
   const [branding, emailSettings, storeSettings] = await Promise.all([
     getSettingsGroup(dataSource, entityMap, "branding"),
     getSettingsGroup(dataSource, entityMap, "email"),
@@ -1845,22 +1921,31 @@ async function sendEmailForTrigger(triggerKey, orderId, audienceType, variables,
       attachInvoice: true
     } : {}
   });
-  console.log("[order-notifications] email queued", {
+  notifyLog.email("queued", {
     triggerKey,
     audienceType,
     orderId,
-    to: contactEmail,
+    to: maskNotifyEmail(contactEmail),
+    subject,
     attachInvoice: shouldAttachInvoice
   });
 }
 __name(sendEmailForTrigger, "sendEmailForTrigger");
 async function sendWhatsAppForTrigger(triggerKey, orderId, phone, variables, dataSource, entityMap, getCms) {
   const template = await loadBoundTemplate(triggerKey, "whatsapp", "customers", dataSource, entityMap);
-  if (!template) return;
+  if (!template) {
+    notifyLog.skip("WHATSAPP", "no bound/default WhatsApp template", {
+      triggerKey,
+      orderId,
+      phone: maskNotifyPhone(phone)
+    });
+    return;
+  }
   const paramOrder = template.providerMeta?.paramOrder ?? [];
   if (paramOrder.length === 0) {
-    console.warn("[order-notifications] WhatsApp template has no paramOrder set \u2014 variables may send blank/wrong", {
-      triggerKey
+    notifyLog.skip("WHATSAPP", "template has no paramOrder \u2014 variables may send blank/wrong", {
+      triggerKey,
+      orderId
     });
   }
   const cms = await getCms();
@@ -1869,8 +1954,10 @@ async function sendWhatsAppForTrigger(triggerKey, orderId, phone, variables, dat
     name: template.name
   });
   if (!metaTemplateName) {
-    console.warn("[order-notifications] bound WhatsApp template has no Meta template name", {
+    notifyLog.skip("WHATSAPP", "template has no Meta template name", {
       triggerKey,
+      orderId,
+      phone: maskNotifyPhone(phone),
       templateId: template.id
     });
     return;
@@ -1885,37 +1972,57 @@ async function sendWhatsAppForTrigger(triggerKey, orderId, phone, variables, dat
     templateParamOrder: paramOrder
   });
   if (!sent) {
-    console.warn("[order-notifications] WhatsApp send failed", {
+    notifyLog.error("WHATSAPP", "send failed / not queued", {
       triggerKey,
       orderId,
+      phone: maskNotifyPhone(phone),
       hint: "Register whatsappPlugin() + queuePlugin() in getCms(), or set WHATSAPP_ACCESS_TOKEN and WHATSAPP_PHONE_NUMBER_ID"
     });
   } else {
-    console.log("[order-notifications] WhatsApp queued/sent", {
+    notifyLog.whatsapp("queued/sent", {
       triggerKey,
       orderId,
-      phone: maskPhone2(phone)
+      phone: maskNotifyPhone(phone),
+      metaTemplateName
     });
   }
 }
 __name(sendWhatsAppForTrigger, "sendWhatsAppForTrigger");
 async function handleTrigger(triggerKey, payload, dataSource, entityMap, getCms) {
-  console.log("[order-notifications] received", {
+  notifyLog.trigger("dispatcher received", {
     triggerKey,
     orderId: payload.orderId,
-    phone: maskPhone2(payload.customerPhone)
+    orderNumber: payload.orderNumber,
+    phone: maskNotifyPhone(payload.customerPhone),
+    vendorId: payload.vendorId ?? null
   });
   const [emailChannelEnabled, whatsappChannelEnabled, pushChannelEnabled] = await Promise.all([
     isEmailNotificationsEnabled(dataSource, entityMap),
     isWhatsappNotificationsEnabled(dataSource, entityMap),
     isPushNotificationsEnabled(dataSource, entityMap)
   ]);
+  notifyLog.trigger("channel switches", {
+    triggerKey,
+    orderId: payload.orderId,
+    email: emailChannelEnabled,
+    whatsapp: whatsappChannelEnabled,
+    push: pushChannelEnabled
+  });
   if (!emailChannelEnabled && !whatsappChannelEnabled && !pushChannelEnabled) {
-    console.warn("[order-notifications] skip: Email, WhatsApp, and Mobile Push notifications are disabled");
+    notifyLog.skip("ALL", "Email, WhatsApp, and Mobile Push are disabled in event_notifications", {
+      triggerKey,
+      orderId: payload.orderId
+    });
     return;
   }
   const triggerEnabled = await isTriggerCatalogEnabled(triggerKey, dataSource, entityMap);
-  if (!triggerEnabled) return;
+  if (!triggerEnabled) {
+    notifyLog.skip("TRIGGER", "trigger catalog disabled", {
+      triggerKey,
+      orderId: payload.orderId
+    });
+    return;
+  }
   const context = await loadOrderNotificationContexts(payload.orderId, {
     dataSource,
     entityMap
@@ -1923,37 +2030,86 @@ async function handleTrigger(triggerKey, payload, dataSource, entityMap, getCms)
   const variables = mergeTriggerVariables(payload, context?.variables);
   const contactEmail = context?.contact.email?.trim() || "";
   const contactPhone = context?.contact.phone?.trim() || payload.customerPhone?.trim() || "";
+  notifyLog.trigger("recipients resolved", {
+    triggerKey,
+    orderId: payload.orderId,
+    contactEmail: maskNotifyEmail(contactEmail),
+    contactPhone: maskNotifyPhone(contactPhone)
+  });
   if (emailChannelEnabled) {
     const [customerEnabled, vendorEnabled, adminEnabled] = await Promise.all([
       isAudienceEmailEnabled(dataSource, entityMap, "customer"),
       isAudienceEmailEnabled(dataSource, entityMap, "vendor"),
       isAudienceEmailEnabled(dataSource, entityMap, "admin")
     ]);
+    notifyLog.email("audience switches", {
+      triggerKey,
+      orderId: payload.orderId,
+      customer: customerEnabled,
+      vendor: vendorEnabled,
+      admin: adminEnabled
+    });
     if (triggerKey === "order_assigned_assignee") {
       const assigneeEmail = context?.order?.assignedUser?.email?.trim();
       if (assigneeEmail) {
         await sendEmailForTrigger(triggerKey, payload.orderId, "customers", variables, assigneeEmail, dataSource, entityMap, getCms);
+      } else {
+        notifyLog.skip("EMAIL", "order_assigned_assignee has no assignee email", {
+          triggerKey,
+          orderId: payload.orderId
+        });
       }
     } else if (customerEnabled && contactEmail) {
       await sendEmailForTrigger(triggerKey, payload.orderId, "customers", variables, contactEmail, dataSource, entityMap, getCms);
+    } else if (!customerEnabled) {
+      notifyLog.skip("EMAIL", "customer email audience disabled", {
+        triggerKey,
+        orderId: payload.orderId
+      });
+    } else {
+      notifyLog.skip("EMAIL", "no customer email on order contact", {
+        triggerKey,
+        orderId: payload.orderId
+      });
     }
     if (vendorEnabled && triggerKey !== "order_assigned_assignee") {
       const multiVendorSettings = await getSettingsGroup(dataSource, entityMap, "multi_vendor");
       if (multiVendorSettings.enabled !== "false" && multiVendorSettings.enabled !== "0") {
         const vendorEmails = await getOrderVendorEmails(payload.orderId, payload.vendorId, dataSource, entityMap);
+        if (vendorEmails.length === 0) {
+          notifyLog.skip("EMAIL", "no vendor emails for order", {
+            triggerKey,
+            orderId: payload.orderId,
+            vendorId: payload.vendorId ?? null
+          });
+        }
         for (const vEmail of vendorEmails) {
           await sendEmailForTrigger(triggerKey, payload.orderId, "vendors", variables, vEmail, dataSource, entityMap, getCms);
         }
+      } else {
+        notifyLog.skip("EMAIL", "multi-vendor off \u2014 skip vendor email", {
+          triggerKey,
+          orderId: payload.orderId
+        });
       }
     }
     if (adminEnabled && triggerKey !== "order_assigned_assignee") {
       const adminEmails = await getAdminRecipientEmails(dataSource, entityMap);
+      if (adminEmails.length === 0) {
+        notifyLog.skip("EMAIL", "no admin recipient emails", {
+          triggerKey,
+          orderId: payload.orderId
+        });
+      }
       for (const aEmail of adminEmails) {
         await sendEmailForTrigger(triggerKey, payload.orderId, "admin", variables, aEmail, dataSource, entityMap, getCms);
       }
     }
   } else {
-    console.log("[order-notifications] skip email: Email notifications channel is disabled");
+    notifyLog.skip("EMAIL", "email channel disabled", {
+      triggerKey,
+      orderId: payload.orderId
+    });
   }
   if (pushChannelEnabled) {
     const [pushCustomerEnabled, pushVendorEnabled, pushAdminEnabled] = await Promise.all([
@@ -1961,29 +2117,59 @@ async function handleTrigger(triggerKey, payload, dataSource, entityMap, getCms)
       isAudiencePushEnabled(dataSource, entityMap, "vendor"),
       isAudiencePushEnabled(dataSource, entityMap, "admin")
     ]);
-    const targetCustomerId = triggerKey === "order_assigned_assignee" ? context?.order?.assignedUser?.id : context?.order?.customerContactId || context?.order?.contactId || context?.order?.userId || context?.order?.id;
+    notifyLog.push("audience switches", {
+      triggerKey,
+      orderId: payload.orderId,
+      customer: pushCustomerEnabled,
+      vendor: pushVendorEnabled,
+      admin: pushAdminEnabled
+    });
+    const targetCustomerId = triggerKey === "order_assigned_assignee" ? context?.order?.assignedUser?.id : context?.contact?.userId;
     if (pushCustomerEnabled && targetCustomerId) {
       await sendPushNotificationForTrigger(triggerKey, payload.orderId, "customers", String(targetCustomerId), variables, dataSource, entityMap);
+    } else if (!pushCustomerEnabled) {
+      notifyLog.skip("PUSH", "customer push audience disabled", {
+        triggerKey,
+        orderId: payload.orderId
+      });
+    } else {
+      notifyLog.skip("PUSH", "no customer user/contact id for push", {
+        triggerKey,
+        orderId: payload.orderId
+      });
     }
     if (pushVendorEnabled && payload.vendorId && triggerKey !== "order_assigned_assignee") {
       await sendPushNotificationForTrigger(triggerKey, payload.orderId, "vendors", String(payload.vendorId), variables, dataSource, entityMap);
+    } else if (pushVendorEnabled && triggerKey !== "order_assigned_assignee" && !payload.vendorId) {
+      notifyLog.skip("PUSH", "no vendorId on order \u2014 skip vendor push", {
+        triggerKey,
+        orderId: payload.orderId
+      });
     }
     if (pushAdminEnabled && triggerKey !== "order_assigned_assignee") {
       await sendPushNotificationForTrigger(triggerKey, payload.orderId, "admin", "admin", variables, dataSource, entityMap);
     }
+  } else {
+    notifyLog.skip("PUSH", "push channel disabled", {
+      triggerKey,
+      orderId: payload.orderId
+    });
   }
   if (whatsappChannelEnabled) {
     const targetPhone = triggerKey === "order_assigned_assignee" ? context?.order?.assignedUser?.phone?.trim() : contactPhone;
     if (targetPhone) {
       await sendWhatsAppForTrigger(triggerKey, payload.orderId, targetPhone, variables, dataSource, entityMap, getCms);
     } else {
-      console.warn("[order-notifications] skip WhatsApp: no recipient phone", {
+      notifyLog.skip("WHATSAPP", "no recipient phone", {
         triggerKey,
         orderId: payload.orderId
       });
     }
   } else {
-    console.log("[order-notifications] skip WhatsApp: WhatsApp notifications channel is disabled");
+    notifyLog.skip("WHATSAPP", "WhatsApp channel disabled", {
+      triggerKey,
+      orderId: payload.orderId
+    });
   }
 }
 __name(handleTrigger, "handleTrigger");
@@ -1997,10 +2183,21 @@ function initWhatsappTriggerDispatcher(deps) {
   });
   notificationTriggerEmitter.onAnyTrigger((triggerKey, payload) => {
     void handleTrigger(triggerKey, payload, dataSource, entityMap, getCms).catch((err) => {
-      console.error("[order-notifications]", triggerKey, err);
+      notifyLog.error("TRIGGER", "dispatcher handleTrigger failed", {
+        triggerKey,
+        orderId: payload.orderId,
+        error: err instanceof Error ? err.message : String(err),
+        stack: err instanceof Error ? err.stack : void 0
+      });
     });
   });
-  console.log("[order-notifications] dispatcher initialized (email + WhatsApp, unified via order_notification_bindings)");
+  notifyLog.trigger("dispatcher initialized", {
+    channels: [
+      "email",
+      "whatsapp",
+      "push"
+    ]
+  });
 }
 __name(initWhatsappTriggerDispatcher, "initWhatsappTriggerDispatcher");
 async function dispatchOrderNotificationDirectly(triggerKey, payload, dataSource, entityMap, getCms) {

package/dist/chunk-PA6YDMFZ.cjs

@@ -0,0 +1,78 @@
+'use strict';
+
+var chunkUSNT2KNT_cjs = require('./chunk-USNT2KNT.cjs');
+var events = require('events');
+
+var KNOWN_NOTIFICATION_TRIGGERS = {
+  ORDER_PENDING: "order_pending",
+  ORDER_PROCESSING: "order_processing",
+  ORDER_COMPLETED: "order_completed",
+  ORDER_PLACED: "order_placed",
+  ORDER_CANCELLED: "order_cancelled",
+  PAYMENT_SUCCESS: "payment_success",
+  PAYMENT_FAILED: "payment_failed",
+  PAYMENT_REFUND_INITIATED: "payment_refund_initiated"
+};
+var NotificationTriggerEmitter = class NotificationTriggerEmitter2 extends events.EventEmitter {
+  static {
+    chunkUSNT2KNT_cjs.__name(this, "NotificationTriggerEmitter");
+  }
+  emitTrigger(triggerKey, payload) {
+    this.emit("__any__", triggerKey, payload);
+  }
+  onAnyTrigger(listener) {
+    this.on("__any__", listener);
+  }
+};
+var notificationTriggerEmitter = new NotificationTriggerEmitter();
+
+// src/lib/notify-log.ts
+function maskNotifyPhone(raw) {
+  const digits = String(raw ?? "").replace(/\D/g, "");
+  if (digits.length <= 4) return "(none)";
+  return `***${digits.slice(-4)}`;
+}
+chunkUSNT2KNT_cjs.__name(maskNotifyPhone, "maskNotifyPhone");
+function maskNotifyEmail(raw) {
+  const e = String(raw ?? "").trim();
+  if (!e || !e.includes("@")) return "(none)";
+  const [user, domain] = e.split("@");
+  const u = user.length <= 2 ? "**" : `${user.slice(0, 2)}***`;
+  return `${u}@${domain}`;
+}
+chunkUSNT2KNT_cjs.__name(maskNotifyEmail, "maskNotifyEmail");
+function logFcmToken(raw) {
+  const s = String(raw ?? "").trim();
+  return s || "(none)";
+}
+chunkUSNT2KNT_cjs.__name(logFcmToken, "logFcmToken");
+function write(level, channel, message, data) {
+  const banner = `========== [NOTIFY] ${channel} | ${message} ==========`;
+  const payload = data ?? {};
+  if (level === "error") {
+    console.error(`
+${banner}`, payload);
+  } else if (level === "warn") {
+    console.warn(`
+${banner}`, payload);
+  } else {
+    console.info(`
+${banner}`, payload);
+  }
+}
+chunkUSNT2KNT_cjs.__name(write, "write");
+var notifyLog = {
+  trigger: /* @__PURE__ */ chunkUSNT2KNT_cjs.__name((message, data) => write("info", "TRIGGER", message, data), "trigger"),
+  email: /* @__PURE__ */ chunkUSNT2KNT_cjs.__name((message, data) => write("info", "EMAIL", message, data), "email"),
+  whatsapp: /* @__PURE__ */ chunkUSNT2KNT_cjs.__name((message, data) => write("info", "WHATSAPP", message, data), "whatsapp"),
+  push: /* @__PURE__ */ chunkUSNT2KNT_cjs.__name((message, data) => write("info", "PUSH", message, data), "push"),
+  skip: /* @__PURE__ */ chunkUSNT2KNT_cjs.__name((channel, message, data) => write("warn", `SKIP ${channel}`, message, data), "skip"),
+  error: /* @__PURE__ */ chunkUSNT2KNT_cjs.__name((channel, message, data) => write("error", channel, message, data), "error")
+};
+
+exports.KNOWN_NOTIFICATION_TRIGGERS = KNOWN_NOTIFICATION_TRIGGERS;
+exports.logFcmToken = logFcmToken;
+exports.maskNotifyEmail = maskNotifyEmail;
+exports.maskNotifyPhone = maskNotifyPhone;
+exports.notificationTriggerEmitter = notificationTriggerEmitter;
+exports.notifyLog = notifyLog;