update

ts/mail/routing/classes.email.config.ts

@@ -1,9 +1,9 @@
 import * as plugins from '../../plugins.js';
 
-/**
- * Email processing modes
- */
-export type EmailProcessingMode = 'forward' | 'mta' | 'process';
+import type { EmailProcessingMode } from '../delivery/interfaces.js';
+
+// Re-export EmailProcessingMode type
+export type { EmailProcessingMode };
 
 /**
  * Consolidated email configuration interface

ts/mail/routing/classes.unified.email.server.ts

@@ -18,7 +18,6 @@ import {
 import { DomainRouter } from './classes.domain.router.js';
 import type { 
   IEmailConfig, 
-  EmailProcessingMode,
   IDomainRule 
 } from './classes.email.config.js';
 import { Email } from '../core/classes.email.js';
@@ -29,6 +28,18 @@ import * as stream from 'node:stream';
 import { SMTPServer as MtaSmtpServer } from '../delivery/classes.smtpserver.js';
 import { MultiModeDeliverySystem, type IMultiModeDeliveryOptions } from '../delivery/classes.delivery.system.js';
 import { UnifiedDeliveryQueue, type IQueueOptions } from '../delivery/classes.delivery.queue.js';
+import { SmtpState } from '../delivery/interfaces.js';
+import type { EmailProcessingMode, ISmtpSession as IBaseSmtpSession } from '../delivery/interfaces.js';
+
+/**
+ * Extended SMTP session interface with domain rule information
+ */
+export interface IExtendedSmtpSession extends ISmtpSession {
+  /**
+   * Matched domain rule for this session
+   */
+  matchedRule?: IDomainRule;
+}
 
 /**
  * Options for the unified email server
@@ -78,41 +89,30 @@ export interface IUnifiedEmailServerOptions {
   reputationMonitorConfig?: IReputationMonitorConfig;
 }
 
+
 /**
- * Interface describing SMTP session data
+ * Extended SMTP session interface for UnifiedEmailServer
  */
-export interface ISmtpSession {
-  id: string;
-  remoteAddress: string;
-  clientHostname: string;
-  secure: boolean;
-  authenticated: boolean;
+export interface ISmtpSession extends IBaseSmtpSession {
+  /**
+   * User information if authenticated
+   */
   user?: {
     username: string;
     [key: string]: any;
   };
-  envelope: {
-    mailFrom: {
-      address: string;
-      args: any;
-    };
-    rcptTo: Array<{
-      address: string;
-      args: any;
-    }>;
-  };
-  processingMode?: EmailProcessingMode;
+  
+  /**
+   * Matched domain rule for this session
+   */
   matchedRule?: IDomainRule;
 }
 
 /**
  * Authentication data for SMTP
  */
-export interface IAuthData {
-  method: string;
-  username: string;
-  password: string;
-}
+import type { ISmtpAuth } from '../delivery/interfaces.js';
+export type IAuthData = ISmtpAuth;
 
 /**
  * Server statistics
@@ -330,6 +330,12 @@ export class UnifiedEmailServer extends EventEmitter {
             // Process based on the mode
             await this.processEmailByMode(email, { 
               id: 'session-' + Math.random().toString(36).substring(2),
+              state: SmtpState.FINISHED,
+              mailFrom: email.from,
+              rcptTo: email.to,
+              emailData: email.toRFC822String(), // Use the proper method to get the full email content
+              useTLS: false,
+              connectionEnded: true,
               remoteAddress: '127.0.0.1',
               clientHostname: '',
               secure: false,
@@ -431,7 +437,7 @@ export class UnifiedEmailServer extends EventEmitter {
   /**
    * Handle new SMTP connection with IP reputation checking
    */
-  private async onConnect(session: ISmtpSession, callback: (err?: Error) => void): Promise<void> {
+  private async onConnect(session: IExtendedSmtpSession, callback: (err?: Error) => void): Promise<void> {
     logger.log('info', `New connection from ${session.remoteAddress}`);
     
     // Update connection statistics
@@ -498,7 +504,7 @@ export class UnifiedEmailServer extends EventEmitter {
   /**
    * Handle authentication (stub implementation)
    */
-  private onAuth(auth: IAuthData, session: ISmtpSession, callback: (err?: Error, user?: any) => void): void {
+  private onAuth(auth: IAuthData, session: IExtendedSmtpSession, callback: (err?: Error, user?: any) => void): void {
     if (!this.options.auth || !this.options.auth.users || this.options.auth.users.length === 0) {
       // No authentication configured, reject
       const error = new Error('Authentication not supported');
@@ -564,7 +570,7 @@ export class UnifiedEmailServer extends EventEmitter {
   /**
    * Handle MAIL FROM command (stub implementation)
    */
-  private onMailFrom(address: {address: string}, session: ISmtpSession, callback: (err?: Error) => void): void {
+  private onMailFrom(address: {address: string}, session: IExtendedSmtpSession, callback: (err?: Error) => void): void {
     logger.log('info', `MAIL FROM: ${address.address}`);
     
     // Validate the email address
@@ -614,7 +620,7 @@ export class UnifiedEmailServer extends EventEmitter {
   /**
    * Handle RCPT TO command (stub implementation)
    */
-  private onRcptTo(address: {address: string}, session: ISmtpSession, callback: (err?: Error) => void): void {
+  private onRcptTo(address: {address: string}, session: IExtendedSmtpSession, callback: (err?: Error) => void): void {
     logger.log('info', `RCPT TO: ${address.address}`);
     
     // Validate the email address
@@ -658,7 +664,7 @@ export class UnifiedEmailServer extends EventEmitter {
   /**
    * Handle incoming email data (stub implementation)
    */
-  private onData(stream: stream.Readable, session: ISmtpSession, callback: (err?: Error) => void): void {
+  private onData(stream: stream.Readable, session: IExtendedSmtpSession, callback: (err?: Error) => void): void {
     logger.log('info', `Processing email data for session ${session.id}`);
     
     const startTime = Date.now();
@@ -762,7 +768,7 @@ export class UnifiedEmailServer extends EventEmitter {
   /**
    * Process email based on the determined mode
    */
-  public async processEmailByMode(emailData: Email | Buffer, session: ISmtpSession, mode: EmailProcessingMode): Promise<Email> {
+  public async processEmailByMode(emailData: Email | Buffer, session: IExtendedSmtpSession, mode: EmailProcessingMode): Promise<Email> {
     // Convert Buffer to Email if needed
     let email: Email;
     if (Buffer.isBuffer(emailData)) {
@@ -833,7 +839,7 @@ export class UnifiedEmailServer extends EventEmitter {
   /**
    * Handle email in forward mode (SMTP proxy)
    */
-  private async handleForwardMode(email: Email, session: ISmtpSession): Promise<void> {
+  private async handleForwardMode(email: Email, session: IExtendedSmtpSession): Promise<void> {
     logger.log('info', `Handling email in forward mode for session ${session.id}`);
     
     // Get target server information
@@ -927,7 +933,7 @@ export class UnifiedEmailServer extends EventEmitter {
   /**
    * Handle email in MTA mode (programmatic processing)
    */
-  private async handleMtaMode(email: Email, session: ISmtpSession): Promise<void> {
+  private async handleMtaMode(email: Email, session: IExtendedSmtpSession): Promise<void> {
     logger.log('info', `Handling email in MTA mode for session ${session.id}`);
     
     try {
@@ -1022,7 +1028,7 @@ export class UnifiedEmailServer extends EventEmitter {
   /**
    * Handle email in process mode (store-and-forward with scanning)
    */
-  private async handleProcessMode(email: Email, session: ISmtpSession): Promise<void> {
+  private async handleProcessMode(email: Email, session: IExtendedSmtpSession): Promise<void> {
     logger.log('info', `Handling email in process mode for session ${session.id}`);
     
     try {