From c0d1fee2578360da72dceabc952a07e55cf50eda Mon Sep 17 00:00:00 2001 From: KubaPro010 Date: Tue, 24 Feb 2026 15:27:39 +0100 Subject: [PATCH] "too dig of a bick" --- .gitignore | 2 +- package.json | 2 +- server/console.js | 4 +++- server/endpoints.js | 3 ++- web/403.ejs | 13 ++++++++++--- web/js/ver.js | 4 ++-- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 25b11ec..4ee529b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ node_modules/ /*.json -/serverlog.txt +/serverlog*.txt /web/js/plugins/ /libraries/ /plugins/* diff --git a/package.json b/package.json index 753331c..088729a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fm-dx-webserver", - "version": "1.4.0", + "version": "1.4.0a", "description": "FM DX Webserver", "main": "index.js", "scripts": { diff --git a/server/console.js b/server/console.js index d0bbde0..0e17a08 100644 --- a/server/console.js +++ b/server/console.js @@ -3,7 +3,9 @@ const fs = require('fs').promises; const verboseMode = process.argv.includes('--debug'); const verboseModeFfmpeg = process.argv.includes('--ffmpegdebug'); -const LOG_FILE = 'serverlog.txt'; +const LOG_FILE = process.argv.includes('--config') && process.argv[process.argv.indexOf('--config') + 1] + ? `serverlog_${process.argv[process.argv.indexOf('--config') + 1]}.txt` + : 'serverlog.txt'; const ANSI_ESCAPE_CODE_PATTERN = /\x1b\[[0-9;]*m/g; const MAX_LOG_LINES = 5000; const FLUSH_INTERVAL = 60000; diff --git a/server/endpoints.js b/server/endpoints.js index ff6c3c3..a4179b5 100644 --- a/server/endpoints.js +++ b/server/endpoints.js @@ -87,7 +87,8 @@ router.get('/', (req, res) => { }); router.get('/403', (req, res) => { - res.render('403'); + const reason = req.query.reason || null; + res.render('403', { reason }); }) router.get('/wizard', (req, res) => { diff --git a/web/403.ejs b/web/403.ejs index e07acad..b4c3fbb 100644 --- a/web/403.ejs +++ b/web/403.ejs @@ -3,8 +3,11 @@ Unauthorized - FM-DX Webserver - - + + @@ -20,9 +23,13 @@

There's a possibility you were kicked by the system.
Please try again later.

+ + <% if (reason) { %> +

Reason: too dig of a bick

+ <% } %> - + \ No newline at end of file diff --git a/web/js/ver.js b/web/js/ver.js index 1625d34..737ea1d 100644 --- a/web/js/ver.js +++ b/web/js/ver.js @@ -1,2 +1,2 @@ -const versionDate = new Date('Feb 24, 2026 01:00:00'); -const currentVersion = `v1.4.0 [${versionDate.getDate()}/${versionDate.getMonth() + 1}/${versionDate.getFullYear()}]`; \ No newline at end of file +const versionDate = new Date('Feb 24, 2026 15:00:00'); +const currentVersion = `v1.4.0a [${versionDate.getDate()}/${versionDate.getMonth() + 1}/${versionDate.getFullYear()}]`; \ No newline at end of file