rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Null safety + reuse variable

This commit is contained in:
Cohee 2024-03-30 22:46:18 +02:00
parent 98dbe3364c
commit af6deda64d
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server.js
View File

@ -109,7 +109,8 @@ app.use(responseTime());
const server_port = cliArguments.port ?? process.env.SILLY_TAVERN_PORT ?? getConfigValue('port', DEFAULT_PORT); const server_port = cliArguments.port ?? process.env.SILLY_TAVERN_PORT ?? getConfigValue('port', DEFAULT_PORT);
const autorun = (cliArguments.autorun ?? getConfigValue('autorun', DEFAULT_AUTORUN)) && !cliArguments.ssl; const autorun = (cliArguments.autorun ?? getConfigValue('autorun', DEFAULT_AUTORUN)) && !cliArguments.ssl;
const listen = cliArguments.listen ?? getConfigValue('listen', DEFAULT_LISTEN); const listen = cliArguments.listen ?? getConfigValue('listen', DEFAULT_LISTEN);
const enableCorsProxy = cliArguments.corsProxy ?? getConfigValue('enableCorsProxy', DEFAULT_CORS_PROXY) const enableCorsProxy = cliArguments.corsProxy ?? getConfigValue('enableCorsProxy', DEFAULT_CORS_PROXY);
const basicAuthMode = getConfigValue('basicAuthMode', false);
const { DIRECTORIES, UPLOADS_PATH } = require('./src/constants'); const { DIRECTORIES, UPLOADS_PATH } = require('./src/constants');
@ -121,7 +122,7 @@ const CORS = cors({
app.use(CORS); app.use(CORS);
if (listen && getConfigValue('basicAuthMode', false)) app.use(basicAuthMiddleware); if (listen && basicAuthMode) app.use(basicAuthMiddleware);
app.use(whitelistMiddleware(listen)); app.use(whitelistMiddleware(listen));
@ -516,14 +517,10 @@ const setupTasks = async function () {
console.log('\n0.0.0.0 means SillyTavern is listening on all network interfaces (Wi-Fi, LAN, localhost). If you want to limit it only to internal localhost (127.0.0.1), change the setting in config.yaml to "listen: false". Check "access.log" file in the SillyTavern directory if you want to inspect incoming connections.\n'); console.log('\n0.0.0.0 means SillyTavern is listening on all network interfaces (Wi-Fi, LAN, localhost). If you want to limit it only to internal localhost (127.0.0.1), change the setting in config.yaml to "listen: false". Check "access.log" file in the SillyTavern directory if you want to inspect incoming connections.\n');
} }
if (getConfigValue("basicAuthMode", false)) { if (basicAuthMode) {
const basicAuthUser = getConfigValue("basicAuthUser", null); const basicAuthUser = getConfigValue('basicAuthUser', {});
if (!basicAuthUser.username || !basicAuthUser.password) { if (!basicAuthUser?.username || !basicAuthUser?.password) {
console.warn( console.warn(color.yellow('Basic Authentication is enabled, but username or password is not set or empty!'));
color.yellow(
"Basic Authentication is set, but username or password is not set or empty!"
)
);
} }
} }
@ -541,7 +538,7 @@ async function loadPlugins() {
return cleanupPlugins; return cleanupPlugins;
} catch { } catch {
console.log('Plugin loading failed.'); console.log('Plugin loading failed.');
return () => {}; return () => { };
} }
} }