Merge branch 'dev' into fix-goojara

.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
 

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",

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",

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");

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<string[]> => {
-  const res = await ctx.fetcher<string>('https://raw.githubusercontent.com/Ciarands/vidsrc-keys/main/keys.json');
+  const res = await ctx.proxiedFetcher<string>('https://github.com/Ciarands/vidsrc-keys/blob/main/keys.json');
-  return JSON.parse(res);
+  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) => {

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,

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,

src/providers/sources/vidsrcto/index.ts

@@ -83,5 +83,5 @@ export const vidSrcToScraper = makeSourcerer({
   scrapeMovie: universalScraper,
   scrapeShow: universalScraper,
   flags: [],
-  rank: 400,
+  rank: 300,
 });

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<string, string>; // these headers HAVE to be set to watch the stream
   preferredHeaders?: Record<string, string>; // these headers are optional, would improve the stream
 };