fixed backward compat, and check if auto before getting addrs

ca283c0da63f7f000baf099447f6bd03d68da78c

BPplays <andymalbp@gmail.com>

Parents: 9e049f44e296e531d67107f598a1ac34593b0412

default/config.yaml+1 -1 Viewed

 listen: false
 # Enables IPv6 and/or IPv4 protocols. Need to have at least one enabled!
 # - Use option "auto" to automatically detect support
-# - Use "enabled" or "disabled" to enable or disable each protocol
+# - Use true or false (no qoutes) to enable or disable each protocol
 protocol:
     ipv4: auto
     ipv6: auto

server.js+28 -26 Viewed

 const uploadsPath = path.join(dataRoot, UPLOADS_DIRECTORY);
-const enableIPv6 = cliArguments.enableIPv6 ?? getConfigValue('protocol.ipv6', DEFAULT_ENABLE_IPV6);
+let enableIPv6 = cliArguments.enableIPv6 ?? getConfigValue('protocol.ipv6', DEFAULT_ENABLE_IPV6);
-const enableIPv4 = cliArguments.enableIPv4 ?? getConfigValue('protocol.ipv4', DEFAULT_ENABLE_IPV4);
+let enableIPv4 = 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);

     console.log('Preferring IPv4 for DNS resolution');
+}
-const ipOptions = ['enabled', 'auto', 'disabled'];
+const ipOptions = [true, 'auto', false];
 if (!ipOptions.includes(enableIPv6)) {
     console.error('`protocol: ipv6` option invalid\n use:', ipOptions);

@@ -292,7 +293,7 @@ if (!ipOptions.includes(enableIPv4)) {
292	process.exit(1);	293	process.exit(1);
293	}	294	}
294		295
295	if (enableIPv6 == 'disabled' && enableIPv4 == 'disabled') {	296	if (enableIPv6 === false && enableIPv4 === false) {
296	console.error('error: You can\'t disable all internet protocols: at least IPv6 or IPv4 must be enabled.');	297	console.error('error: You can\'t disable all internet protocols: at least IPv6 or IPv4 must be enabled.');
297	process.exit(1);	298	process.exit(1);
298	}	299	}

+}
 async function startServer() {
-    let useIPv6 = (enableIPv6 === 'enabled');
+    let useIPv6 = (enableIPv6 === true);
-    let useIPv4 = (enableIPv4 === 'enabled');
+    let useIPv4 = (enableIPv4 === true);
+    let hasIPv6, hasIPv4;
-    const [hasIPv6, hasIPv4] = await getHasIP();
-    if (enableIPv6 === 'auto') {
+    if (enableIPv6 === 'auto' || enableIPv4 === 'auto') {
-        useIPv6 = hasIPv6;
+        [hasIPv6, hasIPv4] = await getHasIP();
-    }
+        if (enableIPv6 === 'auto') {
-    if (hasIPv6) {
+            useIPv6 = hasIPv6;
-        if (useIPv6) {
+        }
-            console.log(color.green('IPv6 support detected'));
+        if (hasIPv6) {
-        } else {
+            if (useIPv6) {
-            console.log('IPv6 support detected');
+                console.log(color.green('IPv6 support detected'));
+            } else {
+                console.log('IPv6 support detected');
+            }
+        }
-    }
-    if (enableIPv4 === 'auto') {
+        if (enableIPv4 === 'auto') {
-        useIPv4 = hasIPv4;
+            useIPv4 = hasIPv4;
-        if (useIPv4) {
-            console.log(color.green('IPv4 support detected'));
+        }
-    }
+        if (hasIPv4) {
-    if (hasIPv4) {
+            if (useIPv4) {
-        if (useIPv4) {
+                console.log(color.green('IPv4 support detected'));
-            console.log(color.green('IPv4 support detected'));
+            } else {
-        } else {
+                console.log('IPv4 support detected');
-            console.log('IPv4 support detected');
+            }
+        }
+    }