From 3985edd62c6cab1d19e6b7fe6454c1f270b4d36c Mon Sep 17 00:00:00 2001
From: slaveeks <chernyshev2001@icloud.com>
Date: Thu, 7 Jul 2022 11:23:14 +0300
Subject: [PATCH] Added timeout for uploading favicon request and writeFileSync
 changed to writeFile

---
 src/backend/utils/downloadFavicon.ts | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/backend/utils/downloadFavicon.ts b/src/backend/utils/downloadFavicon.ts
index 89cde94..bb6a9dc 100644
--- a/src/backend/utils/downloadFavicon.ts
+++ b/src/backend/utils/downloadFavicon.ts
@@ -14,6 +14,9 @@ interface FaviconData {
   type: string;
 }
 
+// Initiate controller for aborting request
+const controller = new AbortController();
+
 /**
  * Check if string is url
  *
@@ -48,16 +51,30 @@ export async function downloadFavicon(destination: string): Promise<FaviconData>
     return  { destination: destination,
       type: `image/${format}` } as FaviconData;
   }
+
+  // Create timeout to abort request
+  const timeoutId = setTimeout(() => {
+    controller.abort();
+    console.log('Favicon request has timed out.');
+  }, 5000);
+
   // Make get request to url
-  const res = await fetch(destination);
+  const res = await fetch(destination, { signal: controller.signal });
   // Get buffer data from response
   const fileData = await res.buffer();
 
+  // Clear timeout, if data was got
+  clearTimeout(timeoutId);
+
   // Get file path in temporary directory
   const filePath = path.join(os.tmpdir(), `favicon.${format}`);
 
   // Save file
-  fs.writeFileSync(filePath, fileData);
+  await fs.writeFile(filePath, fileData, (err) => {
+    if (err) {
+      console.log(err);
+    }
+  });
 
   return  { destination: `/favicon/favicon.${format}`,
     type: `image/${format}` } as FaviconData;