xvideosx 1.6.1 → 1.6.2

package/lib/api/videos/details/details.js

@@ -1,68 +1,13 @@
-const cheerio = require('cheerio');
-const puppeteer = require('puppeteer');
+const base = require("../../base");
+const parseResponse = require('./parseResponse')
 
-const details = async ({ url, puppeteerConfig } = {}) => {
-  let browser;
+const details = async ({url = ''} = {}) => {
   try {
-    browser = await puppeteer.launch(puppeteerConfig);
-    const page = await browser.newPage();
-    await page.goto(url, { waitUntil: 'networkidle2' });
-    const html = await page.content();
+    const request = base.createRequest();
+    return parseResponse(await request.get(url))
 
-    const $ = cheerio.load(html);
-
-    const title = $('meta[property="og:title"]').attr('content');
-    const duration = $('meta[property="og:duration"]').attr('content');
-    const image = $('meta[property="og:image"]').attr('content');
-    const videoType = $('meta[property="og:video:type"]').attr('content');
-    const videoWidth = $('meta[property="og:video:width"]').attr('content');
-    const videoHeight = $('meta[property="og:video:height"]').attr('content');
-    const views = $('#nb-views-number').text();
-    const relatedContentItems = $('div[class=mozaique]').html();
-    const newData = cheerio.load(relatedContentItems);
-    const varios = newData('.thumb-block');
-    const videos = varios.map((index, element) => {
-      const $element = newData(element);
-
-      const title = $element.find('.title a').text();
-      const duration = $element.find('.duration').text();
-      const channel = $element.find('.metadata .name').text();
-      const url = `https://www.xvideos.com${$element.find('.title a').attr('href')}`;
-      const thumbNail = $element.find('.thumb img').attr('src');
-      return {
-        title,
-        duration,
-        channel,
-        thumbNail,
-        url,
-      };
-    }).get();
-
-    const videoScript = $('#video-player-bg > script:nth-child(6)').html();
-    const files = {
-      low: (videoScript.match('html5player.setVideoUrlLow\\(\'(.*?)\'\\);') || [])[1],
-      high: videoScript.match('html5player.setVideoUrlHigh\\(\'(.*?)\'\\);' || [])[1],
-      HLS: videoScript.match('html5player.setVideoHLS\\(\'(.*?)\'\\);' || [])[1],
-      thumb: videoScript.match('html5player.setThumbUrl\\(\'(.*?)\'\\);' || [])[1],
-      thumb69: videoScript.match('html5player.setThumbUrl169\\(\'(.*?)\'\\);' || [])[1],
-      thumbSlide: videoScript.match('html5player.setThumbSlide\\(\'(.*?)\'\\);' || [])[1],
-      thumbSlideBig: videoScript.match('html5player.setThumbSlideBig\\(\'(.*?)\'\\);' || [])[1],
-    };
-
-    return {
-      title,
-      url,
-      duration,
-      image,
-      views,
-      videoType,
-      videoWidth,
-      videoHeight,
-      files,
-      videos,
-    };
-  } finally {
-    if (browser) await browser.close();
+  } catch (error) {
+    throw new Error(error)
   }
 };
 

package/lib/api/videos/details/parseCategory.js

@@ -0,0 +1,10 @@
+const parseCategory = ($) => {
+    const metadata = $('.video-metadata .is-keyword');
+    const keywordTexts = metadata.map((index, element) => {
+        return $(element).text();
+    }).get();
+
+    return keywordTexts;
+
+}
+module.exports = parseCategory

package/lib/api/videos/details/parseModels.js

@@ -0,0 +1,22 @@
+const parseModels = ($) => {
+    const $metadata = $('.video-metadata');
+
+    const mainUploader = $metadata.find('li.main-uploader a span.name').text();
+    const mainUploaderCount = $metadata.find('li.main-uploader a span.count').text();
+
+    const models = $metadata.find('li.model a span.name').map((index, element) => $(element).text()).get();
+    const modelsCounts = $metadata.find('li.model a span.count').map((index, element) => $(element).text()).get();
+
+    return {
+        mainUploader: {
+            name: mainUploader,
+            count: mainUploaderCount
+        },
+        models: models.map((name, index) => ({
+            name,
+            count: modelsCounts[index]
+        })),
+    };
+}
+
+module.exports = parseModels

package/lib/api/videos/details/parseRelated.js

@@ -0,0 +1,25 @@
+const fs = require('fs')
+
+const parseRelated = ($) =>{
+    const scriptContent = $('#video-player-bg script').html();
+    const startIndex =  scriptContent.indexOf('[');
+    const endIndex = scriptContent.lastIndexOf(']');
+    const jsonContent = scriptContent.substring(startIndex, endIndex + 1);
+
+    const videoRelated = JSON.parse(jsonContent);
+
+    return videoRelated.map(video => {
+        return {
+             title: video.tf,
+             short_title: video.t,
+             duration : video.d,
+             channel: video.pn,
+             thumbNail: video.i,
+             poster: video.ip,
+             url: video.u,
+             views: video.n,
+        }
+    })   
+}
+
+module.exports = parseRelated

package/lib/api/videos/details/parseResponse.js

@@ -0,0 +1,44 @@
+const cheerio = require('cheerio');
+const parseVideo = require('./parseVideo');
+const parseRelated = require('./parseRelated');
+const parseCategory = require('./parseCategory');
+const parseModels = require('./parseModels');
+
+
+const getVideo = ($) =>{
+    return parseVideo($);
+}
+const getRelated = ($) => {
+    return parseRelated($);
+}
+const getCategories = ($) =>{
+    return parseCategory($);
+}
+const getModels = ($) =>{
+    return parseModels($);
+}
+const parseResponse = ({ data }) => {
+    const $ = cheerio.load(data);
+    const video = getVideo($);
+    const related = getRelated($);
+    const categories = getCategories($);
+    const models = getModels($);
+
+    
+    return{
+        title: video.title,
+        duration: video.duration,
+        image: video.image,
+        categories,
+        channel: models.mainUploader,
+        models: models.models,
+        videoType: video.videoType,
+        videoWidth: video.videoWidth,
+        videoHeight: video.videoHeight,
+        views: video.views,
+        files: video.files,
+        videos: related
+    }
+}
+
+module.exports = parseResponse

package/lib/api/videos/details/parseVideo.js

@@ -0,0 +1,31 @@
+const parseVideo = ($) => {
+    const title = $('meta[property="og:title"]').attr('content');
+    const duration = $('meta[property="og:duration"]').attr('content');
+    const image = $('meta[property="og:image"]').attr('content');
+    const videoType = $('meta[property="og:video:type"]').attr('content');
+    const videoWidth = $('meta[property="og:video:width"]').attr('content');
+    const videoHeight = $('meta[property="og:video:height"]').attr('content');
+    const views = $('.mobile-show-inline:nth-child(3)').text();
+    const videoScript = $('#video-player-bg > script:nth-child(6)').html();
+    const files = {
+        low: (videoScript.match('html5player.setVideoUrlLow\\(\'(.*?)\'\\);') || [])[1],
+        high: videoScript.match('html5player.setVideoUrlHigh\\(\'(.*?)\'\\);' || [])[1],
+        HLS: videoScript.match('html5player.setVideoHLS\\(\'(.*?)\'\\);' || [])[1],
+        thumb: videoScript.match('html5player.setThumbUrl\\(\'(.*?)\'\\);' || [])[1],
+        thumb69: videoScript.match('html5player.setThumbUrl169\\(\'(.*?)\'\\);' || [])[1],
+        thumbSlide: videoScript.match('html5player.setThumbSlide\\(\'(.*?)\'\\);' || [])[1],
+        thumbSlideBig: videoScript.match('html5player.setThumbSlideBig\\(\'(.*?)\'\\);' || [])[1],
+    };
+    return {
+        title,
+        duration,
+        image,
+        videoType,
+        videoWidth,
+        videoHeight,
+        views,
+        files,
+    }
+}
+
+module.exports = parseVideo

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "xvideosx",
   "description": "xvideos.com api implementation.",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "main": "index.js",
   "license": "BSD-3-Clause",
   "repository": {