feat: removed cache

Author: Catta1997

src/generic/main.ts

@@ -24,9 +24,8 @@ import { Forms } from "./forms";
 import type { MangaMetadata, WindowEntry } from "./models";
 import { MainInterceptor, Requests } from "./network";
 import { Parsers } from "./parsers";
-import { Cache, FilterPreferences, JsonParser, Tags, Type } from "./utils";
+import { FilterPreferences, JsonParser, Tags, Type } from "./utils";
 
-export const cache = new Cache();
 export const filter = new FilterPreferences();
 export const tags = new Tags();
 export const types = new Type();
@@ -165,10 +164,8 @@ export abstract class MangaWorldGeneric
     }
 
     async getMangaDetails(mangaId: string): Promise<SourceManga> {
-        const data = cache.getPageCache(
-            mangaId,
+        const data = this.requestManager.fetchPage(
             `${this.base_url}/manga/${mangaId}`,
-            this,
         );
         const html = Application.arrayBufferToUTF8String(await data);
         const windowEntry = jsonParser.getWindowEntry(html);
@@ -181,22 +178,17 @@ export abstract class MangaWorldGeneric
     }
 
     async getChapters(sourceManga: SourceManga): Promise<Chapter[]> {
-        const data = cache.getPageCache(
-            sourceManga.mangaId,
+        const data = this.requestManager.fetchPage(
             `${this.base_url}/manga/${sourceManga.mangaId}`,
-            this,
-            15,
         );
         const html = Application.arrayBufferToUTF8String(await data);
         const windowEntry = jsonParser.getWindowEntry(html);
         return this.parser.parseChapters(windowEntry, sourceManga);
     }
 
     async getChapterDetails(chapter: Chapter): Promise<ChapterDetails> {
-        const data = cache.getPageCache(
-            chapter.sourceManga.mangaId,
+        const data = this.requestManager.fetchPage(
             `${this.base_url}/manga/${chapter.sourceManga.mangaId}`,
-            this,
         );
         const html = Application.arrayBufferToUTF8String(await data);
         const windowEntry = jsonParser.getWindowEntry(html);
@@ -351,7 +343,7 @@ export abstract class MangaWorldGeneric
         metadata: MangaMetadata,
     ): Promise<PagedResults<DiscoverSectionItem>> {
         const html = Application.arrayBufferToUTF8String(
-            await cache.getPageCache("home", this.base_url, this),
+            await this.requestManager.fetchPage(this.base_url),
         );
         const windowEntry = jsonParser.getWindowEntry(html);
         return await this.getSection(section.id, windowEntry, metadata);

src/generic/network.ts

@@ -6,7 +6,7 @@ import {
     type SearchQuery,
     type SortingOption,
 } from "@paperback/types";
-import { cache, filter, MangaWorldGeneric } from "./main";
+import { filter, MangaWorldGeneric } from "./main";
 
 export class Requests {
     constructSearchRequestURL(
@@ -70,11 +70,7 @@ export class Requests {
 
     async parseFilters(source: MangaWorldGeneric) {
         return Application.arrayBufferToUTF8String(
-            await cache.getPageCache(
-                "Filter",
-                `${source.base_url}/archive`,
-                source,
-            ),
+            await source.requestManager.fetchPage(`${source.base_url}/archive`),
         );
     }
 
@@ -97,10 +93,8 @@ export class Requests {
             html = Application.arrayBufferToUTF8String(data);
         } else {
             html = Application.arrayBufferToUTF8String(
-                await cache.getPageCache(
-                    `LastMangaAddedTagsSection-${tags}`,
+                await source.requestManager.fetchPage(
                     `${source.base_url}/archive?sort=newest&page=${page}&genre=${tags}`,
-                    source,
                 ),
             );
         }
@@ -119,10 +113,8 @@ export class Requests {
             html = Application.arrayBufferToUTF8String(data);
         } else {
             html = Application.arrayBufferToUTF8String(
-                await cache.getPageCache(
-                    "PopularSection",
+                await source.requestManager.fetchPage(
                     `${source.base_url}/archive?sort=most_read&page=${page}`,
-                    source,
                 ),
             );
         }

src/generic/parsers.ts

@@ -9,14 +9,7 @@ import {
     type SourceManga,
     type TagSection,
 } from "@paperback/types";
-import {
-    cache,
-    filter,
-    jsonParser,
-    MangaWorldGeneric,
-    tags,
-    types,
-} from "./main";
+import { filter, jsonParser, MangaWorldGeneric, tags, types } from "./main";
 import type {
     Manga,
     MangaChapterList,
@@ -432,7 +425,7 @@ export class Parsers {
         const updates: ChapterUpdatesCarouselItem[] = [];
         if (page == 1) {
             html = Application.arrayBufferToUTF8String(
-                await cache.getPageCache("home", source.base_url, source),
+                await source.requestManager.fetchPage(source.base_url),
             );
         } else {
             const data = (

src/generic/utils.ts

@@ -2,7 +2,6 @@ import { ContentRating, type Tag } from "@paperback/types";
 import * as cheerio from "cheerio";
 import { jsonParser, MangaWorldGeneric } from "./main";
 import type {
-    CacheItem,
     ChapterList,
     Genre,
     GlobalData,
@@ -18,46 +17,6 @@ import type {
     WindowEntry,
 } from "./models";
 
-const cacheMap = new Map<string, CacheItem>();
-const requestMap = new Map<string, Promise<ArrayBuffer>>();
-
-export class Cache {
-    async getPageCache(
-        name: string,
-        url: string,
-        source: MangaWorldGeneric,
-        cacheTime: number = 10,
-    ): Promise<ArrayBuffer> {
-        const cached = cacheMap.get(name);
-        if (cached && cached.expires > Math.floor(Date.now() / 1000)) {
-            return cached.data;
-        }
-
-        // If a request is already in progress for this name, return that promise
-        if (requestMap.has(name)) {
-            return requestMap.get(name)!;
-        }
-
-        const fetchPromise = source.requestManager
-            .fetchPage(url)
-            .then((data) => {
-                cacheMap.set(name, {
-                    expires: Math.floor(Date.now() / 1000) + cacheTime,
-                    data: data,
-                });
-                requestMap.delete(name);
-                return data;
-            })
-            .catch((error) => {
-                requestMap.delete(name);
-                throw error;
-            });
-
-        requestMap.set(name, fetchPromise);
-        return fetchPromise;
-    }
-}
-
 export class Tags {
     /**
      * Check Excluded tags