Merge pull request #98 from appbaseio/http-timeout

fix: abort request on timeout
appbaseio · Jul 21, 2023 · e849a3f · e849a3f
2 parents d3bc6b6 + 86b4cc7
commit e849a3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "appbase-js",
-  "version": "5.3.3",
+  "version": "5.3.4",
   "main": "dist/appbase-js.cjs.js",
   "jsnext:main": "dist/appbase-js.es.js",
   "module": "dist/appbase-js.es.js",

diff --git a/src/core/request/fetch.js b/src/core/request/fetch.js
@@ -101,6 +101,10 @@ function fetchRequest(args) {
           const transformedRequest = Object.assign({}, ts);
           const { url } = transformedRequest;
           delete transformedRequest.url;
+
+          const controller = new AbortController();
+          const { signal } = controller;
+
           const fetchPromise = fetch(
             url || finalURL,
             Object.assign({}, transformedRequest, {
@@ -111,13 +115,15 @@ function fetchRequest(args) {
                       'x-timestamp': new Date().getTime(),
                     })
                   : transformedRequest.headers,
+              signal, // Attach the abort signal to the fetch request
             }),
           );
 
           const timeoutPromise = new Promise((_, rejectTP) => {
             if (httpRequestTimeout > 0) {
               setTimeout(() => {
                 rejectTP(new Error('Request timeout'));
+                controller.abort();
               }, httpRequestTimeout);
             }
           });