xvideosx 1.5.9 → 1.6.1

package/README.md

@@ -30,6 +30,20 @@ console.log(fresh.pagination.pages); // [1, 2, 3, 4, 5...]
 console.log(fresh.hasNext()); // true
 console.log(fresh.hasPrevious()); // false
 
+const newFresh = await xvideos.videos.newFresh({ page: 1 });
+console.log(fresh.videos)
+/*{
+    title,
+    url,
+    thumbNail,
+    preview,
+    path,
+    duration,
+    channel,
+    views,
+  };
+*/
+
 const nextPage = await fresh.next();
 console.log(nextPage.pagination.current); // 2
 console.log(nextPage.hasNext()); // true

package/lib/api/videos/newfresh/newfresh.js

@@ -1,42 +1,20 @@
-/* eslint-disable linebreak-style */
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-undef */
-const puppeteer = require('puppeteer');
-const cheerio = require('cheerio');
-
-const newFresh = async ({ url, puppeteerConfig } = {}) => {
-  let browser;
-
-  try {
-    browser = await puppeteer.launch(puppeteerConfig);
-    const page = await browser.newPage();
-    await page.goto('https://www.xvideos.com/');
-    const html = await page.content();
-    const $ = cheerio.load(html);
-    const $getVideos = cheerio.load($.html());
-    const mozaique = $getVideos('.thumb-block');
-    const videos = mozaique.map((index, element) => {
-      const $element = $getVideos(element);
-      const title = $element.find('.title a').attr('title');
-      const url = `https://www.xvideos.com${$element.find('.title a').attr('href')}`;
-      const thumbNail = $element.find('.thumb img').attr('src');
-      const duration = $element.find('.duration').text();
-      const channel = $element.find('.metadata .name').text();
-
-      return {
-        title,
-        url,
-        thumbNail,
-        duration,
-        channel,
-      };
-    }).get();
-    return videos;
-  } catch (e) {
-    console.log(e);
-  } finally {
-    if (browser) await browser.close();
-  }
-};
-
-module.exports = newFresh;
+const base = require('../../base');
+const parseResponse = require('./parseResponse');
+
+const PATH = '/new/';
+
+const newFresh = async ({ page = 1 } = {}) => {
+  if (page < 1 || page > Number.MAX_SAFE_INTEGER) {
+    throw new Error(`Invalid page: ${page}`);
+  }
+  try {
+    const request = base.createRequest();
+    const verificationPath = page > 1 ? `${PATH}${page}` : '';
+
+    return parseResponse(page, await request.get(`${verificationPath}`));
+  } catch (e) {
+    console.log(e);
+  }
+};
+
+module.exports = newFresh;

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

@@ -7,8 +7,10 @@ const createHasPreviousFunction = require('./createHasPreviousFunction');
 const createPreviousFunction = require('./createPreviousFunction');
 
 const getVideos = ($) => {
-  return $('#content > .mozaique > .thumb-block')
-    .map((i, video) => parseVideo($, video))
+  return $('.thumb-block')
+    .map((i, video) => {
+      return parseVideo($, video);
+    })
     .get();
 };
 

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

@@ -1,25 +1,43 @@
 const base = require('../../base');
 
+const extractorUrl = (imageUrl) => {
+  const regex = /\/thumbs169ll(\/(?:[0-9a-f]{2}\/){3}[0-9a-f]{32})\//i;
+  const match = imageUrl.match(regex);
+  if (match && match[1]) {
+    const extractedPart = match[1];
+    const newUrl = `https://gcore-pic.xvideos-cdn.com/videos/videopreview${extractedPart}_169.mp4`;
+    return newUrl;
+  } return null;
+};
+const viewsExtractor = (views) => {
+  const regex = /(\d+(?:[,.]\d+)?[MK])/i;
+  const match = views.match(regex);
+  if (match && match[1]) {
+    const views = match[1];
+    return views;
+  } return null;
+};
+
 const parseVideo = ($, video) => {
   const $video = $(video);
-
-  const title = $video.find('p:not(.metadata) a').attr('title');
+  const title = $video.find('.title a').attr('title');
   const path = $video.find('.thumb > a').attr('href');
   const url = `${base.BASE_URL}${path}`;
-  const views = $video.find('p.metadata > span > span:not(.duration)').text();
+  const thumbNail = $video.find('div.thumb img').attr('data-src');
+  const preview = extractorUrl(thumbNail);
   const duration = $video.find('p.metadata > span.bg > span.duration').text();
-  const profileElement = $video.find('p.metadata > span > a');
-  const profile = {
-    name: profileElement.text(),
-    url: `${base.BASE_URL}${profileElement.attr('href')}`,
-  };
+  const channel = $video.find('.metadata .name').text();
+  const viewsData = $video.find('p.metadata > span.bg > span:nth-child(2)').text().trim();
+  const views = viewsExtractor(viewsData);
 
   return {
+    title,
     url,
+    thumbNail,
+    preview,
     path,
-    title,
     duration,
-    profile,
+    channel,
     views,
   };
 };

package/package.json

@@ -1,44 +1,44 @@
-{
-  "name": "xvideosx",
-  "description": "xvideos.com api implementation.",
-  "version": "1.5.9",
-  "main": "index.js",
-  "license": "BSD-3-Clause",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/4CROS2/xvideos.git"
-  },
-  "keywords": [
-    "crawler",
-    "porn",
-    "spider",
-    "scrapper",
-    "api",
-    "xvideos",
-    "api",
-    "library"
-  ],
-  "scripts": {
-    "eslint": "eslint . --ext .js",
-    "test": "cross-env NODE_ENV=test mocha --exit lib/**/*.spec.js",
-    "coverage": "nyc --reporter=html --reporter=lcov npm test"
-  },
-  "dependencies": {
-    "axios": "^0.21.4",
-    "cheerio": "^1.0.0-rc.12",
-    "puppeteer": "^22.0.0"
-  },
-  "devDependencies": {
-    "chai": "^4.3.4",
-    "codeclimate-test-reporter": "^0.5.1",
-    "cross-env": "^7.0.3",
-    "eslint": "^7.23.0",
-    "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-plugin-import": "^2.22.1",
-    "mocha": "^9.1.4",
-    "nyc": "^15.1.0"
-  },
-  "engines": {
-    "node": ">=7.6.0"
-  }
-}
+{
+  "name": "xvideosx",
+  "description": "xvideos.com api implementation.",
+  "version": "1.6.1",
+  "main": "index.js",
+  "license": "BSD-3-Clause",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/4CROS2/xvideos.git"
+  },
+  "keywords": [
+    "crawler",
+    "porn",
+    "spider",
+    "scrapper",
+    "api",
+    "xvideos",
+    "api",
+    "library"
+  ],
+  "scripts": {
+    "eslint": "eslint . --ext .js",
+    "test": "cross-env NODE_ENV=test mocha --exit lib/**/*.spec.js",
+    "coverage": "nyc --reporter=html --reporter=lcov npm test"
+  },
+  "dependencies": {
+    "axios": "^0.21.4",
+    "cheerio": "^1.0.0-rc.12",
+    "puppeteer": "^22.0.0"
+  },
+  "devDependencies": {
+    "chai": "^4.3.4",
+    "codeclimate-test-reporter": "^0.5.1",
+    "cross-env": "^7.0.3",
+    "eslint": "^7.23.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-plugin-import": "^2.22.1",
+    "mocha": "^9.1.4",
+    "nyc": "^15.1.0"
+  },
+  "engines": {
+    "node": ">=7.6.0"
+  }
+}