Improved puppeteer bypass, enabled for Team Skeet.

config/default.js

@@ -303,6 +303,7 @@ 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

@@ -125,9 +125,9 @@
         "postgraphile-plugin-connection-filter": "^2.2.2",
         "promise-task-queue": "^1.2.0",
         "prop-types": "^15.7.2",
-        "puppeteer": "^18.2.0",
+        "puppeteer": "^20.5.0",
-        "puppeteer-extra": "^3.3.4",
+        "puppeteer-extra": "^3.3.6",
-        "puppeteer-extra-plugin-stealth": "^2.11.1",
+        "puppeteer-extra-plugin-stealth": "^2.11.2",
         "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(solution) {
+function extractJson(body, headers) {
-	if (solution.headers['content-type'].includes('application/json')) {
+	if (headers['content-type'].includes('application/json')) {
-		const { document } = new JSDOM(solution.response, { virtualConsole }).window;
+		const { document } = new JSDOM(body, { virtualConsole }).window;
 		const dataString = document.querySelector('body > pre')?.textContent;
 
 		if (dataString) {
@@ -155,14 +155,14 @@ function extractJson(solution) {
 		}
 	}
 
-	return solution.response;
+	return body;
 }
 
 async function getBrowserSession(identifier, options = {}) {
 	return limiters.bypass.schedule(async () => {
 		if (!browser) {
 			browser = await puppeteer.launch({
-				headless: typeof options.headless === 'undefined' ? true : options.headless,
+				headless: typeof options.headless === 'undefined' ? 'new' : options.headless,
 				// headless: false,
 			});
 
@@ -178,20 +178,24 @@ async function getBrowserSession(identifier, options = {}) {
 }
 
 async function bypassBrowserRequest(url, _options) {
-	const page = await getBrowserSession(new URL(url).hostname);
+	const { tab } = await getBrowserSession(new URL(url).hostname);
 
-	const res = await page.goto(url);
+	const res = await tab.goto(url);
-	const body = await page.content();
+	const rawBody = await tab.content();
 
-	console.log(res);
+	const headers = res.headers();
-	console.log(res.status());
+	const body = extractJson(rawBody, headers);
+
+	const statusCode = res.status();
+
+	if (!statusCode === 200) {
+		throw new Error(`Puppeteer bypass failed for ${url} (${statusCode}): ${body?.message}`);
+	}
 
 	return {
 		body,
-		/*
+		statusCode,
-		statusCode: res.body.solution.status,
+		headers,
-		headers: res.body.solution.headers,
-		*/
 	};
 }
 
@@ -287,7 +291,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);
+	const resBody = extractJson(res.body.solution.response, res.body.solution.headers);
 
 	return {
 		body: resBody,