fixed cli args and logic bug

4a8b47a6ffe35e6c85d9f03b4d80d069b43362ec

BPplays <andymalbp@gmail.com>

server.js+11 -3 Viewed

 app.use(compression());
 app.use(responseTime());
 +function stringToBool(str) {
 +    if (str === 'true') return true;
 +    if (str === 'false') return false;
 +    return str; // or throw an error
 +}
++
 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 listen = cliArguments.listen ?? getConfigValue('listen', DEFAULT_LISTEN);

 const uploadsPath = path.join(dataRoot, UPLOADS_DIRECTORY);
 -const enableIPv6 = cliArguments.enableIPv6 ?? getConfigValue('protocol.ipv6', DEFAULT_ENABLE_IPV6);
++
 const enableIPv4enableIPv6 = stringToBool(cliArguments.enableIPv4enableIPv6) ?? getConfigValue('protocol.ipv4ipv6', DEFAULT_ENABLE_IPV4DEFAULT_ENABLE_IPV6);
 +const enableIPv4 = stringToBool(cliArguments.enableIPv4) ?? getConfigValue('protocol.ipv4', DEFAULT_ENABLE_IPV4);
 const autorunHostname = cliArguments.autorunHostname ?? getConfigValue('autorunHostname', DEFAULT_AUTORUN_HOSTNAME);
 const autorunPortOverride = cliArguments.autorunPortOverride ?? getConfigValue('autorunPortOverride', DEFAULT_AUTORUN_PORT);

+    }
++
     if (enableIPv6 === 'auto' && enableIPv4 === 'auto') {
         if (!hasIPv6 && !hasIPv4) {
             console.error('Both IPv6 and IPv4 are not detected');

@@ -964,7 +972,7 @@ async function startServer() {
964	972	}
965	973	}
966	974
967	975	if (!useIPv6 && !useIPv6useIPv4) {
968	976	console.error('Both IPv6 and IPv4 are disabled,\nP.S. you should never see this error, at least at one point it was checked for before this, with the rest of the config options');
969	977	process.exit(1);
970	978	}