eleith/emailjs
1
0
Fork 0
mirror of https://github.com/eleith/emailjs.git synced 2024-07-05 20:10:37 +00:00
Code Issues Projects Releases Wiki Activity

implement more destructuring

Browse Source
This commit is contained in:
Zack Schuster 2018-06-24 19:42:29 -07:00
parent 2efb2abbd9
commit 57c608b249
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
smtp/client.js
View File

@ -1,10 +1,10 @@
const smtp = require('./smtp');
const message = require('./message');
const { SMTP, state } = require('./smtp');
const { Message, create } = require('./message');
const addressparser = require('addressparser');
class Client {
constructor(server) {
this.smtp = new smtp.SMTP(server);
this.smtp = new SMTP(server);
//this.smtp.debug(1);
this.queue = [];
@ -17,10 +17,10 @@ class Client {
clearTimeout(this.timer);
if (this.queue.length) {
if (this.smtp.state() == smtp.state.NOTCONNECTED) {
if (this.smtp.state() == state.NOTCONNECTED) {
this._connect(this.queue[0]);
} else if (
this.smtp.state() == smtp.state.CONNECTED &&
this.smtp.state() == state.CONNECTED &&
!this.sending &&
this.ready
) {
@ -29,7 +29,7 @@ class Client {
}
// wait around 1 seconds in case something does come in,
// otherwise close out SMTP connection if still open
else if (this.smtp.state() == smtp.state.CONNECTED) {
else if (this.smtp.state() == state.CONNECTED) {
this.timer = setTimeout(() => this.smtp.quit(), 1000);
}
}
@ -70,15 +70,15 @@ class Client {
send(msg, callback) {
if (
!(msg instanceof message.Message) &&
!(msg instanceof Message) &&
msg.from &&
(msg.to || msg.cc || msg.bcc) &&
(msg.text !== undefined || this._containsInlinedHtml(msg.attachment))
) {
msg = message.create(msg);
msg = create(msg);
}
if (msg instanceof message.Message) {
if (msg instanceof Message) {
msg.valid((valid, why) => {
if (valid) {
const stack = {

8
smtp/message.js
View File

@ -1,8 +1,8 @@
const { Stream } = require('stream');
const fs = require('fs');
const os = require('os');
const mimeWordEncode = require('emailjs-mime-codec').mimeWordEncode;
const { hostname } = require('os');
const { Stream } = require('stream');
const addressparser = require('addressparser');
const { mimeWordEncode } = require('emailjs-mime-codec');
const { getRFC2822Date } = require('./date');
const CRLF = '\r\n';
@ -47,7 +47,7 @@ class Message {
this.header = {
'message-id': `<${new Date().getTime()}.${counter++}.${
process.pid
}@${os.hostname()}>`,
}@${hostname()}>`,
date: getRFC2822Date(),
};