@emailcheck/email-validator-js 4.0.1 → 5.0.0-beta.1

package/dist/cli/index.js

@@ -1052,15 +1052,21 @@ async function verifyMailboxSMTP(params) {
   const { local, domain, options = {} } = params;
   const mxRecords = params.mxRecords ?? [];
   const ports = (options.ports ?? DEFAULT_PORTS).filter((port) => Number.isInteger(port) && port > 0 && port < 65536);
-  const timeout = options.timeout ?? DEFAULT_TIMEOUT_MS;
-  const tlsConfig = options.tls ?? true;
-  const hostname = options.hostname ?? "localhost";
+  const perAttemptTimeoutMs = options.perAttemptTimeoutMs ?? DEFAULT_TIMEOUT_MS;
+  const tlsConfig = options.tlsConfig ?? true;
+  const heloHostname = options.heloHostname ?? "localhost";
   const debug = options.debug ?? false;
   const captureTranscript = options.captureTranscript ?? false;
   const sequence = options.sequence;
   const cache = options.cache;
   const log = debug ? (...args) => console.log("[SMTP]", ...args) : () => {
   };
+  const totalDeadlineMs = options.totalDeadlineMs;
+  const maxConsecutiveFailures = options.maxConsecutiveFailures;
+  const maxMxHosts = options.maxMxHosts;
+  const retryAttempts = options.retry?.attempts ?? 0;
+  const retryDelayMs = options.retry?.delayMs ?? 200;
+  const retryBackoff = options.retry?.backoff ?? "exponential";
   const startedAtMs = Date.now();
   const primaryMx = mxRecords[0];
   if (!primaryMx) {
@@ -1074,9 +1080,9 @@ async function verifyMailboxSMTP(params) {
   const probeOptions = {
     local,
     domain,
-    timeout,
+    perAttemptTimeoutMs,
     tlsConfig,
-    hostname,
+    heloHostname,
     sequence,
     log,
     catchAllProbeLocal: options.catchAllProbeLocal,
@@ -1097,17 +1103,41 @@ async function verifyMailboxSMTP(params) {
   const mxHostsTried = [];
   let mxAttempts = 0;
   let portAttempts = 0;
+  let consecutiveFailures = 0;
   let lastReason = "all_attempts_failed";
   let lastEnhancedStatus;
   let lastResponseCode;
-  for (const mxHost of mxRecords) {
+  let stoppedEarly = null;
+  const isConnectionFailure = (reason) => reason === "connection_error" || reason === "connection_timeout" || reason === "connection_closed" || reason === "socket_timeout";
+  const retryDelayFor = (attemptIndex) => retryBackoff === "exponential" ? retryDelayMs * 2 ** (attemptIndex - 1) : retryDelayMs;
+  const probeWithRetry = async (mxHost, port) => {
+    let lastProbe = await runProbe({ ...probeOptions, mxHost, port });
+    for (let i = 1; i <= retryAttempts; i++) {
+      if (lastProbe.result !== null || !isConnectionFailure(lastProbe.reason)) break;
+      const delay = retryDelayFor(i);
+      log(`retry ${i}/${retryAttempts} on ${mxHost}:${port} after ${delay}ms (last: ${lastProbe.reason})`);
+      await new Promise((r) => setTimeout(r, delay));
+      portAttempts++;
+      lastProbe = await runProbe({ ...probeOptions, mxHost, port });
+    }
+    return lastProbe;
+  };
+  outer: for (const mxHost of mxRecords) {
+    if (maxMxHosts !== void 0 && mxAttempts >= maxMxHosts) {
+      stoppedEarly = "max_mx_hosts";
+      break;
+    }
     mxHostsTried.push(mxHost);
     mxAttempts++;
     const portsForThisMx = mxHost === primaryMx && cachedPort ? [cachedPort, ...ports.filter((p) => p !== cachedPort)] : ports;
     for (const port of portsForThisMx) {
+      if (totalDeadlineMs !== void 0 && Date.now() - startedAtMs >= totalDeadlineMs) {
+        stoppedEarly = "deadline";
+        break outer;
+      }
       portAttempts++;
       log(`Testing ${mxHost}:${port}`);
-      const probe = await runProbe({ ...probeOptions, mxHost, port });
+      const probe = await probeWithRetry(mxHost, port);
       collectTranscript(transcript, commands, probe, mxHost, port);
       lastReason = probe.reason;
       if (probe.enhancedStatus !== void 0) lastEnhancedStatus = probe.enhancedStatus;
@@ -1123,8 +1153,14 @@ async function verifyMailboxSMTP(params) {
         if (mxHost === primaryMx) await safeCacheSet(portCache, primaryMx, port);
         return { smtpResult: smtpResult2, cached: false, port, portCached: cachedPort === port };
       }
+      consecutiveFailures = isConnectionFailure(probe.reason) ? consecutiveFailures + 1 : 0;
+      if (maxConsecutiveFailures !== void 0 && consecutiveFailures >= maxConsecutiveFailures) {
+        stoppedEarly = "consecutive_failures";
+        break outer;
+      }
     }
   }
+  if (stoppedEarly) log(`Stopped early: ${stoppedEarly}`);
   log(`All MX\xD7port attempts failed (mx=${mxAttempts}, port=${portAttempts})`);
   const metrics = makeMetrics(mxHostsTried, mxAttempts, portAttempts, void 0, startedAtMs);
   const smtpResult = {
@@ -1275,16 +1311,16 @@ class SMTPProbeConnection {
     } else {
       this.socket = net__namespace.connect({ host: this.p.mxHost, port: this.p.port }, onConnect);
     }
-    this.socket.setTimeout(this.p.timeout, () => this.finish(null, "socket_timeout"));
+    this.socket.setTimeout(this.p.perAttemptTimeoutMs, () => this.finish(null, "socket_timeout"));
     this.socket.on("error", () => this.finish(null, "connection_error"));
     this.socket.on("close", () => this.finish(null, "connection_closed"));
   }
   armConnectionTimer() {
-    this.connectionTimer = setTimeout(() => this.finish(null, "connection_timeout"), this.p.timeout);
+    this.connectionTimer = setTimeout(() => this.finish(null, "connection_timeout"), this.p.perAttemptTimeoutMs);
   }
   resetStepTimer() {
     if (this.stepTimer) clearTimeout(this.stepTimer);
-    this.stepTimer = setTimeout(() => this.finish(null, "step_timeout"), this.p.timeout);
+    this.stepTimer = setTimeout(() => this.finish(null, "step_timeout"), this.p.perAttemptTimeoutMs);
   }
   send(cmd) {
     if (this.resolved) return;
@@ -1309,10 +1345,10 @@ class SMTPProbeConnection {
         return;
       // server-driven; nothing to send
       case SMTPStep.ehlo:
-        this.send(`EHLO ${this.p.hostname}`);
+        this.send(`EHLO ${this.p.heloHostname}`);
         return;
       case SMTPStep.helo:
-        this.send(`HELO ${this.p.hostname}`);
+        this.send(`HELO ${this.p.heloHostname}`);
         return;
       case SMTPStep.startTls:
         this.executeStartTls();
@@ -1384,7 +1420,7 @@ class SMTPProbeConnection {
       this.supportsStartTls = false;
       this.supportsPipelining = false;
       this.postUpgradeReEhlo = true;
-      this.send(`EHLO ${this.p.hostname}`);
+      this.send(`EHLO ${this.p.heloHostname}`);
     });
     this.socket = tlsSocket;
     this.socket.on("data", this.onData);
@@ -1392,7 +1428,7 @@ class SMTPProbeConnection {
       this.finish(null, this.tlsUpgrading ? "tls_handshake_failed" : "connection_error");
     });
     this.socket.on("close", () => this.finish(null, "connection_closed"));
-    this.socket.setTimeout(this.p.timeout, () => this.finish(null, "socket_timeout"));
+    this.socket.setTimeout(this.p.perAttemptTimeoutMs, () => this.finish(null, "socket_timeout"));
   }
   /**
    * Send the dual-probe envelope (real RCPT + probe RCPT + RSET). Pipelined
@@ -2328,13 +2364,13 @@ async function runWhoisChecks(domain, params, result, skipWhois, log, collector)
     log(`[verifyEmail] WHOIS checks skipped for disposable: ${domain}`);
     return;
   }
-  const whoisTimeout = params.whoisTimeout ?? 5e3;
+  const whoisTimeoutMs = params.whoisTimeoutMs ?? 5e3;
   const debug = params.debug ?? false;
   if (params.checkDomainAge) {
     try {
       result.domainAge = await collector.record(
         "whois-age",
-        () => getDomainAge(domain, whoisTimeout, debug, params.cache),
+        () => getDomainAge(domain, whoisTimeoutMs, debug, params.cache),
         (info) => ({
           domain,
           found: info !== null,
@@ -2354,7 +2390,7 @@ async function runWhoisChecks(domain, params, result, skipWhois, log, collector)
     try {
       result.domainRegistration = await collector.record(
         "whois-registration",
-        () => getDomainRegistrationStatus(domain, whoisTimeout, debug, params.cache),
+        () => getDomainRegistrationStatus(domain, whoisTimeoutMs, debug, params.cache),
         (info) => ({
           domain,
           found: info !== null,
@@ -2427,7 +2463,11 @@ async function runSmtp(local, domain, mxRecords, params, result, log, collector)
           options: {
             cache: params.cache,
             ports: resolveSmtpPorts(params.smtpPort, mxRecords[0]),
-            timeout: params.timeout ?? 4e3,
+            perAttemptTimeoutMs: params.smtpPerAttemptTimeoutMs ?? 4e3,
+            totalDeadlineMs: params.smtpTotalDeadlineMs,
+            maxConsecutiveFailures: params.smtpMaxConsecutiveFailures,
+            maxMxHosts: params.smtpMaxMxHosts,
+            retry: params.smtpRetry,
             debug: params.debug ?? false,
             // Forward transcript capture so the SMTP step's details include
             // the full per-port transcript when the caller asked for it.
@@ -2613,7 +2653,7 @@ async function run(args, deps = {}) {
     emailAddress: args.email,
     verifyMx: args.verifyMx,
     verifySmtp: args.verifySmtp,
-    timeout: args.timeoutMs ?? 5e3,
+    smtpPerAttemptTimeoutMs: args.timeoutMs ?? 5e3,
     debug: args.debug,
     smtpPort: args.smtpPort,
     checkDisposable: args.checkDisposable,
@@ -2622,7 +2662,7 @@ async function run(args, deps = {}) {
     suggestDomain: args.suggestDomain,
     checkDomainAge: args.checkDomainAge,
     checkDomainRegistration: args.checkDomainRegistration,
-    whoisTimeout: args.whoisTimeoutMs ?? 5e3,
+    whoisTimeoutMs: args.whoisTimeoutMs ?? 5e3,
     captureTranscript: args.captureTranscript
   });
   if (args.quiet) {