formatting changes

adc5940d1523f4deba561b76a27d29950f2a6f18

BPplays <andymalbp@gmail.com>

server.js+3 -32 Viewed

 import util from 'node:util';
 import net from 'node:net';
 import dns from 'node:dns';
 -import { promises as dnsPromise } from 'node:dns';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';

     getSeparator,
     stringToBool,
     urlHostnameToIPv6,
 +    canResolve,
 } from './src/util.js';
 import { UPLOADS_DIRECTORY } from './src/constants.js';
 import { ensureThumbnailCache } from './src/endpoints/thumbnails.js';

     return undefined;
+}
+-
 -async function canResolve(name, useIPv6 = true, useIPv4 = true) {
 -    try {
 -        let v6Resolved = false;
 -        let v4Resolved = false;
+-
 -        if (useIPv6) {
 -            try {
 -                await dnsPromise.resolve6(name);
 -                v6Resolved = true;
 -            } catch (error) {
 -                v6Resolved = false;
 -            }
 -        }
+-
 -        if (useIPv4) {
 -            try {
 -                await dnsPromise.resolve(name);
 -                v4Resolved = true;
 -            } catch (error) {
 -                v4Resolved = false;
 -            }
 -        }
+-
 -        return v6Resolved || v4Resolved;
+-
 -    } catch (error) {
 -        return false;
 -    }
 -}
+-
 async function getHasIP() {
     let hasIPv6 = false;
     let hasIPv6Local = false;

  * Tasks that need to be run after the server starts listening.
  * @param {boolean} v6Failed If the server failed to start on IPv6
  * @param {boolean} v4Failed If the server failed to start on IPv4
 + * @param {boolean} useIPv6 If the server is using IPv6
 + * @param {boolean} useIPv4 If the server is using IPv4
  */
 const postSetupTasks = async function (v6Failed, v4Failed, useIPv6, useIPv4) {
     const autorunUrl = new URL(

src/util.js+46 -0 Viewed

 import { Readable } from 'node:stream';
 import { createRequire } from 'node:module';
 import { Buffer } from 'node:buffer';
 +import { promises as dnsPromise } from 'node:dns';
 import yaml from 'yaml';
 import { sync as commandExistsSync } from 'command-exists';

@@ -692,6 +693,10 @@ export function isValidUrl(url) {
692	693	}
693	694	}
694	695
	696	+/**
	697	+ * removes starting `[` or ending `]` from hostname.
	698	+ * @param {string} hostname hostname to use
	699	+ */
695	700	export function urlHostnameToIPv6(hostname) {
696	701	if (hostname.startsWith('[')) {
697	702	hostname = hostname.slice(1);

     return hostname;
+}
 +/**
 + * Test if can resolve a dns name.
 + * @param {string} name Domain name to use
 + * @param {boolean} useIPv6 If use IPv6
 + * @param {boolean} useIPv4 If use IPv4
 + */
 +export async function canResolve(name, useIPv6 = true, useIPv4 = true) {
 +    try {
 +        let v6Resolved = false;
 +        let v4Resolved = false;
++
 +        if (useIPv6) {
 +            try {
 +                await dnsPromise.resolve6(name);
 +                v6Resolved = true;
 +            } catch (error) {
 +                v6Resolved = false;
 +            }
 +        }
++
 +        if (useIPv4) {
 +            try {
 +                await dnsPromise.resolve(name);
 +                v4Resolved = true;
 +            } catch (error) {
 +                v4Resolved = false;
 +            }
 +        }
++
 +        return v6Resolved || v4Resolved;
++
 +    } catch (error) {
 +        return false;
 +    }
 +}
++
++
 +/**
 + * converts string to boolean accepts 'true' or 'false' else it returns the string put in
 + * @param {string} str Input string
 + */
 export function stringToBool(str) {
     if (str === 'true') return true;
     if (str === 'false') return false;