Fix server crash if whitelist.txt is missing

This commit is contained in:
Cohee
2023-04-20 16:10:05 +03:00
committed by GitHub
parent 50792fdef5
commit 325f4170cb

View File

@@ -32,11 +32,15 @@ const webp = require('webp-converter');
const config = require(path.join(process.cwd(), './config.conf')); const config = require(path.join(process.cwd(), './config.conf'));
const server_port = process.env.SILLY_TAVERN_PORT || config.port; const server_port = process.env.SILLY_TAVERN_PORT || config.port;
let whitelistTxt = null; const whitelistPath = path.join(process.cwd(), "./whitelist.txt");
let whitelist = config.whitelist;
if (fs.existsSync(whitelistPath)) {
try { try {
whitelistTxt = fs.readFileSync(path.join(process.cwd(), "./whitelist.txt")); let whitelistTxt = fs.readFileSync(whitelistPath, 'utf-8');
whitelist = whitelistTxt.split("\n").filter(ip => ip).map(ip => ip.trim());
} catch (e) { } } catch (e) { }
const whitelist = whitelistTxt.toString().split("\n").filter(ip => ip) || config.whitelist; }
const whitelistMode = config.whitelistMode; const whitelistMode = config.whitelistMode;
const autorun = config.autorun; const autorun = config.autorun;