From 327f175241ce2df8b62c2e5479fb5c698811c96f Mon Sep 17 00:00:00 2001
From: William Oldham <wegg7250@gmail.com>
Date: Fri, 15 Mar 2024 19:39:03 +0000
Subject: [PATCH] Do safe checking on exception message

---
 src/background/messages/hello.ts         | 2 +-
 src/background/messages/makeRequest.ts   | 2 +-
 src/background/messages/openPage.ts      | 2 +-
 src/background/messages/prepareStream.ts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/background/messages/hello.ts b/src/background/messages/hello.ts
index 35eeb15..a972bf6 100644
--- a/src/background/messages/hello.ts
+++ b/src/background/messages/hello.ts
@@ -26,7 +26,7 @@ const handler: PlasmoMessaging.MessageHandler<BaseRequest, Response> = async (re
   } catch (err: any) {
     res.send({
       success: false,
-      error: err.message,
+      error: err instanceof Error ? err.message : err,
     });
   }
 };
diff --git a/src/background/messages/makeRequest.ts b/src/background/messages/makeRequest.ts
index 522a744..f497c3e 100644
--- a/src/background/messages/makeRequest.ts
+++ b/src/background/messages/makeRequest.ts
@@ -94,7 +94,7 @@ const handler: PlasmoMessaging.MessageHandler<Request, Response<any>> = async (r
     console.error('failed request', err);
     res.send({
       success: false,
-      error: err.message,
+      error: err instanceof Error ? err.message : err,
     });
   }
 };
diff --git a/src/background/messages/openPage.ts b/src/background/messages/openPage.ts
index 18402db..217dd30 100644
--- a/src/background/messages/openPage.ts
+++ b/src/background/messages/openPage.ts
@@ -32,7 +32,7 @@ const handler: PlasmoMessaging.MessageHandler<Request, BaseResponse> = async (re
   } catch (err: any) {
     res.send({
       success: false,
-      error: err.message,
+      error: err instanceof Error ? err.message : err,
     });
   }
 };
diff --git a/src/background/messages/prepareStream.ts b/src/background/messages/prepareStream.ts
index 62da3f1..9023ab4 100644
--- a/src/background/messages/prepareStream.ts
+++ b/src/background/messages/prepareStream.ts
@@ -26,7 +26,7 @@ const handler: PlasmoMessaging.MessageHandler<Request, BaseResponse> = async (re
   } catch (err: any) {
     res.send({
       success: false,
-      error: err.message,
+      error: err instanceof Error ? err.message : err,
     });
   }
 };