prefix node builtin deps with node:

bin/haraka

@@ -3,13 +3,13 @@
 // this script takes inspiration from:
 // https://github.com/tnantoka/LooseLeaf/blob/master/bin/looseleaf
 
-const child = require('child_process');
-const fs   = require('fs');
-const net  = require('net');
-const nopt = require('nopt');
-const path = require('path');
-const os   = require('os');
+const child = require('node:child_process');
+const fs   = require('node:fs');
+const net  = require('node:net');
+const path = require('node:path');
+const os   = require('node:os');
 
+const nopt = require('nopt');
 const utils   = require('haraka-utils');
 const sprintf = require('sprintf-js').sprintf;
 const base = path.join(__dirname, '..');

connection.js

@@ -1,10 +1,9 @@
 'use strict';
 // a single connection
 
-// node.js built-in libs
-const dns         = require('dns');
-const net         = require('net');
-const os          = require('os');
+const dns         = require('node:dns');
+const net         = require('node:net');
+const os          = require('node:os');
 
 // npm libs
 const ipaddr      = require('ipaddr.js');

host_pool.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const net    = require('net');
+const net    = require('node:net');
 const utils  = require('haraka-utils');
 
 /* HostPool:

line_socket.js

@@ -1,7 +1,7 @@
 'use strict';
 // A subclass of Socket which reads data by line
 
-const net   = require('net');
+const net   = require('node:net');
 const utils = require('haraka-utils');
 
 const tls_socket = require('./tls_socket');

logger.js

@@ -1,8 +1,8 @@
 'use strict';
 // Log class
 
-const util      = require('util');
-const tty       = require('tty');
+const util      = require('node:util');
+const tty       = require('node:tty');
 
 const config    = require('haraka-config');
 const constants = require('haraka-constants');

outbound/fsync_writestream.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const fs = require('fs');
+const fs = require('node:fs');
 
 class FsyncWriteStream extends fs.WriteStream {
     constructor (path, options) {

outbound/hmail.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const events       = require('events');
-const fs           = require('fs');
-const dns          = require('dns');
-const path         = require('path');
+const events       = require('node:events');
+const fs           = require('node:fs');
+const dns          = require('node:dns');
+const path         = require('node:path');
 
 const { Address } = require('address-rfc2821');
 const config      = require('haraka-config');

outbound/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const fs          = require('fs');
-const path        = require('path');
+const fs          = require('node:fs');
+const path        = require('node:path');
 
 const async       = require('async');
 const { Address } = require('address-rfc2821');

outbound/qfile.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const os = require('os');
+const os = require('node:os');
 const platform_dot = `${(['win32','win64'].includes(process.platform)) ? '' : '__tmp__'}.`;
 
 let QFILECOUNTER = 0;

outbound/queue.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const child_process = require('child_process');
-const fs          = require('fs');
-const path        = require('path');
+const child_process = require('node:child_process');
+const fs          = require('node:fs');
+const path        = require('node:path');
 
 const async       = require('async');
 const { Address } = require('address-rfc2821');

outbound/tls.js

@@ -1,12 +1,13 @@
 'use strict';
 
-const net          = require('net')
+const net          = require('node:net')
 
-const logger       = require('../logger');
-const tls_socket   = require('../tls_socket');
 const config       = require('haraka-config');
 const hkredis      = require('haraka-plugin-redis');
 
+const logger       = require('../logger');
+const tls_socket   = require('../tls_socket');
+
 const inheritable_opts = [
     'key', 'cert', 'ciphers', 'minVersion', 'dhparam',
     'requestCert', 'honorCipherOrder', 'rejectUnauthorized',

plugins.js

@@ -2,9 +2,9 @@
 // load all defined plugins
 
 // node built-ins
-const fs          = require('fs');
-const path        = require('path');
-const vm          = require('vm');
+const fs          = require('node:fs');
+const path        = require('node:path');
+const vm          = require('node:vm');
 
 // npm modules
 exports.config    = require('haraka-config');

plugins/auth/auth_base.js

@@ -4,7 +4,7 @@
 
 // Note: You can disable setting `connection.notes.auth_passwd` by `plugin.blankout_password = true`
 
-const crypto = require('crypto');
+const crypto = require('node:crypto');
 
 const tlds   = require('haraka-tld')
 const utils  = require('haraka-utils');

plugins/auth/auth_vpopmaild.js

@@ -1,6 +1,6 @@
 // Auth against vpopmaild
 
-const net = require('net');
+const net = require('node:net');
 
 exports.register = function () {
     this.inherits('auth/auth_base');

plugins/block_me.js

@@ -3,7 +3,7 @@
 // in the mail_from.blocklist file. You need to be running the
 // mail_from.blocklist plugin for this to work fully.
 
-const fs    = require('fs');
+const fs    = require('node:fs');
 const utils = require('haraka-utils');
 
 exports.hook_data = (next, connection) => {

plugins/data.signatures.js

@@ -3,9 +3,7 @@
 
 exports.hook_data = (next, connection) => {
     // enable mail body parsing
-    if (!connection?.transaction) return next();
-
-    connection.transaction.parse_body = true;
+    if (connection?.transaction) connection.transaction.parse_body = true;
     next();
 }
 
@@ -17,7 +15,7 @@ exports.hook_data_post = function (next, connection) {
     if (check_sigs(sigs, connection.transaction.body)) {
         return next(DENY, "Mail matches a known spam signature");
     }
-    return next();
+    next();
 }
 
 function check_sigs (sigs, body) {

plugins/early_talker.js

@@ -1,7 +1,8 @@
 // This plugin checks for clients that talk before we sent a response
 
+const { isIPv6 } = require('node:net');
+
 const ipaddr = require('ipaddr.js');
-const { isIPv6 } = require('net');
 
 exports.register = function () {
     this.load_config();

plugins/mail_from.is_resolvable.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // Check MAIL FROM domain is resolvable to an MX
-const net = require('net');
+const net = require('node:net');
 
 const net_utils = require('haraka-net-utils');
 

plugins/queue/qmail-queue.js

@@ -1,7 +1,7 @@
 // Queue to qmail-queue
 
-const childproc = require('child_process');
-const fs        = require('fs');
+const childproc = require('node:child_process');
+const fs        = require('node:fs');
 
 exports.register = function () {
 

plugins/queue/quarantine.js

@@ -1,7 +1,7 @@
 // quarantine
 
-const fs   = require('fs');
-const path = require('path');
+const fs   = require('node:fs');
+const path = require('node:path');
 
 exports.register = function () {
 

plugins/queue/smtp_forward.js

@@ -4,7 +4,7 @@
 // and passes back any errors seen on the ongoing server to the
 // originating server.
 
-const url = require('url');
+const url = require('node:url');
 
 const smtp_client_mod = require('./smtp_client');
 

plugins/queue/test.js

@@ -1,5 +1,5 @@
-const fs = require('fs');
-const os = require('os');
+const fs = require('node:fs');
+const os = require('node:os');
 
 const tempDir = os.tmpdir();
 

plugins/relay.js

@@ -2,8 +2,9 @@
 //
 // documentation via: haraka -h relay
 
+const net = require('node:net');
+
 const ipaddr = require('ipaddr.js');
-const net    = require('net');
 
 exports.register = function () {
 
@@ -89,11 +90,9 @@ exports.acl = function (next, connection) {
 }
 
 exports.pass_relaying = (next, connection) => {
-    if (connection.relaying) {
-        return next(OK);
-    }
+    if (connection.relaying) return next(OK);
 
-    return next();
+    next();
 }
 
 exports.is_acl_allowed = function (connection) {
@@ -172,7 +171,7 @@ exports.dest_domains = function (next, connection, params) {
     }
 
     transaction.results.add(this, {fail: 'relay_dest_domain'});
-    return next(DENY, "Mail for that recipient is not accepted here.");
+    next(DENY, "Mail for that recipient is not accepted here.");
 }
 
 exports.force_routing = function (next, hmail, domain) {
@@ -196,7 +195,7 @@ exports.force_routing = function (next, hmail, domain) {
     }
 
     this.logdebug(this, `using ${nexthop} for: ${domain}`);
-    return next(OK, nexthop);
+    next(OK, nexthop);
 }
 
 exports.all = function (next, connection, params) {

plugins/reseed_rng.js

@@ -1,4 +1,4 @@
-const crypto = require('crypto');
+const crypto = require('node:crypto');
 
 exports.hook_init_child = function (next) {
     Math.seedrandom(crypto.randomBytes(256).toString('hex'));

plugins/status.js

@@ -1,7 +1,8 @@
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
+
 const async = require('async');
 
 exports.register = function () {

plugins/xclient.js

@@ -1,9 +1,10 @@
 // Implementation of XCLIENT protocol
 // See http://www.postfix.org/XCLIENT_README.html
 
+const net = require('node:net');
+
 const utils = require('haraka-utils');
 const DSN = require('haraka-dsn');
-const net = require('net');
 let allowed_hosts = {};
 
 exports.register = function () {
@@ -119,5 +120,5 @@ exports.hook_unrecognized_command = function (next, connection, params) {
     connection.xclient = true;
     if (!xclient.name) return next(NEXT_HOOK, 'lookup_rdns');
 
-    return next(NEXT_HOOK, 'connect');
+    next(NEXT_HOOK, 'connect');
 }

server.js

@@ -1,20 +1,19 @@
 'use strict';
 // smtp network server
 
-const daemon      = require('daemon');
-const fs          = require('fs');
-const os          = require('os');
-const path        = require('path');
-const tls         = require('tls');
+const cluster     = require('node:cluster');
+const fs          = require('node:fs');
+const os          = require('node:os');
+const path        = require('node:path');
+const tls         = require('node:tls');
 
-// let log = require('why-is-node-running');
+const async       = require('async');
+const daemon      = require('daemon');
 const tls_socket  = require('./tls_socket');
 const conn        = require('./connection');
 const outbound    = require('./outbound');
-const async       = require('async');
-const cluster     = require('cluster');
-const constants   = require('haraka-constants');
 const endpoint    = require('./endpoint');
+const constants   = require('haraka-constants');
 
 const Server      = exports;
 Server.logger     = require('./logger');

smtp_client.js

@@ -7,18 +7,15 @@
 // than a bunch of connections to a single host from the configuration values
 // in "host" and "port" (see host_pool.js).
 
-// node.js builtins
-const events       = require('events');
+const events = require('node:events');
 
-// npm deps
-const ipaddr       = require('ipaddr.js');
-const net_utils    = require('haraka-net-utils');
-const utils        = require('haraka-utils');
+const ipaddr    = require('ipaddr.js');
+const net_utils = require('haraka-net-utils');
+const utils     = require('haraka-utils');
 
-// haraka libs
 const tls_socket = require('./tls_socket')
-const logger      = require('./logger');
-const HostPool    = require('./host_pool');
+const logger     = require('./logger');
+const HostPool   = require('./host_pool');
 
 const smtp_regexp = /^(\d{3})([ -])(.*)/;
 const STATE = {

transaction.js

@@ -1,7 +1,7 @@
 'use strict';
 // An SMTP Transaction
 
-const util   = require('util');
+const util   = require('node:util');
 
 const Notes  = require('haraka-notes');
 const utils  = require('haraka-utils');