@selkirk-systems/fetch 1.3.0 → 1.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Fetch.js +1 -1
- package/dist/utils/FetchUtils.js +5 -2
- package/lib/Fetch.js +1 -2
- package/lib/utils/FetchUtils.js +3 -3
- package/package.json +2 -2
package/dist/Fetch.js
CHANGED
|
@@ -579,8 +579,8 @@ const _fetch = (url, options = {}) => {
|
|
|
579
579
|
_cache.delete(url);
|
|
580
580
|
return Fetch(url, options).then(cacheResponse);
|
|
581
581
|
}
|
|
582
|
-
Fetch(url, options).then(cacheResponse);
|
|
583
582
|
return unwrapResponseData(response).then(obj => {
|
|
583
|
+
Fetch(url, options).then(cacheResponse);
|
|
584
584
|
return Promise.resolve([{
|
|
585
585
|
request: null,
|
|
586
586
|
response: response,
|
package/dist/utils/FetchUtils.js
CHANGED
|
@@ -57,8 +57,8 @@ export async function fetchPagedURL(url, callback, options) {
|
|
|
57
57
|
kiloBytes: kiloBytes,
|
|
58
58
|
megaBytes: megaBytes
|
|
59
59
|
};
|
|
60
|
-
callback(results);
|
|
61
60
|
data.items = data._embedded[[Object.keys(data._embedded)[0]]];
|
|
61
|
+
await callback(results, data.items);
|
|
62
62
|
ret = ret.concat(data.items || []);
|
|
63
63
|
if (data._links && data._links.next) {
|
|
64
64
|
const nextUrl = new URL(`${proxyUrl[0]}/p/${data._links.next.href}`);
|
|
@@ -67,7 +67,10 @@ export async function fetchPagedURL(url, callback, options) {
|
|
|
67
67
|
if (err) return [err, nextPage];
|
|
68
68
|
ret = ret.concat(nextPage);
|
|
69
69
|
}
|
|
70
|
-
return [null, ret
|
|
70
|
+
return [null, ret, {
|
|
71
|
+
...results,
|
|
72
|
+
page: data.page.totalPages
|
|
73
|
+
}];
|
|
71
74
|
}
|
|
72
75
|
function timeout(ms) {
|
|
73
76
|
return new Promise(resolve => setTimeout(resolve, ms));
|
package/lib/Fetch.js
CHANGED
|
@@ -762,9 +762,8 @@ const _fetch = ( url, options = {} ) => {
|
|
|
762
762
|
|
|
763
763
|
}
|
|
764
764
|
|
|
765
|
-
Fetch( url, options ).then( cacheResponse )
|
|
766
|
-
|
|
767
765
|
return unwrapResponseData( response ).then( ( obj ) => {
|
|
766
|
+
Fetch( url, options ).then( cacheResponse )
|
|
768
767
|
return Promise.resolve( [{
|
|
769
768
|
request: null,
|
|
770
769
|
response: response,
|
package/lib/utils/FetchUtils.js
CHANGED
|
@@ -85,10 +85,10 @@ export async function fetchPagedURL( url, callback, options ) {
|
|
|
85
85
|
megaBytes: megaBytes
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
-
callback( results );
|
|
89
|
-
|
|
90
88
|
data.items = data._embedded[[Object.keys( data._embedded )[0]]];
|
|
91
89
|
|
|
90
|
+
await callback( results, data.items );
|
|
91
|
+
|
|
92
92
|
ret = ret.concat( data.items || [] );
|
|
93
93
|
|
|
94
94
|
if ( data._links && data._links.next ) {
|
|
@@ -105,7 +105,7 @@ export async function fetchPagedURL( url, callback, options ) {
|
|
|
105
105
|
|
|
106
106
|
}
|
|
107
107
|
|
|
108
|
-
return [null, ret];
|
|
108
|
+
return [null, ret, { ...results, page: data.page.totalPages }];
|
|
109
109
|
|
|
110
110
|
}
|
|
111
111
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@selkirk-systems/fetch",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.4.1",
|
|
4
4
|
"description": "Abortable fetch library",
|
|
5
5
|
"keywords": [],
|
|
6
6
|
"author": "Marcos Bernal <mbernal@selkirksystems.com>",
|
|
@@ -36,5 +36,5 @@
|
|
|
36
36
|
"peerDependencies": {
|
|
37
37
|
"@selkirk-systems/state-management": ">=1.0.0"
|
|
38
38
|
},
|
|
39
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "1884ed6b43e8310175a4bac185fa03d4ebd94a23"
|
|
40
40
|
}
|