Haraka 2.8.28 → 3.0.1

package/outbound/hmail.js

@@ -6,17 +6,17 @@ const dns          = require('dns');
 const path         = require('path');
 const net          = require('net');
 
-const Address     = require('address-rfc2821').Address;
+const { Address }     = require('address-rfc2821');
 const config      = require('haraka-config');
 const constants   = require('haraka-constants');
 const DSN         = require('haraka-dsn');
+const message     = require('haraka-email-message')
 const net_utils   = require('haraka-net-utils');
 const Notes       = require('haraka-notes');
 const utils       = require('haraka-utils');
 
 const logger      = require('../logger');
 const plugins     = require('../plugins');
-const Header      = require('../mailheader').Header;
 
 const client_pool = require('./client_pool');
 const _qfile      = require('./qfile');
@@ -48,9 +48,8 @@ class HMailItem extends events.EventEmitter {
         super();
 
         const parts = _qfile.parts(filename);
-        if (!parts) {
-            throw new Error(`Bad filename: ${filename}`);
-        }
+        if (!parts) throw new Error(`Bad filename: ${filename}`);
+
         this.path         = filePath;
         this.filename     = filename;
         this.next_process = parts.next_attempt;
@@ -158,14 +157,12 @@ class HMailItem extends events.EventEmitter {
         if (obc.cfg.disabled) {
             // try again in 1 second if delivery is disabled
             this.logdebug("delivery disabled temporarily. Retrying in 1s.");
-            const hmail = this;
-            setTimeout(() => { hmail.send(); }, 1000);
+            setTimeout(() => { this.send(); }, 1000);
             return;
         }
 
         if (!this.todo) {
-            const self = this;
-            this.once('ready', () => { self._send(); });
+            this.once('ready', () => { this._send(); });
         }
         else {
             this._send();
@@ -180,9 +177,8 @@ class HMailItem extends events.EventEmitter {
         if (retval === constants.delay) {
             // Try again in 'delay' seconds.
             this.logdebug(`Delivery of this email delayed for ${delay_seconds} seconds`);
-            const hmail = this;
-            hmail.next_cb();
-            temp_fail_queue.add(hmail.filename, delay_seconds * 1000, () => { delivery_queue.push(hmail); });
+            this.next_cb();
+            temp_fail_queue.add(this.filename, delay_seconds * 1000, () => { delivery_queue.push(this); });
         }
         else {
             this.logdebug(`Sending mail: ${this.filename}`);
@@ -191,12 +187,11 @@ class HMailItem extends events.EventEmitter {
     }
 
     get_mx () {
-        const domain = this.todo.domain;
+        const { domain } = this.todo;
         plugins.run_hooks('get_mx', this, domain);
     }
 
     get_mx_respond (retval, mx) {
-        const hmail = this;
         switch (retval) {
             case constants.ok: {
                 let mx_list;
@@ -214,49 +209,48 @@ class HMailItem extends events.EventEmitter {
                     }
                     mx_list = [{priority: 0, exchange: matches[1], port: matches[3]}];
                 }
-                hmail.logdebug(`Got a MX from Plugin: ${hmail.todo.domain} => 0 ${JSON.stringify(mx)}`);
-                return hmail.found_mx(null, mx_list);
+                this.logdebug(`Got a MX from Plugin: ${this.todo.domain} => 0 ${JSON.stringify(mx)}`);
+                return this.found_mx(null, mx_list);
             }
             case constants.deny:
-                hmail.logwarn(`get_mx plugin returned DENY: ${mx}`);
-                hmail.todo.rcpt_to.forEach(rcpt => {
-                    hmail.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`No MX for ${hmail.todo.domain}`));
+                this.logwarn(`get_mx plugin returned DENY: ${mx}`);
+                this.todo.rcpt_to.forEach(rcpt => {
+                    this.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`No MX for ${this.todo.domain}`));
                 });
-                return hmail.bounce(`No MX for ${hmail.todo.domain}`);
+                return this.bounce(`No MX for ${this.todo.domain}`);
             case constants.denysoft:
-                hmail.logwarn(`get_mx plugin returned DENYSOFT: ${mx}`);
-                hmail.todo.rcpt_to.forEach(rcpt => {
-                    hmail.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`Temporary MX lookup error for ${hmail.todo.domain}`, 450));
+                this.logwarn(`get_mx plugin returned DENYSOFT: ${mx}`);
+                this.todo.rcpt_to.forEach(rcpt => {
+                    this.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`Temporary MX lookup error for ${this.todo.domain}`, 450));
                 });
-                return hmail.temp_fail(`Temporary MX lookup error for ${hmail.todo.domain}`);
+                return this.temp_fail(`Temporary MX lookup error for ${this.todo.domain}`);
         }
 
         // if none of the above return codes, drop through to this...
         mx_lookup.lookup_mx(this.todo.domain, (err, mxs) => {
-            hmail.found_mx(err, mxs);
+            this.found_mx(err, mxs);
         });
     }
 
     found_mx (err, mxs) {
-        const hmail = this;
         if (err) {
             this.lognotice(`MX Lookup for ${this.todo.domain} failed: ${err}`);
             if (err.code === dns.NXDOMAIN || err.code === dns.NOTFOUND) {
                 this.todo.rcpt_to.forEach(rcpt => {
-                    hmail.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`No Such Domain: ${hmail.todo.domain}`));
+                    this.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`No Such Domain: ${this.todo.domain}`));
                 });
                 this.bounce(`No Such Domain: ${this.todo.domain}`);
             }
             else if (err.code === 'NOMX') {
                 this.todo.rcpt_to.forEach(rcpt => {
-                    hmail.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`Nowhere to deliver mail to for domain: ${hmail.todo.domain}`));
+                    this.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`Nowhere to deliver mail to for domain: ${this.todo.domain}`));
                 });
-                this.bounce(`Nowhere to deliver mail to for domain: ${hmail.todo.domain}`);
+                this.bounce(`Nowhere to deliver mail to for domain: ${this.todo.domain}`);
             }
             else {
                 // every other error is transient
                 this.todo.rcpt_to.forEach(rcpt => {
-                    hmail.extend_rcpt_with_dsn(rcpt, DSN.addr_unspecified(`DNS lookup failure: ${hmail.todo.domain}`));
+                    this.extend_rcpt_with_dsn(rcpt, DSN.addr_unspecified(`DNS lookup failure: ${this.todo.domain}`));
                 });
                 this.temp_fail(`DNS lookup failure: ${err}`);
             }
@@ -267,7 +261,7 @@ class HMailItem extends events.EventEmitter {
             // support draft-delany-nullmx-02
             if (mxlist.length === 1 && mxlist[0].priority === 0 && mxlist[0].exchange === '') {
                 this.todo.rcpt_to.forEach(rcpt => {
-                    hmail.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`Domain ${hmail.todo.domain} sends and receives no email (NULL MX)`));
+                    this.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`Domain ${this.todo.domain} sends and receives no email (NULL MX)`));
                 });
                 return this.bounce(`Domain ${this.todo.domain} sends and receives no email (NULL MX)`);
             }
@@ -294,105 +288,100 @@ class HMailItem extends events.EventEmitter {
     }
 
     try_deliver () {
-        const self = this;
 
         // check if there are any MXs left
         if (this.mxlist.length === 0) {
             this.todo.rcpt_to.forEach(rcpt => {
-                self.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`Tried all MXs ${self.todo.domain}`));
+                this.extend_rcpt_with_dsn(rcpt, DSN.addr_bad_dest_system(`Tried all MXs ${this.todo.domain}`));
             });
             return this.temp_fail("Tried all MXs");
         }
 
         const mx = this.mxlist.shift();
-        let host = mx.exchange;
+        const host = mx.exchange;
 
-        self.force_tls = false;
-        if (net_utils.ip_in_list(obtls.cfg.force_tls_hosts, host)) {
-            this.logdebug(`Forcing TLS for host ${host}`);
-            self.force_tls = true;
-        }
-        if (net_utils.ip_in_list(obtls.cfg.force_tls_hosts, self.todo.domain)) {
-            this.logdebug(`Forcing TLS for domain ${self.todo.domain}`);
-            self.force_tls = true;
-        }
+        this.force_tls = this.todo.force_tls;
+        if (!this.force_tls) {
+            if (net_utils.ip_in_list(obtls.cfg.force_tls_hosts, host)) {
+                this.logdebug(`Forcing TLS for host ${host}`);
+                this.force_tls = true;
+            }
+            if (net_utils.ip_in_list(obtls.cfg.force_tls_hosts, this.todo.domain)) {
+                this.logdebug(`Forcing TLS for domain ${this.todo.domain}`);
+                this.force_tls = true;
+            }
 
-        // IP or IP:port
-        if (net.isIP(host)) {
-            self.hostlist = [ host ];
-            return self.try_deliver_host(mx);
+            // IP or IP:port
+            if (net.isIP(host)) {
+                this.hostlist = [ host ];
+                return this.try_deliver_host(mx);
+            }
         }
 
-        host   = mx.exchange;
-        const family = mx.family;
-
-        this.loginfo(`Looking up ${family} records for: ${host}`);
-
         // we have a host, look up the addresses for the host
         // and try each in order they appear
-        // IS: IPv6 compatible
-        dns.resolve(host, family, (err, addresses) => {
+        dns.resolve(host, mx.family, (err, addresses) => {
             if (err) {
-                self.lognotice(`DNS lookup of ${host} failed: ${err}`);
-                return self.try_deliver(); // try next MX
+                this.lognotice(`DNS (${mx.family}) for ${host} failed: ${err}`);
+                return this.try_deliver(); // try next MX
             }
             if (addresses.length === 0) {
                 // NODATA or empty host list
-                self.lognotice(`DNS lookup of ${host} resulted in no data`);
-                return self.try_deliver(); // try next MX
+                this.lognotice(`DNS (${mx.family}) for ${host} resulted in no data`);
+                return this.try_deliver(); // try next MX
             }
-            self.hostlist = addresses;
-            self.try_deliver_host(mx);
+            this.logdebug(`DNS (${mx.family}) for ${host} -> ${addresses.join(',')}`);
+            this.hostlist = addresses;
+            this.try_deliver_host(mx);
         });
     }
 
     try_deliver_host (mx) {
-        const self = this;
 
-        if (self.hostlist.length === 0) {
-            return self.try_deliver(); // try next MX
+        if (this.hostlist.length === 0) {
+            return this.try_deliver(); // try next MX
         }
 
         // Allow transaction notes to set outbound IP
-        if (!mx.bind && self.todo.notes.outbound_ip) {
-            mx.bind = self.todo.notes.outbound_ip;
+        if (!mx.bind && this.todo.notes.outbound_ip) {
+            mx.bind = this.todo.notes.outbound_ip;
         }
 
         // Allow transaction notes to set outbound IP helo
         if (!mx.bind_helo){
-            if (self.todo.notes.outbound_helo) {
-                mx.bind_helo = self.todo.notes.outbound_helo;
+            if (this.todo.notes.outbound_helo) {
+                mx.bind_helo = this.todo.notes.outbound_helo;
             }
             else {
                 mx.bind_helo = net_utils.get_primary_host_name();
             }
         }
 
-        let host = self.hostlist.shift();
+        let host = this.hostlist.shift();
         const port = mx.port || 25;
 
         if (mx.path) {
             host = mx.path;
         }
 
-        this.loginfo(`Attempting to deliver to: ${host}:${port}${mx.using_lmtp ? " using LMTP" : ""} (${delivery_queue.length()}) (${temp_fail_queue.length()})`);
+        this.logdebug(`delivering from: ${mx.bind_helo} to: ${host}:${port}${mx.using_lmtp ? " using LMTP" : ""} (${delivery_queue.length()}) (${temp_fail_queue.length()})`)
         client_pool.get_client(port, host, mx.bind, !!mx.path, (err, socket) => {
             if (err) {
-                if (err.match(/connection timed out|connect ECONNREFUSED/)) {
-                    logger.lognotice(`[outbound] Failed to get pool entry: ${err}`);
+                if (/connection timed out|connect ECONNREFUSED/.test(err)) {
+                    logger.lognotice(`[outbound] Failed to get socket: ${err}`);
                 }
                 else {
-                    logger.logerror(`[outbound] Failed to get pool entry: ${err}`);
+                    logger.logerror(`[outbound] Failed to get socket: ${err}`);
                 }
                 // try next host
-                return self.try_deliver_host(mx);
+                return this.try_deliver_host(mx);
             }
-            self.try_deliver_host_on_socket(mx, host, port, socket);
+            this.try_deliver_host_on_socket(mx, host, port, socket);
         });
     }
 
     try_deliver_host_on_socket (mx, host, port, socket) {
-        const self            = this;
+        const self = this;
         let processing_mail = true;
         let command = mx.using_lmtp ? 'connect_lmtp' : 'connect';
 
@@ -406,24 +395,24 @@ class HMailItem extends events.EventEmitter {
         });
 
         socket.once('error', err => {
-            if (processing_mail) {
-                self.logerror(`Ongoing connection failed to ${host}:${port} : ${err}`);
-                processing_mail = false;
-                client_pool.release_client(socket, port, host, mx.bind, true);
-                if (err.source === 'tls') // exception thrown from tls_socket during tls upgrade
-                    return obtls.mark_tls_nogo(host, () => { return self.try_deliver_host(mx); });
-                // try the next MX
-                return self.try_deliver_host(mx);
-            }
-        });
+            if (!processing_mail) return
+
+            self.logerror(`Ongoing connection failed to ${host}:${port} : ${err}`);
+            processing_mail = false;
+            client_pool.release_client(socket, port, host, mx.bind, true);
+            if (err.source === 'tls') // exception thrown from tls_socket during tls upgrade
+                return obtls.mark_tls_nogo(host, () => { return self.try_deliver_host(mx); });
+            // try the next MX
+            self.try_deliver_host(mx);
+        })
 
         socket.once('close', () => {
-            if (processing_mail) {
-                self.logerror(`Remote end ${host}:${port} closed connection while we were processing mail. Trying next MX.`);
-                processing_mail = false;
-                client_pool.release_client(socket, port, host, mx.bind, true);
-                return self.try_deliver_host(mx);
-            }
+            if (!processing_mail) return
+
+            self.logerror(`Remote end ${host}:${port} closed connection while we were processing mail. Trying next MX.`);
+            processing_mail = false;
+            client_pool.release_client(socket, port, host, mx.bind, true);
+            self.try_deliver_host(mx);
         });
 
         let fin_sent = false;
@@ -559,7 +548,7 @@ class HMailItem extends events.EventEmitter {
 
                 switch (mx.auth_type.toUpperCase()) {
                     case 'PLAIN':
-                        return send_command('AUTH', `PLAIN ${utils.base64(`${mx.auth_user}\0${mx.auth_user}\0${mx.auth_pass}`)}`);
+                        return send_command('AUTH', `PLAIN ${utils.base64(`\0${mx.auth_user}\0${mx.auth_pass}`)}`);
                     case 'LOGIN':
                         authenticating = true;
                         return send_command('AUTH', 'LOGIN');
@@ -667,15 +656,7 @@ class HMailItem extends events.EventEmitter {
                 self.discard();
             }
 
-            if (obc.cfg.pool_concurrency_max && success) {
-                client_pool.release_client(socket, port, host, mx.bind, fin_sent);
-            }
-            else if (obc.cfg.pool_concurrency_max && !mx.using_lmtp) {
-                send_command('RSET');
-            }
-            else {
-                send_command('QUIT');
-            }
+            send_command('QUIT');
         }
 
         socket.on('line', line => {
@@ -742,7 +723,7 @@ class HMailItem extends events.EventEmitter {
                     rcpt.dsn_smtp_response = response.join(' ');
                     rcpt.dsn_remote_mta = mx.exchange;
                 });
-                send_command(obc.cfg.pool_concurrency_max && !mx.using_lmtp ? 'RSET' : 'QUIT');
+                send_command('QUIT');
                 processing_mail = false;
                 return self.temp_fail(`Upstream error: ${code} ${(extc) ? `${extc} ` : ''}${reason}`);
             }
@@ -780,7 +761,7 @@ class HMailItem extends events.EventEmitter {
                         rcpt.dsn_smtp_response = response.join(' ');
                         rcpt.dsn_remote_mta = mx.exchange;
                     });
-                    send_command(obc.cfg.pool_concurrency_max && !mx.using_lmtp ? 'RSET' : 'QUIT');
+                    send_command('QUIT');
                     processing_mail = false;
                     return self.temp_fail(`Upstream error: ${code} ${(extc) ? `${extc} ` : ''}${reason}`);
                 }
@@ -831,7 +812,7 @@ class HMailItem extends events.EventEmitter {
                         rcpt.dsn_smtp_response = response.join(' ');
                         rcpt.dsn_remote_mta = mx.exchange;
                     });
-                    send_command(obc.cfg.pool_concurrency_max && !mx.using_lmtp ? 'RSET' : 'QUIT');
+                    send_command('QUIT');
                     processing_mail = false;
                     return self.bounce(reason, { mx });
                 }
@@ -862,13 +843,13 @@ class HMailItem extends events.EventEmitter {
                             loginfo.version = cipher.version;
                         }
                         if (verifyError) loginfo.error = verifyError;
-                        if (cert && cert.subject) {
+                        if (cert?.subject) {
                             loginfo.cn = cert.subject.CN;
                             loginfo.organization = cert.subject.O;
                         }
-                        if (cert && cert.issuer)   loginfo.issuer = cert.issuer.O;
-                        if (cert && cert.valid_to) loginfo.expires = cert.valid_to;
-                        if (cert && cert.fingerprint) loginfo.fingerprint = cert.fingerprint;
+                        if (cert?.issuer)   loginfo.issuer = cert.issuer.O;
+                        if (cert?.valid_to) loginfo.expires = cert.valid_to;
+                        if (cert?.fingerprint) loginfo.fingerprint = cert.fingerprint;
                         self.loginfo('secured', loginfo);
 
                         if (self.force_tls && !authorized) {
@@ -935,13 +916,6 @@ class HMailItem extends events.EventEmitter {
                     }
                     break;
                 case 'quit':
-                    if (obc.cfg.pool_concurrency_max) {
-                        self.logerror("We should NOT have sent QUIT from here...");
-                    }
-                    else {
-                        client_pool.release_client(socket, port, host, mx.bind, fin_sent);
-                    }
-                    break;
                 case 'rset':
                     client_pool.release_client(socket, port, host, mx.bind, fin_sent);
                     break;
@@ -953,9 +927,9 @@ class HMailItem extends events.EventEmitter {
         });
 
         if (socket.__fromPool) {
-            logger.logdebug('[outbound] got pooled socket, trying to deliver');
+            logger.logdebug('[outbound] got socket, trying to deliver');
             secured = socket.isEncrypted();
-            logger.logdebug(`[outbound] got pooled ${secured ? 'TLS ' : '' }socket, trying to deliver`);
+            logger.logdebug(`[outbound] got ${secured ? 'TLS ' : '' }socket, trying to deliver`);
             send_command('MAIL', `FROM:${self.todo.mail_from.format(!smtp_properties.smtp_utf8)}`);
         }
     }
@@ -973,12 +947,11 @@ class HMailItem extends events.EventEmitter {
     }
 
     populate_bounce_message (from, to, reason, cb) {
-        const self = this;
 
         let buf = '';
         const original_header_lines = [];
         let headers_done = false;
-        const header = new Header();
+        const header = new message.Header();
 
         try {
             const data_stream = this.data_stream();
@@ -1001,14 +974,14 @@ class HMailItem extends events.EventEmitter {
                 if (original_header_lines.length > 0) {
                     header.parse(original_header_lines);
                 }
-                self.populate_bounce_message_with_headers(from, to, reason, header, cb);
+                this.populate_bounce_message_with_headers(from, to, reason, header, cb);
             });
             data_stream.on('error', err => {
                 cb(err);
             });
         }
         catch (err) {
-            self.populate_bounce_message_with_headers(from, to, reason, header, cb);
+            this.populate_bounce_message_with_headers(from, to, reason, header, cb);
         }
     }
 
@@ -1035,7 +1008,6 @@ class HMailItem extends events.EventEmitter {
      * @param cb - a callback for fn(err, message_body_lines)
      */
     populate_bounce_message_with_headers (from, to, reason, header, cb) {
-        const self = this;
         const CRLF = '\r\n';
 
         const originalMessageId = header.get('Message-Id');
@@ -1175,10 +1147,10 @@ class HMailItem extends events.EventEmitter {
             bounce_body.push(`Original-Envelope-Id: ${originalMessageId.replace(/(\r?\n)*$/, '')}${CRLF}`);
         }
         bounce_body.push(`Reporting-MTA: dns;${net_utils.get_primary_host_name()}${CRLF}`);
-        if (self.todo.queue_time) {
-            bounce_body.push(`Arrival-Date: ${utils.date_to_str(new Date(self.todo.queue_time))}${CRLF}`);
+        if (this.todo.queue_time) {
+            bounce_body.push(`Arrival-Date: ${utils.date_to_str(new Date(this.todo.queue_time))}${CRLF}`);
         }
-        self.todo.rcpt_to.forEach(rcpt_to => {
+        this.todo.rcpt_to.forEach(rcpt_to => {
             bounce_body.push(CRLF);
             bounce_body.push(`Final-Recipient: rfc822;${rcpt_to.address()}${CRLF}`);
             let dsn_action = null;
@@ -1211,7 +1183,7 @@ class HMailItem extends events.EventEmitter {
                 bounce_body.push(`Action: ${dsn_action}${CRLF}`);
             }
             if (rcpt_to.dsn_status) {
-                let dsn_status = rcpt_to.dsn_status;
+                let { dsn_status } = rcpt_to;
                 if (rcpt_to.dsn_code || rcpt_to.dsn_msg) {
                     dsn_status += " (";
                     if (rcpt_to.dsn_code) {
@@ -1266,9 +1238,7 @@ class HMailItem extends events.EventEmitter {
     bounce (err, opts) {
         this.loginfo(`bouncing mail: ${err}`);
         if (!this.todo) {
-            // haven't finished reading the todo, delay here...
-            const self = this;
-            self.once('ready', () => { self._bounce(err, opts); });
+            this.once('ready', () => { this._bounce(err, opts); });
             return;
         }
         this._bounce(err, opts);
@@ -1394,20 +1364,18 @@ class HMailItem extends events.EventEmitter {
         parts.next_attempt = Date.now() + delay;
         parts.attempts = this.num_failures;
         const new_filename = _qfile.name(parts);
-        // const new_filename = this`.filename.replace(/^(\d+)_(\d+)_/, until + '_' + this.num_failures + '_');
 
-        const hmail = this;
         fs.rename(this.path, path.join(queue_dir, new_filename), err => {
             if (err) {
-                return hmail.bounce(`Error re-queueing email: ${err}`);
+                return this.bounce(`Error re-queueing email: ${err}`);
             }
 
-            hmail.path = path.join(queue_dir, new_filename);
-            hmail.filename = new_filename;
+            this.path = path.join(queue_dir, new_filename);
+            this.filename = new_filename;
 
-            hmail.next_cb();
+            this.next_cb();
 
-            temp_fail_queue.add(hmail.filename, delay, () => { delivery_queue.push(hmail); });
+            temp_fail_queue.add(this.filename, delay, () => { delivery_queue.push(this); });
         });
     }
 
@@ -1458,17 +1426,15 @@ class HMailItem extends events.EventEmitter {
                     fs.rename(tmp_path, dest_path, err => {
                         if (err) {
                             err_handler(err, "tmp file rename");
+                            return
                         }
-                        else {
-                            const split_mail = new HMailItem (fname, dest_path, hmail.notes);
-                            split_mail.once('ready', () => {
-                                cb(split_mail);
-                            });
-                        }
+                        const split_mail = new HMailItem (fname, dest_path, hmail.notes);
+                        split_mail.once('ready', () => {
+                            cb(split_mail);
+                        });
                     });
                 });
                 ws.destroySoon();
-                return;
             });
         }
 

package/outbound/index.js

@@ -4,7 +4,7 @@ const fs          = require('fs');
 const path        = require('path');
 
 const async       = require('async');
-const Address     = require('address-rfc2821').Address;
+const { Address }     = require('address-rfc2821');
 const config      = require('haraka-config');
 const constants   = require('haraka-constants');
 const net_utils   = require('haraka-net-utils');
@@ -20,12 +20,9 @@ const obc         = require('./config');
 const queuelib    = require('./queue');
 const HMailItem   = require('./hmail');
 const TODOItem    = require('./todo');
-const pools       = require('./client_pool');
 const _qfile = exports.qfile = require('./qfile');
 
-const queue_dir = queuelib.queue_dir;
-const temp_fail_queue = queuelib.temp_fail_queue;
-const delivery_queue = queuelib.delivery_queue;
+const { queue_dir, temp_fail_queue, delivery_queue } = queuelib;
 
 exports.temp_fail_queue = temp_fail_queue;
 exports.delivery_queue = delivery_queue;
@@ -42,34 +39,30 @@ exports.load_pid_queue = queuelib.load_pid_queue;
 exports.ensure_queue_dir = queuelib.ensure_queue_dir;
 exports.load_queue = queuelib.load_queue;
 exports.stats = queuelib.stats;
-exports.drain_pools = pools.drain_pools;
 
 process.on('message', msg => {
-    if (msg.event && msg.event === 'outbound.load_pid_queue') {
+    if (!msg.event) return
+
+    if (msg.event === 'outbound.load_pid_queue') {
         exports.load_pid_queue(msg.data);
         return;
     }
-    if (msg.event && msg.event === 'outbound.flush_queue') {
+    if (msg.event === 'outbound.flush_queue') {
         exports.flush_queue(msg.domain, process.pid);
         return;
     }
-    if (msg.event && msg.event === 'outbound.shutdown') {
+    if (msg.event === 'outbound.shutdown') {
         logger.loginfo("[outbound] Shutting down temp fail queue");
-        exports.drain_pools();
         temp_fail_queue.shutdown();
         return;
     }
-    if (msg.event && msg.event === 'outbound.drain_pools') {
-        exports.drain_pools();
-        return;
-    }
     // ignores the message
 });
 
 exports.send_email = function () {
 
     if (arguments.length === 2) {
-        logger.loginfo("[outbound] Sending email as a transaction");
+        logger.logdebug("[outbound] Sending email as a transaction");
         return this.send_trans_email(arguments[0], arguments[1]);
     }
 
@@ -227,7 +220,6 @@ function get_deliveries (transaction) {
 }
 
 exports.send_trans_email = function (transaction, next) {
-    const self = this;
 
     // add potentially missing headers
     if (!transaction.header.get_all('Message-Id').length) {
@@ -243,9 +235,7 @@ exports.send_trans_email = function (transaction, next) {
         transaction.add_leading_header('Received', `(${obc.cfg.received_header}); ${utils.date_to_str(new Date())}`);
     }
 
-    const connection = {
-        transaction,
-    };
+    const connection = { transaction };
 
     logger.add_log_methods(connection);
     if (!transaction.results) {
@@ -264,7 +254,7 @@ exports.send_trans_email = function (transaction, next) {
             const todo = new TODOItem(deliv.domain, deliv.rcpts, transaction);
             todo.uuid = `${todo.uuid}.${todo_index}`;
             todo_index++;
-            self.process_delivery(ok_paths, todo, hmails, cb);
+            this.process_delivery(ok_paths, todo, hmails, cb);
         },
         (err) => {
             if (err) {
@@ -276,8 +266,7 @@ exports.send_trans_email = function (transaction, next) {
                 return;
             }
 
-            for (let j=0; j<hmails.length; j++) {
-                const hmail = hmails[j];
+            for (const hmail of hmails) {
                 delivery_queue.push(hmail);
             }
 
@@ -292,8 +281,7 @@ exports.send_trans_email = function (transaction, next) {
 }
 
 exports.process_delivery = function (ok_paths, todo, hmails, cb) {
-    const self = this;
-    logger.loginfo(`[outbound] Processing delivery for domain: ${todo.domain}`);
+    logger.loginfo(`[outbound] Transaction delivery for domain: ${todo.domain}`);
     const fname = _qfile.name();
     const tmp_path = path.join(queue_dir, `${_qfile.platformDOT}${fname}`);
     const ws = new FsyncWriteStream(tmp_path, { flags: constants.WRITE_EXCL });
@@ -321,7 +309,7 @@ exports.process_delivery = function (ok_paths, todo, hmails, cb) {
         cb("Queueing failed");
     })
 
-    self.build_todo(todo, ws, () => {
+    this.build_todo(todo, ws, () => {
         todo.message_stream.pipe(ws, { line_endings: '\r\n', dot_stuffing: true, ending_dot: false });
     });
 }