From 03edfdeb7aebb495d2b6b79d533ec409b1855aae Mon Sep 17 00:00:00 2001
From: dm1sh <me@dmitriy.icu>
Date: Sat, 1 Oct 2022 10:47:43 +0300
Subject: [PATCH] Fixed catched errors type handling

---
 src/pages/UploadForm/index.tsx | 6 +++++-
 src/serviceWorker/utils.ts     | 4 ++--
 src/utils/api.ts               | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/UploadForm/index.tsx b/src/pages/UploadForm/index.tsx
index ab9c05b..b81ba96 100644
--- a/src/pages/UploadForm/index.tsx
+++ b/src/pages/UploadForm/index.tsx
@@ -23,7 +23,11 @@ export const UploadForm = ({ setLoading }: IPageProps) => {
       }
     } catch (err) {
       setLoading(false);
-      setError(err.message);
+
+      if (err instanceof Error)
+        setError(err.message);
+      else 
+        setError(String(err))
     }
   };
 
diff --git a/src/serviceWorker/utils.ts b/src/serviceWorker/utils.ts
index a842d73..eb0b2d2 100644
--- a/src/serviceWorker/utils.ts
+++ b/src/serviceWorker/utils.ts
@@ -8,8 +8,8 @@ export const getHash = (path: string) => {
   return path.substr("/book/".length, hashLength);
 };
 
-export const composeResponseStatus = (err: Error): ResponseInit => {
-  if (err.name === "NetowrkError")
+export const composeResponseStatus = (err: unknown): ResponseInit => {
+  if (err instanceof Error && err.name === "NetowrkError")
     return { status: 503, statusText: err.message };
   else return { status: 500, statusText: "Something bad happened (IDK)" };
 };
diff --git a/src/utils/api.ts b/src/utils/api.ts
index e14b4ad..4ea53a8 100644
--- a/src/utils/api.ts
+++ b/src/utils/api.ts
@@ -34,7 +34,9 @@ export const submitFile = async (
 
     return await res.json();
   } catch (err) {
-    console.error("Network error:", err.message);
+    if (err instanceof Error)
+      console.error("Network error:", err.message);
+      
     throw err;
   }
 };