Merge branch 'master' into MZD-dev2

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

@@ -0,0 +1,66 @@
+name: ❗ Connector/Website not working
+description: Notify that a connector is not working
+title: "[<NameOfConnector>] Connector not working"
+labels: ["Website Change"]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this connector?
+      description: Do not create duplicate of an existing issue related to the connector
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: checkboxes
+    attributes:
+      label: Did you read the troubleshooting guide ?
+      description: Please check [the troubleshooting guide](https://hakuneko.download/docs/troubleshoot/) if your issue might not be related to some known cases.
+      options:
+        - label: I read it but nothing seems related
+          required: true
+  - type: checkboxes
+    attributes:
+      label: Is the website of the connector working properly ?
+      description: If the website isn't working, hakuneko will not solve the issue.
+      options:
+        - label: Yes i'm able to see the manga within my standard browser
+          required: true
+  - type: checkboxes
+    attributes:
+      label: Make sure to try Nightly Build
+      description: The [nightly build](https://github.com/manga-download/hakuneko/releases) contains latest fixes. Perhaps your problem is already solved.
+      options:
+        - label: Yes nightly build didn't fix the issue
+          required: true
+  - type: dropdown
+    attributes:
+      label: What kind of issue are you encountering
+      options:
+        - Manga list isn't refreshing
+        - Chapter list isn't refreshing
+        - Downloads aren't working
+        - Images are missing in the embeded viewer
+        - Other
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: To Reproduce
+      description: Steps to reproduce the behavior
+      value: |
+        1. Name of connector
+        2. Name of manga (if connector update is working)
+        3. Name of chapter (if manga update is working)
+        4. Copy any relevant error message that appears in a popup or (advanced) within the console (press F12)
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        **Screenshots**
+        If complex to describe, add screenshots to help explain your problem.

.github/workflows/ci-pr.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 20
       - name: Install NPM Packages
         run: npm install
       - name: Lint

.github/workflows/continuous-deployment.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 20
       - name: Install NPM Packages
         run: npm install
       - name: Lint

.github/workflows/continuous-integration.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Install NodeJS
         uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: 20
       - name: Install NPM Packages
         run: npm install
       - name: Lint

.gitignore

@@ -13,4 +13,5 @@ cache
 /redist/*.zip
 /test/*.log
 junit.xml
-.idea/
+.idea/
+.vs

package.json

@@ -17,7 +17,7 @@
     "asar": "latest",
     "discord-rpc": "latest",
     "electron": "8.3.4",
-    "eslint": "latest",
+    "eslint": "^8.57.0",
     "fs-extra": "latest",
     "innosetup-compiler": "latest",
     "jest": "latest",
@@ -35,7 +35,7 @@
     "start:build": "npm run build:web && electron . --update-url=DISABLED --cache-directory=./build/latest",
     "lint": "npm run lint:app && npm run lint:web",
     "lint:app": "eslint ./src/app --ignore-path .gitignore",
-    "lint:web": "eslint ./src/web/mjs/**/*.mjs --ignore-path .gitignore --ignore-pattern Connectors.mjs",
+    "lint:web": "eslint ./src/web/mjs/**/*.mjs --ignore-path .gitignore --parser-options ecmaVersion:2020",
     "format": "npm run format:app && npm run format:web",
     "format:app": "npm run lint:app -- --fix",
     "format:web": "npm run lint:web -- --fix",

src/web/mjs/HakuNeko.mjs

@@ -8,6 +8,7 @@ import BookmarkManager from './engine/BookmarkManager.mjs';
 import ChaptermarkManager from './engine/ChaptermarkManager.mjs';
 import Connectors from './engine/Connectors.mjs';
 import DownloadManager from './engine/DownloadManager.mjs';
+import ComicInfoGenerator from './engine/ComicInfoGenerator.mjs';
 //import HistoryWorker from './engine/HistoryWorker.mjs'
 import Request from './engine/Request.mjs';
 import Settings from './engine/Settings.mjs';
@@ -32,6 +33,7 @@ export default class HakuNeko {
         this._connectors = new Connectors(ipc);
         this._storage = new Storage();
         this._bookmarkManager = new BookmarkManager(this._settings, new BookmarkImporter());
+        this._comicInfoGenerator = new ComicInfoGenerator();
         this._chaptermarkManager = new ChaptermarkManager(this._settings);
         this._discordPresence = new DiscordPresence(this._settings);
     }
@@ -63,6 +65,10 @@ export default class HakuNeko {
         return this._bookmarkManager;
     }
 
+    get ComicInfoGenerator() {
+        return this._comicInfoGenerator;
+    }
+
     get ChaptermarkManager() {
         return this._chaptermarkManager;
     }

src/web/mjs/connectors/AGS.mjs

@@ -0,0 +1,32 @@
+import WordPressMangastream from './templates/WordPressMangastream.mjs';
+
+export default class AGS extends WordPressMangastream {
+
+    constructor() {
+        super();
+        super.id = 'ags';
+        super.label = 'AGS (Animated Glitched Scans)';
+        this.tags = [ 'manga', 'english', 'scanlation' ];
+        this.url = 'https://agscomics.com';
+        this.path = '/series/?list';
+    }
+
+    get icon() {
+        return '/img/connectors/anigliscans';
+    }
+
+    async _getPages(chapter) {
+        const data = await super._getPages(chapter);
+        return data.map(element => this.createConnectorURI(element));
+    }
+
+    async _handleConnectorURI(payload) {
+        const request = new Request(payload, this.requestOptions);
+        request.headers.set('x-referer', this.url);
+        let response = await fetch(request);
+        let data = await response.blob();
+        data = await this._blobToBuffer(data);
+        this._applyRealMime(data);
+        return data;
+    }
+}

src/web/mjs/connectors/Agitoon.mjs

@@ -0,0 +1,115 @@
+import Connector from '../engine/Connector.mjs';
+import Manga from '../engine/Manga.mjs';
+
+export default class Agitoon extends Connector {
+
+    constructor() {
+        super();
+        super.id = 'agitoon';
+        super.label = 'Agitoon';
+        this.tags = [ 'webtoon', 'korean' ];
+        this.url = 'https://agit185.com';
+        this.cdns = [];
+        this.img_per = [];
+
+    }
+
+    async _initializeConnector() {
+        await this._getNeededValues();
+    }
+
+    async _getNeededValues() {
+        const uri = new URL(`/data/azitoon.js?v=${Math.random()}`, this.url);
+        const request = new Request(uri, this.requestOptions);
+        request.headers.set('x-referer', this.url);
+        let response = await fetch(request);
+        response = await response.text();
+
+        let matches = undefined;
+        const imgRgx = /var img_domain\d?\s*=\s*"([\S]+)";/g;
+        this.cdns = [];
+        // eslint-disable-next-line no-cond-assign
+        while (matches = imgRgx.exec(response)) {
+            this.cdns.push(matches[1]);
+        }
+
+        const img_perRgx = /var img_per\d?\s*=\s*"([\S]+)";/g;
+        this.img_per = [];
+        // eslint-disable-next-line no-cond-assign
+        while (matches= img_perRgx.exec(response)) {
+            this.img_per.push(parseInt(matches[1]));
+        }
+    }
+
+    //CDN is calculated from CHAPTER ID
+    _getMangaCDN(chapterid) { //adapted from chapter html page script "show_content_img"
+        if(chapterid % 100< this.img_per[1]) {
+            return this.cdns[1];
+        } else if(chapterid % 100<this.img_per[1]+this.img_per[2]) {
+            return this.cdns[2];
+        } else if(chapterid % 100<this.img_per[1]+this.img_per[2] + this.img_per[3]) {
+            return this.cdns[3];
+        } else if(chapterid % 100<this.img_per[1]+this.img_per[2] + this.img_per[3] + this.img_per[4]) {
+            return this.cdns[4];
+        } else{
+            return this.cdns[0];
+        }
+
+    }
+
+    async _getMangaFromURI(uri) {
+        let request = new Request(uri, this.requestOptions);
+        let data = await this.fetchDOM(request, 'title');
+        let id = uri.pathname.match(/\/azi_toon\/(\d+)\.html/)[1];
+        let title = data[0].text.split(' - ')[1].trim();
+        return new Manga(this, id, title);
+    }
+
+    async _getMangas() {
+        const paths = ['/data/azi_webtoon_0.js?v=_', '/data/azi_webtoon_1.js?v=_'];
+        const mangalist = [];
+        for (const path of paths) {
+            mangalist.push(... await this._fetchJSONMangas(path));
+        }
+        return mangalist;
+
+    }
+
+    async _fetchJSONMangas(path) {
+        const request = new Request(new URL(path, this.url));
+        request.headers.set('x-referer', this.url);
+        let response = await fetch(request);
+        response = await response.text();
+        const data = JSON.parse(response.match(/var data\d{1}\s*=\s*([\W\S]+);/)[1]);
+        return data.map(element => {
+            return {
+                id: element.x,
+                title: element.t.trim()
+            };
+        });
+    }
+    async _getChapters(manga) {
+        const uri = new URL(`/data/toonlist/${manga.id}.js?v=${Math.random()}`, this.url);
+        const request = new Request(uri, this.requestOptions );
+        request.headers.set('x-referer', this.url);
+        let response = await fetch(request);
+        response = await response.text();
+        const data = JSON.parse(response.match(/var clist\s*=\s*([\W\S]+);/)[1]);
+        return data.map(element => {
+            return {
+                id: element.u,
+                title: element.t.replace(manga.title, '').replace('- ', '').trim(),
+            };
+        });
+    }
+
+    async _getPages(chapter) {
+        const chapterid = chapter.id.match(/\/(\d+)\.html/)[1];
+        const mangadomain = this._getMangaCDN(chapterid);
+        const uri = new URL(chapter.id, this.url);
+        const request = new Request(uri, this.requestOptions );
+        const data = await this.fetchDOM(request, 'div#toon_content_imgs source');
+        return data.map(link => this.getAbsolutePath(link.getAttribute('o_src'), mangadomain));
+    }
+
+}

src/web/mjs/connectors/Alceascan.mjs

@@ -0,0 +1,13 @@
+import WordPressMangastream from './templates/WordPressMangastream.mjs';
+
+export default class Alceascan extends WordPressMangastream {
+
+    constructor() {
+        super();
+        super.id = 'alceascan';
+        super.label = 'Alceascan';
+        this.tags = ['manga', 'indonesian', 'scanlation'];
+        this.url = 'https://alceascan.my.id';
+        this.path = '/manga/list-mode/';
+    }
+}