Add support for fetch cancellation with abort signal

inaturalist · May 23, 2024 · 8380051 · 8380051
1 parent 2467869
commit 8380051
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/build/inaturalistjs.js b/build/inaturalistjs.js
@@ -132,11 +132,13 @@ var iNaturalistAPI = /*#__PURE__*/function () {
           headers: headers,
           body: JSON.stringify(_objectSpread(_objectSpread({}, params), {}, {
             fields: fieldsObject
-          }))
+          })),
+          signal: options.signal
         });
       } else {
         fetch = localFetch(urlWithQueryParams, {
-          headers: headers
+          headers: headers,
+          signal: options.signal
         });
       }
       return fetch.then(iNaturalistAPI.thenText).then(iNaturalistAPI.thenJson).then(iNaturalistAPI.thenWrap);
@@ -191,11 +193,13 @@ var iNaturalistAPI = /*#__PURE__*/function () {
           headers: headers,
           body: JSON.stringify(_objectSpread(_objectSpread({}, remainingParams), {}, {
             fields: fieldsObject
-          }))
+          })),
+          signal: options.signal
         });
       } else {
         fetch = localFetch(urlWithQueryParams, {
-          headers: headers
+          headers: headers,
+          signal: options.signal
         });
       }
       return fetch.then(iNaturalistAPI.thenText).then(iNaturalistAPI.thenJson).then(iNaturalistAPI.thenWrap);
@@ -265,7 +269,8 @@ var iNaturalistAPI = /*#__PURE__*/function () {
       var fetchOpts = {
         method: options.method || "post",
         credentials: options.same_origin ? "same-origin" : undefined,
-        headers: headers
+        headers: headers,
+        signal: options.signal
       };
       if (options.method !== "head") {
         fetchOpts.body = body;

diff --git a/lib/inaturalist_api.js b/lib/inaturalist_api.js
@@ -53,10 +53,11 @@ const iNaturalistAPI = class iNaturalistAPI {
       fetch = localFetch( baseURL, {
         method: "post",
         headers,
-        body: JSON.stringify( { ...params, fields: fieldsObject } )
+        body: JSON.stringify( { ...params, fields: fieldsObject } ),
+        signal: options.signal
       } );
     } else {
-      fetch = localFetch( urlWithQueryParams, { headers } );
+      fetch = localFetch( urlWithQueryParams, { headers, signal: options.signal } );
     }
     return fetch
       .then( iNaturalistAPI.thenText )
@@ -111,10 +112,11 @@ const iNaturalistAPI = class iNaturalistAPI {
       fetch = localFetch( baseURL, {
         method: "post",
         headers,
-        body: JSON.stringify( { ...remainingParams, fields: fieldsObject } )
+        body: JSON.stringify( { ...remainingParams, fields: fieldsObject } ),
+        signal: options.signal
       } );
     } else {
-      fetch = localFetch( urlWithQueryParams, { headers } );
+      fetch = localFetch( urlWithQueryParams, { headers, signal: options.signal } );
     }
     return fetch
       .then( iNaturalistAPI.thenText )
@@ -184,7 +186,8 @@ const iNaturalistAPI = class iNaturalistAPI {
     const fetchOpts = {
       method: ( options.method || "post" ),
       credentials: ( options.same_origin ? "same-origin" : undefined ),
-      headers
+      headers,
+      signal: options.signal
     };
     if ( options.method !== "head" ) {
       fetchOpts.body = body;