@upyo/smtp 0.6.0-dev.271 → 0.6.0-dev.272

package/README.md

@@ -26,6 +26,7 @@ Features
  -  HTML and plain text email support
  -  File attachments (regular and inline)
  -  Multiple recipients (To, CC, BCC)
+ -  SMTP PIPELINING for faster multi-recipient delivery
  -  Custom headers
  -  Priority levels
  -  Comprehensive testing utilities

package/dist/index.cjs

@@ -361,6 +361,16 @@ var OAuth2TokenManager = class {
 
 //#endregion
 //#region src/smtp-connection.ts
+var SmtpPipelineTerminatedError = class extends Error {
+	responseIndex;
+	response;
+	constructor(responseIndex, response) {
+		super("SMTP pipeline terminated by the server.");
+		this.name = "SmtpPipelineTerminatedError";
+		this.responseIndex = responseIndex;
+		this.response = response;
+	}
+};
 /**
 * The maximum length of an SMTP command line, including the terminating CRLF,
 * as specified by RFC 5321 §4.5.3.1.4.
@@ -513,30 +523,59 @@ var SmtpConnection = class {
 		});
 	}
 	sendCommand(command, signal) {
+		return this.sendCommands([command], signal).then((responses) => responses[0]);
+	}
+	/**
+	* Sends a group of commands in one write and reads one reply per command.
+	*
+	* SMTP multiline replies are kept together and complete replies are matched
+	* to commands by their position in the returned array, as required for
+	* command pipelining by RFC 2920.
+	*/
+	sendCommands(commands, signal) {
 		if (!this.socket) throw new Error("Not connected");
 		signal?.throwIfAborted();
 		return new Promise((resolve, reject) => {
 			let buffer = "";
-			const timeout = setTimeout(() => {
+			let responseLines = [];
+			const responses = [];
+			const startTimeout = () => setTimeout(() => {
+				cleanup();
 				reject(/* @__PURE__ */ new Error("Command timeout"));
 			}, this.config.socketTimeout);
+			let timeout = startTimeout();
+			const resetTimeout = () => {
+				clearTimeout(timeout);
+				timeout = startTimeout();
+			};
 			const onData = (data) => {
 				buffer += data.toString();
 				const lines = buffer.split("\r\n");
 				const incompleteLine = lines.pop() || "";
-				for (let i = 0; i < lines.length; i++) {
-					const line = lines[i];
+				for (const line of lines) {
+					responseLines.push(line);
 					if (line.length >= 4 && line[3] === " ") {
 						const code = parseInt(line.substring(0, 3), 10);
 						const message = line.substring(4);
-						const fullResponse = lines.slice(0, i + 1).join("\r\n");
-						cleanup();
-						resolve({
+						const response = {
 							code,
 							message,
-							raw: fullResponse
-						});
-						return;
+							raw: responseLines.join("\r\n")
+						};
+						const responseIndex = responses.length;
+						responses.push(response);
+						responseLines = [];
+						if (responses.length === commands.length) {
+							cleanup();
+							resolve(responses);
+							return;
+						}
+						if (response.code === 421) {
+							cleanup();
+							reject(new SmtpPipelineTerminatedError(responseIndex, response));
+							return;
+						}
+						resetTimeout();
 					}
 				}
 				buffer = incompleteLine;
@@ -545,14 +584,35 @@ var SmtpConnection = class {
 				cleanup();
 				reject(error);
 			};
+			const onClose = () => {
+				cleanup();
+				const responseIndex = responses.findIndex((response) => response.code >= 400);
+				if (responseIndex >= 0) {
+					reject(new SmtpPipelineTerminatedError(responseIndex, responses[responseIndex]));
+					return;
+				}
+				reject(/* @__PURE__ */ new Error("Connection closed before all command responses."));
+			};
+			const onAbort = () => {
+				cleanup();
+				try {
+					signal?.throwIfAborted();
+				} catch (error) {
+					reject(error);
+				}
+			};
 			const cleanup = () => {
 				clearTimeout(timeout);
 				this.socket?.off("data", onData);
 				this.socket?.off("error", onError);
+				this.socket?.off("close", onClose);
+				signal?.removeEventListener("abort", onAbort);
 			};
 			this.socket.on("data", onData);
 			this.socket.on("error", onError);
-			this.socket.write(command + "\r\n");
+			this.socket.on("close", onClose);
+			signal?.addEventListener("abort", onAbort, { once: true });
+			this.socket.write(commands.map((command) => `${command}\r\n`).join(""));
 		});
 	}
 	greeting(signal) {
@@ -600,7 +660,7 @@ var SmtpConnection = class {
 			return;
 		}
 		if (response.code !== 250) throw new Error(`EHLO failed: ${response.message}`);
-		this.capabilities = response.raw.split("\r\n").filter((line) => line.startsWith("250-") || line.startsWith("250 ")).map((line) => line.substring(4)).filter((line) => line.length > 0);
+		this.capabilities = response.raw.split("\r\n").filter((line) => line.startsWith("250-") || line.startsWith("250 ")).slice(1).map((line) => line.substring(4)).filter((line) => line.length > 0);
 	}
 	async starttls(signal) {
 		if (!this.socket) throw new Error("Not connected");
@@ -753,12 +813,31 @@ var SmtpConnection = class {
 		throw new SmtpAuthError(`${mechanism} authentication failed: ${response.message}`);
 	}
 	async sendMessage(message, signal) {
-		const mailResponse = await this.sendCommand(`MAIL FROM:<${message.envelope.from}>`, signal);
+		const mailCommand = `MAIL FROM:<${message.envelope.from}>`;
+		const recipientCommands = message.envelope.to.map((recipient) => `RCPT TO:<${recipient}>`);
+		const pipelining = this.capabilities.some((capability) => /^PIPELINING(?:\s|$)/i.test(capability));
+		let mailResponse;
+		let recipientResponses;
+		if (pipelining) try {
+			const envelopeResponses = await this.sendCommands([mailCommand, ...recipientCommands], signal);
+			mailResponse = envelopeResponses[0];
+			recipientResponses = envelopeResponses.slice(1);
+		} catch (error) {
+			if (!(error instanceof SmtpPipelineTerminatedError)) throw error;
+			const { response, responseIndex } = error;
+			if (responseIndex === 0) throw new SmtpResponseError(`MAIL FROM failed: ${response.message}`, response.code, "MAIL FROM", response.message);
+			const recipient = message.envelope.to[responseIndex - 1];
+			throw new SmtpResponseError(`RCPT TO failed for ${recipient}: ${response.message}`, response.code, "RCPT TO", response.message);
+		}
+		else {
+			mailResponse = await this.sendCommand(mailCommand, signal);
+			recipientResponses = [];
+		}
 		if (mailResponse.code !== 250) throw new SmtpResponseError(`MAIL FROM failed: ${mailResponse.message}`, mailResponse.code, "MAIL FROM", mailResponse.message);
 		const rejectedRecipients = [];
-		for (const recipient of message.envelope.to) {
+		for (const [index, recipient] of message.envelope.to.entries()) {
 			signal?.throwIfAborted();
-			const rcptResponse = await this.sendCommand(`RCPT TO:<${recipient}>`, signal);
+			const rcptResponse = pipelining ? recipientResponses[index] : await this.sendCommand(recipientCommands[index], signal);
 			if (rcptResponse.code === 421) throw new SmtpResponseError(`RCPT TO failed for ${recipient}: ${rcptResponse.message}`, rcptResponse.code, "RCPT TO", rcptResponse.message);
 			if (rcptResponse.code !== 250 && rcptResponse.code !== 251) rejectedRecipients.push({
 				recipient,

package/dist/index.js

@@ -338,6 +338,16 @@ var OAuth2TokenManager = class {
 
 //#endregion
 //#region src/smtp-connection.ts
+var SmtpPipelineTerminatedError = class extends Error {
+	responseIndex;
+	response;
+	constructor(responseIndex, response) {
+		super("SMTP pipeline terminated by the server.");
+		this.name = "SmtpPipelineTerminatedError";
+		this.responseIndex = responseIndex;
+		this.response = response;
+	}
+};
 /**
 * The maximum length of an SMTP command line, including the terminating CRLF,
 * as specified by RFC 5321 §4.5.3.1.4.
@@ -490,30 +500,59 @@ var SmtpConnection = class {
 		});
 	}
 	sendCommand(command, signal) {
+		return this.sendCommands([command], signal).then((responses) => responses[0]);
+	}
+	/**
+	* Sends a group of commands in one write and reads one reply per command.
+	*
+	* SMTP multiline replies are kept together and complete replies are matched
+	* to commands by their position in the returned array, as required for
+	* command pipelining by RFC 2920.
+	*/
+	sendCommands(commands, signal) {
 		if (!this.socket) throw new Error("Not connected");
 		signal?.throwIfAborted();
 		return new Promise((resolve, reject) => {
 			let buffer = "";
-			const timeout = setTimeout(() => {
+			let responseLines = [];
+			const responses = [];
+			const startTimeout = () => setTimeout(() => {
+				cleanup();
 				reject(/* @__PURE__ */ new Error("Command timeout"));
 			}, this.config.socketTimeout);
+			let timeout = startTimeout();
+			const resetTimeout = () => {
+				clearTimeout(timeout);
+				timeout = startTimeout();
+			};
 			const onData = (data) => {
 				buffer += data.toString();
 				const lines = buffer.split("\r\n");
 				const incompleteLine = lines.pop() || "";
-				for (let i = 0; i < lines.length; i++) {
-					const line = lines[i];
+				for (const line of lines) {
+					responseLines.push(line);
 					if (line.length >= 4 && line[3] === " ") {
 						const code = parseInt(line.substring(0, 3), 10);
 						const message = line.substring(4);
-						const fullResponse = lines.slice(0, i + 1).join("\r\n");
-						cleanup();
-						resolve({
+						const response = {
 							code,
 							message,
-							raw: fullResponse
-						});
-						return;
+							raw: responseLines.join("\r\n")
+						};
+						const responseIndex = responses.length;
+						responses.push(response);
+						responseLines = [];
+						if (responses.length === commands.length) {
+							cleanup();
+							resolve(responses);
+							return;
+						}
+						if (response.code === 421) {
+							cleanup();
+							reject(new SmtpPipelineTerminatedError(responseIndex, response));
+							return;
+						}
+						resetTimeout();
 					}
 				}
 				buffer = incompleteLine;
@@ -522,14 +561,35 @@ var SmtpConnection = class {
 				cleanup();
 				reject(error);
 			};
+			const onClose = () => {
+				cleanup();
+				const responseIndex = responses.findIndex((response) => response.code >= 400);
+				if (responseIndex >= 0) {
+					reject(new SmtpPipelineTerminatedError(responseIndex, responses[responseIndex]));
+					return;
+				}
+				reject(/* @__PURE__ */ new Error("Connection closed before all command responses."));
+			};
+			const onAbort = () => {
+				cleanup();
+				try {
+					signal?.throwIfAborted();
+				} catch (error) {
+					reject(error);
+				}
+			};
 			const cleanup = () => {
 				clearTimeout(timeout);
 				this.socket?.off("data", onData);
 				this.socket?.off("error", onError);
+				this.socket?.off("close", onClose);
+				signal?.removeEventListener("abort", onAbort);
 			};
 			this.socket.on("data", onData);
 			this.socket.on("error", onError);
-			this.socket.write(command + "\r\n");
+			this.socket.on("close", onClose);
+			signal?.addEventListener("abort", onAbort, { once: true });
+			this.socket.write(commands.map((command) => `${command}\r\n`).join(""));
 		});
 	}
 	greeting(signal) {
@@ -577,7 +637,7 @@ var SmtpConnection = class {
 			return;
 		}
 		if (response.code !== 250) throw new Error(`EHLO failed: ${response.message}`);
-		this.capabilities = response.raw.split("\r\n").filter((line) => line.startsWith("250-") || line.startsWith("250 ")).map((line) => line.substring(4)).filter((line) => line.length > 0);
+		this.capabilities = response.raw.split("\r\n").filter((line) => line.startsWith("250-") || line.startsWith("250 ")).slice(1).map((line) => line.substring(4)).filter((line) => line.length > 0);
 	}
 	async starttls(signal) {
 		if (!this.socket) throw new Error("Not connected");
@@ -730,12 +790,31 @@ var SmtpConnection = class {
 		throw new SmtpAuthError(`${mechanism} authentication failed: ${response.message}`);
 	}
 	async sendMessage(message, signal) {
-		const mailResponse = await this.sendCommand(`MAIL FROM:<${message.envelope.from}>`, signal);
+		const mailCommand = `MAIL FROM:<${message.envelope.from}>`;
+		const recipientCommands = message.envelope.to.map((recipient) => `RCPT TO:<${recipient}>`);
+		const pipelining = this.capabilities.some((capability) => /^PIPELINING(?:\s|$)/i.test(capability));
+		let mailResponse;
+		let recipientResponses;
+		if (pipelining) try {
+			const envelopeResponses = await this.sendCommands([mailCommand, ...recipientCommands], signal);
+			mailResponse = envelopeResponses[0];
+			recipientResponses = envelopeResponses.slice(1);
+		} catch (error) {
+			if (!(error instanceof SmtpPipelineTerminatedError)) throw error;
+			const { response, responseIndex } = error;
+			if (responseIndex === 0) throw new SmtpResponseError(`MAIL FROM failed: ${response.message}`, response.code, "MAIL FROM", response.message);
+			const recipient = message.envelope.to[responseIndex - 1];
+			throw new SmtpResponseError(`RCPT TO failed for ${recipient}: ${response.message}`, response.code, "RCPT TO", response.message);
+		}
+		else {
+			mailResponse = await this.sendCommand(mailCommand, signal);
+			recipientResponses = [];
+		}
 		if (mailResponse.code !== 250) throw new SmtpResponseError(`MAIL FROM failed: ${mailResponse.message}`, mailResponse.code, "MAIL FROM", mailResponse.message);
 		const rejectedRecipients = [];
-		for (const recipient of message.envelope.to) {
+		for (const [index, recipient] of message.envelope.to.entries()) {
 			signal?.throwIfAborted();
-			const rcptResponse = await this.sendCommand(`RCPT TO:<${recipient}>`, signal);
+			const rcptResponse = pipelining ? recipientResponses[index] : await this.sendCommand(recipientCommands[index], signal);
 			if (rcptResponse.code === 421) throw new SmtpResponseError(`RCPT TO failed for ${recipient}: ${rcptResponse.message}`, rcptResponse.code, "RCPT TO", rcptResponse.message);
 			if (rcptResponse.code !== 250 && rcptResponse.code !== 251) rejectedRecipients.push({
 				recipient,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@upyo/smtp",
-  "version": "0.6.0-dev.271",
+  "version": "0.6.0-dev.272",
   "description": "SMTP transport for Upyo email library",
   "keywords": [
     "email",
@@ -53,7 +53,7 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "@upyo/core": "0.6.0-dev.271+8deab0ad"
+    "@upyo/core": "0.6.0-dev.272+71461772"
   },
   "devDependencies": {
     "tsdown": "^0.12.7",