From 7cf49d8cf3521c8f216e3db7d774e1db9efae5f8 Mon Sep 17 00:00:00 2001
From: alma <alma@governance-labs.org>
Date: Wed, 16 Apr 2025 16:55:56 +0200
Subject: [PATCH] mail page connected with folders 5

---
 app/api/mail/route.ts | 45 ++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/app/api/mail/route.ts b/app/api/mail/route.ts
index 5753e2a..acfbab8 100644
--- a/app/api/mail/route.ts
+++ b/app/api/mail/route.ts
@@ -116,8 +116,19 @@ export async function GET() {
         connTimeout: 30000
       });
 
+      // Add a timeout to prevent hanging
+      const timeout = setTimeout(() => {
+        console.error('IMAP connection timeout');
+        imap.end();
+        resolve(NextResponse.json({ 
+          emails: [],
+          error: 'Connection timeout'
+        }));
+      }, 60000);
+
       imap.once('error', (err: Error) => {
         console.error('IMAP error:', err);
+        clearTimeout(timeout);
         resolve(NextResponse.json({ 
           emails: [],
           error: 'IMAP connection error'
@@ -128,6 +139,7 @@ export async function GET() {
         imap.getBoxes((err, boxes) => {
           if (err) {
             console.error('Error getting mailboxes:', err);
+            clearTimeout(timeout);
             imap.end();
             resolve(NextResponse.json({ emails: [], error: 'Failed to get mailboxes' }));
             return;
@@ -143,6 +155,15 @@ export async function GET() {
           // Process each mailbox
           const foldersToProcess = availableMailboxes;
           let processedFolders = 0;
+          let activeFetches = 0;
+
+          function checkCompletion() {
+            processedFolders++;
+            if (processedFolders === foldersToProcess.length && activeFetches === 0) {
+              clearTimeout(timeout);
+              finishProcessing();
+            }
+          }
 
           function finishProcessing() {
             // Combine all emails from all folders
@@ -169,10 +190,7 @@ export async function GET() {
             imap.openBox(folderName, false, (err, box) => {
               if (err) {
                 console.error(`Error opening box ${folderName}:`, err);
-                processedFolders++;
-                if (processedFolders === foldersToProcess.length) {
-                  finishProcessing();
-                }
+                checkCompletion();
                 return;
               }
 
@@ -180,21 +198,16 @@ export async function GET() {
               imap.search(['ALL'], (err, results) => {
                 if (err) {
                   console.error(`Error searching in ${folderName}:`, err);
-                  processedFolders++;
-                  if (processedFolders === foldersToProcess.length) {
-                    finishProcessing();
-                  }
+                  checkCompletion();
                   return;
                 }
 
                 if (!results || results.length === 0) {
-                  processedFolders++;
-                  if (processedFolders === foldersToProcess.length) {
-                    finishProcessing();
-                  }
+                  checkCompletion();
                   return;
                 }
 
+                activeFetches++;
                 // Fetch emails
                 const fetch = imap.fetch(results, {
                   bodies: ['HEADER', 'TEXT'],
@@ -250,13 +263,13 @@ export async function GET() {
 
                 fetch.on('error', (err) => {
                   console.error(`Error fetching emails from ${folderName}:`, err);
+                  activeFetches--;
+                  checkCompletion();
                 });
 
                 fetch.on('end', () => {
-                  processedFolders++;
-                  if (processedFolders === foldersToProcess.length) {
-                    finishProcessing();
-                  }
+                  activeFetches--;
+                  checkCompletion();
                 });
               });
             });