Compare commits

...

11 Commits

22 changed files with 233 additions and 124 deletions

View File

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

View File

@@ -31,6 +31,7 @@
}, },
"devDependencies": { "devDependencies": {
"@cloudflare/vitest-pool-workers": "^0.10.15", "@cloudflare/vitest-pool-workers": "^0.10.15",
"@graphql-typed-document-node/core": "^3.2.0",
"@trivago/prettier-plugin-sort-imports": "^4.3.0", "@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/lodash.mapkeys": "^4.6.9", "@types/lodash.mapkeys": "^4.6.9",
"@types/luxon": "^3.6.2", "@types/luxon": "^3.6.2",

3
pnpm-lock.yaml generated
View File

@@ -47,6 +47,9 @@ importers:
"@cloudflare/vitest-pool-workers": "@cloudflare/vitest-pool-workers":
specifier: ^0.10.15 specifier: ^0.10.15
version: 0.10.15(@vitest/runner@3.2.4)(@vitest/snapshot@3.2.4)(vitest@3.2.4) 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": "@trivago/prettier-plugin-sort-imports":
specifier: ^4.3.0 specifier: ^4.3.0
version: 4.3.0(prettier@3.7.4) version: 4.3.0(prettier@3.7.4)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -2,7 +2,7 @@ import { DateTime } from "luxon";
import type { DelayedTaskMetadata } from "./delayedTask"; import type { DelayedTaskMetadata } from "./delayedTask";
import { deserializeDelayedTask } 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; 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`); console.log(`Found ${keys.length} delayed tasks to check`);
const currentTime = Math.floor(Date.now() / 1000); const currentTime = Math.floor(Date.now() / 1000);
const maxQueueTime = currentTime + MAX_DELAY_SECONDS; const maxQueueTime = currentTime + MAX_QUEUE_DELAY_SECONDS;
let processedCount = 0; let processedCount = 0;
let queuedCount = 0; let queuedCount = 0;

View File

@@ -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( await queueTask(
"NEW_EPISODE", "NEW_EPISODE",
{ aniListId: 111, episodeNumber: 4 }, { aniListId: 111, episodeNumber: 4 },
@@ -98,12 +98,12 @@ describe("queueTask - delayed task handling", () => {
expect(queueSendSpy).not.toHaveBeenCalled(); 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( await queueTask(
"NEW_EPISODE", "NEW_EPISODE",
{ aniListId: 222, episodeNumber: 5 }, { aniListId: 222, episodeNumber: 5 },
{ {
scheduleConfig: { delay: { hours: 9, seconds: 1 } }, scheduleConfig: { delay: { hours: 12, seconds: 1 } },
env: mockEnv, env: mockEnv,
}, },
); );
@@ -176,7 +176,7 @@ describe("queueTask - delayed task handling", () => {
}); });
describe("epoch time scheduling", () => { 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 const futureTime = Math.floor(Date.now() / 1000) + 3600; // 1 hour from now
await queueTask( await queueTask(
@@ -192,7 +192,7 @@ describe("queueTask - delayed task handling", () => {
expect(kvPutSpy).not.toHaveBeenCalled(); 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 const futureTime = Math.floor(Date.now() / 1000) + 24 * 3600; // 24 hours from now
await queueTask( await queueTask(

View File

@@ -30,7 +30,7 @@ interface QueueTaskOptionalArgs {
env?: Cloudflare.Env; 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", "seconds",
); );
@@ -46,8 +46,8 @@ export async function queueTask(
req?.header(), 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) { if (!env || !env.DELAYED_TASKS) {
throw new Error("DELAYED_TASKS KV namespace not available"); throw new Error("DELAYED_TASKS KV namespace not available");
} }
@@ -132,7 +132,9 @@ function buildTask(
scheduleTime = Duration.fromDurationLike(delay).as("second"); 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) { switch (queueName) {
case "ANILIST_UPDATES": case "ANILIST_UPDATES":

View File

@@ -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();
});

View File

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

View File

@@ -3,20 +3,24 @@ import { z } from "zod";
export type User = z.infer<typeof User>; export type User = z.infer<typeof User>;
export const User = z export const User = z
.object({ .object({
statistics: z.object({
minutesWatched: z.number().openapi({ type: "integer", format: "int64" }),
episodesWatched: z.number().openapi({ type: "integer", format: "int64" }),
count: z
.number()
.int() /* .openapi({ type: "integer", format: "int64" }) */,
meanScore: z.number().openapi({ type: "number", format: "float" }),
}),
id: z.number().openapi({ type: "integer", format: "int64" }), id: z.number().openapi({ type: "integer", format: "int64" }),
name: z.string(), name: z.string(),
avatar: z.object({
medium: z.string(),
large: z.string(),
}),
}) })
.optional() .optional()
.nullable(); .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.number().int(),
meanScore: z.number().openapi({ type: "number", format: "float" }),
}),
id: z.number().openapi({ type: "integer", format: "int64" }),
name: z.string(),
avatar: z.object({
medium: z.string(),
large: z.string(),
}),
});

View File

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