From 3426832f2ba57b0886fdd543642b6201d36ec004 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Thu, 5 Jan 2023 16:44:34 -0600
Subject: [PATCH] Fix for windows, update regex to only include line number,
 move to end of log

---
 server/Logger.js | 19 ++++++++++---------
 server/Server.js |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/server/Logger.js b/server/Logger.js
index 1cf53074..bea91553 100644
--- a/server/Logger.js
+++ b/server/Logger.js
@@ -24,9 +24,10 @@ class Logger {
 
   get source() {
     try {
-      throw new Error();
+      throw new Error()
     } catch (error) {
-      return error.stack.split('\n')[3].replace(/^.*\/([^/]*:[0-9]*:[[0-9]*)\)*/, '$1')
+      const regex = global.isWin ? /^.*\\([^\\:]*:[0-9]*):[0-9]*\)*/ : /^.*\/([^/:]*:[0-9]*):[0-9]*\)*/
+      return error.stack.split('\n')[3].replace(regex, '$1')
     }
   }
 
@@ -87,41 +88,41 @@ class Logger {
 
   trace(...args) {
     if (this.logLevel > LogLevel.TRACE) return
-    console.trace(`[${this.timestamp}[ (${this.source}) TRACE:`, ...args)
+    console.trace(`[${this.timestamp}[ TRACE:`, ...args)
     this.handleLog(LogLevel.TRACE, args)
   }
 
   debug(...args) {
     if (this.logLevel > LogLevel.DEBUG) return
-    console.debug(`[${this.timestamp}[ (${this.source}) DEBUG:`, ...args)
+    console.debug(`[${this.timestamp}] DEBUG:`, ...args, `(${this.source})`)
     this.handleLog(LogLevel.DEBUG, args)
   }
 
   info(...args) {
     if (this.logLevel > LogLevel.INFO) return
-    console.info(`[${this.timestamp}] (${this.source})  INFO:`, ...args)
+    console.info(`[${this.timestamp}] INFO:`, ...args)
     this.handleLog(LogLevel.INFO, args)
   }
 
   warn(...args) {
     if (this.logLevel > LogLevel.WARN) return
-    console.warn(`[${this.timestamp}] (${this.source})  WARN:`, ...args)
+    console.warn(`[${this.timestamp}] WARN:`, ...args, `(${this.source})`)
     this.handleLog(LogLevel.WARN, args)
   }
 
   error(...args) {
     if (this.logLevel > LogLevel.ERROR) return
-    console.error(`[${this.timestamp}] (${this.source}) ERROR:`, ...args)
+    console.error(`[${this.timestamp}] ERROR:`, ...args, `(${this.source})`)
     this.handleLog(LogLevel.ERROR, args)
   }
 
   fatal(...args) {
-    console.error(`[${this.timestamp}] (${this.source}) FATAL:`, ...args)
+    console.error(`[${this.timestamp}] FATAL:`, ...args, `(${this.source})`)
     this.handleLog(LogLevel.FATAL, args)
   }
 
   note(...args) {
-    console.log(`[${this.timestamp}] (${this.source}) NOTE:`, ...args)
+    console.log(`[${this.timestamp}] NOTE:`, ...args)
     this.handleLog(LogLevel.NOTE, args)
   }
 }
diff --git a/server/Server.js b/server/Server.js
index 4038b776..1de00f98 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -41,6 +41,7 @@ class Server {
     this.Port = PORT
     this.Host = HOST
     global.Source = SOURCE
+    global.isWin = process.platform === 'win32'
     global.Uid = isNaN(UID) ? 0 : Number(UID)
     global.Gid = isNaN(GID) ? 0 : Number(GID)
     global.ConfigPath = Path.normalize(CONFIG_PATH)