Merge pull request #152 from movie-web/dev

Version 2.3.0: Disabling Showbox

.docs/content/1.get-started/4.changelog.md

@@ -2,6 +2,11 @@
 title: 'Changelog'
 ---
 
+# Version 2.3.0
+- Fixed RidoMovies search results
+- Added Insertunit, SoaperTV, and WarezCDN providers
+- Disabled Showbox and VidSrc
+
 # Version 2.2.9
 - Fixed VidSrcTo (both Vidplay and Filemoon embeds) 
 - Added dropload, filelions and vtube embeds to Primewire

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movie-web/providers",
-  "version": "2.2.9",
+  "version": "2.3.0",
   "description": "Package that contains all the providers of movie-web",
   "type": "module",
   "main": "./lib/index.js",

src/providers/sources/vidsrc/index.ts

@@ -6,6 +6,7 @@ export const vidsrcScraper = makeSourcerer({
   id: 'vidsrc',
   name: 'VidSrc',
   rank: 90,
+  disabled: true,
   flags: [],
   scrapeMovie,
   scrapeShow,

src/providers/sources/warezcdn/common.ts

@@ -1,4 +1,24 @@
+import { ScrapeContext } from '@/utils/context';
+
 export const warezcdnBase = 'https://embed.warezcdn.com';
 export const warezcdnApiBase = 'https://warezcdn.com/embed';
 export const warezcdnPlayerBase = 'https://warezcdn.com/player';
 export const warezcdnWorkerProxy = 'https://workerproxy.warezcdn.workers.dev';
+
+export async function getExternalPlayerUrl(ctx: ScrapeContext, embedId: string, embedUrl: string) {
+  const params = {
+    id: embedUrl,
+    sv: embedId,
+  };
+  const realUrl = await ctx.proxiedFetcher<string>(`/getPlay.php`, {
+    baseUrl: warezcdnApiBase,
+    headers: {
+      Referer: `${warezcdnApiBase}/getEmbed.php?${new URLSearchParams(params)}`,
+    },
+    query: params,
+  });
+
+  const realEmbedUrl = realUrl.match(/window\.location\.href="([^"]*)";/);
+  if (!realEmbedUrl) throw new Error('Could not find embed url');
+  return realEmbedUrl[1];
+}

src/providers/sources/warezcdn/index.ts

@@ -5,74 +5,110 @@ import { SourcererEmbed, makeSourcerer } from '@/providers/base';
 import { mixdropScraper } from '@/providers/embeds/mixdrop';
 import { warezcdnembedHlsScraper } from '@/providers/embeds/warezcdn/hls';
 import { warezcdnembedMp4Scraper } from '@/providers/embeds/warezcdn/mp4';
-import { MovieScrapeContext, ShowScrapeContext } from '@/utils/context';
 import { NotFoundError } from '@/utils/errors';
 
-import { warezcdnApiBase, warezcdnBase } from './common';
-
-const universalScraper = async (ctx: MovieScrapeContext | ShowScrapeContext) => {
-  if (!ctx.media.imdbId) throw new NotFoundError('This source requires IMDB id.');
-
-  let id = `filme/${ctx.media.imdbId}`;
-  if (ctx.media.type === 'show')
-    id = `serie/${ctx.media.imdbId}/${ctx.media.season.number}/${ctx.media.episode.number}`;
-
-  const serversPage = await ctx.proxiedFetcher<string>(`/${id}`, {
-    baseUrl: warezcdnBase,
-  });
-  const $ = load(serversPage);
-
-  const embedsHost = $('.hostList.active [data-load-embed]').get();
-
-  const embeds: SourcererEmbed[] = [];
-
-  embedsHost.forEach(async (element) => {
-    const embedHost = $(element).attr('data-load-embed-host')!;
-    const embedUrl = $(element).attr('data-load-embed')!;
-
-    if (embedHost === 'mixdrop') {
-      const params = {
-        id: embedUrl,
-        sv: 'mixdrop',
-      };
-      const realUrl = await ctx.proxiedFetcher<string>(`/getPlay.php`, {
-        baseUrl: warezcdnApiBase,
-        headers: {
-          Referer: `${warezcdnApiBase}/getEmbed.php?${new URLSearchParams(params)}`,
-        },
-        query: params,
-      });
-
-      const realEmbedUrl = realUrl.match(/window\.location\.href="([^"]*)";/);
-      if (!realEmbedUrl) throw new Error('Could not find embed url');
-      embeds.push({
-        embedId: mixdropScraper.id,
-        url: realEmbedUrl[1],
-      });
-    } else if (embedHost === 'warezcdn') {
-      embeds.push(
-        {
-          embedId: warezcdnembedHlsScraper.id,
-          url: embedUrl,
-        },
-        {
-          embedId: warezcdnembedMp4Scraper.id,
-          url: embedUrl,
-        },
-      );
-    }
-  });
-
-  return {
-    embeds,
-  };
-};
+import { getExternalPlayerUrl, warezcdnBase } from './common';
+import { SerieAjaxResponse } from './types';
 
 export const warezcdnScraper = makeSourcerer({
   id: 'warezcdn',
   name: 'WarezCDN',
   rank: 81,
   flags: [flags.CORS_ALLOWED],
-  scrapeMovie: universalScraper,
-  scrapeShow: universalScraper,
+  scrapeMovie: async (ctx) => {
+    if (!ctx.media.imdbId) throw new NotFoundError('This source requires IMDB id.');
+
+    const serversPage = await ctx.proxiedFetcher<string>(`/filme/${ctx.media.imdbId}`, {
+      baseUrl: warezcdnBase,
+    });
+    const $ = load(serversPage);
+
+    const embedsHost = $('.hostList.active [data-load-embed]').get();
+
+    const embeds: SourcererEmbed[] = [];
+
+    embedsHost.forEach(async (element) => {
+      const embedHost = $(element).attr('data-load-embed-host')!;
+      const embedUrl = $(element).attr('data-load-embed')!;
+
+      if (embedHost === 'mixdrop') {
+        const realEmbedUrl = await getExternalPlayerUrl(ctx, 'mixdrop', embedUrl);
+        if (!realEmbedUrl) throw new Error('Could not find embed url');
+        embeds.push({
+          embedId: mixdropScraper.id,
+          url: realEmbedUrl,
+        });
+      } else if (embedHost === 'warezcdn') {
+        embeds.push(
+          {
+            embedId: warezcdnembedHlsScraper.id,
+            url: embedUrl,
+          },
+          {
+            embedId: warezcdnembedMp4Scraper.id,
+            url: embedUrl,
+          },
+        );
+      }
+    });
+
+    return {
+      embeds,
+    };
+  },
+  scrapeShow: async (ctx) => {
+    if (!ctx.media.imdbId) throw new NotFoundError('This source requires IMDB id.');
+
+    const url = `${warezcdnBase}/serie/${ctx.media.imdbId}/${ctx.media.season.number}/${ctx.media.episode.number}`;
+
+    const serversPage = await ctx.proxiedFetcher<string>(url);
+
+    const episodeId = serversPage.match(/\$\('\[data-load-episode-content="(\d+)"\]'\)/)?.[1];
+
+    if (!episodeId) throw new NotFoundError('Failed to find episode id');
+
+    const streamsData = await ctx.proxiedFetcher<string>(`/serieAjax.php`, {
+      method: 'POST',
+      baseUrl: warezcdnBase,
+      body: new URLSearchParams({
+        getAudios: episodeId,
+      }),
+      headers: {
+        Origin: warezcdnBase,
+        Referer: url,
+        'X-Requested-With': 'XMLHttpRequest',
+      },
+    });
+
+    const streams: SerieAjaxResponse = JSON.parse(streamsData);
+    const list = streams.list['0'];
+    const embeds: SourcererEmbed[] = [];
+
+    // 3 means ok
+    if (list.mixdropStatus === '3') {
+      const realEmbedUrl = await getExternalPlayerUrl(ctx, 'mixdrop', list.id);
+      if (!realEmbedUrl) throw new Error('Could not find embed url');
+      embeds.push({
+        embedId: mixdropScraper.id,
+        url: realEmbedUrl,
+      });
+    }
+
+    if (list.warezcdnStatus === '3') {
+      embeds.push(
+        {
+          embedId: warezcdnembedHlsScraper.id,
+          url: list.id,
+        },
+        {
+          embedId: warezcdnembedMp4Scraper.id,
+          url: list.id,
+        },
+      );
+    }
+
+    return {
+      embeds,
+    };
+  },
 });

src/providers/sources/warezcdn/types.ts

@@ -0,0 +1,16 @@
+interface Data {
+  id: string;
+  audio: string;
+  mixdropStatus: string;
+  fembedStatus: string;
+  streamtapeStatus: string;
+  warezcdnStatus: string;
+}
+
+type List = {
+  [key: string]: Data;
+};
+
+export interface SerieAjaxResponse {
+  list: List;
+}