config/default.js

@@ -12,44 +12,9 @@ module.exports = {
     // include: [],
     // exclude: [],
     exclude: [
-        ['21sextreme', [
-            // no longer updated
-            'mightymistress',
-            'dominatedgirls',
-            'homepornreality',
-            'peeandblow',
-            'cummingmatures',
-            'mandyiskinky',
-            'speculumplays',
-            'creampiereality',
-        ]],
-        ['blowpass', ['sunlustxxx']],
-        ['ddfnetwork', [
-            'fuckinhd',
-            'bustylover',
-        ]],
         ['famedigital', [
-            'daringsex',
             'lowartfilms',
         ]],
-        ['pornpros', [
-            'milfhumiliation',
-            'humiliated',
-            'flexiblepositions',
-            'publicviolations',
-            'amateurviolations',
-            'squirtdisgrace',
-            'cumdisgrace',
-            'webcamhackers',
-            'collegeteens',
-        ]],
-        ['score', [
-            'bigboobbundle',
-            'milfbundle',
-            'pornmegaload',
-            'scorelandtv',
-            'scoretv',
-        ]],
     ],
     profiles: [
         [
@@ -139,19 +104,6 @@ module.exports = {
         'freeones',
         'freeonesLegacy',
     ],
-    proxy: {
-        enable: false,
-        host: '',
-        port: 8888,
-        hostnames: [
-            'www.vixen.com',
-            'www.blacked.com',
-            'www.blackedraw.com',
-            'www.tushy.com',
-            'www.tushyraw.com',
-            'www.deeper.com',
-        ],
-    },
     fetchAfter: [1, 'week'],
     nullDateLimit: 3,
     media: {

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.112.0",
+    "version": "1.111.3",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {

package.json

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

src/utils/http.js

@@ -1,28 +1,10 @@
 'use strict';
 
-const config = require('config');
-const tunnel = require('tunnel');
 const bhttp = require('bhttp');
 const taskQueue = require('promise-task-queue');
 
 const logger = require('../logger')(__filename);
 
-const proxyAgent = tunnel.httpsOverHttp({
-    proxy: {
-        host: config.proxy.host,
-        port: config.proxy.port,
-    },
-});
-
-function useProxy(url) {
-    if (!config.proxy.enable) {
-        return false;
-    }
-
-    const { hostname } = new URL(url);
-    return config.proxy.hostnames.includes(hostname);
-}
-
 const queue = taskQueue();
 
 queue.on('concurrencyReached:httpGet', () => {
@@ -33,42 +15,47 @@ queue.on('concurrencyReached:httpPost', () => {
     logger.silly('Queueing POST requests');
 });
 
-queue.define('http', async ({
+queue.define('httpGet', async ({
+    url,
+    timeout = 30000,
+    options = {},
+}) => {
+    logger.silly(`GET ${url}`);
+
+    const res = await bhttp.get(url, {
+        responseTimeout: timeout,
+        ...options,
+    });
+
+    res.code = res.statusCode;
+
+    return res;
+}, {
+    concurrency: 20,
+});
+
+queue.define('httpPost', async ({
     url,
-    method = 'GET',
     body,
     timeout = 30000,
     options = {},
 }) => {
-    if (body) {
+    logger.silly(`POST ${url} with ${body}`);
-        logger.silly(`${method.toUpperCase()} ${url} with ${body}`);
-    } else {
-        logger.silly(`${method.toUpperCase()} ${url}`);
-    }
 
-    const reqOptions = {
+    const res = await bhttp.post(url, body, {
         responseTimeout: timeout,
         ...options,
-    };
+    });
 
-    if (useProxy(url)) {
+    res.code = res.statusCode;
-        reqOptions.agent = proxyAgent;
-    }
 
-    const res = ['POST', 'PUT', 'PATCH'].includes(method.toUpperCase())
+    return res;
-        ? await bhttp[method.toLowerCase()](url, body, reqOptions)
-        : await bhttp[method.toLowerCase()](url, reqOptions);
-
-    return {
-        ...res,
-        code: res.statusCode,
-    };
 }, {
     concurrency: 20,
 });
 
 async function get(url, options) {
-    return queue.push('http', {
+    return queue.push('httpGet', {
         method: 'get',
         url,
         options,
@@ -76,7 +63,7 @@ async function get(url, options) {
 }
 
 async function post(url, body, options) {
-    return queue.push('http', {
+    return queue.push('httpPost', {
         url,
         body,
         options,