@bobfrankston/rmfmail 1.0.667 → 1.0.668

package/packages/mailx-service/index.ts

@@ -696,7 +696,7 @@ export class MailxService {
         buttons: string[];
         size?: { width: number; height: number };
         pos?: { x: number; y: number };
-    }): Promise<{ button: string; reason?: string }> {
+    }): Promise<{ button: string; form?: any; reason?: string }> {
         if (!this.popupFn) return { button: "", reason: "no popup host" };
         try {
             const r = await this.popupFn({
@@ -723,7 +723,13 @@ export class MailxService {
                 // on graceful shutdown.
                 detach: false,
             });
-            return { button: r.button || (r.dismissed ? "dismissed" : r.closed ? "closed" : "") };
+            return {
+                button: r.button || (r.dismissed ? "dismissed" : r.closed ? "closed" : ""),
+                // Pass msger's `form` field through. Used by the calendar
+                // reminder popup to send back arbitrary snooze durations
+                // (e.g. { minutes: 75 }) — see alarms.ts.
+                form: (r as any).form,
+            };
         } catch (e: any) {
             console.error(`  [reminder] popup failed: ${e.message}`);
             return { button: "", reason: e.message };
@@ -1116,7 +1122,15 @@ export class MailxService {
                     .catch(e => this.handleGoogleRefreshError("calendar", e));
             }
         }
-        return this.localStore.getCalendarEvents(acctId, fromMs, toMs);
+        const rows = this.localStore.getCalendarEvents(acctId, fromMs, toMs);
+        // Diagnostic: separate counts for plain / recurring / holiday rows
+        // so log inspection reveals whether the issue is fetch-side
+        // (refresh didn't write them) vs read/render-side (they're in DB
+        // but not appearing in the UI).
+        const recurring = rows.filter(r => r.recurringEventId).length;
+        const holidays = rows.filter(r => r.isHoliday).length;
+        console.log(`  [calendar] getCalendarEvents → ${rows.length} rows (${recurring} recurring, ${holidays} holiday) for window ${new Date(fromMs).toISOString().slice(0, 10)}..${new Date(toMs).toISOString().slice(0, 10)}`);
+        return rows;
     }
 
     /** Returns true if the feature is currently in a quota-exceeded cooldown. */
@@ -1177,24 +1191,36 @@ export class MailxService {
         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)}`);
-        // Q131: optionally pull from Google's public holiday calendar in the
-        // same window. The calendarId is the standard US holidays one; future
-        // refinement: per-locale selection via a settings field.
+        // 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
+        // purges that source's rows, not the others. Future generalization
+        // to arbitrary user-supplied calendars is filed as Q140.
         const settings = loadSettings() as any;
-        const showHolidays = !!settings?.calendar?.showHolidays;
-        let holidayEvents: any[] = [];
-        if (showHolidays) {
+        const HOLIDAY_SOURCES: Array<{ enabled: boolean; calId: string; label: string }> = [
+            {
+                enabled: !!settings?.calendar?.showHolidays,
+                calId:   "en.usa#holiday@group.v.calendar.google.com",
+                label:   "US",
+            },
+            {
+                enabled: !!settings?.calendar?.showJewishHolidays,
+                calId:   "en.jewish#holiday@group.v.calendar.google.com",
+                label:   "Jewish",
+            },
+        ];
+        const holidayBundles: Array<{ calId: string; events: any[] }> = [];
+        for (const src of HOLIDAY_SOURCES) {
+            if (!src.enabled) continue;
             try {
-                holidayEvents = await gsync.listCalendarEvents(tp, fromMs, toMs,
-                    "en.usa#holiday@group.v.calendar.google.com");
-                console.log(`  [calendar] pulled ${holidayEvents.length} holiday events`);
+                const ev = await gsync.listCalendarEvents(tp, fromMs, toMs, src.calId);
+                console.log(`  [calendar] pulled ${ev.length} ${src.label} holiday events`);
+                holidayBundles.push({ calId: src.calId, events: ev });
             } catch (e: any) {
-                // Read-only public calendar — most failures here are quota
-                // or network; the user's primary calendar already loaded,
-                // so we don't want to block render on holidays.
-                console.warn(`  [calendar] holiday pull failed: ${e?.message || e}`);
+                console.warn(`  [calendar] ${src.label} holiday pull failed: ${e?.message || e}`);
             }
         }
+        const enabledHolidayCalIds = new Set(HOLIDAY_SOURCES.filter(s => s.enabled).map(s => s.calId));
         let changed = false;
         // Upsert by provider_id — dedup globally, not just within the window,
         // so an event whose start moves outside the prior query range doesn't
@@ -1208,35 +1234,39 @@ export class MailxService {
             this.db.upsertCalendarEvent({ uuid: existing?.uuid, ...local, isHoliday: false });
             changed = true;
         }
-        for (const ev of holidayEvents) {
-            const local = gsync.calendarEventToLocal(ev, accountId);
-            seenProviderIds.add(ev.id);
-            const existing = this.db.getCalendarEventByProviderId(accountId, ev.id);
-            if (existing && calendarRowEquals(existing, local) && existing.isHoliday) continue;
-            this.db.upsertCalendarEvent({ uuid: existing?.uuid, ...local, isHoliday: true });
-            changed = true;
+        for (const bundle of holidayBundles) {
+            for (const ev of bundle.events) {
+                const baseLocal = gsync.calendarEventToLocal(ev, accountId);
+                // Override calendarId so reconcile (below) can tell which
+                // holiday source this row belongs to — toggling one source
+                // off must not purge rows from another active source.
+                const local = { ...baseLocal, calendarId: bundle.calId };
+                seenProviderIds.add(ev.id);
+                const existing = this.db.getCalendarEventByProviderId(accountId, ev.id);
+                if (existing && calendarRowEquals(existing, local) && existing.isHoliday) continue;
+                this.db.upsertCalendarEvent({ uuid: existing?.uuid, ...local, isHoliday: true });
+                changed = true;
+            }
         }
         // Server-side delete reconciliation: any local non-dirty row whose
         // start falls in the queried window and whose provider_id wasn't
-        // returned must have been deleted on Google. Purge it. Dirty rows
-        // are local-only edits that haven't been pushed yet — don't touch.
-        // When holidays are toggled off, skip purging holiday rows from the
-        // primary-calendar reconcile pass so they don't all vanish before
-        // the next toggle-on refresh re-pulls them.
+        // returned must have been deleted on Google. Holiday rows are
+        // partitioned by `calendarId`: only purge a holiday row when its
+        // source calendar is currently disabled. Sources that are enabled
+        // but returned nothing for this row keep the row (transient fail).
         const localWindow = this.db.getCalendarEvents(accountId, fromMs, toMs);
         for (const row of localWindow) {
             if (!row.providerId) continue; // local-only, never pushed
             if (row.dirty) continue;       // locally edited, pending push
             if (seenProviderIds.has(row.providerId)) continue;
-            if (row.isHoliday && !showHolidays) {
-                // Holiday no longer wanted — purge so it disappears from view.
-                this.db.purgeCalendarEvent(row.uuid);
-                changed = true;
-                continue;
-            }
-            if (row.isHoliday && showHolidays) {
-                // Holiday wanted but missing in this pull — the holiday
-                // calendar fetch may have failed transiently. Keep it.
+            if (row.isHoliday) {
+                const fromActiveSource = enabledHolidayCalIds.has(row.calendarId || "");
+                if (!fromActiveSource) {
+                    // Source toggled off — purge.
+                    this.db.purgeCalendarEvent(row.uuid);
+                    changed = true;
+                }
+                // Source enabled but row missing → transient; keep.
                 continue;
             }
             this.db.purgeCalendarEvent(row.uuid);