From fe90bdaa9ae03693f9c17537b8d0a5359a13ca23 Mon Sep 17 00:00:00 2001 From: Jorrin Date: Sat, 3 Feb 2024 01:28:37 +0100 Subject: [PATCH 1/7] fix keys being cached for 5 minutes --- src/providers/embeds/vidplay/common.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/providers/embeds/vidplay/common.ts b/src/providers/embeds/vidplay/common.ts index 3eb19a9..d19cc02 100644 --- a/src/providers/embeds/vidplay/common.ts +++ b/src/providers/embeds/vidplay/common.ts @@ -9,8 +9,12 @@ export const referer = `${vidplayBase}/`; // Full credits to @Ciarands! export const getDecryptionKeys = async (ctx: EmbedScrapeContext): Promise => { - const res = await ctx.fetcher('https://raw.githubusercontent.com/Ciarands/vidsrc-keys/main/keys.json'); - return JSON.parse(res); + const res = await ctx.fetcher('https://github.com/Ciarands/vidsrc-keys/blob/main/keys.json'); + const regex = /"rawLines":\s*\[([\s\S]*?)\]/; + const rawLines = res.match(regex)?.[1]; + if (!rawLines) throw new Error('No keys found'); + const keys = JSON.parse(`${rawLines.substring(1).replace(/\\"/g, '"')}]`); + return keys; }; export const getEncodedId = async (ctx: EmbedScrapeContext) => { From 16dcca270c79de5cd9f0a657c56fe80f705c0ab4 Mon Sep 17 00:00:00 2001 From: Jorrin Date: Sat, 3 Feb 2024 02:29:09 +0100 Subject: [PATCH 2/7] that should be proxied obviously --- src/providers/embeds/vidplay/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/embeds/vidplay/common.ts b/src/providers/embeds/vidplay/common.ts index d19cc02..f10681a 100644 --- a/src/providers/embeds/vidplay/common.ts +++ b/src/providers/embeds/vidplay/common.ts @@ -9,7 +9,7 @@ export const referer = `${vidplayBase}/`; // Full credits to @Ciarands! export const getDecryptionKeys = async (ctx: EmbedScrapeContext): Promise => { - const res = await ctx.fetcher('https://github.com/Ciarands/vidsrc-keys/blob/main/keys.json'); + const res = await ctx.proxiedFetcher('https://github.com/Ciarands/vidsrc-keys/blob/main/keys.json'); const regex = /"rawLines":\s*\[([\s\S]*?)\]/; const rawLines = res.match(regex)?.[1]; if (!rawLines) throw new Error('No keys found'); From f4bc3831e1126b4ef6edf1a6881ebff16d2566b5 Mon Sep 17 00:00:00 2001 From: mrjvs Date: Wed, 7 Feb 2024 19:24:41 +0100 Subject: [PATCH 3/7] Add thumbnail track option to response --- src/providers/streams.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/providers/streams.ts b/src/providers/streams.ts index f4674c6..17567a4 100644 --- a/src/providers/streams.ts +++ b/src/providers/streams.ts @@ -8,10 +8,16 @@ export type StreamFile = { export type Qualities = 'unknown' | '360' | '480' | '720' | '1080' | '4k'; +type ThumbnailTrack = { + type: 'vtt'; + url: string; +}; + type StreamCommon = { id: string; // only unique per output flags: Flags[]; captions: Caption[]; + thumbnailTrack?: ThumbnailTrack; headers?: Record; // these headers HAVE to be set to watch the stream preferredHeaders?: Record; // these headers are optional, would improve the stream }; From 8a5392f08b21a7834a59914e7f358dbdd7cc7379 Mon Sep 17 00:00:00 2001 From: William Oldham Date: Sat, 10 Feb 2024 17:48:51 +0000 Subject: [PATCH 4/7] Bump version to 2.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f21eb89..3ea5af9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@movie-web/providers", - "version": "2.1.1", + "version": "2.2.0", "description": "Package that contains all the providers of movie-web", "main": "./lib/index.umd.js", "types": "./lib/index.d.ts", From 311eefb74f8c8b650e7f01ca6d6fa26928786024 Mon Sep 17 00:00:00 2001 From: William Oldham Date: Sat, 10 Feb 2024 19:12:00 +0000 Subject: [PATCH 5/7] Update package-lock.json --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index f5536e8..033f07f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@movie-web/providers", - "version": "2.1.1", + "version": "2.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@movie-web/providers", - "version": "2.1.1", + "version": "2.2.0", "license": "MIT", "dependencies": { "cheerio": "^1.0.0-rc.12", From 805e520f824c9f7b3580837642fd5c88030ffd4b Mon Sep 17 00:00:00 2001 From: William Oldham Date: Sat, 10 Feb 2024 19:23:30 +0000 Subject: [PATCH 6/7] Add 2.2 changelog and re-order sources --- .docs/content/1.get-started/4.changelog.md | 10 ++++++++++ src/providers/sources/lookmovie/index.ts | 1 + src/providers/sources/showbox/index.ts | 2 +- src/providers/sources/vidsrcto/index.ts | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.docs/content/1.get-started/4.changelog.md b/.docs/content/1.get-started/4.changelog.md index f03e407..1e18e51 100644 --- a/.docs/content/1.get-started/4.changelog.md +++ b/.docs/content/1.get-started/4.changelog.md @@ -2,6 +2,16 @@ title: 'Changelog' --- +# Version 2.2.0 +- Fixed vidsrc.me URL decoding. +- Added ridomovies with Ridoo and Closeload embed. +- Added Goojara.to source. +- Fixed VidSrcTo crashing if no subtitles are found. +- Added Nepu Provider. +- Added vidcloud to flixhq and zoechip. +- Add thumbnail track option to response (Not supported by any providers yet). +- Disabled Lookmovie and swapped Showbox and VidSrcTo in ranking. + # Version 2.1.1 - Fixed vidplay decryption keys being wrong and switched the domain to one that works diff --git a/src/providers/sources/lookmovie/index.ts b/src/providers/sources/lookmovie/index.ts index 6fbe6de..db24196 100644 --- a/src/providers/sources/lookmovie/index.ts +++ b/src/providers/sources/lookmovie/index.ts @@ -32,6 +32,7 @@ async function universalScraper(ctx: MovieScrapeContext | ShowScrapeContext): Pr export const lookmovieScraper = makeSourcerer({ id: 'lookmovie', name: 'LookMovie', + disabled: true, rank: 700, flags: [flags.IP_LOCKED], scrapeShow: universalScraper, diff --git a/src/providers/sources/showbox/index.ts b/src/providers/sources/showbox/index.ts index c8a834a..ce3eceb 100644 --- a/src/providers/sources/showbox/index.ts +++ b/src/providers/sources/showbox/index.ts @@ -41,7 +41,7 @@ async function comboScraper(ctx: ShowScrapeContext | MovieScrapeContext): Promis export const showboxScraper = makeSourcerer({ id: 'showbox', name: 'Showbox', - rank: 300, + rank: 400, flags: [flags.CORS_ALLOWED, flags.CF_BLOCKED], scrapeShow: comboScraper, scrapeMovie: comboScraper, diff --git a/src/providers/sources/vidsrcto/index.ts b/src/providers/sources/vidsrcto/index.ts index 6912ae1..94edc3d 100644 --- a/src/providers/sources/vidsrcto/index.ts +++ b/src/providers/sources/vidsrcto/index.ts @@ -83,5 +83,5 @@ export const vidSrcToScraper = makeSourcerer({ scrapeMovie: universalScraper, scrapeShow: universalScraper, flags: [], - rank: 400, + rank: 300, }); From 2c343968977a49a05e2df462f6dd15dab847883f Mon Sep 17 00:00:00 2001 From: Jorrin Date: Tue, 13 Feb 2024 18:34:29 +0100 Subject: [PATCH 7/7] fix closeload scraper --- src/providers/embeds/closeload.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/embeds/closeload.ts b/src/providers/embeds/closeload.ts index 0235a49..811323a 100644 --- a/src/providers/embeds/closeload.ts +++ b/src/providers/embeds/closeload.ts @@ -43,7 +43,7 @@ export const closeLoadScraper = makeEmbed({ const evalCode = iframeRes$('script') .filter((_, el) => { const script = iframeRes$(el); - return (script.attr('type') === 'text/javascript' && script.html()?.includes('eval')) ?? false; + return (script.attr('type') === 'text/javascript' && script.html()?.includes('p,a,c,k,e,d')) ?? false; }) .html(); if (!evalCode) throw new Error("Couldn't find eval code");