Split up listen address configuration between IPv4 and IPv6

2445b6d9dc11fe8291d4db773d0b3f7233c1f4be

Kristan Schlikow <kristian@schlikow.de>

Signed

default/config.yaml+2 -1 Viewed

 # Listen for incoming connections
 listen: false
 # Listen on a specific address, supports IPv4 and IPv6
 -listenAddress: 0.0.0.0
 +listenAddressIPv6: [::]
 +listenAddressIPv4: 0.0.0.0
 # Enables IPv6 and/or IPv4 protocols. Need to have at least one enabled!
 # - Use option "auto" to automatically detect support
 # - Use true or false (no qoutes) to enable or disable each protocol

server.js+21 -14 Viewed

 const DEFAULT_PORT = 8000;
 const DEFAULT_AUTORUN = false;
 const DEFAULT_LISTEN = false;
 const DEFAULT_LISTEN_ADDRESSDEFAULT_LISTEN_ADDRESS_IPV6 = '[::]';
 +const DEFAULT_LISTEN_ADDRESS_IPV4 = '0.0.0.0';
 const DEFAULT_CORS_PROXY = false;
 const DEFAULT_WHITELIST = true;
 const DEFAULT_ACCOUNTS = false;

         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('listenAddresslistenAddressIPv6', {
         type: 'string',
         default: null,
         describe: 'Set SillyTavern to listen to a specific IPv6 address. If not set, it will fallback to listen to all.\n[config default: empty[::] ]',
 +    }).option('listenAddressIPv4', {
 +        type: 'string',
 +        default: null,
 +        describe: 'Set SillyTavern to listen to a specific IPv4 address. If not set, it will fallback to listen to all.\n[config default: 0.0.0.0 ]',
     }).option('corsProxy', {
         type: 'boolean',
         default: null,

 /** @type {boolean} */
 const listen = cliArguments.listen ?? getConfigValue('listen', DEFAULT_LISTEN);
 /** @type {string} */
 const listenAddresslistenAddressIPv6 = cliArguments.listenAddresslistenAddressIPv6 ?? getConfigValue('listenAddresslistenAddressIPv6', DEFAULT_LISTEN_ADDRESSDEFAULT_LISTEN_ADDRESS_IPV6);
 +/** @type {string} */
 +const listenAddressIPv4 = cliArguments.listenAddressIPv4 ?? getConfigValue('listenAddressIPv4', DEFAULT_LISTEN_ADDRESS_IPV4);
 /** @type {boolean} */
 const enableCorsProxy = cliArguments.corsProxy ?? getConfigValue('enableCorsProxy', DEFAULT_CORS_PROXY);
 const enableWhitelist = cliArguments.whitelist ?? getConfigValue('whitelistMode', DEFAULT_WHITELIST);

 const tavernUrlV6 = new URL(
     (cliArguments.ssl ? 'https://' : 'http://') +
     (listen ? (ipRegex.v6({ exact: true }).test(listenAddresslistenAddressIPv6) ? `[${listenAddress}]`listenAddressIPv6 : '[::]') : '[::1]') +
     (':' + server_port),
 );
 const tavernUrl = new URL(
     (cliArguments.ssl ? 'https://' : 'http://') +
     (listen ? (ipRegex.v4({ exact: true }).test(listenAddresslistenAddressIPv4) ? listenAddresslistenAddressIPv4 : '0.0.0.0') : '127.0.0.1') +
     (':' + server_port),
 );

 async function getAutorunHostname(useIPv6, useIPv4) {
     if (autorunHostname === 'auto') {
         if (listen) {
             if (ipRegex.v4v6({ exact: true }).test(listenAddresslistenAddressIPv6)) {
                 return listenAddresslistenAddressIPv6;
             } else if (ipRegex.v6v4({ exact: true }).test(listenAddresslistenAddressIPv4)) {
 -                return `[${listenAddress}]`;
 +                return listenAddressIPv4;
+            }
+        }

     console.log('\n' + getSeparator(plainGoToLog.length) + '\n');
     if (listen) {
         if (ipRegex.v4v6({ exact: true }).test(listenAddresslistenAddressIPv6)) {
             console.log(
                 `SillyTavern is listening on the address ${listenAddresslistenAddressIPv6}. If you want to limit it only to internal localhost ([::1] or 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`,
             );
         } else if (ipRegex.v6v4({ exact: true }).test(listenAddresslistenAddressIPv4)) {
             console.log(
                 `SillyTavern is listening on the address [${listenAddresslistenAddressIPv4}]. If you want to limit it only to internal localhost ([::1] or 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`,
             );
         } else {
             console.log(