@push.rocks/smartmta 9.4.0 → 9.4.1

package/ts/mail/delivery/classes.delivery.system.ts

@@ -148,6 +148,10 @@ export class MultiModeDeliverySystem extends EventEmitter {
   private emailServer?: UnifiedEmailServer;
   private bounceDrainTimer?: NodeJS.Timeout;
   private bounceDrainPromise?: Promise<void>;
+  private readonly queueItemsReadyHandler = (items: IQueueItem[]): Promise<void> =>
+    this.processItems(items);
+  private queueListenerRegistered = false;
+  private lifecycleGeneration = 0;
   private pendingSmtpAuthenticationUpdates = new Map<string, {
     itemId: string;
     transactionId: string;
@@ -225,8 +229,18 @@ export class MultiModeDeliverySystem extends EventEmitter {
       }
     };
     
-    // Set up event listeners
-    this.queue.on('itemsReady', this.processItems.bind(this));
+  }
+
+  private registerQueueListener(): void {
+    if (this.queueListenerRegistered) return;
+    this.queue.on('itemsReady', this.queueItemsReadyHandler);
+    this.queueListenerRegistered = true;
+  }
+
+  private unregisterQueueListener(): void {
+    if (!this.queueListenerRegistered) return;
+    this.queue.off('itemsReady', this.queueItemsReadyHandler);
+    this.queueListenerRegistered = false;
   }
 
   private createEmailForRecipients(email: Email, recipients: string[]): Email {
@@ -510,14 +524,33 @@ export class MultiModeDeliverySystem extends EventEmitter {
       return;
     }
     
+    const lifecycleGeneration = ++this.lifecycleGeneration;
     this.running = true;
-    await this.drainBounceOutbox();
-    this.bounceDrainTimer = setInterval(() => {
-      void this.drainBounceOutbox();
-    }, 30_000);
-
-    await emitSafely(this, 'started');
-    logger.log('info', 'MultiModeDeliverySystem started successfully');
+    this.registerQueueListener();
+    try {
+      await this.drainBounceOutbox();
+      if (!this.running || lifecycleGeneration !== this.lifecycleGeneration) return;
+
+      this.bounceDrainTimer = setInterval(() => {
+        void this.drainBounceOutbox();
+      }, 30_000);
+
+      await emitSafely(this, 'started');
+      if (!this.running || lifecycleGeneration !== this.lifecycleGeneration) return;
+
+      this.queue.wake();
+      logger.log('info', 'MultiModeDeliverySystem started successfully');
+    } catch (error) {
+      if (lifecycleGeneration === this.lifecycleGeneration) {
+        this.running = false;
+        this.unregisterQueueListener();
+        if (this.bounceDrainTimer) {
+          clearInterval(this.bounceDrainTimer);
+          this.bounceDrainTimer = undefined;
+        }
+      }
+      throw error;
+    }
   }
   
   /**
@@ -527,11 +560,15 @@ export class MultiModeDeliverySystem extends EventEmitter {
     logger.log('info', 'Stopping MultiModeDeliverySystem');
     
     if (!this.running) {
+      this.unregisterQueueListener();
       logger.log('warn', 'MultiModeDeliverySystem is already stopped');
       return;
     }
+
+    const lifecycleGeneration = ++this.lifecycleGeneration;
     
     this.running = false;
+    this.unregisterQueueListener();
     if (this.bounceDrainTimer) {
       clearInterval(this.bounceDrainTimer);
       this.bounceDrainTimer = undefined;
@@ -542,6 +579,10 @@ export class MultiModeDeliverySystem extends EventEmitter {
       clearTimeout(this.throttleResetTimer);
       this.throttleResetTimer = null;
     }
+    this.throttled = false;
+    this.rateLimitCounter = 0;
+    this.rateLimitLastCheck = Date.now();
+    this.stats.rateLimiting.currentRate = 0;
 
     // Wait for active deliveries to complete
     if (this.activeDeliveries.size > 0) {
@@ -566,6 +607,8 @@ export class MultiModeDeliverySystem extends EventEmitter {
     }
     
     await this.bounceDrainPromise;
+    if (lifecycleGeneration !== this.lifecycleGeneration) return;
+
     await emitSafely(this, 'stopped');
     logger.log('info', 'MultiModeDeliverySystem stopped successfully');
   }
@@ -585,17 +628,15 @@ export class MultiModeDeliverySystem extends EventEmitter {
       return;
     }
     
-    // Check rate limiting
-    if (this.checkRateLimit()) {
-      logger.log('debug', 'Rate limit exceeded, throttling deliveries');
-      return;
-    }
-    
     let startedDeliveries = 0;
 
     for (const item of items) {
       if (this.activeDeliveries.size >= this.options.concurrentDeliveries) break;
       if (this.activeDeliveries.has(item.id)) continue;
+      if (this.checkRateLimit()) {
+        logger.log('debug', 'Rate limit exceeded, throttling deliveries');
+        break;
+      }
 
       // Reserve synchronously before the first await so overlapping queue events
       // cannot dispatch the same item while its durable claim is in flight.
@@ -818,6 +859,7 @@ export class MultiModeDeliverySystem extends EventEmitter {
       
       // Update statistics
       await emitSafely(this, 'statsUpdated', this.stats);
+      this.queue.wake();
     }
   }
   
@@ -1403,7 +1445,6 @@ export class MultiModeDeliverySystem extends EventEmitter {
       this.rateLimitCounter = 0;
       this.throttled = false;
       this.stats.rateLimiting.currentRate = 0;
-      return false;
     }
     
     // Check if we're already throttled
@@ -1411,15 +1452,9 @@ export class MultiModeDeliverySystem extends EventEmitter {
       return true;
     }
     
-    // Increment counter
-    this.rateLimitCounter++;
-    
-    // Calculate current rate (emails per minute)
-    const rate = (this.rateLimitCounter / elapsed) * 60000;
-    this.stats.rateLimiting.currentRate = rate;
-    
-    // Check if rate limit is exceeded
-    if (rate > this.options.globalRateLimit) {
+    // Use a fixed one-minute window. Extrapolating the first delivery from a
+    // few elapsed milliseconds falsely throttles every freshly started queue.
+    if (this.rateLimitCounter >= this.options.globalRateLimit) {
       this.throttled = true;
       this.stats.rateLimiting.throttled++;
       
@@ -1434,10 +1469,16 @@ export class MultiModeDeliverySystem extends EventEmitter {
         this.rateLimitLastCheck = Date.now();
         this.rateLimitCounter = 0;
         this.stats.rateLimiting.currentRate = 0;
+        if (this.running) {
+          this.queue.wake();
+        }
       }, resetDelay);
       
       return true;
     }
+
+    this.rateLimitCounter++;
+    this.stats.rateLimiting.currentRate = this.rateLimitCounter;
     
     return false;
   }