n8n-nodes-gmail-custom 0.5.0 → 0.5.1

package/nodes/GmailCustom/GmailTriggerCustom.node.js

@@ -49,6 +49,24 @@ class GmailTriggerCustom {
 					default: true,
 					description: 'Whether to return a simplified version of the response instead of the raw data',
 				},
+				{
+					displayName: 'Max Emails per Poll',
+					name: 'maxResults',
+					type: 'number',
+					default: 10,
+					typeOptions: {
+						minValue: 1,
+						maxValue: 50,
+					},
+					description: 'Maximum number of emails to fetch each time the node polls. Remaining emails are picked up in subsequent polls.',
+				},
+				{
+					displayName: 'Mark as Read',
+					name: 'markAsRead',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to mark processed emails as read (adds 1 API call per email)',
+				},
 				{
 					displayName: 'Filters',
 					name: 'filters',
@@ -128,6 +146,8 @@ class GmailTriggerCustom {
 		const privateKey = this.getNodeParameter('privateKey', 0) || '';
 		const delegatedEmail = this.getNodeParameter('delegatedEmail', 0) || '';
 		const simple = this.getNodeParameter('simple', 0);
+		let maxResults = this.getNodeParameter('maxResults', 0) || 10;
+		const markAsRead = this.getNodeParameter('markAsRead', 0);
 		const filters = this.getNodeParameter('filters', 0, {});
 
 		const accessToken = await getOrRefreshAccessToken(this, serviceAccountEmail, privateKey, delegatedEmail);
@@ -166,11 +186,18 @@ class GmailTriggerCustom {
 				return;
 			}
 
-			if (simple) {
-				responseData.push({ json: fullMessage });
-			} else {
-				responseData.push({ json: fullMessage });
+			if (markAsRead) {
+				try {
+					await this.helpers.httpRequest({
+						method: 'POST',
+						url: `https://gmail.googleapis.com/gmail/v1/users/me/messages/${messageId}/modify`,
+						headers: { Authorization: `Bearer ${accessToken}` },
+						body: { removeLabelIds: ['UNREAD'] },
+					});
+				} catch (e) {}
 			}
+
+			responseData.push({ json: fullMessage });
 		};
 
 		try {
@@ -219,41 +246,58 @@ class GmailTriggerCustom {
 			qs.q = parts.join(' ');
 
 			if (this.getMode() === 'manual') {
-				qs.maxResults = 1;
+				maxResults = 1;
 			}
 
-			const messagesResponse = await this.helpers.httpRequest({
-				method: 'GET',
-				url: 'https://gmail.googleapis.com/gmail/v1/users/me/messages',
-				headers: { Authorization: `Bearer ${accessToken}` },
-				qs,
-			});
+			let budget = maxResults;
 
-			const messages = messagesResponse.messages || [];
+			// Process pending messages from previous poll first.
+			const pendingIds = nodeStaticData.pendingMessageIds || [];
+			if (pendingIds.length > 0) {
+				const idsToFetch = pendingIds.slice(0, budget);
+				nodeStaticData.pendingMessageIds = pendingIds.slice(budget);
 
-			if (!messages.length && !allFetchedMessages.length) {
-				return null;
-			}
-
-			const possibleDuplicates = new Set(nodeStaticData.possibleDuplicates || []);
-			const filteredMessages = possibleDuplicates.size > 0
-				? messages.filter((m) => !possibleDuplicates.has(m.id))
-				: messages;
+				const fetchQs = {};
+				if (!simple) { fetchQs.format = 'raw'; }
+				else { fetchQs.format = 'metadata'; fetchQs.metadataHeaders = ['From', 'To', 'Cc', 'Bcc', 'Subject']; }
 
-			if (!filteredMessages.length && !allFetchedMessages.length) {
-				return null;
-			}
-
-			const fetchQs = {};
-			if (!simple) {
-				fetchQs.format = 'raw';
-			} else {
-				fetchQs.format = 'metadata';
-				fetchQs.metadataHeaders = ['From', 'To', 'Cc', 'Bcc', 'Subject'];
+				for (const id of idsToFetch) {
+					await fetchAndProcessMessage(id, fetchQs);
+				}
+				budget -= idsToFetch.length;
 			}
 
-			for (const message of filteredMessages) {
-				await fetchAndProcessMessage(message.id, fetchQs);
+			// Only list new messages if budget remains.
+			if (budget > 0) {
+				const messagesResponse = await this.helpers.httpRequest({
+					method: 'GET',
+					url: 'https://gmail.googleapis.com/gmail/v1/users/me/messages',
+					headers: { Authorization: `Bearer ${accessToken}` },
+					qs,
+				});
+
+				const messages = messagesResponse.messages || [];
+
+				if (messages.length > 0) {
+					const possibleDuplicates = new Set(nodeStaticData.possibleDuplicates || []);
+					const filteredMessages = possibleDuplicates.size > 0
+						? messages.filter((m) => !possibleDuplicates.has(m.id))
+						: messages;
+
+					let messagesToProcess = filteredMessages;
+					if (filteredMessages.length > budget) {
+						messagesToProcess = filteredMessages.slice(0, budget);
+						nodeStaticData.pendingMessageIds = filteredMessages.slice(budget).map((m) => m.id);
+					}
+
+					const fetchQs = {};
+					if (!simple) { fetchQs.format = 'raw'; }
+					else { fetchQs.format = 'metadata'; fetchQs.metadataHeaders = ['From', 'To', 'Cc', 'Bcc', 'Subject']; }
+
+					for (const message of messagesToProcess) {
+						await fetchAndProcessMessage(message.id, fetchQs);
+					}
+				}
 			}
 		} catch (error) {
 			if (this.getMode() === 'manual' || !nodeStaticData.lastTimeChecked) {
@@ -273,7 +317,9 @@ class GmailTriggerCustom {
 		);
 
 		nodeStaticData.possibleDuplicates = allFetchedMessages.map((m) => m.id);
-		nodeStaticData.lastTimeChecked = Math.max(lastEmailDate || startDate, startDate);
+		if (!nodeStaticData.pendingMessageIds || nodeStaticData.pendingMessageIds.length === 0) {
+			nodeStaticData.lastTimeChecked = Math.max(lastEmailDate || startDate, startDate);
+		}
 
 		return responseData.length > 0 ? [responseData] : null;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "n8n-nodes-gmail-custom",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"description": "Custom Gmail nodes for n8n with token caching — Send and Trigger, self-contained credentials",
 	"keywords": [
 		"n8n-community-node-package",