package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "traxxx",
-    "version": "1.237.17",
+    "version": "1.237.16",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "traxxx",
-            "version": "1.237.17",
+            "version": "1.237.16",
             "license": "ISC",
             "dependencies": {
                 "@aws-sdk/client-s3": "^3.458.0",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.237.17",
+    "version": "1.237.16",
     "description": "All the latest porn releases in one place",
     "main": "src/app.js",
     "scripts": {

src/scrapers/whalemember.js

@@ -1,87 +1,145 @@
 'use strict';
 
-const unprint = require('unprint');
+const { JSDOM } = require('jsdom');
+const moment = require('moment');
 
-const { stripQuery } = require('../utils/url');
+const http = require('../utils/http');
 
-function scrapeLatest(scenes, channel) {
+function scrapeLatest(html, site) {
-	return scenes.map(({ query, element }) => {
+	const { document } = new JSDOM(html).window;
-		const release = {};
+	const { origin } = new URL(site.parameters?.latest || site.url);
 
-		release.url = query.url('[href*="/video"]');
+	const videos = Array.from(document.querySelectorAll('.video-releases-list')).slice(-1)[0];
-		release.entryId = unprint.query.attribute(element, null, 'data-vid');
 
-		release.title = query.content('.video-thumbnail-footer a[href*="/video"]');
+	return Array.from(videos.querySelectorAll('.card'), (scene) => {
-		release.date = query.date('.actor-list + span', 'MM/DD/YYYY');
+		const release = { site };
 
-		release.actors = query.all('.actor-list a').map((actorEl) => ({
+		release.url = `${origin}${scene.querySelector(':scope > a').href}`;
-			name: unprint.query.content(actorEl),
+		release.entryId = scene.dataset.videoId;
-			url: unprint.query.url(actorEl, null, { origin: channel.url }),
+		release.title = scene.querySelector('.card-title').textContent;
+		release.date = moment.utc(scene.dataset.date, 'MMMM DD, YYYY').toDate();
+		release.actors = Array.from(scene.querySelectorAll('.actors a'), (el) => el.textContent);
+
+		// slow CDN?
+		const poster = scene.querySelector('.single-image').dataset.src;
+		const teaserEl = scene.querySelector('source');
+
+		release.poster = {
+			src: /^http/.test(poster) ? poster : `https:${poster}`,
+			referer: site.url,
+			attempts: 5,
+			interval: 5000,
+			concurrency: 1,
+		};
+
+		release.photos = Array.from(scene.querySelectorAll('.rollover-thumbs img'), (el) => ({
+			src: (/^http/.test(el.dataset.src) ? el.dataset.src : `https:${el.dataset.src}`),
+			referer: site.url,
+			attempts: 5,
+			interval: 5000,
+			concurrency: 1,
 		}));
 
-		const poster = query.poster() || query.img('a img', { attribute: 'data-src' });
+		if (teaserEl) {
-
+			release.teaser = {
-		if (poster) {
+				src: teaserEl.dataset.src,
-			release.poster = [
+				referer: site.url,
-				stripQuery(poster),
+				attempts: 5,
-				poster,
+				interval: 5000,
-			];
+				concurrency: 1,
+			};
 		}
 
-		release.photos = query.imgs('img[data-index]', { attribute: 'data-src' }).map((src) => [
-			stripQuery(src),
-			src,
-		]);
-
-		release.teaser = query.video('source', { attribute: 'data-src' });
-
 		return release;
 	});
 }
 
-function scrapeScene({ query }, channel) {
+function scrapeScene(html, site, url) {
-	const release = {};
+	const { document } = new JSDOM(html).window;
+	const release = { site };
 
-	release.entryId = query.attribute('div[data-id]', 'data-id');
+	const scene = document.querySelector('#t2019-2col');
 
-	release.title = query.content('.scene-info h1');
+	release.url = url;
-	release.description = query.content('//div[contains(@class, \'scene-info\')]//i[contains(@class, \'fa-quote\')]/following-sibling::span');
+	release.title = scene.querySelector('.t2019-stitle').textContent.trim();
+	release.description = scene.querySelector('#t2019-description').textContent.trim();
+	release.actors = Array.from(scene.querySelectorAll('#t2019-models a'), (el) => el.textContent);
 
-	release.duration = (query.number('//div[contains(@class, \'scene-info\')]//span[contains(text(), \'Duration\')]/following-sibling::span[contains(text(), \'minutes\')]') * 60) || null;
+	const durationEls = Array.from(scene.querySelectorAll('#t2019-stime span'));
 
-	release.actors = query.all('.scene-info a[href*="/models"]').map((actorEl) => ({
+	if (durationEls.length > 1) {
-		name: unprint.query.content(actorEl),
+		release.date = moment.utc(durationEls[0].textContent, 'MMMM DD, YYYY').toDate();
-		url: unprint.query.url(actorEl, null, { origin: channel.url }),
+		release.duration = Number(durationEls[1].textContent.match(/\d+/)[0]) * 60;
+	} else {
+		release.duration = Number(durationEls[0].textContent.match(/\d+/)[0]) * 60;
+	}
+
+	// unreliable CDN
+	release.photos = Array.from(scene.querySelectorAll('#t2019-main .t2019-thumbs img'), (el) => ({
+		src: (/^http/.test(el.src) ? el.src : `https:${el.src}`),
+		referer: site.url,
+		attempts: 5,
+		interval: 5000,
+		concurrency: 1,
 	}));
 
-	release.poster = query.poster('#player-wrapper video');
+	const posterEl = scene.querySelector('#no-player-image');
+	const videoEl = scene.querySelector('video');
+	const trailerEl = scene.querySelector('#t2019-video source');
 
-	release.photos = query.imgs('#trailer_player .hidden > a img').map((src) => [
+	if (posterEl) {
-		stripQuery(src),
+		release.poster = {
-		src,
+			src: /^http/.test(posterEl.src) ? posterEl.src : `https:${posterEl.src}`,
-	]);
+			referer: site.url,
+			attempts: 5,
+			interval: 5000,
+			concurrency: 1,
+		};
+	} else if (videoEl) {
+		release.poster = {
+			src: /^http/.test(videoEl.poster) ? videoEl.poster : `https:${videoEl.poster}`,
+			referer: site.url,
+			attempts: 5,
+			interval: 5000,
+			concurrency: 1,
+		};
+	}
 
-	release.teaser = query.video('#player-wrapper source');
+	if (trailerEl) {
-	release.qualities = query.contents('#trailer_player .resolution').map((resolution) => Number(resolution.split('x')[1])).filter(Boolean);
+		release.trailer = {
+			src: trailerEl.src,
+			referer: site.url,
+			attempts: 5,
+			interval: 5000,
+			concurrency: 1,
+		};
+	}
 
 	return release;
 }
 
-async function fetchLatest(channel, page = 1) {
+async function fetchLatest(site, page = 1) {
-	const url = `${channel.parameters?.latest || channel.url}?page=${page}`;
+	const url = `${site.parameters?.latest || site.url}?page=${page}`;
-	const res = await unprint.get(url, { selectAll: '//*[(starts-with(text(), \'Latest\') and contains(text(), \'Movies\')) or contains(text(), \'Most Recent\')]/following::div[contains(@class, \'video-thumbnail\') and @data-vid]' });
+	const res = await http.get(url);
 
-	if (res.status === 200) {
+	if (res.statusCode === 200) {
-		return scrapeLatest(res.context, channel);
+		return scrapeLatest(res.body.toString(), site);
 	}
 
-	return res.status;
+	return [];
+}
+
+async function fetchScene(url, site) {
+	const res = await http.get(url);
+
+	if (res.statusCode === 200) {
+		return scrapeScene(res.body.toString(), site, url);
+	}
+
+	return null;
 }
 
 module.exports = {
 	fetchLatest,
-	scrapeScene: {
+	fetchScene,
-		scraper: scrapeScene,
-		unprint: true,
-	},
 };