From 198dfdec872781107efe7b379d1dc6e9f1330ae0 Mon Sep 17 00:00:00 2001
From: MemeCornucopia <148788549+MemeCornucopia@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:08:29 -0500
Subject: [PATCH 01/15] EPIC GOOJARA LESS FUCKING GO

---
 src/.env copy                              |   1 +
 src/providers/all.ts                       |   6 ++
 src/providers/embeds/dood.ts               |  75 ++++++++++++++
 src/providers/embeds/wootly.ts             |  77 ++++++++++++++
 src/providers/sources/goojara/getEmbeds.ts |  52 ++++++++++
 src/providers/sources/goojara/index.ts     |  30 ++++++
 src/providers/sources/goojara/type.ts      |  35 +++++++
 src/providers/sources/goojara/util.ts      | 111 +++++++++++++++++++++
 8 files changed, 387 insertions(+)
 create mode 100644 src/.env copy
 create mode 100644 src/providers/embeds/dood.ts
 create mode 100644 src/providers/embeds/wootly.ts
 create mode 100644 src/providers/sources/goojara/getEmbeds.ts
 create mode 100644 src/providers/sources/goojara/index.ts
 create mode 100644 src/providers/sources/goojara/type.ts
 create mode 100644 src/providers/sources/goojara/util.ts

diff --git a/src/.env copy b/src/.env copy
new file mode 100644
index 0000000..daeee0b
--- /dev/null
+++ b/src/.env copy	
@@ -0,0 +1 @@
+MOVIE_WEB_TMDB_API_KEY="045e3dc79db2f0cbaa9ef67397afca39"
\ No newline at end of file
diff --git a/src/providers/all.ts b/src/providers/all.ts
index de22b4c..b99777d 100644
--- a/src/providers/all.ts
+++ b/src/providers/all.ts
@@ -16,11 +16,14 @@ import { remotestreamScraper } from '@/providers/sources/remotestream';
 import { showboxScraper } from '@/providers/sources/showbox/index';
 import { vidsrcScraper } from '@/providers/sources/vidsrc/index';
 import { zoechipScraper } from '@/providers/sources/zoechip';
+import { doodScraper } from '@/providers/embeds/dood';
 
 import { fileMoonScraper } from './embeds/filemoon';
 import { smashyStreamDScraper } from './embeds/smashystream/dued';
 import { smashyStreamFScraper } from './embeds/smashystream/video1';
 import { vidplayScraper } from './embeds/vidplay';
+import { wootlyScraper } from './embeds/wootly';
+import { goojaraScraper } from './sources/goojara';
 import { smashyStreamScraper } from './sources/smashystream';
 import { vidSrcToScraper } from './sources/vidsrcto';
 
@@ -37,6 +40,7 @@ export function gatherAllSources(): Array<Sourcerer> {
     lookmovieScraper,
     smashyStreamScraper,
     vidSrcToScraper,
+    goojaraScraper,
   ];
 }
 
@@ -56,5 +60,7 @@ export function gatherAllEmbeds(): Array<Embed> {
     smashyStreamDScraper,
     fileMoonScraper,
     vidplayScraper,
+    wootlyScraper,
+    doodScraper
   ];
 }
diff --git a/src/providers/embeds/dood.ts b/src/providers/embeds/dood.ts
new file mode 100644
index 0000000..82ab60e
--- /dev/null
+++ b/src/providers/embeds/dood.ts
@@ -0,0 +1,75 @@
+import { load } from 'cheerio';
+
+import { flags } from '@/entrypoint/utils/targets';
+import { makeEmbed } from '@/providers/base';
+
+export const doodScraper = makeEmbed({
+  id: 'dood',
+  name: 'dood',
+  rank: 173,
+  async scrape(ctx) {
+    function makeTheFunny() {
+      let result = '';
+      const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+      const charactersLength = characters.length;
+
+      for (let i = 0; i < 10; i++) {
+        result += characters.charAt(Math.floor(Math.random() * charactersLength));
+      }
+
+      return result;
+    }
+
+    const baseUrl = 'https://do0od.com';
+
+    const id = ctx.url.split('/d/')[1] || ctx.url.split('/e/')[1];
+    console.log(id);
+
+    const doodData = await ctx.proxiedFetcher<string>(`/e/${id}`, {
+      method: 'GET',
+      baseUrl,
+    });
+
+    // console.log(doodData);
+
+    const dataForLater = doodData.split(`a+"?token=`)[1].split(`"`)[0];
+    const path = doodData.split(`$.get('/pass_md5`)[1].split(`'`)[0];
+
+    const doodPage = await ctx.proxiedFetcher<string>(`/pass_md5/${path}`, {
+      headers: {
+        referer: `${baseUrl}/e/${id}`,
+      },
+      method: 'GET',
+      baseUrl,
+    });
+
+    console.log(`${baseUrl}/pass_md5/${path}`);
+
+    console.log(doodPage);
+
+    // const doodPage = await ctx.proxiedFetcher<string>(`/download/${path}`, { method: 'GET', baseUrl });
+    // console.log(doodPage);
+    const downloadURL = `${doodPage}${makeTheFunny()}?token=${dataForLater}${Date.now()}`;
+
+    if (downloadURL) {
+      return {
+        stream: [
+          {
+            id: 'primary',
+            type: 'hls',
+            playlist: downloadURL,
+            flags: [flags.CORS_ALLOWED],
+            captions: [],
+            preferredHeaders: {
+              referer: 'https://do0od.com/',
+              'content-type': 'video/mp4',
+              range: 'bytes=0-',
+            },
+          },
+        ],
+      };
+    }
+
+    throw new Error('wootly source not found');
+  },
+});
diff --git a/src/providers/embeds/wootly.ts b/src/providers/embeds/wootly.ts
new file mode 100644
index 0000000..8b5199d
--- /dev/null
+++ b/src/providers/embeds/wootly.ts
@@ -0,0 +1,77 @@
+import { load } from 'cheerio';
+
+import { flags } from '@/entrypoint/utils/targets';
+import { makeEmbed } from '@/providers/base';
+
+export const wootlyScraper = makeEmbed({
+  id: 'wootly',
+  name: 'wootly',
+  rank: 172,
+  async scrape(ctx) {
+    const baseUrl = 'https://www.wootly.ch';
+
+    const wootlyData = await ctx.proxiedFetcher.full<string>(ctx.url, {
+      method: 'GET',
+      readHeaders: ['Set-Cookie'],
+    });
+
+    const wootssesCookie = wootlyData.headers.get('Set-Cookie')?.split(';')[0].split('wootsses=')[1];
+
+    let $ = load(wootlyData.body); // load the html data
+    const iframeSrc = $('iframe').attr('src') ?? '';
+
+    const woozCookieRequest = await ctx.proxiedFetcher.full<string>(iframeSrc, {
+      method: 'GET',
+      readHeaders: ['Set-Cookie'],
+      headers: {
+        cookie: `wootsses=${wootssesCookie};`,
+      },
+    });
+
+    const woozCookie = woozCookieRequest.headers.get('Set-Cookie')?.split(';')[0].split('wooz=')[1];
+
+    const iframeData = await ctx.proxiedFetcher<string>(iframeSrc, {
+      method: 'POST',
+      body: new URLSearchParams({ qdf: '1' }),
+      headers: {
+        cookie: `wooz=${woozCookie}`,
+        Referer: iframeSrc,
+      },
+    });
+
+    $ = load(iframeData);
+
+    const scriptText = $('script').html() ?? '';
+
+    // Regular expressions to match the variables
+
+    const tk = scriptText.split('tk=')[1].split(';')[0].replaceAll('"', '').replaceAll(' ', '');
+    const vd = scriptText.split('vd=')[1].split(',')[0].replaceAll('"', '').replaceAll(' ', '');
+    const cv = scriptText.split('cv=')[1].split(',')[0].replaceAll('"', '').replaceAll(' ', '');
+
+    const url = await ctx.proxiedFetcher<string>(`/grabd`, {
+      baseUrl,
+      query: { t: tk, id: vd },
+      method: 'GET',
+      headers: {
+        cookie: `wooz=${woozCookie}; wootsses=${wootssesCookie};`,
+      },
+    });
+
+    if (url) {
+      return {
+        stream: [
+          {
+            id: 'primary',
+            type: 'hls',
+            playlist: url,
+            flags: [flags.CORS_ALLOWED, flags.IP_LOCKED],
+            captions: [],
+          },
+        ],
+      };
+    }
+
+    throw new Error('wootly source not found');
+  },
+});
diff --git a/src/providers/sources/goojara/getEmbeds.ts b/src/providers/sources/goojara/getEmbeds.ts
new file mode 100644
index 0000000..d0a96a4
--- /dev/null
+++ b/src/providers/sources/goojara/getEmbeds.ts
@@ -0,0 +1,52 @@
+import { load } from 'cheerio';
+
+import { ScrapeContext } from '@/utils/context';
+
+import { EmbedsResult } from './type';
+
+export async function getEmbeds(ctx: ScrapeContext, id: string): Promise<EmbedsResult> {
+  const data = await ctx.fetcher.full(`/${id}`, {
+    baseUrl: 'https://ww1.goojara.to',
+    headers: {
+      accept: '*/*',
+      'content-type': 'application/x-www-form-urlencoded',
+      Referer: 'https://www.goojara.to/',
+      'Referrer-Policy': 'strict-origin-when-cross-origin',
+    },
+    readHeaders: ['Set-Cookie'],
+    method: 'GET',
+  });
+
+  const aGoozCookie = data.headers.get('Set-Cookie')?.split(';')[0].split('aGooz=')[1];
+  const $ = load(data.body);
+  const RandomCookieName = data.body.split(`_3chk('`)[1].split(`'`)[0];
+  const RandomCookieValue = data.body.split(`_3chk('`)[1].split(`'`)[2];
+
+  const embedRedirectURLs = $('a')
+    .map((index, element) => $(element).attr('href'))
+    .get()
+    .filter((href) => href && href.includes('https://ww1.goojara.to/go.php'));
+
+  const embeds = await Promise.all(
+    embedRedirectURLs.map((url) =>
+      ctx.fetcher
+        .full(url, {
+          headers: {
+            cookie: `aGooz=${aGoozCookie}; ${RandomCookieName}=${RandomCookieValue};`,
+            Referer: 'https://ww1.goojara.to/eJwD5z',
+          },
+          method: 'GET',
+        })
+        .then((result) => {
+          if (result) {
+            const embedId = ['wootly', 'upstream', 'mixdrop', 'dood'].find((a) => result.finalUrl.includes(a));
+            return embedId ? { embedId, url: result.finalUrl } : null;
+          }
+          return null;
+        })
+        .catch(() => null),
+    ),
+  ).then((results) => results.filter((result) => result !== null) as EmbedsResult);
+
+  return embeds;
+}
diff --git a/src/providers/sources/goojara/index.ts b/src/providers/sources/goojara/index.ts
new file mode 100644
index 0000000..ce2b096
--- /dev/null
+++ b/src/providers/sources/goojara/index.ts
@@ -0,0 +1,30 @@
+import { SourcererOutput, makeSourcerer } from '@/providers/base';
+import { MovieScrapeContext, ShowScrapeContext } from '@/utils/context';
+import { NotFoundError } from '@/utils/errors';
+
+import { scrapeIds, searchAndFindMedia } from './util';
+
+async function universalScraper(ctx: ShowScrapeContext | MovieScrapeContext): Promise<SourcererOutput> {
+  const goojaraData = await searchAndFindMedia(ctx, ctx.media);
+  if (!goojaraData) throw new NotFoundError('Media not found');
+
+  ctx.progress(30);
+  const embeds = await scrapeIds(ctx, ctx.media, goojaraData);
+  if (embeds?.length === 0) throw new NotFoundError('No embeds found');
+
+
+  ctx.progress(60);
+
+  return {
+    embeds
+  }
+}
+
+export const goojaraScraper = makeSourcerer({
+  id: 'goojara',
+  name: 'goojara',
+  rank: 69,
+  flags: [],
+  scrapeShow: universalScraper,
+  scrapeMovie: universalScraper,
+});
diff --git a/src/providers/sources/goojara/type.ts b/src/providers/sources/goojara/type.ts
new file mode 100644
index 0000000..7227ec8
--- /dev/null
+++ b/src/providers/sources/goojara/type.ts
@@ -0,0 +1,35 @@
+// ! Types
+interface BaseConfig {
+  /** The website's slug. Formatted as `1839578-person-of-interest-2011` */
+  slug: string;
+  /** Type of request */
+  type: 'show' | 'movie';
+  /** Hash */
+  hash: string;
+  /** Hash expiry */
+  expires: number;
+}
+interface TvConfig extends BaseConfig {
+  /** Type of request */
+  type: 'show';
+  /** The episode ID for a TV show. Given in search and URL */
+  episodeId: string;
+}
+interface MovieConfig extends BaseConfig {
+  /** Type of request */
+  type: 'movie';
+  /** Movie's id */
+  slug: string;
+}
+export type Config = MovieConfig | TvConfig;
+
+export type EmbedsResult = { embedId: string; url: string; }[]
+
+export interface Result {
+  title: string;
+  slug: any;
+  year: string;
+  type: string;
+  id_movie?: string;
+  id_show?: string;
+}
diff --git a/src/providers/sources/goojara/util.ts b/src/providers/sources/goojara/util.ts
new file mode 100644
index 0000000..f2b452b
--- /dev/null
+++ b/src/providers/sources/goojara/util.ts
@@ -0,0 +1,111 @@
+import { load } from 'cheerio';
+
+import { MovieMedia, ShowMedia } from '@/entrypoint/utils/media';
+import { compareMedia } from '@/utils/compare';
+import { ScrapeContext } from '@/utils/context';
+import { NotFoundError } from '@/utils/errors';
+
+import { getEmbeds } from './getEmbeds';
+import { Result, EmbedsResult } from './type';
+
+const headersData = {
+  accept: '*/*',
+  'accept-language': 'en-US,en;q=0.9',
+  'content-type': 'application/x-www-form-urlencoded',
+  'sec-ch-ua': '"Not_A Brand";v="8", "Chromium";v="120", "Google Chrome";v="120"',
+  'sec-ch-ua-mobile': '?0',
+  'sec-ch-ua-platform': '"Windows"',
+  'sec-fetch-dest': 'empty',
+  'sec-fetch-mode': 'cors',
+  'sec-fetch-site': 'same-origin',
+  cookie: `aGooz=t9pmkdtef1b3lg3pmo1u2re816; bd9aa48e=0d7b89e8c79844e9df07a2; _b414=2151C6B12E2A88379AFF2C0DD65AC8298DEC2BF4; 9d287aaa=8f32ad589e1c4288fe152f`,
+  Referer: 'https://www.goojara.to/',
+  'Referrer-Policy': 'strict-origin-when-cross-origin',
+};
+
+export async function searchAndFindMedia(
+  ctx: ScrapeContext,
+  media: MovieMedia | ShowMedia,
+): Promise<Result | undefined> {
+  const data = await ctx.fetcher<string>(`/xhrr.php`, {
+    baseUrl: 'https://www.goojara.to',
+    headers: headersData,
+    method: 'POST',
+    body: `q=${media.title}`,
+  })
+
+  const $ = load(data);
+
+  const results: Result[] = [];
+
+  $('.mfeed > li').each((index, element) => {
+    const title = $(element).find('strong').text();
+    const yearMatch = $(element)
+      .text()
+      .match(/\((\d{4})\)/);
+    const typeDiv = $(element).find('div').attr('class');
+    const type = typeDiv === 'it' ? 'show' : typeDiv === 'im' ? 'movie' : '';
+    const year = yearMatch ? yearMatch[1] : '';
+    const slug = $(element).find('a').attr('href')?.split('/')[3];
+
+    if (media.type === type) {
+      results.push({ title, year, slug, type });
+    }
+  });
+
+  const result = results.find((res: Result) => compareMedia(media, res.title, Number(res.year)));
+
+  return result;
+}
+
+export async function scrapeIds(ctx: ScrapeContext, media: MovieMedia | ShowMedia, result: Result): Promise<EmbedsResult> {
+  // Find the relevant id
+  let id = null;
+  if (media.type === 'movie') {
+    id = result.slug;
+  } else if (media.type === 'show') {
+    const data = await ctx.fetcher<string>(`/${result.slug}`, {
+      baseUrl: 'https://www.goojara.to',
+      headers: headersData,
+      method: 'GET',
+    });
+
+    const $1 = load(data);
+
+    const dataId = $1('#seon').data('id');
+
+    const data2 = await ctx.fetcher<string>(`/xhrc.php`, {
+      baseUrl: 'https://ww1.goojara.to',
+      headers: headersData,
+      method: 'POST',
+      body: `s=${media.season.number}&t=${dataId}`,
+    });
+
+    let episodeId = '';
+
+    const $2 = load(data2);
+
+    $2('.seho').each((index, element) => {
+      // Extracting the episode number as a string
+      const episodeNumber = $2(element).find('.seep .sea').text().trim();
+
+      // Comparing with the desired episode number as a string
+      if (parseInt(episodeNumber, 10) === media.episode.number) {
+        const href = $2(element).find('.snfo h1 a').attr('href');
+        const idMatch = href?.match(/\/([a-zA-Z0-9]+)$/);
+        if (idMatch && idMatch[1]) {
+          episodeId = idMatch[1];
+          return false; // Break out of the loop once the episode is found
+        }
+      }
+    });
+
+    id = episodeId;
+  }
+
+  // Check ID
+  if (id === null) throw new NotFoundError('Not found');
+
+  const embeds = await getEmbeds(ctx, id);
+  return embeds;
+}

From bcb1d292187f1f7fb52c058bb85e97409f736f76 Mon Sep 17 00:00:00 2001
From: MemeCornucopia <148788549+MemeCornucopia@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:19:38 -0500
Subject: [PATCH 02/15] OMG GOOJARA!?!?!?!?!??! EPIC SOURCE!?!?!?!?

---
 src/providers/embeds/dood.ts   | 20 ++++++++++++--------
 src/providers/embeds/wootly.ts | 11 ++++++++---
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/providers/embeds/dood.ts b/src/providers/embeds/dood.ts
index 82ab60e..4b6d413 100644
--- a/src/providers/embeds/dood.ts
+++ b/src/providers/embeds/dood.ts
@@ -1,5 +1,3 @@
-import { load } from 'cheerio';
-
 import { flags } from '@/entrypoint/utils/targets';
 import { makeEmbed } from '@/providers/base';
 
@@ -56,14 +54,20 @@ export const doodScraper = makeEmbed({
         stream: [
           {
             id: 'primary',
-            type: 'hls',
-            playlist: downloadURL,
+            type: 'file',
+            url: downloadURL,
             flags: [flags.CORS_ALLOWED],
             captions: [],
-            preferredHeaders: {
-              referer: 'https://do0od.com/',
-              'content-type': 'video/mp4',
-              range: 'bytes=0-',
+            qualities: {
+              unknown: {
+                type: 'mp4',
+                url: downloadURL,
+                preferredHeaders: {
+                  referer: 'https://do0od.com/',
+                  'content-type': 'video/mp4',
+                  range: 'bytes=0-',
+                },
+              },
             },
           },
         ],
diff --git a/src/providers/embeds/wootly.ts b/src/providers/embeds/wootly.ts
index 8b5199d..d02962d 100644
--- a/src/providers/embeds/wootly.ts
+++ b/src/providers/embeds/wootly.ts
@@ -47,7 +47,6 @@ export const wootlyScraper = makeEmbed({
 
     const tk = scriptText.split('tk=')[1].split(';')[0].replaceAll('"', '').replaceAll(' ', '');
     const vd = scriptText.split('vd=')[1].split(',')[0].replaceAll('"', '').replaceAll(' ', '');
-    const cv = scriptText.split('cv=')[1].split(',')[0].replaceAll('"', '').replaceAll(' ', '');
 
     const url = await ctx.proxiedFetcher<string>(`/grabd`, {
       baseUrl,
@@ -63,10 +62,16 @@ export const wootlyScraper = makeEmbed({
         stream: [
           {
             id: 'primary',
-            type: 'hls',
-            playlist: url,
+            type: 'file',
+            url,
             flags: [flags.CORS_ALLOWED, flags.IP_LOCKED],
             captions: [],
+            qualities: {
+              unknown: {
+                type: 'mp4',
+                url,
+              },
+            },
           },
         ],
       };

From e11885a1dfc8ebcf34819916372bba8fd07d988c Mon Sep 17 00:00:00 2001
From: MemeCornucopia <148788549+MemeCornucopia@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:26:14 -0500
Subject: [PATCH 03/15] fixed imports

---
 src/providers/all.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/providers/all.ts b/src/providers/all.ts
index b99777d..cb64896 100644
--- a/src/providers/all.ts
+++ b/src/providers/all.ts
@@ -1,4 +1,5 @@
 import { Embed, Sourcerer } from '@/providers/base';
+import { doodScraper } from '@/providers/embeds/dood';
 import { febboxHlsScraper } from '@/providers/embeds/febbox/hls';
 import { febboxMp4Scraper } from '@/providers/embeds/febbox/mp4';
 import { mixdropScraper } from '@/providers/embeds/mixdrop';
@@ -16,7 +17,6 @@ import { remotestreamScraper } from '@/providers/sources/remotestream';
 import { showboxScraper } from '@/providers/sources/showbox/index';
 import { vidsrcScraper } from '@/providers/sources/vidsrc/index';
 import { zoechipScraper } from '@/providers/sources/zoechip';
-import { doodScraper } from '@/providers/embeds/dood';
 
 import { fileMoonScraper } from './embeds/filemoon';
 import { smashyStreamDScraper } from './embeds/smashystream/dued';
@@ -61,6 +61,6 @@ export function gatherAllEmbeds(): Array<Embed> {
     fileMoonScraper,
     vidplayScraper,
     wootlyScraper,
-    doodScraper
+    doodScraper,
   ];
 }

From 9291bd6828b3f663e5c62c07d4040dd5c8e405d2 Mon Sep 17 00:00:00 2001
From: MemeCornucopia <148788549+MemeCornucopia@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:27:37 -0500
Subject: [PATCH 04/15] more prettier crap

---
 src/providers/sources/goojara/index.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/providers/sources/goojara/index.ts b/src/providers/sources/goojara/index.ts
index ce2b096..bd1e03f 100644
--- a/src/providers/sources/goojara/index.ts
+++ b/src/providers/sources/goojara/index.ts
@@ -12,12 +12,11 @@ async function universalScraper(ctx: ShowScrapeContext | MovieScrapeContext): Pr
   const embeds = await scrapeIds(ctx, ctx.media, goojaraData);
   if (embeds?.length === 0) throw new NotFoundError('No embeds found');
 
-
   ctx.progress(60);
 
   return {
-    embeds
-  }
+    embeds,
+  };
 }
 
 export const goojaraScraper = makeSourcerer({

From 0396272dd926ab360e2b52d30dfffdb74bc9970b Mon Sep 17 00:00:00 2001
From: MemeCornucopia <148788549+MemeCornucopia@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:29:11 -0500
Subject: [PATCH 05/15] more prettier stuff

---
 src/providers/sources/goojara/type.ts |  2 +-
 src/providers/sources/goojara/util.ts | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/providers/sources/goojara/type.ts b/src/providers/sources/goojara/type.ts
index 7227ec8..732ba4e 100644
--- a/src/providers/sources/goojara/type.ts
+++ b/src/providers/sources/goojara/type.ts
@@ -23,7 +23,7 @@ interface MovieConfig extends BaseConfig {
 }
 export type Config = MovieConfig | TvConfig;
 
-export type EmbedsResult = { embedId: string; url: string; }[]
+export type EmbedsResult = { embedId: string; url: string }[];
 
 export interface Result {
   title: string;
diff --git a/src/providers/sources/goojara/util.ts b/src/providers/sources/goojara/util.ts
index f2b452b..0fcba4b 100644
--- a/src/providers/sources/goojara/util.ts
+++ b/src/providers/sources/goojara/util.ts
@@ -6,7 +6,7 @@ import { ScrapeContext } from '@/utils/context';
 import { NotFoundError } from '@/utils/errors';
 
 import { getEmbeds } from './getEmbeds';
-import { Result, EmbedsResult } from './type';
+import { EmbedsResult, Result } from './type';
 
 const headersData = {
   accept: '*/*',
@@ -32,7 +32,7 @@ export async function searchAndFindMedia(
     headers: headersData,
     method: 'POST',
     body: `q=${media.title}`,
-  })
+  });
 
   const $ = load(data);
 
@@ -58,7 +58,11 @@ export async function searchAndFindMedia(
   return result;
 }
 
-export async function scrapeIds(ctx: ScrapeContext, media: MovieMedia | ShowMedia, result: Result): Promise<EmbedsResult> {
+export async function scrapeIds(
+  ctx: ScrapeContext,
+  media: MovieMedia | ShowMedia,
+  result: Result,
+): Promise<EmbedsResult> {
   // Find the relevant id
   let id = null;
   if (media.type === 'movie') {

From 5eb3ade82e8ad81d1cd28ad210d9fda06f4997d3 Mon Sep 17 00:00:00 2001
From: MemeCornucopia <148788549+MemeCornucopia@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:48:35 -0500
Subject: [PATCH 06/15] deleted env copy xd

---
 src/.env copy | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 src/.env copy

diff --git a/src/.env copy b/src/.env copy
deleted file mode 100644
index daeee0b..0000000
--- a/src/.env copy	
+++ /dev/null
@@ -1 +0,0 @@
-MOVIE_WEB_TMDB_API_KEY="045e3dc79db2f0cbaa9ef67397afca39"
\ No newline at end of file

From fb12c6bfa9dcf1248eb0bbac414f1f362e5d3acf Mon Sep 17 00:00:00 2001
From: MemeCornucopia <148788549+MemeCornucopia@users.noreply.github.com>
Date: Sat, 27 Jan 2024 19:30:18 -0500
Subject: [PATCH 07/15] Changes requests by jvs

---
 src/providers/embeds/dood.ts               | 70 ++++++++--------------
 src/providers/embeds/wootly.ts             | 46 +++++++-------
 src/providers/sources/goojara/getEmbeds.ts | 56 +++++++++--------
 src/providers/sources/goojara/index.ts     |  2 +-
 src/providers/sources/goojara/type.ts      | 27 +--------
 src/providers/sources/goojara/util.ts      | 31 +++++-----
 6 files changed, 96 insertions(+), 136 deletions(-)

diff --git a/src/providers/embeds/dood.ts b/src/providers/embeds/dood.ts
index 4b6d413..d977fdc 100644
--- a/src/providers/embeds/dood.ts
+++ b/src/providers/embeds/dood.ts
@@ -1,37 +1,26 @@
+import { customAlphabet } from 'nanoid';
+
 import { flags } from '@/entrypoint/utils/targets';
 import { makeEmbed } from '@/providers/base';
 
+const nanoid = customAlphabet('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789', 10);
+
 export const doodScraper = makeEmbed({
   id: 'dood',
   name: 'dood',
   rank: 173,
   async scrape(ctx) {
-    function makeTheFunny() {
-      let result = '';
-      const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-      const charactersLength = characters.length;
-
-      for (let i = 0; i < 10; i++) {
-        result += characters.charAt(Math.floor(Math.random() * charactersLength));
-      }
-
-      return result;
-    }
-
     const baseUrl = 'https://do0od.com';
 
     const id = ctx.url.split('/d/')[1] || ctx.url.split('/e/')[1];
-    console.log(id);
 
     const doodData = await ctx.proxiedFetcher<string>(`/e/${id}`, {
       method: 'GET',
       baseUrl,
     });
 
-    // console.log(doodData);
-
-    const dataForLater = doodData.split(`a+"?token=`)[1].split(`"`)[0];
-    const path = doodData.split(`$.get('/pass_md5`)[1].split(`'`)[0];
+    const dataForLater = doodData.match(/a\+"\?token=([^"]+)/)?.[1];
+    const path = doodData.match(/\$\.get\('\/pass_md5([^']+)/)?.[1];
 
     const doodPage = await ctx.proxiedFetcher<string>(`/pass_md5/${path}`, {
       headers: {
@@ -41,39 +30,28 @@ export const doodScraper = makeEmbed({
       baseUrl,
     });
 
-    console.log(`${baseUrl}/pass_md5/${path}`);
+    const downloadURL = `${doodPage}${nanoid()}?token=${dataForLater}${Date.now()}`;
 
-    console.log(doodPage);
+    if (!downloadURL) throw new Error('dood source not found');
 
-    // const doodPage = await ctx.proxiedFetcher<string>(`/download/${path}`, { method: 'GET', baseUrl });
-    // console.log(doodPage);
-    const downloadURL = `${doodPage}${makeTheFunny()}?token=${dataForLater}${Date.now()}`;
-
-    if (downloadURL) {
-      return {
-        stream: [
-          {
-            id: 'primary',
-            type: 'file',
-            url: downloadURL,
-            flags: [flags.CORS_ALLOWED],
-            captions: [],
-            qualities: {
-              unknown: {
-                type: 'mp4',
-                url: downloadURL,
-                preferredHeaders: {
-                  referer: 'https://do0od.com/',
-                  'content-type': 'video/mp4',
-                  range: 'bytes=0-',
-                },
+    return {
+      stream: [
+        {
+          id: 'primary',
+          type: 'file',
+          flags: [],
+          captions: [],
+          qualities: {
+            unknown: {
+              type: 'mp4',
+              url: downloadURL,
+              headers: {
+                referer: 'https://do0od.com/',
               },
             },
           },
-        ],
-      };
-    }
-
-    throw new Error('wootly source not found');
+        },
+      ],
+    };
   },
 });
diff --git a/src/providers/embeds/wootly.ts b/src/providers/embeds/wootly.ts
index d02962d..701fae9 100644
--- a/src/providers/embeds/wootly.ts
+++ b/src/providers/embeds/wootly.ts
@@ -15,7 +15,7 @@ export const wootlyScraper = makeEmbed({
       readHeaders: ['Set-Cookie'],
     });
 
-    const wootssesCookie = wootlyData.headers.get('Set-Cookie')?.split(';')[0].split('wootsses=')[1];
+    const wootssesCookie = wootlyData.headers.get('Set-Cookie')?.match(/wootsses=([^;]+)/)?.[1];
 
     let $ = load(wootlyData.body); // load the html data
     const iframeSrc = $('iframe').attr('src') ?? '';
@@ -28,7 +28,7 @@ export const wootlyScraper = makeEmbed({
       },
     });
 
-    const woozCookie = woozCookieRequest.headers.get('Set-Cookie')?.split(';')[0].split('wooz=')[1];
+    const woozCookie = woozCookieRequest.headers.get('Set-Cookie')?.match(/wooz=([^;]+)/)?.[1];
 
     const iframeData = await ctx.proxiedFetcher<string>(iframeSrc, {
       method: 'POST',
@@ -45,8 +45,10 @@ export const wootlyScraper = makeEmbed({
 
     // Regular expressions to match the variables
 
-    const tk = scriptText.split('tk=')[1].split(';')[0].replaceAll('"', '').replaceAll(' ', '');
-    const vd = scriptText.split('vd=')[1].split(',')[0].replaceAll('"', '').replaceAll(' ', '');
+    const tk = scriptText.match(/tk=([^;]+)/)?.[0].replace(/tk=|["\s]/g, '');
+    const vd = scriptText.match(/vd=([^,]+)/)?.[0].replace(/vd=|["\s]/g, '');
+
+    if (!tk || !vd) throw new Error('wootly source not found');
 
     const url = await ctx.proxiedFetcher<string>(`/grabd`, {
       baseUrl,
@@ -57,26 +59,24 @@ export const wootlyScraper = makeEmbed({
       },
     });
 
-    if (url) {
-      return {
-        stream: [
-          {
-            id: 'primary',
-            type: 'file',
-            url,
-            flags: [flags.CORS_ALLOWED, flags.IP_LOCKED],
-            captions: [],
-            qualities: {
-              unknown: {
-                type: 'mp4',
-                url,
-              },
+    if (!url) throw new Error('wootly source not found');
+
+    return {
+      stream: [
+        {
+          id: 'primary',
+          type: 'file',
+          url,
+          flags: [flags.IP_LOCKED],
+          captions: [],
+          qualities: {
+            unknown: {
+              type: 'mp4',
+              url,
             },
           },
-        ],
-      };
-    }
-
-    throw new Error('wootly source not found');
+        },
+      ],
+    };
   },
 });
diff --git a/src/providers/sources/goojara/getEmbeds.ts b/src/providers/sources/goojara/getEmbeds.ts
index d0a96a4..de2148a 100644
--- a/src/providers/sources/goojara/getEmbeds.ts
+++ b/src/providers/sources/goojara/getEmbeds.ts
@@ -8,16 +8,14 @@ export async function getEmbeds(ctx: ScrapeContext, id: string): Promise<EmbedsR
   const data = await ctx.fetcher.full(`/${id}`, {
     baseUrl: 'https://ww1.goojara.to',
     headers: {
-      accept: '*/*',
-      'content-type': 'application/x-www-form-urlencoded',
       Referer: 'https://www.goojara.to/',
-      'Referrer-Policy': 'strict-origin-when-cross-origin',
     },
     readHeaders: ['Set-Cookie'],
     method: 'GET',
   });
 
-  const aGoozCookie = data.headers.get('Set-Cookie')?.split(';')[0].split('aGooz=')[1];
+  const aGoozCookie = data.headers.get('Set-Cookie')?.match(/aGooz=([^;]+)/)?.[1];
+
   const $ = load(data.body);
   const RandomCookieName = data.body.split(`_3chk('`)[1].split(`'`)[0];
   const RandomCookieValue = data.body.split(`_3chk('`)[1].split(`'`)[2];
@@ -27,26 +25,36 @@ export async function getEmbeds(ctx: ScrapeContext, id: string): Promise<EmbedsR
     .get()
     .filter((href) => href && href.includes('https://ww1.goojara.to/go.php'));
 
-  const embeds = await Promise.all(
-    embedRedirectURLs.map((url) =>
-      ctx.fetcher
-        .full(url, {
-          headers: {
-            cookie: `aGooz=${aGoozCookie}; ${RandomCookieName}=${RandomCookieValue};`,
-            Referer: 'https://ww1.goojara.to/eJwD5z',
-          },
-          method: 'GET',
-        })
-        .then((result) => {
-          if (result) {
-            const embedId = ['wootly', 'upstream', 'mixdrop', 'dood'].find((a) => result.finalUrl.includes(a));
-            return embedId ? { embedId, url: result.finalUrl } : null;
-          }
-          return null;
-        })
-        .catch(() => null),
+  const embedPages = await Promise.all(
+    embedRedirectURLs.map(
+      (url) =>
+        ctx.fetcher
+          .full(url, {
+            headers: {
+              cookie: `aGooz=${aGoozCookie}; ${RandomCookieName}=${RandomCookieValue};`,
+              Referer: 'https://ww1.goojara.to/eJwD5z',
+            },
+            method: 'GET',
+          })
+          .catch(() => null), // Handle errors gracefully
     ),
-  ).then((results) => results.filter((result) => result !== null) as EmbedsResult);
+  );
 
-  return embeds;
+  // Initialize an array to hold the results
+  const results = [];
+
+  // Process each page result
+  for (const result of embedPages) {
+    // Ensure there's a result to process
+    if (result) {
+      // Attempt to find a matching embed ID
+      const embedId = ['wootly', 'upstream', 'mixdrop', 'dood'].find((a) => result.finalUrl.includes(a));
+      // If an embed ID is found, push the result to the results array
+      if (embedId) {
+        results.push({ embedId, url: result.finalUrl });
+      }
+    }
+  }
+
+  return results;
 }
diff --git a/src/providers/sources/goojara/index.ts b/src/providers/sources/goojara/index.ts
index bd1e03f..ea85d3d 100644
--- a/src/providers/sources/goojara/index.ts
+++ b/src/providers/sources/goojara/index.ts
@@ -22,7 +22,7 @@ async function universalScraper(ctx: ShowScrapeContext | MovieScrapeContext): Pr
 export const goojaraScraper = makeSourcerer({
   id: 'goojara',
   name: 'goojara',
-  rank: 69,
+  rank: 225,
   flags: [],
   scrapeShow: universalScraper,
   scrapeMovie: universalScraper,
diff --git a/src/providers/sources/goojara/type.ts b/src/providers/sources/goojara/type.ts
index 732ba4e..b4b4751 100644
--- a/src/providers/sources/goojara/type.ts
+++ b/src/providers/sources/goojara/type.ts
@@ -1,33 +1,8 @@
-// ! Types
-interface BaseConfig {
-  /** The website's slug. Formatted as `1839578-person-of-interest-2011` */
-  slug: string;
-  /** Type of request */
-  type: 'show' | 'movie';
-  /** Hash */
-  hash: string;
-  /** Hash expiry */
-  expires: number;
-}
-interface TvConfig extends BaseConfig {
-  /** Type of request */
-  type: 'show';
-  /** The episode ID for a TV show. Given in search and URL */
-  episodeId: string;
-}
-interface MovieConfig extends BaseConfig {
-  /** Type of request */
-  type: 'movie';
-  /** Movie's id */
-  slug: string;
-}
-export type Config = MovieConfig | TvConfig;
-
 export type EmbedsResult = { embedId: string; url: string }[];
 
 export interface Result {
   title: string;
-  slug: any;
+  slug: string;
   year: string;
   type: string;
   id_movie?: string;
diff --git a/src/providers/sources/goojara/util.ts b/src/providers/sources/goojara/util.ts
index 0fcba4b..4922ffa 100644
--- a/src/providers/sources/goojara/util.ts
+++ b/src/providers/sources/goojara/util.ts
@@ -1,4 +1,5 @@
 import { load } from 'cheerio';
+import { stringify } from 'crypto-js/enc-base64';
 
 import { MovieMedia, ShowMedia } from '@/entrypoint/utils/media';
 import { compareMedia } from '@/utils/compare';
@@ -8,30 +9,24 @@ import { NotFoundError } from '@/utils/errors';
 import { getEmbeds } from './getEmbeds';
 import { EmbedsResult, Result } from './type';
 
+let data;
+
+// The cookie for this headerData doesn't matter, Goojara just checks it's there. T
 const headersData = {
-  accept: '*/*',
-  'accept-language': 'en-US,en;q=0.9',
   'content-type': 'application/x-www-form-urlencoded',
-  'sec-ch-ua': '"Not_A Brand";v="8", "Chromium";v="120", "Google Chrome";v="120"',
-  'sec-ch-ua-mobile': '?0',
-  'sec-ch-ua-platform': '"Windows"',
-  'sec-fetch-dest': 'empty',
-  'sec-fetch-mode': 'cors',
-  'sec-fetch-site': 'same-origin',
   cookie: `aGooz=t9pmkdtef1b3lg3pmo1u2re816; bd9aa48e=0d7b89e8c79844e9df07a2; _b414=2151C6B12E2A88379AFF2C0DD65AC8298DEC2BF4; 9d287aaa=8f32ad589e1c4288fe152f`,
   Referer: 'https://www.goojara.to/',
-  'Referrer-Policy': 'strict-origin-when-cross-origin',
 };
 
 export async function searchAndFindMedia(
   ctx: ScrapeContext,
   media: MovieMedia | ShowMedia,
 ): Promise<Result | undefined> {
-  const data = await ctx.fetcher<string>(`/xhrr.php`, {
+  data = await ctx.fetcher<string>(`/xhrr.php`, {
     baseUrl: 'https://www.goojara.to',
     headers: headersData,
     method: 'POST',
-    body: `q=${media.title}`,
+    body: new URLSearchParams({ q: media.title }),
   });
 
   const $ = load(data);
@@ -48,6 +43,8 @@ export async function searchAndFindMedia(
     const year = yearMatch ? yearMatch[1] : '';
     const slug = $(element).find('a').attr('href')?.split('/')[3];
 
+    if (!slug) throw new NotFoundError('Not found');
+
     if (media.type === type) {
       results.push({ title, year, slug, type });
     }
@@ -68,7 +65,7 @@ export async function scrapeIds(
   if (media.type === 'movie') {
     id = result.slug;
   } else if (media.type === 'show') {
-    const data = await ctx.fetcher<string>(`/${result.slug}`, {
+    data = await ctx.fetcher<string>(`/${result.slug}`, {
       baseUrl: 'https://www.goojara.to',
       headers: headersData,
       method: 'GET',
@@ -76,18 +73,20 @@ export async function scrapeIds(
 
     const $1 = load(data);
 
-    const dataId = $1('#seon').data('id');
+    const dataId = $1('#seon').attr('data-id');
 
-    const data2 = await ctx.fetcher<string>(`/xhrc.php`, {
+    if (!dataId) throw NotFoundError;
+
+    data = await ctx.fetcher<string>(`/xhrc.php`, {
       baseUrl: 'https://ww1.goojara.to',
       headers: headersData,
       method: 'POST',
-      body: `s=${media.season.number}&t=${dataId}`,
+      body: new URLSearchParams({ s: media.season.number.toString(), t: dataId }),
     });
 
     let episodeId = '';
 
-    const $2 = load(data2);
+    const $2 = load(data);
 
     $2('.seho').each((index, element) => {
       // Extracting the episode number as a string

From d6624efc5a42b77a0b1d3d53a1294ed704d079fa Mon Sep 17 00:00:00 2001
From: MemeCornucopia <148788549+MemeCornucopia@users.noreply.github.com>
Date: Sun, 28 Jan 2024 14:27:07 -0500
Subject: [PATCH 08/15] Added Base URL Declaration

---
 src/providers/sources/goojara/getEmbeds.ts | 10 +++++-----
 src/providers/sources/goojara/type.ts      |  4 ++++
 src/providers/sources/goojara/util.ts      |  8 ++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/providers/sources/goojara/getEmbeds.ts b/src/providers/sources/goojara/getEmbeds.ts
index de2148a..33b7e16 100644
--- a/src/providers/sources/goojara/getEmbeds.ts
+++ b/src/providers/sources/goojara/getEmbeds.ts
@@ -2,13 +2,13 @@ import { load } from 'cheerio';
 
 import { ScrapeContext } from '@/utils/context';
 
-import { EmbedsResult } from './type';
+import { EmbedsResult, baseUrl, baseUrl2 } from './type';
 
 export async function getEmbeds(ctx: ScrapeContext, id: string): Promise<EmbedsResult> {
   const data = await ctx.fetcher.full(`/${id}`, {
-    baseUrl: 'https://ww1.goojara.to',
+    baseUrl: baseUrl2,
     headers: {
-      Referer: 'https://www.goojara.to/',
+      Referer: baseUrl,
     },
     readHeaders: ['Set-Cookie'],
     method: 'GET',
@@ -23,7 +23,7 @@ export async function getEmbeds(ctx: ScrapeContext, id: string): Promise<EmbedsR
   const embedRedirectURLs = $('a')
     .map((index, element) => $(element).attr('href'))
     .get()
-    .filter((href) => href && href.includes('https://ww1.goojara.to/go.php'));
+    .filter((href) => href && href.includes(`${baseUrl2}/go.php`));
 
   const embedPages = await Promise.all(
     embedRedirectURLs.map(
@@ -32,7 +32,7 @@ export async function getEmbeds(ctx: ScrapeContext, id: string): Promise<EmbedsR
           .full(url, {
             headers: {
               cookie: `aGooz=${aGoozCookie}; ${RandomCookieName}=${RandomCookieValue};`,
-              Referer: 'https://ww1.goojara.to/eJwD5z',
+              Referer: baseUrl2,
             },
             method: 'GET',
           })
diff --git a/src/providers/sources/goojara/type.ts b/src/providers/sources/goojara/type.ts
index b4b4751..ff1923f 100644
--- a/src/providers/sources/goojara/type.ts
+++ b/src/providers/sources/goojara/type.ts
@@ -1,3 +1,7 @@
+export const baseUrl = 'https://www.goojara.to';
+
+export const baseUrl2 = 'https://ww1.goojara.to';
+
 export type EmbedsResult = { embedId: string; url: string }[];
 
 export interface Result {
diff --git a/src/providers/sources/goojara/util.ts b/src/providers/sources/goojara/util.ts
index 4922ffa..96ecb8b 100644
--- a/src/providers/sources/goojara/util.ts
+++ b/src/providers/sources/goojara/util.ts
@@ -7,7 +7,7 @@ import { ScrapeContext } from '@/utils/context';
 import { NotFoundError } from '@/utils/errors';
 
 import { getEmbeds } from './getEmbeds';
-import { EmbedsResult, Result } from './type';
+import { EmbedsResult, Result, baseUrl } from './type';
 
 let data;
 
@@ -23,7 +23,7 @@ export async function searchAndFindMedia(
   media: MovieMedia | ShowMedia,
 ): Promise<Result | undefined> {
   data = await ctx.fetcher<string>(`/xhrr.php`, {
-    baseUrl: 'https://www.goojara.to',
+    baseUrl,
     headers: headersData,
     method: 'POST',
     body: new URLSearchParams({ q: media.title }),
@@ -66,7 +66,7 @@ export async function scrapeIds(
     id = result.slug;
   } else if (media.type === 'show') {
     data = await ctx.fetcher<string>(`/${result.slug}`, {
-      baseUrl: 'https://www.goojara.to',
+      baseUrl,
       headers: headersData,
       method: 'GET',
     });
@@ -78,7 +78,7 @@ export async function scrapeIds(
     if (!dataId) throw NotFoundError;
 
     data = await ctx.fetcher<string>(`/xhrc.php`, {
-      baseUrl: 'https://ww1.goojara.to',
+      baseUrl,
       headers: headersData,
       method: 'POST',
       body: new URLSearchParams({ s: media.season.number.toString(), t: dataId }),

From 63bbd8b858ddd77f0290c00c9d8cb5cbcdcd64df Mon Sep 17 00:00:00 2001
From: MemeCornucopia <148788549+MemeCornucopia@users.noreply.github.com>
Date: Sun, 28 Jan 2024 15:41:40 -0500
Subject: [PATCH 09/15] All changes done

---
 src/providers/all.ts                       | 3 ---
 src/providers/embeds/dood.ts               | 2 --
 src/providers/embeds/wootly.ts             | 1 -
 src/providers/sources/goojara/getEmbeds.ts | 2 +-
 src/providers/sources/goojara/util.ts      | 5 ++---
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/providers/all.ts b/src/providers/all.ts
index fe1be15..0f3ce9e 100644
--- a/src/providers/all.ts
+++ b/src/providers/all.ts
@@ -24,12 +24,9 @@ import { ridooScraper } from './embeds/ridoo';
 import { smashyStreamDScraper } from './embeds/smashystream/dued';
 import { smashyStreamFScraper } from './embeds/smashystream/video1';
 import { vidplayScraper } from './embeds/vidplay';
-
 import { wootlyScraper } from './embeds/wootly';
 import { goojaraScraper } from './sources/goojara';
-
 import { ridooMoviesScraper } from './sources/ridomovies';
-
 import { smashyStreamScraper } from './sources/smashystream';
 import { vidSrcToScraper } from './sources/vidsrcto';
 
diff --git a/src/providers/embeds/dood.ts b/src/providers/embeds/dood.ts
index d977fdc..e2c8534 100644
--- a/src/providers/embeds/dood.ts
+++ b/src/providers/embeds/dood.ts
@@ -32,8 +32,6 @@ export const doodScraper = makeEmbed({
 
     const downloadURL = `${doodPage}${nanoid()}?token=${dataForLater}${Date.now()}`;
 
-    if (!downloadURL) throw new Error('dood source not found');
-
     return {
       stream: [
         {
diff --git a/src/providers/embeds/wootly.ts b/src/providers/embeds/wootly.ts
index 701fae9..72202e1 100644
--- a/src/providers/embeds/wootly.ts
+++ b/src/providers/embeds/wootly.ts
@@ -66,7 +66,6 @@ export const wootlyScraper = makeEmbed({
         {
           id: 'primary',
           type: 'file',
-          url,
           flags: [flags.IP_LOCKED],
           captions: [],
           qualities: {
diff --git a/src/providers/sources/goojara/getEmbeds.ts b/src/providers/sources/goojara/getEmbeds.ts
index 33b7e16..d72a0ff 100644
--- a/src/providers/sources/goojara/getEmbeds.ts
+++ b/src/providers/sources/goojara/getEmbeds.ts
@@ -41,7 +41,7 @@ export async function getEmbeds(ctx: ScrapeContext, id: string): Promise<EmbedsR
   );
 
   // Initialize an array to hold the results
-  const results = [];
+  const results: EmbedsResult = [];
 
   // Process each page result
   for (const result of embedPages) {
diff --git a/src/providers/sources/goojara/util.ts b/src/providers/sources/goojara/util.ts
index 96ecb8b..1b19b50 100644
--- a/src/providers/sources/goojara/util.ts
+++ b/src/providers/sources/goojara/util.ts
@@ -11,9 +11,8 @@ import { EmbedsResult, Result, baseUrl } from './type';
 
 let data;
 
-// The cookie for this headerData doesn't matter, Goojara just checks it's there. T
+// The cookie for this headerData doesn't matter, Goojara just checks it's there.
 const headersData = {
-  'content-type': 'application/x-www-form-urlencoded',
   cookie: `aGooz=t9pmkdtef1b3lg3pmo1u2re816; bd9aa48e=0d7b89e8c79844e9df07a2; _b414=2151C6B12E2A88379AFF2C0DD65AC8298DEC2BF4; 9d287aaa=8f32ad589e1c4288fe152f`,
   Referer: 'https://www.goojara.to/',
 };
@@ -75,7 +74,7 @@ export async function scrapeIds(
 
     const dataId = $1('#seon').attr('data-id');
 
-    if (!dataId) throw NotFoundError;
+    if (!dataId) throw new NotFoundError();
 
     data = await ctx.fetcher<string>(`/xhrc.php`, {
       baseUrl,

From 53f4d6699a65e1de043f5f715d4ae29f1a2c2d7b Mon Sep 17 00:00:00 2001
From: MemeCornucopia <148788549+MemeCornucopia@users.noreply.github.com>
Date: Sun, 28 Jan 2024 15:44:09 -0500
Subject: [PATCH 10/15] Added reasoning

---
 src/providers/sources/goojara/util.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/providers/sources/goojara/util.ts b/src/providers/sources/goojara/util.ts
index 1b19b50..e04f3ae 100644
--- a/src/providers/sources/goojara/util.ts
+++ b/src/providers/sources/goojara/util.ts
@@ -74,7 +74,7 @@ export async function scrapeIds(
 
     const dataId = $1('#seon').attr('data-id');
 
-    if (!dataId) throw new NotFoundError();
+    if (!dataId) throw new NotFoundError('Not found');
 
     data = await ctx.fetcher<string>(`/xhrc.php`, {
       baseUrl,

From 46253bad0c7650fe136599e90e7b3a061393e0d7 Mon Sep 17 00:00:00 2001
From: MemeCornucopia <148788549+MemeCornucopia@users.noreply.github.com>
Date: Sun, 28 Jan 2024 15:49:10 -0500
Subject: [PATCH 11/15] Fixed linting errors

---
 src/providers/embeds/dood.ts          | 1 -
 src/providers/sources/goojara/util.ts | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/providers/embeds/dood.ts b/src/providers/embeds/dood.ts
index e2c8534..faa79d8 100644
--- a/src/providers/embeds/dood.ts
+++ b/src/providers/embeds/dood.ts
@@ -1,6 +1,5 @@
 import { customAlphabet } from 'nanoid';
 
-import { flags } from '@/entrypoint/utils/targets';
 import { makeEmbed } from '@/providers/base';
 
 const nanoid = customAlphabet('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789', 10);
diff --git a/src/providers/sources/goojara/util.ts b/src/providers/sources/goojara/util.ts
index e04f3ae..30d63a9 100644
--- a/src/providers/sources/goojara/util.ts
+++ b/src/providers/sources/goojara/util.ts
@@ -1,5 +1,4 @@
 import { load } from 'cheerio';
-import { stringify } from 'crypto-js/enc-base64';
 
 import { MovieMedia, ShowMedia } from '@/entrypoint/utils/media';
 import { compareMedia } from '@/utils/compare';

From c8ad3387c53903eb9c6637e3464538d85011bc23 Mon Sep 17 00:00:00 2001
From: MemeCornucopia <148788549+MemeCornucopia@users.noreply.github.com>
Date: Mon, 29 Jan 2024 13:32:21 -0500
Subject: [PATCH 12/15] Added Cookie.ts. Changed request changes.

---
 src/entrypoint/utils/cookie.ts             | 22 ++++++++++++++++++++++
 src/providers/embeds/wootly.ts             | 14 ++++++++------
 src/providers/sources/goojara/getEmbeds.ts | 12 +++++++-----
 3 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 src/entrypoint/utils/cookie.ts

diff --git a/src/entrypoint/utils/cookie.ts b/src/entrypoint/utils/cookie.ts
new file mode 100644
index 0000000..4f2fcbe
--- /dev/null
+++ b/src/entrypoint/utils/cookie.ts
@@ -0,0 +1,22 @@
+export interface Cookie {
+  name: string;
+  value: string;
+}
+
+export function makeCookieHeader(cookies: Record<string, string>): string {
+  return Object.entries(cookies)
+    .map(([name, value]) => `${name}=${value}`)
+    .join('; ');
+}
+
+export function parseSetCookie(headerValue: string): Record<string, Cookie> {
+  const cookies: Record<string, Cookie> = {};
+  const parts = headerValue.split(/; */);
+  for (const part of parts) {
+    const [name, value] = part.split('=');
+    if (name && value) {
+      cookies[name] = { name, value };
+    }
+  }
+  return cookies;
+}
diff --git a/src/providers/embeds/wootly.ts b/src/providers/embeds/wootly.ts
index 72202e1..e748707 100644
--- a/src/providers/embeds/wootly.ts
+++ b/src/providers/embeds/wootly.ts
@@ -1,5 +1,6 @@
 import { load } from 'cheerio';
 
+import { makeCookieHeader, parseSetCookie } from '@/entrypoint/utils/cookie';
 import { flags } from '@/entrypoint/utils/targets';
 import { makeEmbed } from '@/providers/base';
 
@@ -15,7 +16,8 @@ export const wootlyScraper = makeEmbed({
       readHeaders: ['Set-Cookie'],
     });
 
-    const wootssesCookie = wootlyData.headers.get('Set-Cookie')?.match(/wootsses=([^;]+)/)?.[1];
+    const cookies = parseSetCookie(wootlyData.headers.get('Set-Cookie') || '');
+    const wootssesCookie = cookies.wootsses.value;
 
     let $ = load(wootlyData.body); // load the html data
     const iframeSrc = $('iframe').attr('src') ?? '';
@@ -24,17 +26,18 @@ export const wootlyScraper = makeEmbed({
       method: 'GET',
       readHeaders: ['Set-Cookie'],
       headers: {
-        cookie: `wootsses=${wootssesCookie};`,
+        cookie: makeCookieHeader({ wootsses: wootssesCookie }),
       },
     });
 
-    const woozCookie = woozCookieRequest.headers.get('Set-Cookie')?.match(/wooz=([^;]+)/)?.[1];
+    const woozCookies = parseSetCookie(woozCookieRequest.headers.get('Set-Cookie') || '');
+    const woozCookie = woozCookies.wooz.value;
 
     const iframeData = await ctx.proxiedFetcher<string>(iframeSrc, {
       method: 'POST',
       body: new URLSearchParams({ qdf: '1' }),
       headers: {
-        cookie: `wooz=${woozCookie}`,
+        cookie: makeCookieHeader({ wooz: woozCookie }),
         Referer: iframeSrc,
       },
     });
@@ -44,7 +47,6 @@ export const wootlyScraper = makeEmbed({
     const scriptText = $('script').html() ?? '';
 
     // Regular expressions to match the variables
-
     const tk = scriptText.match(/tk=([^;]+)/)?.[0].replace(/tk=|["\s]/g, '');
     const vd = scriptText.match(/vd=([^,]+)/)?.[0].replace(/vd=|["\s]/g, '');
 
@@ -55,7 +57,7 @@ export const wootlyScraper = makeEmbed({
       query: { t: tk, id: vd },
       method: 'GET',
       headers: {
-        cookie: `wooz=${woozCookie}; wootsses=${wootssesCookie};`,
+        cookie: makeCookieHeader({ wooz: woozCookie, wootsses: wootssesCookie }),
       },
     });
 
diff --git a/src/providers/sources/goojara/getEmbeds.ts b/src/providers/sources/goojara/getEmbeds.ts
index d72a0ff..2b05a2d 100644
--- a/src/providers/sources/goojara/getEmbeds.ts
+++ b/src/providers/sources/goojara/getEmbeds.ts
@@ -1,5 +1,6 @@
 import { load } from 'cheerio';
 
+import { makeCookieHeader, parseSetCookie } from '@/entrypoint/utils/cookie';
 import { ScrapeContext } from '@/utils/context';
 
 import { EmbedsResult, baseUrl, baseUrl2 } from './type';
@@ -14,7 +15,8 @@ export async function getEmbeds(ctx: ScrapeContext, id: string): Promise<EmbedsR
     method: 'GET',
   });
 
-  const aGoozCookie = data.headers.get('Set-Cookie')?.match(/aGooz=([^;]+)/)?.[1];
+  const cookies = parseSetCookie(data.headers.get('Set-Cookie') || '');
+  const aGoozCookie = cookies.aGooz.value;
 
   const $ = load(data.body);
   const RandomCookieName = data.body.split(`_3chk('`)[1].split(`'`)[0];
@@ -31,7 +33,10 @@ export async function getEmbeds(ctx: ScrapeContext, id: string): Promise<EmbedsR
         ctx.fetcher
           .full(url, {
             headers: {
-              cookie: `aGooz=${aGoozCookie}; ${RandomCookieName}=${RandomCookieValue};`,
+              cookie: makeCookieHeader({
+                aGooz: aGoozCookie,
+                [RandomCookieName]: RandomCookieValue,
+              }),
               Referer: baseUrl2,
             },
             method: 'GET',
@@ -45,11 +50,8 @@ export async function getEmbeds(ctx: ScrapeContext, id: string): Promise<EmbedsR
 
   // Process each page result
   for (const result of embedPages) {
-    // Ensure there's a result to process
     if (result) {
-      // Attempt to find a matching embed ID
       const embedId = ['wootly', 'upstream', 'mixdrop', 'dood'].find((a) => result.finalUrl.includes(a));
-      // If an embed ID is found, push the result to the results array
       if (embedId) {
         results.push({ embedId, url: result.finalUrl });
       }

From 8b149458e060c648539a677f05581680216ee860 Mon Sep 17 00:00:00 2001
From: MemeCornucopia <148788549+MemeCornucopia@users.noreply.github.com>
Date: Mon, 29 Jan 2024 13:43:32 -0500
Subject: [PATCH 13/15] Use cookie and set-cookie-parser

---
 package-lock.json              | 36 ++++++++++++++++++++++++++++++++--
 package.json                   |  4 ++++
 src/entrypoint/utils/cookie.ts | 18 ++++++++---------
 3 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3facef2..f5536e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,26 +1,30 @@
 {
   "name": "@movie-web/providers",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@movie-web/providers",
-      "version": "2.1.0",
+      "version": "2.1.1",
       "license": "MIT",
       "dependencies": {
         "cheerio": "^1.0.0-rc.12",
+        "cookie": "^0.6.0",
         "crypto-js": "^4.1.1",
         "form-data": "^4.0.0",
         "iso-639-1": "^3.1.0",
         "nanoid": "^3.3.6",
         "node-fetch": "^2.7.0",
+        "set-cookie-parser": "^2.6.0",
         "unpacker": "^1.0.1"
       },
       "devDependencies": {
+        "@types/cookie": "^0.6.0",
         "@types/crypto-js": "^4.1.1",
         "@types/node-fetch": "^2.6.6",
         "@types/randombytes": "^2.0.1",
+        "@types/set-cookie-parser": "^2.4.7",
         "@types/spinnies": "^0.5.1",
         "@typescript-eslint/eslint-plugin": "^5.60.0",
         "@typescript-eslint/parser": "^5.60.0",
@@ -687,6 +691,12 @@
         "@types/chai": "*"
       }
     },
+    "node_modules/@types/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
+      "dev": true
+    },
     "node_modules/@types/crypto-js": {
       "version": "4.2.1",
       "dev": true,
@@ -751,6 +761,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/set-cookie-parser": {
+      "version": "2.4.7",
+      "resolved": "https://registry.npmjs.org/@types/set-cookie-parser/-/set-cookie-parser-2.4.7.tgz",
+      "integrity": "sha512-+ge/loa0oTozxip6zmhRIk8Z/boU51wl9Q6QdLZcokIGMzY5lFXYy/x7Htj2HTC6/KZP1hUbZ1ekx8DYXICvWg==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/spinnies": {
       "version": "0.5.3",
       "dev": true,
@@ -1764,6 +1783,14 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/cosmiconfig": {
       "version": "8.3.6",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
@@ -4789,6 +4816,11 @@
         "node": ">=10"
       }
     },
+    "node_modules/set-cookie-parser": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz",
+      "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ=="
+    },
     "node_modules/set-function-length": {
       "version": "1.1.1",
       "dev": true,
diff --git a/package.json b/package.json
index 25c4d07..f21eb89 100644
--- a/package.json
+++ b/package.json
@@ -48,9 +48,11 @@
     "prepublishOnly": "npm test && npm run lint"
   },
   "devDependencies": {
+    "@types/cookie": "^0.6.0",
     "@types/crypto-js": "^4.1.1",
     "@types/node-fetch": "^2.6.6",
     "@types/randombytes": "^2.0.1",
+    "@types/set-cookie-parser": "^2.4.7",
     "@types/spinnies": "^0.5.1",
     "@typescript-eslint/eslint-plugin": "^5.60.0",
     "@typescript-eslint/parser": "^5.60.0",
@@ -80,11 +82,13 @@
   },
   "dependencies": {
     "cheerio": "^1.0.0-rc.12",
+    "cookie": "^0.6.0",
     "crypto-js": "^4.1.1",
     "form-data": "^4.0.0",
     "iso-639-1": "^3.1.0",
     "nanoid": "^3.3.6",
     "node-fetch": "^2.7.0",
+    "set-cookie-parser": "^2.6.0",
     "unpacker": "^1.0.1"
   }
 }
diff --git a/src/entrypoint/utils/cookie.ts b/src/entrypoint/utils/cookie.ts
index 4f2fcbe..20fd3e4 100644
--- a/src/entrypoint/utils/cookie.ts
+++ b/src/entrypoint/utils/cookie.ts
@@ -1,3 +1,6 @@
+import cookie from 'cookie';
+import setCookieParser from 'set-cookie-parser';
+
 export interface Cookie {
   name: string;
   value: string;
@@ -5,18 +8,13 @@ export interface Cookie {
 
 export function makeCookieHeader(cookies: Record<string, string>): string {
   return Object.entries(cookies)
-    .map(([name, value]) => `${name}=${value}`)
+    .map(([name, value]) => cookie.serialize(name, value))
     .join('; ');
 }
 
 export function parseSetCookie(headerValue: string): Record<string, Cookie> {
-  const cookies: Record<string, Cookie> = {};
-  const parts = headerValue.split(/; */);
-  for (const part of parts) {
-    const [name, value] = part.split('=');
-    if (name && value) {
-      cookies[name] = { name, value };
-    }
-  }
-  return cookies;
+  const parsedCookies = setCookieParser.parse(headerValue, {
+    map: true,
+  });
+  return parsedCookies;
 }

From 7061e808ba5b34e85c1532d1d948157e06a4f52e Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Tue, 30 Jan 2024 19:13:23 +0100
Subject: [PATCH 14/15] Move cookie file

---
 src/providers/embeds/wootly.ts             | 2 +-
 src/providers/sources/goojara/getEmbeds.ts | 2 +-
 src/{entrypoint => }/utils/cookie.ts       | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/{entrypoint => }/utils/cookie.ts (100%)

diff --git a/src/providers/embeds/wootly.ts b/src/providers/embeds/wootly.ts
index e748707..0119926 100644
--- a/src/providers/embeds/wootly.ts
+++ b/src/providers/embeds/wootly.ts
@@ -1,8 +1,8 @@
 import { load } from 'cheerio';
 
-import { makeCookieHeader, parseSetCookie } from '@/entrypoint/utils/cookie';
 import { flags } from '@/entrypoint/utils/targets';
 import { makeEmbed } from '@/providers/base';
+import { makeCookieHeader, parseSetCookie } from '@/utils/cookie';
 
 export const wootlyScraper = makeEmbed({
   id: 'wootly',
diff --git a/src/providers/sources/goojara/getEmbeds.ts b/src/providers/sources/goojara/getEmbeds.ts
index 2b05a2d..50f574a 100644
--- a/src/providers/sources/goojara/getEmbeds.ts
+++ b/src/providers/sources/goojara/getEmbeds.ts
@@ -1,7 +1,7 @@
 import { load } from 'cheerio';
 
-import { makeCookieHeader, parseSetCookie } from '@/entrypoint/utils/cookie';
 import { ScrapeContext } from '@/utils/context';
+import { makeCookieHeader, parseSetCookie } from '@/utils/cookie';
 
 import { EmbedsResult, baseUrl, baseUrl2 } from './type';
 
diff --git a/src/entrypoint/utils/cookie.ts b/src/utils/cookie.ts
similarity index 100%
rename from src/entrypoint/utils/cookie.ts
rename to src/utils/cookie.ts

From f683cbf8ac875cc53c92294804abc83a68c74a3b Mon Sep 17 00:00:00 2001
From: Jorrin <jorrinkievit@hotmail.com>
Date: Tue, 30 Jan 2024 19:56:58 +0100
Subject: [PATCH 15/15] Fixed VidSrcTo crashing if no subtitles are found

---
 src/providers/sources/vidsrcto/index.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/providers/sources/vidsrcto/index.ts b/src/providers/sources/vidsrcto/index.ts
index b85b068..6912ae1 100644
--- a/src/providers/sources/vidsrcto/index.ts
+++ b/src/providers/sources/vidsrcto/index.ts
@@ -46,7 +46,10 @@ const universalScraper = async (ctx: ShowScrapeContext | MovieScrapeContext): Pr
   }
 
   // Originally Filemoon does not have subtitles. But we can use the ones from Vidplay.
-  const subtitleUrl = new URL(embedUrls.find((v) => v.includes('sub.info')) ?? '').searchParams.get('sub.info');
+  const urlWithSubtitles = embedUrls.find((v) => v.includes('sub.info'));
+  let subtitleUrl: string | null = null;
+  if (urlWithSubtitles) subtitleUrl = new URL(urlWithSubtitles).searchParams.get('sub.info');
+
   for (const source of sources.result) {
     if (source.title === 'Vidplay') {
       const embedUrl = embedUrls.find((v) => v.includes('vidplay'));