@bobfrankston/mailx-store 0.1.19 → 0.1.21

package/db.d.ts

@@ -83,6 +83,7 @@ export declare class MailxDB {
         recurringEventId?: string;
         htmlLink?: string;
         isHoliday?: boolean;
+        reminderMinutes?: number[];
     }): string;
     getCalendarEvents(accountId: string, fromMs: number, toMs: number): any[];
     /** Lookup by uuid only — used by patch/delete paths that don't have an
@@ -224,6 +225,12 @@ export declare class MailxDB {
         bodyPath: string;
         providerId?: string;
     }): number;
+    /** Backfill the FTS5 `body_text` column for a message after its body
+     *  has been parsed. Capped at ~64 KB of text per row — FTS5 stores the
+     *  raw text and indexes tokens; we don't need every byte of a 1 MB
+     *  marketing email to find a word in the first paragraph. Called from
+     *  LocalStore.getMessage right after simpleParser succeeds. */
+    updateFtsBodyByUid(accountId: string, folderId: number, uid: number, bodyText: string): void;
     /** List view: messages currently in (account, folder).
      *  Joins through `message_folders` so the UID + folder location come
      *  from membership rows, not from the legacy messages.folder_id /

package/db.js

@@ -411,6 +411,15 @@ export class MailxDB {
         // calendar_events table; the flag distinguishes them so the UI can
         // style them differently and the alarm scheduler can skip them.
         this.addColumnIfMissing("calendar_events", "is_holiday", "INTEGER NOT NULL DEFAULT 0");
+        // Per-event reminder offsets (Bob 2026-05-12: "use the reminder
+        // times in the event (there can be multiple)"). Google's API
+        // returns `reminders.overrides` as an array of {method, minutes}
+        // — we store the minute offsets as JSON so alarms.ts can fire ONE
+        // popup per offset (10-min, 30-min, 1-day, …) instead of the
+        // hard-coded 10-min default. `useDefault: true` events get the
+        // calendar's defaultReminders pre-resolved server-side and pulled
+        // through here too.
+        this.addColumnIfMissing("calendar_events", "reminder_minutes_json", "TEXT DEFAULT '[]'");
         // Backfill UUIDs for any pre-existing rows that were inserted before
         // this column landed. One UPDATE + an id roundtrip per row — cheap
         // at our row counts, runs once per DB upgrade.
@@ -733,12 +742,13 @@ export class MailxDB {
     // ── Calendar events (two-way cache) ──
     upsertCalendarEvent(ev) {
         const uuid = ev.uuid || randomUUID().replace(/-/g, "");
+        const remindersJson = JSON.stringify(Array.isArray(ev.reminderMinutes) ? ev.reminderMinutes : []);
         this.db.prepare(`
             INSERT INTO calendar_events
                 (uuid, account_id, provider_id, calendar_id, title, start_ms, end_ms,
                  all_day, location, notes, etag, last_synced, dirty, deleted, updated_at,
-                 recurring_event_id, html_link, is_holiday)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?, ?, ?)
+                 recurring_event_id, html_link, is_holiday, reminder_minutes_json)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, ?, ?, ?, ?)
             ON CONFLICT(uuid) DO UPDATE SET
                 account_id=excluded.account_id, provider_id=excluded.provider_id,
                 calendar_id=excluded.calendar_id, title=excluded.title,
@@ -749,8 +759,9 @@ export class MailxDB {
                 updated_at=excluded.updated_at,
                 recurring_event_id=excluded.recurring_event_id,
                 html_link=excluded.html_link,
-                is_holiday=excluded.is_holiday
-        `).run(uuid, ev.accountId, ev.providerId || null, ev.calendarId || "primary", ev.title, ev.startMs, ev.endMs, ev.allDay ? 1 : 0, ev.location || "", ev.notes || "", ev.etag || null, ev.dirty ? 0 : Date.now(), ev.dirty ? 1 : 0, Date.now(), ev.recurringEventId || null, ev.htmlLink || null, ev.isHoliday ? 1 : 0);
+                is_holiday=excluded.is_holiday,
+                reminder_minutes_json=excluded.reminder_minutes_json
+        `).run(uuid, ev.accountId, ev.providerId || null, ev.calendarId || "primary", ev.title, ev.startMs, ev.endMs, ev.allDay ? 1 : 0, ev.location || "", ev.notes || "", ev.etag || null, ev.dirty ? 0 : Date.now(), ev.dirty ? 1 : 0, Date.now(), ev.recurringEventId || null, ev.htmlLink || null, ev.isHoliday ? 1 : 0, remindersJson);
         return uuid;
     }
     getCalendarEvents(accountId, fromMs, toMs) {
@@ -778,7 +789,15 @@ export class MailxDB {
         return rows.map(this.calendarRowToObject);
     }
     calendarRowToObject(r) {
+        let reminderMinutes = [];
+        try {
+            const parsed = JSON.parse(r.reminder_minutes_json || "[]");
+            if (Array.isArray(parsed))
+                reminderMinutes = parsed.filter((n) => Number.isFinite(n)).map((n) => Number(n));
+        }
+        catch { /* invalid JSON → empty */ }
         return {
+            reminderMinutes,
             uuid: r.uuid, accountId: r.account_id, providerId: r.provider_id,
             calendarId: r.calendar_id, title: r.title, startMs: r.start_ms,
             endMs: r.end_ms, allDay: !!r.all_day, location: r.location, notes: r.notes,
@@ -1372,13 +1391,35 @@ export class MailxDB {
         // sync during the additive migration but reads will move to JOIN
         // with message_folders.
         this.upsertMessageFolder(rowId, msg.folderId, msg.uid);
-        // Index for full-text search
+        // Index for full-text search. body_text seeded from `msg.preview`
+        // here — the full parsed body isn't available at upsert time (we
+        // store .eml on disk; parsing is on-demand). LocalStore.getMessage
+        // calls `updateFtsBodyByUid` after simpleParser runs to swap the
+        // preview-only seed for the full body text, so subsequent searches
+        // hit body content too. Without that backfill, words that only
+        // appear deep in the body (Bob 2026-05-12: "I searched for ksink
+        // which is in <...>.eml but it was not found") never match.
         try {
             this.db.prepare("INSERT INTO messages_fts (rowid, subject, from_name, from_address, to_text, cc_text, body_text) VALUES (?, ?, ?, ?, ?, ?, ?)").run(rowId, msg.subject, msg.from.name, msg.from.address, toText, ccText, msg.preview);
         }
         catch { /* FTS insert may fail on rebuild, non-fatal */ }
         return rowId;
     }
+    /** Backfill the FTS5 `body_text` column for a message after its body
+     *  has been parsed. Capped at ~64 KB of text per row — FTS5 stores the
+     *  raw text and indexes tokens; we don't need every byte of a 1 MB
+     *  marketing email to find a word in the first paragraph. Called from
+     *  LocalStore.getMessage right after simpleParser succeeds. */
+    updateFtsBodyByUid(accountId, folderId, uid, bodyText) {
+        try {
+            const row = this.db.prepare("SELECT id FROM messages WHERE account_id = ? AND folder_id = ? AND uid = ?").get(accountId, folderId, uid);
+            if (!row)
+                return;
+            const capped = bodyText.length > 64_000 ? bodyText.slice(0, 64_000) : bodyText;
+            this.db.prepare("UPDATE messages_fts SET body_text = ? WHERE rowid = ?").run(capped, row.id);
+        }
+        catch { /* FTS update is best-effort */ }
+    }
     /** List view: messages currently in (account, folder).
      *  Joins through `message_folders` so the UID + folder location come
      *  from membership rows, not from the legacy messages.folder_id /

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@bobfrankston/mailx-types": "^0.1.11",
-    "@bobfrankston/mailx-settings": "^0.1.15"
+    "@bobfrankston/mailx-settings": "^0.1.16"
   },
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
   ".transformedSnapshot": {
     "dependencies": {
       "@bobfrankston/mailx-types": "^0.1.11",
-      "@bobfrankston/mailx-settings": "^0.1.15"
+      "@bobfrankston/mailx-settings": "^0.1.16"
     }
   }
 }