From e3b7f38c736faa198be9a3845c45a3842350cf08 Mon Sep 17 00:00:00 2001
From: TheBeastLT <pauliox@beyond.lt>
Date: Mon, 20 Sep 2021 22:38:14 +0200
Subject: [PATCH] improve request error message logging

---
 scraper/scrapers/comando/comando_api.js         | 3 ++-
 scraper/scrapers/comoeubaixo/comoeubaixo_api.js | 5 +++--
 scraper/scrapers/lapumia/lapumia_api.js         | 3 ++-
 scraper/scrapers/ondebaixa/ondebaixa_api.js     | 5 +++--
 scraper/scrapers/rarbg/rarbg_api.js             | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/scraper/scrapers/comando/comando_api.js b/scraper/scrapers/comando/comando_api.js
index 5027eee..d151ef2 100644
--- a/scraper/scrapers/comando/comando_api.js
+++ b/scraper/scrapers/comando/comando_api.js
@@ -74,7 +74,8 @@ function singleRequest(requestUrl, config = {}) {
           throw new Error(`Invalid body contents: ${requestUrl}`);
         }
         return body;
-      });
+      })
+      .catch(error => Promise.reject(error.message || error));
 }
 
 function parseTableBody(body) {
diff --git a/scraper/scrapers/comoeubaixo/comoeubaixo_api.js b/scraper/scrapers/comoeubaixo/comoeubaixo_api.js
index 26ed934..80ada38 100644
--- a/scraper/scrapers/comoeubaixo/comoeubaixo_api.js
+++ b/scraper/scrapers/comoeubaixo/comoeubaixo_api.js
@@ -5,7 +5,7 @@ const { escapeHTML } = require('../../lib/metadata');
 const { getRandomUserAgent } = require('../../lib/requestHelper');
 const { isPtDubbed, sanitizePtName, sanitizePtLanguages } = require('../scraperHelper')
 
-const defaultTimeout = 10000;
+const defaultTimeout = 30000;
 const maxSearchPage = 50
 
 const baseUrl = 'https://comoeubaixo.com';
@@ -74,7 +74,8 @@ function singleRequest(requestUrl, config = {}) {
           throw new Error(`Invalid body contents: ${requestUrl}`);
         }
         return body;
-      });
+      })
+      .catch(error => Promise.reject(error.message || error));
 }
 
 function parseTableBody(body) {
diff --git a/scraper/scrapers/lapumia/lapumia_api.js b/scraper/scrapers/lapumia/lapumia_api.js
index 0b403dd..d68b1cb 100644
--- a/scraper/scrapers/lapumia/lapumia_api.js
+++ b/scraper/scrapers/lapumia/lapumia_api.js
@@ -74,7 +74,8 @@ function singleRequest(requestUrl, config = {}) {
           throw new Error(`Invalid body contents: ${requestUrl}`);
         }
         return body;
-      });
+      })
+      .catch(error => Promise.reject(error.message || error));
 }
 
 function parseTableBody(body) {
diff --git a/scraper/scrapers/ondebaixa/ondebaixa_api.js b/scraper/scrapers/ondebaixa/ondebaixa_api.js
index 9d626f7..5b56924 100644
--- a/scraper/scrapers/ondebaixa/ondebaixa_api.js
+++ b/scraper/scrapers/ondebaixa/ondebaixa_api.js
@@ -5,7 +5,7 @@ const { escapeHTML } = require('../../lib/metadata');
 const { getRandomUserAgent } = require('../../lib/requestHelper');
 const { isPtDubbed, sanitizePtName, sanitizePtOriginalName, sanitizePtLanguages } = require('../scraperHelper')
 
-const defaultTimeout = 10000;
+const defaultTimeout = 30000;
 const maxSearchPage = 50
 
 const baseUrl = 'https://ondebaixa.com';
@@ -74,7 +74,8 @@ function singleRequest(requestUrl, config = {}) {
           throw new Error(`Invalid body contents: ${requestUrl}`);
         }
         return body;
-      });
+      })
+      .catch(error => Promise.reject(error.message || error));
 }
 
 function parseTableBody(body) {
diff --git a/scraper/scrapers/rarbg/rarbg_api.js b/scraper/scrapers/rarbg/rarbg_api.js
index 4032c72..a61bb6e 100644
--- a/scraper/scrapers/rarbg/rarbg_api.js
+++ b/scraper/scrapers/rarbg/rarbg_api.js
@@ -122,7 +122,7 @@ async function singleRequest(params = {}, config = {}, retries = 15) {
         if (error.response && [429].includes(error.response.status) && retries > 0) {
           return Promises.delay(3000).then(() => singleRequest(params, config, retries - 1));
         }
-        return Promise.reject(error);
+        return Promise.reject(error.message || error);
       });
 }