diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Data/Manga/raw.ts | 82 | ||||
| -rw-r--r-- | src/lib/Media/Manga/chapters.ts | 57 |
2 files changed, 101 insertions, 38 deletions
diff --git a/src/lib/Data/Manga/raw.ts b/src/lib/Data/Manga/raw.ts index 3663c737..64ed3de4 100644 --- a/src/lib/Data/Manga/raw.ts +++ b/src/lib/Data/Manga/raw.ts @@ -6,41 +6,61 @@ interface Chapter { chapterDate: string; } +const RAWKUMA_ORIGIN = "https://rawkuma.net"; + +const fetchDocument = async (url: string, init?: RequestInit) => + new DOMParser().parseFromString( + await (await fetch(proxy(url, true), init)).text(), + "text/html", + ); + +const parseChapterNumber = (text: string | null | undefined) => { + if (!text) return undefined; + + const match = text.match(/Chapter\s+(\d+(?:\.\d+)?)/i); + + return match ? Number.parseFloat(match[1]) : undefined; +}; + export const getChapterCount = async ( nativeTitle: string, ): Promise<number | undefined> => { - const html = new DOMParser().parseFromString( - await ( - await fetch( - proxy(`https://rawkuma.com/?s=${encodeURIComponent(nativeTitle)}`), - ) - ).text(), - "text/html", + const nonceDocument = await fetchDocument( + `${RAWKUMA_ORIGIN}/wp-admin/admin-ajax.php?type=search_form&action=get_nonce`, + ); + const nonce = nonceDocument + .querySelector("input[name='search_nonce']") + ?.getAttribute("value"); + + if (!nonce) return undefined; + + const searchDocument = await fetchDocument( + `${RAWKUMA_ORIGIN}/wp-admin/admin-ajax.php?nonce=${encodeURIComponent( + nonce, + )}&action=search`, + { + method: "POST", + headers: { + "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", + }, + body: new URLSearchParams({ + query: nativeTitle, + }), + }, ); - const listContent = html.querySelector(".listupd"); - - if ( - listContent && - listContent.textContent && - listContent.textContent.includes("Not Found") - ) { - return undefined; - } - - const chapterCount = html.querySelector(".epxs"); - - if ( - chapterCount && - chapterCount.textContent && - chapterCount.textContent.includes("Chapter") - ) { - return Number.parseInt( - chapterCount.textContent.replace("Chapter", "").trim(), - 10, - ); - } - - return undefined; + const mangaUrl = searchDocument + .querySelector("#searchResults a[href*='/manga/']") + ?.getAttribute("href"); + + if (!mangaUrl) return undefined; + + const mangaDocument = await fetchDocument(mangaUrl); + const chapters = [...mangaDocument.querySelectorAll("a[href*='/chapter-']")] + .map((anchor) => parseChapterNumber(anchor.textContent)) + .filter((value): value is number => value !== undefined) + .sort((left, right) => right - left); + + return chapters[0]; }; export const getChaptersFromText = (text: string) => { diff --git a/src/lib/Media/Manga/chapters.ts b/src/lib/Media/Manga/chapters.ts index 473a3ed4..04b147b0 100644 --- a/src/lib/Media/Manga/chapters.ts +++ b/src/lib/Media/Manga/chapters.ts @@ -1,6 +1,5 @@ import { env } from "$env/dynamic/public"; import { type Media, recentMediaActivities } from "$lib/Data/AniList/media"; -import { getChapterCount } from "$lib/Data/Manga/raw"; import { proxyRoute } from "$lib/Utility/proxy"; import settings from "$stores/settings"; import type { UserIdentity } from "../../Data/AniList/identity"; @@ -17,6 +16,14 @@ interface MangaDexChapterCountsResponse { retryAfterMs?: number; } +interface NativeChapterCount { + chapter: number | null; +} + +interface NativeChapterCountsResponse { + data?: Record<string, NativeChapterCount>; +} + const chapterMemoryCache = new Map<number, number | null>(); const MAX_PENDING_RETRIES = 2; const DEFAULT_PENDING_RETRY_MS = 750; @@ -182,6 +189,36 @@ const fetchMangaChapterCounts = async (manga: Media[]) => { return { data, rateLimited: rateLimited && !successfulResponse }; }; +const fetchNativeChapterCounts = async (manga: Media[]) => { + const data: Record<string, NativeChapterCount> = {}; + + for (let index = 0; index < manga.length; index += 100) { + const chunk = manga.slice(index, index + 100); + const response = await fetch(proxyRoute("/manga/native-chapter-counts"), { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify({ + manga: chunk.map((entry) => ({ + anilistId: entry.id, + nativeTitle: entry.title.native, + englishTitle: entry.title.english, + romajiTitle: entry.title.romaji, + })), + }), + }).catch(() => null); + + if (!response?.ok) continue; + + const payload = (await response.json()) as NativeChapterCountsResponse; + + Object.assign(data, payload.data || {}); + } + + return data; +}; + export const hydrateChapterCounts = async ( identity: UserIdentity, manga: Media[], @@ -191,6 +228,7 @@ export const hydrateChapterCounts = async ( (entry, index, array) => array.findIndex((candidate) => candidate.id === entry.id) === index, ); + const nativeCountManga: Media[] = []; const unresolvedManga: Media[] = []; for (const entry of uniqueManga) { @@ -203,12 +241,7 @@ export const hydrateChapterCounts = async ( } if (settings.get().calculatePreferNativeChapterCount) { - const nativeCount = (await getChapterCount(entry.title.native)) || 0; - - await writeCachedChapterCount( - entry.id, - nativeCount === 0 ? null : nativeCount, - ); + nativeCountManga.push(entry); continue; } @@ -216,6 +249,16 @@ export const hydrateChapterCounts = async ( unresolvedManga.push(entry); } + if (nativeCountManga.length) { + const nativeCounts = await fetchNativeChapterCounts(nativeCountManga); + + for (const entry of nativeCountManga) { + const nativeCount = nativeCounts[String(entry.id)]?.chapter ?? null; + + await writeCachedChapterCount(entry.id, nativeCount); + } + } + if (!unresolvedManga.length) return { rateLimited: false }; const { data, rateLimited } = await fetchMangaChapterCounts(unresolvedManga); |