config/default.js

@@ -303,7 +303,6 @@ module.exports = {
 			enable: false,
 			hostnames: [ // these can run in the same browser session
 				'www.kink.com',
-				'store2.psmcdn.net', // Team Skeet API
 			],
 		},
 		cloudflare: {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.227.7",
+    "version": "1.227.6",
     "description": "All the latest porn releases in one place",
     "main": "src/app.js",
     "scripts": {
@@ -125,9 +125,9 @@
         "postgraphile-plugin-connection-filter": "^2.2.2",
         "promise-task-queue": "^1.2.0",
         "prop-types": "^15.7.2",
-        "puppeteer": "^20.5.0",
+        "puppeteer": "^18.2.0",
-        "puppeteer-extra": "^3.3.6",
+        "puppeteer-extra": "^3.3.4",
-        "puppeteer-extra-plugin-stealth": "^2.11.2",
+        "puppeteer-extra-plugin-stealth": "^2.11.1",
         "sharp": "^0.29.2",
         "showdown": "^1.9.1",
         "source-map-support": "^0.5.16",

src/utils/http.js

@@ -143,9 +143,9 @@ function getLimiter(options = {}, url) {
 	return limiters[interval][concurrency];
 }
 
-function extractJson(body, headers) {
+function extractJson(solution) {
-	if (headers['content-type'].includes('application/json')) {
+	if (solution.headers['content-type'].includes('application/json')) {
-		const { document } = new JSDOM(body, { virtualConsole }).window;
+		const { document } = new JSDOM(solution.response, { virtualConsole }).window;
 		const dataString = document.querySelector('body > pre')?.textContent;
 
 		if (dataString) {
@@ -155,14 +155,14 @@ function extractJson(body, headers) {
 		}
 	}
 
-	return body;
+	return solution.response;
 }
 
 async function getBrowserSession(identifier, options = {}) {
 	return limiters.bypass.schedule(async () => {
 		if (!browser) {
 			browser = await puppeteer.launch({
-				headless: typeof options.headless === 'undefined' ? 'new' : options.headless,
+				headless: typeof options.headless === 'undefined' ? true : options.headless,
 				// headless: false,
 			});
 
@@ -178,24 +178,20 @@ async function getBrowserSession(identifier, options = {}) {
 }
 
 async function bypassBrowserRequest(url, _options) {
-	const { tab } = await getBrowserSession(new URL(url).hostname);
+	const page = await getBrowserSession(new URL(url).hostname);
 
-	const res = await tab.goto(url);
+	const res = await page.goto(url);
-	const rawBody = await tab.content();
+	const body = await page.content();
 
-	const headers = res.headers();
+	console.log(res);
-	const body = extractJson(rawBody, headers);
+	console.log(res.status());
-
-	const statusCode = res.status();
-
-	if (!statusCode === 200) {
-		throw new Error(`Puppeteer bypass failed for ${url} (${statusCode}): ${body?.message}`);
-	}
 
 	return {
 		body,
-		statusCode,
+		/*
-		headers,
+		statusCode: res.body.solution.status,
+		headers: res.body.solution.headers,
+		*/
 	};
 }
 
@@ -291,7 +287,7 @@ async function bypassCloudflareRequest(url, method, body, cloudflareBypass, opti
 		throw new Error(`CloudFlare bypass failed for ${url} (${res.statusCode}): ${res.body?.message}`);
 	}
 
-	const resBody = extractJson(res.body.solution.response, res.body.solution.headers);
+	const resBody = extractJson(res.body.solution);
 
 	return {
 		body: resBody,