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

nits

Browse Source
This commit is contained in:
Zack Schuster 2018-07-06 13:31:45 -07:00
parent ba41892117
commit 83587cb1b7
2 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
smtp/client.js
View File

@ -55,6 +55,64 @@ class Client {
this.ready = false;
}
/**
* @param {Message|MessageStack} msg msg
* @param {function(Error, MessageStack): void} callback callback
* @returns {void}
*/
send(msg, callback) {
/**
* @type {Message}
*/
const message =
msg instanceof Message
? msg
: this._canMakeMessage(msg)
? create(msg)
: null;
if (message == null) {
callback(
new Error('message is not a valid Message instance'),
/** @type {MessageStack} */ (msg)
);
return;
}
message.valid((valid, why) => {
if (valid) {
const stack = {
message,
to: addressparser(message.header.to),
from: addressparser(message.header.from)[0].address,
callback: (callback || function() {}).bind(this),
};
if (message.header.cc) {
stack.to = stack.to.concat(addressparser(message.header.cc));
}
if (message.header.bcc) {
stack.to = stack.to.concat(addressparser(message.header.bcc));
}
if (
message.header['return-path'] &&
addressparser(message.header['return-path']).length
) {
stack.returnPath = addressparser(
message.header['return-path']
)[0].address;
}
this.queue.push(stack);
this._poll();
} else {
callback(new Error(why), /** @type {MessageStack} */ (msg));
}
});
}
/**
* @private
* @returns {void}
@ -123,64 +181,6 @@ class Client {
this.smtp.connect(connect);
}
/**
* @param {Message|MessageStack} msg msg
* @param {function(Error, MessageStack): void} callback callback
* @returns {void}
*/
send(msg, callback) {
/**
* @type {Message}
*/
const message =
msg instanceof Message
? msg
: this._canMakeMessage(msg)
? create(msg)
: null;
if (message == null) {
callback(
new Error('message is not a valid Message instance'),
/**@type {MessageStack}*/ (msg)
);
return;
}
message.valid((valid, why) => {
if (valid) {
const stack = {
message,
to: addressparser(message.header.to),
from: addressparser(message.header.from)[0].address,
callback: (callback || function() {}).bind(this),
};
if (message.header.cc) {
stack.to = stack.to.concat(addressparser(message.header.cc));
}
if (message.header.bcc) {
stack.to = stack.to.concat(addressparser(message.header.bcc));
}
if (
message.header['return-path'] &&
addressparser(message.header['return-path']).length
) {
stack.returnPath = addressparser(
message.header['return-path']
)[0].address;
}
this.queue.push(stack);
this._poll();
} else {
callback(new Error(why), /**@type {MessageStack}*/ (msg));
}
});
}
/**
* @private
* @param {MessageStack} msg message stack

2
smtp/smtp.js
View File

@ -684,7 +684,7 @@ class SMTP extends EventEmitter {
);
/**
* see: https://developers.google.com/gmail/xoauth2_protocol
* @see https://developers.google.com/gmail/xoauth2_protocol
* @returns {string} base64 xoauth2 auth token
*/
const encode_xoauth2 = () =>