Implement tasks 40, 41, 42: web push, notification bus, reminders engine
Task 40 — Web Push (VAPID): - Add web-push package + @types/web-push - pnpm vapid:generate script prints VAPID_PUBLIC_KEY, VAPID_PRIVATE_KEY, NEXT_PUBLIC_VAPID_PUBLIC_KEY - push_subscriptions schema + migration 0013 - _core/push.ts: sendPush() iterates subscriptions, prunes 404/410 stale entries - SW push/notificationclick event handlers added to generated sw.js template - PushOptIn client component on /settings (opt-in, disable, send test) Task 42 — Notification bus + ntfy adapter: - notifications table + notif_push/notif_inapp/notif_ntfy user columns (migration 0013) - _core/notify.ts: notify() fans out to push, in-app DB, and optional ntfy POST - NotificationBell server component in AppNav: unread badge, dropdown inbox, mark-read - NotifyChannelToggles client component in /settings Task 41 — Reminders engine: - fired_at + created_by added to reminders; default channel changed to 'auto' - _core/reminders.ts: scheduleReminder (upsert), cancelReminder, listReminders, tickReminders - tickReminders uses pg_try_advisory_xact_lock for horizontal-scale safety - src/instrumentation.ts starts reminder worker (30s tick) on Node.js boot - Notes actions use scheduleReminder/cancelReminder instead of raw SQL - Calendar createEvent: optional remindMinutesBefore, deleteEvent: cancelReminder - Calendar-shell: "Remind me 30 min before" checkbox on new event form Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 4.6
parent
ec20f1bc87
commit
b6abe052c9
@@ -0,0 +1,99 @@
|
||||
import { and, eq, inArray, isNull, lte, sql } from "drizzle-orm";
|
||||
import { db } from "@/lib/db";
|
||||
import { reminders } from "./schema";
|
||||
import { notify } from "./notify";
|
||||
|
||||
const REMINDER_LOCK_KEY = 7_777_777;
|
||||
|
||||
export async function scheduleReminder(input: {
|
||||
householdId: string;
|
||||
entityType: string;
|
||||
entityId: string;
|
||||
fireAt: Date;
|
||||
createdBy: string;
|
||||
channel?: string;
|
||||
}) {
|
||||
await db
|
||||
.insert(reminders)
|
||||
.values({
|
||||
householdId: input.householdId,
|
||||
entityType: input.entityType,
|
||||
entityId: input.entityId,
|
||||
fireAt: input.fireAt,
|
||||
channel: input.channel ?? "auto",
|
||||
createdBy: input.createdBy,
|
||||
firedAt: null,
|
||||
})
|
||||
.onConflictDoUpdate({
|
||||
target: [reminders.entityType, reminders.entityId],
|
||||
set: { fireAt: input.fireAt, firedAt: null, createdBy: input.createdBy },
|
||||
});
|
||||
}
|
||||
|
||||
export async function cancelReminder(entityType: string, entityId: string) {
|
||||
await db
|
||||
.delete(reminders)
|
||||
.where(and(eq(reminders.entityType, entityType), eq(reminders.entityId, entityId)));
|
||||
}
|
||||
|
||||
export async function listReminders(entityType: string, entityId: string) {
|
||||
return db
|
||||
.select()
|
||||
.from(reminders)
|
||||
.where(and(eq(reminders.entityType, entityType), eq(reminders.entityId, entityId)));
|
||||
}
|
||||
|
||||
export async function tickReminders() {
|
||||
let dueReminders: (typeof reminders.$inferSelect)[] = [];
|
||||
|
||||
try {
|
||||
await db.transaction(async (tx) => {
|
||||
const lockRows = await tx.execute<{ acquired: boolean }>(
|
||||
sql`SELECT pg_try_advisory_xact_lock(${REMINDER_LOCK_KEY}) AS acquired`,
|
||||
);
|
||||
if (!lockRows[0]?.acquired) return;
|
||||
|
||||
const now = new Date();
|
||||
dueReminders = await tx
|
||||
.select()
|
||||
.from(reminders)
|
||||
.where(and(lte(reminders.fireAt, now), isNull(reminders.firedAt)));
|
||||
|
||||
if (dueReminders.length > 0) {
|
||||
await tx
|
||||
.update(reminders)
|
||||
.set({ firedAt: now })
|
||||
.where(inArray(reminders.id, dueReminders.map((r) => r.id)));
|
||||
}
|
||||
});
|
||||
} catch (err) {
|
||||
console.error("[famapp] reminder tick error:", err);
|
||||
return;
|
||||
}
|
||||
|
||||
await Promise.allSettled(
|
||||
dueReminders.map(async (reminder) => {
|
||||
if (!reminder.createdBy) return;
|
||||
try {
|
||||
await notify(reminder.createdBy, {
|
||||
title: "Reminder",
|
||||
body: `You have a reminder`,
|
||||
url: reminder.entityType === "notes.note" ? `/notes/${reminder.entityId}` : "/",
|
||||
channels: ["push", "inapp"],
|
||||
});
|
||||
} catch (err) {
|
||||
console.error("[famapp] reminder delivery failed:", reminder.id, err);
|
||||
}
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
let workerTimer: ReturnType<typeof setInterval> | null = null;
|
||||
|
||||
export function startReminderWorker() {
|
||||
if (workerTimer) return;
|
||||
workerTimer = setInterval(() => {
|
||||
tickReminders().catch((err) => console.error("[famapp] reminder worker uncaught:", err));
|
||||
}, 30_000);
|
||||
console.log("[famapp] reminder worker started (30s tick)");
|
||||
}
|
||||
Reference in New Issue
Block a user