Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(gogoanime): Add Mp4Upload as server on fetchEpisodeSources, fix(streamwish): Fix encoding error #592

Merged
merged 1 commit into from
Oct 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/extractors/streamwish.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/extractors/streamwish.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions dist/providers/anime/gogoanime.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/providers/anime/gogoanime.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/providers/anime/monoschinos.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/extractors/streamwish.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class StreamWish extends VideoExtractor {
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-Encoding': 'gzip, deflate, zstd',
'Accept-Encoding': '*',
'Accept-Language': 'en-US,en;q=0.9',
'Cache-Control': 'max-age=0',
Priority: 'u=0, i',
Expand Down
15 changes: 14 additions & 1 deletion src/providers/anime/gogoanime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
ProxyConfig,
} from '../../models';
import { USER_AGENT } from '../../utils';
import { GogoCDN, StreamSB, StreamWish } from '../../extractors';
import { GogoCDN, Mp4Upload, StreamSB, StreamWish } from '../../extractors';

class Gogoanime extends AnimeParser {
override readonly name = 'Gogoanime';
Expand Down Expand Up @@ -183,93 +183,106 @@
* @param episodeId episode id
* @param server server type (default 'GogoCDN') (optional)
*/
override fetchEpisodeSources = async (
episodeId: string,
server: StreamingServers = StreamingServers.VidStreaming,
downloadUrl: string | undefined = undefined
): Promise<ISource> => {
if (episodeId.startsWith('http')) {
const serverUrl = new URL(episodeId);
switch (server) {
case StreamingServers.GogoCDN:
return {
headers: { Referer: serverUrl.origin },
sources: await new GogoCDN(this.proxyConfig, this.adapter).extract(serverUrl),
download: downloadUrl ? downloadUrl : `https://${serverUrl.host}/download${serverUrl.search}`,
};
case StreamingServers.StreamSB:
return {
headers: {
Referer: serverUrl.href,
watchsb: 'streamsb',
'User-Agent': USER_AGENT,
},
sources: await new StreamSB(this.proxyConfig, this.adapter).extract(serverUrl),
download: downloadUrl ? downloadUrl : `https://${serverUrl.host}/download${serverUrl.search}`,
};
case StreamingServers.Mp4Upload:
return {
headers: {
Referer: serverUrl.origin,
},
sources: await new Mp4Upload(this.proxyConfig, this.adapter).extract(serverUrl),
download: downloadUrl ? downloadUrl : `https://${serverUrl.host}/download${serverUrl.search}`,
};
case StreamingServers.StreamWish:
return {
headers: {
Referer: serverUrl.origin,
},
sources: await new StreamWish(this.proxyConfig, this.adapter).extract(serverUrl),
download: downloadUrl ? downloadUrl : `https://${serverUrl.host}/download${serverUrl.search}`,
};
default:
return {
headers: { Referer: serverUrl.origin },
sources: await new GogoCDN(this.proxyConfig, this.adapter).extract(serverUrl),
download: downloadUrl ? downloadUrl : `https://${serverUrl.host}/download${serverUrl.search}`,
};
}
}

try {
const res = await this.client.get(`${this.baseUrl}/${episodeId}`);

const $ = load(res.data);

let serverUrl: URL;

switch (server) {
case StreamingServers.GogoCDN:
serverUrl = new URL(`${$('#load_anime > div > div > iframe').attr('src')}`);
break;
case StreamingServers.VidStreaming:
serverUrl = new URL(
`${$('div.anime_video_body > div.anime_muti_link > ul > li.vidcdn > a').attr('data-video')}`
);
break;
case StreamingServers.StreamSB:
serverUrl = new URL(
$('div.anime_video_body > div.anime_muti_link > ul > li.streamsb > a').attr('data-video')!
);
break;
case StreamingServers.StreamWish:
serverUrl = new URL(
$('div.anime_video_body > div.anime_muti_link > ul > li.streamwish > a').attr('data-video')!
);
break;
case StreamingServers.Mp4Upload:
serverUrl = new URL(
$('div.anime_video_body > div.anime_muti_link > ul > li.mp4upload > a').attr('data-video')!
);
break;
default:
serverUrl = new URL(`${$('#load_anime > div > div > iframe').attr('src')}`);
break;
}

const downloadLink = `${$('.dowloads > a').attr('href')}`;

return downloadLink
? await this.fetchEpisodeSources(serverUrl.href, server, downloadLink)
: await this.fetchEpisodeSources(serverUrl.href, server);
} catch (err) {
console.log(err);
throw new Error('Episode not found.');
}
};

/**
*
* @param episodeId episode link or episode id
*/

Check notice on line 285 in src/providers/anime/gogoanime.ts

View check run for this annotation

codefactor.io / CodeFactor

src/providers/anime/gogoanime.ts#L186-L285

Complex Method
override fetchEpisodeServers = async (episodeId: string): Promise<IEpisodeServer[]> => {
try {
if (!episodeId.startsWith(this.baseUrl)) episodeId = `${this.baseUrl}/${episodeId}`;
Expand Down
Loading