@astralibx/email-rule-engine 5.0.0 → 6.0.0

package/dist/index.d.mts

@@ -92,6 +92,8 @@ interface EmailRule {
     cooldownDays?: number;
     autoApprove: boolean;
     maxPerRun?: number;
+    validFrom?: Date;
+    validTill?: Date;
     bypassThrottle: boolean;
     emailType: EmailType;
     totalSent: number;
@@ -112,6 +114,8 @@ interface CreateEmailRuleInput {
     cooldownDays?: number;
     autoApprove?: boolean;
     maxPerRun?: number;
+    validFrom?: Date;
+    validTill?: Date;
     bypassThrottle?: boolean;
     emailType?: EmailType;
 }
@@ -127,6 +131,8 @@ interface UpdateEmailRuleInput {
     cooldownDays?: number;
     autoApprove?: boolean;
     maxPerRun?: number;
+    validFrom?: Date;
+    validTill?: Date;
     bypassThrottle?: boolean;
     emailType?: EmailType;
 }
@@ -289,6 +295,7 @@ interface EmailTemplate {
     textBody?: string;
     subjects: string[];
     bodies: string[];
+    fields?: Record<string, string>;
     variables: string[];
     version: number;
     isActive: boolean;
@@ -305,6 +312,7 @@ interface CreateEmailTemplateInput {
     textBody?: string;
     subjects: string[];
     bodies: string[];
+    fields?: Record<string, string>;
     variables?: string[];
 }
 interface UpdateEmailTemplateInput {
@@ -316,6 +324,7 @@ interface UpdateEmailTemplateInput {
     textBody?: string;
     subjects?: string[];
     bodies?: string[];
+    fields?: Record<string, string>;
     variables?: string[];
     isActive?: boolean;
 }

package/dist/index.d.ts

@@ -92,6 +92,8 @@ interface EmailRule {
     cooldownDays?: number;
     autoApprove: boolean;
     maxPerRun?: number;
+    validFrom?: Date;
+    validTill?: Date;
     bypassThrottle: boolean;
     emailType: EmailType;
     totalSent: number;
@@ -112,6 +114,8 @@ interface CreateEmailRuleInput {
     cooldownDays?: number;
     autoApprove?: boolean;
     maxPerRun?: number;
+    validFrom?: Date;
+    validTill?: Date;
     bypassThrottle?: boolean;
     emailType?: EmailType;
 }
@@ -127,6 +131,8 @@ interface UpdateEmailRuleInput {
     cooldownDays?: number;
     autoApprove?: boolean;
     maxPerRun?: number;
+    validFrom?: Date;
+    validTill?: Date;
     bypassThrottle?: boolean;
     emailType?: EmailType;
 }
@@ -289,6 +295,7 @@ interface EmailTemplate {
     textBody?: string;
     subjects: string[];
     bodies: string[];
+    fields?: Record<string, string>;
     variables: string[];
     version: number;
     isActive: boolean;
@@ -305,6 +312,7 @@ interface CreateEmailTemplateInput {
     textBody?: string;
     subjects: string[];
     bodies: string[];
+    fields?: Record<string, string>;
     variables?: string[];
 }
 interface UpdateEmailTemplateInput {
@@ -316,6 +324,7 @@ interface UpdateEmailTemplateInput {
     textBody?: string;
     subjects?: string[];
     bodies?: string[];
+    fields?: Record<string, string>;
     variables?: string[];
     isActive?: boolean;
 }

package/dist/index.js

@@ -79,6 +79,7 @@ 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: mongoose.Schema.Types.Mixed, default: {} },
       variables: [{ type: String }],
       version: { type: Number, default: 1 },
       isActive: { type: Boolean, default: true, index: true }
@@ -113,6 +114,7 @@ function createEmailTemplateSchema(platformValues, audienceValues, categoryValue
             textBody: input.textBody,
             subjects: input.subjects,
             bodies: input.bodies,
+            fields: input.fields || {},
             variables: input.variables || [],
             version: 1,
             isActive: true
@@ -161,6 +163,8 @@ function createEmailRuleSchema(platformValues, audienceValues, collectionPrefix)
       cooldownDays: Number,
       autoApprove: { type: Boolean, default: true },
       maxPerRun: Number,
+      validFrom: { type: Date },
+      validTill: { type: Date },
       bypassThrottle: { type: Boolean, default: false },
       emailType: { type: String, enum: Object.values(EMAIL_TYPE), default: EMAIL_TYPE.Automated },
       totalSent: { type: Number, default: 0 },
@@ -191,6 +195,8 @@ function createEmailRuleSchema(platformValues, audienceValues, collectionPrefix)
             cooldownDays: input.cooldownDays,
             autoApprove: input.autoApprove ?? true,
             maxPerRun: input.maxPerRun,
+            validFrom: input.validFrom,
+            validTill: input.validTill,
             bypassThrottle: input.bypassThrottle ?? false,
             emailType: input.emailType ?? EMAIL_TYPE.Automated,
             totalSent: 0,
@@ -563,7 +569,8 @@ var UPDATEABLE_FIELDS = /* @__PURE__ */ new Set([
   "subjects",
   "bodies",
   "variables",
-  "isActive"
+  "isActive",
+  "fields"
 ]);
 function slugify(name) {
   return name.toLowerCase().trim().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
@@ -727,7 +734,9 @@ var UPDATEABLE_FIELDS2 = /* @__PURE__ */ new Set([
   "autoApprove",
   "maxPerRun",
   "bypassThrottle",
-  "emailType"
+  "emailType",
+  "validFrom",
+  "validTill"
 ]);
 function validateRuleTemplateCompat(targetRole, targetPlatform, template) {
   const templateAudience = template.audience;
@@ -966,7 +975,13 @@ var RuleRunnerService = class {
     let runStatus = "completed";
     try {
       const throttleConfig = await this.EmailThrottleConfig.getConfig();
-      const activeRules = await this.EmailRule.findActive();
+      const allActiveRules = await this.EmailRule.findActive();
+      const now = /* @__PURE__ */ new Date();
+      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;
+        return true;
+      });
       this.config.hooks?.onRunStart?.({ rulesCount: activeRules.length, triggeredBy });
       await this.updateRunProgress(runId, {
         progress: { rulesTotal: activeRules.length, rulesCompleted: 0, sent: 0, failed: 0, skipped: 0, invalid: 0 }
@@ -1170,7 +1185,8 @@ var RuleRunnerService = class {
           continue;
         }
         const user = { _id: identifier.id, email };
-        const templateData = this.config.adapters.resolveData(user);
+        const resolvedData = this.config.adapters.resolveData(user);
+        const templateData = { ...template.fields || {}, ...resolvedData };
         const si = Math.floor(Math.random() * compiledVariants.subjectFns.length);
         const bi = Math.floor(Math.random() * compiledVariants.bodyFns.length);
         const renderedSubject = compiledVariants.subjectFns[si](templateData);
@@ -1253,6 +1269,29 @@ var RuleRunnerService = class {
       $set: { lastRunAt: /* @__PURE__ */ new Date(), lastRunStats: stats },
       $inc: { totalSent: stats.sent, totalSkipped: stats.skipped }
     });
+    if (rule.sendOnce) {
+      const allIdentifiers = rule.target.identifiers;
+      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) {
+        await this.EmailRule.findByIdAndUpdate(rule._id, { $set: { isActive: false } });
+        this.logger.info(`Rule '${rule.name}' auto-disabled \u2014 all identifiers processed`);
+      }
+    }
     this.config.hooks?.onRuleComplete?.({ ruleId, ruleName: rule.name, stats });
     return stats;
   }
@@ -1349,7 +1388,8 @@ var RuleRunnerService = class {
           this.config.hooks?.onSend?.({ ruleId, ruleName: rule.name, email, status: "skipped" });
           continue;
         }
-        const templateData = this.config.adapters.resolveData(user);
+        const resolvedData = this.config.adapters.resolveData(user);
+        const templateData = { ...template.fields || {}, ...resolvedData };
         const si = Math.floor(Math.random() * compiledVariants.subjectFns.length);
         const bi = Math.floor(Math.random() * compiledVariants.bodyFns.length);
         const renderedSubject = compiledVariants.subjectFns[si](templateData);