fix: Revert to abort-controller from npm package in fetchHelper

iotaledger · Nov 20, 2023 · 4c46520 · 4c46520
1 parent 05abdb2
commit 4c46520
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -23,7 +23,6 @@
     },
     "engines": {
         "node": ">=16 <=16.20.2"
-
     },
     "dependencies": {
         "@google-cloud/logging-winston": "^5.3.0",
@@ -39,6 +38,7 @@
         "@iota/util.js": "^1.8.6",
         "@iota/validators": "^1.0.0-beta.30",
         "@types/node-cron": "^3.0.2",
+        "abort-controller": "^3.0.0",
         "aws-sdk": "^2.1205.0",
         "big-integer": "^1.6.51",
         "compression": "^1.7.4",

diff --git a/api/src/index.ts b/api/src/index.ts
@@ -31,7 +31,8 @@ const configAllowedHeaders: string | undefined =
 if (Array.isArray(config.allowedDomains)) {
     for (const dom of config.allowedDomains) {
         if (dom.indexOf("*") > 0) {
-            configAllowedDomains.push(new RegExp(dom.replaceAll("*", "(.*)")));
+            // eslint-disable-next-line unicorn/prefer-string-replace-all
+            configAllowedDomains.push(new RegExp(dom.replace(/\*/g, "(.*)")));
         } else {
             configAllowedDomains.push(dom);
         }

diff --git a/api/src/utils/fetchHelper.ts b/api/src/utils/fetchHelper.ts
@@ -1,4 +1,4 @@
-// eslint-disable-next-line import/no-named-as-default
+import AbortController from "abort-controller";
 import fetch from "node-fetch";
 
 /**
@@ -37,7 +37,8 @@ export class FetchHelper {
                         controller.abort();
                     }
                 },
-                timeout);
+                timeout
+            );
         }
 
         try {
@@ -48,7 +49,8 @@ export class FetchHelper {
                     headers,
                     body: payload ? JSON.stringify(payload) : undefined,
                     signal: controller ? controller.signal : undefined
-                });
+                }
+            );
 
             const json = await res.json();
             return json as U;