smtp/client.ts

@@ -63,6 +63,9 @@ export class SMTPClient {
 				}
 				this.queue.push(stack);
 				this._poll();
+				if (this.queue.every((x) => x !== stack)) {
+					callback(null, message);
+				}
 			} else {
 				callback(new Error(why), msg);
 			}

smtp/connection.ts

@@ -120,7 +120,10 @@ export class SMTPConnection extends EventEmitter {
 	protected tls: boolean | SMTPSocketOptions = false;
 	protected port: number;
 
-	private greylistResponseTracker = new WeakSet<(...rest: any[]) => void>();
+	private greylistResponseTracker = new WeakMap<
+		(...rest: any[]) => void,
+		boolean
+	>();
 
 	/**
 	 * SMTP class written using python's (2.7) smtplib.py as a base.
@@ -408,9 +411,9 @@ export class SMTPConnection extends EventEmitter {
 				} else if (
 					(code === 450 || code === 451) &&
 					msg.message.toLowerCase().includes('greylist') &&
-					this.greylistResponseTracker.has(response) === false
+					this.greylistResponseTracker.get(response) === false
 				) {
-					this.greylistResponseTracker.add(response);
+					this.greylistResponseTracker.set(response, true);
 					setTimeout(() => {
 						this.send(cmd + CRLF, response);
 					}, GREYLIST_DELAY);
@@ -432,7 +435,7 @@ export class SMTPConnection extends EventEmitter {
 			}
 		};
 
-		this.greylistResponseTracker.delete(response);
+		this.greylistResponseTracker.set(response, false);
 		this.send(cmd + CRLF, response);
 	}