@astralibx/email-rule-engine 6.0.0 → 7.0.0

package/dist/index.mjs

@@ -71,7 +71,18 @@ function createEmailTemplateSchema(platformValues, audienceValues, categoryValue
       textBody: String,
       subjects: { type: [{ type: String }], required: true, validate: [(v) => v.length >= 1, "At least one subject is required"] },
       bodies: { type: [{ type: String }], required: true, validate: [(v) => v.length >= 1, "At least one body is required"] },
-      fields: { type: Schema.Types.Mixed, default: {} },
+      preheaders: [{ type: String }],
+      fields: {
+        type: Schema.Types.Mixed,
+        default: {},
+        validate: {
+          validator: (v) => {
+            if (!v || typeof v !== "object") return true;
+            return Object.values(v).every((val) => typeof val === "string");
+          },
+          message: "All field values must be strings"
+        }
+      },
       variables: [{ type: String }],
       version: { type: Number, default: 1 },
       isActive: { type: Boolean, default: true, index: true }
@@ -106,6 +117,7 @@ function createEmailTemplateSchema(platformValues, audienceValues, categoryValue
             textBody: input.textBody,
             subjects: input.subjects,
             bodies: input.bodies,
+            preheaders: input.preheaders || [],
             fields: input.fields || {},
             variables: input.variables || [],
             version: 1,
@@ -216,6 +228,7 @@ function createEmailRuleSendSchema(collectionPrefix) {
       subject: { type: String },
       subjectIndex: { type: Number },
       bodyIndex: { type: Number },
+      preheaderIndex: { type: Number },
       failureReason: { type: String }
     },
     {
@@ -440,7 +453,7 @@ var TemplateRenderService = class {
     const textBodyFn = textBody ? Handlebars.compile(textBody, { strict: true }) : void 0;
     return { subjectFn, bodyFn, textBodyFn };
   }
-  compileBatchVariants(subjects, bodies, textBody) {
+  compileBatchVariants(subjects, bodies, textBody, preheaders) {
     const subjectFns = subjects.map((s) => Handlebars.compile(s, { strict: true }));
     const bodyFns = bodies.map((b) => {
       const mjmlSource = wrapInMjml(b);
@@ -448,7 +461,8 @@ var TemplateRenderService = class {
       return Handlebars.compile(htmlWithHandlebars, { strict: true });
     });
     const textBodyFn = textBody ? Handlebars.compile(textBody, { strict: true }) : void 0;
-    return { subjectFns, bodyFns, textBodyFn };
+    const preheaderFns = preheaders && preheaders.length > 0 ? preheaders.map((p) => Handlebars.compile(p, { strict: true })) : void 0;
+    return { subjectFns, bodyFns, textBodyFn, preheaderFns };
   }
   renderFromCompiled(compiled, data) {
     const subject = compiled.subjectFn(data);
@@ -560,6 +574,7 @@ var UPDATEABLE_FIELDS = /* @__PURE__ */ new Set([
   "textBody",
   "subjects",
   "bodies",
+  "preheaders",
   "variables",
   "isActive",
   "fields"
@@ -602,7 +617,7 @@ var TemplateService = class {
         throw new TemplateSyntaxError(`Template validation failed: ${validation.errors.join("; ")}`, validation.errors);
       }
     }
-    const allContent = [...subjects, ...bodies, input.textBody || ""].join(" ");
+    const allContent = [...subjects, ...bodies, ...input.preheaders || [], input.textBody || ""].join(" ");
     const variables = input.variables || this.renderService.extractVariables(allContent);
     return this.EmailTemplate.createTemplate({
       ...input,
@@ -630,11 +645,12 @@ var TemplateService = class {
         }
       }
     }
-    if (input.textBody || input.subjects || input.bodies) {
+    if (input.textBody || input.subjects || input.bodies || input.preheaders) {
       const subjects = input.subjects ?? template.subjects;
       const bodies = input.bodies ?? template.bodies;
+      const preheaders = input.preheaders ?? template.preheaders ?? [];
       const textBody = input.textBody ?? template.textBody;
-      const allContent = [...subjects, ...bodies, textBody || ""].join(" ");
+      const allContent = [...subjects, ...bodies, ...preheaders, textBody || ""].join(" ");
       input.variables = this.renderService.extractVariables(allContent);
     }
     const setFields = {};
@@ -644,7 +660,7 @@ var TemplateService = class {
       }
     }
     const update = { $set: setFields };
-    if (input.textBody || input.subjects || input.bodies) {
+    if (input.textBody || input.subjects || input.bodies || input.preheaders) {
       update["$inc"] = { version: 1 };
     }
     return this.EmailTemplate.findByIdAndUpdate(
@@ -896,6 +912,21 @@ var RedisLock = class {
 var MS_PER_DAY = 864e5;
 var DEFAULT_LOCK_TTL_MS = 30 * 60 * 1e3;
 var IDENTIFIER_CHUNK_SIZE = 50;
+function getLocalDate(date, timezone) {
+  if (!timezone) return date;
+  const parts = new Intl.DateTimeFormat("en-US", {
+    timeZone: timezone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    hour12: false
+  }).formatToParts(date);
+  const get = (type) => parts.find((p) => p.type === type)?.value || "0";
+  return /* @__PURE__ */ new Date(`${get("year")}-${get("month")}-${get("day")}T${get("hour")}:${get("minute")}:${get("second")}`);
+}
 async function processInChunks(items, fn, chunkSize) {
   const results = [];
   for (let i = 0; i < items.length; i += chunkSize) {
@@ -969,9 +1000,18 @@ var RuleRunnerService = class {
       const throttleConfig = await this.EmailThrottleConfig.getConfig();
       const allActiveRules = await this.EmailRule.findActive();
       const now = /* @__PURE__ */ new Date();
+      const tz = this.config.options?.sendWindow?.timezone;
       const activeRules = allActiveRules.filter((rule) => {
-        if (rule.validFrom && now < new Date(rule.validFrom)) return false;
-        if (rule.validTill && now > new Date(rule.validTill)) return false;
+        if (rule.validFrom) {
+          const localNow = getLocalDate(now, tz);
+          const localValidFrom = getLocalDate(new Date(rule.validFrom), tz);
+          if (localNow < localValidFrom) return false;
+        }
+        if (rule.validTill) {
+          const localNow = getLocalDate(now, tz);
+          const localValidTill = getLocalDate(new Date(rule.validTill), tz);
+          if (localNow > localValidTill) return false;
+        }
         return true;
       });
       this.config.hooks?.onRunStart?.({ rulesCount: activeRules.length, triggeredBy });
@@ -1128,10 +1168,12 @@ var RuleRunnerService = class {
         sendMap.set(uid, send);
       }
     }
+    const preheaders = template.preheaders || [];
     const compiledVariants = this.templateRenderer.compileBatchVariants(
       template.subjects,
       template.bodies,
-      template.textBody
+      template.textBody,
+      preheaders
     );
     let totalProcessed = 0;
     for (let i = 0; i < emailsToProcess.length; i++) {
@@ -1187,6 +1229,15 @@ var RuleRunnerService = class {
         let finalHtml = renderedHtml;
         let finalText = renderedText;
         let finalSubject = renderedSubject;
+        let pi;
+        if (compiledVariants.preheaderFns && compiledVariants.preheaderFns.length > 0) {
+          pi = Math.floor(Math.random() * compiledVariants.preheaderFns.length);
+          const renderedPreheader = compiledVariants.preheaderFns[pi](templateData);
+          if (renderedPreheader) {
+            const preheaderHtml = `<div style="display:none;font-size:1px;color:#ffffff;line-height:1px;max-height:0px;max-width:0px;opacity:0;overflow:hidden;">${renderedPreheader}</div>`;
+            finalHtml = finalHtml.replace(/(<body[^>]*>)/i, `$1${preheaderHtml}`);
+          }
+        }
         if (this.config.hooks?.beforeSend) {
           try {
             const modified = await this.config.hooks.beforeSend({
@@ -1229,7 +1280,7 @@ var RuleRunnerService = class {
           dedupKey,
           identifier.id,
           void 0,
-          { status: "sent", accountId: agentSelection.accountId, subject: finalSubject, subjectIndex: si, bodyIndex: bi }
+          { status: "sent", accountId: agentSelection.accountId, subject: finalSubject, subjectIndex: si, bodyIndex: bi, preheaderIndex: pi }
         );
         const current = throttleMap.get(dedupKey) || { today: 0, thisWeek: 0, lastSentDate: null };
         throttleMap.set(dedupKey, {
@@ -1262,24 +1313,16 @@ var RuleRunnerService = class {
       $inc: { totalSent: stats.sent, totalSkipped: stats.skipped }
     });
     if (rule.sendOnce) {
-      const allIdentifiers = rule.target.identifiers;
+      const allIdentifiers = rule.target.identifiers || [];
+      const totalIdentifiers = new Set(allIdentifiers.map((e) => e.toLowerCase().trim()).filter(Boolean)).size;
       const sends = await this.EmailRuleSend.find({
         ruleId: rule._id
       }).lean();
       const sentOrProcessedIds = new Set(
         sends.filter((s) => s.status !== "throttled").map((s) => String(s.userId || s.emailIdentifierId))
       );
-      let pendingCount = 0;
-      for (const email of allIdentifiers) {
-        const identifier = identifierMap.get(email.toLowerCase().trim());
-        if (!identifier) continue;
-        if (!sentOrProcessedIds.has(String(identifier.id))) {
-          pendingCount++;
-        }
-      }
       const throttledCount = sends.filter((s) => s.status === "throttled").length;
-      pendingCount += throttledCount;
-      if (pendingCount === 0) {
+      if (sentOrProcessedIds.size >= totalIdentifiers && throttledCount === 0) {
         await this.EmailRule.findByIdAndUpdate(rule._id, { $set: { isActive: false } });
         this.logger.info(`Rule '${rule.name}' auto-disabled \u2014 all identifiers processed`);
       }
@@ -1324,10 +1367,12 @@ var RuleRunnerService = class {
         identifierMap.set(result.email, { id: result.id, contactId: result.contactId });
       }
     }
+    const preheadersQ = template.preheaders || [];
     const compiledVariants = this.templateRenderer.compileBatchVariants(
       template.subjects,
       template.bodies,
-      template.textBody
+      template.textBody,
+      preheadersQ
     );
     const ruleId = rule._id.toString();
     const templateId = rule.templateId.toString();
@@ -1390,6 +1435,15 @@ var RuleRunnerService = class {
         let finalHtml = renderedHtml;
         let finalText = renderedText;
         let finalSubject = renderedSubject;
+        let pi;
+        if (compiledVariants.preheaderFns && compiledVariants.preheaderFns.length > 0) {
+          pi = Math.floor(Math.random() * compiledVariants.preheaderFns.length);
+          const renderedPreheader = compiledVariants.preheaderFns[pi](templateData);
+          if (renderedPreheader) {
+            const preheaderHtml = `<div style="display:none;font-size:1px;color:#ffffff;line-height:1px;max-height:0px;max-width:0px;opacity:0;overflow:hidden;">${renderedPreheader}</div>`;
+            finalHtml = finalHtml.replace(/(<body[^>]*>)/i, `$1${preheaderHtml}`);
+          }
+        }
         if (this.config.hooks?.beforeSend) {
           try {
             const modified = await this.config.hooks.beforeSend({
@@ -1432,7 +1486,7 @@ var RuleRunnerService = class {
           userId,
           identifier.id,
           void 0,
-          { status: "sent", accountId: agentSelection.accountId, subject: finalSubject, subjectIndex: si, bodyIndex: bi }
+          { status: "sent", accountId: agentSelection.accountId, subject: finalSubject, subjectIndex: si, bodyIndex: bi, preheaderIndex: pi }
         );
         const current = throttleMap.get(userId) || { today: 0, thisWeek: 0, lastSentDate: null };
         throttleMap.set(userId, {
@@ -1661,7 +1715,7 @@ function createTemplateController(templateService, options) {
   }
   async function create(req, res) {
     try {
-      const { name, subjects, bodies, category, audience, platform } = req.body;
+      const { name, subjects, bodies, category, audience, platform, preheaders } = req.body;
       if (!name || !subjects || subjects.length === 0 || !bodies || bodies.length === 0 || !category || !audience || !platform) {
         return res.status(400).json({ success: false, error: "name, subjects, bodies, category, audience, and platform are required" });
       }