refactor: centralize config file path resolution

- Move getConfigFilePath() to server_functions.js
- Use in app.js and watcher.js to avoid duplication

Author: KristjanESPERANTO

js/app.js

@@ -15,7 +15,7 @@ const Utils = require(`${__dirname}/utils`);
 const defaultModules = require(`${global.root_path}/modules/default/defaultmodules`);
 // used to control fetch timeout for node_helpers
 const { setGlobalDispatcher, Agent } = require("undici");
-const { getEnvVarsAsObj } = require("#server_functions");
+const { getEnvVarsAsObj, getConfigFilePath } = require("#server_functions");
 // common timeout value, provide environment override in case
 const fetch_timeout = process.env.mmFetchTimeout !== undefined ? process.env.mmFetchTimeout : 30000;
 
@@ -72,7 +72,7 @@ function App () {
 
 		// For this check proposed to TestSuite
 		// https://forum.magicmirror.builders/topic/1456/test-suite-for-magicmirror/8
-		const configFilename = path.resolve(global.configuration_file || `${global.root_path}/config/config.js`);
+		const configFilename = getConfigFilePath();
 		let templateFile = `${configFilename}.template`;
 
 		// check if templateFile exists

js/server_functions.js

@@ -176,4 +176,12 @@ function getEnvVars (req, res) {
 	res.send(obj);
 }
 
-module.exports = { cors, getConfig, getHtml, getVersion, getStartup, getEnvVars, getEnvVarsAsObj, getUserAgent };
+/**
+ * Get the config file path from environment or default location
+ * @returns {string} The absolute config file path
+ */
+function getConfigFilePath () {
+	return path.resolve(global.configuration_file || `${global.root_path}/config/config.js`);
+}
+
+module.exports = { cors, getConfig, getHtml, getVersion, getStartup, getEnvVars, getEnvVarsAsObj, getUserAgent, getConfigFilePath };

serveronly/watcher.js

@@ -1,9 +1,13 @@
+// Load lightweight internal alias resolver to enable require("logger")
+require("../js/alias-resolver");
+
 const { spawn } = require("child_process");
 const fs = require("fs");
 const path = require("path");
 const net = require("net");
 const http = require("http");
-const Log = require("../js/logger");
+const Log = require("logger");
+const { getConfigFilePath } = require("#server_functions");
 
 const RESTART_DELAY_MS = 500;
 const PORT_CHECK_MAX_ATTEMPTS = 20;
@@ -201,22 +205,6 @@ function watchFile (file) {
 	}
 }
 
-/**
- * Get the config file path from environment or default location
- * @returns {string} The config file path
- */
-function getConfigFilePath () {
-	if (process.env.MM_CONFIG_FILE) {
-		return process.env.MM_CONFIG_FILE;
-	}
-
-	if (global.configuration_file && global.root_path) {
-		return path.resolve(global.root_path, global.configuration_file);
-	}
-
-	return path.join(__dirname, "..", "config", "config.js");
-}
-
 startServer();
 
 // Watch the config file (might be in custom location)