Merge pull request #148 from movie-web/feature/disable-showbox

Disable showbox

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

@@ -2,6 +2,12 @@
 title: 'Changelog'
 ---
 
+# Version 2.2.9
+- Fixed VidSrcTo (both Vidplay and Filemoon embeds) 
+- Added dropload, filelions and vtube embeds to Primewire
+- Fixed and enabled Smashystream
+- Improved RidoMovies search results
+
 # Version 2.2.8
 - Fix package exports for CJS and ESM
 - Fixed Mixdrop embed

.docs/pnpm-lock.yaml

@@ -7370,7 +7370,7 @@ packages:
       fast-glob: 3.3.2
       js-yaml: 4.1.0
       supports-color: 9.4.0
-      undici: 5.28.3
+      undici: 5.28.4
       yargs-parser: 21.1.1
     dev: true
 
@@ -9117,8 +9117,8 @@ packages:
     resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
     dev: true
 
-  /undici@5.28.3:
-    resolution: {integrity: sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==}
+  /undici@5.28.4:
+    resolution: {integrity: sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==}
     engines: {node: '>=14.0'}
     dependencies:
       '@fastify/busboy': 2.1.1

package.json

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

src/providers/all.ts

@@ -24,7 +24,7 @@ import { zoechipScraper } from '@/providers/sources/zoechip';
 import { closeLoadScraper } from './embeds/closeload';
 import { fileMoonScraper } from './embeds/filemoon';
 import { ridooScraper } from './embeds/ridoo';
-import { smashyStreamDScraper } from './embeds/smashystream/dued';
+import { smashyStreamOScraper } from './embeds/smashystream/opstream';
 import { smashyStreamFScraper } from './embeds/smashystream/video1';
 import { streamtapeScraper } from './embeds/streamtape';
 import { streamvidScraper } from './embeds/streamvid';
@@ -75,7 +75,7 @@ export function gatherAllEmbeds(): Array<Embed> {
     vidsrcembedScraper,
     streambucketScraper,
     smashyStreamFScraper,
-    smashyStreamDScraper,
+    smashyStreamOScraper,
     ridooScraper,
     closeLoadScraper,
     fileMoonScraper,

src/providers/embeds/smashystream/dued.ts

@@ -1,71 +0,0 @@
-import { load } from 'cheerio';
-
-import { flags } from '@/entrypoint/utils/targets';
-import { makeEmbed } from '@/providers/base';
-
-type DPlayerSourcesResponse = {
-  title: string;
-  id: string;
-  file: string;
-}[];
-
-export const smashyStreamDScraper = makeEmbed({
-  id: 'smashystream-d',
-  name: 'SmashyStream (D)',
-  rank: 71,
-  async scrape(ctx) {
-    const mainPageRes = await ctx.proxiedFetcher<string>(ctx.url, {
-      headers: {
-        Referer: ctx.url,
-      },
-    });
-    const mainPageRes$ = load(mainPageRes);
-    const iframeUrl = mainPageRes$('iframe').attr('src');
-    if (!iframeUrl) throw new Error(`[${this.name}] failed to find iframe url`);
-    const mainUrl = new URL(iframeUrl);
-    const iframeRes = await ctx.proxiedFetcher<string>(iframeUrl, {
-      headers: {
-        Referer: ctx.url,
-      },
-    });
-    const textFilePath = iframeRes.match(/"file":"([^"]+)"/)?.[1];
-    const csrfToken = iframeRes.match(/"key":"([^"]+)"/)?.[1];
-    if (!textFilePath || !csrfToken) throw new Error(`[${this.name}] failed to find text file url or token`);
-    const textFileUrl = `${mainUrl.origin}${textFilePath}`;
-    const textFileRes = await ctx.proxiedFetcher<DPlayerSourcesResponse>(textFileUrl, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'X-CSRF-TOKEN': csrfToken,
-        Referer: iframeUrl,
-      },
-    });
-    // Playlists in Hindi, English, Tamil and Telugu are available. We only get the english one.
-    const textFilePlaylist = textFileRes.find((x) => x.title === 'English')?.file;
-    if (!textFilePlaylist) throw new Error(`[${this.name}] failed to find an english playlist`);
-
-    const playlistRes = await ctx.proxiedFetcher<string>(
-      `${mainUrl.origin}/playlist/${textFilePlaylist.slice(1)}.txt`,
-      {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          'X-CSRF-TOKEN': csrfToken,
-          Referer: iframeUrl,
-        },
-      },
-    );
-
-    return {
-      stream: [
-        {
-          id: 'primary',
-          playlist: playlistRes,
-          type: 'hls',
-          flags: [flags.CORS_ALLOWED],
-          captions: [],
-        },
-      ],
-    };
-  },
-});

src/providers/embeds/smashystream/opstream.ts

@@ -0,0 +1,17 @@
+import { makeEmbed } from '@/providers/base';
+
+import { smashyStreamFScraper } from './video1';
+
+export const smashyStreamOScraper = makeEmbed({
+  // the scraping logic for all smashystream embeds is the same
+  // all the embeds can be added in the same way
+  id: 'smashystream-o',
+  name: 'SmashyStream (O)',
+  rank: 70,
+  async scrape(ctx) {
+    const result = await smashyStreamFScraper.scrape(ctx);
+    return {
+      stream: result.stream,
+    };
+  },
+});

src/providers/embeds/smashystream/video1.ts

@@ -1,16 +1,29 @@
 import { flags } from '@/entrypoint/utils/targets';
 import { makeEmbed } from '@/providers/base';
 import { Caption, getCaptionTypeFromUrl, labelToLanguageCode } from '@/providers/captions';
+import { NotFoundError } from '@/utils/errors';
 
 type FPlayerResponse = {
   sourceUrls: string[];
-  subtitleUrls: string;
+  subtitles: string | null;
 };
 
+// if you don't understand how this is reversed
+// check https://discord.com/channels/871713465100816424/1186646348137775164/1225644477188935770
+// feel free to reach out atpn or ciaran_ds on discord if you've any problems
+function decode(str: string): string {
+  const b = ['U0ZML2RVN0IvRGx4', 'MGNhL0JWb0kvTlM5', 'Ym94LzJTSS9aU0Zj', 'SGJ0L1dGakIvN0dX', 'eE52L1QwOC96N0Yz'];
+  let formatedB64 = str.slice(2);
+  for (let i = 4; i > -1; i--) {
+    formatedB64 = formatedB64.replace(`//${b[i]}`, '');
+  }
+  return atob(formatedB64);
+}
+
 export const smashyStreamFScraper = makeEmbed({
   id: 'smashystream-f',
   name: 'SmashyStream (F)',
-  rank: 70,
+  rank: 71,
   async scrape(ctx) {
     const res = await ctx.proxiedFetcher<FPlayerResponse>(ctx.url, {
       headers: {
@@ -18,15 +31,20 @@ export const smashyStreamFScraper = makeEmbed({
       },
     });
 
+    if (!res.sourceUrls[0]) throw new NotFoundError('No watchable item found');
+
+    const playlist = decode(res.sourceUrls[0]);
+    if (!playlist.includes('.m3u8')) throw new Error('Failed to decode');
+
     const captions: Caption[] =
-      res.subtitleUrls
-        .match(/\[([^\]]+)\](https?:\/\/\S+?)(?=,\[|$)/g)
+      res.subtitles
+        ?.match(/\[([^\]]+)\](https?:\/\/\S+?)(?=,\[|$)/g)
         ?.map<Caption | null>((entry: string) => {
           const match = entry.match(/\[([^\]]+)\](https?:\/\/\S+?)(?=,\[|$)/);
           if (match) {
             const [, language, url] = match;
             if (language && url) {
-              const languageCode = labelToLanguageCode(language);
+              const languageCode = labelToLanguageCode(language.replace(/ - .*/, ''));
               const captionType = getCaptionTypeFromUrl(url);
               if (!languageCode || !captionType) return null;
               return {
@@ -46,7 +64,7 @@ export const smashyStreamFScraper = makeEmbed({
       stream: [
         {
           id: 'primary',
-          playlist: res.sourceUrls[0],
+          playlist,
           type: 'hls',
           flags: [flags.CORS_ALLOWED],
           captions,

src/providers/embeds/vidsrc.ts

@@ -32,21 +32,24 @@ export const vidsrcembedScraper = makeEmbed({
     if (!finalUrl.includes('.m3u8')) throw new Error('Unable to find HLS playlist');
 
     let setPassLink = html.match(setPassRegex)?.[1];
-    if (!setPassLink) throw new Error('Unable to find set_pass.php link');
 
-    if (setPassLink.startsWith('//')) {
-      setPassLink = `https:${setPassLink}`;
+    // isn't neeeded, the stream works without it anyway
+    // shouldn't fail if the setpass link is not found
+    if (setPassLink) {
+      if (setPassLink.startsWith('//')) {
+        setPassLink = `https:${setPassLink}`;
+      }
+
+      // VidSrc uses a password endpoint to temporarily whitelist the user's IP. This is called in an interval by the player.
+      // It currently has no effect on the player itself, the content plays fine without it.
+      // In the future we might have to introduce hooks for the frontend to call this endpoint.
+      await ctx.proxiedFetcher(setPassLink, {
+        headers: {
+          referer: ctx.url,
+        },
+      });
     }
 
-    // VidSrc uses a password endpoint to temporarily whitelist the user's IP. This is called in an interval by the player.
-    // It currently has no effect on the player itself, the content plays fine without it.
-    // In the future we might have to introduce hooks for the frontend to call this endpoint.
-    await ctx.proxiedFetcher(setPassLink, {
-      headers: {
-        referer: ctx.url,
-      },
-    });
-
     return {
       stream: [
         {

src/providers/sources/ridomovies/index.ts

@@ -19,13 +19,19 @@ const universalScraper = async (ctx: MovieScrapeContext | ShowScrapeContext) =>
       q: ctx.media.title,
     },
   });
-  const show = searchResult.data.items[0];
-  if (!show) throw new NotFoundError('No watchable item found');
+  const mediaData = searchResult.data.items.map((movieEl) => {
+    const name = movieEl.title;
+    const year = movieEl.contentable.releaseYear;
+    const fullSlug = movieEl.fullSlug;
+    return { name, year, fullSlug };
+  });
+  const targetMedia = mediaData.find((m) => m.name === ctx.media.title && m.year === ctx.media.releaseYear.toString());
+  if (!targetMedia?.fullSlug) throw new NotFoundError('No watchable item found');
 
-  let iframeSourceUrl = `/${show.fullSlug}/videos`;
+  let iframeSourceUrl = `/${targetMedia.fullSlug}/videos`;
 
   if (ctx.media.type === 'show') {
-    const showPageResult = await ctx.proxiedFetcher<string>(`/${show.fullSlug}`, {
+    const showPageResult = await ctx.proxiedFetcher<string>(`/${targetMedia.fullSlug}`, {
       baseUrl: ridoMoviesBase,
     });
     const fullEpisodeSlug = `season-${ctx.media.season.number}/episode-${ctx.media.episode.number}`;

src/providers/sources/showbox/index.ts

@@ -42,6 +42,7 @@ export const showboxScraper = makeSourcerer({
   id: 'showbox',
   name: 'Showbox',
   rank: 150,
+  disabled: true,
   flags: [flags.CORS_ALLOWED, flags.CF_BLOCKED],
   scrapeShow: comboScraper,
   scrapeMovie: comboScraper,

src/providers/sources/smashystream/index.ts

@@ -1,56 +1,29 @@
-import { load } from 'cheerio';
-
 import { flags } from '@/entrypoint/utils/targets';
-import { SourcererEmbed, SourcererOutput, makeSourcerer } from '@/providers/base';
-import { smashyStreamDScraper } from '@/providers/embeds/smashystream/dued';
+import { SourcererOutput, makeSourcerer } from '@/providers/base';
+import { smashyStreamOScraper } from '@/providers/embeds/smashystream/opstream';
 import { smashyStreamFScraper } from '@/providers/embeds/smashystream/video1';
 import { MovieScrapeContext, ShowScrapeContext } from '@/utils/context';
 
-const smashyStreamBase = 'https://embed.smashystream.com';
-const referer = 'https://smashystream.com/';
-
 const universalScraper = async (ctx: ShowScrapeContext | MovieScrapeContext): Promise<SourcererOutput> => {
-  const mainPage = await ctx.proxiedFetcher<string>('/playere.php', {
-    query: {
-      tmdb: ctx.media.tmdbId,
-      ...(ctx.media.type === 'show' && {
-        season: ctx.media.season.number.toString(),
-        episode: ctx.media.episode.number.toString(),
-      }),
-    },
-    headers: {
-      Referer: referer,
-    },
-    baseUrl: smashyStreamBase,
-  });
-
-  ctx.progress(30);
-
-  const mainPage$ = load(mainPage);
-  const sourceUrls = mainPage$('.dropdown-menu a[data-url]')
-    .map((_, el) => mainPage$(el).attr('data-url'))
-    .get();
-
-  const embeds: SourcererEmbed[] = [];
-  for (const sourceUrl of sourceUrls) {
-    if (sourceUrl.includes('video1d.php')) {
-      embeds.push({
-        embedId: smashyStreamFScraper.id,
-        url: sourceUrl,
-      });
-    }
-    if (sourceUrl.includes('dued.php')) {
-      embeds.push({
-        embedId: smashyStreamDScraper.id,
-        url: sourceUrl,
-      });
-    }
-  }
-
-  ctx.progress(60);
+  // theres no point in fetching the player page
+  // because it too just calls the api with the tmdb id
+  // thats the only way to find out if the embed has any streams
+  const query =
+    ctx.media.type === 'movie'
+      ? `?tmdb=${ctx.media.tmdbId}`
+      : `?tmdbId=${ctx.media.tmdbId}&season=${ctx.media.season.number}&episode=${ctx.media.episode.number}`;
 
   return {
-    embeds,
+    embeds: [
+      {
+        embedId: smashyStreamFScraper.id,
+        url: `https://embed.smashystream.com/video1dn.php${query}`,
+      },
+      {
+        embedId: smashyStreamOScraper.id,
+        url: `https://embed.smashystream.com/videoop.php${query}`,
+      },
+    ],
   };
 };
 
@@ -59,7 +32,6 @@ export const smashyStreamScraper = makeSourcerer({
   name: 'SmashyStream',
   rank: 30,
   flags: [flags.CORS_ALLOWED],
-  disabled: true,
   scrapeMovie: universalScraper,
   scrapeShow: universalScraper,
 });

src/runners/individualRunner.ts

@@ -59,14 +59,12 @@ export async function scrapeInvidualSource(
 
   if (!output) throw new Error('output is null');
 
-  // filter output with only valid embeds that are not disabled, and remove duplicates
-  output.embeds = output.embeds
-    .filter((embed) => {
-      const e = list.embeds.find((v) => v.id === embed.embedId);
-      if (!e || e.disabled) return false;
-      return true;
-    })
-    .filter((v, i, a) => a.findIndex((t) => t.embedId === v.embedId) === i);
+  // filter output with only valid embeds that are not disabled
+  output.embeds = output.embeds.filter((embed) => {
+    const e = list.embeds.find((v) => v.id === embed.embedId);
+    if (!e || e.disabled) return false;
+    return true;
+  });
 
   if ((!output.stream || output.stream.length === 0) && output.embeds.length === 0)
     throw new NotFoundError('No streams found');

src/runners/runner.ts

@@ -112,13 +112,12 @@ export async function runAllProviders(list: ProviderList, ops: ProviderRunnerOpt
       };
     }
 
-    // filter disabled, filter out duplicates, run embed scrapers on listed embeds
+    // filter disabled and run embed scrapers on listed embeds
     const sortedEmbeds = output.embeds
       .filter((embed) => {
         const e = list.embeds.find((v) => v.id === embed.embedId);
         return e && !e.disabled;
       })
-      .filter((v, i, a) => a.findIndex((t) => t.embedId === v.embedId) === i)
       .sort((a, b) => embedIds.indexOf(a.embedId) - embedIds.indexOf(b.embedId));
 
     if (sortedEmbeds.length > 0) {