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

cli server args precedency fix + port/listen arg 

- Fixes precedence: cli > (env) > yaml > default
- Add cli arguments for port and listen
This commit is contained in:
Wolfsblvt 2024-03-29 02:20:16 +01:00
parent 7c99d87238
commit a951f68c8d
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
server.js
View File

@ -55,15 +55,29 @@ if (process.versions && process.versions.node && process.versions.node.match(/20
// Set default DNS resolution order to IPv4 first // Set default DNS resolution order to IPv4 first
dns.setDefaultResultOrder('ipv4first'); dns.setDefaultResultOrder('ipv4first');
const DEFAULT_PORT = 8000;
const DEFAULT_AUTORUN = false;
const DEFAULT_LISTEN = false;
const DEFAULT_CORS_PROXY = false;
const cliArguments = yargs(hideBin(process.argv)) const cliArguments = yargs(hideBin(process.argv))
.option('autorun', { .usage('Usage: <your-start-script> <command> [options]')
.option('port', {
type: 'number',
default: null,
describe: `Sets the port under which SillyTavern will run.\nIf not provided falls back to yaml config 'port'.\n[config default: ${DEFAULT_PORT}]`,
}).option('autorun', {
type: 'boolean', type: 'boolean',
default: false, default: null,
describe: 'Automatically launch SillyTavern in the browser.', describe: `Automatically launch SillyTavern in the browser.\nAutorun is automatically disabled if --ssl is set to true.\nIf not provided falls back to yaml config 'autorun'.\n[config default: ${DEFAULT_AUTORUN}]`,
}).option('listen', {
type: 'boolean',
default: null,
describe: `SillyTavern is listening on all network interfaces (Wi-Fi, LAN, localhost). If false, will limit it only to internal localhost (127.0.0.1).\nIf not provided falls back to yaml config 'listen'.\n[config default: ${DEFAULT_LISTEN}]`,
}).option('corsProxy', { }).option('corsProxy', {
type: 'boolean', type: 'boolean',
default: false, default: null,
describe: 'Enables CORS proxy', describe: `Enables CORS proxy\nIf not provided falls back to yaml config 'enableCorsProxy'.\n[config default: ${DEFAULT_CORS_PROXY}]`,
}).option('disableCsrf', { }).option('disableCsrf', {
type: 'boolean', type: 'boolean',
default: false, default: false,
@ -91,10 +105,10 @@ const app = express();
app.use(compression()); app.use(compression());
app.use(responseTime()); app.use(responseTime());
const server_port = process.env.SILLY_TAVERN_PORT || getConfigValue('port', 8000); 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 = (getConfigValue('autorun', false) || cliArguments.autorun) && !cliArguments.ssl; const listen = cliArguments.listen ?? getConfigValue('listen', DEFAULT_LISTEN);
const listen = getConfigValue('listen', false); const enableCorsProxy = cliArguments.corsProxy ?? getConfigValue('enableCorsProxy', DEFAULT_CORS_PROXY)
const { DIRECTORIES, UPLOADS_PATH } = require('./src/constants'); const { DIRECTORIES, UPLOADS_PATH } = require('./src/constants');
@ -144,7 +158,7 @@ if (!cliArguments.disableCsrf) {
}); });
} }
if (getConfigValue('enableCorsProxy', false) || cliArguments.corsProxy) { if (enableCorsProxy) {
const bodyParser = require('body-parser'); const bodyParser = require('body-parser');
app.use(bodyParser.json({ app.use(bodyParser.json({
limit: '200mb', limit: '200mb',