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

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

@@ -5,6 +5,71 @@ exports.SearchMessages = void 0;
 
 const n8n_workflow_1 = require('n8n-workflow');
 
+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() {
 		this.description = {
@@ -104,95 +169,27 @@ class SearchMessages {
 	}
 
 	async execute() {
-		const items = this.getInputData ? this.getInputData() : [];
+		const items = typeof this.getInputData === 'function' ? this.getInputData() : [];
 		const returnData = [];
+		const max = items.length > 0 ? items.length : 1;
 
-		for (let itemIndex = 0; itemIndex < (items.length || 1); itemIndex++) {
+		for (let itemIndex = 0; itemIndex < max; itemIndex++) {
 			try {
-				const result = await this.executeSingle.call(this, itemIndex);
+				const result = await performSearch(this, itemIndex);
 				returnData.push({
 					json: result,
 					pairedItem: { item: itemIndex },
 				});
 			} catch (err) {
-				if (this.continueOnFail && this.continueOnFail()) {
-					returnData.push({
-						json: { error: err.message },
-						pairedItem: { item: itemIndex },
-					});
-				} else {
-					throw err;
-				}
+				returnData.push({
+					json: { error: err.message },
+					pairedItem: { item: itemIndex },
+				});
 			}
 		}
 
 		return [returnData];
 	}
-
-	async executeSingle(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 keywords = this.getNodeParameter('keywords', itemIndex) || '';
-		const dateFrom = this.getNodeParameter('dateFrom', itemIndex) || '';
-		const dateTo = this.getNodeParameter('dateTo', itemIndex) || '';
-		const pageSize = this.getNodeParameter('pageSize', itemIndex) || 10;
-		const page = this.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 this.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,
-		};
-	}
 }
 
 exports.SearchMessages = SearchMessages;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-evolution-message-search",
-  "version": "2.0.2",
+  "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",