From ebb7af7123c751aee791ae9b3bcce3c213f13a97 Mon Sep 17 00:00:00 2001 From: Isra Date: Mon, 11 Sep 2023 22:41:41 -0500 Subject: [PATCH 01/19] feat(providers): remotestream --- README.md | 27 ++++++++++++++++ package-lock.json | 4 +-- src/providers/sources/remotestream/common.ts | 1 + src/providers/sources/remotestream/index.ts | 34 ++++++++++++++++++++ 4 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 src/providers/sources/remotestream/common.ts create mode 100644 src/providers/sources/remotestream/index.ts diff --git a/README.md b/README.md index 1aa330b..a5a9ac2 100644 --- a/README.md +++ b/README.md @@ -11,3 +11,30 @@ features: Todos: - make default fetcher maker thing work with both undici and node-fetch + + +providers need to be ported to the new provider repo: + +* [ ] superstream +* [x] flixhq +* [ ] gomovies +* [ ] kissasian +* [x] remotestream + +embeds: + +* [x] upcloud +* [ ] mp4upload +* [ ] playm4u +* [ ] streamm4u +* [ ] streamsb + +providers that will not be ported: + +* 2embed (disabled) +* gdriveplayer (disabled) +* hdwatched (disabled) +* m4ufree (disabled) +* netfilm (disabled) +* sflix (disabled) +* streamflix (uses flixhq, we already have the content) diff --git a/package-lock.json b/package-lock.json index 626dcc4..9bb9569 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@movie-web/providers", - "version": "0.0.11", + "version": "0.0.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@movie-web/providers", - "version": "0.0.11", + "version": "0.0.12", "license": "MIT", "dependencies": { "cheerio": "^1.0.0-rc.12", diff --git a/src/providers/sources/remotestream/common.ts b/src/providers/sources/remotestream/common.ts new file mode 100644 index 0000000..be8edfd --- /dev/null +++ b/src/providers/sources/remotestream/common.ts @@ -0,0 +1 @@ +export const remotestreamBase = `https://fsa.remotestre.am`; diff --git a/src/providers/sources/remotestream/index.ts b/src/providers/sources/remotestream/index.ts new file mode 100644 index 0000000..b7601c5 --- /dev/null +++ b/src/providers/sources/remotestream/index.ts @@ -0,0 +1,34 @@ +import { flags } from '@/main/targets'; +import { makeSourcerer } from '@/providers/base'; +import { NotFoundError } from '@/utils/errors'; + +import { remotestreamBase } from './common'; + +// TODO tv shows are available in flixHQ, just no scraper yet +export const flixhqScraper = makeSourcerer({ + id: 'remotestream', + name: 'Remote Stream', + rank: 55, + flags: [flags.NO_CORS], + async scrapeShow(ctx) { + let playlistLink = `${remotestreamBase}/Movies/${ctx.media.tmdbId}`; + + const seasonNumber = ctx.media.season.number; + const episodeNumber = ctx.media.episode.number; + + playlistLink += `/${seasonNumber}/${episodeNumber}/${episodeNumber}.m3u8`; + + const streamRes = await ctx.fetcher(playlistLink); + if (streamRes.type !== 'application/x-mpegurl') throw new NotFoundError('No watchable item found'); + ctx.progress(90); + + return { + embeds: [], + stream: { + playlist: playlistLink, + type: 'hls', + flags: [flags.NO_CORS], + }, + }; + }, +}); From 6fc1a74729a86248b1e1ea192e8dbe9a3dc11547 Mon Sep 17 00:00:00 2001 From: Isra Date: Mon, 11 Sep 2023 22:48:33 -0500 Subject: [PATCH 02/19] feat(providers): support remotestream movies --- src/providers/all.ts | 3 ++- src/providers/sources/remotestream/index.ts | 22 ++++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/providers/all.ts b/src/providers/all.ts index e9f7c1d..159c496 100644 --- a/src/providers/all.ts +++ b/src/providers/all.ts @@ -1,10 +1,11 @@ import { Embed, Sourcerer } from '@/providers/base'; import { upcloudScraper } from '@/providers/embeds/upcloud'; import { flixhqScraper } from '@/providers/sources/flixhq/index'; +import { remotreamScraper } from '@/providers/sources/remotestream/index'; export function gatherAllSources(): Array { // all sources are gathered here - return [flixhqScraper]; + return [flixhqScraper, remotreamScraper]; } export function gatherAllEmbeds(): Array { diff --git a/src/providers/sources/remotestream/index.ts b/src/providers/sources/remotestream/index.ts index b7601c5..4027a31 100644 --- a/src/providers/sources/remotestream/index.ts +++ b/src/providers/sources/remotestream/index.ts @@ -5,22 +5,34 @@ import { NotFoundError } from '@/utils/errors'; import { remotestreamBase } from './common'; // TODO tv shows are available in flixHQ, just no scraper yet -export const flixhqScraper = makeSourcerer({ +export const remotreamScraper = makeSourcerer({ id: 'remotestream', name: 'Remote Stream', rank: 55, flags: [flags.NO_CORS], async scrapeShow(ctx) { - let playlistLink = `${remotestreamBase}/Movies/${ctx.media.tmdbId}`; - const seasonNumber = ctx.media.season.number; const episodeNumber = ctx.media.episode.number; - playlistLink += `/${seasonNumber}/${episodeNumber}/${episodeNumber}.m3u8`; + const playlistLink = `${remotestreamBase}/Shows/${ctx.media.tmdbId}/${seasonNumber}/${episodeNumber}/${episodeNumber}.m3u8`; + + const streamRes = await ctx.fetcher(playlistLink); + if (streamRes.type !== 'application/x-mpegurl') throw new NotFoundError('No watchable item found'); + + return { + embeds: [], + stream: { + playlist: playlistLink, + type: 'hls', + flags: [flags.NO_CORS], + }, + }; + }, + async scrapeMovie(ctx) { + const playlistLink = `${remotestreamBase}/Movies/${ctx.media.tmdbId}/${ctx.media.tmdbId}.m3u8`; const streamRes = await ctx.fetcher(playlistLink); if (streamRes.type !== 'application/x-mpegurl') throw new NotFoundError('No watchable item found'); - ctx.progress(90); return { embeds: [], From e28d3fae925fa570d1a910641f5cecc95dcb1bd8 Mon Sep 17 00:00:00 2001 From: Isra Date: Mon, 11 Sep 2023 22:49:25 -0500 Subject: [PATCH 03/19] feat(providers): Fix typos --- src/providers/all.ts | 4 ++-- src/providers/sources/remotestream/index.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/providers/all.ts b/src/providers/all.ts index 159c496..a0ec85d 100644 --- a/src/providers/all.ts +++ b/src/providers/all.ts @@ -1,11 +1,11 @@ import { Embed, Sourcerer } from '@/providers/base'; import { upcloudScraper } from '@/providers/embeds/upcloud'; import { flixhqScraper } from '@/providers/sources/flixhq/index'; -import { remotreamScraper } from '@/providers/sources/remotestream/index'; +import { remotestreamScraper } from '@/providers/sources/remotestream/index'; export function gatherAllSources(): Array { // all sources are gathered here - return [flixhqScraper, remotreamScraper]; + return [flixhqScraper, remotestreamScraper]; } export function gatherAllEmbeds(): Array { diff --git a/src/providers/sources/remotestream/index.ts b/src/providers/sources/remotestream/index.ts index 4027a31..a2ead82 100644 --- a/src/providers/sources/remotestream/index.ts +++ b/src/providers/sources/remotestream/index.ts @@ -5,7 +5,7 @@ import { NotFoundError } from '@/utils/errors'; import { remotestreamBase } from './common'; // TODO tv shows are available in flixHQ, just no scraper yet -export const remotreamScraper = makeSourcerer({ +export const remotestreamScraper = makeSourcerer({ id: 'remotestream', name: 'Remote Stream', rank: 55, From c80c27a7ed54f87303d433d7f4dd1c41b36c228d Mon Sep 17 00:00:00 2001 From: mrjvs Date: Fri, 15 Sep 2023 19:21:47 +0200 Subject: [PATCH 04/19] refactor file tree for remotestream --- src/providers/all.ts | 2 +- .../sources/{remotestream/index.ts => remotestream.ts} | 9 ++++++--- src/providers/sources/remotestream/common.ts | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) rename src/providers/sources/{remotestream/index.ts => remotestream.ts} (83%) delete mode 100644 src/providers/sources/remotestream/common.ts diff --git a/src/providers/all.ts b/src/providers/all.ts index a0ec85d..bcf8191 100644 --- a/src/providers/all.ts +++ b/src/providers/all.ts @@ -1,7 +1,7 @@ import { Embed, Sourcerer } from '@/providers/base'; import { upcloudScraper } from '@/providers/embeds/upcloud'; import { flixhqScraper } from '@/providers/sources/flixhq/index'; -import { remotestreamScraper } from '@/providers/sources/remotestream/index'; +import { remotestreamScraper } from '@/providers/sources/remotestream'; export function gatherAllSources(): Array { // all sources are gathered here diff --git a/src/providers/sources/remotestream/index.ts b/src/providers/sources/remotestream.ts similarity index 83% rename from src/providers/sources/remotestream/index.ts rename to src/providers/sources/remotestream.ts index a2ead82..80a8621 100644 --- a/src/providers/sources/remotestream/index.ts +++ b/src/providers/sources/remotestream.ts @@ -2,9 +2,8 @@ import { flags } from '@/main/targets'; import { makeSourcerer } from '@/providers/base'; import { NotFoundError } from '@/utils/errors'; -import { remotestreamBase } from './common'; +const remotestreamBase = `https://fsa.remotestre.am`; -// TODO tv shows are available in flixHQ, just no scraper yet export const remotestreamScraper = makeSourcerer({ id: 'remotestream', name: 'Remote Stream', @@ -16,8 +15,10 @@ export const remotestreamScraper = makeSourcerer({ const playlistLink = `${remotestreamBase}/Shows/${ctx.media.tmdbId}/${seasonNumber}/${episodeNumber}/${episodeNumber}.m3u8`; - const streamRes = await ctx.fetcher(playlistLink); + ctx.progress(30); + const streamRes = await ctx.fetcher(playlistLink); // TODO support blobs in fetchers if (streamRes.type !== 'application/x-mpegurl') throw new NotFoundError('No watchable item found'); + ctx.progress(90); return { embeds: [], @@ -31,8 +32,10 @@ export const remotestreamScraper = makeSourcerer({ async scrapeMovie(ctx) { const playlistLink = `${remotestreamBase}/Movies/${ctx.media.tmdbId}/${ctx.media.tmdbId}.m3u8`; + ctx.progress(30); const streamRes = await ctx.fetcher(playlistLink); if (streamRes.type !== 'application/x-mpegurl') throw new NotFoundError('No watchable item found'); + ctx.progress(90); return { embeds: [], diff --git a/src/providers/sources/remotestream/common.ts b/src/providers/sources/remotestream/common.ts deleted file mode 100644 index be8edfd..0000000 --- a/src/providers/sources/remotestream/common.ts +++ /dev/null @@ -1 +0,0 @@ -export const remotestreamBase = `https://fsa.remotestre.am`; From c57fdc39ff2e2437fb4eed06718b711e377465c1 Mon Sep 17 00:00:00 2001 From: mrjvs Date: Fri, 15 Sep 2023 19:54:30 +0200 Subject: [PATCH 05/19] add mp4upload + streamsb --- .eslintrc.js | 1 + src/providers/embeds/mp4upload.ts | 30 ++++++ src/providers/embeds/streamsb.ts | 165 ++++++++++++++++++++++++++++++ 3 files changed, 196 insertions(+) create mode 100644 src/providers/embeds/mp4upload.ts create mode 100644 src/providers/embeds/streamsb.ts diff --git a/.eslintrc.js b/.eslintrc.js index 9e0f9d5..9f88aa7 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -33,6 +33,7 @@ module.exports = { 'no-eval': 'off', 'no-await-in-loop': 'off', 'no-nested-ternary': 'off', + 'no-param-reassign': 'off', 'prefer-destructuring': 'off', '@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }], 'import/extensions': [ diff --git a/src/providers/embeds/mp4upload.ts b/src/providers/embeds/mp4upload.ts new file mode 100644 index 0000000..4524018 --- /dev/null +++ b/src/providers/embeds/mp4upload.ts @@ -0,0 +1,30 @@ +import { flags } from '@/main/targets'; +import { makeEmbed } from '@/providers/base'; + +export const mp4uploadScraper = makeEmbed({ + id: 'mp4upload', + name: 'mp4upload', + rank: 170, + async scrape(ctx) { + const embed = await ctx.proxiedFetcher(ctx.url); + + const playerSrcRegex = /(?<=player\.src\()\s*{\s*type:\s*"[^"]+",\s*src:\s*"([^"]+)"\s*}\s*(?=\);)/s; + const playerSrc = embed.match(playerSrcRegex) ?? []; + + const streamUrl = playerSrc[1]; + if (!streamUrl) throw new Error('Stream url not found in embed code'); + + return { + stream: { + type: 'file', + flags: [flags.NO_CORS], + qualities: { + '1080': { + type: 'mp4', + url: streamUrl, + }, + }, + }, + }; + }, +}); diff --git a/src/providers/embeds/streamsb.ts b/src/providers/embeds/streamsb.ts new file mode 100644 index 0000000..a42355a --- /dev/null +++ b/src/providers/embeds/streamsb.ts @@ -0,0 +1,165 @@ +import { load } from 'cheerio'; +import Base64 from 'crypto-js/enc-base64'; +import Utf8 from 'crypto-js/enc-utf8'; +import FormData from 'form-data'; + +import { flags } from '@/main/targets'; +import { makeEmbed } from '@/providers/base'; +import { StreamFile } from '@/providers/streams'; +import { EmbedScrapeContext } from '@/utils/context'; + +async function fetchCaptchaToken(ctx: EmbedScrapeContext, domain: string, recaptchaKey: string) { + const domainHash = Base64.stringify(Utf8.parse(domain)).replace(/=/g, '.'); + + const recaptchaRender = await ctx.proxiedFetcher(`https://www.google.com/recaptcha/api.js`, { + query: { + render: recaptchaKey, + }, + }); + + const vToken = recaptchaRender.substring( + recaptchaRender.indexOf('/releases/') + 10, + recaptchaRender.indexOf('/recaptcha__en.js'), + ); + + const recaptchaAnchor = await ctx.proxiedFetcher( + `https://www.google.com/recaptcha/api2/anchor?cb=1&hl=en&size=invisible&cb=flicklax`, + { + query: { + k: recaptchaKey, + co: domainHash, + v: vToken, + }, + }, + ); + + const cToken = load(recaptchaAnchor)('#recaptcha-token').attr('value'); + if (!cToken) throw new Error('Unable to find cToken'); + + const tokenData = await ctx.proxiedFetcher(`https://www.google.com/recaptcha/api2/reload`, { + query: { + v: vToken, + reason: 'q', + k: recaptchaKey, + c: cToken, + sa: '', + co: domain, + }, + headers: { referer: 'https://www.google.com/recaptcha/api2/' }, + method: 'POST', + }); + + const token = tokenData.match('rresp","(.+?)"'); + return token ? token[1] : null; +} + +/* Url variations + - domain.com/{id}?.html + - domain.com/{id} + - domain.com/embed-{id} + - domain.com/d/{id} + - domain.com/e/{id} + - domain.com/e/{id}-embed + */ +export const streamsbScraper = makeEmbed({ + id: 'streamsb', + name: 'StreamSB', + rank: 150, + async scrape(ctx) { + const streamsbUrl = ctx.url.replace('.html', '').replace('embed-', '').replace('e/', '').replace('d/', ''); + const parsedUrl = new URL(streamsbUrl); + const base = await ctx.proxiedFetcher(`${parsedUrl.origin}/d${parsedUrl.pathname}`); + ctx.progress(20); + + const pageDoc = load(base); + + const dlDetails: any[] = []; + pageDoc('[onclick^=download_video]').each((i, el) => { + const $el = pageDoc(el); + + const funcContents = $el.attr('onclick'); + const regExpFunc = /download_video\('(.+?)','(.+?)','(.+?)'\)/; + const matchesFunc = regExpFunc.exec(funcContents ?? ''); + if (!matchesFunc) return; + + const quality = $el.find('span').text(); + const regExpQuality = /(.+?) \((.+?)\)/; + const matchesQuality = regExpQuality.exec(quality ?? ''); + if (!matchesQuality) return; + + dlDetails.push({ + parameters: [matchesFunc[1], matchesFunc[2], matchesFunc[3]], + quality: { + label: matchesQuality[1].trim(), + size: matchesQuality[2], + }, + }); + }); + + ctx.progress(40); + + let dls = await Promise.all( + dlDetails.map(async (dl) => { + const query = { + op: 'download_orig', + id: dl.parameters[0], + mode: dl.parameters[1], + hash: dl.parameters[2], + }; + + const getDownload = await ctx.proxiedFetcher(`/dl`, { + query, + baseUrl: parsedUrl.origin, + }); + + const downloadDoc = load(getDownload); + + const recaptchaKey = downloadDoc('.g-recaptcha').attr('data-sitekey'); + if (!recaptchaKey) throw new Error('Unable to get captcha key'); + + const captchaToken = await fetchCaptchaToken(ctx, parsedUrl.origin, recaptchaKey); + if (!captchaToken) throw new Error('Unable to get captcha token'); + + const dlForm = new FormData(); + dlForm.append('op', 'download_orig'); + dlForm.append('id', dl.parameters[0]); + dlForm.append('mode', dl.parameters[1]); + dlForm.append('hash', dl.parameters[2]); + dlForm.append('g-recaptcha-response', captchaToken); + + const download = await ctx.proxiedFetcher(`/dl`, { + method: 'POST', + baseUrl: parsedUrl.origin, + body: dlForm, + query, + }); + + const dlLink = load(download)('.btn.btn-light.btn-lg').attr('href'); + + return { + quality: dl.quality.label, + url: dlLink, + }; + }), + ); + dls = dls.filter((d) => !!d.url); + + ctx.progress(80); + + const qualities = dls.reduce((a, v) => { + a[v.quality] = { + type: 'mp4', + url: v.url as string, + }; + return a; + }, {} as Record); + + return { + stream: { + type: 'file', + flags: [flags.NO_CORS], + qualities, + }, + }; + }, +}); From b5d59516620082484e2df60956ebb459369f8d7d Mon Sep 17 00:00:00 2001 From: mrjvs Date: Fri, 15 Sep 2023 19:58:20 +0200 Subject: [PATCH 06/19] add embed scrapers to list --- src/providers/all.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/providers/all.ts b/src/providers/all.ts index bcf8191..3b980f4 100644 --- a/src/providers/all.ts +++ b/src/providers/all.ts @@ -1,4 +1,6 @@ import { Embed, Sourcerer } from '@/providers/base'; +import { mp4uploadScraper } from '@/providers/embeds/mp4upload'; +import { streamsbScraper } from '@/providers/embeds/streamsb'; import { upcloudScraper } from '@/providers/embeds/upcloud'; import { flixhqScraper } from '@/providers/sources/flixhq/index'; import { remotestreamScraper } from '@/providers/sources/remotestream'; @@ -10,5 +12,5 @@ export function gatherAllSources(): Array { export function gatherAllEmbeds(): Array { // all embeds are gathered here - return [upcloudScraper]; + return [upcloudScraper, mp4uploadScraper, streamsbScraper]; } From 2d6a603b2b197078b0d8227376b69a8af88721ed Mon Sep 17 00:00:00 2001 From: mrjvs Date: Fri, 15 Sep 2023 20:00:54 +0200 Subject: [PATCH 07/19] update todos --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a5a9ac2..ba636ce 100644 --- a/README.md +++ b/README.md @@ -24,10 +24,8 @@ providers need to be ported to the new provider repo: embeds: * [x] upcloud -* [ ] mp4upload -* [ ] playm4u -* [ ] streamm4u -* [ ] streamsb +* [x] mp4upload +* [x] streamsb providers that will not be ported: @@ -37,4 +35,6 @@ providers that will not be ported: * m4ufree (disabled) * netfilm (disabled) * sflix (disabled) +* playm4u (never worked) +* streamm4u (never worked, throws 403) * streamflix (uses flixhq, we already have the content) From a0637cc04696d319e999c1f6cdad94fa49ad69c3 Mon Sep 17 00:00:00 2001 From: Isra Date: Fri, 15 Sep 2023 15:09:00 -0500 Subject: [PATCH 08/19] Add kissasian scraper --- README.md | 2 +- src/providers/all.ts | 3 +- src/providers/sources/kissasian/common.ts | 15 ++++ src/providers/sources/kissasian/getEmbeds.ts | 34 +++++++++ .../sources/kissasian/getEpisodes.ts | 14 ++++ src/providers/sources/kissasian/index.ts | 70 +++++++++++++++++++ src/providers/sources/kissasian/search.ts | 27 +++++++ 7 files changed, 163 insertions(+), 2 deletions(-) create mode 100644 src/providers/sources/kissasian/common.ts create mode 100644 src/providers/sources/kissasian/getEmbeds.ts create mode 100644 src/providers/sources/kissasian/getEpisodes.ts create mode 100644 src/providers/sources/kissasian/index.ts create mode 100644 src/providers/sources/kissasian/search.ts diff --git a/README.md b/README.md index ba636ce..b99ee2a 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ providers need to be ported to the new provider repo: * [ ] superstream * [x] flixhq * [ ] gomovies -* [ ] kissasian +* [x] kissasian * [x] remotestream embeds: diff --git a/src/providers/all.ts b/src/providers/all.ts index 3b980f4..6e2a0b1 100644 --- a/src/providers/all.ts +++ b/src/providers/all.ts @@ -3,11 +3,12 @@ import { mp4uploadScraper } from '@/providers/embeds/mp4upload'; import { streamsbScraper } from '@/providers/embeds/streamsb'; import { upcloudScraper } from '@/providers/embeds/upcloud'; import { flixhqScraper } from '@/providers/sources/flixhq/index'; +import { kissAsianScraper } from '@/providers/sources/kissasian/index'; import { remotestreamScraper } from '@/providers/sources/remotestream'; export function gatherAllSources(): Array { // all sources are gathered here - return [flixhqScraper, remotestreamScraper]; + return [flixhqScraper, remotestreamScraper, kissAsianScraper]; } export function gatherAllEmbeds(): Array { diff --git a/src/providers/sources/kissasian/common.ts b/src/providers/sources/kissasian/common.ts new file mode 100644 index 0000000..d9e35e0 --- /dev/null +++ b/src/providers/sources/kissasian/common.ts @@ -0,0 +1,15 @@ +import { mp4uploadScraper } from '@/providers/embeds/mp4upload'; +import { streamsbScraper } from '@/providers/embeds/streamsb'; + +export const kissasianBase = 'https://kissasian.li'; + +export const embedProviders = [ + { + type: mp4uploadScraper.id, + id: 'mp', + }, + { + type: streamsbScraper.id, + id: 'sb', + }, +]; diff --git a/src/providers/sources/kissasian/getEmbeds.ts b/src/providers/sources/kissasian/getEmbeds.ts new file mode 100644 index 0000000..4fb28f9 --- /dev/null +++ b/src/providers/sources/kissasian/getEmbeds.ts @@ -0,0 +1,34 @@ +import { load } from 'cheerio'; + +import { ScrapeContext } from '@/utils/context'; + +import { embedProviders, kissasianBase } from './common'; + +export async function getEmbeds( + ctx: ScrapeContext, + targetEpisode: { + number: string; + url?: string; + }, +) { + let embeds = await Promise.all( + embedProviders.map(async (provider) => { + const watch = await ctx.fetcher(`${kissasianBase}/${targetEpisode.url}&s=${provider.id}`); + + const watchPage = load(watch); + + const embedUrl = watchPage('iframe[id=my_video_1]').attr('src'); + + if (!embedUrl) throw new Error('Embed not found'); + + return { + embedId: provider.id, + url: embedUrl, + }; + }), + ); + + embeds = embeds.filter((e) => !!e.url); + + return embeds; +} diff --git a/src/providers/sources/kissasian/getEpisodes.ts b/src/providers/sources/kissasian/getEpisodes.ts new file mode 100644 index 0000000..4d94848 --- /dev/null +++ b/src/providers/sources/kissasian/getEpisodes.ts @@ -0,0 +1,14 @@ +import { CheerioAPI } from 'cheerio'; + +export async function getEpisodes(dramaPage: CheerioAPI) { + const episodesEl = dramaPage('tbody tr:not(:first-child)'); + + return episodesEl + .toArray() + .map((ep) => { + const number = dramaPage(ep).find('td.episodeSub a').text().split('Episode')[1]?.trim(); + const url = dramaPage(ep).find('td.episodeSub a').attr('href'); + return { number, url }; + }) + .filter((e) => !!e.url); +} diff --git a/src/providers/sources/kissasian/index.ts b/src/providers/sources/kissasian/index.ts new file mode 100644 index 0000000..5c09236 --- /dev/null +++ b/src/providers/sources/kissasian/index.ts @@ -0,0 +1,70 @@ +import { load } from 'cheerio'; + +import { flags } from '@/main/targets'; +import { makeSourcerer } from '@/providers/base'; +import { NotFoundError } from '@/utils/errors'; + +import { getEmbeds } from './getEmbeds'; +import { getEpisodes } from './getEpisodes'; +import { search } from './search'; + +export const kissAsianScraper = makeSourcerer({ + id: 'kissasian', + name: 'KissAsian', + rank: 130, + flags: [flags.NO_CORS], + + async scrapeShow(ctx) { + const seasonNumber = ctx.media.season.number; + const episodeNumber = ctx.media.episode.number; + + const dramas = await search(ctx, ctx.media.title, seasonNumber); + + const targetDrama = dramas.find((d) => d.name?.toLowerCase() === ctx.media.title.toLowerCase()) ?? dramas[0]; + if (!targetDrama) throw new Error('Drama not found'); + + ctx.progress(30); + + const drama = await ctx.fetcher(targetDrama.url); + + const dramaPage = load(drama); + + const episodes = await getEpisodes(dramaPage); + + const targetEpisode = episodes.find((e) => e.number === `${episodeNumber}`); + if (!targetEpisode?.url) throw new NotFoundError('Episode not found'); + + ctx.progress(70); + + const embeds = await getEmbeds(ctx, targetEpisode); + + return { + embeds, + }; + }, + async scrapeMovie(ctx) { + const dramas = await search(ctx, ctx.media.title, undefined); + + const targetDrama = dramas.find((d) => d.name?.toLowerCase() === ctx.media.title.toLowerCase()) ?? dramas[0]; + if (!targetDrama) throw new Error('Drama not found'); + + ctx.progress(30); + + const drama = await ctx.fetcher(targetDrama.url); + + const dramaPage = load(drama); + + const episodes = await getEpisodes(dramaPage); + + const targetEpisode = episodes[0]; + if (!targetEpisode?.url) throw new NotFoundError('Episode not found'); + + ctx.progress(70); + + const embeds = await getEmbeds(ctx, targetEpisode); + + return { + embeds, + }; + }, +}); diff --git a/src/providers/sources/kissasian/search.ts b/src/providers/sources/kissasian/search.ts new file mode 100644 index 0000000..5d913f5 --- /dev/null +++ b/src/providers/sources/kissasian/search.ts @@ -0,0 +1,27 @@ +import { load } from 'cheerio'; +import FormData from 'form-data'; + +import { ScrapeContext } from '@/utils/context'; + +import { kissasianBase } from './common'; + +export async function search(ctx: ScrapeContext, title: string, seasonNumber?: number) { + const searchForm = new FormData(); + searchForm.append('keyword', `${title} ${seasonNumber ?? ''}`.trim()); + searchForm.append('type', 'Drama'); + + const searchResults = await ctx.fetcher('/Search/SearchSuggest', { + baseUrl: kissasianBase, + method: 'POST', + body: searchForm, + }); + + const searchPage = load(searchResults); + + return Array.from(searchPage('a')).map((drama) => { + return { + name: searchPage(drama).text(), + url: drama.attribs.href, + }; + }); +} From 2aa74287113d9f99c7ce3f50ba66a77eb401a775 Mon Sep 17 00:00:00 2001 From: Isra Date: Fri, 15 Sep 2023 15:11:27 -0500 Subject: [PATCH 09/19] Import types only --- src/providers/sources/kissasian/getEmbeds.ts | 2 +- src/providers/sources/kissasian/getEpisodes.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/providers/sources/kissasian/getEmbeds.ts b/src/providers/sources/kissasian/getEmbeds.ts index 4fb28f9..8dab8f4 100644 --- a/src/providers/sources/kissasian/getEmbeds.ts +++ b/src/providers/sources/kissasian/getEmbeds.ts @@ -1,6 +1,6 @@ import { load } from 'cheerio'; -import { ScrapeContext } from '@/utils/context'; +import type { ScrapeContext } from '@/utils/context'; import { embedProviders, kissasianBase } from './common'; diff --git a/src/providers/sources/kissasian/getEpisodes.ts b/src/providers/sources/kissasian/getEpisodes.ts index 4d94848..1576a81 100644 --- a/src/providers/sources/kissasian/getEpisodes.ts +++ b/src/providers/sources/kissasian/getEpisodes.ts @@ -1,4 +1,4 @@ -import { CheerioAPI } from 'cheerio'; +import type { CheerioAPI } from 'cheerio'; export async function getEpisodes(dramaPage: CheerioAPI) { const episodesEl = dramaPage('tbody tr:not(:first-child)'); From 87b1763761b68d5be9b161e85834ebb6a09db902 Mon Sep 17 00:00:00 2001 From: Isra Date: Fri, 15 Sep 2023 22:09:40 -0500 Subject: [PATCH 10/19] SuperStream --- package-lock.json | 30 ++++-- package.json | 1 + src/providers/all.ts | 3 +- src/providers/sources/superstream/common.ts | 13 +++ src/providers/sources/superstream/crypto.ts | 16 ++++ .../sources/superstream/getStreamQualities.ts | 32 +++++++ src/providers/sources/superstream/index.ts | 96 +++++++++++++++++++ .../sources/superstream/sendRequest.ts | 56 +++++++++++ 8 files changed, 240 insertions(+), 7 deletions(-) create mode 100644 src/providers/sources/superstream/common.ts create mode 100644 src/providers/sources/superstream/crypto.ts create mode 100644 src/providers/sources/superstream/getStreamQualities.ts create mode 100644 src/providers/sources/superstream/index.ts create mode 100644 src/providers/sources/superstream/sendRequest.ts diff --git a/package-lock.json b/package-lock.json index 9bb9569..c2a5fa1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "cheerio": "^1.0.0-rc.12", "crypto-js": "^4.1.1", "form-data": "^4.0.0", + "nanoid": "^5.0.1", "node-fetch": "^3.3.2" }, "devDependencies": { @@ -4560,10 +4561,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", - "dev": true, + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.0.1.tgz", + "integrity": "sha512-vWeVtV5Cw68aML/QaZvqN/3QQXc6fBfIieAlu05m7FZW2Dgb+3f0xc0TTxuJW+7u30t7iSDTV/j3kVI0oJqIfQ==", "funding": [ { "type": "github", @@ -4571,10 +4571,10 @@ } ], "bin": { - "nanoid": "bin/nanoid.cjs" + "nanoid": "bin/nanoid.js" }, "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + "node": "^18 || >=20" } }, "node_modules/natural-compare": { @@ -4986,6 +4986,24 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/postcss/node_modules/nanoid": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", diff --git a/package.json b/package.json index 95b1b79..d886001 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "cheerio": "^1.0.0-rc.12", "crypto-js": "^4.1.1", "form-data": "^4.0.0", + "nanoid": "^5.0.1", "node-fetch": "^3.3.2" } } diff --git a/src/providers/all.ts b/src/providers/all.ts index 6e2a0b1..aa87f8a 100644 --- a/src/providers/all.ts +++ b/src/providers/all.ts @@ -5,10 +5,11 @@ import { upcloudScraper } from '@/providers/embeds/upcloud'; import { flixhqScraper } from '@/providers/sources/flixhq/index'; import { kissAsianScraper } from '@/providers/sources/kissasian/index'; import { remotestreamScraper } from '@/providers/sources/remotestream'; +import { superStreamScraper } from '@/providers/sources/superstream/index'; export function gatherAllSources(): Array { // all sources are gathered here - return [flixhqScraper, remotestreamScraper, kissAsianScraper]; + return [flixhqScraper, remotestreamScraper, kissAsianScraper, superStreamScraper]; } export function gatherAllEmbeds(): Array { diff --git a/src/providers/sources/superstream/common.ts b/src/providers/sources/superstream/common.ts new file mode 100644 index 0000000..b5d5de1 --- /dev/null +++ b/src/providers/sources/superstream/common.ts @@ -0,0 +1,13 @@ +// We do not want content scanners to notice this scraping going on so we've hidden all constants +// The source has its origins in China so I added some extra security with banned words +// Mayhaps a tiny bit unethical, but this source is just too good :) +// If you are copying this code please use precautions so they do not change their api. + +export const iv = atob('d0VpcGhUbiE='); +export const key = atob('MTIzZDZjZWRmNjI2ZHk1NDIzM2FhMXc2'); +export const apiUrls = [ + atob('aHR0cHM6Ly9zaG93Ym94LnNoZWd1Lm5ldC9hcGkvYXBpX2NsaWVudC9pbmRleC8='), + atob('aHR0cHM6Ly9tYnBhcGkuc2hlZ3UubmV0L2FwaS9hcGlfY2xpZW50L2luZGV4Lw=='), +]; +export const appKey = atob('bW92aWVib3g='); +export const appId = atob('Y29tLnRkby5zaG93Ym94'); diff --git a/src/providers/sources/superstream/crypto.ts b/src/providers/sources/superstream/crypto.ts new file mode 100644 index 0000000..49adaac --- /dev/null +++ b/src/providers/sources/superstream/crypto.ts @@ -0,0 +1,16 @@ +import CryptoJS from 'crypto-js'; + +import { iv, key } from './common'; + +export function encrypt(str: string) { + return CryptoJS.TripleDES.encrypt(str, CryptoJS.enc.Utf8.parse(key), { + iv: CryptoJS.enc.Utf8.parse(iv), + }).toString(); +} + +export function getVerify(str: string, str2: string, str3: string) { + if (str) { + return CryptoJS.MD5(CryptoJS.MD5(str2).toString() + str3 + str).toString(); + } + return null; +} diff --git a/src/providers/sources/superstream/getStreamQualities.ts b/src/providers/sources/superstream/getStreamQualities.ts new file mode 100644 index 0000000..6fe55a3 --- /dev/null +++ b/src/providers/sources/superstream/getStreamQualities.ts @@ -0,0 +1,32 @@ +import { StreamFile } from '@/providers/streams'; +import { ScrapeContext } from '@/utils/context'; + +import { sendRequest } from './sendRequest'; + +import { allowedQualities } from '.'; + +export async function getStreamQualities(ctx: ScrapeContext, apiQuery: object) { + const mediaRes: { list: { path: string; real_quality: string }[] } = (await sendRequest(ctx, apiQuery)).data; + ctx.progress(66); + + const qualityMap = mediaRes.list + .filter((file) => allowedQualities.includes(file.real_quality.replace('p', ''))) + .map((file) => ({ + url: file.path, + quality: file.real_quality.replace('p', ''), + })); + + const qualities: Record = {}; + + allowedQualities.forEach((quality) => { + const foundQuality = qualityMap.find((q) => q.quality === quality); + if (foundQuality) { + qualities[quality] = { + type: 'mp4', + url: foundQuality.url, + }; + } + }); + + return qualities; +} diff --git a/src/providers/sources/superstream/index.ts b/src/providers/sources/superstream/index.ts new file mode 100644 index 0000000..45f64b2 --- /dev/null +++ b/src/providers/sources/superstream/index.ts @@ -0,0 +1,96 @@ +import { flags } from '@/main/targets'; +import { makeSourcerer } from '@/providers/base'; +import { compareTitle } from '@/utils/compare'; +import { NotFoundError } from '@/utils/errors'; + +import { getStreamQualities } from './getStreamQualities'; +import { sendRequest } from './sendRequest'; + +export const allowedQualities = ['360', '480', '720', '1080']; + +export const superStreamScraper = makeSourcerer({ + id: 'superstream', + name: 'Superstream', + rank: 300, + flags: [flags.NO_CORS], + async scrapeShow(ctx) { + const searchQuery = { + module: 'Search3', + page: '1', + type: 'all', + keyword: ctx.media.title, + pagelimit: '20', + }; + + const searchRes = (await sendRequest(ctx, searchQuery, true)).data; + ctx.progress(33); + + const superstreamEntry = searchRes.find( + (res: any) => compareTitle(res.title, ctx.media.title) && res.year === Number(ctx.media.releaseYear), + ); + + if (!superstreamEntry) throw new NotFoundError('No entry found'); + const superstreamId = superstreamEntry.id; + + // Fetch requested episode + const apiQuery = { + uid: '', + module: 'TV_downloadurl_v3', + tid: superstreamId, + season: ctx.media.season.number, + episode: ctx.media.episode.number, + oss: '1', + group: '', + }; + + const qualities = await getStreamQualities(ctx, apiQuery); + + return { + embeds: [], + stream: { + qualities, + type: 'file', + flags: [flags.NO_CORS], + }, + }; + }, + async scrapeMovie(ctx) { + const searchQuery = { + module: 'Search3', + page: '1', + type: 'all', + keyword: ctx.media.title, + pagelimit: '20', + }; + + const searchRes = (await sendRequest(ctx, searchQuery, true)).data; + ctx.progress(33); + + const superstreamEntry = searchRes.find( + (res: any) => compareTitle(res.title, ctx.media.title) && res.year === Number(ctx.media.releaseYear), + ); + + if (!superstreamEntry) throw new NotFoundError('No entry found'); + const superstreamId = superstreamEntry.id; + + // Fetch requested episode + const apiQuery = { + uid: '', + module: 'Movie_downloadurl_v3', + mid: superstreamId, + oss: '1', + group: '', + }; + + const qualities = await getStreamQualities(ctx, apiQuery); + + return { + embeds: [], + stream: { + qualities, + type: 'file', + flags: [flags.NO_CORS], + }, + }; + }, +}); diff --git a/src/providers/sources/superstream/sendRequest.ts b/src/providers/sources/superstream/sendRequest.ts new file mode 100644 index 0000000..7475e14 --- /dev/null +++ b/src/providers/sources/superstream/sendRequest.ts @@ -0,0 +1,56 @@ +import CryptoJS from 'crypto-js'; +import { customAlphabet } from 'nanoid'; + +import type { ScrapeContext } from '@/utils/context'; + +import { apiUrls, appId, appKey, key } from './common'; +import { encrypt, getVerify } from './crypto'; + +const nanoid = customAlphabet('0123456789abcdef', 32); +const expiry = () => Math.floor(Date.now() / 1000 + 60 * 60 * 12); + +export const sendRequest = async (ctx: ScrapeContext, data: object, altApi = false) => { + const defaultData = { + childmode: '0', + app_version: '11.5', + appid: appId, + lang: 'en', + expired_date: `${expiry()}`, + platform: 'android', + channel: 'Website', + }; + const encryptedData = encrypt( + JSON.stringify({ + ...defaultData, + ...data, + }), + ); + const appKeyHash = CryptoJS.MD5(appKey).toString(); + const verify = getVerify(encryptedData, appKey, key); + const body = JSON.stringify({ + app_key: appKeyHash, + verify, + encrypt_data: encryptedData, + }); + const base64body = btoa(body); + + const formatted = new URLSearchParams(); + formatted.append('data', base64body); + formatted.append('appid', '27'); + formatted.append('platform', 'android'); + formatted.append('version', '129'); + formatted.append('medium', 'Website'); + + const requestUrl = altApi ? apiUrls[1] : apiUrls[0]; + + const response = await ctx.proxiedFetcher(requestUrl, { + method: 'POST', + headers: { + Platform: 'android', + 'Content-Type': 'application/x-www-form-urlencoded', + }, + body: `${formatted.toString()}&token${nanoid()}`, + }); + + return JSON.parse(response); +}; From 2b7c0ad52f6b8d6ca757e7c91c03195fca7b2908 Mon Sep 17 00:00:00 2001 From: Isra Date: Fri, 15 Sep 2023 23:17:35 -0500 Subject: [PATCH 11/19] Gomovies --- src/providers/sources/gomovies/index.ts | 147 +++++++++++++++++++++++ src/providers/sources/gomovies/source.ts | 30 +++++ 2 files changed, 177 insertions(+) create mode 100644 src/providers/sources/gomovies/index.ts create mode 100644 src/providers/sources/gomovies/source.ts diff --git a/src/providers/sources/gomovies/index.ts b/src/providers/sources/gomovies/index.ts new file mode 100644 index 0000000..1ed29de --- /dev/null +++ b/src/providers/sources/gomovies/index.ts @@ -0,0 +1,147 @@ +import { load } from 'cheerio'; + +import { flags } from '@/main/targets'; +import { makeSourcerer } from '@/providers/base'; +import { upcloudScraper } from '@/providers/embeds/upcloud'; +import { NotFoundError } from '@/utils/errors'; + +import { getSource } from './source'; + +export const gomoviesBase = `https://gomovies.sx`; + +export const remotestreamScraper = makeSourcerer({ + id: 'gomovies', + name: 'GOmovies', + rank: 200, + flags: [flags.NO_CORS], + async scrapeShow(ctx) { + const search = await ctx.proxiedFetcher(`${gomoviesBase}/ajax/search`, { + method: 'POST', + body: JSON.stringify({ + keyword: ctx.media.title, + }), + headers: { + 'X-Requested-With': 'XMLHttpRequest', + }, + }); + + const searchPage = load(search); + const mediaElements = searchPage('a.nav-item'); + + const mediaData = mediaElements.toArray().map((movieEl) => { + const name = searchPage(movieEl).find('h3.film-name')?.text(); + const year = searchPage(movieEl).find('div.film-infor span:first-of-type')?.text(); + const path = searchPage(movieEl).attr('href'); + return { name, year, path }; + }); + + const targetMedia = mediaData.find((m) => m.name === ctx.media.title); + if (!targetMedia?.path) throw new NotFoundError('Media not found'); + + // Example movie path: /movie/watch-{slug}-{id} + // Example series path: /tv/watch-{slug}-{id} + let mediaId = targetMedia.path.split('-').pop()?.replace('/', ''); + + const seasons = await ctx.proxiedFetcher(`${gomoviesBase}/ajax/v2/tv/seasons/${mediaId}`, { + headers: { + 'X-Requested-With': 'XMLHttpRequest', + }, + }); + + const seasonsEl = load(seasons)('.ss-item'); + + const seasonsData = seasonsEl.toArray().map((season) => ({ + number: load(season).text().replace('Season ', ''), + dataId: season.attribs['data-id'], + })); + + const seasonNumber = ctx.media.season.number; + const targetSeason = seasonsData.find((season) => +season.number === seasonNumber); + + if (!targetSeason) throw new NotFoundError('Season not found'); + + const episodes = await ctx.proxiedFetcher(`${gomoviesBase}/ajax/v2/season/episodes/${targetSeason.dataId}`, { + headers: { + 'X-Requested-With': 'XMLHttpRequest', + }, + }); + + const episodesPage = load(episodes); + const episodesEl = episodesPage('.eps-item'); + + const episodesData = episodesEl.toArray().map((ep) => ({ + dataId: ep.attribs['data-id'], + number: episodesPage(ep).find('strong').text().replace('Eps', '').replace(':', '').trim(), + })); + + const episodeNumber = ctx.media.episode.number; + const targetEpisode = episodesData.find((ep) => (ep.number ? +ep.number === episodeNumber : false)); + if (!targetEpisode?.dataId) throw new NotFoundError('Episode not found'); + + mediaId = targetEpisode.dataId; + + const sources = await ctx.proxiedFetcher(`${gomoviesBase}/ajax/v2/episode/servers/${mediaId}`, { + headers: { + 'X-Requested-With': 'XMLHttpRequest', + }, + }); + + const upcloudSource = await getSource(ctx, sources); + + return { + embeds: [ + { + embedId: upcloudScraper.id, + url: upcloudSource.link, + }, + ], + }; + }, + async scrapeMovie(ctx) { + const search = await ctx.proxiedFetcher(`${gomoviesBase}/ajax/search`, { + method: 'POST', + body: JSON.stringify({ + keyword: ctx.media.title, + }), + headers: { + 'X-Requested-With': 'XMLHttpRequest', + }, + }); + + const searchPage = load(search); + const mediaElements = searchPage('a.nav-item'); + + const mediaData = mediaElements.toArray().map((movieEl) => { + const name = searchPage(movieEl).find('h3.film-name')?.text(); + const year = searchPage(movieEl).find('div.film-infor span:first-of-type')?.text(); + const path = searchPage(movieEl).attr('href'); + return { name, year, path }; + }); + + const targetMedia = mediaData.find( + (m) => m.name === ctx.media.title && m.year === ctx.media.releaseYear.toString(), + ); + if (!targetMedia?.path) throw new NotFoundError('Media not found'); + + // Example movie path: /movie/watch-{slug}-{id} + // Example series path: /tv/watch-{slug}-{id} + const mediaId = targetMedia.path.split('-').pop()?.replace('/', ''); + + const sources = await ctx.proxiedFetcher(`${gomoviesBase}/ajax/movie/episodes/${mediaId}`, { + headers: { + 'X-Requested-With': 'XMLHttpRequest', + }, + }); + + const upcloudSource = await getSource(ctx, sources); + + return { + embeds: [ + { + embedId: upcloudScraper.id, + url: upcloudSource.link, + }, + ], + }; + }, +}); diff --git a/src/providers/sources/gomovies/source.ts b/src/providers/sources/gomovies/source.ts new file mode 100644 index 0000000..c903c8b --- /dev/null +++ b/src/providers/sources/gomovies/source.ts @@ -0,0 +1,30 @@ +import { load } from 'cheerio'; + +import { ScrapeContext } from '@/utils/context'; +import { NotFoundError } from '@/utils/errors'; + +import { gomoviesBase } from '.'; + +export async function getSource(ctx: ScrapeContext, sources: any) { + const upcloud = load(sources)('a[title*="upcloud" i]'); + + const upcloudDataId = upcloud?.attr('data-id') ?? upcloud?.attr('data-linkid'); + + if (!upcloudDataId) throw new NotFoundError('Upcloud source not available'); + + const upcloudSource = await ctx.proxiedFetcher<{ + type: 'iframe' | string; + link: string; + sources: []; + title: string; + tracks: []; + }>(`${gomoviesBase}/ajax/sources/${upcloudDataId}`, { + headers: { + 'X-Requested-With': 'XMLHttpRequest', + }, + }); + + if (!upcloudSource.link || upcloudSource.type !== 'iframe') throw new NotFoundError('No upcloud stream found'); + + return upcloudSource; +} From 36d4e1f9f62f91413edf386768f0ffd92de03b1f Mon Sep 17 00:00:00 2001 From: Isra Date: Fri, 15 Sep 2023 23:18:26 -0500 Subject: [PATCH 12/19] Remove todos --- README.md | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index b99ee2a..ce4652f 100644 --- a/README.md +++ b/README.md @@ -4,37 +4,8 @@ package that holds all providers of movie-web. Feel free to use for your own projects. features: - - scrape popular streaming websites - - works in both browser and server-side + +- scrape popular streaming websites +- works in both browser and server-side > **This package is still WIP** - -Todos: - - make default fetcher maker thing work with both undici and node-fetch - - -providers need to be ported to the new provider repo: - -* [ ] superstream -* [x] flixhq -* [ ] gomovies -* [x] kissasian -* [x] remotestream - -embeds: - -* [x] upcloud -* [x] mp4upload -* [x] streamsb - -providers that will not be ported: - -* 2embed (disabled) -* gdriveplayer (disabled) -* hdwatched (disabled) -* m4ufree (disabled) -* netfilm (disabled) -* sflix (disabled) -* playm4u (never worked) -* streamm4u (never worked, throws 403) -* streamflix (uses flixhq, we already have the content) From 37fdf7ab3bc2300ce90456e61e2bb7d09c034e78 Mon Sep 17 00:00:00 2001 From: Isra Date: Fri, 15 Sep 2023 23:26:18 -0500 Subject: [PATCH 13/19] Fix CORS errors --- src/providers/sources/kissasian/getEmbeds.ts | 2 +- src/providers/sources/kissasian/index.ts | 4 ++-- src/providers/sources/kissasian/search.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/providers/sources/kissasian/getEmbeds.ts b/src/providers/sources/kissasian/getEmbeds.ts index 8dab8f4..ca15015 100644 --- a/src/providers/sources/kissasian/getEmbeds.ts +++ b/src/providers/sources/kissasian/getEmbeds.ts @@ -13,7 +13,7 @@ export async function getEmbeds( ) { let embeds = await Promise.all( embedProviders.map(async (provider) => { - const watch = await ctx.fetcher(`${kissasianBase}/${targetEpisode.url}&s=${provider.id}`); + const watch = await ctx.proxiedFetcher(`${kissasianBase}/${targetEpisode.url}&s=${provider.id}`); const watchPage = load(watch); diff --git a/src/providers/sources/kissasian/index.ts b/src/providers/sources/kissasian/index.ts index 5c09236..6175a24 100644 --- a/src/providers/sources/kissasian/index.ts +++ b/src/providers/sources/kissasian/index.ts @@ -25,7 +25,7 @@ export const kissAsianScraper = makeSourcerer({ ctx.progress(30); - const drama = await ctx.fetcher(targetDrama.url); + const drama = await ctx.proxiedFetcher(targetDrama.url); const dramaPage = load(drama); @@ -50,7 +50,7 @@ export const kissAsianScraper = makeSourcerer({ ctx.progress(30); - const drama = await ctx.fetcher(targetDrama.url); + const drama = await ctx.proxiedFetcher(targetDrama.url); const dramaPage = load(drama); diff --git a/src/providers/sources/kissasian/search.ts b/src/providers/sources/kissasian/search.ts index 5d913f5..ca9e136 100644 --- a/src/providers/sources/kissasian/search.ts +++ b/src/providers/sources/kissasian/search.ts @@ -10,7 +10,7 @@ export async function search(ctx: ScrapeContext, title: string, seasonNumber?: n searchForm.append('keyword', `${title} ${seasonNumber ?? ''}`.trim()); searchForm.append('type', 'Drama'); - const searchResults = await ctx.fetcher('/Search/SearchSuggest', { + const searchResults = await ctx.proxiedFetcher('/Search/SearchSuggest', { baseUrl: kissasianBase, method: 'POST', body: searchForm, From f66c408fd2a5a5081012b87761ae599d6270ce8d Mon Sep 17 00:00:00 2001 From: William Oldham Date: Mon, 18 Sep 2023 20:07:37 +0100 Subject: [PATCH 14/19] chore: change eslint param reassign --- .eslintrc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 9f88aa7..524585d 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -33,7 +33,7 @@ module.exports = { 'no-eval': 'off', 'no-await-in-loop': 'off', 'no-nested-ternary': 'off', - 'no-param-reassign': 'off', + 'no-param-reassign': ["error", { "props": false }], 'prefer-destructuring': 'off', '@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_' }], 'import/extensions': [ From 3b538cebb10cd565fdcefd90963b288af17a968b Mon Sep 17 00:00:00 2001 From: Isra Date: Mon, 18 Sep 2023 15:09:42 -0500 Subject: [PATCH 15/19] Resolve all reviews --- src/providers/all.ts | 3 +- src/providers/sources/gomovies/index.ts | 17 +- src/providers/sources/gomovies/source.ts | 3 +- src/providers/sources/kissasian/common.ts | 2 +- src/providers/sources/kissasian/getEmbeds.ts | 9 +- src/providers/sources/kissasian/index.ts | 8 +- src/providers/sources/kissasian/search.ts | 2 +- src/providers/sources/superstream/LICENSE | 680 ++++++++++++++++++ .../sources/superstream/sendRequest.ts | 3 +- 9 files changed, 710 insertions(+), 17 deletions(-) create mode 100644 src/providers/sources/superstream/LICENSE diff --git a/src/providers/all.ts b/src/providers/all.ts index aa87f8a..968b61d 100644 --- a/src/providers/all.ts +++ b/src/providers/all.ts @@ -3,13 +3,14 @@ import { mp4uploadScraper } from '@/providers/embeds/mp4upload'; import { streamsbScraper } from '@/providers/embeds/streamsb'; import { upcloudScraper } from '@/providers/embeds/upcloud'; import { flixhqScraper } from '@/providers/sources/flixhq/index'; +import { goMoviesScraper } from '@/providers/sources/gomovies/index'; import { kissAsianScraper } from '@/providers/sources/kissasian/index'; import { remotestreamScraper } from '@/providers/sources/remotestream'; import { superStreamScraper } from '@/providers/sources/superstream/index'; export function gatherAllSources(): Array { // all sources are gathered here - return [flixhqScraper, remotestreamScraper, kissAsianScraper, superStreamScraper]; + return [flixhqScraper, remotestreamScraper, kissAsianScraper, superStreamScraper, goMoviesScraper]; } export function gatherAllEmbeds(): Array { diff --git a/src/providers/sources/gomovies/index.ts b/src/providers/sources/gomovies/index.ts index 1ed29de..f2612fc 100644 --- a/src/providers/sources/gomovies/index.ts +++ b/src/providers/sources/gomovies/index.ts @@ -9,13 +9,13 @@ import { getSource } from './source'; export const gomoviesBase = `https://gomovies.sx`; -export const remotestreamScraper = makeSourcerer({ +export const goMoviesScraper = makeSourcerer({ id: 'gomovies', name: 'GOmovies', rank: 200, flags: [flags.NO_CORS], async scrapeShow(ctx) { - const search = await ctx.proxiedFetcher(`${gomoviesBase}/ajax/search`, { + const search = await ctx.proxiedFetcher(`/ajax/search`, { method: 'POST', body: JSON.stringify({ keyword: ctx.media.title, @@ -23,6 +23,7 @@ export const remotestreamScraper = makeSourcerer({ headers: { 'X-Requested-With': 'XMLHttpRequest', }, + baseUrl: gomoviesBase, }); const searchPage = load(search); @@ -60,10 +61,11 @@ export const remotestreamScraper = makeSourcerer({ if (!targetSeason) throw new NotFoundError('Season not found'); - const episodes = await ctx.proxiedFetcher(`${gomoviesBase}/ajax/v2/season/episodes/${targetSeason.dataId}`, { + const episodes = await ctx.proxiedFetcher(`/ajax/v2/season/episodes/${targetSeason.dataId}`, { headers: { 'X-Requested-With': 'XMLHttpRequest', }, + baseUrl: gomoviesBase, }); const episodesPage = load(episodes); @@ -80,7 +82,8 @@ export const remotestreamScraper = makeSourcerer({ mediaId = targetEpisode.dataId; - const sources = await ctx.proxiedFetcher(`${gomoviesBase}/ajax/v2/episode/servers/${mediaId}`, { + const sources = await ctx.proxiedFetcher(`ajax/v2/episode/servers/${mediaId}`, { + baseUrl: gomoviesBase, headers: { 'X-Requested-With': 'XMLHttpRequest', }, @@ -98,7 +101,7 @@ export const remotestreamScraper = makeSourcerer({ }; }, async scrapeMovie(ctx) { - const search = await ctx.proxiedFetcher(`${gomoviesBase}/ajax/search`, { + const search = await ctx.proxiedFetcher(`ajax/search`, { method: 'POST', body: JSON.stringify({ keyword: ctx.media.title, @@ -106,6 +109,7 @@ export const remotestreamScraper = makeSourcerer({ headers: { 'X-Requested-With': 'XMLHttpRequest', }, + baseUrl: gomoviesBase, }); const searchPage = load(search); @@ -127,10 +131,11 @@ export const remotestreamScraper = makeSourcerer({ // Example series path: /tv/watch-{slug}-{id} const mediaId = targetMedia.path.split('-').pop()?.replace('/', ''); - const sources = await ctx.proxiedFetcher(`${gomoviesBase}/ajax/movie/episodes/${mediaId}`, { + const sources = await ctx.proxiedFetcher(`ajax/movie/episodes/${mediaId}`, { headers: { 'X-Requested-With': 'XMLHttpRequest', }, + baseUrl: gomoviesBase, }); const upcloudSource = await getSource(ctx, sources); diff --git a/src/providers/sources/gomovies/source.ts b/src/providers/sources/gomovies/source.ts index c903c8b..279a35c 100644 --- a/src/providers/sources/gomovies/source.ts +++ b/src/providers/sources/gomovies/source.ts @@ -18,10 +18,11 @@ export async function getSource(ctx: ScrapeContext, sources: any) { sources: []; title: string; tracks: []; - }>(`${gomoviesBase}/ajax/sources/${upcloudDataId}`, { + }>(`/ajax/sources/${upcloudDataId}`, { headers: { 'X-Requested-With': 'XMLHttpRequest', }, + baseUrl: gomoviesBase, }); if (!upcloudSource.link || upcloudSource.type !== 'iframe') throw new NotFoundError('No upcloud stream found'); diff --git a/src/providers/sources/kissasian/common.ts b/src/providers/sources/kissasian/common.ts index d9e35e0..014e187 100644 --- a/src/providers/sources/kissasian/common.ts +++ b/src/providers/sources/kissasian/common.ts @@ -1,7 +1,7 @@ import { mp4uploadScraper } from '@/providers/embeds/mp4upload'; import { streamsbScraper } from '@/providers/embeds/streamsb'; -export const kissasianBase = 'https://kissasian.li'; +export const kissasianBase = 'https://kissasian.shp'; export const embedProviders = [ { diff --git a/src/providers/sources/kissasian/getEmbeds.ts b/src/providers/sources/kissasian/getEmbeds.ts index ca15015..c26d358 100644 --- a/src/providers/sources/kissasian/getEmbeds.ts +++ b/src/providers/sources/kissasian/getEmbeds.ts @@ -8,12 +8,17 @@ export async function getEmbeds( ctx: ScrapeContext, targetEpisode: { number: string; - url?: string; + url: string; }, ) { let embeds = await Promise.all( embedProviders.map(async (provider) => { - const watch = await ctx.proxiedFetcher(`${kissasianBase}/${targetEpisode.url}&s=${provider.id}`); + const watch = await ctx.proxiedFetcher(targetEpisode.url, { + baseUrl: kissasianBase, + query: { + s: provider.id, + }, + }); const watchPage = load(watch); diff --git a/src/providers/sources/kissasian/index.ts b/src/providers/sources/kissasian/index.ts index 6175a24..267d561 100644 --- a/src/providers/sources/kissasian/index.ts +++ b/src/providers/sources/kissasian/index.ts @@ -21,11 +21,11 @@ export const kissAsianScraper = makeSourcerer({ const dramas = await search(ctx, ctx.media.title, seasonNumber); const targetDrama = dramas.find((d) => d.name?.toLowerCase() === ctx.media.title.toLowerCase()) ?? dramas[0]; - if (!targetDrama) throw new Error('Drama not found'); + if (!targetDrama) throw new NotFoundError('Drama not found'); ctx.progress(30); - const drama = await ctx.proxiedFetcher(targetDrama.url); + const drama = await ctx.proxiedFetcher(targetDrama.url); const dramaPage = load(drama); @@ -46,11 +46,11 @@ export const kissAsianScraper = makeSourcerer({ const dramas = await search(ctx, ctx.media.title, undefined); const targetDrama = dramas.find((d) => d.name?.toLowerCase() === ctx.media.title.toLowerCase()) ?? dramas[0]; - if (!targetDrama) throw new Error('Drama not found'); + if (!targetDrama) throw new NotFoundError('Drama not found'); ctx.progress(30); - const drama = await ctx.proxiedFetcher(targetDrama.url); + const drama = await ctx.proxiedFetcher(targetDrama.url); const dramaPage = load(drama); diff --git a/src/providers/sources/kissasian/search.ts b/src/providers/sources/kissasian/search.ts index ca9e136..3fc9cd9 100644 --- a/src/providers/sources/kissasian/search.ts +++ b/src/providers/sources/kissasian/search.ts @@ -10,7 +10,7 @@ export async function search(ctx: ScrapeContext, title: string, seasonNumber?: n searchForm.append('keyword', `${title} ${seasonNumber ?? ''}`.trim()); searchForm.append('type', 'Drama'); - const searchResults = await ctx.proxiedFetcher('/Search/SearchSuggest', { + const searchResults = await ctx.proxiedFetcher('/Search/SearchSuggest', { baseUrl: kissasianBase, method: 'POST', body: searchForm, diff --git a/src/providers/sources/superstream/LICENSE b/src/providers/sources/superstream/LICENSE new file mode 100644 index 0000000..3f5347b --- /dev/null +++ b/src/providers/sources/superstream/LICENSE @@ -0,0 +1,680 @@ +Credit goes to @ImZaw and @Blatzar from https://github.com/recloudstream/cloudstream +All files in the current directory (src/providers/list/superstream) are derived from https://github.com/recloudstream/cloudstream-extensions/blob/master/SuperStream/src/main/kotlin/com/lagradost/SuperStream.kt +Below is the license associated with the source of the derived work. + + + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/src/providers/sources/superstream/sendRequest.ts b/src/providers/sources/superstream/sendRequest.ts index 7475e14..ed67a35 100644 --- a/src/providers/sources/superstream/sendRequest.ts +++ b/src/providers/sources/superstream/sendRequest.ts @@ -40,6 +40,7 @@ export const sendRequest = async (ctx: ScrapeContext, data: object, altApi = fal formatted.append('platform', 'android'); formatted.append('version', '129'); formatted.append('medium', 'Website'); + formatted.append('token', nanoid()); const requestUrl = altApi ? apiUrls[1] : apiUrls[0]; @@ -49,7 +50,7 @@ export const sendRequest = async (ctx: ScrapeContext, data: object, altApi = fal Platform: 'android', 'Content-Type': 'application/x-www-form-urlencoded', }, - body: `${formatted.toString()}&token${nanoid()}`, + body: formatted, }); return JSON.parse(response); From 1d147b8e384a60c6725e02117b24fb881b106ce4 Mon Sep 17 00:00:00 2001 From: Isra Date: Mon, 18 Sep 2023 16:40:09 -0500 Subject: [PATCH 16/19] Handle episode not found --- src/providers/sources/kissasian/getEmbeds.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/providers/sources/kissasian/getEmbeds.ts b/src/providers/sources/kissasian/getEmbeds.ts index c26d358..823ae9d 100644 --- a/src/providers/sources/kissasian/getEmbeds.ts +++ b/src/providers/sources/kissasian/getEmbeds.ts @@ -1,6 +1,7 @@ import { load } from 'cheerio'; import type { ScrapeContext } from '@/utils/context'; +import { NotFoundError } from '@/utils/errors'; import { embedProviders, kissasianBase } from './common'; @@ -8,11 +9,12 @@ export async function getEmbeds( ctx: ScrapeContext, targetEpisode: { number: string; - url: string; + url?: string; }, ) { let embeds = await Promise.all( embedProviders.map(async (provider) => { + if (!targetEpisode.url) throw new NotFoundError('Episode not found'); const watch = await ctx.proxiedFetcher(targetEpisode.url, { baseUrl: kissasianBase, query: { From 53b4098540445a7d3a0033e176534b099f9a6fb1 Mon Sep 17 00:00:00 2001 From: Isra Date: Mon, 18 Sep 2023 16:41:26 -0500 Subject: [PATCH 17/19] Fix typo --- src/providers/sources/kissasian/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/sources/kissasian/common.ts b/src/providers/sources/kissasian/common.ts index 014e187..fc284af 100644 --- a/src/providers/sources/kissasian/common.ts +++ b/src/providers/sources/kissasian/common.ts @@ -1,7 +1,7 @@ import { mp4uploadScraper } from '@/providers/embeds/mp4upload'; import { streamsbScraper } from '@/providers/embeds/streamsb'; -export const kissasianBase = 'https://kissasian.shp'; +export const kissasianBase = 'https://kissasian.sh'; export const embedProviders = [ { From 4b23310ed7b5839c251542f331ada4f02e61eeec Mon Sep 17 00:00:00 2001 From: Isra Date: Tue, 19 Sep 2023 11:44:08 -0500 Subject: [PATCH 18/19] Attempt to fix kissasian --- src/providers/sources/gomovies/index.ts | 3 ++- src/providers/sources/kissasian/getEmbeds.ts | 22 +++++++++++++++---- .../sources/kissasian/getEpisodes.ts | 8 +++---- src/providers/sources/kissasian/index.ts | 11 +++++++--- 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/providers/sources/gomovies/index.ts b/src/providers/sources/gomovies/index.ts index f2612fc..e09cf8e 100644 --- a/src/providers/sources/gomovies/index.ts +++ b/src/providers/sources/gomovies/index.ts @@ -43,10 +43,11 @@ export const goMoviesScraper = makeSourcerer({ // Example series path: /tv/watch-{slug}-{id} let mediaId = targetMedia.path.split('-').pop()?.replace('/', ''); - const seasons = await ctx.proxiedFetcher(`${gomoviesBase}/ajax/v2/tv/seasons/${mediaId}`, { + const seasons = await ctx.proxiedFetcher(`/ajax/v2/tv/seasons/${mediaId}`, { headers: { 'X-Requested-With': 'XMLHttpRequest', }, + baseUrl: gomoviesBase, }); const seasonsEl = load(seasons)('.ss-item'); diff --git a/src/providers/sources/kissasian/getEmbeds.ts b/src/providers/sources/kissasian/getEmbeds.ts index 823ae9d..30c5e7e 100644 --- a/src/providers/sources/kissasian/getEmbeds.ts +++ b/src/providers/sources/kissasian/getEmbeds.ts @@ -15,16 +15,30 @@ export async function getEmbeds( let embeds = await Promise.all( embedProviders.map(async (provider) => { if (!targetEpisode.url) throw new NotFoundError('Episode not found'); - const watch = await ctx.proxiedFetcher(targetEpisode.url, { + const watch = await ctx.proxiedFetcher(`${targetEpisode.url}&s=${provider.id}`, { baseUrl: kissasianBase, - query: { - s: provider.id, + headers: { + accept: + 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7', + 'accept-language': 'en-US,en;q=0.9', + 'cache-control': 'no-cache', + pragma: 'no-cache', + 'sec-ch-ua': '"Not)A;Brand";v="24", "Chromium";v="116"', + 'sec-ch-ua-mobile': '?0', + 'sec-ch-ua-platform': '"macOS"', + 'sec-fetch-dest': 'document', + 'sec-fetch-mode': 'navigate', + 'sec-fetch-site': 'cross-site', + 'sec-fetch-user': '?1', + 'upgrade-insecure-requests': '1', + cookie: + '__rd=; ASP.NET_SessionId=jwnl2kmlw5h4mfdaxvpk30q0; k_token=OKbJDFNx3rUtaw7iAA6UxMKSJb79lgZ2X2rVC9aupJhycYQKVSLaW1y2B4K%2f%2fo3i6BuzhXgfkJGmKlKH6LpNlKPPpZUk31n9DapfMdJgjlLExgrPS3jpSKwGnNUI%2bOpNpZu9%2fFnkLZRxvVKCa8APMxrck1tYkKXWqfyJJh8%2b7hQTI1wfAOU%2fLEouHhtQGL%2fReTzElw2LQ0XSL1pjs%2fkWW3rM3of2je7Oo13I%2f7olLFuiJUVWyNbn%2fYKSgNrm%2bQ3p', }, }); const watchPage = load(watch); - const embedUrl = watchPage('iframe[id=my_video_1]').attr('src'); + const embedUrl = watchPage('#my_video_1').attr('src'); if (!embedUrl) throw new Error('Embed not found'); diff --git a/src/providers/sources/kissasian/getEpisodes.ts b/src/providers/sources/kissasian/getEpisodes.ts index 1576a81..7ea4466 100644 --- a/src/providers/sources/kissasian/getEpisodes.ts +++ b/src/providers/sources/kissasian/getEpisodes.ts @@ -1,13 +1,13 @@ import type { CheerioAPI } from 'cheerio'; -export async function getEpisodes(dramaPage: CheerioAPI) { - const episodesEl = dramaPage('tbody tr:not(:first-child)'); +export function getEpisodes(dramaPage: CheerioAPI) { + const episodesEl = dramaPage('.episodeSub'); return episodesEl .toArray() .map((ep) => { - const number = dramaPage(ep).find('td.episodeSub a').text().split('Episode')[1]?.trim(); - const url = dramaPage(ep).find('td.episodeSub a').attr('href'); + const number = dramaPage(ep).find('.episodeSub a').text().split('Episode')[1]?.trim(); + const url = dramaPage(ep).find('.episodeSub a').attr('href'); return { number, url }; }) .filter((e) => !!e.url); diff --git a/src/providers/sources/kissasian/index.ts b/src/providers/sources/kissasian/index.ts index 267d561..1f765c1 100644 --- a/src/providers/sources/kissasian/index.ts +++ b/src/providers/sources/kissasian/index.ts @@ -4,6 +4,7 @@ import { flags } from '@/main/targets'; import { makeSourcerer } from '@/providers/base'; import { NotFoundError } from '@/utils/errors'; +import { kissasianBase } from './common'; import { getEmbeds } from './getEmbeds'; import { getEpisodes } from './getEpisodes'; import { search } from './search'; @@ -25,7 +26,9 @@ export const kissAsianScraper = makeSourcerer({ ctx.progress(30); - const drama = await ctx.proxiedFetcher(targetDrama.url); + const drama = await ctx.proxiedFetcher(targetDrama.url, { + baseUrl: kissasianBase, + }); const dramaPage = load(drama); @@ -50,11 +53,13 @@ export const kissAsianScraper = makeSourcerer({ ctx.progress(30); - const drama = await ctx.proxiedFetcher(targetDrama.url); + const drama = await ctx.proxiedFetcher(targetDrama.url, { + baseUrl: kissasianBase, + }); const dramaPage = load(drama); - const episodes = await getEpisodes(dramaPage); + const episodes = getEpisodes(dramaPage); const targetEpisode = episodes[0]; if (!targetEpisode?.url) throw new NotFoundError('Episode not found'); From 27997089923c764b801e3dfad4b3596fce888793 Mon Sep 17 00:00:00 2001 From: William Oldham Date: Wed, 27 Sep 2023 18:50:45 +0100 Subject: [PATCH 19/19] Set kissasian to be disabled --- src/providers/sources/kissasian/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/providers/sources/kissasian/index.ts b/src/providers/sources/kissasian/index.ts index 1f765c1..67111ca 100644 --- a/src/providers/sources/kissasian/index.ts +++ b/src/providers/sources/kissasian/index.ts @@ -14,6 +14,7 @@ export const kissAsianScraper = makeSourcerer({ name: 'KissAsian', rank: 130, flags: [flags.NO_CORS], + disabled: true, async scrapeShow(ctx) { const seasonNumber = ctx.media.season.number;