.dockerignore

@@ -3,5 +3,3 @@ node_modules
 .gitignore
 .next
 package-lock.json
-
-.env

.env.example

@@ -1,20 +0,0 @@
-# enable content cache (less server api calls)
-ENABLE_REDIS=true
-
-# if cache enabled, sets redis url for Docker network (see docker-compose.yaml)
-# REDIS_URL='redis://redis:6379'
-
-# if cache enabled, set redis url for external redis
-REDIS_URL='redis://127.0.0.1:6379'
-
-# this key is necessary to encrypt/decrypt urls for server-side stream
-# if not set, a default value (check const DEFAULT_ENCODING_KEY inside src/constants/encoding.ts ) will be used
-# please generate a new one with command `pwgen 20 1` (pwgen command needs to be installed)
-# uncomment variable below and add generated value
-
-# ENCODING_KEY=''
-
-# this key can be use to disable specific platforms
-# please add platforms list (comma separated, eg: 'pornhub,youporn,xnxx')
-# list of platform values can be found in Platforms enum inside src/meta/settings.ts
-# DISABLED_PLATFORMS=''

.gitignore

@@ -34,6 +34,3 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
-
-# local .env
-.env

Dockerfile

@@ -1,28 +1,21 @@
 # PHASE 1: copy and build
 
-FROM node:22-alpine AS build
+FROM node:alpine AS build
-ENV NEXT_TELEMETRY_DISABLED 1
-ENV NEXT_PRIVATE_STANDALONE true
 
 WORKDIR /app
 
 COPY . .
-RUN rm -rf node_modules && npm i --package-lock-only && npm ci
+
-RUN npm run build
+RUN rm -rf node_modules && npm install && npm run build
 
 # PHASE 2: prepare for exec
 
-FROM node:22-alpine AS exec
+FROM node:alpine AS exec
-ENV NEXT_TELEMETRY_DISABLED 1
-ENV NODE_ENV production
 
 WORKDIR /app
 
-COPY --from=build /app/.next/standalone .
+COPY --from=build /app/. .
-COPY --from=build /app/.next/static ./.next/static
-COPY --from=build /app/public ./public
 
 EXPOSE 3000
 
-ENTRYPOINT [ "node" ]
+CMD ["npm", "run", "start"]
-CMD ["server.js"]

README.md

@@ -6,14 +6,7 @@ Proxy Raye is an alternative front-end for adult websites. Watch videos on a cle
 
 - XVideos
 - XNXX
-- PornHub (experimental)
+- (...more coming soon!)
-- YouPorn
-- RedTube
-- XHamster
-
-### How to switch between platforms
-
-Click on settings icon (gear icon on top-right corner). A pop-up menu will let you choose platform and orientation.
 
 ## Working demos
 
@@ -21,88 +14,27 @@ Vercel hosted demo can be found [here](https://proxyraye.vercel.app).
 
 Self-hosted demo can be found [here](https://proxyraye.copyriot.xyz).
 
-# Roadmap
-
-This is the list of features that will be implemented in the future:
-
- - [ ] Search pagination
- - [ ] Search filters
- - [ ] Add support for *bellesa.co*
- - [ ] Add support for *ohentai.org*
- - [ ] Add support for *iamsissy.com*
- - [ ] Video results API
- - [ ] Favourite videos
- - [ ] Embed videos
- - [ ] Download videos
- - [ ] Share link button for videos
-
-
 # Quickstart
 
 You can run the project on local by cloning the repo. 
 
-## IMPORTANT: encoding key generation:
+Project requires no configuration. 
 
-Since version `0.4.0` server-side video streaming is supported and mandatory for some platforms (like PornHub) in order to work properly. In order to avoid random video url injection, urls get encrypted/decrypted by using an encoding key. 
+You can run it via Docker with docker-compose by opening root folder via console and running:
-
-For security reasons it's better to generate a new encoding key. It can be done via console/terminal by running `pwgen 20 1` command. Make sure `pwgen` command is installed. This will generate an alphanumeric string. 
-
-Paste the string to `ENCODING_KEY` environment variable inside `docker-compose.yaml` if you are using Docker, or inside `.env` file if you run the project with npm. See detailed instructions below.
-
-In case variable is not set, a default encoding key will be used (not recommended!).
-
-## Docker
-
-You can run project via Docker with docker-compose by opening root folder via console and running:
 
 ```
 docker-compose up -d
 ```
-
 And head browser to `localhost:8069`.
 
-### Caching
+Or you can run it outside Docker via npm (tested with NodeJS `20.11`) by opening root folder via console and running:
-
-Starting from version `0.3.0` caching is enabled by default inside `docker-compose.yaml`. 
-
-A base Redis image will be added to the network.
-
-However, Proxy Raye can still work without Redis by setting `ENABLE_REDIS=false`  under `environment:`. 
-
-### Encoding urls
-
-Please uncomment `ENCODING_KEY=` related line  inside `docker-compose.yaml` (under `environment:`) and set value to the string obtained by running `pwgen 20 1`.
-
-## Node.js
-
-You can also run project outside Docker via npm (tested with NodeJS `20.11` and above).
-
-You can run the project by opening root folder via console and running:
-
 ```
 npm install
 npm run build
 npm run start
 ```
-
 And head browser to `localhost:3000`.
 
-### Encoding urls
-
-Please rename `.env.example` to `.env` file inside root folder.
-
-Please uncomment `ENCODING_KEY=` related line inside `.env` file and set value to the string obtained by running `pwgen 20 1`.
-
-### (optional) Enable caching
-
-If you want to enable caching, please rename `.env.example` to `.env` file inside root folder. Inside `.env` file you will find following variables:
-
-```
-ENABLE_REDIS=true
-REDIS_URL='redis://127.0.0.1:6379'
-```
-These values assume a basic Redis instance running on local machine. If your local setup is different, or your Redis instance is somewhere else, please change `REDIS_URL` accordingly.
-
 # Modify
 If you want to edit the project you can start development mode by opening root folder via console and running:
 
@@ -119,7 +51,6 @@ The project uses following tech stack:
  - Next/Intl
 
 It scrapes data server-side and return treated data to the frontend to be rendered.
-
 # Deploy
 
 ## Vercel
@@ -129,17 +60,4 @@ You can deploy the app on Vercel by cloning this repo on your GitHub/Gitlab and
 Due to Vercel's *serverless* nature (which makes every request to XVideos and other platforms come from a different IP) it becomes very hard for *web application firewalls* to ban addresses effectively.
 
 ## Self-host
-
 You can self host the project on your local server via docker-compose and reverse-proxy exposed port to nginx.
-
-# Disabling platforms
-
-For several reason you might want to disable some platforms. You can do it by adding `DISABLED_PLATFORMS` environment variable.
-
-List of platform values can be found in Platforms enum inside `src/meta/settings.ts`
-
-Please add platforms list comma separated. Example:
-
-```
-DISABLED_PLATFORMS='pornhub, xnxx'
-```

docker-compose.yaml

@@ -19,14 +19,3 @@ services:
 
     ports:
       - "8069:3000"
-
-    environment:
-    - ENABLE_REDIS=true
-    - REDIS_URL=redis://redis:6379
-    # Please generate a new encoding key with command `pwgen 20 1`, decomment following variable and insert result into it:
-    # - ENCODING_KEY=
-    
-  redis:
-      image: redis:alpine
-      container_name: redis
-      restart: unless-stopped

locale/en.json

@@ -2,7 +2,13 @@
     "Header": {
         "title": "Proxy Raye",
         "description": "A proxy for porn websites",
-        "disclaimer_pornhub": "Warning: PornHub support is experimental. If video player freezes, try reloading the page after a few seconds."
+        "disclaimer_0": "Genital sexuality is only one of the many possible conceptions of sexuality",
+        "disclaimer_1": "Platform capitalism makes money on desire flow. Proxies avoid this to happen.",
+        "disclaimer_2": "Platform capitalism is narcissism-driven",
+        "disclaimer_3": "Pornhub annoying elements (like ads) are put there intentionally to make you upgrade to premium",
+        "disclaimer_4": "You're going to masturbate on someone else's imaginary",
+        "disclaimer_5": "No banners or annoying popups. You can jerk off with no hassle!",
+        "disclaimer_6": "You're choosing image over imagination. What if they're not in antithesis?"
     },
     "NotFound": {
         "uh_oh": "Uh Oh...",
@@ -23,7 +29,7 @@
     },
     "Results": {
         "query": "Search results for: {{ query }}",
-        "toggle": "Toggle opacity",
+        "toggle": "Show preview",
         "noData": "No videos found :("
     }
 }

locale/it.json

@@ -2,7 +2,13 @@
     "Header": {
         "title": "Proxy Raye",
         "description": "Un proxy per i siti porno",
-        "disclaimer_pornhub": "Attenzione: il supporto per PornHub è sperimentale. Se il player si blocca, provare a ricaricare la pagina dopo qualche secondo."
+        "disclaimer_0": "Quella genitale è solo una delle possibili concezioni della sessualità.",
+        "disclaimer_1": "Le piattaforme monetizzano i flussi di desiderio. I proxy impediscono che questo accada.",
+        "disclaimer_2": "Le piattaforme si alimentano del narcisisismo degli utenti.",
+        "disclaimer_3": "Gli elementi di disturbo su PornHub sono messi lì a posta per farti passare alla versione Premium.",
+        "disclaimer_4": "Stai per masturbarti sull'immaginario di qualcun altro.",
+        "disclaimer_5": "Niente banner o popup fastidiosi. Puoi masturbarti in santa pace.",
+        "disclaimer_6": "Stai preferendo l'immagine all'immaginazione. E se immagine e immaginazione non fossero in antitesi?"
     },
     "NotFound": {
         "uh_oh": "Uh Oh...",
@@ -23,7 +29,7 @@
     },
     "Results": {
         "query": "Risultati della ricerca per: {{ query }}",
-        "toggle": "Attiva/disattiva opacità",
+        "toggle": "Mostra anteprime risultati",
         "noData": "Nessun video trovato :("
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "proxyraye-next",
-  "version": "0.4.1",
+  "version": "0.2.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -9,34 +9,31 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@picocss/pico": "2.0.6",
+    "@picocss/pico": "^2.0.6",
-    "@reduxjs/toolkit": "2.2.3",
+    "@reduxjs/toolkit": "^2.2.3",
-    "axios": "1.6.8",
+    "axios": "^1.6.8",
-    "cheerio": "1.0.0-rc.12",
+    "cheerio": "^1.0.0-rc.12",
-    "classnames": "2.5.1",
+    "classnames": "^2.5.1",
     "next": "14.2.2",
-    "next-intl": "3.11.3",
+    "next-intl": "^3.11.3",
-    "next-nprogress-bar": "2.3.11",
+    "next-nprogress-bar": "^2.3.11",
-    "plyr-react": "5.3.0",
+    "react": "^18",
-    "react": "18.3.0",
+    "react-cookie": "^7.1.4",
-    "react-cookie": "7.1.4",
+    "react-dom": "^18",
-    "react-dom": "18.3.0",
+    "react-icons": "^5.1.0",
-    "react-icons": "5.1.0",
+    "react-image": "^4.1.0",
-    "react-image": "4.1.0",
+    "react-redux": "^9.1.1",
-    "react-redux": "9.1.1",
+    "redux-persist": "^6.0.0",
-    "redis": "4.6.14",
+    "video.js": "^8.10.0",
-    "redux-persist": "6.0.0",
+    "videojs-hls-quality-selector": "^2.0.0"
-    "video.js": "8.12.0",
-    "videojs-hls-quality-selector": "2.0.0"
   },
   "devDependencies": {
-    "@types/node": "20.12.12",
+    "@types/node": "^20",
-    "@types/react": "18.3.0",
+    "@types/react": "^18",
-    "@types/react-dom": "18.3.0",
+    "@types/react-dom": "^18",
-    "@types/redis": "4.0.11",
+    "eslint": "^8",
-    "eslint": "8",
     "eslint-config-next": "14.2.2",
-    "sass": "1.75.0",
+    "sass": "^1.75.0",
-    "typescript": "5.4.5"
+    "typescript": "^5"
   }
 }

src/app/[locale]/video/[platform]/[id]/page.tsx

@@ -24,11 +24,13 @@ export default async function VideoPage({ params }: { params: { platform: Platfo
 
   const [data, related] = await new VideoAgent(platform).getVideo(decodedId)
 
-  if (!data.hlsUrl && (!data.srcSet || data.srcSet.length == 0)) {
+  //const [data, related] = await fetchVideoData(decodedId)
+
+  if (!data.lowResUrl) {
     redirect(`/${locale}/404`)
   }
  
   return <Layout>
-    <Video platform={platform} id={id} data={data} related={related}/>
+    <Video id={id} data={data} related={related}/>
   </Layout>
 }

src/app/api/stream/[platform]/[encodedUrl]/route.ts

@@ -1,44 +0,0 @@
-import { Platforms } from "@/meta/settings";
-import { decodeUrl } from "@/utils/string";
-import axios from "axios";
-
-type GetParams = {
-  params: {
-    platform: Platforms
-    encodedUrl: string
-  };
-};
-
-export async function GET(req: Request, { params }: GetParams) {
-
-  const { platform, encodedUrl } = params;
-
-  if (!Object.keys(Platforms).includes(platform)) {
-    return Response.json(
-      { 
-        success: false, 
-        message: 'Platform not supported!' 
-      },
-      { status: 404 }
-    )
-  }
-
-  const decodedUrl = decodeUrl(encodedUrl)
-  
-  const response = await axios.get<ReadableStream>(decodedUrl, {
-    responseType: "stream",
-  });
-
-  const headers = new Headers();
-  
-  headers.set('Content-Type', 'video/mp4');
-  headers.set('Cache-Control', 'no-cache');
-  headers.set('Accept-Ranges', 'bytes');
-  headers.set('Content-Length', response.headers['content-length']);
-  headers.set('Content-Disposition', 'inline');
-
-  return new Response(response.data, {
-    headers,
-  });
-}
-

src/components/Layout/Header/Disclaimer/index.tsx

@@ -3,22 +3,19 @@ import React from 'react';
 import style from './Disclaimer.module.scss'
 
 import { useTranslations } from 'next-intl';
-import { Platforms } from '@/meta/settings';
 
-interface Props {
+const Disclaimer: React.FC = () => {
-  platform: Platforms
-}
 
-const Disclaimer: React.FC<Props> = (props) => {
+  const MAX_DISCLAIMER_NO = 6
-
-  const { platform } = props;
 
   const t = useTranslations('Header');
 
+  const getRandomArbitrary = (max: number) => {
+    return Math.floor( Math.random() * max);
+  }
+
   return (
-    <>
+    <div className={style.messageBox}>{t(`disclaimer_${getRandomArbitrary(MAX_DISCLAIMER_NO)}`)}</div>
-      {platform == Platforms.pornhub && <div className={style.messageBox}>{t(`disclaimer_pornhub`)}</div>}
-    </>
   );
 };
 

src/components/Layout/Header/Menu/Settings/Modal/Orientation/index.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { Cookies, OrientationMapper, Platforms, XVideosOrientations } from '@/meta/settings';
+import { Cookies, XVideosOrientations } from '@/meta/settings';
 
 import css from './Orientation.module.scss'
 
@@ -16,17 +16,11 @@ interface Props {
     }
 }
 
-const getOrientations = (platform: Platforms):Object => {
-    return OrientationMapper[platform];
-} 
-
 const Orientation: React.FC<Props> = (props) => {
 
     const { labels, handleClose } = props
     
-    const [cookies] = useCookies([Cookies.orientation, Cookies.platform]);
+    const [cookies] = useCookies([Cookies.orientation]);
-
-    const orientationsList = cookies.platform ? getOrientations(cookies.platform) : XVideosOrientations
 
     const handleChange = async (event: React.ChangeEvent<HTMLSelectElement>) => {
         const value = event.target.value;
@@ -40,7 +34,7 @@ const Orientation: React.FC<Props> = (props) => {
         <div className={css.container}>
             <div className={css.title}>{labels.title}</div>
             <select defaultValue={ cookies.orientation ?? XVideosOrientations.etero } onChange={handleChange} name={'orientation'} aria-label={labels.title}>
-                {Object.keys(orientationsList).map((elem, key) => {
+                {Object.keys(XVideosOrientations).map((elem, key) => {
                     return <option className={css.option} key={key} value={elem}>{elem.toUpperCase()}</option>
                 })}
             </select>

src/components/Layout/Header/Menu/Settings/Modal/Platform/index.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { Cookies, OrientationMapper, Platforms } from '@/meta/settings';
+import { Cookies, Platforms } from '@/meta/settings';
 
 import css from './Platform.module.scss'
 
@@ -11,45 +11,30 @@ import { useCookies } from 'react-cookie';
 
 interface Props {
     handleClose(): void
-    enabledPlatforms: string[]
     labels: {
         title: string,
     }
 }
 
-const mapOrientationToPlatform = (platform: string, orientation: string): string | undefined => {
-    const orientations = OrientationMapper[platform as Platforms]
-    return Object.keys(orientations).includes(orientation) ? orientation : String(Object.keys(orientations)[0])
-}
-
 const Platform: React.FC<Props> = (props) => {
 
-    const { labels, handleClose, enabledPlatforms } = props
+    const { labels, handleClose } = props
     
-    const [cookies] = useCookies([Cookies.platform, Cookies.orientation]);
+    const [cookies] = useCookies([Cookies.platform]);
 
     const handleChange = async (event: React.ChangeEvent<HTMLSelectElement>) => {
         const value = event.target.value;
 
         await setCookie(Cookies.platform, value)
 
-        if (cookies.orientation) {
-            const newOrientation = mapOrientationToPlatform(value, cookies.orientation)
-            newOrientation && await setCookie(Cookies.orientation, newOrientation)
-        }
-
         handleClose()
     }
 
     return (
         <div className={css.container}>
             <div className={css.title}>{labels.title}</div>
-            <select defaultValue={cookies.platform ?? Platforms.xvideos} onChange={handleChange} name={'platform'} aria-label={labels.title}>
+            <select defaultValue={ cookies.platform ?? Platforms.xvideos } onChange={handleChange} name={'platform'} aria-label={labels.title}>
                 {Object.keys(Platforms).map((elem, key) => {
-                    if (!enabledPlatforms.includes(elem)) {
-                        return null
-                    }
-
                     return <option className={css.option} key={key} value={elem}>{elem.toUpperCase()}</option>
                 })}
             </select>

src/components/Layout/Header/Menu/Settings/Modal/index.tsx

@@ -10,7 +10,6 @@ import Orientation from './Orientation';
 
 interface Props {
   handleClose(): void
-  enabledPlatforms: string[]
   labels: {
     title: string
     platform: any
@@ -20,7 +19,7 @@ interface Props {
 
 const LangSwitcher: React.FC<Props> = (props) => {
 
-  const { labels, handleClose, enabledPlatforms } = props
+  const { labels, handleClose } = props
 
   return (
     <dialog open>
@@ -30,7 +29,7 @@ const LangSwitcher: React.FC<Props> = (props) => {
           <div className={style.close} onClick={() => { handleClose() }}><IoCloseCircleOutline size={24} /></div>
         </header>
         <div className={style.content}>
-          <Platform enabledPlatforms={enabledPlatforms} handleClose={handleClose} labels={{ title: labels.platform.title }} />
+          <Platform handleClose={handleClose} labels={{ title: labels.platform.title }} />
           <Orientation handleClose={handleClose} labels={{ title: labels.orientation.title }} />
         </div>
       </article>

src/components/Layout/Header/Menu/Settings/index.tsx

@@ -9,12 +9,11 @@ import Modal from './Modal';
 
 interface Props {
     labels: any
-    enabledPlatforms: string[]
 }
 
 const Settings: React.FC<Props> = (props) => {
 
-    const { labels, enabledPlatforms } = props
+    const { labels } = props
 
     const [showModal, setShowModal] = useState<boolean>(false)
 
@@ -24,7 +23,7 @@ const Settings: React.FC<Props> = (props) => {
                 {<IoSettingsOutline size={24} />}
             </Icon>
 
-            {showModal && <Modal enabledPlatforms={enabledPlatforms} handleClose={() => setShowModal(false)} labels={labels} />}
+            {showModal && <Modal handleClose={() => setShowModal(false)} labels={labels} />}
         </>
     );
 };

src/components/Layout/Header/Menu/index.tsx

@@ -9,7 +9,6 @@ import Repo from './Repo';
 import Language from './Language';
 import { LangOption } from '@/meta/settings';
 import Settings from './Settings';
-import { getEnabledPlatforms } from '@/utils/platforms';
 
 const Menu: React.FC = () => {
 
@@ -35,14 +34,12 @@ const Menu: React.FC = () => {
         }
     }
 
-    const enabledPlatforms = getEnabledPlatforms()
-
     return (
         <div className={style.container}>
             <Repo />
             <Language labels={languageLabels} />
             <Theme />
-            <Settings enabledPlatforms={enabledPlatforms} labels={settingsLabels} />
+            <Settings labels={settingsLabels} />
         </div>
     );
 };

src/components/Layout/Player/VideoJS/index.tsx

@@ -6,9 +6,9 @@ import videojs from 'video.js';
 
 import 'video.js/dist/video-js.css';
 
-import style from './VJSContent.module.scss'
+import style from './VideoJS.module.scss'
 
-export const VJSContent = (props: { options: any; onReady: any; }) => {
+export const VideoJS = (props: { options: any; onReady: any; }) => {
   const videoRef = React.useRef(null);
   const playerRef = React.useRef(null);
   const {options, onReady} = props;
@@ -64,4 +64,4 @@ export const VJSContent = (props: { options: any; onReady: any; }) => {
   );
 }
 
-export default VJSContent;
+export default VideoJS;

src/components/Layout/Player/index.tsx

@@ -2,9 +2,9 @@
 
 import React from 'react';
 
-import style from './VideoJS.module.scss'
+import style from './Player.module.scss'
 
-import VJSContent from './VJSContent';
+import VideoJS from './VideoJS';
 import { VideoData } from '@/meta/data';
 
 import 'videojs-hls-quality-selector';
@@ -13,12 +13,12 @@ interface Props {
   data: VideoData
 }
 
-const VideoJS: React.FC<Props> = (props) => {
+const Player: React.FC<Props> = (props) => {
 
   const { data } = props;
 
-  const videoSrc = data.hlsUrl
+  const videoSrc = data.hlsUrl ?? data.lowResUrl
-  const videoType = 'application/x-mpegURL'
+  const videoType = data.hlsUrl ? 'application/x-mpegURL' : 'video/mp4'
 
   const playerRef = React.useRef(null);
 
@@ -55,9 +55,9 @@ const VideoJS: React.FC<Props> = (props) => {
 
   return (
     <div className={style.container}>
-      <VJSContent options={videoJsOptions} onReady={handlePlayerReady} />
+      <VideoJS options={videoJsOptions} onReady={handlePlayerReady} />
     </div>
   );
 };
 
-export default VideoJS;
+export default Player;

src/components/Layout/PlyrJS/PlyrJS.module.scss

@@ -1,13 +0,0 @@
-@import 'spacing';
-
-.container {
-    margin-bottom: $spacing_32;
-
-    [type="button"],
-    [type="reset"],
-    [type="submit"] {
-        margin-bottom: 0 !important;
-    }
-
-    --plyr-color-main: var(--primary)
-}

src/components/Layout/PlyrJS/index.tsx

@@ -1,71 +0,0 @@
-'use client'
-
-import React from 'react';
-
-import { usePlyr } from 'plyr-react';
-
-import style from './PlyrJS.module.scss'
-
-import { VideoData } from '@/meta/data';
-
-import "plyr-react/plyr.css"
-
-import dynamic from 'next/dynamic';
-
-interface Props {
-    data: VideoData
-}
-
-const PlyrJS: React.FC<Props> = (props) => {
-
-    const PlyrComponent = React.useMemo(() => {
-        return dynamic(() => import("plyr-react").then(() => {
-            const Comp = React.forwardRef((props, ref) => {
-                //@ts-ignore
-                const { source, options = null, ...rest } = props
-                //@ts-ignore
-                const raptorRef = usePlyr(ref, {
-                    source,
-                    options,
-                })
-                return <video ref={raptorRef} className="plyr-react plyr" {...rest} />
-            })
-
-            Comp.displayName = 'PlyrComponent'
-
-            return Comp;
-        }), { ssr: false });
-    }, []);
-
-    PlyrComponent.displayName = 'PlyrComponent'
-
-    const { data } = props;
-
-    const plyrProps = {
-        source: { type: 'video', sources: data.srcSet }, // https://github.com/sampotts/plyr#the-source-setter
-        options: {
-            controls: [
-                'play-large',
-                'play', // Play/pause playback
-                'progress', // The progress bar and scrubber for playback and buffering
-                'current-time', // The current time of playback
-                'duration', // The full duration of the media
-                'mute', // Toggle mute
-                'volume', // Volume control
-                'captions', // Toggle captions
-                'settings', // Settings menu
-                'fullscreen', // Toggle fullscreen
-            ]
-        }, // https://github.com/sampotts/plyr#options
-    }
-
-    return (
-        <div className={style.container}>
-            {/* @ts-ignore */}
-            <PlyrComponent {...plyrProps} />
-        </div>
-    );
-
-};
-
-export default PlyrJS;

src/components/Layout/Results/Wrapper/Gallery/Thumbnail/index.tsx

@@ -31,11 +31,7 @@ const Thumbnail: React.FC<Props> = (props) => {
     return (
         <div className={classNames(style.thumbnailContainer, { [style.show]: show } )}>
             <Link href={`/${locale}/video/${platform}/${encodedUri}`}>
-                <Img 
+                <Img className={style.image} src={imgUrl} unloader={<div className={style.imgPlaceholder}></div>} />
-                    className={style.image} 
-                    src={imgUrl} 
-                    loader={<div className={style.imgPlaceholder}></div>} 
-                    unloader={<div className={style.imgPlaceholder}></div>} />
                 <div className={style.text}>{text}</div>
             </Link>
         </div>

src/components/Layout/Results/Wrapper/Toggle/Toggle.module.scss

@@ -1,5 +1,4 @@
 @import 'breakpoints';
-@import 'fontsize';
 
 .toggleContainer {
     display: flex;
@@ -12,7 +11,7 @@
         border-color: var(--primary-focus);
     }
 
-    .label {
+    @media only screen and (min-width: $tablet) {
-        font-size: $font-size-medium;
+        display: none;
     }
 }

src/components/Pages/Video/index.tsx

@@ -1,34 +1,27 @@
 import React from 'react';
 
 import Header from '@/components/Layout/Header';
-
+import Player from '@/components/Layout/Player';
-import VideoJS from '@/components/Layout/VideoJS';
-import PlyrJS from '@/components/Layout/PlyrJS';
-
 import SearchBar from '@/components/Layout/SearchBar';
 import Results from '@/components/Layout/Results';
 
 import { GalleryData, VideoData } from '@/meta/data';
-import { Platforms } from '@/meta/settings';
-import Disclaimer from '@/components/Layout/Header/Disclaimer';
 
 
 interface Props {
     id: string
     data: VideoData
     related: GalleryData[]
-    platform: Platforms
 }
 
 const Video: React.FC<Props> = (props) => {
 
-    const { data, related, platform } = props;
+    const { data, related } = props;
 
     return (
         <>
             <Header />
-            <Disclaimer platform={platform} />
+            <Player data={data} />
-            {data.hlsUrl ? <VideoJS data={data} /> : <PlyrJS data={data} />}
             <SearchBar />
             {related && <Results data={related} />}
         </>

src/constants/encoding.ts

@@ -1 +0,0 @@
-export const DEFAULT_ENCODING_KEY = 'oom2oz8ut0ieshie1Hae'

src/constants/redis.ts

@@ -1,21 +0,0 @@
-const EX_MIN = 60
-const EX_HOURLY = 60 * 60
-const EX_DAILY = 60 * 60 * 24
-
-export const DEFAULT_PORNHUB_GALLERY_EXPIRY = { EX: EX_HOURLY };
-export const DEFAULT_PORNHUB_VIDEO_EXPIRY = { EX: EX_MIN };
-
-export const DEFAULT_XVIDEOS_CONTENT_EXPIRY = { EX: EX_HOURLY };
-
-export const DEFAULT_XNXX_CONTENT_EXPIRY = { EX: EX_HOURLY };
-
-export const DEFAULT_YOUPORN_GALLERY_EXPIRY = { EX: EX_HOURLY };
-export const DEFAULT_YOUPORN_VIDEO_EXPIRY = { EX: EX_HOURLY };
-
-export const DEFAULT_REDTUBE_GALLERY_EXPIRY = { EX: EX_HOURLY };
-export const DEFAULT_REDTUBE_VIDEO_EXPIRY = { EX: EX_HOURLY };
-
-export const DEFAULT_XHAMSTER_GALLERY_EXPIRY = { EX: EX_HOURLY };
-export const DEFAULT_XHAMSTER_VIDEO_EXPIRY = { EX: EX_HOURLY };
-
-export const DEFAULT_RELATED_VIDEO_KEY_PATH = '/related/'

src/constants/stream.ts

@@ -1 +0,0 @@
-export const DEFAULT_VIDEO_STREAM_ROUTE_PREFIX = '/api/stream'

src/constants/urls.ts

@@ -1,12 +1,7 @@
-// XVIDEOS
-
 export const XVIDEOS_BASE_URL: string = "https://www.xvideos.com"
 export const XVIDEOS_BASE_URL_GAY: string = "https://www.xvideos.com/gay"
 export const XVIDEOS_BASE_URL_TRANS: string = "https://www.xvideos.com/shemale"
 
-
-// XNXX
-
 export const XNXX_BASE_URL: string = 'https://www.xnxx.com'
 
 export const XNXX_BASE_URL_ETERO: string = 'https://www.xnxx.com/best'
@@ -14,39 +9,3 @@ export const XNXX_BASE_URL_GAY: string = 'https://www.xnxx.com/best-of-gay'
 export const XNXX_BASE_URL_TRANS: string = 'https://www.xnxx.com/best-of-shemale'
 
 export const XNXX_BASE_SEARCH: string = 'https://www.xnxx.com/search'
-
-// PORNHUB
-
-export const PORNHUB_BASE_URL: string = 'https://www.pornhub.com'
-export const PORNHUB_BASE_URL_VIDEO: string = 'https://www.pornhub.com/view_video.php?viewkey='
-
-export const PORNHUB_BASE_URL_GAY: string = 'https://www.pornhub.com/gayporn'
-export const PORNHUB_BASE_URL_GAY_SEARCH: string = 'https://www.pornhub.com/gay'
-
-// YOUPORN
-
-export const YOUPORN_BASE_URL: string = 'https://www.youporn.com'
-export const YOUPORN_BASE_URL_VIDEO: string = 'https://www.youporn.com/watch'
-
-export const YOUPORN_BASE_SEARCH: string = 'https://www.youporn.com/search/?search-btn=&query='
-
-// REDTUBE
-
-export const REDTUBE_BASE_URL: string = 'https://www.redtube.com'
-export const REDTUBE_BASE_URL_GAY: string = 'https://www.redtube.com/gay'
-export const REDTUBE_BASE_URL_TRANS: string = 'https://www.redtube.com/redtube/transgender'
-
-export const REDTUBE_BASE_SEARCH: string = 'https://www.redtube.com/?search='
-export const REDTUBE_BASE_GAY_SEARCH: string = 'https://www.redtube.com/gay?search='
-
-// XHAMSTER
-export const XHAMSTER_BASE_URL = 'https://xhamster.com'
-export const XHAMSTER_BASE_URL_VIDEOS = 'https://xhamster.com/videos'
-
-export const XHAMSTER_BASE_URL_ETERO = 'https://xhamster.com/newest'
-export const XHAMSTER_BASE_URL_GAY = 'https://xhamster.com/gay/newest'
-export const XHAMSTER_BASE_URL_TRANS = 'https://xhamster.com/shemale/newest'
-
-export const XHAMSTER_BASE_SEARCH = 'https://xhamster.com/search/'
-export const XHAMSTER_BASE_SEARCH_GAY = 'https://xhamster.com/gay/search/'
-export const XHAMSTER_BASE_SEARCH_TRANS = 'https://xhamster.com/shemale/search/'

src/meta/data.ts

@@ -12,20 +12,10 @@ export interface GalleryData {
     platform: Platforms
 }
 
-export interface VideoSourceItem {
-    type: string,
-    src: string,
-    size: string
-}
-
 export interface VideoData {
+    lowResUrl: string,
+    hiResUrl?: string,
     hlsUrl?: string
-    srcSet?: VideoSourceItem[]
-}
-
-export interface MindGeekVideoSrcElem {
-    videoUrl: string
-    quality: string
 }
 
 export interface VideoAgent {

src/meta/settings.ts

@@ -6,11 +6,7 @@ export enum Cookies {
 
 export enum Platforms {
     xvideos= 'xvideos',
-    xnxx= 'xnxx',
+    xnxx= 'xnxx'
-    pornhub= 'pornhub',
-    youporn= 'youporn',
-    redtube= 'redtube',
-    xhamster= 'xhamster'
 }
 
 export enum XVideosCatQueryMap {
@@ -25,27 +21,6 @@ export enum XVideosOrientations {
     trans= 'trans'
 }
 
-export enum PornHubOrientations {
-    generic= 'generic',
-    gay= 'gay'
-}
-
-export enum YouPornOrientations {
-    generic= 'generic'
-}
-
-export enum RedTubeOrientations {
-    etero= 'etero',
-    gay= 'gay',
-    trans= 'trans'
-}
-
-export enum XHamsterOrientations {
-    etero= 'etero',
-    gay= 'gay',
-    trans= 'trans'
-}
-
 export enum Themes {
     light= 'light',
     dark= 'dark',
@@ -58,12 +33,3 @@ export interface LangOption {
     label: string;
     code: string;
 }
-
-export const OrientationMapper = {
-    [Platforms.xvideos]: XVideosOrientations,
-    [Platforms.xnxx]: XVideosOrientations,
-    [Platforms.pornhub]: PornHubOrientations,
-    [Platforms.youporn]: YouPornOrientations,
-    [Platforms.redtube]: RedTubeOrientations,
-    [Platforms.xhamster]: XHamsterOrientations
-}

src/redis/client.ts

@@ -1,38 +0,0 @@
-import { createClient } from 'redis';
-
-export const getDataFromRedis = async (key: string): Promise<Object | null> => {
-
-    if (Boolean(process.env.ENABLE_REDIS)) {
-
-        const redis = await createClient({ url: process.env.REDIS_URL })
-            .on('error', err => console.log('Redis Client Error', err))
-            .connect()
-
-        const cached = await redis.get(key);
-
-        if (cached) {
-            await redis.disconnect();
-
-            return JSON.parse(cached)
-        } else {
-            return null
-        }
-
-
-    } else {
-        return null
-    }
-}
-
-export const storeDataIntoRedis = async (key: string, data: Object, expiry?: Object) => {
-    if (Boolean(process.env.ENABLE_REDIS)) {
-        const redis = await createClient({ url: process.env.REDIS_URL })
-            .on('error', err => console.log('Redis Client Error', err))
-            .connect()
-
-        await redis.set(key, JSON.stringify(data), expiry);
-
-        await redis.disconnect();
-    }
-
-} 

src/utils/agent.ts

@@ -4,18 +4,10 @@ import { Platforms } from "@/meta/settings";
 
 import { XVideosAgent } from "./scrape/xvideos/agent";
 import { XNXXAgent } from "./scrape/xnxx/agent";
-import { PornHubAgent } from "./scrape/pornhub/agent";
-import { YouPornAgent } from "./scrape/youporn/agent";
-import { RedTubeAgent } from "./scrape/redtube/agent";
-import { XHamsterAgent } from "./scrape/xhamster/agent";
 
 const AgentMapper = {
   [Platforms.xvideos]: XVideosAgent,
-  [Platforms.xnxx]: XNXXAgent,
+  [Platforms.xnxx]: XNXXAgent
-  [Platforms.pornhub]: PornHubAgent,
-  [Platforms.youporn]: YouPornAgent,
-  [Platforms.redtube]: RedTubeAgent,
-  [Platforms.xhamster]: XHamsterAgent
 }
 
 export class VideoAgent {

src/utils/platforms.ts

@@ -1,13 +0,0 @@
-import { Platforms } from "@/meta/settings";
-
-export const getEnabledPlatforms = ():string[] => {
-    if (process.env.DISABLED_PLATFORMS) {
-        const regex = /[ '\"]/g;
-
-        const disabledPlatforms: string[] = String(process.env.DISABLED_PLATFORMS).replace(regex, '').split(',')
-
-        return [...Object.values(Platforms)].filter(p => !disabledPlatforms.includes(p))
-    } else {
-        return [...Object.values(Platforms)]
-    }
-}

src/utils/scrape/common/headers.ts

@@ -22,7 +22,7 @@ const getRandomUserAgent = (): string => {
     return userAgents[rand]
 }
 
-export const getHeaders = (host:string) => {
+export const getHeaders = (host:string = XVIDEOS_BASE_URL) => {
     return {
         headers: {
             "User-Agent": getRandomUserAgent(),
@@ -32,23 +32,7 @@ export const getHeaders = (host:string) => {
             "Sec-Fetch-Dest": "document",
             "Sec-Fetch-Mode": "navigate",
             "Sec-Fetch-Site": "none",
-            "Host": removeHttpS(host),
+            "Host": removeHttpS(host)
-        },
-    }
-};
-
-export const getHeadersWithCookie = (host:string, cookie: string) => {
-    return {
-        headers: {
-            "User-Agent": getRandomUserAgent(),
-            "Accept-Language": "en-gb, en, en-US, it",
-            "Accept-Encoding": "gzip, deflate, br",
-            "Connection": "keep-alive",
-            "Sec-Fetch-Dest": "document",
-            "Sec-Fetch-Mode": "navigate",
-            "Sec-Fetch-Site": "none",
-            "Host": removeHttpS(host),
-            "Cookie": cookie
         },
     }
 };

src/utils/scrape/common/mindgeek.ts

@@ -1,55 +0,0 @@
-export const findGetMediaUrlInTagblock = (
-    tagBlock: string, key?: string): string | null => {
-
-    const getMediaIndex = tagBlock.indexOf(key ?? 'get_media');
-
-    if (getMediaIndex === -1) {
-        return null
-    }
-
-    const start = tagBlock.lastIndexOf('"', getMediaIndex);
-    const end = tagBlock.indexOf('"', getMediaIndex);
-
-    const substr = tagBlock.substring(start, end);
-
-    if (substr.length > 0) {
-        return substr.replace(/\\/g, '').replace(/"/g, '');
-    }
-
-    return null
-}
-
-export const findGetRelatedUrlInTagblock = (
-    tagBlock: string): string | null => {
-
-    const getMediaIndex = tagBlock.indexOf('player_related_datas');
-
-    if (getMediaIndex === -1) {
-        return null
-    }
-
-    const start = tagBlock.lastIndexOf('"', getMediaIndex);
-    const end = tagBlock.indexOf('"', getMediaIndex);
-
-    const substr = tagBlock.substring(start, end);
-
-    if (substr.length > 0) {
-        return substr.replace(/\\/g, '').replace(/"/g, '');
-    }
-
-    return null
-}
-
-export const createSessionCookie = (responseSetCookies: string[]): string => {
-    let pieces: string[] = []
-
-    responseSetCookies.map((elem, key) => {
-        if (elem.includes('platform=') || elem.includes('ss=') || elem.includes('fg_')) {
-            pieces.push(elem.split(';')[0])
-        }
-    })
-
-    const sessionCookie = pieces.join('; ');
-
-    return sessionCookie
-}

src/utils/scrape/pornhub/agent.ts

@@ -1,15 +0,0 @@
-import { FetchParams, GalleryData, VideoAgent, VideoData } from "@/meta/data";
-import { fetchPornHubGalleryData } from "./gallery";
-import { fetchPornHubVideoData } from "./video";
-
-export class PornHubAgent implements VideoAgent {
-
-    public getGallery = async (params?: FetchParams): Promise<GalleryData[]> => {
-        return await fetchPornHubGalleryData(params)
-    }
-
-    public getVideo = async (id: string, params?: FetchParams): Promise<[VideoData, GalleryData[]]> => {
-        return await fetchPornHubVideoData(id, params)
-    }
-
-}

src/utils/scrape/pornhub/gallery.ts

@@ -1,64 +0,0 @@
-import { PORNHUB_BASE_URL } from "@/constants/urls";
-import { FetchParams, GalleryData } from "@/meta/data";
-import { getHeaders } from "../common/headers";
-import { getDataFromRedis, storeDataIntoRedis } from "@/redis/client";
-import { getPornHubQueryUrl, getPornHubResultsWrapperId } from "./url";
-
-import * as cheerio from "cheerio";
-
-import axios, { AxiosError } from "axios";
-import { Platforms } from "@/meta/settings";
-
-import { DEFAULT_PORNHUB_GALLERY_EXPIRY } from "@/constants/redis";
-
-export const fetchPornHubGalleryData = async (params?: FetchParams): Promise<GalleryData[]> => {
-
-    let data: GalleryData[] = [];
-
-    const reqHeaders = getHeaders(PORNHUB_BASE_URL)
-
-    const queryUrl = await getPornHubQueryUrl(params?.query)
-
-    const cachedData = await getDataFromRedis(queryUrl)
-
-    if (cachedData) {
-        return cachedData as GalleryData[]
-    }
-
-    await axios.get(queryUrl, reqHeaders)
-
-    .then(async response => {
-
-        const html = response.data;
-
-        const $ = cheerio.load(html);
-
-        const wrapperId = await getPornHubResultsWrapperId(params?.query)
-    
-        const thumbs = $(wrapperId);
-    
-        thumbs.map((key, thumb) => {
-    
-            const videoUrl = $(thumb).find(".pcVideoListItem a").attr("href")?.split('=')[1];
-            const imgUrl = $(thumb).find(".pcVideoListItem a img").attr("src")
-            const text = $(thumb).find(".pcVideoListItem a").attr("title")
-    
-            videoUrl && imgUrl && text && data.push({
-                videoUrl,
-                imgUrl,
-                text,
-                platform: Platforms.pornhub
-            })
-        })
-
-        if (data.length > 0) {
-            await storeDataIntoRedis(queryUrl, data, DEFAULT_PORNHUB_GALLERY_EXPIRY);
-        }
-
-    }).catch((error: AxiosError) => {
-        // handle errors
-    });
-
-
-    return data
-}

src/utils/scrape/pornhub/url.ts

@@ -1,126 +0,0 @@
-import { PORNHUB_BASE_URL, PORNHUB_BASE_URL_GAY, PORNHUB_BASE_URL_GAY_SEARCH } from "@/constants/urls"
-import axios, { AxiosHeaders } from "axios"
-import { getHeadersWithCookie } from "../common/headers"
-import { GalleryData, MindGeekVideoSrcElem, VideoSourceItem } from "@/meta/data"
-import { Cookies, Platforms, PornHubOrientations } from "@/meta/settings"
-import { getCookie } from "@/utils/cookies/read"
-import { encodeUrl } from "@/utils/string"
-import { DEFAULT_VIDEO_STREAM_ROUTE_PREFIX } from "@/constants/stream"
-
-export const getPornHubQueryUrl = async (query?: string): Promise<string> => {
-    const orientation = await getCookie(Cookies.orientation)
-
-    if (query) {
-        return `${orientation && orientation.value == PornHubOrientations.gay ?
-            PORNHUB_BASE_URL_GAY_SEARCH :
-            PORNHUB_BASE_URL}/video/search?search=${query}`
-    }
-
-    return orientation && orientation.value == PornHubOrientations.gay ? PORNHUB_BASE_URL_GAY : PORNHUB_BASE_URL
-}
-
-export const getPornHubResultsWrapperId = async (query?: string): Promise<string> => {
-    const orientation = await getCookie(Cookies.orientation)
-
-    if (query) {
-        return "#videoSearchResult li"
-    }
-
-    if (orientation && orientation.value == PornHubOrientations.gay) {
-        return "#videoCategory li"
-    }
-
-    return "#singleFeedSection li"
-}
-
-export const getPornHubMediaUrlList = async (url: string, sessionCookie: string): Promise<VideoSourceItem[]> => {
-
-    const headersWithCookie = getHeadersWithCookie(PORNHUB_BASE_URL, sessionCookie)
-
-    let videos: VideoSourceItem[] = []
-
-    await axios.get(url, headersWithCookie)
-        .then(async response => {
-
-            if (response.data) {
-
-                videos = await response.data.map((elem: MindGeekVideoSrcElem) => ({
-                    src: `${DEFAULT_VIDEO_STREAM_ROUTE_PREFIX}/${Platforms.pornhub}/${encodeUrl(elem?.videoUrl)}`,
-                    type: 'video/mp4',
-                    size: elem?.quality
-                })) as VideoSourceItem[]
-
-                return videos
-
-            } else {
-                return []
-            }
-
-        })
-        .catch(error => console.log(error))
-
-    return videos
-}
-
-function containsAtLeastThreeSpaces(input: string): boolean {
-    // Conta il numero di spazi nella stringa
-    const spaceCount = (input.match(/ /g) || []).length;
-    // Verifica se ci sono almeno tre spazi
-    return spaceCount >= 3;
-}
-
-export const getPornHubRelatedVideoData = async (url: string, sessionCookie: string): Promise<GalleryData[]> => {
-
-    const headersWithCookie = getHeadersWithCookie(PORNHUB_BASE_URL, sessionCookie)
-
-    let gallery: GalleryData[] = []
-
-    await axios.get(url, headersWithCookie)
-        .then(async response => {
-
-            if (response.data?.related) {
-
-                Array(response.data.related).map((related: any[], key) => {
-
-                    related.map((rel: string[], key) => {
-
-                        let galleryElem: GalleryData = {
-                            videoUrl: '',
-                            imgUrl: '',
-                            text: '',
-                            platform: Platforms.pornhub
-                        }
-
-                        rel.map((str, key) => {
-
-                            if (String(str).includes('.jpg')) {
-                                galleryElem.imgUrl = str;
-                            }
-
-                            if (String(str).includes('viewkey')) {
-                                galleryElem.videoUrl = str.split('=')[1];
-                            }
-
-                            if (containsAtLeastThreeSpaces(String(str))) {
-                                galleryElem.text = str;
-                            }
-
-                        })
-
-                        gallery.push(galleryElem)
-
-                    })
-
-                })
-
-                return gallery;
-
-            } else {
-                return []
-            }
-
-        })
-        .catch(error => console.log(error))
-
-    return gallery
-}

src/utils/scrape/pornhub/video.ts

@@ -1,88 +0,0 @@
-import { PORNHUB_BASE_URL, PORNHUB_BASE_URL_VIDEO } from "@/constants/urls";
-import { FetchParams, GalleryData, VideoData, VideoSourceItem } from "@/meta/data";
-import { getHeaders } from "../common/headers";
-import { getDataFromRedis, storeDataIntoRedis } from "@/redis/client";
-import { DEFAULT_PORNHUB_GALLERY_EXPIRY, DEFAULT_PORNHUB_VIDEO_EXPIRY, DEFAULT_RELATED_VIDEO_KEY_PATH } from "@/constants/redis";
-
-import * as cheerio from "cheerio";
-
-import axios, { AxiosError } from "axios";
-import { createSessionCookie, findGetMediaUrlInTagblock, findGetRelatedUrlInTagblock } from "../common/mindgeek";
-import { getPornHubMediaUrlList, getPornHubRelatedVideoData } from "./url";
-
-export const fetchPornHubVideoData = async (videoId: string, params?: FetchParams): Promise<[VideoData, GalleryData[]]> => {
-
-    let data: VideoData = {
-        hlsUrl: '',
-        srcSet: []
-    }
-
-    let relatedData: GalleryData[] = [];
-
-    let mediaUrl, relatedUrl, sessionCookie, convertedData: VideoSourceItem[]
-
-    let reqHeaders = getHeaders(PORNHUB_BASE_URL)
-
-    const queryUrl = `${PORNHUB_BASE_URL_VIDEO}${videoId.replace(/\//g, '')}`
-
-    const cachedVideoData = await getDataFromRedis(queryUrl)
-    const cachedRelatedData = await getDataFromRedis(queryUrl + DEFAULT_RELATED_VIDEO_KEY_PATH)
-
-    if (cachedVideoData) {
-        return [cachedVideoData as VideoData, cachedRelatedData as GalleryData[] ?? []]
-    }
-
-    await axios.get(queryUrl, reqHeaders)
-
-        .then(async response => {
-
-            sessionCookie = response?.headers["set-cookie"] ? createSessionCookie(response?.headers["set-cookie"]) : '';
-
-            const html = response.data;
-
-            const $ = cheerio.load(html);
-
-            const scriptTags = $("script");
-
-            scriptTags.map((idx, elem) => {
-                const getMediaUrl = findGetMediaUrlInTagblock($(elem).toString()) ?? null
-
-                if (getMediaUrl) {
-                    mediaUrl = getMediaUrl
-                }
-
-            })
-
-            scriptTags.map((idx, elem) => {
-                const getRelatedUrl = findGetRelatedUrlInTagblock($(elem).toString()) ?? null
-
-                if (getRelatedUrl) {
-                    relatedUrl = getRelatedUrl
-                }
-
-            })
-
-        }).catch((error: AxiosError) => {
-            // error handling goes here
-        });
-
-    if (sessionCookie && mediaUrl) {
-        convertedData = await getPornHubMediaUrlList(mediaUrl, sessionCookie)
-        data.srcSet = convertedData.reverse()
-
-        await storeDataIntoRedis(queryUrl, data, DEFAULT_PORNHUB_VIDEO_EXPIRY);
-    }
-
-    if (sessionCookie && relatedUrl) {
-        if (cachedRelatedData) {
-            relatedData = cachedRelatedData as GalleryData[]
-        } else {
-            relatedData = await getPornHubRelatedVideoData(relatedUrl, sessionCookie)
-        
-            await storeDataIntoRedis(queryUrl + DEFAULT_RELATED_VIDEO_KEY_PATH, relatedData, DEFAULT_PORNHUB_GALLERY_EXPIRY);
-        }
-
-    }
-
-    return [ data, relatedData ]
-}

src/utils/scrape/redtube/agent.ts

@@ -1,15 +0,0 @@
-import { FetchParams, GalleryData, VideoAgent, VideoData } from "@/meta/data";
-import { fetchRedTubeGalleryData } from "./gallery";
-import { fetchRedTubeVideoData } from "./video";
-
-export class RedTubeAgent implements VideoAgent {
-
-    public getGallery = async (params?: FetchParams): Promise<GalleryData[]> => {
-        return await fetchRedTubeGalleryData(params)
-    }
-
-    public getVideo = async (id: string, params?: FetchParams): Promise<[VideoData, GalleryData[]]> => {
-        return await fetchRedTubeVideoData(id, params)
-    }
-
-}

src/utils/scrape/redtube/gallery.ts

@@ -1,60 +0,0 @@
-import { FetchParams, GalleryData } from "@/meta/data";
-import { getHeaders } from "../common/headers";
-import { REDTUBE_BASE_URL } from "@/constants/urls";
-import { getRedTubeQueryUrl, getRedTubeResultsWrapperId } from "./url";
-import { getDataFromRedis, storeDataIntoRedis } from "@/redis/client";
-
-import * as cheerio from "cheerio";
-
-import axios, { AxiosError } from "axios";
-import { Platforms } from "@/meta/settings";
-import { DEFAULT_REDTUBE_GALLERY_EXPIRY } from "@/constants/redis";
-
-export const fetchRedTubeGalleryData = async (params?: FetchParams): Promise<GalleryData[]> => {
-
-    let data: GalleryData[] = [];
-
-    const reqHeaders = getHeaders(REDTUBE_BASE_URL)
-
-    const queryUrl = await getRedTubeQueryUrl(params?.query)
-
-    const cachedData = await getDataFromRedis(queryUrl)
-
-    if (cachedData) {
-        return cachedData as GalleryData[]
-    }
-
-    await axios.get(queryUrl, reqHeaders)
-
-    .then(async response => {
-
-        const html = response.data;
-
-        const $ = cheerio.load(html);
-
-        const wrapperId = await getRedTubeResultsWrapperId(params?.query)
-    
-        const thumbs = $(wrapperId);
-    
-        thumbs.map((key, thumb) => {
-    
-            const videoUrl = $(thumb).find("a.video_link").attr("href")?.split('/')[1];
-            const imgUrl = $(thumb).find("img.js_thumbImageTag").attr("data-src")
-            const text = $(thumb).find("a.tm_video_title").attr("title");
-    
-            videoUrl && imgUrl && text && data.push({
-                videoUrl,
-                imgUrl,
-                text,
-                platform: Platforms.redtube
-            })
-        })
-
-        await storeDataIntoRedis(queryUrl, data, DEFAULT_REDTUBE_GALLERY_EXPIRY);
-
-    }).catch((error: AxiosError) => {
-        // handle errors
-    });
-
-    return data
-}

src/utils/scrape/redtube/url.ts

@@ -1,71 +0,0 @@
-import { getCookie } from "@/utils/cookies/read"
-
-import { Cookies, RedTubeOrientations } from "@/meta/settings"
-import { REDTUBE_BASE_SEARCH, REDTUBE_BASE_GAY_SEARCH, REDTUBE_BASE_URL_GAY, REDTUBE_BASE_URL, REDTUBE_BASE_URL_TRANS } from "@/constants/urls"
-import { getHeadersWithCookie } from "../common/headers"
-import { MindGeekVideoSrcElem, VideoSourceItem } from "@/meta/data"
-
-import axios from "axios"
-
-export const getRedTubeQueryUrl = async (query?: string): Promise<string> => {
-    const orientation = await getCookie(Cookies.orientation)
-
-    if (query) {
-        return `${orientation && orientation.value == RedTubeOrientations.gay ?
-            REDTUBE_BASE_GAY_SEARCH :
-            REDTUBE_BASE_SEARCH}${query}`
-    }
-
-    if (orientation && orientation.value == RedTubeOrientations.gay ) {
-        return REDTUBE_BASE_URL_GAY
-    }
-
-    if (orientation && orientation.value == RedTubeOrientations.trans ) {
-        return REDTUBE_BASE_URL_TRANS
-    }
-
-    return REDTUBE_BASE_URL
-}
-
-export const getRedTubeResultsWrapperId = async (query?: string): Promise<string> => {
-    const orientation = await getCookie(Cookies.orientation)
-
-    if (query) {
-        return ".videos_grid li"
-    }
-
-    if (orientation && ((orientation.value == RedTubeOrientations.gay) || (orientation.value == RedTubeOrientations.trans))) {
-        return "#block_browse li"
-    }
-
-    return "#most_recent_videos li"
-}
-
-export const getRedTubeMediaUrlList = async (url: string, sessionCookie: string): Promise<VideoSourceItem[]> => {
-
-    const headersWithCookie = getHeadersWithCookie(REDTUBE_BASE_URL, sessionCookie)
-
-    let videos: VideoSourceItem[] = []
-
-    await axios.get(url, headersWithCookie)
-        .then(async response => {
-
-            if (response.data) {
-
-                videos = await response.data.map((elem: MindGeekVideoSrcElem) => ({
-                    src: elem?.videoUrl,
-                    type: 'video/mp4',
-                    size: elem?.quality
-                })) as VideoSourceItem[]
-
-                return videos
-
-            } else {
-                return []
-            }
-
-        })
-        .catch(error => console.log(error))
-
-    return videos
-}

src/utils/scrape/redtube/video.ts

@@ -1,91 +0,0 @@
-import { REDTUBE_BASE_URL } from "@/constants/urls";
-import { FetchParams, GalleryData, VideoData, VideoSourceItem } from "@/meta/data";
-import { getHeaders } from "../common/headers";
-import { getDataFromRedis, storeDataIntoRedis } from "@/redis/client";
-import { DEFAULT_REDTUBE_GALLERY_EXPIRY, DEFAULT_REDTUBE_VIDEO_EXPIRY, DEFAULT_RELATED_VIDEO_KEY_PATH } from "@/constants/redis";
-
-import * as cheerio from "cheerio";
-
-import axios, { AxiosError } from "axios";
-import { createSessionCookie, findGetMediaUrlInTagblock } from "../common/mindgeek";
-import { Platforms } from "@/meta/settings";
-import { getRedTubeMediaUrlList } from "./url";
-
-export const fetchRedTubeVideoData = async (videoId: string, params?: FetchParams): Promise<[VideoData, GalleryData[]]> => {
-
-    let data: VideoData = {
-        hlsUrl: '',
-        srcSet: []
-    }
-
-    let relatedData: GalleryData[] = [];
-
-    let mediaUrl, sessionCookie, convertedData: VideoSourceItem[]
-
-    let reqHeaders = getHeaders(REDTUBE_BASE_URL)
-
-    const queryUrl = `${REDTUBE_BASE_URL}/${videoId.replace(/\//g, '')}`
-
-    const cachedVideoData = await getDataFromRedis(queryUrl)
-    const cachedRelatedData = await getDataFromRedis(queryUrl + DEFAULT_RELATED_VIDEO_KEY_PATH)
-
-    if (cachedVideoData) {
-        return [cachedVideoData as VideoData, cachedRelatedData as GalleryData[] ?? []]
-    }
-
-    await axios.get(queryUrl, reqHeaders)
-
-    .then(async response => {
-
-        sessionCookie = response?.headers["set-cookie"] ? createSessionCookie(response?.headers["set-cookie"]) : '';
-
-        const html = response.data;
-
-        const $ = cheerio.load(html);
-
-        const scriptTags = $("script");
-
-        scriptTags.map((idx, elem) => {
-            const getMediaUrl = findGetMediaUrlInTagblock($(elem).toString().replace(/\\/g, ''), 'media/mp4') ?? null
-
-            if (getMediaUrl) {
-                mediaUrl = `${REDTUBE_BASE_URL}${getMediaUrl}`
-            }
-
-        })
-
-        const wrapperId = "#related_videos_center li.tm_video_block"
-    
-        const thumbs = $(wrapperId);
-    
-        thumbs.map((key, thumb) => {
-    
-            const videoUrl = $(thumb).find("a.tm_video_link").attr("href")?.split('/')[1];
-            const imgUrl = $(thumb).find("img.js_thumbImageTag").attr("data-src")
-            const text = $(thumb).find("a.tm_video_title").attr("title");
-    
-            videoUrl && imgUrl && text && relatedData.push({
-                videoUrl,
-                imgUrl,
-                text,
-                platform: Platforms.redtube
-            })
-        })
-
-    }).catch((error: AxiosError) => {
-        // error handling goes here
-    });
-
-    if (sessionCookie && mediaUrl) {
-        convertedData = await getRedTubeMediaUrlList(mediaUrl, sessionCookie)
-        data.srcSet = convertedData.reverse()
-
-        await storeDataIntoRedis(queryUrl, data, DEFAULT_REDTUBE_VIDEO_EXPIRY);
-    }
-
-    if (relatedData.length > 0) {
-        await storeDataIntoRedis(queryUrl + DEFAULT_RELATED_VIDEO_KEY_PATH, relatedData, DEFAULT_REDTUBE_GALLERY_EXPIRY);
-    }
-
-    return [ data, relatedData ]
-}

src/utils/scrape/xhamster/agent.ts

@@ -1,15 +0,0 @@
-import { FetchParams, GalleryData, VideoAgent, VideoData } from "@/meta/data";
-import { fetchXHamsterGalleryData } from "./gallery";
-import { fetchXHamsterVideoData } from "./video";
-
-export class XHamsterAgent implements VideoAgent {
-
-    public getGallery = async (params?: FetchParams): Promise<GalleryData[]> => {
-        return await fetchXHamsterGalleryData(params)
-    }
-
-    public getVideo = async (id: string, params?: FetchParams): Promise<[VideoData, GalleryData[]]> => {
-        return await fetchXHamsterVideoData(id, params)
-    }
-
-}

src/utils/scrape/xhamster/gallery.ts

@@ -1,62 +0,0 @@
-import { XHAMSTER_BASE_URL, XHAMSTER_BASE_URL_VIDEOS } from "@/constants/urls";
-import { FetchParams, GalleryData } from "@/meta/data";
-import { getHeaders } from "../common/headers";
-import { getXHamsterQueryUrl } from "./url";
-import { getDataFromRedis, storeDataIntoRedis } from "@/redis/client";
-
-import * as cheerio from "cheerio";
-
-import axios, { AxiosError } from "axios";
-import { DEFAULT_XHAMSTER_GALLERY_EXPIRY } from "@/constants/redis";
-import { Platforms } from "@/meta/settings";
-
-export const fetchXHamsterGalleryData = async (params?: FetchParams): Promise<GalleryData[]> => {
-
-    let data: GalleryData[] = [];
-
-    const reqHeaders = getHeaders(XHAMSTER_BASE_URL)
-
-    const queryUrl = await getXHamsterQueryUrl(params?.query)
-
-    const cachedData = await getDataFromRedis(queryUrl)
-
-    if (cachedData) {
-        return cachedData as GalleryData[]
-    }
-
-    await axios.get(queryUrl, reqHeaders)
-
-    .then(async response => {
-
-        const html = response.data;
-
-        const $ = cheerio.load(html);
-
-        const wrapperId = '.thumb-list .thumb-list__item'
-    
-        const thumbs = $(wrapperId);
-    
-        thumbs.map((key, thumb) => {
-    
-            const videoUrl = $(thumb).find("a.video-thumb__image-container").attr("href")?.replace(XHAMSTER_BASE_URL_VIDEOS, '')
-            const imgUrl = $(thumb).find("a.video-thumb__image-container img").attr("src")
-            const text = $(thumb).find("a.video-thumb-info__name").attr("title")
-    
-            videoUrl && imgUrl && text && data.push({
-                videoUrl,
-                imgUrl,
-                text,
-                platform: Platforms.xhamster
-            })
-        })
-
-        if (data.length > 0) {
-            await storeDataIntoRedis(queryUrl, data, DEFAULT_XHAMSTER_GALLERY_EXPIRY);
-        }
-
-    }).catch((error: AxiosError) => {
-        // handle errors
-    });
-
-    return data
-}

src/utils/scrape/xhamster/url.ts

@@ -1,30 +0,0 @@
-import { XHAMSTER_BASE_SEARCH, XHAMSTER_BASE_SEARCH_GAY, XHAMSTER_BASE_SEARCH_TRANS, XHAMSTER_BASE_URL_ETERO, XHAMSTER_BASE_URL_GAY, XHAMSTER_BASE_URL_TRANS } from "@/constants/urls"
-import { Cookies, XHamsterOrientations } from "@/meta/settings"
-import { getCookie } from "@/utils/cookies/read"
-
-export const getXHamsterQueryUrl = async (query?: string): Promise<string> => {
-    const orientation = await getCookie(Cookies.orientation)
-
-    if (query) {
-        if (orientation && orientation.value == XHamsterOrientations.gay) {
-            return XHAMSTER_BASE_SEARCH_GAY + query + '?revert=orientation'
-        }
-        
-        if (orientation && orientation.value == XHamsterOrientations.trans) {
-            return XHAMSTER_BASE_SEARCH_TRANS + query + '?revert=orientation'
-        }
-
-        return XHAMSTER_BASE_SEARCH + query
-
-    } else {
-        if (orientation && orientation.value == XHamsterOrientations.gay) {
-            return XHAMSTER_BASE_URL_GAY
-        }
-        
-        if (orientation && orientation.value == XHamsterOrientations.trans) {
-            return XHAMSTER_BASE_URL_TRANS
-        }
-    }
-
-    return XHAMSTER_BASE_URL_ETERO
-}

src/utils/scrape/xhamster/video.ts

@@ -1,94 +0,0 @@
-import { XHAMSTER_BASE_URL, XHAMSTER_BASE_URL_VIDEOS } from "@/constants/urls";
-import { FetchParams, GalleryData, VideoData, VideoSourceItem } from "@/meta/data";
-import { getHeaders } from "../common/headers";
-import { getDataFromRedis, storeDataIntoRedis } from "@/redis/client";
-import { DEFAULT_RELATED_VIDEO_KEY_PATH, DEFAULT_XHAMSTER_GALLERY_EXPIRY, DEFAULT_XHAMSTER_VIDEO_EXPIRY } from "@/constants/redis";
-
-import * as cheerio from "cheerio";
-
-import axios, { AxiosError } from "axios";
-import { findGetMediaUrlInTagblock } from "../common/mindgeek";
-import { Platforms } from "@/meta/settings";
-import { encodeUrl } from "@/utils/string";
-import { DEFAULT_VIDEO_STREAM_ROUTE_PREFIX } from "@/constants/stream";
-
-export const fetchXHamsterVideoData = async (videoId: string, params?: FetchParams): Promise<[VideoData, GalleryData[]]> => {
-
-    let data: VideoData = {
-        srcSet: []
-    }
-
-    let relatedData: GalleryData[] = [];
-
-    let reqHeaders = getHeaders(XHAMSTER_BASE_URL);
-
-    const queryUrl = `${XHAMSTER_BASE_URL_VIDEOS}/${videoId.replace(/\//g, '')}`
-
-    const cachedVideoData = await getDataFromRedis(queryUrl)
-    const cachedRelatedData = await getDataFromRedis(queryUrl + DEFAULT_RELATED_VIDEO_KEY_PATH)
-
-    if (cachedVideoData) {
-        return [cachedVideoData as VideoData, cachedRelatedData as GalleryData[] ?? []]
-    }
-
-    await axios.get(queryUrl, reqHeaders)
-
-    .then(async response => {
-
-        const html = response.data;
-
-        const $ = cheerio.load(html);
-
-        const scriptTags = $("script");
-
-        scriptTags.map((idx, elem) => {
-            const hlsUrl = findGetMediaUrlInTagblock($(elem).toString().replace(/\\/g, ''), 'media=hls4') ?? null
-
-            if (hlsUrl) {
-                ['144', '240', '360', '480', '720', '1080'].map((res: string) => {
-                    let resUrl = findGetMediaUrlInTagblock($(elem).toString().replace(/\\/g, ''), `${res}p.h264.mp4`) ?? null
-
-                    if (resUrl) {
-                        data.srcSet?.push({
-                            src: `${DEFAULT_VIDEO_STREAM_ROUTE_PREFIX}/${Platforms.xhamster}/${encodeUrl(resUrl)}`,
-                            type: 'video/mp4',
-                            size: res
-                        })
-                    }
-                });
-            }
-
-        })
-
-        const wrapperId = '.thumb-list .thumb-list__item'
-    
-        const thumbs = $(wrapperId);
-    
-        thumbs.map((key, thumb) => {
-    
-            const videoUrl = $(thumb).find("a.video-thumb__image-container").attr("href")?.replace(XHAMSTER_BASE_URL_VIDEOS, '')
-            const imgUrl = $(thumb).find("a.video-thumb__image-container img").attr("src")
-            const text = $(thumb).find("a.video-thumb-info__name").attr("title")
-    
-            videoUrl && imgUrl && text && relatedData.push({
-                videoUrl,
-                imgUrl,
-                text,
-                platform: Platforms.xhamster
-            })
-        })
-
-    }).catch((error: AxiosError) => {
-        // error handling goes here
-    });
-
-    if (data.srcSet && data.srcSet?.length > 0) {
-        await storeDataIntoRedis(queryUrl, data, DEFAULT_XHAMSTER_VIDEO_EXPIRY);
-    }
-
-    if (relatedData.length > 0) {
-        await storeDataIntoRedis(queryUrl + DEFAULT_RELATED_VIDEO_KEY_PATH, relatedData, DEFAULT_XHAMSTER_GALLERY_EXPIRY);
-    }
- 
-    return [ data, relatedData ]
-}

src/utils/scrape/xnxx/agent.ts

@@ -1,5 +1,5 @@
 import { FetchParams, GalleryData, VideoAgent, VideoData } from "@/meta/data";
-import { fetchXNXXGalleryData } from "./gallery";
+import { fetchXNXXGalleryData,  } from "./gallery";
 import { fetchXNXXVideoData } from "./video";
 
 export class XNXXAgent implements VideoAgent {

src/utils/scrape/xnxx/gallery.ts

@@ -8,8 +8,6 @@ import { getXNXXQueryUrl } from './url';
 
 import { Platforms } from '@/meta/settings';
 import { XNXX_BASE_URL } from '@/constants/urls';
-import { getDataFromRedis, storeDataIntoRedis } from '@/redis/client';
-import { DEFAULT_XNXX_CONTENT_EXPIRY } from '@/constants/redis';
 
 export const fetchXNXXGalleryData = async (params?: FetchParams): Promise<GalleryData[]> => {
 
@@ -19,15 +17,9 @@ export const fetchXNXXGalleryData = async (params?: FetchParams): Promise<Galler
 
     const queryUrl = await getXNXXQueryUrl(params?.query)
 
-    const cachedData = await getDataFromRedis(queryUrl)
-
-    if (cachedData) {
-        return cachedData as GalleryData[]
-    }
-
     await axios.get(queryUrl, reqHeaders)
 
-        .then(async response => {
+        .then(response => {
 
             const html = response.data;
 
@@ -49,8 +41,6 @@ export const fetchXNXXGalleryData = async (params?: FetchParams): Promise<Galler
                 })
             })
 
-            await storeDataIntoRedis(queryUrl, data, DEFAULT_XNXX_CONTENT_EXPIRY);
-
         }).catch((error: AxiosError) => {
             // handle errors
         });

src/utils/scrape/xnxx/video.ts

@@ -8,14 +8,11 @@ import * as cheerio from "cheerio";
 import { Platforms } from '@/meta/settings';
 import { findRelatedVideos, findVideoUrlInsideTagStringByFunctionNameAndExtension } from '@/utils/scrape/common/wgcz';
 import { getHeaders } from '@/utils/scrape/common/headers';
-import { DEFAULT_RELATED_VIDEO_KEY_PATH, DEFAULT_XNXX_CONTENT_EXPIRY } from '@/constants/redis';
-import { getDataFromRedis, storeDataIntoRedis } from '@/redis/client';
 
 export const fetchXNXXVideoData = async (videoId: string, params?: FetchParams): Promise<[VideoData, GalleryData[]]> => {
 
     let data: VideoData = {
-        hlsUrl: '',
+        lowResUrl: ''
-        srcSet: []
     }
 
     let related: GalleryData[] = [];
@@ -26,16 +23,9 @@ export const fetchXNXXVideoData = async (videoId: string, params?: FetchParams):
 
     const queryUrl = `${host}${videoId}`
 
-    const cachedVideoData = await getDataFromRedis(queryUrl)
-    const cachedRelatedData = await getDataFromRedis(queryUrl + DEFAULT_RELATED_VIDEO_KEY_PATH)
-
-    if (cachedVideoData) {
-        return [cachedVideoData as VideoData, cachedRelatedData as GalleryData[] ?? []]
-    }
-
     await axios.get(queryUrl, reqHeaders)   
 
-        .then(async response => {
+        .then(response => {
 
             const html = response.data;
 
@@ -51,19 +41,11 @@ export const fetchXNXXVideoData = async (videoId: string, params?: FetchParams):
                 const hlsUrl = findVideoUrlInsideTagStringByFunctionNameAndExtension($(elem).toString(), 'setVideoHLS', '.m3u8')
 
                 if (lowResUrl) {
-                    data.srcSet?.push({
+                    data.lowResUrl = lowResUrl;
-                        src: lowResUrl,
-                        type: 'video/mp4',
-                        size: "480"
-                    })
                 }
 
                 if (hiResUrl) {
-                    data.srcSet?.push({
+                    data.hiResUrl = hiResUrl
-                        src: hiResUrl,
-                        type: 'video/mp4',
-                        size: "720"
-                    })
                 }
 
                 if (hlsUrl) {
@@ -72,8 +54,6 @@ export const fetchXNXXVideoData = async (videoId: string, params?: FetchParams):
 
             })
 
-            await storeDataIntoRedis(queryUrl, data, DEFAULT_XNXX_CONTENT_EXPIRY);
-
             // populate related gallery
             scriptTags.map((idx, elem) => {
                 const relatedVideos = findRelatedVideos($(elem).toString(), Platforms.xnxx)
@@ -83,8 +63,6 @@ export const fetchXNXXVideoData = async (videoId: string, params?: FetchParams):
                 }
             })
 
-            await storeDataIntoRedis(queryUrl + DEFAULT_RELATED_VIDEO_KEY_PATH, related, DEFAULT_XNXX_CONTENT_EXPIRY);
-
         }).catch((error: AxiosError) => {
             // handle errors
         });

src/utils/scrape/xvideos/gallery.ts

@@ -6,27 +6,17 @@ import { getHeaders } from '@/utils/scrape/common/headers';
 import { getXVideosQueryUrl } from './url';
 import { Platforms } from '@/meta/settings';
 
-import { getDataFromRedis, storeDataIntoRedis } from '@/redis/client';
-import { DEFAULT_XVIDEOS_CONTENT_EXPIRY } from '@/constants/redis';
-import { XVIDEOS_BASE_URL } from '@/constants/urls';
-
 export const fetchXVideosGalleryData = async (params?: FetchParams): Promise<GalleryData[]> => {
 
     let data: GalleryData[] = [];
 
-    const reqHeaders = getHeaders(XVIDEOS_BASE_URL)
+    const reqHeaders = getHeaders()
 
     const queryUrl = await getXVideosQueryUrl(params?.query)
 
-    const cachedData = await getDataFromRedis(queryUrl)
-
-    if (cachedData) {
-        return cachedData as GalleryData[]
-    }
-
     await axios.get(queryUrl, reqHeaders)
 
-        .then(async response => {
+        .then(response => {
 
             const html = response.data;
 
@@ -48,10 +38,7 @@ export const fetchXVideosGalleryData = async (params?: FetchParams): Promise<Gal
                 })
             })
 
-            await storeDataIntoRedis(queryUrl, data, DEFAULT_XVIDEOS_CONTENT_EXPIRY);
+        }).catch((error: AxiosError) => {
-
-        })
-        .catch((error: AxiosError) => {
             // handle errors
         });
 

src/utils/scrape/xvideos/video.ts

@@ -8,14 +8,11 @@ import { getHeaders } from '@/utils/scrape/common/headers';
 import { Platforms } from '@/meta/settings';
 
 import { findRelatedVideos, findVideoUrlInsideTagStringByFunctionNameAndExtension } from '@/utils/scrape/common/wgcz';
-import { getDataFromRedis, storeDataIntoRedis } from '@/redis/client';
-import { DEFAULT_RELATED_VIDEO_KEY_PATH, DEFAULT_XVIDEOS_CONTENT_EXPIRY } from '@/constants/redis';
 
 export const fetchXvideosVideoData = async (videoId: string, params?: FetchParams): Promise<[VideoData, GalleryData[]]> => {
 
     let data: VideoData = {
-        hlsUrl: '',
+        lowResUrl: ''
-        srcSet: []
     }
 
     let related: GalleryData[] = [];
@@ -26,16 +23,9 @@ export const fetchXvideosVideoData = async (videoId: string, params?: FetchParam
 
     const queryUrl = `${host}${videoId}`
 
-    const cachedVideoData = await getDataFromRedis(queryUrl)
-    const cachedRelatedData = await getDataFromRedis(queryUrl + DEFAULT_RELATED_VIDEO_KEY_PATH)
-
-    if (cachedVideoData) {
-        return [cachedVideoData as VideoData, cachedRelatedData as GalleryData[] ?? []]
-    }
-
     await axios.get(queryUrl, reqHeaders)   
 
-        .then(async response => {
+        .then(response => {
 
             const html = response.data;
 
@@ -51,19 +41,11 @@ export const fetchXvideosVideoData = async (videoId: string, params?: FetchParam
                 const hlsUrl = findVideoUrlInsideTagStringByFunctionNameAndExtension($(elem).toString(), 'setVideoHLS', '.m3u8')
 
                 if (lowResUrl) {
-                    data.srcSet?.push({
+                    data.lowResUrl = lowResUrl;
-                        src: lowResUrl,
-                        type: 'video/mp4',
-                        size: "480"
-                    })
                 }
 
                 if (hiResUrl) {
-                    data.srcSet?.push({
+                    data.hiResUrl = hiResUrl
-                        src: hiResUrl,
-                        type: 'video/mp4',
-                        size: "720"
-                    })
                 }
 
                 if (hlsUrl) {
@@ -72,8 +54,6 @@ export const fetchXvideosVideoData = async (videoId: string, params?: FetchParam
 
             })
 
-            await storeDataIntoRedis(queryUrl, data, DEFAULT_XVIDEOS_CONTENT_EXPIRY);
-
             // populate related gallery
             scriptTags.map((idx, elem) => {
                 const relatedVideos = findRelatedVideos($(elem).toString(), Platforms.xvideos)
@@ -83,8 +63,6 @@ export const fetchXvideosVideoData = async (videoId: string, params?: FetchParam
                 }
             })
 
-            await storeDataIntoRedis(queryUrl + DEFAULT_RELATED_VIDEO_KEY_PATH, related, DEFAULT_XVIDEOS_CONTENT_EXPIRY);
-
         }).catch((error: AxiosError) => {
             // handle errors
         });

src/utils/scrape/youporn/agent.ts

@@ -1,15 +0,0 @@
-import { FetchParams, GalleryData, VideoAgent, VideoData } from "@/meta/data";
-import { fetchYouPornGalleryData } from "./gallery";
-import { fetchYouPornVideoData } from "./video";
-
-export class YouPornAgent implements VideoAgent {
-
-    public getGallery = async (params?: FetchParams): Promise<GalleryData[]> => {
-        return await fetchYouPornGalleryData(params)
-    }
-
-    public getVideo = async (id: string, params?: FetchParams): Promise<[VideoData, GalleryData[]]> => {
-        return await fetchYouPornVideoData(id, params)
-    }
-
-}

src/utils/scrape/youporn/gallery.ts

@@ -1,60 +0,0 @@
-import { YOUPORN_BASE_URL } from "@/constants/urls";
-import { FetchParams, GalleryData } from "@/meta/data";
-import { getHeaders } from "../common/headers";
-import { getYouPornQueryUrl } from "./url";
-import { getDataFromRedis, storeDataIntoRedis } from "@/redis/client";
-
-import * as cheerio from "cheerio";
-
-import axios, { AxiosError } from "axios";
-import { Platforms } from "@/meta/settings";
-import { DEFAULT_YOUPORN_GALLERY_EXPIRY } from "@/constants/redis";
-
-export const fetchYouPornGalleryData = async (params?: FetchParams): Promise<GalleryData[]> => {
-
-    let data: GalleryData[] = [];
-
-    const reqHeaders = getHeaders(YOUPORN_BASE_URL)
-
-    const queryUrl = await getYouPornQueryUrl(params?.query)
-
-    const cachedData = await getDataFromRedis(queryUrl)
-
-    if (cachedData) {
-        return cachedData as GalleryData[]
-    }
-
-    await axios.get(queryUrl, reqHeaders)
-
-    .then(async response => {
-
-        const html = response.data;
-
-        const $ = cheerio.load(html);
-
-        const wrapperId = params?.query ? ".searchResults .video-box" : ".tm_mostRecent_videos_section .video-box"
-    
-        const thumbs = $(wrapperId);
-    
-        thumbs.map((key, thumb) => {
-    
-            const videoUrl = $(thumb).find("a.tm_video_link").attr("href")?.split('/')[2];
-            const imgUrl = $(thumb).find("img.thumb-image").attr("data-src")
-            const text = $(thumb).find("a.video-title").text();
-    
-            videoUrl && imgUrl && text && data.push({
-                videoUrl,
-                imgUrl,
-                text,
-                platform: Platforms.youporn
-            })
-        })
-
-        await storeDataIntoRedis(queryUrl, data, DEFAULT_YOUPORN_GALLERY_EXPIRY);
-
-    }).catch((error: AxiosError) => {
-        // handle errors
-    });
-
-    return data
-}

src/utils/scrape/youporn/url.ts

@@ -1,42 +0,0 @@
-import { YOUPORN_BASE_SEARCH, YOUPORN_BASE_URL } from "@/constants/urls"
-import { getHeadersWithCookie } from "../common/headers"
-import axios from "axios"
-import { MindGeekVideoSrcElem, VideoSourceItem } from "@/meta/data"
-
-export const getYouPornQueryUrl = async (query?: string): Promise<string> => {
-
-    if (query) {
-        return `${YOUPORN_BASE_SEARCH}${query}`
-    }
-
-    return YOUPORN_BASE_URL
-}
-
-export const getYouPornMediaUrlList = async (url: string, sessionCookie: string): Promise<VideoSourceItem[]> => {
-
-    const headersWithCookie = getHeadersWithCookie(YOUPORN_BASE_URL, sessionCookie)
-
-    let videos: VideoSourceItem[] = []
-
-    await axios.get(url, headersWithCookie)
-        .then(async response => {
-
-            if (response.data) {
-
-                videos = await response.data.map((elem: MindGeekVideoSrcElem) => ({
-                    src: elem?.videoUrl,
-                    type: 'video/mp4',
-                    size: elem?.quality
-                })) as VideoSourceItem[]
-
-                return videos
-
-            } else {
-                return []
-            }
-
-        })
-        .catch(error => console.log(error))
-
-    return videos
-}

src/utils/scrape/youporn/video.ts

@@ -1,91 +0,0 @@
-import { YOUPORN_BASE_URL, YOUPORN_BASE_URL_VIDEO } from "@/constants/urls";
-import { FetchParams, GalleryData, VideoData, VideoSourceItem } from "@/meta/data";
-import { getHeaders } from "../common/headers";
-import { getDataFromRedis, storeDataIntoRedis } from "@/redis/client";
-import { DEFAULT_RELATED_VIDEO_KEY_PATH, DEFAULT_YOUPORN_VIDEO_EXPIRY, DEFAULT_YOUPORN_GALLERY_EXPIRY } from "@/constants/redis";
-
-import * as cheerio from "cheerio";
-
-import axios, { AxiosError } from "axios";
-import { createSessionCookie, findGetMediaUrlInTagblock } from "../common/mindgeek";
-import { getYouPornMediaUrlList } from "./url";
-import { Platforms } from "@/meta/settings";
-
-export const fetchYouPornVideoData = async (videoId: string, params?: FetchParams): Promise<[VideoData, GalleryData[]]> => {
-
-    let data: VideoData = {
-        hlsUrl: '',
-        srcSet: []
-    }
-
-    let relatedData: GalleryData[] = [];
-
-    let mediaUrl, sessionCookie, convertedData: VideoSourceItem[]
-
-    let reqHeaders = getHeaders(YOUPORN_BASE_URL)
-
-    const queryUrl = `${YOUPORN_BASE_URL_VIDEO}/${videoId.replace(/\//g, '')}`
-
-    const cachedVideoData = await getDataFromRedis(queryUrl)
-    const cachedRelatedData = await getDataFromRedis(queryUrl + DEFAULT_RELATED_VIDEO_KEY_PATH)
-
-    if (cachedVideoData) {
-        return [cachedVideoData as VideoData, cachedRelatedData as GalleryData[] ?? []]
-    }
-
-    await axios.get(queryUrl, reqHeaders)
-
-    .then(async response => {
-
-        sessionCookie = response?.headers["set-cookie"] ? createSessionCookie(response?.headers["set-cookie"]) : '';
-
-        const html = response.data;
-
-        const $ = cheerio.load(html);
-
-        const scriptTags = $("script");
-
-        scriptTags.map((idx, elem) => {
-            const getMediaUrl = findGetMediaUrlInTagblock($(elem).toString().replace(/\\/g, ''), 'media/mp4') ?? null
-
-            if (getMediaUrl) {
-                mediaUrl = getMediaUrl
-            }
-
-        })
-
-        const wrapperId = "#relatedVideos .video-box"
-    
-        const thumbs = $(wrapperId);
-    
-        thumbs.map((key, thumb) => {
-    
-            const videoUrl = $(thumb).find("a.tm_video_link").attr("href")?.split('/')[2];
-            const imgUrl = $(thumb).find("img.thumb-image").attr("data-src")
-            const text = $(thumb).find("a.video-title").text();
-    
-            videoUrl && imgUrl && text && relatedData.push({
-                videoUrl,
-                imgUrl,
-                text,
-                platform: Platforms.youporn
-            })
-        })
-
-    }).catch((error: AxiosError) => {
-        // error handling goes here
-    });
-
-    if (sessionCookie && mediaUrl) {
-        convertedData = await getYouPornMediaUrlList(mediaUrl, sessionCookie)
-        data.srcSet = convertedData.reverse()
-
-        await storeDataIntoRedis(queryUrl, data, DEFAULT_YOUPORN_VIDEO_EXPIRY);
-    }
-
-    if (relatedData.length > 0) {
-        await storeDataIntoRedis(queryUrl + DEFAULT_RELATED_VIDEO_KEY_PATH, relatedData, DEFAULT_YOUPORN_GALLERY_EXPIRY);
-    }
-
-    return [ data, relatedData ]
-}

src/utils/string.ts

@@ -1,5 +1,3 @@
-import { DEFAULT_ENCODING_KEY } from "@/constants/encoding";
-
 export const removeHttpS = (url: string): string => {
     if (url.startsWith("http://")) {
         return url.slice(7);
@@ -16,58 +14,3 @@ export const encodeVideoUrlPath = (input: string): string => {
 export const decodeVideoUrlPath = (input: string): string => {
     return `/${decodeURIComponent(input)}`;
 };
-
-const getEncodingKey = ():string => {
-    return process.env.ENCODING_KEY ?? DEFAULT_ENCODING_KEY;
-} 
-
-// Funzione per codifica Base64 URL-safe
-const base64UrlEncode = (input: string): string => {
-    return btoa(input)
-        .replace(/\+/g, '-')
-        .replace(/\//g, '_')
-        .replace(/=+$/, '');
-}
-
-// Funzione per decodifica Base64 URL-safe
-const base64UrlDecode = (input: string): string => {
-    let base64 = input
-        .replace(/-/g, '+')
-        .replace(/_/g, '/');
-    
-    // Aggiungi padding se necessario
-    while (base64.length % 4) {
-        base64 += '=';
-    }
-
-    return atob(base64);
-}
-
-export function encodeUrl(url: string): string {
-    const key = getEncodingKey();
-
-    // Convert the URL and key to UTF-8 bytes
-    const urlBytes = new TextEncoder().encode(url);
-    const keyBytes = new TextEncoder().encode(key);
-
-    // XOR the bytes of the URL with the key bytes
-    const encodedBytes = urlBytes.map((byte, index) => byte ^ keyBytes[index % keyBytes.length]);
-
-    // Convert the XORed bytes to a base64 URL-safe string
-    //@ts-ignore
-    return base64UrlEncode(String.fromCharCode(...encodedBytes));
-}
-
-export function decodeUrl(encodedUrl: string): string {
-    const key = getEncodingKey();
-
-    // Decode the base64 URL-safe string to get the XORed bytes
-    const encodedBytes = Uint8Array.from(base64UrlDecode(encodedUrl), char => char.charCodeAt(0));
-    const keyBytes = new TextEncoder().encode(key);
-
-    // XOR the encoded bytes with the key bytes to get the original URL bytes
-    const urlBytes = encodedBytes.map((byte, index) => byte ^ keyBytes[index % keyBytes.length]);
-
-    // Convert the bytes back to a string
-    return new TextDecoder().decode(urlBytes);
-}