update

ts/mail/delivery/smtpserver/starttls-handler.ts

@@ -11,7 +11,7 @@ import {
   type ICertificateData
 } from './certificate-utils.js';
 import { getSocketDetails } from './utils/helpers.js';
-import type { ISmtpSession } from './interfaces.js';
+import type { ISmtpSession, ISessionManager, IConnectionManager } from './interfaces.js';
 import { SmtpState } from '../interfaces.js';
 
 /**
@@ -24,6 +24,8 @@ export async function performStartTLS(
     cert: string;
     ca?: string;
     session?: ISmtpSession;
+    sessionManager?: ISessionManager;
+    connectionManager?: IConnectionManager;
     onSuccess?: (tlsSocket: plugins.tls.TLSSocket) => void;
     onFailure?: (error: Error) => void;
     updateSessionState?: (session: ISmtpSession, state: SmtpState) => void;
@@ -190,6 +192,34 @@ export async function performStartTLS(
           cipher: cipher?.name || 'unknown'
         });
         
+        // Update socket mapping in session manager
+        if (options.sessionManager) {
+          const socketReplaced = options.sessionManager.replaceSocket(socket, tlsSocket);
+          if (!socketReplaced) {
+            SmtpLogger.error('Failed to replace socket in session manager after STARTTLS', {
+              remoteAddress: socketDetails.remoteAddress,
+              remotePort: socketDetails.remotePort
+            });
+          }
+        }
+        
+        // Re-attach event handlers from connection manager
+        if (options.connectionManager) {
+          try {
+            options.connectionManager.setupSocketEventHandlers(tlsSocket);
+            SmtpLogger.debug('Successfully re-attached connection manager event handlers to TLS socket', {
+              remoteAddress: socketDetails.remoteAddress,
+              remotePort: socketDetails.remotePort
+            });
+          } catch (handlerError) {
+            SmtpLogger.error('Failed to re-attach event handlers to TLS socket after STARTTLS', {
+              remoteAddress: socketDetails.remoteAddress,
+              remotePort: socketDetails.remotePort,
+              error: handlerError instanceof Error ? handlerError : new Error(String(handlerError))
+            });
+          }
+        }
+        
         // Update session if provided
         if (options.session) {
           // Update session properties to indicate TLS is active