fix(streamwish): Grab video sources extractor (#529)

* fix(streamwish): Grab video sources extractor * feat(gogoanime): Add streamwish on fetchEpisodeSources * fix(streamwish): double auto quality stream * refactor(streamwish): add wasted link as backup stream * refactor(streamwish): Sanitize m3u8 links that are not filtered properly with regex * refactor(streamwish): Sanitize m3u8 links that are not filtered properly with regex * refactor(streamwish): Add user agent to minimize 403 forbidden
consumet · May 16, 2024 · bdf2454 · bdf2454
1 parent 6059b41
commit bdf2454
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 28 deletions.
diff --git a/dist/extractors/streamwish.js b/dist/extractors/streamwish.js
diff --git a/dist/extractors/streamwish.js.map b/dist/extractors/streamwish.js.map
diff --git a/dist/providers/anime/gogoanime.js b/dist/providers/anime/gogoanime.js
diff --git a/dist/providers/anime/gogoanime.js.map b/dist/providers/anime/gogoanime.js.map
diff --git a/src/extractors/streamwish.ts b/src/extractors/streamwish.ts
@@ -1,20 +1,29 @@
 import { VideoExtractor, IVideo } from '../models';
-
+import { USER_AGENT } from '../utils';
 class StreamWish extends VideoExtractor {
   protected override serverName = 'streamwish';
   protected override sources: IVideo[] = [];
 
   override extract = async (videoUrl: URL): Promise<IVideo[]> => {
     try {
-      const { data } = await this.client.get(videoUrl.href);
-
-      const unPackagedData = eval(/(eval)(\(f.*?)(\n<\/script>)/s.exec(data)![2]);
-      const links = unPackagedData.match(/file:\s*"([^"]+)"/);
-
-      this.sources.push({
-        quality: 'auto',
-        url: links[1],
-        isM3U8: links[1].includes('.m3u8'),
+      const options = {
+        headers: {
+            'User-Agent': USER_AGENT,
+        },
+      };
+      const { data } = await this.client.get(videoUrl.href, options);
+      const links = data.match(/file:\s*"([^"]+)"/);
+      let lastLink = null;
+      links.forEach((link: string) => {
+        if(link.includes('file:"')){
+          link = link.replace('file:"', '').replace(new RegExp('"', 'g'), '');
+        }
+        this.sources.push({
+          quality: lastLink! ? 'backup' : 'default',
+          url: link,
+          isM3U8: link.includes('.m3u8'),
+        });
+        lastLink = link;
       });
 
       const m3u8Content = await this.client.get(links[1], {

diff --git a/src/providers/anime/gogoanime.ts b/src/providers/anime/gogoanime.ts
@@ -16,7 +16,7 @@ import {
   ProxyConfig,
 } from '../../models';
 import { USER_AGENT } from '../../utils';
-import { GogoCDN, StreamSB } from '../../extractors';
+import { GogoCDN, StreamSB, StreamWish } from '../../extractors';
 
 class Gogoanime extends AnimeParser {
   override readonly name = 'Gogoanime';
@@ -26,7 +26,7 @@ class Gogoanime extends AnimeParser {
   protected override classPath = 'ANIME.Gogoanime';
   private readonly ajaxUrl = 'https://ajax.gogocdn.net/ajax';
 
-  
+
   constructor(
     customBaseURL?: string,
     proxy?: ProxyConfig,
@@ -37,11 +37,11 @@ class Gogoanime extends AnimeParser {
     if (proxy) {
       // Initialize proxyConfig if provided
       this.setProxy(proxy);
-  }
-  if (adapter) {
+    }
+    if (adapter) {
       // Initialize adapter if provided
       this.setAxiosAdapter(adapter);
-  }
+    }
   }
 
   /**
@@ -209,6 +209,14 @@ class Gogoanime extends AnimeParser {
             sources: await new StreamSB(this.proxyConfig, this.adapter).extract(serverUrl),
             download: `https://${serverUrl.host}/download${serverUrl.search}`,
           };
+        case StreamingServers.StreamWish:
+          return {
+            headers: {
+              Referer: serverUrl.href,
+            },
+            sources: await new StreamWish(this.proxyConfig, this.adapter).extract(serverUrl),
+            download: `https://${serverUrl.host}/download${serverUrl.search}`,
+          };
         default:
           return {
             headers: { Referer: serverUrl.href },
@@ -239,6 +247,11 @@ class Gogoanime extends AnimeParser {
             $('div.anime_video_body > div.anime_muti_link > ul > li.streamsb > a').attr('data-video')!
           );
           break;
+        case StreamingServers.StreamWish:
+          serverUrl = new URL(
+            $('div.anime_video_body > div.anime_muti_link > ul > li.streamwish > a').attr('data-video')!
+          );
+          break;
         default:
           serverUrl = new URL(`${$('#load_anime > div > div > iframe').attr('src')}`);
           break;
@@ -502,7 +515,7 @@ class Gogoanime extends AnimeParser {
     const animeID = idParam ? idParam[1] : null;
     if (!captchaToken)
       captchaToken = '03AFcWeA5zy7DBK82U_tctVKelJ6L2duTWac5at2zXjHLX8XqUm8tI6NKWMxGd2gjh1vi2hnEyRhVgbMhdb9WjexRsJkxTt-C-_iIIZ5yC3E5I19G5Q0buSTcIQIZS6tskrz-mDn-d37aWxAJtqbg0Yoo1XsdVc5Yf4sB-9iQxQK-W_9YLep_QaAz8uL17gMMlCz5WZM3dbBEEGmk_qPbJu_pZ8kk-lFPDzd6iBobcpyIDRZgTgD4bYUnby5WZc11i00mrRiRS3m-qSY0lprGaBqoyY1BbRkQZ25AGPp5al4kSwBZqpcVgLrs3bjdo8XVWAe73_XLa8HhqLWbz_m5Ebyl5F9awwL7w4qikGj-AK7v2G8pgjT22kDLIeenQ_ss4jYpmSzgnuTItur9pZVzpPkpqs4mzr6y274AmJjzppRTDH4VFtta_E02-R7Hc1rUD2kCYt9BqsD7kDjmetnvLtBm97q5XgBS8rQfeH4P-xqiTAsJwXlcrPybSjnwPEptqYCPX5St_BSj4NQfSuzZowXu_qKsP4hAaE9L2W36MvqePPlEm6LChBT3tnqUwcEYNe5k7lkAAbunxx8q_X5Q3iEdcFqt9_0GWHebRBd5abEbjbmoqqCoQeZt7AUvkXCRfBDne-bf25ypyTtwgyuvYMYXau3zGUjgPUO9WIotZwyKyrYmjsZJ7TiM';
-    
+
     let res = null;
     try {
       res = await this.client.get(`${baseUrl}?id=${animeID}&captcha_v3=${captchaToken}`);
@@ -513,7 +526,7 @@ class Gogoanime extends AnimeParser {
       const $ = load(res.data);
       $('.dowload').each((_index, element) => {
         const link = $(element).find('a');
-        if(link.attr('target') != '_blank'){
+        if (link.attr('target') != '_blank') {
           downloadLinks.push({ source: link.text(), link: link.attr('href') }!);
         }
       });