eleith/emailjs
1
0
Fork 0
mirror of https://github.com/eleith/emailjs.git synced 2024-07-03 11:38:50 +00:00
Code Issues Projects Releases Wiki Activity

allow overriding log

Browse Source
This commit is contained in:
Zack Schuster 2018-07-12 09:46:37 -07:00
parent 07b456ad9f
commit 1dad23e285
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
smtp/smtp.js
View File

@ -57,12 +57,20 @@ const AUTH_METHODS = {
let DEBUG = 0;
/**
* @param {...string} args the message(s) to log
* @param {...any} args the message(s) to log
* @returns {void}
*/
const log = (...args) => {
if (DEBUG === 1) {
args.forEach(d => console.log(d));
args.forEach(d =>
console.log(
typeof d === 'object'
? d instanceof Error
? d.message
: JSON.stringify(d)
: d
)
);
}
};
@ -100,6 +108,7 @@ class SMTP extends EventEmitter {
* @property {boolean|SMTPSocketOptions} [ssl]
* @property {boolean|SMTPSocketOptions} [tls]
* @property {string[]} [authentication]
* @property {function(...any): void} [logger]
*
* @constructor
* @param {SMTPOptions} [options] instance options
@ -113,6 +122,7 @@ class SMTP extends EventEmitter {
port,
ssl,
tls,
logger,
authentication,
} = {}) {
super();
@ -204,6 +214,8 @@ class SMTP extends EventEmitter {
// keep these strings hidden when quicky debugging/logging
this.user = /** @returns {string} */ () => user;
this.password = /** @returns {string} */ () => password;
this.log = typeof logger === 'function' ? logger : log;
}
/**
@ -258,7 +270,7 @@ class SMTP extends EventEmitter {
* @returns {void}
*/
const connected = () => {
log(`connected: ${this.host}:${this.port}`);
this.log(`connected: ${this.host}:${this.port}`);
if (this.ssl && !this.tls) {
// if key/ca/cert was passed in, check if connection is authorized
@ -290,6 +302,7 @@ class SMTP extends EventEmitter {
connected();
} else {
this.close(true);
this.log(err);
caller(
callback,
SMTPError('could not connect', SMTPError.COULDNOTCONNECT, err)
@ -305,13 +318,13 @@ class SMTP extends EventEmitter {
this.close(true);
caller(callback, err);
} else if (msg.code == '220') {
log(msg.data);
this.log(msg.data);
// might happen first, so no need to wait on connected()
this._state = SMTPState.CONNECTED;
caller(callback, null, msg.data);
} else {
log(`response (data): ${msg.data}`);
this.log(`response (data): ${msg.data}`);
this.quit(() => {
caller(
callback,
@ -327,7 +340,7 @@ class SMTP extends EventEmitter {
};
this._state = SMTPState.CONNECTING;
log(`connecting: ${this.host}:${this.port}`);
this.log(`connecting: ${this.host}:${this.port}`);
if (this.ssl) {
this.sock = connect(
@ -359,13 +372,13 @@ class SMTP extends EventEmitter {
*/
send(str, callback) {
if (this.sock && this._state === SMTPState.CONNECTED) {
log(str);
this.log(str);
this.sock.once('response', (err, msg) => {
if (err) {
caller(callback, err);
} else {
log(msg.data);
this.log(msg.data);
caller(callback, null, msg);
}
});
@ -590,7 +603,7 @@ class SMTP extends EventEmitter {
* @returns {void}
*/
message(data) {
log(data);
this.log(data);
this.sock.write(data);
}
@ -830,10 +843,10 @@ class SMTP extends EventEmitter {
close(force = false) {
if (this.sock) {
if (force) {
log('smtp connection destroyed!');
this.log('smtp connection destroyed!');
this.sock.destroy();
} else {
log('smtp connection closed.');
this.log('smtp connection closed.');
this.sock.end();
}
}