Add FlatManga decorator and websites

web/src/engine/transformers/BookmarkConverter.ts

@@ -25,9 +25,11 @@ export const legacyWebsiteIdentifierMap = new Map([
     [ 'gateanimemanga', 'gatemanga' ],
     [ 'imperioscans', 'neroxus' ],
     [ 'instamanhwa', 'xmanhwa' ],
+    [ 'kissaway', 'klmanga' ],
     [ 'kisscomic', 'readcomiconline' ],
     [ 'komikav', 'apkomik' ],
     [ 'kumascans', 'retsu' ],
+    [ 'lovehug', 'welovemanga' ],
     [ 'lyrascans', 'quantumscans' ],
     [ 'mangamx', 'mangaoni' ],
     [ 'manganel', 'manganato' ],

web/src/engine/transformers/BookmarkConverter_test.ts

@@ -27,9 +27,11 @@ const legacyWebsiteIdentifierMapTestCases = [
     { sourceID: 'gateanimemanga', targetID: 'gatemanga' },
     { sourceID: 'imperioscans', targetID: 'neroxus' },
     { sourceID: 'instamanhwa', targetID: 'xmanhwa' },
+    { sourceID: 'kissaway', targetID: 'klmanga' },
     { sourceID: 'kisscomic', targetID: 'readcomiconline' },
     { sourceID: 'komikav', targetID: 'apkomik' },
     { sourceID: 'kumascans', targetID: 'retsu' },
+    { sourceID: 'lovehug', targetID: 'welovemanga' },
     { sourceID: 'lyrascans', targetID: 'quantumscans' },
     { sourceID: 'mangamx', targetID: 'mangaoni' },
     { sourceID: 'manganel', targetID: 'manganato' },

web/src/engine/websites/KLManga.ts

@@ -0,0 +1,28 @@
+import { Tags } from '../Tags';
+import icon from './KLManga.webp';
+import { DecoratableMangaScraper } from '../providers/MangaPlugin';
+import * as Common from './decorators/Common';
+import * as FlatManga from './decorators/FlatManga';
+
+function GenerateRandomEndPoint(length: number, suffix: string): string {
+    const r = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    let randomEndpoint = '';
+    for (let o = 0; o < length; o++) randomEndpoint += r.charAt(Math.floor(Math.random() * r.length));
+    return randomEndpoint + suffix;
+}
+
+@Common.MangaCSS(/^{origin}\/[^/]+\.html$/, FlatManga.queryMangaTitle, FlatManga.MangaLabelExtractor)
+@Common.MangasSinglePagesCSS([FlatManga.pathSinglePageManga], FlatManga.queryMangas, FlatManga.MangaExtractor)
+@FlatManga.ChaptersSinglePageAJAX(GenerateRandomEndPoint(25, '.lstc?slug='), 'dataL', 'a.chapter[title]')
+@FlatManga.PagesSinglePageAJAX(GenerateRandomEndPoint(30, '.iog?cid='), 'img.chapter-img[alt*="Page"]', [/olimposcan/])
+@Common.ImageAjax()
+export default class extends DecoratableMangaScraper {
+
+    public constructor() {
+        super('klmanga', `KLManga`, 'https://klz9.com', Tags.Language.Japanese, Tags.Media.Manga, Tags.Source.Aggregator);
+    }
+
+    public override get Icon() {
+        return icon;
+    }
+}

web/src/engine/websites/KLManga_e2e.ts

@@ -0,0 +1,24 @@
+import { TestFixture, type Config } from '../../../test/WebsitesFixture';
+
+const config: Config = {
+    plugin: {
+        id: 'klmanga',
+        title: 'KLManga'
+    },
+    container: {
+        url: 'https://klz9.com/ybed-isekai-koushoku-musou-roku-isekai-tensei-no-chie-to-chikara-wo-tada-hitasura-xxxx-suru-tame-ni-tsukau.html',
+        id: '/ybed-isekai-koushoku-musou-roku-isekai-tensei-no-chie-to-chikara-wo-tada-hitasura-xxxx-suru-tame-ni-tsukau.html',
+        title: 'Isekai Koushoku Musou Roku - Isekai Tensei No Chie To Chikara Wo, Tada Hitasura Xxxx Suru Tame Ni Tsukau'
+    },
+    child: {
+        id: '/jxsh-isekai-koushoku-musou-roku-isekai-tensei-no-chie-to-chikara-wo-tada-hitasura-xxxx-suru-tame-ni-tsukau-chapter-16.html',
+        title: 'Chapter 16'
+    },
+    entry: {
+        index: 0,
+        size: 494_933,
+        type: 'image/jpeg'
+    }
+};
+
+new TestFixture(config).AssertWebsite();

web/src/engine/websites/MangaGun.ts

@@ -0,0 +1,21 @@
+import { Tags } from '../Tags';
+import icon from './MangaGun.webp';
+import { DecoratableMangaScraper } from '../providers/MangaPlugin';
+import * as Common from './decorators/Common';
+import * as FlatManga from './decorators/FlatManga';
+
+@Common.MangaCSS(/^{origin}\/manga-[^/]+\.html$/, FlatManga.queryMangaTitle, FlatManga.MangaLabelExtractor)
+@Common.MangasMultiPageCSS(FlatManga.pathMultiPageManga, FlatManga.queryMangas, 1, 1, 0, FlatManga.MangaExtractor)
+@FlatManga.ChaptersSinglePageAJAX('/app/manga/controllers/cont.Listchapter.php?slug=', 'sLugs')
+@FlatManga.PagesSinglePageAJAX('/app/manga/controllers/cont.Showimage.php?cid=')
+@Common.ImageAjax()
+export default class extends DecoratableMangaScraper {
+
+    public constructor() {
+        super('mangagun', `MangaGun`, 'https://mangagun.net', Tags.Language.English, Tags.Media.Manga, Tags.Media.Manhua, Tags.Media.Manhwa, Tags.Source.Aggregator);
+    }
+
+    public override get Icon() {
+        return icon;
+    }
+}

web/src/engine/websites/MangaGun_e2e.ts

@@ -0,0 +1,24 @@
+import { TestFixture } from '../../../test/WebsitesFixture';
+
+const config = {
+    plugin: {
+        id: 'mangagun',
+        title: 'MangaGun'
+    },
+    container: {
+        url: 'https://mangagun.net/manga-oshi-no-ko-raw.html',
+        id: '/manga-oshi-no-ko-raw.html',
+        title: 'OSHI NO KO'
+    },
+    child: {
+        id: '/read-oshi-no-ko-raw-chapter-146.html',
+        title: 'Chapter 146'
+    },
+    entry: {
+        index: 0,
+        size: 297_654,
+        type: 'image/jpeg',
+    }
+};
+
+new TestFixture(config).AssertWebsite();

web/src/engine/websites/MangaTR.ts

@@ -0,0 +1,59 @@
+import { Tags } from '../Tags';
+import icon from './MangaTR.webp';
+import { Chapter, DecoratableMangaScraper, type MangaPlugin, type Manga } from '../providers/MangaPlugin';
+import { FetchCSS, FetchWindowScript } from '../platform/FetchProvider';
+import * as Common from './decorators/Common';
+import * as FlatManga from './decorators/FlatManga';
+
+function MangaLabelExtractor(element: HTMLTitleElement) {
+    return element.text.split(' - ')[0].trim();
+}
+
+@Common.MangaCSS(/^{origin}\/manga-[^/]+\.html$/, 'body title', MangaLabelExtractor)
+@FlatManga.PagesSinglePageCSS('img.chapter-img')
+@Common.ImageAjax()
+export default class extends DecoratableMangaScraper {
+    public constructor() {
+        super('mangatr', `Manga-TR`, 'https://manga-tr.com', Tags.Language.Turkish, Tags.Media.Manga, Tags.Source.Aggregator);
+    }
+    public override get Icon() {
+        return icon;
+    }
+
+    public override async Initialize(): Promise<void> {
+        const request = new Request(new URL('/manga-list.html', this.URI));
+        return FetchWindowScript(request, `window.cookieStore.set('read_type', '1')`, 0, 30000);
+    }
+
+    public override async FetchMangas(provider: MangaPlugin): Promise<Manga[]> {
+        return (await Common.FetchMangasSinglePagesCSS.call(this, provider, ['/manga-list.html'], FlatManga.queryMangas)).filter(manga => manga.Title);
+    }
+
+    public override async FetchChapters(manga: Manga): Promise<Chapter[]> {
+        const chapterList = [];
+        for (let page = 1, run = true; run; page++) {
+            const chapters = await this.GetChaptersFromPage(manga, page);
+            chapters.length > 0 ? chapterList.push(...chapters) : run = false;
+        }
+        return chapterList;
+    }
+    private async GetChaptersFromPage(manga: Manga, page: number): Promise<Chapter[]>{
+        const mangaSlug = manga.Identifier.match(/manga-([^/]+)\.html/)[1];
+        const url = new URL(`/cek/fetch_pages_manga.php?manga_cek=${mangaSlug}`, this.URI);
+        const request = new Request(url, {
+            method: 'POST',
+            body: 'page=' + page,
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'x-requested-with': 'XMLHttpRequest'
+            }
+        });
+
+        const data = await FetchCSS<HTMLAnchorElement>(request, 'table.table tr td.table-bordered:first-of-type > a');
+        return data.map(chapter => {
+            const title = FlatManga.CleanTitle(chapter.text.replace(manga.Title, '')) || chapter.text.trim();
+            return new Chapter(this, manga, chapter.pathname, title);
+        });
+    }
+
+}

web/src/engine/websites/MangaTR_e2e.ts

@@ -0,0 +1,24 @@
+import { TestFixture } from '../../../test/WebsitesFixture';
+
+const config = {
+    plugin: {
+        id: 'mangatr',
+        title: 'Manga-TR'
+    },
+    container: {
+        url: 'https://manga-tr.com/manga-mairimashita-iruma-kun.html',
+        id: '/manga-mairimashita-iruma-kun.html',
+        title: 'Mairimashita! Iruma-kun'
+    },
+    child: {
+        id: '/id-153837-read-mairimashita-iruma-kun-chapter-174.html',
+        title: '174'
+    },
+    entry: {
+        index: 1,
+        size: 342_746,
+        type: 'image/webp'
+    }
+};
+
+new TestFixture(config).AssertWebsite();

web/src/engine/websites/NicoManga.ts

@@ -0,0 +1,52 @@
+import { Tags } from '../Tags';
+import icon from './NicoManga.webp';
+import { DecoratableMangaScraper, Manga, type MangaPlugin } from '../providers/MangaPlugin';
+import * as Common from './decorators/Common';
+import * as FlatManga from './decorators/FlatManga';
+import { FetchJSON } from '../platform/FetchProvider';
+
+type APIMangas = {
+    manga_list: {
+        name: string,
+        slug: string
+    }[],
+    lang: {
+        manga_slug: string
+    }
+
+}
+
+@Common.MangaCSS(/^{origin}\/manga[^/]+\.html$/, FlatManga.queryMangaTitle)
+@FlatManga.ChaptersSinglePageAJAX('/app/manga/controllers/cont.Listchapterapi.php?slug=', 'sLugs', 'ul > a', Common.AnchorInfoExtractor(true))
+@FlatManga.PagesSinglePageAJAX('/app/manga/controllers/cont.imgsList.php?cid=', 'img.chapter-img:not([alt*="nicoscan"])')
+@Common.ImageAjax()
+export default class extends DecoratableMangaScraper {
+
+    public constructor() {
+        super('nicomanga', `NicoManga`, 'https://nicomanga.com', Tags.Language.Japanese, Tags.Media.Manga, Tags.Source.Aggregator);
+    }
+
+    public override get Icon() {
+        return icon;
+    }
+
+    public override async FetchMangas(provider: MangaPlugin): Promise<Manga[]> {
+        const mangaList: Manga[] = [];
+        for (let page = 1, run = true; run; page++) {
+            const mangas = await this.GetMangasFromPageAJAX(provider, page);
+            mangaList.isMissingLastItemFrom(mangas) ? mangaList.push(...mangas) : run = false;
+        }
+        return mangaList.distinct();
+    }
+    private async GetMangasFromPageAJAX(provider: MangaPlugin, page: number): Promise<Manga[]> {
+        const request = new Request(new URL(`/app/manga/controllers/cont.display.homeTopday.php?page=${page}`, this.URI), {
+            headers: {
+                'Referer': new URL('/manga-list.html', this.URI.origin).href,
+                'X-Requested-With': 'XMLHttpRequest'
+            }
+        });
+        const { manga_list, lang: { manga_slug } } = await FetchJSON<APIMangas>(request);
+        return manga_list.map(manga => new Manga(this, provider, `/${manga_slug}-${manga.slug}.html`, FlatManga.CleanTitle(manga.name.trim())));
+    }
+
+}

web/src/engine/websites/NicoManga_e2e.ts

@@ -0,0 +1,25 @@
+import { TestFixture } from '../../../test/WebsitesFixture';
+
+const config = {
+    plugin: {
+        id: 'nicomanga',
+        title: 'NicoManga'
+    },
+    container: {
+        url: 'https://nicomanga.com/manga-kage-no-jitsuryokusha-ni-naritakute-raw.html',
+        id: '/manga-kage-no-jitsuryokusha-ni-naritakute-raw.html',
+        title: 'TO BE A POWER IN THE SHADOWS! (MANGA)'
+    },
+    child: {
+        id: '/read-kage-no-jitsuryokusha-ni-naritakute-raw-chapter-60.2.html',
+        title: 'Chapter 60.2',
+        timeout: 15000
+    },
+    entry: {
+        index: 0,
+        size: 708_342,
+        type: 'image/jpeg'
+    }
+};
+
+new TestFixture(config).AssertWebsite();

web/src/engine/websites/OlimpoScans.ts

@@ -0,0 +1,30 @@
+import { Tags } from '../Tags';
+import icon from './OlimpoScans.webp';
+import { type Chapter, DecoratableMangaScraper, Page } from '../providers/MangaPlugin';
+import * as Common from './decorators/Common';
+import * as FlatManga from './decorators/FlatManga';
+
+@Common.MangaCSS(/^{origin}\/[^/]+\.html$/, FlatManga.queryMangaTitle, FlatManga.MangaLabelExtractor)
+@Common.MangasMultiPageCSS(FlatManga.pathMultiPageManga, FlatManga.queryMangas, 1, 1, 0, FlatManga.MangaExtractor)
+@Common.ChaptersSinglePageCSS(FlatManga.queryChapters, FlatManga.ChapterExtractor)
+@Common.ImageAjax()
+export default class extends DecoratableMangaScraper {
+    public constructor() {
+        super('olimposcans', `OlimpoScans`, 'https://leerolimpo.com', Tags.Media.Manga, Tags.Media.Manhua, Tags.Media.Manhwa, Tags.Language.Spanish, Tags.Source.Scanlator);
+    }
+
+    public override get Icon() {
+        return icon;
+    }
+
+    public override async FetchPages(chapter: Chapter): Promise<Page[]> {
+        const pages = await FlatManga.FetchPagesSinglePageCSS.call(this, chapter);
+        return pages.map(page => new Page(this, chapter, this.StripSearch(page.Link)));
+    }
+
+    StripSearch(link: URL): URL {
+        link.pathname = link.pathname.replace(/&.*/g, '');
+        return link;
+
+    }
+}

web/src/engine/websites/OlimpoScans_e2e.ts

@@ -0,0 +1,24 @@
+import { TestFixture } from '../../../test/WebsitesFixture';
+
+const config = {
+    plugin: {
+        id: 'olimposcans',
+        title: 'OlimpoScans'
+    },
+    container: {
+        url: 'https://leerolimpo.com/comic-bjorn-el-barbaro.html',
+        id: '/comic-bjorn-el-barbaro.html',
+        title: 'BJORN EL BARBARO'
+    },
+    child: {
+        id: '/leer-bjorn-el-barbaro-capitulo-50.html',
+        title: 'Capítulo 50',
+    },
+    entry: {
+        index: 1,
+        size: 273_422,
+        type: 'image/webp'
+    }
+};
+
+new TestFixture(config).AssertWebsite();

web/src/engine/websites/RawInu.ts

@@ -0,0 +1,25 @@
+import { Tags } from '../Tags';
+import icon from './RawInu.webp';
+import { DecoratableMangaScraper } from '../providers/MangaPlugin';
+import * as Common from './decorators/Common';
+import * as FlatManga from './decorators/FlatManga';
+import { FetchWindowScript } from '../platform/FetchProvider';
+
+@Common.MangaCSS(/^{origin}\/[^.]+\.html$/, 'li.breadcrumb-item.active', FlatManga.MangaLabelExtractor)
+@Common.MangasMultiPageCSS(FlatManga.pathMultiPageManga, FlatManga.queryMangas, 1, 1, 0, FlatManga.MangaExtractor)
+@FlatManga.ChaptersSinglePageAJAX('/app/manga/controllers/cont.Listchapter.php?slug=', 'sLugs')
+@FlatManga.PagesSinglePageAJAX('/app/manga/controllers/cont.imagesChap.php?cid=')
+@Common.ImageAjax()
+export default class extends DecoratableMangaScraper {
+    public constructor() {
+        super('rawinu', `RawInu`, 'https://rawinu.com', Tags.Media.Manga, Tags.Language.Japanese, Tags.Source.Aggregator);
+    }
+
+    public override get Icon() {
+        return icon;
+    }
+
+    public override async Initialize(): Promise<void> {
+        return await FetchWindowScript(new Request(new URL('/manga-list.html', this.URI)), 'true', 3000, 15000);//trigger antiDDOSS
+    }
+}