@marlinjai/email-mcp 1.2.6 → 1.2.7

package/dist/setup/wizard.js

@@ -1622,34 +1622,28 @@ var ImapAdapter = class {
       throw formatImapError(error, `Failed to open folder "${folder}"`);
     }
     try {
-      let realMessageCount = -1;
+      const mailboxExists = this.client.mailbox?.exists ?? 0;
+      let statusCount = 0;
       try {
         const status = await this.client.status(folder, { messages: true });
-        realMessageCount = status.messages ?? -1;
+        statusCount = status.messages ?? 0;
       } catch {
       }
-      const mailboxExists = this.client.mailbox?.exists ?? -1;
-      const effectiveCount = Math.max(realMessageCount, mailboxExists);
-      if (effectiveCount <= 0) {
+      const effectiveCount = Math.max(mailboxExists, statusCount);
+      if (effectiveCount === 0) {
         return [];
       }
       const criteria = this.buildSearchCriteria(query);
       const hasCriteria = Object.keys(criteria).length > 0;
-      let allUids;
+      let allUids = [];
       try {
         const searchResult = await this.client.search(
           hasCriteria ? criteria : { all: true },
           { uid: true }
         );
         allUids = Array.isArray(searchResult) ? searchResult : [];
-      } catch (searchError) {
-        const errorMsg = String(searchError?.responseText || searchError?.message || "").toLowerCase();
-        const isInvalidMessage = errorMsg.includes("invalid message");
-        if (isInvalidMessage || !hasCriteria) {
-          allUids = await this.collectUidsViaFetch(query);
-        } else {
-          throw searchError;
-        }
+      } catch {
+        allUids = await this.collectUidsViaFetch(query);
       }
       const offset = query.offset || 0;
       const slicedUids = query.limit ? allUids.slice(offset, offset + query.limit) : allUids.slice(offset);
@@ -1671,39 +1665,39 @@ var ImapAdapter = class {
   async collectUidsViaFetch(query) {
     if (!this.client) return [];
     const uids = [];
-    try {
-      for await (const msg of this.client.fetch("1:*", { uid: true, flags: true })) {
-        if (query.unreadOnly && msg.flags?.has("\\Seen")) continue;
-        if (query.starredOnly && !msg.flags?.has("\\Flagged")) continue;
-        uids.push(msg.uid);
-      }
-      return uids;
-    } catch {
-      const exists = this.client.mailbox?.exists ?? 0;
-      if (exists > 0) {
-        try {
-          for await (const msg of this.client.fetch(`1:${exists}`, { uid: true, flags: true })) {
-            if (query.unreadOnly && msg.flags?.has("\\Seen")) continue;
-            if (query.starredOnly && !msg.flags?.has("\\Flagged")) continue;
-            uids.push(msg.uid);
-          }
-          return uids;
-        } catch {
+    const exists = this.client.mailbox?.exists ?? 0;
+    const safeFetch = async (range) => {
+      try {
+        const messages = await this.client.fetchAll(range, { uid: true, flags: true });
+        for (const msg of messages) {
+          if (query.unreadOnly && msg.flags?.has("\\Seen")) continue;
+          if (query.starredOnly && !msg.flags?.has("\\Flagged")) continue;
+          uids.push(msg.uid);
         }
+        return uids.length > 0;
+      } catch {
+        return false;
       }
-      const count = exists > 0 ? exists : 50;
-      for (let seq = 1; seq <= count; seq++) {
-        try {
-          for await (const msg of this.client.fetch(String(seq), { uid: true, flags: true })) {
-            if (query.unreadOnly && msg.flags?.has("\\Seen")) continue;
-            if (query.starredOnly && !msg.flags?.has("\\Flagged")) continue;
-            uids.push(msg.uid);
-          }
-        } catch {
+    };
+    if (await safeFetch("1:*")) return uids;
+    uids.length = 0;
+    if (exists > 0) {
+      if (await safeFetch(`1:${exists}`)) return uids;
+      uids.length = 0;
+    }
+    const count = exists > 0 ? exists : 50;
+    for (let seq = 1; seq <= count; seq++) {
+      try {
+        const msgs = await this.client.fetchAll(String(seq), { uid: true, flags: true });
+        for (const msg of msgs) {
+          if (query.unreadOnly && msg.flags?.has("\\Seen")) continue;
+          if (query.starredOnly && !msg.flags?.has("\\Flagged")) continue;
+          uids.push(msg.uid);
         }
+      } catch {
       }
-      return uids;
     }
+    return uids;
   }
   /**
    * Fetches email data for a set of UIDs, either with full body or lightweight headers.