From f6bdaacbbac92354f9c9314fcf50e157830f4f06 Mon Sep 17 00:00:00 2001
From: Nelson Chan <3271800+chakflying@users.noreply.github.com>
Date: Sat, 14 Oct 2023 16:52:38 +0800
Subject: [PATCH 1/3] Fix: Clear toasts button blocked by bottom bar (#3863)

* Fix: Clear toasts button blocked

* Chore: Fix lint
---
 src/layouts/Layout.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue
index 3abbc4018..610681835 100644
--- a/src/layouts/Layout.vue
+++ b/src/layouts/Layout.vue
@@ -370,12 +370,16 @@ main {
     padding: 9px 15px;
     width: 48px;
     box-shadow: 2px 2px 30px rgba(0, 0, 0, 0.2);
+    z-index: 100;
+
+    .dark & {
+        box-shadow: 2px 2px 30px rgba(0, 0, 0, 0.5);
+    }
 }
 
 @media (max-width: 770px) {
     .clear-all-toast-btn {
         bottom: 72px;
-        z-index: 100;
     }
 }
 

From a362206fab8a31a3e1e8cc8deba963d8d5c6c3cd Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Sat, 14 Oct 2023 17:48:41 +0800
Subject: [PATCH 2/3] Fix: do not colorize non-string log message

---
 .../monitor-types/real-browser-monitor-type.js   |  2 --
 src/util.js                                      | 16 ++++++++++++++--
 src/util.ts                                      | 16 +++++++++++++---
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/server/monitor-types/real-browser-monitor-type.js b/server/monitor-types/real-browser-monitor-type.js
index 34ee18482..94ceb02ee 100644
--- a/server/monitor-types/real-browser-monitor-type.js
+++ b/server/monitor-types/real-browser-monitor-type.js
@@ -49,8 +49,6 @@ if (process.platform === "win32") {
     ];
 }
 
-log.debug("chrome", allowedList);
-
 /**
  * Is the executable path allowed?
  * @param {string} executablePath Path to executable
diff --git a/src/util.js b/src/util.js
index 2368f7c10..f6ed5cd99 100644
--- a/src/util.js
+++ b/src/util.js
@@ -147,13 +147,25 @@ class Logger {
             console.warn(timePart, modulePart, levelPart, msg);
         }
         else if (level === "ERROR") {
-            let msgPart = exports.CONSOLE_STYLE_FgRed + msg + exports.CONSOLE_STYLE_Reset;
+            let msgPart;
+            if (typeof msg === "string") {
+                msgPart = exports.CONSOLE_STYLE_FgRed + msg + exports.CONSOLE_STYLE_Reset;
+            }
+            else {
+                msgPart = msg;
+            }
             console.error(timePart, modulePart, levelPart, msgPart);
         }
         else if (level === "DEBUG") {
             if (exports.isDev) {
                 timePart = exports.CONSOLE_STYLE_FgGray + now + exports.CONSOLE_STYLE_Reset;
-                let msgPart = exports.CONSOLE_STYLE_FgGray + msg + exports.CONSOLE_STYLE_Reset;
+                let msgPart;
+                if (typeof msg === "string") {
+                    msgPart = exports.CONSOLE_STYLE_FgGray + msg + exports.CONSOLE_STYLE_Reset;
+                }
+                else {
+                    msgPart = msg;
+                }
                 console.debug(timePart, modulePart, levelPart, msgPart);
             }
         }
diff --git a/src/util.ts b/src/util.ts
index 56b6dad52..0f8981102 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -208,13 +208,23 @@ class Logger {
         } else if (level === "WARN") {
             console.warn(timePart, modulePart, levelPart, msg);
         } else if (level === "ERROR") {
-            let msgPart = CONSOLE_STYLE_FgRed + msg + CONSOLE_STYLE_Reset;
+            let msgPart :string;
+            if (typeof msg === "string") {
+                msgPart = CONSOLE_STYLE_FgRed + msg + CONSOLE_STYLE_Reset;
+            } else {
+                msgPart = msg;
+            }
             console.error(timePart, modulePart, levelPart, msgPart);
         } else if (level === "DEBUG") {
             if (isDev) {
                 timePart = CONSOLE_STYLE_FgGray + now + CONSOLE_STYLE_Reset;
-                let msgPart = CONSOLE_STYLE_FgGray + msg + CONSOLE_STYLE_Reset;
-                console.debug(timePart, modulePart, levelPart, msgPart );
+                let msgPart :string;
+                if (typeof msg === "string") {
+                    msgPart = CONSOLE_STYLE_FgGray + msg + CONSOLE_STYLE_Reset;
+                } else {
+                    msgPart = msg;
+                }
+                console.debug(timePart, modulePart, levelPart, msgPart);
             }
         } else {
             console.log(timePart, modulePart, msg);

From 9ebf4f97bb51bbcd8bb207a5d9e939fb76e5975e Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Sat, 14 Oct 2023 17:50:54 +0800
Subject: [PATCH 3/3] Add `npm run start-server-dev:watch`

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 2018f3dbc..c0fe6e26b 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
         "start": "npm run start-server",
         "start-server": "node server/server.js",
         "start-server-dev": "cross-env NODE_ENV=development node server/server.js",
+        "start-server-dev:watch": "cross-env NODE_ENV=development node --watch server/server.js",
         "build": "vite build --config ./config/vite.config.js",
         "test": "node test/prepare-test-server.js && npm run test-backend",
         "test-with-build": "npm run build && npm test",