From d5b9e3c96029922812933350b655bd89de45ddcb Mon Sep 17 00:00:00 2001
From: Araxeus <oaeben@gmail.com>
Date: Tue, 4 May 2021 01:22:47 +0300
Subject: [PATCH] stringify did-fail-load error directly preload front-logger
 simplify front-logger

---
 index.js                  | 6 +++---
 preload.js                | 3 +--
 providers/front-logger.js | 8 +++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/index.js b/index.js
index e28607c1..8c98e2c9 100644
--- a/index.js
+++ b/index.js
@@ -168,7 +168,7 @@ app.once("browser-window-created", (event, win) => {
 		frameProcessId,
 		frameRoutingId,
 	) => {
-		const log = {
+		const log = JSON.stringify({
 			error: "did-fail-load",
 			event,
 			errorCode,
@@ -177,9 +177,9 @@ app.once("browser-window-created", (event, win) => {
 			isMainFrame,
 			frameProcessId,
 			frameRoutingId,
-		};
+		}, null, "\t");
 		if (is.dev()) {
-			console.log(log.toString());
+			console.log(log);
 		}
 		win.webContents.send("log", log);
 		win.webContents.loadFile(path.join(__dirname, "error.html"));
diff --git a/preload.js b/preload.js
index 74860cec..e0ce9ffe 100644
--- a/preload.js
+++ b/preload.js
@@ -34,8 +34,7 @@ document.addEventListener("DOMContentLoaded", () => {
 	fileExists(songInfoProviderPath, require(songInfoProviderPath));
 
 	// inject front logger
-	const loggerPath = path.join(__dirname, "providers", "front-logger.js")
-	fileExists(loggerPath, require(loggerPath));
+	require("./providers/front-logger")();
 
 	// Add action for reloading
 	global.reload = () =>
diff --git a/providers/front-logger.js b/providers/front-logger.js
index 210e3ff8..986cbb6f 100644
--- a/providers/front-logger.js
+++ b/providers/front-logger.js
@@ -1,11 +1,9 @@
 const { ipcRenderer } = require("electron");
 
 function logToString(log) {
-	let string = (typeof log === "string") ? log : log.toString();
-	if (!string || string.includes("[object Object]")) {
-		string = JSON.stringify(log, null, "\t");
-	}
-	return string;
+	return (typeof log === "string") ?
+		log :
+		JSON.stringify(log, null, "\t");
 }
 
 module.exports = () => {