Update farcaster.js

Author: serefyarar

farcaster.js

@@ -155,45 +155,42 @@ class Farcaster {
         });
     }
 
-    async getMessages(conversationId, cursor = null) {
-        try {
-            const allMessages = [];
-            const messageIds = new Set();
-            let currentCursor = cursor;
-            let iterationCount = 0;
-            const maxIterations = 5;
-            
-            while (iterationCount < maxIterations) {
-                let endpoint = `/direct-cast-conversation-messages?conversationId=${conversationId}&limit=100`;
-                if (currentCursor) {
-                    endpoint += `&cursor=${currentCursor}`;
-                }
+    async getMessages(conversationId) {
+        const messages = await this.fetchMessages(conversationId);
+        return messages.map(message => formatMessage(message)).filter(Boolean);
+    }
 
-                console.log("getting messages", endpoint);
+    async fetchMessages(conversationId, cursor = null, collectedMessages = [], seenMessageIds = new Set(), attempts = 0) {
+        const maxAttempts = 5;
+        if (attempts >= maxAttempts) {
+            return collectedMessages.reverse();
+        }
 
-                const response = await this.#makeApiCall(endpoint, 'GET');
+        const endpoint = cursor 
+            ? `/direct-cast-conversation-messages?conversationId=${conversationId}&limit=100&cursor=${cursor}`
+            : `/direct-cast-conversation-messages?conversationId=${conversationId}&limit=100`;
 
-                const messages = response.result.messages ? response.result.messages.map(message => formatMessage(message)).filter(Boolean) : [];
-                
-                messages.forEach(message => {
-                    if (!messageIds.has(message.messageId)) {
-                        allMessages.push(message);
-                        messageIds.add(message.messageId);
-                    }
-                });
+        console.log("Fetching messages from", endpoint);
+
+        try {
+            const response = await this.#makeApiCall(endpoint, 'GET');
+            const messages = response.result.messages || [];
 
-                if (!response.next || !response.next.cursor) {
-                    console.log("no more messages");
-                    break;
+            messages.forEach(msg => {
+                if (!seenMessageIds.has(msg.messageId)) {
+                    collectedMessages.push(msg);
+                    seenMessageIds.add(msg.messageId);
                 }
-                
-                currentCursor = response.next.cursor;
-                iterationCount++;
-            }
+            });
 
-            return allMessages.reverse();
+            if (response.next && response.next.cursor) {
+                return this.getMessages(conversationId, response.next.cursor, collectedMessages, seenMessageIds, attempts + 1);
+            } else {
+                console.log("No more messages to fetch");
+                return collectedMessages.reverse();
+            }
         } catch (error) {
-            console.error('Error fetching messages:', error);
+            console.error('Failed to fetch messages:', error);
             throw error;
         }
     }