n8n-nodes-gmail-custom 0.1.8 → 0.2.1

package/nodes/GmailCustom/GmailCustom.node.js

@@ -161,6 +161,58 @@ async function buildMimeMessage(options) {
 		.replace(/=+$/, '');
 }
 
+async function getOrRefreshAccessToken(ctx, credentials, fromEmail) {
+	const cacheKey = `${credentials.email}:${fromEmail}`;
+	let token = TOKEN_CACHE[cacheKey];
+	if (token && token.expiresAt > Date.now()) {
+		return token.accessToken;
+	}
+
+	const privateKey = formatPrivateKey(credentials.privateKey);
+	const now = Math.floor(Date.now() / 1000);
+
+	let jwt;
+	const payload = {
+		iss: credentials.email,
+		scope: 'https://mail.google.com/',
+		aud: 'https://oauth2.googleapis.com/token',
+		exp: now + 3600,
+		iat: now,
+		sub: fromEmail,
+	};
+
+	if (jwtLib) {
+		jwt = jwtLib.sign(payload, privateKey, {
+			algorithm: 'RS256',
+			header: { kid: privateKey, typ: 'JWT', alg: 'RS256' },
+		});
+	} else {
+		const header = { alg: 'RS256', typ: 'JWT', kid: privateKey };
+		const signatureInput = base64UrlEncode(JSON.stringify(header)) + '.' + base64UrlEncode(JSON.stringify(payload));
+		const signer = crypto.createSign('RSA-SHA256');
+		signer.update(signatureInput);
+		const sig = signer.sign(privateKey);
+		jwt = signatureInput + '.' + base64urlEscape(sig.toString('base64'));
+	}
+
+	const response = await ctx.helpers.httpRequest({
+		method: 'POST',
+		url: 'https://oauth2.googleapis.com/token',
+		headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+		body: new URLSearchParams({
+			grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
+			assertion: jwt,
+		}).toString(),
+	});
+
+	TOKEN_CACHE[cacheKey] = {
+		accessToken: response.access_token,
+		expiresAt: Date.now() + 3500 * 1000,
+	};
+
+	return response.access_token;
+}
+
 class GmailCustom {
 
 	constructor() {
@@ -171,7 +223,7 @@ class GmailCustom {
 			group: ['output'],
 			version: 1,
 			subtitle: '={{$parameter["subject"] || "Send Email"}}',
-			description: 'Send email via Gmail API with token caching and 429 retry',
+			description: 'Send email via Gmail API with token caching for service accounts',
 			defaults: {
 				name: 'Gmail Custom',
 				color: '#1a73e8',
@@ -291,13 +343,6 @@ class GmailCustom {
 							default: '',
 							description: 'The email address that the reply message is sent to',
 						},
-						{
-							displayName: 'Append n8n Attribution',
-							name: 'appendAttribution',
-							type: 'boolean',
-							default: true,
-							description: 'Whether to include the phrase "This email was sent automatically with n8n" to the end of the email',
-						},
 					],
 				},
 			],
@@ -306,10 +351,15 @@ class GmailCustom {
 
 	async execute() {
 		const items = this.getInputData();
+		if (!items || items.length === 0) {
+			return [[]];
+		}
+
 		const returnData = [];
 
 		for (let i = 0; i < items.length; i++) {
 			try {
+				const item = items[i];
 				const fromEmail = this.getNodeParameter('fromEmail', i, '');
 				const sendTo = this.getNodeParameter('sendTo', i, '');
 				const subject = this.getNodeParameter('subject', i, '');
@@ -325,7 +375,6 @@ class GmailCustom {
 				let cc = options.ccList || '';
 				let bcc = options.bccList || '';
 				let replyTo = options.replyTo || '';
-				const appendAttribution = options.appendAttribution === undefined ? true : options.appendAttribution;
 
 				let bodyText = message;
 				let bodyHtml = '';
@@ -338,84 +387,8 @@ class GmailCustom {
 					bodyText = message;
 				}
 
-				if (appendAttribution) {
-					const attributionText = '\n\n---\nThis email was sent automatically with n8n';
-					if (emailType === 'html') {
-						bodyHtml += '<br><br>---<br><em>This email was sent automatically with n8n</em>';
-					} else {
-						bodyText += attributionText;
-					}
-				}
-
 				const credentials = await this.getCredentials('googleApi');
-				const cacheKey = `${credentials.email}:${fromEmail}`;
-				let accessToken;
-				let expiresAt = 0;
-
-				if (TOKEN_CACHE[cacheKey]) {
-					expiresAt = TOKEN_CACHE[cacheKey].expiresAt;
-					accessToken = TOKEN_CACHE[cacheKey].accessToken;
-				}
-
-				if (!accessToken || Date.now() >= expiresAt) {
-					const privateKey = formatPrivateKey(credentials.privateKey);
-					const now = Math.floor(Date.now() / 1000);
-
-					let jwt;
-					if (jwtLib) {
-						jwt = jwtLib.sign(
-							{
-								iss: credentials.email,
-								scope: 'https://mail.google.com/',
-								aud: 'https://oauth2.googleapis.com/token',
-								exp: now + 3600,
-								iat: now,
-								sub: fromEmail,
-							},
-							privateKey,
-							{
-								algorithm: 'RS256',
-								header: {
-									kid: privateKey,
-									typ: 'JWT',
-									alg: 'RS256',
-								},
-							},
-						);
-					} else {
-						const header = { alg: 'RS256', typ: 'JWT', kid: privateKey };
-						const payload = {
-							iss: credentials.email,
-							scope: 'https://mail.google.com/',
-							aud: 'https://oauth2.googleapis.com/token',
-							exp: now + 3600,
-							iat: now,
-							sub: fromEmail,
-						};
-						const signatureInput = base64UrlEncode(JSON.stringify(header)) + '.' + base64UrlEncode(JSON.stringify(payload));
-						const signer = crypto.createSign('RSA-SHA256');
-						signer.update(signatureInput);
-						const sig = signer.sign(privateKey);
-						jwt = signatureInput + '.' + base64urlEscape(sig.toString('base64'));
-					}
-
-					const response = await this.helpers.request({
-						method: 'POST',
-						uri: 'https://oauth2.googleapis.com/token',
-						headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-						form: {
-							grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-							assertion: jwt,
-						},
-						json: true,
-					});
-
-					accessToken = response.access_token;
-					TOKEN_CACHE[cacheKey] = {
-						accessToken,
-						expiresAt: Date.now() + 3500 * 1000,
-					};
-				}
+				const accessToken = await getOrRefreshAccessToken(this, credentials, fromEmail);
 
 				let attachments = [];
 				if (options.attachmentsUi && options.attachmentsUi.attachmentsBinary) {
@@ -452,46 +425,27 @@ class GmailCustom {
 					attachments,
 				});
 
-				const maxRetries = 4;
-				let lastError;
-
-				for (let attempt = 0; attempt <= maxRetries; attempt++) {
-					try {
-						const sendResponse = await this.helpers.httpRequest({
-							method: 'POST',
-							url: 'https://gmail.googleapis.com/gmail/v1/users/me/messages/send',
-							headers: {
-								Authorization: `Bearer ${accessToken}`,
-								'Content-Type': 'application/json',
-							},
-							body: { raw: base64UrlMessage },
-						});
-
-						returnData.push({
-							json: sendResponse,
-							pairedItem: { item: i },
-						});
-						lastError = null;
-						break;
-					} catch (error) {
-						lastError = error;
-						const statusCode = error.statusCode || error.response?.statusCode;
-						if (statusCode === 429 && attempt < maxRetries) {
-							const delay = Math.min(Math.pow(2, attempt) * 1000 + Math.random() * 1000, 30000);
-							await new Promise(resolve => setTimeout(resolve, delay));
-							continue;
-						}
-						throw error;
-					}
-				}
+				const sendResponse = await this.helpers.httpRequest({
+						method: 'POST',
+						url: 'https://gmail.googleapis.com/gmail/v1/users/me/messages/send',
+						headers: {
+							Authorization: `Bearer ${accessToken}`,
+							'Content-Type': 'application/json',
+						},
+						body: { raw: base64UrlMessage },
+					});
 
-				if (lastError) throw lastError;
+					returnData.push({
+						json: sendResponse,
+						pairedItem: { item: i },
+					});
 
 			} catch (error) {
-				const continueOnFail = typeof this.continueOnFail === 'function' ? this.continueOnFail() : false;
+				let continueOnFail = false;
+				try { continueOnFail = this.continueOnFail(); } catch (e) {}
 				if (continueOnFail) {
 					returnData.push({
-						json: { error: error.message },
+						json: { error: error.message || 'Unknown error' },
 						pairedItem: { item: i },
 					});
 					continue;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "n8n-nodes-gmail-custom",
-	"version": "0.1.8",
+	"version": "0.2.1",
 	"description": "Custom Gmail node for n8n with token caching and 429 retry",
 	"keywords": [
 		"n8n-community-node-package",