Fixed session options in http module.

src/scrapers/mindgeek.js

@@ -3,13 +3,13 @@
 /* eslint-disable newline-per-chained-call */
 const Promise = require('bluebird');
 const { CookieJar } = Promise.promisifyAll(require('tough-cookie'));
+const cookie = require('cookie');
 const moment = require('moment');
 
 const qu = require('../utils/qu');
 const slugify = require('../utils/slugify');
 const http = require('../utils/http');
 const { inchesToCm, lbsToKg } = require('../utils/convert');
-const { cookieToData } = require('../utils/cookies');
 
 function getThumbs(scene) {
 	if (scene.images.poster) {
@@ -174,7 +174,7 @@ async function getSession(site, parameters) {
 
 	if (res.statusCode === 200) {
 		const cookieString = await cookieJar.getCookieStringAsync(sessionUrl);
-		const { instance_token: instanceToken } = cookieToData(cookieString);
+		const { instance_token: instanceToken } = cookie.parse(cookieString);
 
 		return { session, instanceToken };
 	}
@@ -254,11 +254,11 @@ async function fetchLatest(site, page = 1, options) {
 		},
 	});
 
-	if (res.statusCode === 200 && res.body.result) {
+	if (res.status === 200 && res.body.result) {
 		return scrapeLatest(res.body.result, site);
 	}
 
-	return null;
+	return res.statusCode;
 }
 
 async function fetchUpcoming(site, page, options) {
@@ -282,7 +282,7 @@ async function fetchUpcoming(site, page, options) {
 		return scrapeLatest(res.body.result, site, true);
 	}
 
-	return null;
+	return res.statusCode;
 }
 
 async function fetchScene(url, site, baseScene, options) {
@@ -303,7 +303,7 @@ async function fetchScene(url, site, baseScene, options) {
 		},
 	});
 
-	if (res.statusCode === 200 && res.body.result) {
+	if (res.status === 200 && res.body.result) {
 		return scrapeScene(res.body.result, url, site);
 	}
 

src/store-releases.js

@@ -227,7 +227,7 @@ async function updateReleasesSearch(releaseIds) {
                 COALESCE(parents.slug, '') || ' ' ||
                 COALESCE(array_to_string(parents.alias, ' '), '') || ' ' ||
                 COALESCE(releases.shoot_id, '') || ' ' ||
-                COALESCE(TO_CHAR(releases.date, 'YYYY YY MM FMMM FMmonth mon DD FMDD'), '') || ' ' ||
+                COALESCE(TO_CHAR(releases.date, 'YYYY YY MM FMMM FMMonth mon DD FMDD'), '') || ' ' ||
                 STRING_AGG(COALESCE(actors.name, ''), ' ') || ' ' ||
                 STRING_AGG(COALESCE(directors.name, ''), ' ') || ' ' ||
                 STRING_AGG(COALESCE(tags.name, ''), ' ') || ' ' ||

src/utils/cookies.js

@@ -1,16 +0,0 @@
-'use strict';
-
-function cookieToData(cookieString) {
-	return cookieString.split('; ').reduce((acc, cookie) => {
-		const [key, value] = cookie.split('=');
-
-		return {
-			...acc,
-			[key]: value,
-		};
-	}, {});
-}
-
-module.exports = {
-	cookieToData,
-};

src/utils/http.js

@@ -82,7 +82,11 @@ function getLimiter(options = {}, url) {
 
 async function request(method = 'get', url, body, requestOptions = {}, limiter) {
 	const http = requestOptions.session || bhttp;
-	const options = requestOptions;
+
+	const options = {
+		...requestOptions,
+		session: null,
+	};
 
 	const withProxy = useProxy(url);
 
@@ -151,7 +155,6 @@ async function scheduleRequest(method = 'get', url, body, requestOptions = {}) {
 		},
 		responseTimeout: requestOptions.responseTimeout || requestOptions.timeout || defaultOptions.timeout,
 		stream: !!requestOptions.destination,
-		session: null,
 	};
 
 	const limiter = getLimiter(options, url);