refactor: upgrade to Zod 4

also updates Hono Zod related deps

README.md

@@ -66,6 +66,7 @@ pnpm run deploy
 
 - `src/controllers`: API route handlers (titles, episodes, search, etc.)
 - `src/libs`: Shared utilities and logic (AniList integration, background tasks)
+- `src/middleware`: Middleware handlers (authentication, authorization, etc.)
 - `src/models`: Database schema and models
 - `src/scripts`: Utility scripts for maintenance and setup
 - `src/types`: TypeScript type definitions

package.json

@@ -17,8 +17,8 @@
   },
   "dependencies": {
     "@hono/swagger-ui": "^0.5.1",
-    "@hono/zod-openapi": "^0.19.5",
+    "@hono/zod-openapi": "^1.1.6",
-    "@hono/zod-validator": "^0.2.2",
+    "@hono/zod-validator": "^0.7.6",
     "drizzle-orm": "^0.44.7",
     "gql.tada": "^1.8.10",
     "graphql": "^16.12.0",
@@ -27,10 +27,11 @@
     "jose": "^5.10.0",
     "lodash.mapkeys": "^4.6.0",
     "luxon": "^3.6.1",
-    "zod": "^3.24.3"
+    "zod": "^4.2.1"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.10.15",
+    "@graphql-typed-document-node/core": "^3.2.0",
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/lodash.mapkeys": "^4.6.9",
     "@types/luxon": "^3.6.2",

pnpm-lock.yaml

@@ -11,11 +11,11 @@ importers:
         specifier: ^0.5.1
         version: 0.5.2(hono@4.10.8)
       "@hono/zod-openapi":
-        specifier: ^0.19.5
+        specifier: ^1.1.6
-        version: 0.19.10(hono@4.10.8)(zod@3.25.76)
+        version: 1.1.6(hono@4.10.8)(zod@4.2.1)
       "@hono/zod-validator":
-        specifier: ^0.2.2
+        specifier: ^0.7.6
-        version: 0.2.2(hono@4.10.8)(zod@3.25.76)
+        version: 0.7.6(hono@4.10.8)(zod@4.2.1)
       drizzle-orm:
         specifier: ^0.44.7
         version: 0.44.7
@@ -41,12 +41,15 @@ importers:
         specifier: ^3.6.1
         version: 3.7.2
       zod:
-        specifier: ^3.24.3
+        specifier: ^4.2.1
-        version: 3.25.76
+        version: 4.2.1
     devDependencies:
       "@cloudflare/vitest-pool-workers":
         specifier: ^0.10.15
         version: 0.10.15(@vitest/runner@3.2.4)(@vitest/snapshot@3.2.4)(vitest@3.2.4)
+      "@graphql-typed-document-node/core":
+        specifier: ^3.2.0
+        version: 3.2.0(graphql@16.12.0)
       "@trivago/prettier-plugin-sort-imports":
         specifier: ^4.3.0
         version: 4.3.0(prettier@3.7.4)
@@ -135,13 +138,13 @@ packages:
       graphql: ^15.5.0 || ^16.0.0 || ^17.0.0
       typescript: ^5.0.0
 
-  "@asteasolutions/zod-to-openapi@7.3.4":
+  "@asteasolutions/zod-to-openapi@8.2.0":
     resolution:
       {
-        integrity: sha512-/2rThQ5zPi9OzVwes6U7lK1+Yvug0iXu25olp7S0XsYmOqnyMfxH7gdSQjn/+DSOHRg7wnotwGJSyL+fBKdnEA==,
+        integrity: sha512-u05zNUirlukJAf9oEHmxSF31L1XQhz9XdpVILt7+xhrz65oQqBpiOWFkGvRWL0IpjOUJ878idKoNmYPxrFnkeg==,
       }
     peerDependencies:
-      zod: ^3.20.2
+      zod: ^4.0.0
 
   "@babel/code-frame@7.27.1":
     resolution:
@@ -1408,29 +1411,20 @@ packages:
     peerDependencies:
       hono: "*"
 
-  "@hono/zod-openapi@0.19.10":
+  "@hono/zod-openapi@1.1.6":
     resolution:
       {
-        integrity: sha512-dpoS6DenvoJyvxtQ7Kd633FRZ/Qf74+4+o9s+zZI8pEqnbjdF/DtxIib08WDpCaWabMEJOL5TXpMgNEZvb7hpA==,
+        integrity: sha512-wEdG1MlCWAnngRVPKZJ/dv5P/b5UL3di/+SLX0Cuuc8hJ6Gf8L3vDMXcXywSYAwxK8iiatF7HoTxJ96gtckLpQ==,
       }
     engines: { node: ">=16.0.0" }
     peerDependencies:
       hono: ">=4.3.6"
-      zod: ">=3.0.0"
+      zod: ^4.0.0
 
-  "@hono/zod-validator@0.2.2":
+  "@hono/zod-validator@0.7.6":
     resolution:
       {
-        integrity: sha512-dSDxaPV70Py8wuIU2QNpoVEIOSzSXZ/6/B/h4xA7eOMz7+AarKTSGV8E6QwrdcCbBLkpqfJ4Q2TmBO0eP1tCBQ==,
+        integrity: sha512-Io1B6d011Gj1KknV4rXYz4le5+5EubcWEU/speUjuw9XMMIaP3n78yXLhjd2A3PXaXaUwEAluOiAyLqhBEJgsw==,
-      }
-    peerDependencies:
-      hono: ">=3.9.0"
-      zod: ^3.19.1
-
-  "@hono/zod-validator@0.7.5":
-    resolution:
-      {
-        integrity: sha512-n4l4hutkfYU07PzRUHBOVzUEn38VSfrh+UVE5d0w4lyfWDOEhzxIupqo5iakRiJL44c3vTuFJBvcmUl8b9agIA==,
       }
     peerDependencies:
       hono: ">=3.9.0"
@@ -4134,6 +4128,12 @@ packages:
         integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==,
       }
 
+  zod@4.2.1:
+    resolution:
+      {
+        integrity: sha512-0wZ1IRqGGhMP76gLqz8EyfBXKk0J2qo2+H3fi4mcUP/KtTocoX08nmIAHl1Z2kJIZbZee8KOpBCSNPRgauucjw==,
+      }
+
   zx@8.1.5:
     resolution:
       {
@@ -4153,10 +4153,10 @@ snapshots:
       graphql: 16.12.0
       typescript: 5.9.3
 
-  "@asteasolutions/zod-to-openapi@7.3.4(zod@3.25.76)":
+  "@asteasolutions/zod-to-openapi@8.2.0(zod@4.2.1)":
     dependencies:
       openapi3-ts: 4.5.0
-      zod: 3.25.76
+      zod: 4.2.1
 
   "@babel/code-frame@7.27.1":
     dependencies:
@@ -4702,23 +4702,18 @@ snapshots:
     dependencies:
       hono: 4.10.8
 
-  "@hono/zod-openapi@0.19.10(hono@4.10.8)(zod@3.25.76)":
+  "@hono/zod-openapi@1.1.6(hono@4.10.8)(zod@4.2.1)":
     dependencies:
-      "@asteasolutions/zod-to-openapi": 7.3.4(zod@3.25.76)
+      "@asteasolutions/zod-to-openapi": 8.2.0(zod@4.2.1)
-      "@hono/zod-validator": 0.7.5(hono@4.10.8)(zod@3.25.76)
+      "@hono/zod-validator": 0.7.6(hono@4.10.8)(zod@4.2.1)
       hono: 4.10.8
       openapi3-ts: 4.5.0
-      zod: 3.25.76
+      zod: 4.2.1
 
-  "@hono/zod-validator@0.2.2(hono@4.10.8)(zod@3.25.76)":
+  "@hono/zod-validator@0.7.6(hono@4.10.8)(zod@4.2.1)":
     dependencies:
       hono: 4.10.8
-      zod: 3.25.76
+      zod: 4.2.1
-
-  "@hono/zod-validator@0.7.5(hono@4.10.8)(zod@3.25.76)":
-    dependencies:
-      hono: 4.10.8
-      zod: 3.25.76
 
   "@img/sharp-darwin-arm64@0.33.5":
     optionalDependencies:
@@ -6298,6 +6293,8 @@ snapshots:
 
   zod@3.25.76: {}
 
+  zod@4.2.1: {}
+
   zx@8.1.5:
     optionalDependencies:
       "@types/fs-extra": 11.0.4

src/controllers/auth/anilist/index.ts

@@ -20,8 +20,8 @@ const UserSchema = z.object({
   }),
   statistics: z.object({
     minutesWatched: z.number().openapi({ type: "integer", format: "int64" }),
-    episodesWatched: z.number().int(),
+    episodesWatched: z.int(),
-    count: z.number().int(),
+    count: z.int(),
     meanScore: z.number().openapi({ type: "number", format: "float" }),
   }),
 });
@@ -129,15 +129,11 @@ app.openapi(route, async (c) => {
       let hasNextPage = true;
 
       do {
-        const stub = env.ANILIST_DO.getByName(user.name!);
+        const { mediaList, pageInfo } = await getWatchingTitles(
-        const { mediaList, pageInfo } = await stub
-          .getTitles(
           user.name!,
           currentPage++,
-            ["CURRENT", "PLANNING", "PAUSED", "REPEATING"],
           aniListToken,
-          )
+        ).then((data) => data!);
-          .then((data) => data!);
         if (!mediaList) {
           break;
         }

src/controllers/internal/upcoming-titles/anilist.ts

@@ -15,7 +15,7 @@ type AiringSchedule = {
   id: number;
 };
 
-export async function getUpcomingTitlesFromAnilist(req: HonoRequest) {
+export async function getUpcomingTitlesFromAnilist() {
   const durableObjectId = env.ANILIST_DO.idFromName("GLOBAL");
   const stub = env.ANILIST_DO.get(durableObjectId);
 

src/controllers/internal/upcoming-titles/index.ts

@@ -9,8 +9,8 @@ import { getUpcomingTitlesFromAnilist } from "./anilist";
 
 const app = new Hono();
 
-app.post("/", async (c) => {
+export async function checkUpcomingTitles() {
-  const titles = await getUpcomingTitlesFromAnilist(c.req);
+  const titles = await getUpcomingTitlesFromAnilist();
 
   await Promise.allSettled(
     titles.map(async (title) => {
@@ -44,6 +44,10 @@ app.post("/", async (c) => {
       });
     }),
   );
+}
+
+app.post("/", async (c) => {
+  await checkUpcomingTitles();
 
   return c.json(SuccessResponse, 200);
 });

src/controllers/popular/browse/index.ts

@@ -23,8 +23,8 @@ const route = createRoute({
   path: "/",
   request: {
     query: z.object({
-      limit: z
+      limit: z.coerce
-        .number({ coerce: true })
+        .number()
         .int()
         .default(10)
         .describe("The number of titles to return"),

src/controllers/popular/category/anilist.ts

@@ -30,7 +30,7 @@ export async function fetchPopularTitlesFromAnilist(
       );
       break;
     case "upcoming":
-      data = await stub.nextSeasonPopular(next.season, next.year, limit);
+      data = await stub.nextSeasonPopular(next.season, next.year, page, limit);
       break;
     default:
       throw new Error(`Unknown category: ${category}`);

src/controllers/popular/category/index.ts

@@ -22,12 +22,12 @@ const route = createRoute({
   path: "/{category}",
   request: {
     query: z.object({
-      limit: z
+      limit: z.coerce
-        .number({ coerce: true })
+        .number()
         .int()
-        .default(10)
+        .prefault(10)
         .describe("The number of titles to return"),
-      page: z.number({ coerce: true }).int().min(1).default(1),
+      page: z.coerce.number().int().min(1).prefault(1),
     }),
     params: z.object({ category: PopularCategory }),
   },

src/controllers/search/index.ts

@@ -17,8 +17,8 @@ const route = createRoute({
   request: {
     query: z.object({
       query: z.string(),
-      page: z.number({ coerce: true }).int().min(1).default(1),
+      page: z.coerce.number().int().min(1).prefault(1),
-      limit: z.number({ coerce: true }).int().default(10),
+      limit: z.coerce.number().int().prefault(10),
     }),
   },
   responses: {

src/controllers/title/index.spec.ts

@@ -51,7 +51,7 @@ describe('requests the "/title" route', () => {
       headers: new Headers({ "x-anilist-token": "asd" }),
     });
 
-    expect(await response.json()).toMatchSnapshot();
+    await expect(response.json()).resolves.toMatchSnapshot();
     expect(response.status).toBe(200);
   });
 
@@ -63,7 +63,7 @@ describe('requests the "/title" route', () => {
 
     const response = await app.request("/title?id=10");
 
-    expect(await response.json()).toMatchSnapshot();
+    await expect(response.json()).resolves.toMatchSnapshot();
     expect(response.status).toBe(200);
   });
 
@@ -75,7 +75,7 @@ describe('requests the "/title" route', () => {
 
     const response = await app.request("/title?id=-1");
 
-    expect(await response.json()).toEqual({ success: false });
+    await expect(response.json()).resolves.toEqual({ success: false });
     expect(response.status).toBe(404);
   });
 });

src/controllers/title/index.ts

@@ -2,6 +2,7 @@ import { OpenAPIHono, createRoute, z } from "@hono/zod-openapi";
 
 import { fetchTitleFromAnilist } from "~/libs/anilist/getTitle";
 import { fetchFromMultipleSources } from "~/libs/fetchFromMultipleSources";
+import { userProfileMiddleware } from "~/middleware/userProfile";
 import {
   AniListIdQuerySchema,
   ErrorResponse,
@@ -9,6 +10,7 @@ import {
   SuccessResponseSchema,
 } from "~/types/schema";
 import { Title } from "~/types/title";
+import type { User } from "~/types/user";
 
 const app = new OpenAPIHono();
 
@@ -40,6 +42,7 @@ const route = createRoute({
       description: "Title could not be found",
     },
   },
+  middleware: [userProfileMiddleware],
 });
 
 app.openapi(route, async (c) => {
@@ -55,7 +58,12 @@ app.openapi(route, async (c) => {
   }
 
   const { result: title, errorOccurred } = await fetchFromMultipleSources([
-    () => fetchTitleFromAnilist(aniListId, aniListToken ?? undefined),
+    () =>
+      fetchTitleFromAnilist(
+        aniListId,
+        (c.get("user") as User)?.id,
+        aniListToken ?? undefined,
+      ),
   ]);
 
   if (errorOccurred) {

src/controllers/watch-status/index.ts

@@ -1,5 +1,4 @@
 import { OpenAPIHono, createRoute, z } from "@hono/zod-openapi";
-import type { HonoRequest } from "hono";
 
 import { AnilistUpdateType } from "~/libs/anilist/updateType.ts";
 import { maybeScheduleNextAiringEpisode } from "~/libs/maybeScheduleNextAiringEpisode";
@@ -22,7 +21,6 @@ const UpdateWatchStatusRequest = z.object({
   deviceId: z.string(),
   watchStatus: WatchStatus.nullable(),
   titleId: AniListIdSchema,
-  isRetrying: z.boolean().optional().default(false),
 });
 
 const route = createRoute({
@@ -81,12 +79,8 @@ export async function updateWatchStatus(
 }
 
 app.openapi(route, async (c) => {
-  const {
+  const { deviceId, watchStatus, titleId } =
-    deviceId,
+    await c.req.json<typeof UpdateWatchStatusRequest._type>();
-    watchStatus,
-    titleId,
-    isRetrying = false,
-  } = await c.req.json<typeof UpdateWatchStatusRequest._type>();
   // Check if we should use mock data
   const { useMockData } = await import("~/libs/useMockData");
   if (useMockData()) {
@@ -94,7 +88,6 @@ app.openapi(route, async (c) => {
     return c.json(SuccessResponse, { status: 200 });
   }
 
-  if (!isRetrying) {
   try {
     await updateWatchStatus(deviceId, titleId, watchStatus);
   } catch (error) {
@@ -102,7 +95,6 @@ app.openapi(route, async (c) => {
     console.error(error);
     return c.json(ErrorResponse, { status: 500 });
   }
-  }
 
   const aniListToken = c.req.header("X-AniList-Token");
   if (aniListToken) {

src/index.ts

@@ -3,11 +3,14 @@ import { OpenAPIHono } from "@hono/zod-openapi";
 import { Duration, type DurationLike } from "luxon";
 
 import { onNewEpisode } from "~/controllers/internal/new-episode";
-import { maybeUpdateLastConnectedAt } from "~/controllers/maybeUpdateLastConnectedAt";
 import { AnilistUpdateType } from "~/libs/anilist/updateType";
 import { calculateExponentialBackoff } from "~/libs/calculateExponentialBackoff";
 import type { QueueName } from "~/libs/tasks/queueName.ts";
-import type { QueueBody } from "~/libs/tasks/queueTask";
+import {
+  MAX_QUEUE_DELAY_SECONDS,
+  type QueueBody,
+} from "~/libs/tasks/queueTask";
+import { maybeUpdateLastConnectedAt } from "~/middleware/maybeUpdateLastConnectedAt";
 
 export const app = new OpenAPIHono<{ Bindings: Env }>();
 
@@ -79,6 +82,7 @@ export default {
         case "ANILIST_UPDATES":
           const anilistUpdateBody =
             message.body as QueueBody["ANILIST_UPDATES"];
+          console.log("queue run", message.body);
           switch (anilistUpdateBody.updateType) {
             case AnilistUpdateType.UpdateWatchStatus:
               if (!anilistUpdateBody[AnilistUpdateType.UpdateWatchStatus]) {
@@ -117,9 +121,20 @@ export default {
     });
   },
   async scheduled(event, env, ctx) {
+    switch (event.cron) {
+      case "0 */12 * * *":
         const { processDelayedTasks } =
           await import("~/libs/tasks/processDelayedTasks");
         await processDelayedTasks(env);
+        break;
+      case "0 18 * * *":
+        const { checkUpcomingTitles } =
+          await import("~/controllers/internal/upcoming-titles");
+        await checkUpcomingTitles();
+        break;
+      default:
+        throw new Error(`Unhandled cron: ${event.cron}`);
+    }
   },
 } satisfies ExportedHandler<Env>;
 
@@ -146,11 +161,14 @@ function onMessageQueue<QN extends QueueName>(
       );
       console.error(error);
       message.retry({
-        delaySeconds: calculateExponentialBackoff({
+        delaySeconds: Math.min(
+          calculateExponentialBackoff({
             attempt: message.attempts,
             baseMin: retryDelayConfig[messageBatch.queue as QN]?.min,
             absCap: retryDelayConfig[messageBatch.queue as QN]?.max,
           }),
+          MAX_QUEUE_DELAY_SECONDS,
+        ),
       });
     }
   }

src/libs/anilist/anilist-do.ts

@@ -1,5 +1,7 @@
+import type { TypedDocumentNode } from "@graphql-typed-document-node/core";
 import { DurableObject } from "cloudflare:workers";
 import { print } from "graphql";
+import { DateTime } from "luxon";
 import { z } from "zod";
 
 import {
@@ -7,6 +9,7 @@ import {
   GetNextEpisodeAiringAtQuery,
   GetPopularTitlesQuery,
   GetTitleQuery,
+  GetTitleUserDataQuery,
   GetTrendingTitlesQuery,
   GetUpcomingTitlesQuery,
   GetUserProfileQuery,
@@ -17,12 +20,13 @@ import {
   SearchQuery,
 } from "~/libs/anilist/queries";
 import { sleep } from "~/libs/sleep.ts";
+import type { Title } from "~/types/title";
 
 const nextAiringEpisodeSchema = z.nullable(
   z.object({
-    episode: z.number().int(),
+    episode: z.int(),
-    airingAt: z.number().int(),
+    airingAt: z.int(),
-    timeUntilAiring: z.number().int(),
+    timeUntilAiring: z.int(),
   }),
 );
 
@@ -37,30 +41,54 @@ export class AnilistDurableObject extends DurableObject {
     return new Response("Not found", { status: 404 });
   }
 
-  async getTitle(id: number, token?: string) {
+  async getTitle(
-    return this.handleCachedRequest(
+    id: number,
+    userId?: number,
+    token?: string,
+  ): Promise<Title | null> {
+    const promises: Promise<any>[] = [
+      this.handleCachedRequest(
         `title:${id}`,
         async () => {
-        const anilistResponse = await this.fetchFromAnilist(
+          const anilistResponse = await this.fetchFromAnilist(GetTitleQuery, {
-          GetTitleQuery,
+            id,
-          { id },
+          });
-          token,
-        );
           return anilistResponse?.Media ?? null;
         },
         (media) => {
           if (!media) return undefined;
+
           // Cast to any to access fragment fields without unmasking
           const nextAiringEpisode = nextAiringEpisodeSchema.parse(
             (media as any)?.nextAiringEpisode,
           );
-        const airingAt = (nextAiringEpisode?.airingAt ?? 0) * 1000;
+          return nextAiringEpisode?.airingAt
-        if (airingAt) {
+            ? DateTime.fromMillis(nextAiringEpisode?.airingAt)
-          return airingAt - Date.now();
+            : undefined;
-        }
-        return undefined;
         },
+      ),
+    ];
+    promises.push(
+      userId
+        ? this.handleCachedRequest(
+            `title:${id}:${userId}`,
+            async () => {
+              const anilistResponse = await this.fetchFromAnilist(
+                GetTitleUserDataQuery,
+                { id },
+                { token },
               );
+              return anilistResponse?.Media ?? null;
+            },
+            DateTime.now().plus({ days: 1 }),
+          )
+        : Promise.resolve({ mediaListEntry: null }),
+    );
+
+    return Promise.all(promises).then(([title, userTitle]) => ({
+      ...title,
+      ...userTitle,
+    }));
   }
 
   async getNextEpisodeAiringAt(id: number) {
@@ -72,7 +100,7 @@ export class AnilistDurableObject extends DurableObject {
         });
         return data?.Media;
       },
-      60 * 60 * 1000,
+      DateTime.now().plus({ hours: 1 }),
     );
   }
 
@@ -87,7 +115,7 @@ export class AnilistDurableObject extends DurableObject {
         });
         return data?.Page;
       },
-      60 * 60 * 1000,
+      DateTime.now().plus({ hours: 1 }),
     );
   }
 
@@ -100,8 +128,7 @@ export class AnilistDurableObject extends DurableObject {
   ) {
     return this.handleCachedRequest(
       `popular:${JSON.stringify({ season, seasonYear, nextSeason, nextYear, limit })}`,
-      async () => {
+      () => {
-        console.log(nextSeason, nextYear, print(BrowsePopularQuery));
         return this.fetchFromAnilist(BrowsePopularQuery, {
           season,
           seasonYear,
@@ -110,21 +137,27 @@ export class AnilistDurableObject extends DurableObject {
           limit,
         });
       },
-      24 * 60 * 60 * 1000,
+      DateTime.now().plus({ days: 1 }),
     );
   }
 
-  async nextSeasonPopular(nextSeason: any, nextYear: number, limit: number) {
+  async nextSeasonPopular(
+    nextSeason: any,
+    nextYear: number,
+    page: number,
+    limit: number,
+  ) {
     return this.handleCachedRequest(
-      `next_season:${JSON.stringify({ nextSeason, nextYear, limit })}`,
+      `next_season:${JSON.stringify({ nextSeason, nextYear, page, limit })}`,
       async () => {
         return this.fetchFromAnilist(NextSeasonPopularQuery, {
           nextSeason,
           nextYear,
           limit,
-        });
+          page,
+        }).then((data) => data?.Page);
       },
-      24 * 60 * 60 * 1000,
+      DateTime.now().plus({ days: 1 }),
     );
   }
 
@@ -137,15 +170,14 @@ export class AnilistDurableObject extends DurableObject {
     return this.handleCachedRequest(
       `popular:${JSON.stringify({ page, limit, season, seasonYear })}`,
       async () => {
-        const data = await this.fetchFromAnilist(GetPopularTitlesQuery, {
+        return this.fetchFromAnilist(GetPopularTitlesQuery, {
           page,
           limit,
           season,
           seasonYear,
-        });
+        }).then((data) => data?.Page);
-        return data?.Page;
       },
-      24 * 60 * 60 * 1000,
+      DateTime.now().plus({ days: 1 }),
     );
   }
 
@@ -159,7 +191,7 @@ export class AnilistDurableObject extends DurableObject {
         });
         return data?.Page;
       },
-      24 * 60 * 60 * 1000,
+      DateTime.now().plus({ days: 1 }),
     );
   }
 
@@ -178,7 +210,7 @@ export class AnilistDurableObject extends DurableObject {
         });
         return data?.Page;
       },
-      24 * 60 * 60 * 1000,
+      DateTime.now().plus({ days: 1 }),
     );
   }
 
@@ -186,10 +218,10 @@ export class AnilistDurableObject extends DurableObject {
     return this.handleCachedRequest(
       `user:${token}`,
       async () => {
-        const data = await this.fetchFromAnilist(GetUserQuery, {}, token);
+        const data = await this.fetchFromAnilist(GetUserQuery, {}, { token });
         return data?.Viewer;
       },
-      60 * 60 * 24 * 30 * 1000,
+      DateTime.now().plus({ days: 30 }),
     );
   }
 
@@ -200,11 +232,11 @@ export class AnilistDurableObject extends DurableObject {
         const data = await this.fetchFromAnilist(
           GetUserProfileQuery,
           { token },
-          token,
+          { token },
         );
         return data?.Viewer;
       },
-      60 * 60 * 24 * 30 * 1000,
+      DateTime.now().plus({ days: 30 }),
     );
   }
 
@@ -216,7 +248,7 @@ export class AnilistDurableObject extends DurableObject {
     const data = await this.fetchFromAnilist(
       MarkEpisodeAsWatchedMutation,
       { titleId, episodeNumber },
-      token,
+      { token },
     );
     return data?.SaveMediaListEntry;
   }
@@ -225,7 +257,7 @@ export class AnilistDurableObject extends DurableObject {
     const data = await this.fetchFromAnilist(
       MarkTitleAsWatchedMutation,
       { titleId },
-      token,
+      { token },
     );
     return data?.SaveMediaListEntry;
   }
@@ -234,7 +266,7 @@ export class AnilistDurableObject extends DurableObject {
   async handleCachedRequest<T>(
     key: string,
     fetcher: () => Promise<T>,
-    ttl?: number | ((data: T) => number | undefined),
+    ttl?: DateTime | ((data: T) => DateTime | undefined),
   ) {
     const cache = await this.state.storage.get(key);
     console.debug(`Retrieving request ${key} from cache:`, cache != null);
@@ -246,9 +278,8 @@ export class AnilistDurableObject extends DurableObject {
     await this.state.storage.put(key, result);
 
     const calculatedTtl = typeof ttl === "function" ? ttl(result) : ttl;
-
+    if (calculatedTtl) {
-    if (calculatedTtl && calculatedTtl > 0) {
+      const alarmTime = calculatedTtl.toMillis();
-      const alarmTime = Date.now() + calculatedTtl;
       await this.state.storage.setAlarm(alarmTime);
       await this.state.storage.put(`alarm:${key}`, alarmTime);
     }
@@ -259,11 +290,13 @@ export class AnilistDurableObject extends DurableObject {
   async alarm() {
     const now = Date.now();
     const alarms = await this.state.storage.list({ prefix: "alarm:" });
+    console.debug(`Retrieved alarms from cache:`, Object.entries(alarms));
     for (const [key, ttl] of Object.entries(alarms)) {
       if (now >= ttl) {
         // The key in alarms is `alarm:${storageKey}`
         // We want to delete the storageKey
         const storageKey = key.replace("alarm:", "");
+        console.debug(`Deleting storage key ${storageKey} & alarm ${key}`);
         await this.state.storage.delete(storageKey);
         await this.state.storage.delete(key);
       }
@@ -271,10 +304,13 @@ export class AnilistDurableObject extends DurableObject {
   }
 
   async fetchFromAnilist<Result = any, Variables = any>(
-    queryString: string,
+    query: TypedDocumentNode<Result, Variables>,
     variables: Variables,
-    token?: string | undefined,
+    {
-  ): Promise<Result> {
+      token,
+      shouldRetryOnRateLimit = true,
+    }: { token?: string | undefined; shouldRetryOnRateLimit?: boolean } = {},
+  ): Promise<Result | undefined> {
     const headers: any = {
       "Content-Type": "application/json",
     };
@@ -285,7 +321,7 @@ export class AnilistDurableObject extends DurableObject {
 
     // Use the query passed in, or fallback if needed (though we expect it to be passed)
     // We print the query to string
-    // const queryString = print(query);
+    const queryString = print(query);
 
     const response = await fetch(`${this.env.PROXY_URL}/proxy`, {
       method: "POST",
@@ -304,14 +340,17 @@ export class AnilistDurableObject extends DurableObject {
     });
 
     // 1. Handle Rate Limiting (429)
-    if (response.status === 429) {
+    if (shouldRetryOnRateLimit && response.status === 429) {
       const retryAfter = await response
-        .json()
+        .json<{ headers: Record<string, string> }>()
         .then(({ headers }) => new Headers(headers).get("Retry-After"));
       console.log("429, retrying in", retryAfter);
 
       await sleep(Number(retryAfter || 1) * 1000); // specific fallback or ensure logic
-      return this.fetchFromAnilist(query, variables, token);
+      return this.fetchFromAnilist(query, variables, {
+        token,
+        shouldRetryOnRateLimit: false,
+      });
     }
 
     // 2. Handle HTTP Errors (like 404 or 500)

src/libs/anilist/getTitle.ts

@@ -5,6 +5,7 @@ import type { Title } from "~/types/title";
 
 export async function fetchTitleFromAnilist(
   id: number,
+  userId?: number | undefined,
   token?: string | undefined,
 ): Promise<Title | undefined> {
   if (useMockData()) {
@@ -17,8 +18,7 @@ export async function fetchTitleFromAnilist(
   );
   const stub = env.ANILIST_DO.get(durableObjectId);
 
-  const data = await stub.getTitle(id, token);
+  const data = await stub.getTitle(id, userId, token);
-
   if (!data) {
     return undefined;
   }

src/libs/anilist/queries.ts

@@ -14,6 +14,18 @@ export const GetTitleQuery = graphql(
   [MediaFragment],
 );
 
+export const GetTitleUserDataQuery = graphql(`
+  query GetTitleUserData($id: Int!) {
+    Media(id: $id) {
+      mediaListEntry {
+        id
+        progress
+        status
+      }
+    }
+  }
+`);
+
 export const SearchQuery = graphql(
   `
     query Search($query: String!, $page: Int!, $limit: Int!) {
@@ -247,8 +259,9 @@ export const NextSeasonPopularQuery = graphql(
       $nextSeason: MediaSeason
       $nextYear: Int
       $limit: Int!
+      $page: Int!
     ) {
-      Page(page: 1, perPage: $limit) {
+      Page(page: $page, perPage: $limit) {
         media(
           season: $nextSeason
           seasonYear: $nextYear

src/libs/gcloud/getAdminSdkCredentials.ts

@@ -3,11 +3,13 @@ import mapKeys from "lodash.mapkeys";
 
 import { Case, changeStringCase } from "../changeStringCase";
 
-export function getAdminSdkCredentials(env: Cloudflare.Env = cloudflareEnv) {
+export function getAdminSdkCredentials(
+  env: Cloudflare.Env = cloudflareEnv,
+): AdminSdkCredentials {
   return mapKeys(
     JSON.parse(env.ADMIN_SDK_JSON) as AdminSdkCredentials,
     (_, key) => changeStringCase(key, Case.snake_case, Case.camelCase),
-  );
+  ) satisfies AdminSdkCredentials;
 }
 
 export interface AdminSdkCredentials {

src/libs/tasks/processDelayedTasks.ts

@@ -2,7 +2,7 @@ import { DateTime } from "luxon";
 
 import type { DelayedTaskMetadata } from "./delayedTask";
 import { deserializeDelayedTask } from "./delayedTask";
-import { MAX_DELAY_SECONDS, queueTask } from "./queueTask";
+import { MAX_QUEUE_DELAY_SECONDS, queueTask } from "./queueTask";
 
 const RETRY_ALERT_THRESHOLD = 3;
 
@@ -27,7 +27,7 @@ export async function processDelayedTasks(env: Cloudflare.Env): Promise<void> {
   console.log(`Found ${keys.length} delayed tasks to check`);
 
   const currentTime = Math.floor(Date.now() / 1000);
-  const maxQueueTime = currentTime + MAX_DELAY_SECONDS;
+  const maxQueueTime = currentTime + MAX_QUEUE_DELAY_SECONDS;
 
   let processedCount = 0;
   let queuedCount = 0;

src/libs/tasks/queueTask.spec.ts

@@ -81,8 +81,8 @@ describe("queueTask - delayed task handling", () => {
     });
   });
 
-  describe("tasks with delay > 9 hours", () => {
+  describe("tasks with delay > 12 hours", () => {
-    it("stores task in KV when delay exceeds 9 hours", async () => {
+    it("stores task in KV when delay exceeds 12 hours", async () => {
       await queueTask(
         "NEW_EPISODE",
         { aniListId: 111, episodeNumber: 4 },
@@ -98,12 +98,12 @@ describe("queueTask - delayed task handling", () => {
       expect(queueSendSpy).not.toHaveBeenCalled();
     });
 
-    it("stores task in KV when delay is 9 hours + 1 second", async () => {
+    it("stores task in KV when delay is 12 hours + 1 second", async () => {
       await queueTask(
         "NEW_EPISODE",
         { aniListId: 222, episodeNumber: 5 },
         {
-          scheduleConfig: { delay: { hours: 9, seconds: 1 } },
+          scheduleConfig: { delay: { hours: 12, seconds: 1 } },
           env: mockEnv,
         },
       );
@@ -176,7 +176,7 @@ describe("queueTask - delayed task handling", () => {
   });
 
   describe("epoch time scheduling", () => {
-    it("queues directly when epoch time is within 9 hours", async () => {
+    it("queues directly when epoch time is within 12 hours", async () => {
       const futureTime = Math.floor(Date.now() / 1000) + 3600; // 1 hour from now
 
       await queueTask(
@@ -192,7 +192,7 @@ describe("queueTask - delayed task handling", () => {
       expect(kvPutSpy).not.toHaveBeenCalled();
     });
 
-    it("stores in KV when epoch time is beyond 9 hours", async () => {
+    it("stores in KV when epoch time is beyond 12 hours", async () => {
       const futureTime = Math.floor(Date.now() / 1000) + 24 * 3600; // 24 hours from now
 
       await queueTask(

src/libs/tasks/queueTask.ts

@@ -30,7 +30,7 @@ interface QueueTaskOptionalArgs {
   env?: Cloudflare.Env;
 }
 
-export const MAX_DELAY_SECONDS = Duration.fromObject({ hours: 9 }).as(
+export const MAX_QUEUE_DELAY_SECONDS = Duration.fromObject({ hours: 12 }).as(
   "seconds",
 );
 
@@ -46,8 +46,8 @@ export async function queueTask(
     req?.header(),
   );
 
-  // If delay exceeds 9 hours, store in KV for later processing
+  // If delay exceeds 12 hours, store in KV for later processing
-  if (scheduleTime > MAX_DELAY_SECONDS) {
+  if (scheduleTime > MAX_QUEUE_DELAY_SECONDS) {
     if (!env || !env.DELAYED_TASKS) {
       throw new Error("DELAYED_TASKS KV namespace not available");
     }
@@ -79,7 +79,18 @@ export async function queueTask(
   // Otherwise, queue directly
   const contentType =
     headers["Content-Type"] === "application/json" ? "json" : "text";
-  if (!env) {
+  if (env) {
+    console.debug(
+      `Queueing task in queue ${queueName}: ${JSON.stringify(body)}`,
+    );
+    await env[queueName].send(
+      { body, headers },
+      {
+        contentType,
+        delaySeconds: scheduleTime,
+      },
+    );
+  } else {
     const Cloudflare = await import("cloudflare").then(
       ({ Cloudflare }) => Cloudflare,
     );
@@ -103,14 +114,6 @@ export async function queueTask(
       delay_seconds: scheduleTime,
       account_id: env.CLOUDFLARE_ACCOUNT_ID,
     });
-  } else {
-    await env[queueName].send(
-      { body, headers },
-      {
-        contentType,
-        delaySeconds: scheduleTime,
-      },
-    );
   }
 }
 function buildTask(
@@ -122,6 +125,7 @@ function buildTask(
   let scheduleTime: number = 0;
   if (scheduleConfig) {
     const { delay, epochTime } = scheduleConfig;
+    console.log("scheduleConfig", scheduleConfig);
     if (epochTime) {
       console.log("epochTime", epochTime);
       scheduleTime = DateTime.fromSeconds(epochTime)
@@ -132,7 +136,9 @@ function buildTask(
       scheduleTime = Duration.fromDurationLike(delay).as("second");
     }
   }
-  const authorizationHeader = headers?.["X-Anilist-Token"] ? { Authorization: `Bearer ${headers["X-Anilist-Token"]}` } : {};
+  const authorizationHeader = headers?.["X-Anilist-Token"]
+    ? { Authorization: `Bearer ${headers["X-Anilist-Token"]}` }
+    : {};
 
   switch (queueName) {
     case "ANILIST_UPDATES":

src/middleware/userProfile.ts

@@ -0,0 +1,25 @@
+import { createMiddleware } from "hono/factory";
+
+import type { User } from "~/types/user";
+
+export const userProfileMiddleware = createMiddleware<
+  Cloudflare.Env & {
+    Variables: {
+      user: User;
+    };
+    Bindings: Env;
+  }
+>(async (c, next) => {
+  const aniListToken = await c.req.header("X-AniList-Token");
+  if (!aniListToken) {
+    return next();
+  }
+
+  const user = await c.env.ANILIST_DO.getByName("GLOBAL").getUser(aniListToken);
+  if (!user) {
+    return c.json({ error: "User not found" }, 401);
+  }
+
+  c.set("user", user);
+  return next();
+});

src/types/episode/fetch-url-response.ts

@@ -9,7 +9,7 @@ export const FetchUrlResponseSchema = z.object({
   audio: z.array(z.object({ url: z.string(), lang: z.string() })),
   intro: SkippableSchema,
   outro: SkippableSchema,
-  headers: z.record(z.string()).optional(),
+  headers: z.record(z.string(), z.string()).optional(),
 });
 
 export type FetchUrlResponse = z.infer<typeof FetchUrlResponse> & {

src/types/episode/index.ts

@@ -9,8 +9,8 @@ export const Episode = z.object({
   title: z.string().nullish(),
   img: z.string().nullish(),
   description: z.string().nullish(),
-  rating: z.number().int().nullish(),
+  rating: z.int().nullish(),
-  updatedAt: z.number().int().default(0).openapi({ format: "int64" }),
+  updatedAt: z.int().prefault(0).openapi({ format: "int64" }),
 });
 
 export type EpisodesResponse = z.infer<typeof EpisodesResponse>;

src/types/schema.ts

@@ -24,9 +24,9 @@ export const ErrorResponseSchema = z.object({
   success: z.literal(false).openapi({ type: "boolean" }),
 });
 
-export const NullableNumberSchema = z.number().int().nullable();
+export const NullableNumberSchema = z.int().nullable();
 
-export const AniListIdSchema = z.number().int().openapi({ format: "int64" });
+export const AniListIdSchema = z.int().openapi({ format: "int64" });
 export const AniListIdQuerySchema = z
   .string()
   .openapi({ type: "integer", format: "int64" });

src/types/title/index.ts

@@ -8,17 +8,17 @@ export type Title = z.infer<typeof Title>;
 export const Title = z.object({
   nextAiringEpisode: z.nullable(
     z.object({
-      episode: z.number().int(),
+      episode: z.int(),
-      airingAt: z.number().int().openapi({ format: "int64" }),
+      airingAt: z.int().openapi({ format: "int64" }),
-      timeUntilAiring: z.number().int().openapi({ format: "int64" }),
+      timeUntilAiring: z.int().openapi({ format: "int64" }),
     }),
   ),
   mediaListEntry: z.nullable(
     z.object({
       status: z.nullable(WatchStatus),
       progress: NullableNumberSchema,
-      id: z.number().int(),
+      id: z.int(),
-      updatedAt: z.number().int().openapi({ format: "int64" }).optional(),
+      updatedAt: z.int().openapi({ format: "int64" }).optional(),
     }),
   ),
   countryOfOrigin: countryCodeSchema,
@@ -50,5 +50,5 @@ export const Title = z.object({
     }),
   ),
   idMal: NullableNumberSchema,
-  id: z.number().int().openapi({ format: "int64" }),
+  id: z.int().openapi({ format: "int64" }),
 });

src/types/title/mediaFragment.ts

@@ -21,11 +21,6 @@ export const MediaFragment = graphql(`
       medium
     }
     countryOfOrigin
-    mediaListEntry {
-      id
-      progress
-      status
-    }
     nextAiringEpisode {
       timeUntilAiring
       airingAt

src/types/user.ts

@@ -3,12 +3,18 @@ import { z } from "zod";
 export type User = z.infer<typeof User>;
 export const User = z
   .object({
+    id: z.number().openapi({ type: "integer", format: "int64" }),
+    name: z.string(),
+  })
+  .optional()
+  .nullable();
+
+export type UserProfile = z.infer<typeof UserProfile>;
+export const UserProfile = z.object({
   statistics: z.object({
     minutesWatched: z.number().openapi({ type: "integer", format: "int64" }),
     episodesWatched: z.number().openapi({ type: "integer", format: "int64" }),
-      count: z
+    count: z.int(),
-        .number()
-        .int() /* .openapi({ type: "integer", format: "int64" }) */,
     meanScore: z.number().openapi({ type: "number", format: "float" }),
   }),
   id: z.number().openapi({ type: "integer", format: "int64" }),
@@ -17,6 +23,4 @@ export const User = z
     medium: z.string(),
     large: z.string(),
   }),
-  })
+});
-  .optional()
-  .nullable();

wrangler.toml

@@ -67,7 +67,7 @@ id = "c8db249d8ee7462b91f9c374321776e4"
 preview_id = "ff38240eb2aa4b1388c705f4974f5aec"
 
 [triggers]
-crons = ["0 */9 * * *"]
+crons = ["0 */12 * * *", "0 18 * * *"]
 
 [[d1_databases]]
 binding = "DB"