Merge nightly stable

.github/ISSUE_TEMPLATE/1-connector-website-not-working.yml

@@ -3,6 +3,12 @@ description: Notify that a connector is not working
 title: "[<NameOfConnector>] Connector not working"
 labels: ["Website Change"]
 body:
+  - type: markdown
+    attributes:
+      value: |
+        > [!CAUTION]
+        > Do **NOT** report that **MangaLife** or **MangaSee** moved to **WeebCentral**, it will not be fixed!  
+        > See: [#7407](https://github.com/manga-download/hakuneko/issues/7407) for info.
   - type: checkboxes
     attributes:
       label: Is there an existing issue for this connector?

.github/ISSUE_TEMPLATE/2-suggest-a-new-connector-website.md

@@ -0,0 +1,30 @@
+---
+name: ✍ Suggest a new Connector/Website
+about: Want a new website to be added in hakuneko ?
+title: "[Site Request] thewebsitename"
+labels: Website Suggestion
+assignees: ''
+
+---
+
+> [!CAUTION]
+> Do **NOT** request **WeebCentral**, it will not be added!  
+> See: [#7407](https://github.com/manga-download/hakuneko/issues/7407) for info.
+
+**Name of the website**
+thewebsitename
+
+**Website urls (examples below)**
+- Site: https://thewebsiteurl/
+- Manga List: https://thewebsiteurl/mangalist.html
+- Manga example: https://thewebsiteurl/manga/themanganame.html
+- Chapter online viewer example: https://thewebsiteurl/manga/0012/view.html
+
+**Languages**
+List of languages supported by the website
+
+**Website relationship*
+If applicable describe the relation with any other website (eg : "alternative domain, copy of ...").
+
+**Additional details**
+Add any other context details that you may have found (like template to reuse)

src/web/mjs/connectors/AllHentai.mjs

@@ -8,9 +8,9 @@ export default class AllHentai extends Connector {
         super.id = 'allhentai';
         super.label = 'AllHentai';
         this.tags = ['hentai', 'russian'];
-        this.url = 'https://20.allhen.online';
+        this.url = 'https://z.ahen.me';
         this.links = {
-            login: 'https://20.allhen.online/internal/auth'
+            login: 'https://z.ahen.me/internal/auth'
         };
         this.config = {
             throttle: {

src/web/mjs/connectors/AresManga.mjs

@@ -7,7 +7,7 @@ export default class AresManga extends WordPressMangastream {
         super.id = 'aresmanga';
         super.label = 'Ares Manga';
         this.tags = ['webtoon', 'arabic'];
-        this.url = 'https://aresnov.org';
+        this.url = 'https://fl-ares.com';
         this.path = '/series/list-mode/';
     }
 }

src/web/mjs/connectors/BacaKomik.mjs

@@ -7,12 +7,12 @@ export default class BacaKomik extends WordPressMangastream {
         super.id = 'bacakomik';
         super.label = 'BacaKomik';
         this.tags = [ 'manga', 'indonesian' ];
-        this.url = 'https://bacakomik.co';
-        this.path = '/daftar-manga/?list';
+        this.url = 'https://bacakomik.one';
+        this.path = '/daftar-komik/?list';
 
         this.queryMangas = 'div.cpp div.daftarkartun div.jdlbar ul li a.tip';
         this.queryChapters = 'div.eps_lst ul li span.lchx a';
         this.queryChaptersTitle = undefined;
-        this.queryPages = 'div.chapter-area div.chapter-content div.chapter-image img';
+        this.queryPages = 'div#anjay_ini_id_kh img';
     }
-}
+}

src/web/mjs/connectors/BacaMangaOrg.mjs

@@ -7,7 +7,7 @@ export default class BacaMangaOrg extends WordPressMangastream {
         super.id = 'bacamangaorg';
         super.label = 'MangaTale';
         this.tags = ['manga', 'webtoon', 'indonesian'];
-        this.url = 'https://mangatale.co';
+        this.url = 'https://mangatale.id';
         this.path = '/manga/list-mode/';
     }
 }

src/web/mjs/connectors/ComicBoost.mjs

@@ -139,7 +139,7 @@ export default class ComicBoost extends Connector {
                         if (fileinfos.BlockHeight) //if we have a block size for the page, its a puzzle !
                         {
                             mode = 'puzzle';
-                            blocks = window.NFBR.a6G.a5x.prototype.g8w(fPage, fPage.width, fPage.height)
+                            blocks = window.NFBR.a6G.a5x.prototype.C5X(fPage, fPage.width, fPage.height)
                         }
                    
                         return {

src/web/mjs/connectors/CuuTruyen.mjs

@@ -0,0 +1,135 @@
+import Connector from '../engine/Connector.mjs';
+import Manga from '../engine/Manga.mjs';
+
+export default class CuuTruyen extends Connector {
+    constructor() {
+        super();
+        super.id = 'cuutruyen';
+        super.label = 'Cứu Truyện';
+        this.tags = ['manga', 'vietnamese'];
+        this.url = 'https://cuutruyen.net';
+    }
+
+    async _getMangaFromURI(uri) {
+        const mangaid = uri.href.match(/\/mangas\/([0-9]+)/)[1];
+        const req = new URL(`/api/v2/mangas/${mangaid}`, this.url);
+        const request = new Request(req, this.requestOptions);
+        const { data: { name } } = await this.fetchJSON(request);
+        return new Manga(this, mangaid, name.trim());
+    }
+
+    async _getMangas() {
+        const uri = new URL('/api/v2/mangas/recently_updated?page=1&per_page=30', this.url);
+        const request = new Request(uri, this.requestOptions);
+        const data = await this.fetchJSON(request);
+        const pages = data._metadata.total_pages;
+
+        const mangaList = this._getMangasFromPage(data);
+
+        for (let page = 2; page <= pages; page++) {
+            const uri = new URL(`/api/v2/mangas/recently_updated?page=${page}&per_page=30`, this.url);
+            const request = new Request(uri, this.requestOptions);
+            const data = await this.fetchJSON(request);
+            const mangas = this._getMangasFromPage(data);
+            mangaList.push(...mangas);
+        }
+        return mangaList;
+    }
+
+    _getMangasFromPage(data) {
+        return data.data.map((c) => ({
+            id: c.id,
+            title: c.name.trim(),
+        }));
+    }
+
+    async _getChapters(manga) {
+        const uri = new URL(`/api/v2/mangas/${manga.id}/chapters`, this.url);
+        const request = new Request(uri, this.requestOptions);
+        const { data } = await this.fetchJSON(request);
+        return data
+            .filter((chapter) => chapter.status === 'processed')
+            .map((chapter) => {
+                let title = `Chapter ${chapter.number}`;
+
+                if (chapter.name) {
+                    title += `: ${chapter.name}`;
+                }
+
+                return { id: chapter.id, title };
+            });
+    }
+
+    async _getPages(chapter) {
+        const uri = new URL('/api/v2/chapters/' + chapter.id, this.url);
+        const request = new Request(uri, this.requestOptions);
+        const { data: { pages } } = await this.fetchJSON(request);
+
+        if (pages.some((image) => image.status !== 'processed')) {
+            throw new Error('This chapter is still processing, please try again later.');
+        }
+
+        return pages.map((image) => {
+            return this.createConnectorURI({
+                url: image.image_url,
+                drmData: image.drm_data,
+            });
+        });
+    }
+
+    async _handleConnectorURI(payload) {
+        const response = await fetch(payload.url, {
+            cache: 'no-cache',
+            referrer: `${this.url}/`,
+            headers: {
+                'accept': 'image/avif,image/webp,image/png,image/svg+xml,image/*;q=0.8,*/*;q=0.5',
+            },
+        });
+
+        if (!payload.drmData) {
+            return this._blobToBuffer(await response.blob());
+        }
+
+        const decryptedDrmData = this.decodeXorCipher(atob(payload.drmData), '3141592653589793');
+
+        if (!decryptedDrmData.startsWith('#v4|')) {
+            throw new Error(`Invalid DRM data (does not start with magic bytes): ${decryptedDrmData}`);
+        }
+
+        const image = await createImageBitmap(await response.blob());
+        const canvas = document.createElement('canvas');
+
+        canvas.width = image.width;
+        canvas.height = image.height;
+
+        const ctx = canvas.getContext('2d');
+        let sy = 0;
+
+        for (const t of decryptedDrmData.split('|').slice(1)) {
+            const [dy, height] = t.split('-', 2).map(Number);
+
+            ctx.drawImage(image, 0, sy, image.width, height, 0, dy, image.width, height);
+            sy += height;
+        }
+
+        return this._blobToBuffer(await this._canvasToBlob(canvas));
+    }
+
+    _canvasToBlob(canvas) {
+        return new Promise(resolve => {
+            canvas.toBlob(data => {
+                resolve(data);
+            }, Engine.Settings.recompressionFormat.value, parseFloat(Engine.Settings.recompressionQuality.value) / 100);
+        });
+    }
+
+    decodeXorCipher(data, key) {
+        let output = "";
+
+        for (let i = 0; i < data.length; i++) {
+            output += String.fromCharCode(data.charCodeAt(i) ^ key.charCodeAt(i % key.length));
+        }
+
+        return output;
+    }
+}

src/web/mjs/connectors/Desu.mjs

@@ -8,7 +8,7 @@ export default class Desu extends Connector {
         super.id = 'desu';
         super.label = 'Desu';
         this.tags = ['manga', 'webtoon', 'russian'];
-        this.url = 'https://desu.me';
+        this.url = 'https://x.desu.win';
     }
 
     async _getMangaFromURI(uri) {
@@ -69,6 +69,16 @@ export default class Desu extends Connector {
         const uri = new URL(chapter.id, this.url);
         const request = new Request(uri, this.requestOptions);
         const pages = await Engine.Request.fetchUI(request, script);
-        return pages.map(element => this.getAbsolutePath(element.url, this.url));
+        return pages.map(element => this.createConnectorURI(this.getAbsolutePath(element.url, this.url)));
+    }
+
+    async _handleConnectorURI(payload) {
+        const request = new Request(payload, this.requestOptions);
+        request.headers.set('x-referer', this.url);
+        const response = await fetch(request);
+        let data = await response.blob();
+        data = await this._blobToBuffer(data);
+        this._applyRealMime(data);
+        return data;
     }
 }

src/web/mjs/connectors/ErosScans.mjs

@@ -0,0 +1,31 @@
+import WordPressMangastream from './templates/WordPressMangastream.mjs';
+
+export default class ErosScan extends WordPressMangastream {
+
+    constructor() {
+        super();
+        super.id = 'erosscans';
+        super.label = 'Eros Scan';
+        this.tags = ['webtoon', 'english'];
+        this.path = '/manga/list-mode/';
+        this.config = {
+            url: {
+                label: 'URL',
+                description: 'This website changes their URL regularly.\nThis is the last known URL which can also be manually set by the user.',
+                input: 'text',
+                value: 'https://doomcomic.xyz'
+            }
+        };
+    }
+
+    get url() {
+        return this.config.url.value;
+    }
+
+    set url(value) {
+        if (this.config && value) {
+            this.config.url.value = value;
+            Engine.Settings.save();
+        }
+    }
+}

src/web/mjs/connectors/Fbsquads.mjs

@@ -6,6 +6,6 @@ export default class Fbsquads extends WordPressMadara {
         super.id = 'fbsquads';
         super.label = 'Fleur Blanche Squads';
         this.tags = [ 'webtoon', 'spanish', 'scanlation', 'yaoi' ];
-        this.url = 'https://fbsscan.com';
+        this.url = 'https://fbsquadx.com';
     }
 }

src/web/mjs/connectors/FirstKiss.mjs

@@ -8,7 +8,7 @@ export default class FirstKiss extends Connector {
         super.id = 'firstkiss';
         super.label = 'LikeManga.io';
         this.tags = ['webtoon', 'english'];
-        this.url = 'https://likemanga.io';
+        this.url = 'https://likemanga.ink';
         this.requestOptions.headers.set('x-referer', this.url);
         this.requestOptions.headers.set('x-origin', this.url);
     }

src/web/mjs/connectors/GourmetScans.mjs

@@ -14,18 +14,29 @@ export default class GourmetScans extends WordPressMadara {
         const url = new URL(chapter.id, this.url);
         const request = new Request(url, this.requestOptions);
         const script = `
-            new Promise((resolve, reject) => {
-                try {
-                    let rocketscript = new RocketLazyLoadScripts;
-                    rocketscript._loadEverythingNow();
-                } catch (error) {}
-
-                setTimeout(() => {
-                    var imgdata = JSON.parse(CryptoJS.AES.decrypt(chapter_data, wpmangaprotectornonce, {
-                        format: CryptoJSAesJson
-                    }).toString(CryptoJS.enc.Utf8));
-                    resolve(JSON.parse(imgdata));
-                }, 2500);
+            new Promise( (resolve, reject) => {
+                const start = Date.now();
+                const interval = setInterval(function () {
+                    try {
+                        if (CryptoJS) {
+                            clearInterval(interval);
+                            let imgdata = JSON.parse(CryptoJS.AES.decrypt(chapter_data, wpmangaprotectornonce, {
+                                format: CryptoJSAesJson
+                            }).toString(CryptoJS.enc.Utf8));
+                            resolve(JSON.parse(imgdata));
+                        }
+                    } catch (error) {
+                        clearInterval(interval);
+                        reject(error);
+                    } finally {
+                        if(Date.now() - start > 10_000) {
+                            clearInterval(interval);
+                            reject(new Error('Unable to get pictures after more than 10 seconds !'));
+                        }
+                     }
+                }, 1000);
+               window.dispatchEvent(new KeyboardEvent('keydown'));
+
             });
         `;
         const data = await Engine.Request.fetchUI(request, script);

src/web/mjs/connectors/Hitomi.mjs

@@ -13,11 +13,21 @@ export default class Hitomi extends Connector {
     }
 
     async _getMangaFromURI(uri) {
-        let request = new Request(uri, this.requestOptions);
-        let data = await this.fetchDOM(request, 'div.gallery h1 a', 3);
-        let id = uri.pathname.match(/(\d+)\.html$/)[1];
-        let title = data[0].text.trim();
-        return new Manga(this, id, title);
+        const request = new Request(uri, this.requestOptions);
+        const script = `
+            new Promise((resolve, reject) => {
+                setTimeout(() => {
+                    try {
+                        resolve(galleryinfo.title);
+                    } catch(error) {
+                        reject(error);
+                    }
+                }, 1000);
+            });
+        `;
+        const title = await Engine.Request.fetchUI(request, script);
+        const id = uri.pathname.match(/(\d+)\.html$/)[1];
+        return new Manga(this, id, title.trim());
     }
 
     async _getMangas() {
@@ -38,7 +48,7 @@ export default class Hitomi extends Connector {
             new Promise((resolve, reject) => {
                 setTimeout(() => {
                     try {
-                        let images = galleryinfo.files.map(info => url_from_url_from_hash(galleryinfo.id, info));
+                        let images = galleryinfo.files.map(image => url_from_url_from_hash(galleryinfo.id, image, 'webp', undefined, 'a'));
                         resolve(images);
                     } catch(error) {
                         reject(error);

src/web/mjs/connectors/HunterScan.mjs

@@ -7,6 +7,6 @@ export default class HunterScan extends WordPressMadara {
         super.id = 'hunterscan';
         super.label = 'Hunters Scan';
         this.tags = [ 'manga', 'webtoon', 'portuguese' ];
-        this.url = 'https://huntersscan.xyz/';
+        this.url = 'https://htoons.online';
     }
 }