@bobfrankston/rmfmail 1.1.103 → 1.1.105

package/packages/mailx-service/index.ts

@@ -1028,26 +1028,63 @@ export class MailxService implements MailxApi {
             const seen = new Set<string>();
             const items: any[] = [];
             let total = 0;
+            // Partial-failure accounting. The old code did `if (r.status !==
+            // "fulfilled") continue` — a folder whose SEARCH rejected
+            // (connection discard, a genuinely slow huge folder hitting the
+            // 90s cap) contributed zero results AND zero signal. The user saw
+            // "No results" for a search that simply never ran in the folder
+            // holding the match. Now we count failures and hand them back so
+            // the UI can say "searched 88/93 — 5 folders failed, retry".
+            let foldersSearched = 0;
+            let foldersFailed = 0;
+            const failedFolders: string[] = [];
+            let droppedHits = 0;
+
+            // Bounded concurrency. The per-account ops queue already
+            // serializes connection use, so this doesn't change IMAP
+            // parallelism — but firing all ~93 folder promises at once
+            // builds a 90+-deep pending-promise queue with 90+ live
+            // setTimeout timers. Batching keeps that bounded and gives a
+            // natural place to add early-abort later.
+            const SERVER_SEARCH_BATCH = 8;
 
             for (const acct of dbAccounts) {
                 const folders = this.db.getFolders(acct.id)
                     .filter((f: any) => !(f.flags || []).some((x: string) => /noselect/i.test(x)));
-                const results = await Promise.allSettled(
-                    folders.map(f =>
-                        this.imapManager.searchAndFetchOnServer(acct.id, f.id, f.path, criteria)
-                            .then(uids => ({ folderId: f.id, uids }))
-                    )
-                );
-                for (const r of results) {
-                    if (r.status !== "fulfilled") continue;
-                    for (const uid of r.value.uids) {
-                        const msg = this.db.getMessageByUid(acct.id, uid, r.value.folderId);
-                        if (!msg) continue;
-                        const key = msg.messageId || `${acct.id}:${r.value.folderId}:${uid}`;
-                        if (seen.has(key)) continue;
-                        seen.add(key);
-                        items.push(msg);
-                        total++;
+                for (let i = 0; i < folders.length; i += SERVER_SEARCH_BATCH) {
+                    const batch = folders.slice(i, i + SERVER_SEARCH_BATCH);
+                    const results = await Promise.allSettled(
+                        batch.map(f =>
+                            this.imapManager.searchAndFetchOnServer(acct.id, f.id, f.path, criteria)
+                                .then(uids => ({ folder: f, uids }))
+                        )
+                    );
+                    for (let j = 0; j < results.length; j++) {
+                        const r = results[j];
+                        if (r.status !== "fulfilled") {
+                            foldersFailed++;
+                            failedFolders.push(`${acct.id}/${batch[j].path}`);
+                            console.error(`  [server-search] ${acct.id}/${batch[j].path}: ${r.reason?.message || r.reason}`);
+                            continue;
+                        }
+                        foldersSearched++;
+                        for (const uid of r.value.uids) {
+                            const msg = this.db.getMessageByUid(acct.id, uid, r.value.folder.id);
+                            if (!msg) {
+                                // SEARCH matched on the server but the
+                                // fetch-and-store in searchAndFetchOnServer
+                                // didn't land the row. Count it so the total
+                                // doesn't silently under-report.
+                                droppedHits++;
+                                console.error(`  [server-search] ${acct.id}/${r.value.folder.path} uid ${uid}: SEARCH hit not in local DB after fetch — dropped`);
+                                continue;
+                            }
+                            const key = msg.messageId || `${acct.id}:${r.value.folder.id}:${uid}`;
+                            if (seen.has(key)) continue;
+                            seen.add(key);
+                            items.push(msg);
+                            total++;
+                        }
                     }
                 }
             }
@@ -1055,7 +1092,14 @@ export class MailxService implements MailxApi {
             // Newest first, then paginate.
             items.sort((a: any, b: any) => (b.date?.getTime?.() || 0) - (a.date?.getTime?.() || 0));
             const sliced = items.slice((page - 1) * pageSize, page * pageSize);
-            return { items: sliced, total, page, pageSize };
+            if (foldersFailed > 0 || droppedHits > 0) {
+                console.log(`  [server-search] q="${q}" — ${total} hits across ${foldersSearched} folders; ${foldersFailed} folders failed, ${droppedHits} hits dropped`);
+            }
+            return {
+                items: sliced, total, page, pageSize,
+                partial: foldersFailed > 0 || droppedHits > 0,
+                foldersSearched, foldersFailed, failedFolders, droppedHits,
+            };
         } else if (scope === "current" && accountId && folderId) {
             // Per-folder search — folder scope is the user's explicit
             // intent, including trash/spam if that's where they are.