mirror of
https://github.com/juherr/kill-the-news.git
synced 2026-06-20 22:03:48 +00:00
dc2ccfdd1c
Add nativeFeeds/nativeFeedDismissed to FeedMetadata and hasNativeFeed to FeedListItem; extend IngestOptions with nativeFeeds; add nativeFeeds(), hasNativeFeed(), and dismissNativeFeed() to the Feed aggregate mirroring the existing pendingConfirmation/dismissConfirmation pattern. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
414 lines
12 KiB
TypeScript
414 lines
12 KiB
TypeScript
import { describe, it, expect } from "vitest";
|
|
import { createMockEnv } from "../test/setup";
|
|
import { Feed, CreateFeedInput } from "./feed.aggregate";
|
|
import { FeedRepository } from "../infrastructure/feed-repository";
|
|
import { FeedId } from "./value-objects/feed-id";
|
|
import { MailboxId } from "./value-objects/mailbox-id";
|
|
import { Lifetime } from "./value-objects/lifetime";
|
|
import { FeedState } from "./feed-state";
|
|
import { Clock } from "./clock";
|
|
import type { Env, EmailMetadata } from "../types";
|
|
|
|
const FID = FeedId.unchecked("opaque-feed-id");
|
|
const MBOX = MailboxId.unchecked("a.b.42");
|
|
|
|
const mockEnv = () => createMockEnv() as unknown as Env;
|
|
|
|
const fixedClock = (now: number): Clock => ({ now: () => now });
|
|
|
|
const createInput = (
|
|
overrides: Partial<CreateFeedInput> = {},
|
|
): CreateFeedInput => ({
|
|
title: "News",
|
|
language: "en",
|
|
allowedSenders: [],
|
|
blockedSenders: [],
|
|
...overrides,
|
|
});
|
|
|
|
const state = (overrides: Partial<FeedState> = {}): FeedState => ({
|
|
title: "T",
|
|
language: "en",
|
|
mailboxId: "a.b.42",
|
|
allowedSenders: [],
|
|
blockedSenders: [],
|
|
createdAt: 0,
|
|
...overrides,
|
|
});
|
|
|
|
const entry = (overrides: Partial<EmailMetadata> = {}): EmailMetadata => ({
|
|
key: "feed:a.b.42:1",
|
|
subject: "Hello",
|
|
receivedAt: 1,
|
|
size: 10,
|
|
...overrides,
|
|
});
|
|
|
|
describe("Feed.create", () => {
|
|
it("builds a config with an empty email index and no expiry by default", () => {
|
|
const feed = Feed.create(FID, createInput(), { mailboxId: MBOX });
|
|
expect(feed.id.value).toBe("opaque-feed-id");
|
|
expect(feed.mailboxId.value).toBe("a.b.42");
|
|
expect(feed.title).toBe("News");
|
|
expect(feed.expiresAt).toBeUndefined();
|
|
expect(feed.emails).toEqual([]);
|
|
});
|
|
|
|
it("resolves expiry from the supplied lifetime using the injected clock", () => {
|
|
const NOW = 1_000_000;
|
|
const feed = Feed.create(FID, createInput(), {
|
|
mailboxId: MBOX,
|
|
clock: fixedClock(NOW),
|
|
lifetime: Lifetime.ofHours(2),
|
|
});
|
|
expect(feed.createdAt).toBe(NOW);
|
|
expect(feed.updatedAt).toBe(NOW);
|
|
expect(feed.expiresAt).toBe(NOW + 2 * 3_600_000);
|
|
});
|
|
|
|
it("trusts only deps.lifetime, not the client lifetimeHours field", () => {
|
|
// The aggregate no longer parses lifetime policy: the application resolves
|
|
// the effective Lifetime (env override etc.) and hands it in.
|
|
const feed = Feed.create(FID, createInput({ lifetimeHours: 9999 }), {
|
|
mailboxId: MBOX,
|
|
});
|
|
expect(feed.expiresAt).toBeUndefined();
|
|
});
|
|
|
|
it("treats a non-positive lifetime as no expiry", () => {
|
|
expect(
|
|
Feed.create(FID, createInput(), {
|
|
mailboxId: MBOX,
|
|
lifetime: Lifetime.ofHours(0),
|
|
}).expiresAt,
|
|
).toBeUndefined();
|
|
expect(
|
|
Feed.create(FID, createInput(), {
|
|
mailboxId: MBOX,
|
|
lifetime: Lifetime.ofHours(-5),
|
|
}).expiresAt,
|
|
).toBeUndefined();
|
|
});
|
|
});
|
|
|
|
describe("Feed.isExpired / accepts", () => {
|
|
it("reports expiry against the configured instant", () => {
|
|
const feed = Feed.reconstitute(FID, state({ expiresAt: 100 }), {
|
|
emails: [],
|
|
});
|
|
expect(feed.isExpired(50)).toBe(false);
|
|
expect(feed.isExpired(150)).toBe(true);
|
|
});
|
|
|
|
it("uses the injected clock when no instant is supplied", () => {
|
|
const feed = Feed.reconstitute(
|
|
FID,
|
|
state({ expiresAt: 100 }),
|
|
{ emails: [] },
|
|
fixedClock(150),
|
|
);
|
|
expect(feed.isExpired()).toBe(true);
|
|
});
|
|
|
|
it("applies the sender policy", () => {
|
|
const feed = Feed.reconstitute(
|
|
FID,
|
|
state({ allowedSenders: ["good@example.com"] }),
|
|
{ emails: [] },
|
|
);
|
|
expect(feed.accepts(["good@example.com"])).toBe("accepted");
|
|
expect(feed.accepts(["bad@example.com"])).toBe("blocked");
|
|
});
|
|
});
|
|
|
|
describe("Feed.edit", () => {
|
|
it("recomputes expiry only when a lifetime is supplied", () => {
|
|
const NOW = 5_000_000;
|
|
const FUTURE = NOW + 10 * 3_600_000;
|
|
const feed = Feed.reconstitute(
|
|
FID,
|
|
state({ expiresAt: FUTURE }),
|
|
{ emails: [] },
|
|
fixedClock(NOW),
|
|
);
|
|
|
|
feed.edit({ title: "T2" }); // no lifetime ⇒ expiry preserved
|
|
expect(feed.expiresAt).toBe(FUTURE);
|
|
expect(feed.updatedAt).toBe(NOW);
|
|
|
|
feed.edit({ title: "T3" }, { lifetime: Lifetime.ofHours(1) });
|
|
expect(feed.expiresAt).toBe(NOW + 3_600_000);
|
|
});
|
|
|
|
it("refuses to edit an already-expired feed", () => {
|
|
const feed = Feed.reconstitute(
|
|
FID,
|
|
state({ expiresAt: 100 }),
|
|
{ emails: [] },
|
|
fixedClock(200),
|
|
);
|
|
expect(feed.edit({ title: "X" }).status).toBe("expired");
|
|
});
|
|
});
|
|
|
|
describe("Feed.ingest", () => {
|
|
it("prepends the entry, tracks icon/unsub and trims to the byte budget", () => {
|
|
const feed = Feed.reconstitute(FID, state(), {
|
|
emails: [entry({ key: "old", size: 400 })],
|
|
});
|
|
|
|
const { dropped } = feed.ingest(entry({ key: "new", size: 400 }), {
|
|
maxBytes: 500,
|
|
iconDomain: "example.com",
|
|
unsub: { senderKey: "news@example.com", url: "https://u/1" },
|
|
});
|
|
|
|
expect(feed.emails[0].key).toBe("new");
|
|
expect(feed.iconDomain).toBe("example.com");
|
|
expect(feed.unsubscribeUrls()).toEqual({
|
|
"news@example.com": "https://u/1",
|
|
});
|
|
expect(dropped.map((e) => e.key)).toEqual(["old"]);
|
|
expect(feed.emails.map((e) => e.key)).toEqual(["new"]);
|
|
});
|
|
|
|
it("always keeps the just-ingested entry, even when it alone is oversized", () => {
|
|
const feed = Feed.reconstitute(FID, state(), { emails: [] });
|
|
|
|
const { dropped } = feed.ingest(entry({ key: "huge", size: 999 }), {
|
|
maxBytes: 1,
|
|
});
|
|
|
|
expect(dropped).toEqual([]);
|
|
expect(feed.emails.map((e) => e.key)).toEqual(["huge"]);
|
|
});
|
|
});
|
|
|
|
describe("Feed.removeEmails", () => {
|
|
it("drops matching keys and returns the removed entries", () => {
|
|
const feed = Feed.reconstitute(FID, state(), {
|
|
emails: [
|
|
entry({ key: "k1" }),
|
|
entry({ key: "k2" }),
|
|
entry({ key: "k3" }),
|
|
],
|
|
});
|
|
|
|
const { removed } = feed.removeEmails(["k1", "k3", "missing"]);
|
|
expect(removed.map((e) => e.key).sort()).toEqual(["k1", "k3"]);
|
|
expect(feed.emails.map((e) => e.key)).toEqual(["k2"]);
|
|
});
|
|
});
|
|
|
|
describe("Feed events", () => {
|
|
it("records FeedCreated on create and drains it once", () => {
|
|
const feed = Feed.create(FID, createInput(), { mailboxId: MBOX });
|
|
expect(feed.pullEvents()).toEqual([{ type: "FeedCreated", feedId: FID }]);
|
|
// Draining clears: a second pull is empty.
|
|
expect(feed.pullEvents()).toEqual([]);
|
|
});
|
|
|
|
it("records EmailIngested (with icon domain) on ingest", () => {
|
|
const feed = Feed.reconstitute(FID, state(), { emails: [] });
|
|
feed.ingest(entry({ key: "k" }), {
|
|
maxBytes: 1_000_000,
|
|
iconDomain: "example.com",
|
|
});
|
|
expect(feed.pullEvents()).toEqual([
|
|
{ type: "EmailIngested", feedId: FID, iconDomain: "example.com" },
|
|
]);
|
|
});
|
|
|
|
it("emits no events for edit / removeEmails", () => {
|
|
const feed = Feed.reconstitute(
|
|
FID,
|
|
state({ expiresAt: 9_999_999_999 }),
|
|
{ emails: [entry({ key: "k1" })] },
|
|
fixedClock(1000),
|
|
);
|
|
feed.edit({ title: "X" });
|
|
feed.edit({ description: "Y" });
|
|
feed.removeEmails(["k1"]);
|
|
expect(feed.pullEvents()).toEqual([]);
|
|
});
|
|
});
|
|
|
|
function newFeed(): Feed {
|
|
return Feed.create(
|
|
FeedId.generate(),
|
|
{
|
|
title: "T",
|
|
description: "",
|
|
language: "en",
|
|
allowedSenders: [],
|
|
blockedSenders: [],
|
|
},
|
|
{ mailboxId: MailboxId.unchecked("alpha.beta.10") },
|
|
);
|
|
}
|
|
|
|
function confirmationEmail(
|
|
key: string,
|
|
confirmation?: { links: string[] },
|
|
): EmailMetadata {
|
|
return {
|
|
key,
|
|
subject: "s",
|
|
receivedAt: Date.now(),
|
|
size: 10,
|
|
...(confirmation ? { confirmation } : {}),
|
|
};
|
|
}
|
|
|
|
describe("Feed pendingConfirmation", () => {
|
|
it("is false on a fresh feed", () => {
|
|
expect(newFeed().pendingConfirmation).toBe(false);
|
|
});
|
|
|
|
it("is raised when a confirmation email is ingested", () => {
|
|
const feed = newFeed();
|
|
feed.ingest(confirmationEmail("k1", { links: ["https://x/confirm"] }), {
|
|
maxBytes: 1_000_000,
|
|
});
|
|
expect(feed.pendingConfirmation).toBe(true);
|
|
});
|
|
|
|
it("stays false for a non-confirmation email", () => {
|
|
const feed = newFeed();
|
|
feed.ingest(confirmationEmail("k1"), { maxBytes: 1_000_000 });
|
|
expect(feed.pendingConfirmation).toBe(false);
|
|
});
|
|
|
|
it("is cleared by dismissConfirmation", () => {
|
|
const feed = newFeed();
|
|
feed.ingest(confirmationEmail("k1", { links: ["https://x/confirm"] }), {
|
|
maxBytes: 1_000_000,
|
|
});
|
|
feed.dismissConfirmation();
|
|
expect(feed.pendingConfirmation).toBe(false);
|
|
});
|
|
|
|
it("does not re-raise after dismiss when removing an unrelated email", () => {
|
|
const feed = newFeed();
|
|
feed.ingest(confirmationEmail("k1", { links: ["https://x/confirm"] }), {
|
|
maxBytes: 1_000_000,
|
|
});
|
|
feed.ingest(confirmationEmail("k2"), { maxBytes: 1_000_000 });
|
|
feed.dismissConfirmation();
|
|
feed.removeEmails(["k2"]);
|
|
expect(feed.pendingConfirmation).toBe(false);
|
|
});
|
|
|
|
it("clears when the last confirmation email is removed", () => {
|
|
const feed = newFeed();
|
|
feed.ingest(confirmationEmail("k1", { links: ["https://x/confirm"] }), {
|
|
maxBytes: 1_000_000,
|
|
});
|
|
feed.removeEmails(["k1"]);
|
|
expect(feed.pendingConfirmation).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("FeedRepository.load / save round-trip", () => {
|
|
it("persists a created feed and reflects later mutations", async () => {
|
|
const repo = new FeedRepository(mockEnv().EMAIL_STORAGE);
|
|
const created = Feed.create(FID, createInput({ title: "Round" }), {
|
|
mailboxId: MBOX,
|
|
});
|
|
await repo.save(created);
|
|
|
|
const loaded = await repo.load(FID);
|
|
expect(loaded).not.toBeNull();
|
|
expect(loaded!.title).toBe("Round");
|
|
expect(loaded!.mailboxId.value).toBe("a.b.42");
|
|
|
|
loaded!.ingest(entry({ key: "feed:opaque-feed-id:1" }), {
|
|
maxBytes: 1_000_000,
|
|
});
|
|
await repo.saveMetadata(loaded!);
|
|
|
|
const reloaded = await repo.load(FID);
|
|
expect(reloaded!.emails.map((e) => e.key)).toEqual([
|
|
"feed:opaque-feed-id:1",
|
|
]);
|
|
});
|
|
|
|
it("returns null when the feed has no config", async () => {
|
|
const repo = new FeedRepository(mockEnv().EMAIL_STORAGE);
|
|
expect(await repo.load(FeedId.unchecked("missing"))).toBeNull();
|
|
});
|
|
});
|
|
|
|
describe("Feed native feeds", () => {
|
|
const nf = (
|
|
senderKey: string,
|
|
url: string,
|
|
type: "rss" | "atom" | "json",
|
|
) => ({
|
|
maxBytes: 1_000_000_000,
|
|
nativeFeeds: { senderKey, feeds: [{ url, type }] },
|
|
});
|
|
|
|
it("stores native feeds and raises the flag on ingest", () => {
|
|
const feed = Feed.create(FID, createInput(), { mailboxId: MBOX });
|
|
feed.ingest(entry(), nf("a@x.com", "https://x.com/rss", "rss"));
|
|
expect(feed.nativeFeeds()).toEqual([
|
|
{ url: "https://x.com/rss", type: "rss" },
|
|
]);
|
|
expect(feed.hasNativeFeed()).toBe(true);
|
|
});
|
|
|
|
it("latest non-empty wins per sender; other senders preserved", () => {
|
|
const feed = Feed.create(FID, createInput(), { mailboxId: MBOX });
|
|
feed.ingest(
|
|
entry({ key: "k1" }),
|
|
nf("a@x.com", "https://x.com/old", "rss"),
|
|
);
|
|
feed.ingest(
|
|
entry({ key: "k2" }),
|
|
nf("b@y.com", "https://y.com/atom", "atom"),
|
|
);
|
|
feed.ingest(
|
|
entry({ key: "k3" }),
|
|
nf("a@x.com", "https://x.com/new", "rss"),
|
|
);
|
|
expect(feed.nativeFeeds()).toEqual([
|
|
{ url: "https://x.com/new", type: "rss" },
|
|
{ url: "https://y.com/atom", type: "atom" },
|
|
]);
|
|
});
|
|
|
|
it("dismiss hides the notice but keeps URLs; only a new URL re-raises", () => {
|
|
const feed = Feed.create(FID, createInput(), { mailboxId: MBOX });
|
|
feed.ingest(
|
|
entry({ key: "k1" }),
|
|
nf("a@x.com", "https://x.com/rss", "rss"),
|
|
);
|
|
feed.dismissNativeFeed();
|
|
expect(feed.hasNativeFeed()).toBe(false);
|
|
expect(feed.nativeFeeds()).toHaveLength(1);
|
|
feed.ingest(
|
|
entry({ key: "k2" }),
|
|
nf("a@x.com", "https://x.com/rss", "rss"),
|
|
);
|
|
expect(feed.hasNativeFeed()).toBe(false); // same URL → stays dismissed
|
|
feed.ingest(
|
|
entry({ key: "k3" }),
|
|
nf("a@x.com", "https://x.com/rss2", "rss"),
|
|
);
|
|
expect(feed.hasNativeFeed()).toBe(true); // new URL → re-raise
|
|
});
|
|
|
|
it("removeEmails leaves native feeds intact", () => {
|
|
const feed = Feed.create(FID, createInput(), { mailboxId: MBOX });
|
|
feed.ingest(
|
|
entry({ key: "k1" }),
|
|
nf("a@x.com", "https://x.com/rss", "rss"),
|
|
);
|
|
feed.removeEmails(["k1"]);
|
|
expect(feed.nativeFeeds()).toEqual([
|
|
{ url: "https://x.com/rss", type: "rss" },
|
|
]);
|
|
});
|
|
});
|