refactor(domain): introduce FeedRepository as the single KV access layer

Centralise the KV key schema and all get/put access behind a FeedRepository
class under src/domain/. Every feed/email/list/icon/websub/counter key was
previously inlined across ~12 modules with two divergent storeEmail and
addFeedToList implementations; the dead src/utils/storage.ts write path is
removed and the email key convention unified on feed:<id>:<ts>.

Behaviour-preserving: existing tests pass unchanged in logic, plus a new
feed-repository.test.ts covering CRUD, key builders, list ops and counters.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

src/routes/admin.tsx

@@ -8,7 +8,7 @@ import { ADMIN_COOKIE_MAX_AGE } from "../config/constants";
 import { logger } from "../lib/logger";
 import { timingSafeEqual, checkProxyAuth } from "../lib/auth";
 import { Layout, clampText } from "./admin/ui";
-import { listAllFeeds } from "./admin/helpers";
+import { FeedRepository } from "../domain/feed-repository";
 import { updateFeedRecord } from "../lib/feed-service";
 import { feedRssUrl, feedAtomUrl, feedEmailAddress } from "../utils/urls";
 import { feedsRouter } from "./admin/feeds";
@@ -282,14 +282,13 @@ const ExpiryBadge = ({ expiresAt }: { expiresAt: number }) => {
 app.get("/", async (c) => {
   // Type assertion for environment variables
   const env = c.env;
-  const emailStorage = env.EMAIL_STORAGE;
   const url = new URL(c.req.url);
   const view = url.searchParams.get("view") === "table" ? "table" : "list";
   const message = url.searchParams.get("message");
   const count = Number(url.searchParams.get("count") || "0");
 
   // List all feeds
-  const feedList = await listAllFeeds(emailStorage);
+  const feedList = await FeedRepository.from(env).listFeeds();
 
   // Keep the dashboard fast: avoid N KV reads for N feeds.
   // We store title/description in `feeds:list` (description is optional for older data).

src/routes/admin/emails.tsx

@@ -1,17 +1,12 @@
 import { Hono } from "hono";
-import {
-  Env,
-  FeedConfig,
-  FeedMetadata,
-  EmailData,
-  EmailMetadata,
-} from "../../types";
+import { Env, EmailMetadata } from "../../types";
 import { logger } from "../../lib/logger";
 import { Layout, clampText } from "./ui";
 import {
   deleteAttachmentsForEmails,
   deleteKeysWithConcurrency,
 } from "./helpers";
+import { FeedRepository } from "../../domain/feed-repository";
 import { feedRssUrl, feedAtomUrl, feedEmailAddress } from "../../utils/urls";
 import { formatBytes } from "../../utils/format";
 import { emailsPageScript } from "../../scripts/generated/emails-page";
@@ -156,17 +151,13 @@ const SenderField = ({ from, feedId }: SenderFieldProps) => {
 
 emailsRouter.get("/feeds/:feedId/emails", async (c) => {
   const env = c.env;
-  const emailStorage = env.EMAIL_STORAGE;
+  const repo = FeedRepository.from(env);
   const feedId = c.req.param("feedId");
   const message = c.req.query("message");
   const count = Number(c.req.query("count") || "0");
 
-  const feedConfig = (await emailStorage.get(`feed:${feedId}:config`, {
-    type: "json",
-  })) as FeedConfig | null;
-  const feedMetadata = (await emailStorage.get(`feed:${feedId}:metadata`, {
-    type: "json",
-  })) as FeedMetadata | null;
+  const feedConfig = await repo.getConfig(feedId);
+  const feedMetadata = await repo.getMetadata(feedId);
 
   if (!feedConfig || !feedMetadata) {
     return c.text("Feed not found", 404);
@@ -461,16 +452,14 @@ emailsRouter.get("/feeds/:feedId/emails", async (c) => {
 
 emailsRouter.get("/emails/:emailKey", async (c) => {
   const env = c.env;
-  const emailStorage = env.EMAIL_STORAGE;
+  const repo = FeedRepository.from(env);
   const emailKey = c.req.param("emailKey");
 
-  const emailData = (await emailStorage.get(emailKey, {
-    type: "json",
-  })) as EmailData | null;
+  const emailData = await repo.getEmail(emailKey);
 
   if (!emailData) return c.text("Email not found", 404);
 
-  const feedId = emailKey.split(":")[1];
+  const feedId = repo.feedIdFromEmailKey(emailKey);
   const attachments = emailData.attachments ?? [];
 
   const htmlContent = `<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><style>body{font-family:-apple-system,BlinkMacSystemFont,'SF Pro Text','SF Pro Display','Helvetica Neue',Arial,sans-serif;line-height:1.5;padding:16px;margin:0;color:#333;box-sizing:border-box}img{max-width:100%;height:auto}a{color:#0070f3}@media(prefers-color-scheme:dark){body{background-color:#1c1c1e;color:#ffffff}a{color:#0a84ff}}</style></head><body>${emailData.content}</body></html>`;
@@ -652,7 +641,7 @@ emailsRouter.get("/emails/:emailKey", async (c) => {
 
 emailsRouter.post("/emails/:emailKey/delete", async (c) => {
   const env = c.env;
-  const emailStorage = env.EMAIL_STORAGE;
+  const repo = FeedRepository.from(env);
   const emailKey = c.req.param("emailKey");
   const wantsJson = (c.req.header("Accept") || "").includes("application/json");
 
@@ -664,12 +653,9 @@ emailsRouter.post("/emails/:emailKey/delete", async (c) => {
       return c.text("Feed ID is required", 400);
     }
 
-    const feedMetadataKey = `feed:${feedId}:metadata`;
-    const feedMetadata = (await emailStorage.get(feedMetadataKey, {
-      type: "json",
-    })) as FeedMetadata | null;
+    const feedMetadata = await repo.getMetadata(feedId);
 
-    await emailStorage.delete(emailKey);
+    await repo.deleteEmail(emailKey);
     await deleteAttachmentsForEmails(env, feedMetadata?.emails ?? [], [
       emailKey,
     ]);
@@ -678,7 +664,7 @@ emailsRouter.post("/emails/:emailKey/delete", async (c) => {
       feedMetadata.emails = feedMetadata.emails.filter(
         (email) => email.key !== emailKey,
       );
-      await emailStorage.put(feedMetadataKey, JSON.stringify(feedMetadata));
+      await repo.putMetadata(feedId, feedMetadata);
     }
 
     if (wantsJson) return c.json({ ok: true, emailKey, feedId });
@@ -699,6 +685,7 @@ emailsRouter.post("/emails/:emailKey/delete", async (c) => {
 emailsRouter.post("/feeds/:feedId/emails/bulk-delete", async (c) => {
   const env = c.env;
   const emailStorage = env.EMAIL_STORAGE;
+  const repo = new FeedRepository(emailStorage);
   const feedId = c.req.param("feedId");
   const contentType = c.req.header("Content-Type") || "";
   const wantsJson =
@@ -706,10 +693,7 @@ emailsRouter.post("/feeds/:feedId/emails/bulk-delete", async (c) => {
     (c.req.header("Accept") || "").includes("application/json");
 
   try {
-    const feedMetadataKey = `feed:${feedId}:metadata`;
-    const feedMetadata = (await emailStorage.get(feedMetadataKey, {
-      type: "json",
-    })) as FeedMetadata | null;
+    const feedMetadata = await repo.getMetadata(feedId);
 
     if (!feedMetadata) {
       return wantsJson
@@ -753,7 +737,7 @@ emailsRouter.post("/feeds/:feedId/emails/bulk-delete", async (c) => {
       feedMetadata.emails = feedMetadata.emails.filter(
         (email) => !deletedSet.has(email.key),
       );
-      await emailStorage.put(feedMetadataKey, JSON.stringify(feedMetadata));
+      await repo.putMetadata(feedId, feedMetadata);
 
       return c.json({
         ok: failedEmailKeys.length === 0,
@@ -784,7 +768,7 @@ emailsRouter.post("/feeds/:feedId/emails/bulk-delete", async (c) => {
     feedMetadata.emails = feedMetadata.emails.filter(
       (email) => !deletedSet.has(email.key),
     );
-    await emailStorage.put(feedMetadataKey, JSON.stringify(feedMetadata));
+    await repo.putMetadata(feedId, feedMetadata);
 
     return c.redirect(
       `/admin/feeds/${feedId}/emails?message=bulkDeleted&count=${deletedOk.length}`,

src/routes/admin/feeds.tsx

@@ -1,6 +1,6 @@
 import { Hono } from "hono";
 import { z } from "zod";
-import { Env, FeedConfig } from "../../types";
+import { Env } from "../../types";
 import { bumpCounters } from "../../utils/stats";
 import { waitUntilSafe } from "../../utils/worker";
 import { feedRssUrl, feedEmailAddress } from "../../utils/urls";
@@ -8,11 +8,8 @@ import { logger } from "../../lib/logger";
 import { sendUnsubscribes } from "../../utils/unsubscribe";
 import { getAttachmentBucket } from "../../utils/attachments";
 import { Layout } from "./ui";
-import {
-  removeFeedsFromListBulk,
-  purgeFeedKeysStep,
-  collectUnsubscribeUrls,
-} from "./helpers";
+import { purgeFeedKeysStep, collectUnsubscribeUrls } from "./helpers";
+import { FeedRepository } from "../../domain/feed-repository";
 import {
   createFeedRecord,
   updateFeedRecord,
@@ -149,12 +146,9 @@ feedsRouter.post("/create", async (c) => {
 
 feedsRouter.get("/:feedId/edit", async (c) => {
   const env = c.env;
-  const emailStorage = env.EMAIL_STORAGE;
   const feedId = c.req.param("feedId");
 
-  const feedConfig = (await emailStorage.get(`feed:${feedId}:config`, {
-    type: "json",
-  })) as FeedConfig | null;
+  const feedConfig = await FeedRepository.from(env).getConfig(feedId);
 
   if (!feedConfig) {
     return c.text("Feed not found", 404);
@@ -365,7 +359,7 @@ feedsRouter.post("/:feedId/edit", async (c) => {
 feedsRouter.post("/:feedId/sender-filter", async (c) => {
   const env = c.env;
   const feedId = c.req.param("feedId");
-  const feedConfigKey = `feed:${feedId}:config`;
+  const repo = FeedRepository.from(env);
 
   const body = await c.req.json().catch(() => null);
   const parsed = senderFilterSchema.safeParse(body);
@@ -376,9 +370,7 @@ feedsRouter.post("/:feedId/sender-filter", async (c) => {
   const { action, value } = parsed.data;
   const normalized = value.trim().toLowerCase();
 
-  const feedConfig = (await env.EMAIL_STORAGE.get(feedConfigKey, {
-    type: "json",
-  })) as FeedConfig | null;
+  const feedConfig = await repo.getConfig(feedId);
   if (!feedConfig) return c.json({ ok: false, error: "Feed not found" }, 404);
 
   const allowedSenders = (feedConfig.allowed_senders || []).map((s) =>
@@ -405,15 +397,12 @@ feedsRouter.post("/:feedId/sender-filter", async (c) => {
 
   if (!targetList.includes(normalized)) {
     targetList.push(normalized);
-    await env.EMAIL_STORAGE.put(
-      feedConfigKey,
-      JSON.stringify({
-        ...feedConfig,
-        allowed_senders: allowedSenders,
-        blocked_senders: blockedSenders,
-        updated_at: Date.now(),
-      }),
-    );
+    await repo.putConfig(feedId, {
+      ...feedConfig,
+      allowed_senders: allowedSenders,
+      blocked_senders: blockedSenders,
+      updated_at: Date.now(),
+    });
   }
 
   return c.json({ ok: true });
@@ -552,7 +541,9 @@ feedsRouter.post("/bulk-delete", async (c) => {
         }
       }
 
-      const deletedFeedIds = await removeFeedsFromListBulk(emailStorage, okIds);
+      const deletedFeedIds = await new FeedRepository(
+        emailStorage,
+      ).removeFromListBulk(okIds);
       if (deletedFeedIds.length > 0) {
         await bumpCounters(emailStorage, {
           feeds_deleted: deletedFeedIds.length,
@@ -616,7 +607,9 @@ feedsRouter.post("/bulk-delete", async (c) => {
       }
     }
 
-    const deletedFeedIds = await removeFeedsFromListBulk(emailStorage, okIds);
+    const deletedFeedIds = await new FeedRepository(
+      emailStorage,
+    ).removeFromListBulk(okIds);
     if (deletedFeedIds.length > 0) {
       await bumpCounters(emailStorage, {
         feeds_deleted: deletedFeedIds.length,

src/routes/admin/helpers.ts

@@ -1,14 +1,7 @@
-import {
-  EmailData,
-  EmailMetadata,
-  Env,
-  FeedList,
-  FeedListItem,
-  FeedMetadata,
-} from "../../types";
-import { FEEDS_LIST_KEY } from "../../config/constants";
+import { EmailData, EmailMetadata, Env } from "../../types";
 import { logger } from "../../lib/logger";
 import { getAttachmentBucket } from "../../utils/attachments";
+import { FeedRepository } from "../../domain/feed-repository";
 
 // Delete the R2 attachments belonging to the given email keys. Call before the
 // emails are removed from feed metadata, while `emails` still carries their
@@ -58,108 +51,6 @@ export async function deleteKeysWithConcurrency(
   return { ok, failed };
 }
 
-export async function listAllFeeds(
-  emailStorage: KVNamespace,
-): Promise<FeedListItem[]> {
-  try {
-    const feedList = (await emailStorage.get(FEEDS_LIST_KEY, {
-      type: "json",
-    })) as FeedList | null;
-    return feedList?.feeds || [];
-  } catch (error) {
-    logger.error("Error listing feeds", { error: String(error) });
-    return [];
-  }
-}
-
-export async function addFeedToList(
-  emailStorage: KVNamespace,
-  feedId: string,
-  title: string,
-  description?: string,
-  expires_at?: number,
-): Promise<void> {
-  try {
-    const feedList = ((await emailStorage.get(FEEDS_LIST_KEY, {
-      type: "json",
-    })) as FeedList | null) || { feeds: [] };
-
-    feedList.feeds.push({ id: feedId, title, description, expires_at });
-    await emailStorage.put(FEEDS_LIST_KEY, JSON.stringify(feedList));
-  } catch (error) {
-    logger.error("Error adding feed to list", { feedId, error: String(error) });
-  }
-}
-
-export async function updateFeedInList(
-  emailStorage: KVNamespace,
-  feedId: string,
-  title: string,
-  description?: string,
-  expires_at?: number,
-): Promise<void> {
-  try {
-    const feedList = ((await emailStorage.get(FEEDS_LIST_KEY, {
-      type: "json",
-    })) as FeedList | null) || { feeds: [] };
-
-    const feedIndex = feedList.feeds.findIndex((feed) => feed.id === feedId);
-    if (feedIndex !== -1) {
-      feedList.feeds[feedIndex].title = title;
-      feedList.feeds[feedIndex].description = description;
-      feedList.feeds[feedIndex].expires_at = expires_at;
-      await emailStorage.put(FEEDS_LIST_KEY, JSON.stringify(feedList));
-    }
-  } catch (error) {
-    logger.error("Error updating feed in list", {
-      feedId,
-      error: String(error),
-    });
-  }
-}
-
-export async function removeFeedsFromListBulk(
-  emailStorage: KVNamespace,
-  feedIds: string[],
-): Promise<string[]> {
-  try {
-    const feedList = ((await emailStorage.get(FEEDS_LIST_KEY, {
-      type: "json",
-    })) as FeedList | null) || { feeds: [] };
-
-    const toRemove = new Set(feedIds.filter(Boolean));
-    if (toRemove.size === 0) return [];
-
-    const removed: string[] = [];
-    const nextFeeds: FeedListItem[] = [];
-
-    for (const feed of feedList.feeds) {
-      if (toRemove.has(feed.id)) {
-        removed.push(feed.id);
-        continue;
-      }
-      nextFeeds.push(feed);
-    }
-
-    if (removed.length === 0) return [];
-
-    feedList.feeds = nextFeeds;
-    await emailStorage.put(FEEDS_LIST_KEY, JSON.stringify(feedList));
-    return removed;
-  } catch (error) {
-    logger.error("Error removing feeds from list", { error: String(error) });
-    return [];
-  }
-}
-
-export async function removeFeedFromList(
-  emailStorage: KVNamespace,
-  feedId: string,
-): Promise<boolean> {
-  const removed = await removeFeedsFromListBulk(emailStorage, [feedId]);
-  return removed.includes(feedId);
-}
-
 /**
  * Read a feed's stored RFC 8058 one-click unsubscribe URLs (one per sender).
  * Must be called before the feed metadata is deleted. Never throws.
@@ -169,9 +60,7 @@ export async function collectUnsubscribeUrls(
   feedId: string,
 ): Promise<string[]> {
   try {
-    const metadata = (await emailStorage.get(`feed:${feedId}:metadata`, {
-      type: "json",
-    })) as FeedMetadata | null;
+    const metadata = await new FeedRepository(emailStorage).getMetadata(feedId);
     return Object.values(metadata?.unsubscribe ?? {});
   } catch (error) {
     logger.error("Error reading unsubscribe URLs", {
@@ -192,24 +81,18 @@ export async function purgeFeedKeysStep(
   cursor: string;
   listComplete: boolean;
 }> {
-  const prefix = `feed:${feedId}:`;
-  const limit = Math.min(1000, Math.max(1, Math.floor(options.limit || 100)));
-  const cursor = options.cursor || undefined;
-
-  const listed = await emailStorage.list({ prefix, cursor, limit });
-  const keys = (listed.keys || []).map((k) => k.name);
+  const repo = new FeedRepository(emailStorage);
+  const listed = await repo.listFeedKeys(feedId, {
+    cursor: options.cursor,
+    limit: options.limit,
+  });
+  const keys = listed.names;
 
   if (options.bucket && keys.length > 0) {
-    const emailKeys = keys.filter((k) => {
-      const suffix = k.slice(prefix.length);
-      return suffix !== "config" && suffix !== "metadata";
-    });
+    const emailKeys = keys.filter((k) => repo.isEmailKey(feedId, k));
     if (emailKeys.length > 0) {
       const emailDataResults = await Promise.allSettled(
-        emailKeys.map(
-          (k) =>
-            emailStorage.get(k, { type: "json" }) as Promise<EmailData | null>,
-        ),
+        emailKeys.map((k) => repo.getEmail(k)),
       );
       const attachmentIds = emailDataResults
         .filter(
@@ -234,8 +117,8 @@ export async function purgeFeedKeysStep(
   return {
     deletedKeys: ok,
     failedKeys: failed,
-    cursor: listed.cursor || "",
-    listComplete: !!listed.list_complete,
+    cursor: listed.cursor,
+    listComplete: listed.listComplete,
   };
 }
 

src/routes/api/index.ts

@@ -8,12 +8,8 @@ import {
   updateFeedRecord,
   deleteFeedRecord,
 } from "../../lib/feed-service";
-import { listAllFeeds, deleteAttachmentsForEmails } from "../admin/helpers";
-import {
-  getFeedConfig,
-  getFeedMetadata,
-  getEmailData,
-} from "../../utils/storage";
+import { deleteAttachmentsForEmails } from "../admin/helpers";
+import { FeedRepository } from "../../domain/feed-repository";
 import { getStats } from "../../utils/stats";
 import { feedEmailAddress, feedRssUrl, feedAtomUrl } from "../../utils/urls";
 import {
@@ -107,7 +103,7 @@ apiApp.openapi(
   }),
   async (c) => {
     const env = c.env;
-    const feeds = await listAllFeeds(env.EMAIL_STORAGE);
+    const feeds = await FeedRepository.from(env).listFeeds();
     return c.json(
       {
         feeds: feeds.map((f) => ({
@@ -173,9 +169,10 @@ apiApp.openapi(
   async (c) => {
     const env = c.env;
     const { feedId } = c.req.valid("param");
-    const config = await getFeedConfig(env.EMAIL_STORAGE, feedId);
+    const repo = FeedRepository.from(env);
+    const config = await repo.getConfig(feedId);
     if (!config) return c.json({ error: "Feed not found" }, 404);
-    const metadata = await getFeedMetadata(env.EMAIL_STORAGE, feedId);
+    const metadata = await repo.getMetadata(feedId);
     return c.json(
       toFeed(feedId, config, metadata?.emails.length ?? 0, env),
       200,
@@ -218,7 +215,7 @@ apiApp.openapi(
       return c.json({ error: "Feed not found" }, 404);
     if (result.status === "expired")
       return c.json({ error: "Feed has expired and cannot be modified" }, 409);
-    const metadata = await getFeedMetadata(env.EMAIL_STORAGE, feedId);
+    const metadata = await FeedRepository.from(env).getMetadata(feedId);
     return c.json(
       toFeed(feedId, result.config, metadata?.emails.length ?? 0, env),
       200,
@@ -268,7 +265,7 @@ apiApp.openapi(
   async (c) => {
     const env = c.env;
     const { feedId } = c.req.valid("param");
-    const metadata = await getFeedMetadata(env.EMAIL_STORAGE, feedId);
+    const metadata = await FeedRepository.from(env).getMetadata(feedId);
     if (!metadata) return c.json({ error: "Feed not found" }, 404);
     return c.json(
       {
@@ -303,10 +300,11 @@ apiApp.openapi(
     const env = c.env;
     const { feedId, entryId } = c.req.valid("param");
     const receivedAt = parseInt(entryId, 10);
-    const metadata = await getFeedMetadata(env.EMAIL_STORAGE, feedId);
+    const repo = FeedRepository.from(env);
+    const metadata = await repo.getMetadata(feedId);
     const metaEntry = metadata?.emails.find((e) => e.receivedAt === receivedAt);
     if (!metaEntry) return c.json({ error: "Email not found" }, 404);
-    const data = await getEmailData(env.EMAIL_STORAGE, metaEntry.key);
+    const data = await repo.getEmail(metaEntry.key);
     if (!data) return c.json({ error: "Email not found" }, 404);
     return c.json(
       {
@@ -344,18 +342,18 @@ apiApp.openapi(
   }),
   async (c) => {
     const env = c.env;
-    const emailStorage = env.EMAIL_STORAGE;
+    const repo = FeedRepository.from(env);
     const { feedId, entryId } = c.req.valid("param");
     const receivedAt = parseInt(entryId, 10);
-    const metadata = await getFeedMetadata(emailStorage, feedId);
+    const metadata = await repo.getMetadata(feedId);
     const metaEntry = metadata?.emails.find((e) => e.receivedAt === receivedAt);
     if (!metadata || !metaEntry)
       return c.json({ error: "Email not found" }, 404);
 
-    await emailStorage.delete(metaEntry.key);
+    await repo.deleteEmail(metaEntry.key);
     await deleteAttachmentsForEmails(env, metadata.emails, [metaEntry.key]);
     metadata.emails = metadata.emails.filter((e) => e.key !== metaEntry.key);
-    await emailStorage.put(`feed:${feedId}:metadata`, JSON.stringify(metadata));
+    await repo.putMetadata(feedId, metadata);
 
     return c.json({ ok: true }, 200);
   },

src/routes/entries.ts

@@ -1,8 +1,9 @@
 import { Context } from "hono";
 import { html, raw } from "hono/html";
-import { Env, FeedConfig, FeedMetadata, EmailData } from "../types";
+import { Env } from "../types";
 import { processEmailContent } from "../utils/html-processor";
 import { formatBytes } from "../utils/format";
+import { FeedRepository } from "../domain/feed-repository";
 
 export async function handle(c: Context<{ Bindings: Env }>): Promise<Response> {
   const feedId = c.req.param("feedId");
@@ -12,17 +13,11 @@ export async function handle(c: Context<{ Bindings: Env }>): Promise<Response> {
     return new Response("Not Found", { status: 404 });
   }
 
-  const emailStorage = c.env.EMAIL_STORAGE;
+  const repo = FeedRepository.from(c.env);
 
   const [feedMetadata, feedConfig] = await Promise.all([
-    emailStorage.get(
-      `feed:${feedId}:metadata`,
-      "json",
-    ) as Promise<FeedMetadata | null>,
-    emailStorage.get(
-      `feed:${feedId}:config`,
-      "json",
-    ) as Promise<FeedConfig | null>,
+    repo.getMetadata(feedId),
+    repo.getConfig(feedId),
   ]);
   if (!feedMetadata) {
     return new Response("Feed not found", { status: 404 });
@@ -41,10 +36,7 @@ export async function handle(c: Context<{ Bindings: Env }>): Promise<Response> {
     return new Response("Entry not found", { status: 404 });
   }
 
-  const emailData = (await emailStorage.get(
-    metaEntry.key,
-    "json",
-  )) as EmailData | null;
+  const emailData = await repo.getEmail(metaEntry.key);
   if (!emailData) {
     return new Response("Entry not found", { status: 404 });
   }

src/routes/favicon.test.ts

@@ -1,9 +1,10 @@
 import { describe, it, expect } from "vitest";
 import worker from "../index";
 import { createMockEnv } from "../test/setup";
-import { iconKey } from "../utils/storage";
 import type { Env } from "../types";
 
+const iconKey = (domain: string) => `icon:${domain}`;
+
 function req(path: string): Request {
   return new Request(`https://test.getmynews.app${path}`);
 }

src/routes/favicon.ts

@@ -1,6 +1,6 @@
 import { Context } from "hono";
 import { Env } from "../types";
-import { getFeedMetadata } from "../utils/storage";
+import { FeedRepository } from "../domain/feed-repository";
 import { cacheFaviconForDomain, getCachedIcon } from "../utils/favicon-fetcher";
 
 export const FAVICON_PATH = "/favicon.svg";
@@ -40,7 +40,7 @@ export async function handleFeedFavicon(
   const feedId = c.req.param("feedId");
   if (!feedId) return projectFavicon();
 
-  const metadata = await getFeedMetadata(env.EMAIL_STORAGE, feedId);
+  const metadata = await FeedRepository.from(env).getMetadata(feedId);
   const domain = metadata?.iconDomain;
   if (!domain) return projectFavicon();
 

src/routes/hub.ts

@@ -7,6 +7,7 @@ import {
 import { waitUntilSafe } from "../utils/worker";
 import { DEFAULT_LEASE_SECONDS, MAX_LEASE_SECONDS } from "../config/constants";
 import { feedTopicPattern } from "../utils/urls";
+import { FeedRepository } from "../domain/feed-repository";
 
 type AppEnv = { Bindings: Env };
 
@@ -73,10 +74,7 @@ hubRouter.post("/", async (c) => {
   const feedId = match[2];
 
   // Verify the feed exists before accepting any subscription
-  const feedConfig = await env.EMAIL_STORAGE.get(
-    `feed:${feedId}:config`,
-    "json",
-  );
+  const feedConfig = await FeedRepository.from(env).getConfig(feedId);
   if (!feedConfig) {
     return c.text("Not Found: feed does not exist", 404);
   }