@astralibx/email-rule-engine 8.0.0 → 10.0.0

package/dist/index.cjs

@@ -93,7 +93,7 @@ function createEmailTemplateSchema(platformValues, audienceValues, categoryValue
       },
       variables: [{ type: String }],
       version: { type: Number, default: 1 },
-      isActive: { type: Boolean, default: true, index: true }
+      isActive: { type: Boolean, default: true }
     },
     {
       timestamps: true,
@@ -160,13 +160,13 @@ function createEmailRuleSchema(platformValues, audienceValues, collectionPrefix)
     sent: { type: Number, default: 0 },
     skipped: { type: Number, default: 0 },
     skippedByThrottle: { type: Number, default: 0 },
-    errors: { type: Number, default: 0 }
+    errorCount: { type: Number, default: 0 }
   }, { _id: false });
   const schema = new mongoose.Schema(
     {
       name: { type: String, required: true },
       description: String,
-      isActive: { type: Boolean, default: false, index: true },
+      isActive: { type: Boolean, default: false },
       sortOrder: { type: Number, default: 10 },
       target: { type: RuleTargetSchema, required: true },
       templateId: { type: mongoose.Schema.Types.ObjectId, ref: "EmailTemplate", required: true, index: true },
@@ -278,14 +278,14 @@ function createEmailRuleRunLogSchema(collectionPrefix) {
     sent: { type: Number, default: 0 },
     skipped: { type: Number, default: 0 },
     skippedByThrottle: { type: Number, default: 0 },
-    errors: { type: Number, default: 0 }
+    errorCount: { type: Number, default: 0 }
   }, { _id: false });
   const TotalStatsSchema = new mongoose.Schema({
     matched: { type: Number, default: 0 },
     sent: { type: Number, default: 0 },
     skipped: { type: Number, default: 0 },
     skippedByThrottle: { type: Number, default: 0 },
-    errors: { type: Number, default: 0 }
+    errorCount: { type: Number, default: 0 }
   }, { _id: false });
   const schema = new mongoose.Schema(
     {
@@ -1034,7 +1034,7 @@ var RuleRunnerService = class {
           triggeredBy,
           duration: Date.now() - runStartTime,
           rulesProcessed: 0,
-          totalStats: { matched: 0, sent: 0, skipped: 0, skippedByThrottle: 0, errors: 0 },
+          totalStats: { matched: 0, sent: 0, skipped: 0, skippedByThrottle: 0, errorCount: 0 },
           perRuleStats: [],
           status: "completed"
         });
@@ -1070,9 +1070,9 @@ var RuleRunnerService = class {
         });
         const stats = await this.executeRule(rule, throttleMap, throttleConfig, templateMap, runId);
         totalSent += stats.sent;
-        totalFailed += stats.errors;
+        totalFailed += stats.errorCount;
         totalSkipped += stats.skipped + stats.skippedByThrottle;
-        totalInvalid += stats.matched - stats.sent - stats.skipped - stats.skippedByThrottle - stats.errors;
+        totalInvalid += stats.matched - stats.sent - stats.skipped - stats.skippedByThrottle - stats.errorCount;
         perRuleStats.push({
           ruleId: rule._id.toString(),
           ruleName: rule.name,
@@ -1096,9 +1096,9 @@ var RuleRunnerService = class {
           sent: acc.sent + s.sent,
           skipped: acc.skipped + s.skipped,
           skippedByThrottle: acc.skippedByThrottle + s.skippedByThrottle,
-          errors: acc.errors + s.errors
+          errorCount: acc.errorCount + s.errorCount
         }),
-        { matched: 0, sent: 0, skipped: 0, skippedByThrottle: 0, errors: 0 }
+        { matched: 0, sent: 0, skipped: 0, skippedByThrottle: 0, errorCount: 0 }
       );
       await this.EmailRuleRunLog.create({
         runId,
@@ -1129,11 +1129,11 @@ var RuleRunnerService = class {
     return { runId };
   }
   async executeRule(rule, throttleMap, throttleConfig, templateMap, runId) {
-    const stats = { matched: 0, sent: 0, skipped: 0, skippedByThrottle: 0, errors: 0 };
+    const stats = { matched: 0, sent: 0, skipped: 0, skippedByThrottle: 0, errorCount: 0 };
     const template = templateMap?.get(rule.templateId.toString()) ?? await this.EmailTemplate.findById(rule.templateId);
     if (!template) {
       this.logger.error(`Rule "${rule.name}": template ${rule.templateId} not found`);
-      stats.errors = 1;
+      stats.errorCount = 1;
       return stats;
     }
     const isListMode = rule.target?.mode === "list";
@@ -1268,7 +1268,7 @@ var RuleRunnerService = class {
             finalSubject = modified.subject;
           } catch (hookErr) {
             this.logger.error(`beforeSend hook failed for email ${email}: ${hookErr.message}`);
-            stats.errors++;
+            stats.errorCount++;
             this.config.hooks?.onSend?.({ ruleId, ruleName: rule.name, email, status: "error" });
             continue;
           }
@@ -1311,7 +1311,7 @@ var RuleRunnerService = class {
           }
         }
       } catch (err) {
-        stats.errors++;
+        stats.errorCount++;
         this.config.hooks?.onSend?.({ ruleId, ruleName: rule.name, email, status: "error" });
         this.logger.error(`Rule "${rule.name}" failed for identifier ${email}`, { error: err });
       }
@@ -1344,7 +1344,7 @@ var RuleRunnerService = class {
       users = await this.config.adapters.queryUsers(rule.target, rule.maxPerRun || this.config.options?.defaultMaxPerRun || 500);
     } catch (err) {
       this.logger.error(`Rule "${rule.name}": query failed`, { error: err });
-      stats.errors = 1;
+      stats.errorCount = 1;
       return stats;
     }
     stats.matched = users.length;
@@ -1474,7 +1474,7 @@ var RuleRunnerService = class {
             finalSubject = modified.subject;
           } catch (hookErr) {
             this.logger.error(`beforeSend hook failed for email ${email}: ${hookErr.message}`);
-            stats.errors++;
+            stats.errorCount++;
             this.config.hooks?.onSend?.({ ruleId, ruleName: rule.name, email, status: "error" });
             continue;
           }
@@ -1517,7 +1517,7 @@ var RuleRunnerService = class {
           }
         }
       } catch (err) {
-        stats.errors++;
+        stats.errorCount++;
         this.config.hooks?.onSend?.({ ruleId, ruleName: rule.name, email: user.email || "unknown", status: "error" });
         this.logger.error(`Rule "${rule.name}" failed for user ${user._id?.toString()}`, { error: err });
       }
@@ -1613,7 +1613,7 @@ var RuleRunnerService = class {
       }
     }
     progress.sent = stats.sent;
-    progress.failed = stats.errors;
+    progress.failed = stats.errorCount;
     progress.skipped = stats.skipped + stats.skippedByThrottle;
     await this.redis.hset(key, "progress", JSON.stringify(progress));
     await this.redis.expire(key, 3600);
@@ -2110,24 +2110,22 @@ function createRoutes(deps) {
   const ruleRouter = express.Router();
   ruleRouter.get("/", ruleCtrl.list);
   ruleRouter.post("/", ruleCtrl.create);
-  ruleRouter.get("/run-history", ruleCtrl.runHistory);
   ruleRouter.get("/:id", ruleCtrl.getById);
   ruleRouter.patch("/:id", ruleCtrl.update);
   ruleRouter.delete("/:id", ruleCtrl.remove);
-  ruleRouter.patch("/:id/toggle", ruleCtrl.toggleActive);
+  ruleRouter.post("/:id/toggle", ruleCtrl.toggleActive);
   ruleRouter.post("/:id/dry-run", ruleCtrl.dryRun);
   const runnerRouter = express.Router();
   runnerRouter.post("/", runnerCtrl.triggerManualRun);
   runnerRouter.get("/status", runnerCtrl.getLatestRun);
   runnerRouter.get("/status/:runId", runnerCtrl.getStatusByRunId);
   runnerRouter.post("/cancel/:runId", runnerCtrl.cancelRun);
-  const settingsRouter = express.Router();
-  settingsRouter.get("/throttle", settingsCtrl.getThrottleConfig);
-  settingsRouter.patch("/throttle", settingsCtrl.updateThrottleConfig);
+  runnerRouter.get("/logs", ruleCtrl.runHistory);
   router.use("/templates", templateRouter);
   router.use("/rules", ruleRouter);
   router.use("/runner", runnerRouter);
-  router.use("/settings", settingsRouter);
+  router.get("/throttle", settingsCtrl.getThrottleConfig);
+  router.put("/throttle", settingsCtrl.updateThrottleConfig);
   return router;
 }
 var configSchema = zod.z.object({