nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2025-09-07 05:35:12 +08:00
Code Issues Projects Releases Packages Wiki Activity

use public properties to check if a socket is open or not

Browse source
This commit is contained in:
Andris Reinman 2021-05-31 16:19:44 +03:00
parent 9c04a286e2
commit 425652d4c0
4 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
imap-core/lib/imap-connection.js
View file

@ -203,7 +203,7 @@ class IMAPConnection extends EventEmitter {
* @param {String|Array} data If data is Array, send a multi-line response * @param {String|Array} data If data is Array, send a multi-line response
*/ */
send(payload, callback) { send(payload, callback) {
if (this._socket && this._socket.writable) { if (this._socket && !this._socket.destroyed && this._socket.readyState === 'open') {
try { try {
this[!this.compression ? '_socket' : '_deflate'].write(payload + '\r\n', 'binary', (...args) => { this[!this.compression ? '_socket' : '_deflate'].write(payload + '\r\n', 'binary', (...args) => {
if (args[0]) { if (args[0]) {

1
imap-core/lib/imap-tools.js
View file

@ -744,7 +744,6 @@ module.exports.sendCapabilityResponse = connection => {
capabilities.push('SPECIAL-USE'); capabilities.push('SPECIAL-USE');
capabilities.push('UIDPLUS'); capabilities.push('UIDPLUS');
capabilities.push('UNSELECT');
capabilities.push('ENABLE'); capabilities.push('ENABLE');
capabilities.push('CONDSTORE'); capabilities.push('CONDSTORE');
capabilities.push('UTF8=ACCEPT'); capabilities.push('UTF8=ACCEPT');

4
lib/pop3/connection.js
View file

@ -70,14 +70,14 @@ class POP3Connection extends EventEmitter {
} }
write(payload) { write(payload) {
if (!this._socket || !this._socket.writable) { if (!this._socket || this._socket.destroyed || this._socket.readyState !== 'open') {
return; return;
} }
this._socket.write(payload); this._socket.write(payload);
} }
send(payload) { send(payload) {
if (!this._socket || !this._socket.writable) { if (!this._socket || this._socket.destroyed || this._socket.readyState !== 'open') {
return; return;
} }

7
lib/tools.js
View file

@ -459,14 +459,9 @@ function validationErrors(validationResult) {
} }
function checkSocket(socket) { function checkSocket(socket) {
if (!socket || !socket._writableState || !socket._readableState) { if (!socket || socket.destroyed || socket.readyState !== 'open') {
throw new Error('Socket not open'); throw new Error('Socket not open');
} }
for (let s of [socket._writableState, socket._readableState]) {
if (s.destroyed || s.errored || s.closed) {
throw new Error('Socket not open');
}
}
} }
module.exports = { module.exports = {