@bobfrankston/rmfmail 1.0.686 → 1.0.690

package/packages/mailx-service/index.js

@@ -1264,8 +1264,54 @@ export class MailxService {
      *  Tight loop = 429 quota burn. */
     async refreshCalendarEvents(accountId, fromMs, toMs) {
         const tp = await this.primaryTokenProvider("calendar");
-        const events = await gsync.listCalendarEvents(tp, fromMs, toMs);
-        console.log(`  [calendar] pulled ${events.length} events from ${new Date(fromMs).toISOString().slice(0, 10)} to ${new Date(toMs).toISOString().slice(0, 10)}`);
+        // Enumerate ALL of the user's `selected` calendars (the ones shown
+        // in Google's web UI) and pull events from each. Earlier code
+        // hard-coded `primary` only — so any event living on a secondary
+        // calendar (a personal "Statin" reminder, a shared work cal, a
+        // sports schedule) was invisible to mailx. Bob 2026-05-12:
+        // "you're still not showing me and alerting me about recurring
+        // events." Thunderbird and Google's own UI walk the entire
+        // calendarList; mailx now does too. Failing to list calendars
+        // falls back to primary so single-calendar users still work.
+        let calendarsToFetch = [{ id: "primary", label: "primary", defaultReminderMinutes: [] }];
+        try {
+            const all = await gsync.listCalendars(tp);
+            const selected = all.filter(c => c.selected);
+            if (selected.length > 0) {
+                calendarsToFetch = selected.map(c => ({
+                    id: c.id, label: c.summary || c.id,
+                    defaultReminderMinutes: c.defaultReminderMinutes,
+                }));
+                console.log(`  [calendar] enumerated ${all.length} calendars, ${selected.length} selected`);
+            }
+            else {
+                console.log(`  [calendar] no selected calendars — falling back to primary`);
+            }
+        }
+        catch (e) {
+            console.warn(`  [calendar] listCalendars failed (${e?.message || e}) — falling back to primary`);
+        }
+        const fetchResults = await Promise.all(calendarsToFetch.map(async (c) => {
+            try {
+                const ev = await gsync.listCalendarEvents(tp, fromMs, toMs, c.id);
+                console.log(`  [calendar] pulled ${ev.length} events from "${c.label}" (${new Date(fromMs).toISOString().slice(0, 10)} to ${new Date(toMs).toISOString().slice(0, 10)})`);
+                return { events: ev, calendarId: c.id, defaultReminderMinutes: c.defaultReminderMinutes };
+            }
+            catch (e) {
+                console.warn(`  [calendar] fetch from "${c.label}" failed: ${e?.message || e}`);
+                return { events: [], calendarId: c.id, defaultReminderMinutes: c.defaultReminderMinutes };
+            }
+        }));
+        // Flatten with each event remembering its source calendar's default
+        // reminder list, so calendarEventToLocal can apply the right
+        // defaults when `reminders.useDefault === true`.
+        const eventsWithDefaults = [];
+        for (const fr of fetchResults) {
+            for (const ev of fr.events) {
+                eventsWithDefaults.push({ ev, defaultReminderMinutes: fr.defaultReminderMinutes });
+            }
+        }
+        const events = eventsWithDefaults.map(x => x.ev);
         // Holiday calendars (Q131 + Bob 2026-05-11 second-toggle request).
         // Each enabled toggle pulls a separate Google public calendar; rows
         // are tagged with the source `calendar_id` so toggling one off only
@@ -1327,8 +1373,8 @@ export class MailxService {
         // so an event whose start moves outside the prior query range doesn't
         // get a second row on the next pull.
         const seenProviderIds = new Set();
-        for (const ev of events) {
-            const local = gsync.calendarEventToLocal(ev, accountId);
+        for (const { ev, defaultReminderMinutes } of eventsWithDefaults) {
+            const local = gsync.calendarEventToLocal(ev, accountId, defaultReminderMinutes);
             seenProviderIds.add(ev.id);
             const existing = this.db.getCalendarEventByProviderId(accountId, ev.id);
             if (existing && calendarRowEquals(existing, local) && !existing.isHoliday)
@@ -1461,8 +1507,35 @@ export class MailxService {
     }
     async refreshTasks(accountId, includeCompleted) {
         const tp = await this.primaryTokenProvider("tasks");
-        const tasks = await gsync.listTasks(tp, "@default", includeCompleted);
-        console.log(`  [tasks] pulled ${tasks.length} tasks`);
+        // Enumerate every task list (Google Reminders since late 2023 live
+        // here, and users can have many lists — "My Tasks", "Reminders",
+        // custom ones). Earlier code only queried `@default`, so reminders
+        // filed elsewhere were invisible. Bob 2026-05-12. Falling back to
+        // a single `@default` query keeps single-list users working when
+        // the listTaskLists call fails.
+        let lists = [{ id: "@default", title: "@default" }];
+        try {
+            const all = await gsync.listTaskLists(tp);
+            if (all.length > 0) {
+                lists = all;
+                console.log(`  [tasks] enumerated ${all.length} task list(s)`);
+            }
+        }
+        catch (e) {
+            console.warn(`  [tasks] listTaskLists failed (${e?.message || e}) — falling back to @default`);
+        }
+        const fetchResults = await Promise.all(lists.map(async (l) => {
+            try {
+                const t = await gsync.listTasks(tp, l.id, includeCompleted);
+                console.log(`  [tasks] pulled ${t.length} tasks from "${l.title}"`);
+                return t;
+            }
+            catch (e) {
+                console.warn(`  [tasks] fetch from "${l.title}" failed: ${e?.message || e}`);
+                return [];
+            }
+        }));
+        const tasks = [].concat(...fetchResults);
         const existing = this.db.getTasks(accountId, true);
         let changed = false;
         const seen = new Set();