@bobfrankston/rmfmail 1.2.175 → 1.2.178

package/packages/mailx-types/reminder-state.js

@@ -0,0 +1,85 @@
+/**
+ * Reminder dismissed/snoozed state — shared across devices.
+ *
+ * The alarm subsystem (client/components/alarms.ts) keys every reminder by a
+ * per-occurrence string (`providerId:startMs[@offsetMs]` for calendar,
+ * `taskUuid:dueMs` for tasks). Those keys are built from Google-stable ids,
+ * so the SAME occurrence produces the SAME key on every device — which is
+ * what makes cross-device sync meaningful: dismiss a reminder on the desktop
+ * and the laptop's poller sees the dismissal before it fires its own popup.
+ *
+ * State lives in `reminders.jsonc` in the shared GDrive folder (same rails
+ * as allowlist.jsonc / userdict.csv). Values are epoch-ms timestamps:
+ *   dismissed[key] = when the user dismissed it   (retention: 30 days)
+ *   snoozed[key]   = fire again after this time   (retention: 7 days past)
+ *
+ * Merge is per-key max — a dismissal or longer snooze on ANY device wins.
+ * Deletions don't propagate (union semantics); the only deletion in the
+ * alarm flow is the Open-button re-evaluate, which by construction touches
+ * a key that was never pushed as dismissed. Timestamps double as the prune
+ * criterion so the file can't grow forever.
+ *
+ * This module is dependency-free (mailx-types) so the desktop service
+ * (mailx-settings) and the Android/web service (mailx-store-web) share one
+ * merge implementation.
+ */
+export const REMINDER_STATE_FILE = "reminders.jsonc";
+/** Dismissed entries older than this are pruned — by then the occurrence is
+ *  long past the alarm lookback window on every device. */
+const DISMISSED_RETENTION_MS = 30 * 86400_000;
+/** Snoozed entries whose until-time is this far past are pruned. */
+const SNOOZED_RETENTION_MS = 7 * 86400_000;
+/** Coerce arbitrary parsed JSON (or the client's localStorage maps, whose
+ *  legacy dismissed values are boolean `true`) into a clean ReminderState.
+ *  Legacy booleans become `now` so they get a full retention window. */
+export function normalizeReminderState(raw, now) {
+    const out = { dismissed: {}, snoozed: {} };
+    if (raw && typeof raw === "object") {
+        for (const [k, v] of Object.entries(raw.dismissed || {})) {
+            if (v === true)
+                out.dismissed[k] = now;
+            else if (Number.isFinite(v) && v > 0)
+                out.dismissed[k] = v;
+        }
+        for (const [k, v] of Object.entries(raw.snoozed || {})) {
+            if (Number.isFinite(v) && v > 0)
+                out.snoozed[k] = v;
+        }
+    }
+    return out;
+}
+/** Union merge with per-key max, pruned by retention. Inputs must already
+ *  be normalized. Pure — does not mutate its arguments. */
+export function mergeReminderStates(a, b, now) {
+    const out = { dismissed: {}, snoozed: {} };
+    const dismissedCutoff = now - DISMISSED_RETENTION_MS;
+    const snoozedCutoff = now - SNOOZED_RETENTION_MS;
+    for (const src of [a.dismissed, b.dismissed]) {
+        for (const [k, v] of Object.entries(src)) {
+            if (v < dismissedCutoff)
+                continue;
+            if (!(k in out.dismissed) || v > out.dismissed[k])
+                out.dismissed[k] = v;
+        }
+    }
+    for (const src of [a.snoozed, b.snoozed]) {
+        for (const [k, v] of Object.entries(src)) {
+            if (v < snoozedCutoff)
+                continue;
+            if (!(k in out.snoozed) || v > out.snoozed[k])
+                out.snoozed[k] = v;
+        }
+    }
+    return out;
+}
+/** Deep-equal for change detection so a no-op merge skips the cloud write. */
+export function reminderStatesEqual(a, b) {
+    const mapsEqual = (x, y) => {
+        const xk = Object.keys(x);
+        if (xk.length !== Object.keys(y).length)
+            return false;
+        return xk.every(k => y[k] === x[k]);
+    };
+    return mapsEqual(a.dismissed, b.dismissed) && mapsEqual(a.snoozed, b.snoozed);
+}
+//# sourceMappingURL=reminder-state.js.map

package/packages/mailx-types/reminder-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reminder-state.js","sourceRoot":"","sources":["reminder-state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AASH,MAAM,CAAC,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAErD;2DAC2D;AAC3D,MAAM,sBAAsB,GAAG,EAAE,GAAG,SAAS,CAAC;AAC9C,oEAAoE;AACpE,MAAM,oBAAoB,GAAG,CAAC,GAAG,SAAS,CAAC;AAE3C;;wEAEwE;AACxE,MAAM,UAAU,sBAAsB,CAAC,GAAQ,EAAE,GAAW;IACxD,MAAM,GAAG,GAAkB,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAC1D,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACjC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;YACvD,IAAI,CAAC,KAAK,IAAI;gBAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;iBAClC,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAW,CAAC,IAAK,CAAY,GAAG,CAAC;gBAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAW,CAAC;QAC/F,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;YACrD,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAW,CAAC,IAAK,CAAY,GAAG,CAAC;gBAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAW,CAAC;QACxF,CAAC;IACL,CAAC;IACD,OAAO,GAAG,CAAC;AACf,CAAC;AAED;2DAC2D;AAC3D,MAAM,UAAU,mBAAmB,CAAC,CAAgB,EAAE,CAAgB,EAAE,GAAW;IAC/E,MAAM,GAAG,GAAkB,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAC1D,MAAM,eAAe,GAAG,GAAG,GAAG,sBAAsB,CAAC;IACrD,MAAM,aAAa,GAAG,GAAG,GAAG,oBAAoB,CAAC;IACjD,KAAK,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3C,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,GAAG,eAAe;gBAAE,SAAS;YAClC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;gBAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC5E,CAAC;IACL,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;QACvC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,GAAG,aAAa;gBAAE,SAAS;YAChC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;gBAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACtE,CAAC;IACL,CAAC;IACD,OAAO,GAAG,CAAC;AACf,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,mBAAmB,CAAC,CAAgB,EAAE,CAAgB;IAClE,MAAM,SAAS,GAAG,CAAC,CAAyB,EAAE,CAAyB,EAAW,EAAE;QAChF,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1B,IAAI,EAAE,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QACtD,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC,CAAC;IACF,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;AAClF,CAAC"}

package/packages/mailx-types/reminder-state.ts

@@ -0,0 +1,88 @@
+/**
+ * Reminder dismissed/snoozed state — shared across devices.
+ *
+ * The alarm subsystem (client/components/alarms.ts) keys every reminder by a
+ * per-occurrence string (`providerId:startMs[@offsetMs]` for calendar,
+ * `taskUuid:dueMs` for tasks). Those keys are built from Google-stable ids,
+ * so the SAME occurrence produces the SAME key on every device — which is
+ * what makes cross-device sync meaningful: dismiss a reminder on the desktop
+ * and the laptop's poller sees the dismissal before it fires its own popup.
+ *
+ * State lives in `reminders.jsonc` in the shared GDrive folder (same rails
+ * as allowlist.jsonc / userdict.csv). Values are epoch-ms timestamps:
+ *   dismissed[key] = when the user dismissed it   (retention: 30 days)
+ *   snoozed[key]   = fire again after this time   (retention: 7 days past)
+ *
+ * Merge is per-key max — a dismissal or longer snooze on ANY device wins.
+ * Deletions don't propagate (union semantics); the only deletion in the
+ * alarm flow is the Open-button re-evaluate, which by construction touches
+ * a key that was never pushed as dismissed. Timestamps double as the prune
+ * criterion so the file can't grow forever.
+ *
+ * This module is dependency-free (mailx-types) so the desktop service
+ * (mailx-settings) and the Android/web service (mailx-store-web) share one
+ * merge implementation.
+ */
+
+export interface ReminderState {
+    /** occurrence-key → epoch-ms when dismissed */
+    dismissed: Record<string, number>;
+    /** occurrence-key → epoch-ms snooze-until */
+    snoozed: Record<string, number>;
+}
+
+export const REMINDER_STATE_FILE = "reminders.jsonc";
+
+/** Dismissed entries older than this are pruned — by then the occurrence is
+ *  long past the alarm lookback window on every device. */
+const DISMISSED_RETENTION_MS = 30 * 86400_000;
+/** Snoozed entries whose until-time is this far past are pruned. */
+const SNOOZED_RETENTION_MS = 7 * 86400_000;
+
+/** Coerce arbitrary parsed JSON (or the client's localStorage maps, whose
+ *  legacy dismissed values are boolean `true`) into a clean ReminderState.
+ *  Legacy booleans become `now` so they get a full retention window. */
+export function normalizeReminderState(raw: any, now: number): ReminderState {
+    const out: ReminderState = { dismissed: {}, snoozed: {} };
+    if (raw && typeof raw === "object") {
+        for (const [k, v] of Object.entries(raw.dismissed || {})) {
+            if (v === true) out.dismissed[k] = now;
+            else if (Number.isFinite(v as number) && (v as number) > 0) out.dismissed[k] = v as number;
+        }
+        for (const [k, v] of Object.entries(raw.snoozed || {})) {
+            if (Number.isFinite(v as number) && (v as number) > 0) out.snoozed[k] = v as number;
+        }
+    }
+    return out;
+}
+
+/** Union merge with per-key max, pruned by retention. Inputs must already
+ *  be normalized. Pure — does not mutate its arguments. */
+export function mergeReminderStates(a: ReminderState, b: ReminderState, now: number): ReminderState {
+    const out: ReminderState = { dismissed: {}, snoozed: {} };
+    const dismissedCutoff = now - DISMISSED_RETENTION_MS;
+    const snoozedCutoff = now - SNOOZED_RETENTION_MS;
+    for (const src of [a.dismissed, b.dismissed]) {
+        for (const [k, v] of Object.entries(src)) {
+            if (v < dismissedCutoff) continue;
+            if (!(k in out.dismissed) || v > out.dismissed[k]) out.dismissed[k] = v;
+        }
+    }
+    for (const src of [a.snoozed, b.snoozed]) {
+        for (const [k, v] of Object.entries(src)) {
+            if (v < snoozedCutoff) continue;
+            if (!(k in out.snoozed) || v > out.snoozed[k]) out.snoozed[k] = v;
+        }
+    }
+    return out;
+}
+
+/** Deep-equal for change detection so a no-op merge skips the cloud write. */
+export function reminderStatesEqual(a: ReminderState, b: ReminderState): boolean {
+    const mapsEqual = (x: Record<string, number>, y: Record<string, number>): boolean => {
+        const xk = Object.keys(x);
+        if (xk.length !== Object.keys(y).length) return false;
+        return xk.every(k => y[k] === x[k]);
+    };
+    return mapsEqual(a.dismissed, b.dismissed) && mapsEqual(a.snoozed, b.snoozed);
+}