From 49d1e5868104441cd2e459cdab84d5eb7c65cfea Mon Sep 17 00:00:00 2001 From: Ciarands <74070993+Ciarands@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:31:50 +0100 Subject: [PATCH 1/5] Add IP_LOCKED flag to vidplay --- src/providers/embeds/vidplay/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/embeds/vidplay/index.ts b/src/providers/embeds/vidplay/index.ts index fb5b7c2..f37054b 100644 --- a/src/providers/embeds/vidplay/index.ts +++ b/src/providers/embeds/vidplay/index.ts @@ -54,7 +54,7 @@ export const vidplayScraper = makeEmbed({ id: 'primary', type: 'hls', playlist: source, - flags: [flags.CORS_ALLOWED], + flags: [flags.IP_LOCKED], captions, thumbnailTrack, }, From 97008a643965aad08e9d01a5ad4b39e6e785fb1c Mon Sep 17 00:00:00 2001 From: Ciarands <74070993+Ciarands@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:32:18 +0100 Subject: [PATCH 2/5] Add IP_LOCKED flag to vidsrcto --- src/providers/sources/vidsrcto/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/sources/vidsrcto/index.ts b/src/providers/sources/vidsrcto/index.ts index d5f72e2..937a4af 100644 --- a/src/providers/sources/vidsrcto/index.ts +++ b/src/providers/sources/vidsrcto/index.ts @@ -78,6 +78,6 @@ export const vidSrcToScraper = makeSourcerer({ name: 'VidSrcTo', scrapeMovie: universalScraper, scrapeShow: universalScraper, - flags: [flags.CORS_ALLOWED], + flags: [flags.IP_LOCKED], rank: 130, }); From b8570bb560cfa1c2e74c92753fce85463d521b8c Mon Sep 17 00:00:00 2001 From: Ciarands <74070993+Ciarands@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:47:55 +0100 Subject: [PATCH 3/5] Add referrer and origin to vidplay --- src/providers/embeds/vidplay/index.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/providers/embeds/vidplay/index.ts b/src/providers/embeds/vidplay/index.ts index f37054b..a2914ee 100644 --- a/src/providers/embeds/vidplay/index.ts +++ b/src/providers/embeds/vidplay/index.ts @@ -29,6 +29,7 @@ export const vidplayScraper = makeEmbed({ } const url = new URL(ctx.url); + console.log(url); const subtitlesLink = url.searchParams.get('sub.info'); const captions: Caption[] = []; if (subtitlesLink) { @@ -55,6 +56,10 @@ export const vidplayScraper = makeEmbed({ type: 'hls', playlist: source, flags: [flags.IP_LOCKED], + headers: { + Referer: url.origin, + Origin: url.origin, + }, captions, thumbnailTrack, }, From 464f34d5748e10797999a51f37e989582b3a36ac Mon Sep 17 00:00:00 2001 From: Ciarands <74070993+Ciarands@users.noreply.github.com> Date: Wed, 3 Apr 2024 15:48:41 +0100 Subject: [PATCH 4/5] Remove console.log --- src/providers/embeds/vidplay/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/providers/embeds/vidplay/index.ts b/src/providers/embeds/vidplay/index.ts index a2914ee..0c34459 100644 --- a/src/providers/embeds/vidplay/index.ts +++ b/src/providers/embeds/vidplay/index.ts @@ -29,7 +29,6 @@ export const vidplayScraper = makeEmbed({ } const url = new URL(ctx.url); - console.log(url); const subtitlesLink = url.searchParams.get('sub.info'); const captions: Caption[] = []; if (subtitlesLink) { From d25e1eaede675625356e0265d8343ed1088ad1ee Mon Sep 17 00:00:00 2001 From: Jorrin Date: Wed, 3 Apr 2024 17:30:01 +0200 Subject: [PATCH 5/5] filemoon fix --- src/providers/embeds/filemoon/index.ts | 4 ++-- src/providers/embeds/vidplay/index.ts | 3 +-- src/providers/sources/vidsrcto/index.ts | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/providers/embeds/filemoon/index.ts b/src/providers/embeds/filemoon/index.ts index dc8a053..e63e2be 100644 --- a/src/providers/embeds/filemoon/index.ts +++ b/src/providers/embeds/filemoon/index.ts @@ -23,7 +23,7 @@ export const fileMoonScraper = makeEmbed({ const embedHtml = load(embedRes); const evalCode = embedHtml('script').text().match(evalCodeRegex); if (!evalCode) throw new Error('Failed to find eval code'); - const unpacked = unpack(evalCode[1]); + const unpacked = unpack(evalCode[0]); const file = fileRegex.exec(unpacked); if (!file?.[1]) throw new Error('Failed to find file'); @@ -53,7 +53,7 @@ export const fileMoonScraper = makeEmbed({ id: 'primary', type: 'hls', playlist: file[1], - flags: [flags.CORS_ALLOWED], + flags: [], captions, }, ], diff --git a/src/providers/embeds/vidplay/index.ts b/src/providers/embeds/vidplay/index.ts index 0c34459..781909c 100644 --- a/src/providers/embeds/vidplay/index.ts +++ b/src/providers/embeds/vidplay/index.ts @@ -1,4 +1,3 @@ -import { flags } from '@/entrypoint/utils/targets'; import { makeEmbed } from '@/providers/base'; import { Caption, getCaptionTypeFromUrl, labelToLanguageCode } from '@/providers/captions'; @@ -54,7 +53,7 @@ export const vidplayScraper = makeEmbed({ id: 'primary', type: 'hls', playlist: source, - flags: [flags.IP_LOCKED], + flags: [], headers: { Referer: url.origin, Origin: url.origin, diff --git a/src/providers/sources/vidsrcto/index.ts b/src/providers/sources/vidsrcto/index.ts index 937a4af..0f99b4e 100644 --- a/src/providers/sources/vidsrcto/index.ts +++ b/src/providers/sources/vidsrcto/index.ts @@ -1,6 +1,5 @@ import { load } from 'cheerio'; -import { flags } from '@/entrypoint/utils/targets'; import { SourcererEmbed, SourcererOutput, makeSourcerer } from '@/providers/base'; import { MovieScrapeContext, ShowScrapeContext } from '@/utils/context'; @@ -78,6 +77,6 @@ export const vidSrcToScraper = makeSourcerer({ name: 'VidSrcTo', scrapeMovie: universalScraper, scrapeShow: universalScraper, - flags: [flags.IP_LOCKED], + flags: [], rank: 130, });