n8n-nodes-evolution-message-search 2.0.1 → 2.0.3

package/dist/nodes/SearchMessages/SearchMessages.node.js

@@ -4,7 +4,71 @@ Object.defineProperty(exports, '__esModule', { value: true });
 exports.SearchMessages = void 0;
 
 const n8n_workflow_1 = require('n8n-workflow');
-const core_tools_1 = require('@langchain/core/tools');
+
+async function performSearch(ctx, itemIndex) {
+	const credentials = await ctx.getCredentials('evolutionApi');
+	const serverUrl = credentials['server-url'];
+	const apiKey = credentials.apikey;
+
+	const instanceName = ctx.getNodeParameter('instanceName', itemIndex);
+	const userConversationId = ctx.getNodeParameter('conversationId', itemIndex) || '';
+	const keywords = ctx.getNodeParameter('keywords', itemIndex) || '';
+	const dateFrom = ctx.getNodeParameter('dateFrom', itemIndex) || '';
+	const dateTo = ctx.getNodeParameter('dateTo', itemIndex) || '';
+	const pageSize = ctx.getNodeParameter('pageSize', itemIndex) || 10;
+	const page = ctx.getNodeParameter('page', itemIndex) || 1;
+
+	const skip = (page - 1) * pageSize;
+
+	const whereClause = {};
+	if (userConversationId) {
+		whereClause['key.remote'] = userConversationId;
+	}
+	if (keywords) {
+		whereClause['message.conversationMessage.text'] = { contains: keywords };
+	}
+	if (dateFrom || dateTo) {
+		whereClause['timestamp'] = {};
+		if (dateFrom) {
+			whereClause['timestamp']['gte'] = new Date(dateFrom).getTime() / 1000;
+		}
+		if (dateTo) {
+			whereClause['timestamp']['lte'] = new Date(dateTo).getTime() / 1000;
+		}
+	}
+
+	const body = {
+		where: whereClause,
+		take: pageSize,
+		skip: skip,
+		orderBy: { timestamp: 'desc' },
+	};
+
+	const cleanUrl = serverUrl.replace(/\/$/, '');
+	const response = await ctx.helpers.request({
+		method: 'POST',
+		uri: `${cleanUrl}/chat/findMessages/${instanceName}`,
+		body,
+		headers: {
+			'Content-Type': 'application/json',
+			Accept: 'application/json',
+			apikey: apiKey,
+		},
+		json: true,
+	});
+
+	const messages = response.messages || response;
+	const total = messages.total || messages.length || 0;
+	const totalPages = Math.ceil(total / pageSize);
+
+	return {
+		total,
+		pages: totalPages,
+		currentPage: page,
+		pageSize,
+		records: Array.isArray(messages.records) ? messages.records : messages,
+	};
+}
 
 class SearchMessages {
 	constructor() {
@@ -19,9 +83,9 @@ class SearchMessages {
 			defaults: {
 				name: 'Evolution API - Search Messages',
 			},
-			inputs: [],
-			outputs: [n8n_workflow_1.NodeConnectionTypes.AiTool],
-			outputNames: ['Tool'],
+			usableAsTool: true,
+			inputs: [n8n_workflow_1.NodeConnectionTypes.Main],
+			outputs: [n8n_workflow_1.NodeConnectionTypes.Main],
 			credentials: [
 				{
 					name: 'evolutionApi',
@@ -43,7 +107,7 @@ class SearchMessages {
 					type: 'string',
 					required: false,
 					default: '',
-					description: 'WhatsApp conversation ID (JID). If empty, searches all conversations. Model can set if allowed.',
+					description: 'WhatsApp conversation ID (JID). If empty, searches all conversations.',
 					placeholder: '5511999999999@s.whatsapp.net',
 				},
 				{
@@ -51,7 +115,33 @@ class SearchMessages {
 					name: 'allowModelSetConversation',
 					type: 'boolean',
 					default: false,
-					description: 'If enabled, the AI model can set the conversation ID',
+					description: 'If enabled, the AI model can set the conversation ID via $fromAI()',
+				},
+				{
+					displayName: 'Keywords',
+					name: 'keywords',
+					type: 'string',
+					required: false,
+					default: '',
+					description: 'Search text in message content (model can set)',
+				},
+				{
+					displayName: 'Date From',
+					name: 'dateFrom',
+					type: 'string',
+					required: false,
+					default: '',
+					description: 'Start date for message search (model can set)',
+					placeholder: '2024-01-01T00:00:00Z',
+				},
+				{
+					displayName: 'Date To',
+					name: 'dateTo',
+					type: 'string',
+					required: false,
+					default: '',
+					description: 'End date for message search (model can set)',
+					placeholder: '2024-12-31T23:59:59Z',
 				},
 				{
 					displayName: 'Items per Page',
@@ -64,88 +154,41 @@ class SearchMessages {
 					},
 					description: 'Number of results per page (defined by user, model cannot change)',
 				},
+				{
+					displayName: 'Page Number',
+					name: 'page',
+					type: 'number',
+					default: 1,
+					typeOptions: {
+						minValue: 1,
+					},
+					description: 'Page number to retrieve (model can navigate)',
+				},
 			],
 		};
 	}
 
-	async supplyData(itemIndex) {
-		const credentials = await this.getCredentials('evolutionApi');
-		const serverUrl = credentials['server-url'];
-		const apiKey = credentials.apikey;
-		const instanceName = this.getNodeParameter('instanceName', itemIndex);
-		const userConversationId = this.getNodeParameter('conversationId', itemIndex) || '';
-		const allowModelSetConversation = this.getNodeParameter('allowModelSetConversation', itemIndex);
-		const pageSizeDefault = this.getNodeParameter('pageSize', itemIndex) || 10;
-		const ctx = this;
-
-		const tool = new core_tools_1.DynamicTool({
-			name: n8n_workflow_1.nodeNameToToolName(this.getNode()),
-			description: 'Search WhatsApp message history. Input must be a JSON object with: keywords (string, optional), dateFrom (ISO date string, optional), dateTo (ISO date string, optional), page (number, default 1), pageSize (number, default 10), conversationId (string, optional). Returns paginated message search results.',
-			func: async (input) => {
-				const params = typeof input === 'string' ? JSON.parse(input) : (input || {});
-				let conversationId = userConversationId;
-				if (!conversationId && allowModelSetConversation && params.conversationId) {
-					conversationId = params.conversationId;
-				}
-				const keywords = params.keywords || '';
-				const dateFrom = params.dateFrom || '';
-				const dateTo = params.dateTo || '';
-				const pageSize = params.pageSize || pageSizeDefault;
-				const page = params.page || 1;
-				const skip = (page - 1) * pageSize;
-
-				const whereClause = {};
-				if (conversationId) {
-					whereClause['key.remote'] = conversationId;
-				}
-				if (keywords) {
-					whereClause['message.conversationMessage.text'] = { contains: keywords };
-				}
-				if (dateFrom || dateTo) {
-					whereClause['timestamp'] = {};
-					if (dateFrom) {
-						whereClause['timestamp']['gte'] = new Date(dateFrom).getTime() / 1000;
-					}
-					if (dateTo) {
-						whereClause['timestamp']['lte'] = new Date(dateTo).getTime() / 1000;
-					}
-				}
+	async execute() {
+		const items = typeof this.getInputData === 'function' ? this.getInputData() : [];
+		const returnData = [];
+		const max = items.length > 0 ? items.length : 1;
 
-				const body = {
-					where: whereClause,
-					take: pageSize,
-					skip: skip,
-					orderBy: { timestamp: 'desc' },
-				};
-
-				const cleanUrl = serverUrl.replace(/\/$/, '');
-				const response = await ctx.helpers.request({
-					method: 'POST',
-					uri: `${cleanUrl}/chat/findMessages/${instanceName}`,
-					body,
-					headers: {
-						'Content-Type': 'application/json',
-						Accept: 'application/json',
-						apikey: apiKey,
-					},
-					json: true,
+		for (let itemIndex = 0; itemIndex < max; itemIndex++) {
+			try {
+				const result = await performSearch(this, itemIndex);
+				returnData.push({
+					json: result,
+					pairedItem: { item: itemIndex },
 				});
-
-				const messages = response.messages || response;
-				const total = messages.total || messages.length || 0;
-				const totalPages = Math.ceil(total / pageSize);
-
-				return JSON.stringify({
-					total,
-					pages: totalPages,
-					currentPage: page,
-					pageSize,
-					records: Array.isArray(messages.records) ? messages.records : messages,
+			} catch (err) {
+				returnData.push({
+					json: { error: err.message },
+					pairedItem: { item: itemIndex },
 				});
-			},
-		});
+			}
+		}
 
-		return { response: tool };
+		return [returnData];
 	}
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-evolution-message-search",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Evolution API - Search Messages node for n8n. Search WhatsApp message history by keywords, dates, and conversation.",
   "keywords": [
     "n8n-community-node-package",
@@ -24,7 +24,6 @@
     ]
   },
   "peerDependencies": {
-    "n8n-workflow": "*",
-    "@langchain/core": "*"
+    "n8n-workflow": "*"
   }
 }