nodemailer
Advanced tools
Comparing version 6.3.0 to 6.3.1
# CHANGELOG | ||
## 6.3.1 2019-10-09 | ||
- Ignore "end" events because it might be "error" after it (dex4er) [72bade9] | ||
- Set username and password on the connection proxy object correctly (UsamaAshraf) [250b1a8] | ||
- Support more DNS errors (madarche) [2391aa4] | ||
## 6.3.0 2019-07-14 | ||
- Added new option to pass a set of httpHeaders to be sent when fetching attachments. See [PR #1034](https://github.com/nodemailer/nodemailer/pull/1034) | ||
## 6.2.1 2019-05-24 | ||
@@ -4,0 +14,0 @@ |
@@ -146,9 +146,11 @@ 'use strict'; | ||
} | ||
return lines.filter(line => line.trim()).map(line => ({ | ||
key: line | ||
.substr(0, line.indexOf(':')) | ||
.trim() | ||
.toLowerCase(), | ||
line | ||
})); | ||
return lines | ||
.filter(line => line.trim()) | ||
.map(line => ({ | ||
key: line | ||
.substr(0, line.indexOf(':')) | ||
.trim() | ||
.toLowerCase(), | ||
line | ||
})); | ||
} | ||
@@ -155,0 +157,0 @@ } |
@@ -347,4 +347,4 @@ 'use strict'; | ||
if (proxyV2) { | ||
connectionOpts.userId = username; | ||
connectionOpts.password = password; | ||
connectionOpts.proxy.userId = username; | ||
connectionOpts.proxy.password = password; | ||
} else if (proxyType === 4) { | ||
@@ -351,0 +351,0 @@ connectionOpts.userid = username; |
@@ -21,2 +21,4 @@ /* eslint no-console: 0 */ | ||
case dns.NOTIMP: | ||
case dns.SERVFAIL: | ||
case 'EAI_AGAIN': | ||
return callback(null, []); | ||
@@ -23,0 +25,0 @@ } |
@@ -189,4 +189,4 @@ 'use strict'; | ||
*/ | ||
this._onSocketData = (chunk) => this._onData(chunk); | ||
this._onSocketError = (error) => this._onError(error, 'ESOCKET', false, 'CONN'); | ||
this._onSocketData = chunk => this._onData(chunk); | ||
this._onSocketError = error => this._onError(error, 'ESOCKET', false, 'CONN'); | ||
this._onSocketClose = () => this._onClose(); | ||
@@ -278,10 +278,6 @@ this._onSocketEnd = () => this._onEnd(); | ||
try { | ||
this._socket.connect( | ||
this.port, | ||
this.host, | ||
() => { | ||
this._socket.setKeepAlive(true); | ||
this._onConnect(); | ||
} | ||
); | ||
this._socket.connect(this.port, this.host, () => { | ||
this._socket.setKeepAlive(true); | ||
this._onConnect(); | ||
}); | ||
setupConnectionHandlers(); | ||
@@ -321,9 +317,6 @@ } catch (E) { | ||
try { | ||
this._socket = tls.connect( | ||
opts, | ||
() => { | ||
this._socket.setKeepAlive(true); | ||
this._onConnect(); | ||
} | ||
); | ||
this._socket = tls.connect(opts, () => { | ||
this._socket.setKeepAlive(true); | ||
this._onConnect(); | ||
}); | ||
setupConnectionHandlers(); | ||
@@ -358,9 +351,6 @@ } catch (E) { | ||
try { | ||
this._socket = net.connect( | ||
opts, | ||
() => { | ||
this._socket.setKeepAlive(true); | ||
this._onConnect(); | ||
} | ||
); | ||
this._socket = net.connect(opts, () => { | ||
this._socket.setKeepAlive(true); | ||
this._onConnect(); | ||
}); | ||
setupConnectionHandlers(); | ||
@@ -837,3 +827,5 @@ } catch (E) { | ||
_onEnd() { | ||
this._destroy(); | ||
if (this._socket && !this._socket.destroyed) { | ||
this._socket.destroy(); | ||
} | ||
} | ||
@@ -886,15 +878,12 @@ | ||
this.upgrading = true; | ||
this._socket = tls.connect( | ||
opts, | ||
() => { | ||
this.secure = true; | ||
this.upgrading = false; | ||
this._socket.on('data', this._onSocketData); | ||
this._socket = tls.connect(opts, () => { | ||
this.secure = true; | ||
this.upgrading = false; | ||
this._socket.on('data', this._onSocketData); | ||
socketPlain.removeListener('close', this._onSocketClose); | ||
socketPlain.removeListener('end', this._onSocketEnd); | ||
socketPlain.removeListener('close', this._onSocketClose); | ||
socketPlain.removeListener('end', this._onSocketEnd); | ||
return callback(null, true); | ||
} | ||
); | ||
return callback(null, true); | ||
}); | ||
@@ -901,0 +890,0 @@ this._socket.on('error', this._onSocketError); |
{ | ||
"name": "nodemailer", | ||
"version": "6.3.0", | ||
"version": "6.3.1", | ||
"description": "Easy as cake e-mail sending from your Node.js applications", | ||
@@ -26,3 +26,3 @@ "main": "lib/nodemailer.js", | ||
"eslint-config-nodemailer": "1.2.0", | ||
"eslint-config-prettier": "6.0.0", | ||
"eslint-config-prettier": "6.4.0", | ||
"grunt": "1.0.4", | ||
@@ -32,10 +32,10 @@ "grunt-cli": "1.3.2", | ||
"grunt-mocha-test": "0.13.3", | ||
"libbase64": "1.0.3", | ||
"libbase64": "1.2.1", | ||
"libmime": "4.1.3", | ||
"libqp": "1.1.0", | ||
"mocha": "6.1.4", | ||
"mocha": "6.2.1", | ||
"nodemailer-ntlm-auth": "1.0.1", | ||
"proxy": "0.2.4", | ||
"proxy": "1.0.1", | ||
"proxy-test-server": "1.0.0", | ||
"sinon": "7.3.2", | ||
"sinon": "7.5.0", | ||
"smtp-server": "3.5.0" | ||
@@ -42,0 +42,0 @@ }, |
478637
11283