@slicedearth/whoisleuth-cli 2.4.0 → 2.6.0

package/lib/smtp-transport-review.mjs

@@ -205,12 +205,17 @@ class SocketReplyReader {
     #endedError = null;
     bytesRead = 0;
     lineCount = 0;
+    #onData = (chunk) => this.#receive(chunk);
+    #onError = (error) => this.#fail(error);
+    #onEnd = () => this.#fail(new Error('SMTP server closed the connection before completing a reply.'));
+    #onTimeout = () => this.#fail(new Error('SMTP transport timed out.'));
     constructor(socket) {
         this.#socket = socket;
-        socket.on('data', (chunk) => this.#receive(Buffer.from(chunk)));
-        socket.once('error', (error) => this.#fail(error));
-        socket.once('end', () => this.#fail(new Error('SMTP server closed the connection before completing a reply.')));
-        socket.once('timeout', () => this.#fail(new Error('SMTP transport timed out.')));
+        socket.on('data', this.#onData);
+        socket.once('error', this.#onError);
+        socket.once('end', this.#onEnd);
+        socket.once('close', this.#onEnd);
+        socket.once('timeout', this.#onTimeout);
     }
     #receive(chunk) {
         if (this.#endedError)
@@ -281,10 +286,14 @@ class SocketReplyReader {
     }
     release() {
         this.assertIdle();
-        this.#socket.removeAllListeners('data');
-        this.#socket.removeAllListeners('error');
-        this.#socket.removeAllListeners('end');
-        this.#socket.removeAllListeners('timeout');
+        this.detach();
+    }
+    detach() {
+        this.#socket.removeListener('data', this.#onData);
+        this.#socket.removeListener('error', this.#onError);
+        this.#socket.removeListener('end', this.#onEnd);
+        this.#socket.removeListener('close', this.#onEnd);
+        this.#socket.removeListener('timeout', this.#onTimeout);
     }
 }
 function smtpStartTlsOptions(socket, hostname) {
@@ -297,10 +306,18 @@ function smtpStartTlsOptions(socket, hostname) {
         checkServerIdentity: () => undefined,
     };
 }
-async function defaultSmtpProbe(options) {
-    const socket = net.createConnection({ host: options.address, port: SMTP_PORT, family: options.family });
+async function defaultSmtpProbe(options, transport = {
+    connect: options => net.createConnection(options),
+    startTls: options => tls.connect(options),
+}) {
+    options.signal.throwIfAborted();
+    const socket = transport.connect({ host: options.address, port: SMTP_PORT, family: options.family });
+    let activeSocket = socket;
+    let reader = null;
     socket.setTimeout(options.timeoutMs);
-    const aborted = () => socket.destroy(new Error('SMTP endpoint review timed out.'));
+    // Closing the active phase rejects its pending read/handshake. Do not emit
+    // an unhandled error on the raw socket after ownership has moved to TLS.
+    const aborted = () => { activeSocket.destroy(); };
     options.signal.addEventListener('abort', aborted, { once: true });
     try {
         await new Promise((resolve, reject) => {
@@ -308,38 +325,48 @@ async function defaultSmtpProbe(options) {
                 socket.removeListener('connect', connected);
                 socket.removeListener('error', failed);
                 socket.removeListener('timeout', timedOut);
+                socket.removeListener('close', closed);
             };
             const connected = () => { cleanup(); resolve(); };
             const failed = (error) => { cleanup(); socket.destroy(); reject(error); };
             const timedOut = () => { cleanup(); socket.destroy(); reject(new Error('SMTP connection timed out.')); };
+            const closed = () => failed(new Error('SMTP connection closed before connecting.'));
             socket.once('connect', connected);
             socket.once('error', failed);
             socket.once('timeout', timedOut);
+            socket.once('close', closed);
             if (options.signal.aborted)
                 aborted();
         });
-        const reader = new SocketReplyReader(socket);
+        const replyReader = new SocketReplyReader(socket);
+        reader = replyReader;
         const connection = {
             remoteAddress: socket.remoteAddress || null,
-            readReply: () => reader.readReply(),
-            assertIdle: () => reader.assertIdle(),
+            readReply: () => replyReader.readReply(),
+            assertIdle: () => replyReader.assertIdle(),
             write: (command) => new Promise((resolve, reject) => socket.write(command, (error) => error ? reject(error) : resolve())),
             startTls: async (hostname) => {
-                reader.release();
-                const tlsSocket = tls.connect(smtpStartTlsOptions(socket, hostname));
+                replyReader.release();
+                const tlsSocket = transport.startTls(smtpStartTlsOptions(socket, hostname));
+                activeSocket = tlsSocket;
                 tlsSocket.setTimeout(options.timeoutMs);
                 await new Promise((resolve, reject) => {
                     const cleanup = () => {
                         tlsSocket.removeListener('secureConnect', secured);
                         tlsSocket.removeListener('error', failed);
                         tlsSocket.removeListener('timeout', timedOut);
+                        tlsSocket.removeListener('close', closed);
                     };
                     const secured = () => { cleanup(); resolve(); };
                     const failed = (error) => { cleanup(); tlsSocket.destroy(); reject(error); };
                     const timedOut = () => { cleanup(); tlsSocket.destroy(); reject(new Error('SMTP STARTTLS handshake timed out.')); };
+                    const closed = () => failed(new Error('SMTP STARTTLS connection closed before completing the handshake.'));
                     tlsSocket.once('secureConnect', secured);
                     tlsSocket.once('error', failed);
                     tlsSocket.once('timeout', timedOut);
+                    tlsSocket.once('close', closed);
+                    if (options.signal.aborted)
+                        aborted();
                 });
                 const cipher = tlsSocket.getCipher();
                 return Object.freeze({
@@ -351,13 +378,15 @@ async function defaultSmtpProbe(options) {
                     remoteAddress: tlsSocket.remoteAddress || null,
                 });
             },
-            diagnostics: () => ({ bytesRead: reader.bytesRead, lineCount: reader.lineCount }),
-            destroy: () => socket.destroy(),
+            diagnostics: () => ({ bytesRead: replyReader.bytesRead, lineCount: replyReader.lineCount }),
+            destroy: () => { activeSocket.destroy(); socket.destroy(); },
         };
         return await runSmtpConversation(options.hostname, connection);
     }
     finally {
         options.signal.removeEventListener('abort', aborted);
+        reader?.detach();
+        activeSocket.destroy();
         socket.destroy();
     }
 }
@@ -796,4 +825,4 @@ function formatMailTransportReview(review) {
         lines.push(`  - ${limitation}`);
     return `${lines.join('\n')}\n`;
 }
-export { EHLO_COMMAND, MAIL_TRANSPORT_INPUT_SCHEMA, MAIL_TRANSPORT_INPUT_VERSION, MAIL_TRANSPORT_REVIEW_SCHEMA, MAIL_TRANSPORT_REVIEW_VERSION, MAIL_TRANSPORT_TOTAL_TIMEOUT_MS, MAX_MAIL_TRANSPORT_CONCURRENCY, MAX_MAIL_TRANSPORT_ADDRESS_CANDIDATES, MAX_MAIL_TRANSPORT_DNS_ALIASES, MAX_MAIL_TRANSPORT_INPUT_BYTES, MAX_MAIL_TRANSPORT_TARGETS, MAX_SMTP_CAPABILITIES, MAX_SMTP_LINE_BYTES, MAX_SMTP_REPLY_LINES, MAX_SMTP_RESPONSE_BYTES, SMTP_ENDPOINT_TIMEOUT_MS, STARTTLS_COMMAND, collectMailTransportReview, certificateObservation, formatMailTransportReview, normalizeSmtpReply, parseMailTransportInput, resolveSelectedHost, runSmtpConversation, smtpStartTlsOptions, smtpCapabilities, };
+export { EHLO_COMMAND, MAIL_TRANSPORT_INPUT_SCHEMA, MAIL_TRANSPORT_INPUT_VERSION, MAIL_TRANSPORT_REVIEW_SCHEMA, MAIL_TRANSPORT_REVIEW_VERSION, MAIL_TRANSPORT_TOTAL_TIMEOUT_MS, MAX_MAIL_TRANSPORT_CONCURRENCY, MAX_MAIL_TRANSPORT_ADDRESS_CANDIDATES, MAX_MAIL_TRANSPORT_DNS_ALIASES, MAX_MAIL_TRANSPORT_INPUT_BYTES, MAX_MAIL_TRANSPORT_TARGETS, MAX_SMTP_CAPABILITIES, MAX_SMTP_LINE_BYTES, MAX_SMTP_REPLY_LINES, MAX_SMTP_RESPONSE_BYTES, SMTP_ENDPOINT_TIMEOUT_MS, STARTTLS_COMMAND, collectMailTransportReview, certificateObservation, formatMailTransportReview, normalizeSmtpReply, parseMailTransportInput, resolveSelectedHost, runSmtpConversation, smtpStartTlsOptions, smtpCapabilities, SocketReplyReader, defaultSmtpProbe, };