xvideosx 1.6.3 → 1.6.4

package/AUTHORS

@@ -1,2 +1,2 @@
-Yeferson Yair Tejada Rivas <yeferok2@gmail.com> (https://github.com/4CROS2)
-
+Yeferson Yair Tejada Rivas <yeferok2@gmail.com> (https://github.com/4CROS2)
+

package/README.md

@@ -54,7 +54,8 @@ console.log(previousPage.pagination.current); // 1
 console.log(previousPage.hasNext()); // true
 console.log(previousPage.hasPrevious()); // tfalse
 
-const detail = await xvideos.videos.details(fresh.videos[0]); /**
+const url = '/video.ucadpthfed9/me_folle_a_la_mama_de_mi_novia_-_valentina_bellucci_jason_pierce'
+const detail = await xvideos.videos.details({url}); /**
 {
   title,
   duration,
@@ -211,4 +212,4 @@ const detail = await xvideos.videos.details(fresh.videos[0]); /**
     ```
 
 ### License
-[Licence](https://github.com/4CROS2/xvideos/blob/main/LICENSE) © Yeferson Yair Tejada Rivas
+[Licence](https://github.com/4CROS2/xvideos/blob/main/LICENSE) © 4CROS2

package/index.js

@@ -1 +1 @@
-module.exports = require('./lib');
+module.exports = require('./lib');

package/lib/api/base.js

@@ -1,14 +1,14 @@
-const axios = require('axios');
-
-const BASE_URL = 'https://www.xvideos3.com';
-
-const createRequest = (options = {}) => {
-  return axios.create({ baseURL: BASE_URL, ...options });
-};
-
-const base = {
-  BASE_URL,
-  createRequest,
-};
-
-module.exports = base;
+const axios = require('axios');
+
+const BASE_URL = 'https://www.xvideos3.com';
+
+const createRequest = (options = {}) => {
+  return axios.create({ baseURL: BASE_URL, ...options });
+};
+
+const base = {
+  BASE_URL,
+  createRequest,
+};
+
+module.exports = base;

package/lib/api/index.js

@@ -1,5 +1,5 @@
-const api = {
-  videos: require('./videos'),
-};
-
-module.exports = api;
+const api = {
+  videos: require('./videos'),
+};
+
+module.exports = api;

package/lib/api/videos/best/best.js

@@ -1,19 +1,19 @@
-const base = require('../../base');
-const parseResponse = require('./parseResponse');
-
-const PATH = '/best';
-
-const best = async ({ year, month, page = 1 } = {}) => {
-  if (!year) year = new Date().getFullYear();
-  year = String(year);
-  if (!month) month = new Date().getMonth() + 1; // Date.getMonth is zero based
-  month = String(month).padStart(2, '0');
-
-  if (page < 1 || page > Number.MAX_SAFE_INTEGER) {
-    throw new Error(`Invalid page: ${page}`);
-  }
-  const request = base.createRequest();
-  return parseResponse(page, await request.get(`${PATH}/${year}-${month}/${page === 0 ? '' : page}`));
-};
-
-module.exports = best;
+const base = require('../../base');
+const parseResponse = require('./parseResponse');
+
+const PATH = '/best';
+
+const best = async ({ year, month, page = 1 } = {}) => {
+  if (!year) year = new Date().getFullYear();
+  year = String(year);
+  if (!month) month = new Date().getMonth() + 1; // Date.getMonth is zero based
+  month = String(month).padStart(2, '0');
+
+  if (page < 1 || page > Number.MAX_SAFE_INTEGER) {
+    throw new Error(`Invalid page: ${page}`);
+  }
+  const request = base.createRequest();
+  return parseResponse(page, await request.get(`${PATH}/${year}-${month}/${page === 0 ? '' : page}`));
+};
+
+module.exports = best;

package/lib/api/videos/best/best.spec.js

@@ -1,138 +1,138 @@
-/* eslint-disable padded-blocks */
-
-const chai = require('chai');
-const best = require('./best');
-
-before(() => {
-  chai.should();
-});
-
-describe('api/videos/best', () => {
-
-  it('should list best video pages', async () => {
-    const list = await best({ page: 2 });
-
-    list.should.be.an('object');
-    list.pagination.should.be.an('object');
-    list.pagination.page.should.be.equals(2);
-    list.pagination.pages.should.be.an('array');
-    list.pagination.pages[0].should.be.a('number');
-    list.hasNext.should.be.a('function');
-    list.hasNext().should.be.equals(true);
-    list.hasPrevious.should.be.a('function');
-    list.hasPrevious().should.be.equals(true);
-    list.next.should.be.a('function');
-    list.previous.should.be.a('function');
-    list.videos.should.be.an('array');
-    list.videos.forEach((video) => {
-      video.should.be.an('object');
-      video.should.have.ownPropertyDescriptor('duration');
-      video.duration.should.be.a('string');
-      video.should.have.ownPropertyDescriptor('path');
-      video.path.should.be.a('string');
-      video.should.have.ownPropertyDescriptor('profile');
-      video.profile.should.be.an('object');
-      video.profile.should.have.ownPropertyDescriptor('name');
-      video.profile.name.should.be.an('string');
-      video.profile.should.have.ownPropertyDescriptor('url');
-      video.profile.url.should.be.an('string');
-      video.should.have.ownPropertyDescriptor('title');
-      video.title.should.be.a('string');
-      video.should.have.ownPropertyDescriptor('url');
-      video.url.should.be.a('string');
-      video.should.have.ownPropertyDescriptor('views');
-      video.views.should.be.a('string');
-    });
-
-    const previous = await list.previous();
-    previous.should.be.an('object');
-    previous.pagination.should.be.an('object');
-    previous.pagination.page.should.be.equals(1);
-    previous.pagination.pages.should.be.an('array');
-    previous.pagination.pages[0].should.be.a('number');
-    previous.hasNext.should.be.a('function');
-    previous.hasNext().should.be.equals(true);
-    previous.hasPrevious.should.be.a('function');
-    previous.hasPrevious().should.be.equals(false);
-    previous.next.should.be.a('function');
-    previous.previous.should.be.a('function');
-    previous.videos.should.be.an('array');
-    previous.videos.forEach((video) => {
-      video.should.be.an('object');
-      video.should.have.ownPropertyDescriptor('duration');
-      video.duration.should.be.a('string');
-      video.should.have.ownPropertyDescriptor('path');
-      video.path.should.be.a('string');
-      video.should.have.ownPropertyDescriptor('profile');
-      video.profile.should.be.an('object');
-      video.profile.should.have.ownPropertyDescriptor('name');
-      video.profile.name.should.be.an('string');
-      video.profile.should.have.ownPropertyDescriptor('url');
-      video.profile.url.should.be.an('string');
-      video.should.have.ownPropertyDescriptor('title');
-      video.title.should.be.a('string');
-      video.should.have.ownPropertyDescriptor('url');
-      video.url.should.be.a('string');
-      video.should.have.ownPropertyDescriptor('views');
-      video.views.should.be.a('string');
-    });
-
-    const next = await list.next();
-    next.should.be.an('object');
-    next.pagination.should.be.an('object');
-    next.pagination.page.should.be.equals(3);
-    next.pagination.pages.should.be.an('array');
-    next.pagination.pages[0].should.be.a('number');
-    next.hasNext.should.be.a('function');
-    next.hasNext().should.be.equals(true);
-    next.hasPrevious.should.be.a('function');
-    next.hasPrevious().should.be.equals(true);
-    next.next.should.be.a('function');
-    next.previous.should.be.a('function');
-    next.videos.should.be.an('array');
-    next.videos.forEach((video) => {
-      video.should.be.an('object');
-      video.should.have.ownPropertyDescriptor('duration');
-      video.duration.should.be.a('string');
-      video.should.have.ownPropertyDescriptor('path');
-      video.path.should.be.a('string');
-      video.should.have.ownPropertyDescriptor('profile');
-      video.profile.should.be.an('object');
-      video.profile.should.have.ownPropertyDescriptor('name');
-      video.profile.name.should.be.an('string');
-      video.profile.should.have.ownPropertyDescriptor('url');
-      video.profile.url.should.be.an('string');
-      video.should.have.ownPropertyDescriptor('title');
-      video.title.should.be.a('string');
-      video.should.have.ownPropertyDescriptor('url');
-      video.url.should.be.a('string');
-      video.should.have.ownPropertyDescriptor('views');
-      video.views.should.be.a('string');
-    });
-
-    await list.refresh();
-  }).timeout(10000);
-
-  it('should fail when page parameter is beyond limit', async () => {
-    let err;
-    try {
-      await best({ page: Number.MAX_SAFE_INTEGER + 1 });
-    } catch (error) {
-      err = error;
-    } finally {
-      err.should.be.an('error');
-    }
-  }).timeout(10000);
-
-  it('should fail when page parameter is less than 1', async () => {
-    let err;
-    try {
-      await best({ page: 0 });
-    } catch (error) {
-      err = error;
-    } finally {
-      err.should.be.an('error');
-    }
-  }).timeout(10000);
-
-});
+/* eslint-disable padded-blocks */
+
+const chai = require('chai');
+const best = require('./best');
+
+before(() => {
+  chai.should();
+});
+
+describe('api/videos/best', () => {
+
+  it('should list best video pages', async () => {
+    const list = await best({ page: 2 });
+
+    list.should.be.an('object');
+    list.pagination.should.be.an('object');
+    list.pagination.page.should.be.equals(2);
+    list.pagination.pages.should.be.an('array');
+    list.pagination.pages[0].should.be.a('number');
+    list.hasNext.should.be.a('function');
+    list.hasNext().should.be.equals(true);
+    list.hasPrevious.should.be.a('function');
+    list.hasPrevious().should.be.equals(true);
+    list.next.should.be.a('function');
+    list.previous.should.be.a('function');
+    list.videos.should.be.an('array');
+    list.videos.forEach((video) => {
+      video.should.be.an('object');
+      video.should.have.ownPropertyDescriptor('duration');
+      video.duration.should.be.a('string');
+      video.should.have.ownPropertyDescriptor('path');
+      video.path.should.be.a('string');
+      video.should.have.ownPropertyDescriptor('profile');
+      video.profile.should.be.an('object');
+      video.profile.should.have.ownPropertyDescriptor('name');
+      video.profile.name.should.be.an('string');
+      video.profile.should.have.ownPropertyDescriptor('url');
+      video.profile.url.should.be.an('string');
+      video.should.have.ownPropertyDescriptor('title');
+      video.title.should.be.a('string');
+      video.should.have.ownPropertyDescriptor('url');
+      video.url.should.be.a('string');
+      video.should.have.ownPropertyDescriptor('views');
+      video.views.should.be.a('string');
+    });
+
+    const previous = await list.previous();
+    previous.should.be.an('object');
+    previous.pagination.should.be.an('object');
+    previous.pagination.page.should.be.equals(1);
+    previous.pagination.pages.should.be.an('array');
+    previous.pagination.pages[0].should.be.a('number');
+    previous.hasNext.should.be.a('function');
+    previous.hasNext().should.be.equals(true);
+    previous.hasPrevious.should.be.a('function');
+    previous.hasPrevious().should.be.equals(false);
+    previous.next.should.be.a('function');
+    previous.previous.should.be.a('function');
+    previous.videos.should.be.an('array');
+    previous.videos.forEach((video) => {
+      video.should.be.an('object');
+      video.should.have.ownPropertyDescriptor('duration');
+      video.duration.should.be.a('string');
+      video.should.have.ownPropertyDescriptor('path');
+      video.path.should.be.a('string');
+      video.should.have.ownPropertyDescriptor('profile');
+      video.profile.should.be.an('object');
+      video.profile.should.have.ownPropertyDescriptor('name');
+      video.profile.name.should.be.an('string');
+      video.profile.should.have.ownPropertyDescriptor('url');
+      video.profile.url.should.be.an('string');
+      video.should.have.ownPropertyDescriptor('title');
+      video.title.should.be.a('string');
+      video.should.have.ownPropertyDescriptor('url');
+      video.url.should.be.a('string');
+      video.should.have.ownPropertyDescriptor('views');
+      video.views.should.be.a('string');
+    });
+
+    const next = await list.next();
+    next.should.be.an('object');
+    next.pagination.should.be.an('object');
+    next.pagination.page.should.be.equals(3);
+    next.pagination.pages.should.be.an('array');
+    next.pagination.pages[0].should.be.a('number');
+    next.hasNext.should.be.a('function');
+    next.hasNext().should.be.equals(true);
+    next.hasPrevious.should.be.a('function');
+    next.hasPrevious().should.be.equals(true);
+    next.next.should.be.a('function');
+    next.previous.should.be.a('function');
+    next.videos.should.be.an('array');
+    next.videos.forEach((video) => {
+      video.should.be.an('object');
+      video.should.have.ownPropertyDescriptor('duration');
+      video.duration.should.be.a('string');
+      video.should.have.ownPropertyDescriptor('path');
+      video.path.should.be.a('string');
+      video.should.have.ownPropertyDescriptor('profile');
+      video.profile.should.be.an('object');
+      video.profile.should.have.ownPropertyDescriptor('name');
+      video.profile.name.should.be.an('string');
+      video.profile.should.have.ownPropertyDescriptor('url');
+      video.profile.url.should.be.an('string');
+      video.should.have.ownPropertyDescriptor('title');
+      video.title.should.be.a('string');
+      video.should.have.ownPropertyDescriptor('url');
+      video.url.should.be.a('string');
+      video.should.have.ownPropertyDescriptor('views');
+      video.views.should.be.a('string');
+    });
+
+    await list.refresh();
+  }).timeout(10000);
+
+  it('should fail when page parameter is beyond limit', async () => {
+    let err;
+    try {
+      await best({ page: Number.MAX_SAFE_INTEGER + 1 });
+    } catch (error) {
+      err = error;
+    } finally {
+      err.should.be.an('error');
+    }
+  }).timeout(10000);
+
+  it('should fail when page parameter is less than 1', async () => {
+    let err;
+    try {
+      await best({ page: 0 });
+    } catch (error) {
+      err = error;
+    } finally {
+      err.should.be.an('error');
+    }
+  }).timeout(10000);
+
+});

package/lib/api/videos/best/createHasNextFunction.js

@@ -1,10 +1,10 @@
-const hasNextFunction = (currentPage, pages) => () => {
-  return currentPage < Math.max(...pages);
-};
-
-const createHasNextFunction = (pagination) => {
-  const { page, pages } = pagination;
-  return hasNextFunction(page, pages);
-};
-
-module.exports = createHasNextFunction;
+const hasNextFunction = (currentPage, pages) => () => {
+  return currentPage < Math.max(...pages);
+};
+
+const createHasNextFunction = (pagination) => {
+  const { page, pages } = pagination;
+  return hasNextFunction(page, pages);
+};
+
+module.exports = createHasNextFunction;

package/lib/api/videos/best/createHasPreviousFunction.js

@@ -1,10 +1,10 @@
-const hasPreviousFunction = (currentPage, pages) => () => {
-  return currentPage > Math.min(...pages);
-};
-
-const createHasPreviousFunction = (pagination) => {
-  const { page, pages } = pagination;
-  return hasPreviousFunction(page, pages);
-};
-
-module.exports = createHasPreviousFunction;
+const hasPreviousFunction = (currentPage, pages) => () => {
+  return currentPage > Math.min(...pages);
+};
+
+const createHasPreviousFunction = (pagination) => {
+  const { page, pages } = pagination;
+  return hasPreviousFunction(page, pages);
+};
+
+module.exports = createHasPreviousFunction;

package/lib/api/videos/best/createNextFunction.js

@@ -1,12 +1,12 @@
-const nextFunction = (currentPage) => () => {
-  const best = require('./best');
-  const next = currentPage + 1;
-  return best({ page: next });
-};
-
-const createNextFunction = (pagination) => {
-  const { page } = pagination;
-  return nextFunction(page);
-};
-
-module.exports = createNextFunction;
+const nextFunction = (currentPage) => () => {
+  const best = require('./best');
+  const next = currentPage + 1;
+  return best({ page: next });
+};
+
+const createNextFunction = (pagination) => {
+  const { page } = pagination;
+  return nextFunction(page);
+};
+
+module.exports = createNextFunction;

package/lib/api/videos/best/createPreviousFunction.js

@@ -1,12 +1,12 @@
-const previousFunction = (currentPage) => () => {
-  const best = require('./best');
-  const previous = currentPage - 1;
-  return best({ page: previous });
-};
-
-const createPreviousFunction = (pagination) => {
-  const { page } = pagination;
-  return previousFunction(page);
-};
-
-module.exports = createPreviousFunction;
+const previousFunction = (currentPage) => () => {
+  const best = require('./best');
+  const previous = currentPage - 1;
+  return best({ page: previous });
+};
+
+const createPreviousFunction = (pagination) => {
+  const { page } = pagination;
+  return previousFunction(page);
+};
+
+module.exports = createPreviousFunction;

package/lib/api/videos/best/createRefreshFunction.js

@@ -1,11 +1,11 @@
-const refreshFunction = (currentPage) => () => {
-  const best = require('./best');
-  return best(currentPage);
-};
-
-const createRefreshFunction = (pagination) => {
-  const { page } = pagination;
-  return refreshFunction(page);
-};
-
-module.exports = createRefreshFunction;
+const refreshFunction = (currentPage) => () => {
+  const best = require('./best');
+  return best(currentPage);
+};
+
+const createRefreshFunction = (pagination) => {
+  const { page } = pagination;
+  return refreshFunction(page);
+};
+
+module.exports = createRefreshFunction;

package/lib/api/videos/best/index.js

@@ -1 +1 @@
-module.exports = require('./best');
+module.exports = require('./best');

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

@@ -1,45 +1,45 @@
-const cheerio = require('cheerio');
-const parseVideo = require('./parseVideo');
-const createRefreshFunction = require('./createRefreshFunction');
-const createHasNextFunction = require('./createHasNextFunction');
-const createNextFunction = require('./createNextFunction');
-const createHasPreviousFunction = require('./createHasPreviousFunction');
-const createPreviousFunction = require('./createPreviousFunction');
-
-const getVideos = ($) => {
-  return $('#content > .mozaique > .thumb-block')
-    .map((i, video) => parseVideo($, video))
-    .get();
-};
-
-const getPages = ($) => {
-  return $('.pagination > ul > li > a')
-    .map((i, page) => $(page)
-      .text())
-    .filter((i, page) => !isNaN(page))
-    .map((i, page) => Number(page))
-    .get();
-};
-
-const parseResponse = (page, { data }) => {
-  const $ = cheerio.load(data);
-
-  const videos = getVideos($);
-
-  const pagination = {
-    page,
-    pages: getPages($),
-  };
-
-  return {
-    videos,
-    pagination,
-    refresh: createRefreshFunction(pagination),
-    hasNext: createHasNextFunction(pagination),
-    next: createNextFunction(pagination),
-    hasPrevious: createHasPreviousFunction(pagination),
-    previous: createPreviousFunction(pagination),
-  };
-};
-
-module.exports = parseResponse;
+const cheerio = require('cheerio');
+const parseVideo = require('./parseVideo');
+const createRefreshFunction = require('./createRefreshFunction');
+const createHasNextFunction = require('./createHasNextFunction');
+const createNextFunction = require('./createNextFunction');
+const createHasPreviousFunction = require('./createHasPreviousFunction');
+const createPreviousFunction = require('./createPreviousFunction');
+
+const getVideos = ($) => {
+  return $('#content > .mozaique > .thumb-block')
+    .map((i, video) => parseVideo($, video))
+    .get();
+};
+
+const getPages = ($) => {
+  return $('.pagination > ul > li > a')
+    .map((i, page) => $(page)
+      .text())
+    .filter((i, page) => !isNaN(page))
+    .map((i, page) => Number(page))
+    .get();
+};
+
+const parseResponse = (page, { data }) => {
+  const $ = cheerio.load(data);
+
+  const videos = getVideos($);
+
+  const pagination = {
+    page,
+    pages: getPages($),
+  };
+
+  return {
+    videos,
+    pagination,
+    refresh: createRefreshFunction(pagination),
+    hasNext: createHasNextFunction(pagination),
+    next: createNextFunction(pagination),
+    hasPrevious: createHasPreviousFunction(pagination),
+    previous: createPreviousFunction(pagination),
+  };
+};
+
+module.exports = parseResponse;

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

@@ -1,27 +1,27 @@
-const base = require('../../base');
-
-const parseVideo = ($, video) => {
-  const $video = $(video);
-
-  const title = $video.find('p:not(.metadata) 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 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')}`,
-  };
-
-  return {
-    url,
-    path,
-    title,
-    duration,
-    profile,
-    views,
-  };
-};
-
-module.exports = parseVideo;
+const base = require('../../base');
+
+const parseVideo = ($, video) => {
+  const $video = $(video);
+
+  const title = $video.find('p:not(.metadata) 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 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')}`,
+  };
+
+  return {
+    url,
+    path,
+    title,
+    duration,
+    profile,
+    views,
+  };
+};
+
+module.exports = parseVideo;