-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Delitoon : move code to template DelitoonBase (#860)
- Loading branch information
Showing
10 changed files
with
170 additions
and
153 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,149 +1,14 @@ | ||
| import { Tags } from '../Tags'; | ||
| import icon from './Delitoon.webp'; | ||
| import { Chapter, DecoratableMangaScraper, Manga, Page, type MangaPlugin } from '../providers/MangaPlugin'; | ||
| import * as Common from './decorators/Common'; | ||
| import { FetchJSON } from '../platform/FetchProvider'; | ||
| import { Exception } from '../Error'; | ||
| import { WebsiteResourceKey as R } from '../../i18n/ILocale'; | ||
| import { DelitoonBase } from './templates/DelitoonBase'; | ||
|
|
||
| export type APIResult<T> = { | ||
| result: string, | ||
| error?: { | ||
| code: string | ||
| } | ||
| data: T | ||
| } | ||
|
|
||
| export type APIManga = { | ||
| id: number, | ||
| alias: string, | ||
| title: string | ||
| episodes: APIChapter[] | ||
| } | ||
|
|
||
| type APIChapter = { | ||
| id: string, | ||
| alias: string, | ||
| title: string, | ||
| subTitle: string | ||
| } | ||
|
|
||
| export type APIPages = { | ||
| images: { | ||
| imagePath: string | ||
| }[] | ||
| } | ||
|
|
||
| type APIUser = { | ||
| user?: { | ||
| accessToken: APIToken, | ||
| }, | ||
| }; | ||
|
|
||
| type APIToken = { | ||
| token: string, | ||
| expiredAt: number, | ||
| }; | ||
|
|
||
| @Common.ImageAjax(true) | ||
| export default class extends DecoratableMangaScraper { | ||
| private readonly Platform: string = 'WEB'; | ||
| private authorization: APIToken = undefined; | ||
| protected readonly apiUrl = new URL('/api/balcony-api-v2/', this.URI); | ||
| protected BalconyID: string = 'DELITOON_COM'; | ||
|
|
||
| public constructor(id = 'delitoon', label = 'Delitoon', url = 'https://www.delitoon.com', tags = [Tags.Media.Manhwa, Tags.Language.French, Tags.Source.Official]) { | ||
| super(id, label, url, ...tags); | ||
| export default class extends DelitoonBase { | ||
| public constructor() { | ||
| super('delitoon', 'Delitoon', 'https://www.delitoon.com', [Tags.Media.Manhwa, Tags.Language.French, Tags.Source.Official]); | ||
|
|
||
| } | ||
|
|
||
| public override get Icon() { | ||
| return icon; | ||
| } | ||
|
|
||
| public override ValidateMangaURL(url: string): boolean { | ||
| return new RegExpSafe(`^${this.URI.origin}/detail/[^/]+$`).test(url); | ||
| } | ||
|
|
||
| public override async FetchManga(provider: MangaPlugin, url: string): Promise<Manga> { | ||
| const mangaid = new URL(url).href.match(/\/detail\/([^/]+)/)[1]; | ||
| const endpointUrl = new URL(`contents/${mangaid}`, this.apiUrl); | ||
| endpointUrl.searchParams.set('isNotLoginAdult', 'true'); | ||
| const { data } = await FetchJSON<APIResult<APIManga>>(this.CreateRequest(endpointUrl)); | ||
| return new Manga(this, provider, mangaid, data.title.trim()); | ||
| } | ||
|
|
||
| public override async FetchMangas(provider: MangaPlugin): Promise<Manga[]> { | ||
| const url = new URL('contents/search', this.apiUrl); | ||
| const promises = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('').map(character => { | ||
| url.search = new URLSearchParams({ | ||
| searchText: character, | ||
| isCheckDevice: 'true', | ||
| isIncludeAdult: 'true', | ||
| contentsThumbnailType: 'MAIN' | ||
| }).toString(); | ||
|
|
||
| return FetchJSON<APIResult<APIManga[]>>(this.CreateRequest(url)); | ||
| }); | ||
|
|
||
| const results = (await Promise.all(promises)).reduce((accumulator: Manga[], element) => { | ||
| const mangas = element.data.map(element => new Manga(this, provider, element.alias, element.title.trim())); | ||
| accumulator.push(...mangas); | ||
| return accumulator; | ||
| }, []); | ||
|
|
||
| return results.distinct(); | ||
| } | ||
|
|
||
| public override async FetchChapters(manga: Manga): Promise<Chapter[]> { | ||
| await this.UpdateToken(); | ||
| const url = new URL(`contents/${manga.Identifier}`, this.apiUrl); | ||
| url.searchParams.set('isNotLoginAdult', 'true'); | ||
| const { data } = await FetchJSON<APIResult<APIManga>>(this.CreateRequest(url)); | ||
| return data.episodes.map(element => { | ||
| let title = element.title.trim(); | ||
| title += element.subTitle ? ' : ' + element.subTitle.trim() : ''; | ||
| return new Chapter(this, manga, element.alias, title); | ||
| }); | ||
| } | ||
|
|
||
| public override async FetchPages(chapter: Chapter): Promise<Page[]> { | ||
| await this.UpdateToken(); | ||
| const url = new URL(`contents/viewer/${chapter.Parent.Identifier}/${chapter.Identifier}`, this.apiUrl); | ||
| url.searchParams.set('isNotLoginAdult', 'true'); | ||
| const { result, error, data } = await FetchJSON<APIResult<APIPages>>(this.CreateRequest(url)); | ||
| if (result == 'ERROR') { | ||
| switch (error.code) { | ||
| case 'NOT_LOGIN_USER': | ||
| case 'UNAUTHORIZED_CONTENTS': | ||
| throw new Exception(R.Plugin_Common_Chapter_UnavailableError); | ||
| } | ||
| } | ||
| return data.images.map(element => new Page(this, chapter, new URL(element.imagePath))); | ||
| } | ||
|
|
||
| protected CreateRequest(url: URL, includeAuthorization = true, body: string = undefined): Request { | ||
| const request = new Request(url, { | ||
| method: body? 'POST':'GET', | ||
| headers: { | ||
| 'Referer': this.URI.origin, | ||
| 'X-Balcony-Id': this.BalconyID, | ||
| 'X-Platform': this.Platform, | ||
| 'Content-type': body ? 'application/json' : undefined | ||
| }, | ||
| body: body | ||
| }); | ||
| if (this.authorization && includeAuthorization) { | ||
| request.headers.set('authorization', ' Bearer ' + this.authorization.token); | ||
| } | ||
| return request; | ||
| } | ||
|
|
||
| protected async UpdateToken() { | ||
| if (!this.authorization || this.authorization.expiredAt < Date.now()) { | ||
| const url = new URL('/api/auth/session', this.URI); | ||
| const { user } = await FetchJSON<APIUser>(this.CreateRequest(url, false)); | ||
| this.authorization = user?.accessToken; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| import { Chapter, DecoratableMangaScraper, Manga, Page, type MangaPlugin } from '../../providers/MangaPlugin'; | ||
| import * as Common from '../decorators/Common'; | ||
| import { FetchJSON } from '../../platform/FetchProvider'; | ||
| import { Exception } from '../../Error'; | ||
| import { WebsiteResourceKey as R } from '../../../i18n/ILocale'; | ||
| import type { Tag } from '../../Tags'; | ||
|
|
||
| export type APIResult<T> = { | ||
| result: string, | ||
| error?: { | ||
| code: string | ||
| } | ||
| data: T | ||
| } | ||
|
|
||
| export type APIManga = {deli | ||
|
|
||
| id: number, | ||
| alias: string, | ||
| title: string | ||
| episodes: APIChapter[] | ||
| } | ||
|
|
||
| type APIChapter = { | ||
| id: string, | ||
| alias: string, | ||
| title: string, | ||
| subTitle: string | ||
| } | ||
|
|
||
| export type APIPages = { | ||
| images: { | ||
| imagePath: string | ||
| }[] | ||
| } | ||
|
|
||
| type APIUser = { | ||
| user?: { | ||
| accessToken: APIToken, | ||
| }, | ||
| }; | ||
|
|
||
| type APIToken = { | ||
| token: string, | ||
| expiredAt: number, | ||
| }; | ||
|
|
||
| @Common.ImageAjax(true) | ||
| export class DelitoonBase extends DecoratableMangaScraper { | ||
| private readonly Platform: string = 'WEB'; | ||
| private authorization: APIToken = undefined; | ||
| protected readonly apiUrl = new URL('/api/balcony-api-v2/', this.URI); | ||
| protected BalconyID: string = 'DELITOON_COM'; | ||
|
|
||
| public constructor(id: string, label: string, url: string, tags: Tag[]) { | ||
| super(id, label, url, ...tags); | ||
| } | ||
|
|
||
| public override ValidateMangaURL(url: string): boolean { | ||
| return new RegExpSafe(`^${this.URI.origin}/detail/[^/]+$`).test(url); | ||
| } | ||
|
|
||
| public override async FetchManga(provider: MangaPlugin, url: string): Promise<Manga> { | ||
| const mangaid = new URL(url).href.match(/\/detail\/([^/]+)/)[1]; | ||
| const endpointUrl = new URL(`contents/${mangaid}`, this.apiUrl); | ||
| endpointUrl.searchParams.set('isNotLoginAdult', 'true'); | ||
| const { data } = await FetchJSON<APIResult<APIManga>>(this.CreateRequest(endpointUrl)); | ||
| return new Manga(this, provider, mangaid, data.title.trim()); | ||
| } | ||
|
|
||
| public override async FetchMangas(provider: MangaPlugin): Promise<Manga[]> { | ||
| const url = new URL('contents/search', this.apiUrl); | ||
| const promises = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('').map(character => { | ||
| url.search = new URLSearchParams({ | ||
| searchText: character, | ||
| isCheckDevice: 'true', | ||
| isIncludeAdult: 'true', | ||
| contentsThumbnailType: 'MAIN' | ||
| }).toString(); | ||
|
|
||
| return FetchJSON<APIResult<APIManga[]>>(this.CreateRequest(url)); | ||
| }); | ||
|
|
||
| const results = (await Promise.all(promises)).reduce((accumulator: Manga[], element) => { | ||
| const mangas = element.data.map(element => new Manga(this, provider, element.alias, element.title.trim())); | ||
| accumulator.push(...mangas); | ||
| return accumulator; | ||
| }, []); | ||
|
|
||
| return results.distinct(); | ||
| } | ||
|
|
||
| public override async FetchChapters(manga: Manga): Promise<Chapter[]> { | ||
| await this.UpdateToken(); | ||
| const url = new URL(`contents/${manga.Identifier}`, this.apiUrl); | ||
| url.searchParams.set('isNotLoginAdult', 'true'); | ||
| const { data } = await FetchJSON<APIResult<APIManga>>(this.CreateRequest(url)); | ||
| return data.episodes.map(element => { | ||
| let title = element.title.trim(); | ||
| title += element.subTitle ? ' : ' + element.subTitle.trim() : ''; | ||
| return new Chapter(this, manga, element.alias, title); | ||
| }); | ||
| } | ||
|
|
||
| public override async FetchPages(chapter: Chapter): Promise<Page[]> { | ||
| await this.UpdateToken(); | ||
| const url = new URL(`contents/viewer/${chapter.Parent.Identifier}/${chapter.Identifier}`, this.apiUrl); | ||
| url.searchParams.set('isNotLoginAdult', 'true'); | ||
| const { result, error, data } = await FetchJSON<APIResult<APIPages>>(this.CreateRequest(url)); | ||
| if (result == 'ERROR') { | ||
| switch (error.code) { | ||
| case 'NOT_LOGIN_USER': | ||
| case 'UNAUTHORIZED_CONTENTS': | ||
| throw new Exception(R.Plugin_Common_Chapter_UnavailableError); | ||
| } | ||
| } | ||
| return data.images.map(element => new Page(this, chapter, new URL(element.imagePath))); | ||
| } | ||
|
|
||
| protected CreateRequest(url: URL, includeAuthorization = true, body: string = undefined): Request { | ||
| const request = new Request(url, { | ||
| method: body ? 'POST' : 'GET', | ||
| headers: { | ||
| 'Referer': this.URI.origin, | ||
| 'X-Balcony-Id': this.BalconyID, | ||
| 'X-Platform': this.Platform, | ||
| 'Content-type': body ? 'application/json' : undefined | ||
| }, | ||
| body: body | ||
| }); | ||
| if (this.authorization && includeAuthorization) { | ||
| request.headers.set('authorization', ' Bearer ' + this.authorization.token); | ||
| } | ||
| return request; | ||
| } | ||
|
|
||
| protected async UpdateToken() { | ||
| if (!this.authorization || this.authorization.expiredAt < Date.now()) { | ||
| const url = new URL('/api/auth/session', this.URI); | ||
| const { user } = await FetchJSON<APIUser>(this.CreateRequest(url, false)); | ||
| this.authorization = user?.accessToken; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import '../Bomtoon_e2e'; | ||
| import '../BomtoonCN_e2e'; | ||
| import '../Bontoon_e2e'; | ||
| import '../BoomToon_e2e'; | ||
| import '../Delitoon_e2e'; | ||
| import '../DelitoonDE_e2e'; | ||
| import '../DelitoonX_e2e'; | ||
| import '../LezhinES_e2e'; |