nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2025-03-05 20:33:06 +08:00
Code Issues Projects Releases Packages Wiki Activity

Suppress ETIMEDOUT errors

Browse source
This commit is contained in:
Andris Reinman 2017-10-07 23:25:25 +03:00
parent 1fca2d024f
commit 283be10cc6
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
imap-core/lib/imap-server.js
View file

@ -206,9 +206,11 @@ class IMAPServer extends EventEmitter {
remoteAddress
};
}
if (!err) {
err = new Error('Socket closed unexpectedly');
if (!err || !err.message) {
err = new Error('Socket closed while initiating TLS');
err.meta = {
protocol: 'imap',
stage: 'connect',
remoteAddress
};
}
@ -221,8 +223,7 @@ class IMAPServer extends EventEmitter {
// upgrade connection
let tlsSocket = new tls.TLSSocket(socket, socketOptions);
let onCloseError = () => onError(new Error('Socket closed while initiating TLS'));
tlsSocket.once('close', onCloseError);
tlsSocket.once('close', onError);
tlsSocket.once('error', onError);
tlsSocket.once('_tlsError', onError);
tlsSocket.once('clientError', onError);
@ -230,7 +231,7 @@ class IMAPServer extends EventEmitter {
tlsSocket.on('secure', () => {
socket.removeListener('error', onError);
tlsSocket.removeListener('close', onCloseError);
tlsSocket.removeListener('close', onError);
tlsSocket.removeListener('error', onError);
tlsSocket.removeListener('_tlsError', onError);
tlsSocket.removeListener('clientError', onError);

11
lib/pop3/server.js
View file

@ -82,9 +82,11 @@ class POP3Server extends EventEmitter {
remoteAddress
};
}
if (!err) {
err = new Error('Socket closed unexpectedly');
if (!err || !err.message) {
err = new Error('Socket closed while initiating TLS');
err.meta = {
protocol: 'pop3',
stage: 'connect',
remoteAddress
};
}
@ -97,8 +99,7 @@ class POP3Server extends EventEmitter {
// upgrade connection
let tlsSocket = new tls.TLSSocket(socket, socketOptions);
let onCloseError = () => onError(new Error('Socket closed while initiating TLS'));
tlsSocket.once('close', onCloseError);
tlsSocket.once('close', onError);
tlsSocket.once('error', onError);
tlsSocket.once('_tlsError', onError);
tlsSocket.once('clientError', onError);
@ -106,7 +107,7 @@ class POP3Server extends EventEmitter {
tlsSocket.on('secure', () => {
socket.removeListener('error', onError);
tlsSocket.removeListener('close', onCloseError);
tlsSocket.removeListener('close', onError);
tlsSocket.removeListener('error', onError);
tlsSocket.removeListener('_tlsError', onError);
tlsSocket.removeListener('clientError', onError);