From 85b7c9826a38903bb212184e103660df35504540 Mon Sep 17 00:00:00 2001 From: Andrii Trybynenko Date: Wed, 17 Jul 2019 01:54:42 +0200 Subject: [PATCH 1/3] #569 _requestAllPages parse options #569 _requestAllPages parse options.page from nextUrl --- lib/Requestable.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/Requestable.js b/lib/Requestable.js index ab43d9d0..5f5c42f8 100644 --- a/lib/Requestable.js +++ b/lib/Requestable.js @@ -256,9 +256,17 @@ class Requestable { results.push(...thisGroup); const nextUrl = getNextPage(response.headers.link); - if (nextUrl && !(options && typeof options.page !== 'number')) { - log(`getting next page: ${nextUrl}`); - return this._requestAllPages(nextUrl, options, cb, results); + if(nextUrl) { + options.page = parseInt( + nextUrl.match(/(&page=[0-9]*)/g) + .shift() + .split('=') + .pop() + ); + if (!(options && typeof options.page !== 'number')) { + log('getting next page: ' + nextUrl); + return _this2._requestAllPages(nextUrl, options, cb, results); + } } if (cb) { From e9b4832380b3a4ba1ece44cfc6c70be92e4bee85 Mon Sep 17 00:00:00 2001 From: Andrii Trybynenko Date: Wed, 17 Jul 2019 01:59:36 +0200 Subject: [PATCH 2/3] #569 clean up #569 clean up --- lib/Requestable.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Requestable.js b/lib/Requestable.js index 5f5c42f8..c1a039aa 100644 --- a/lib/Requestable.js +++ b/lib/Requestable.js @@ -264,8 +264,8 @@ class Requestable { .pop() ); if (!(options && typeof options.page !== 'number')) { - log('getting next page: ' + nextUrl); - return _this2._requestAllPages(nextUrl, options, cb, results); + log(`getting next page: ${nextUrl}`); + return this._requestAllPages(nextUrl, options, cb, results); } } From 86775a64496ae26bd8607492a0606c78ed1f0c7b Mon Sep 17 00:00:00 2001 From: j-rewerts Date: Sun, 25 Aug 2019 13:27:43 -0600 Subject: [PATCH 3/3] Fixed unpaged url. --- lib/Requestable.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/Requestable.js b/lib/Requestable.js index c1a039aa..b1ec7d59 100644 --- a/lib/Requestable.js +++ b/lib/Requestable.js @@ -257,8 +257,11 @@ class Requestable { const nextUrl = getNextPage(response.headers.link); if(nextUrl) { + if (!options) { + options = {}; + } options.page = parseInt( - nextUrl.match(/(&page=[0-9]*)/g) + nextUrl.match(/(page=[0-9]*)/g) .shift() .split('=') .pop()