kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2026-04-21 21:40:55 +00:00
Code Issues Projects Releases Wiki Activity

refactor: replace implicit global config with explicit global.config (#4085)

Browse Source 
In PR #4072 the GitHub bot complained about a missing variable
declaration for `config` in `app.js` and suggested adding `let config`.
Applying that suggestion broke the app because `server_functions.js` was
accessing `config` as an implicit global variable - the `let`
declaration made it unreachable from there.

So instead of the `let` declaration, I replaced all bare `config`
references with explicit `global.config`. This makes the dependency on
the global variable visible without changing runtime behavior,
consistent with how other globals like `global.root_path` and
`global.version` are already handled throughout the codebase.

Related to #4073
This commit is contained in:
Kristjan ESPERANTO
2026-04-03 17:56:11 +02:00
committed by GitHub
parent 19c6489e6f
commit dce2df63af
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/app.js
View File

@@ -174,7 +174,8 @@ function App () {
*/
this.start = async function () {
const configObj = Utils.loadConfig();
config = configObj.fullConf;
global.config = configObj.fullConf;
const config = global.config;
Utils.checkConfigFile(configObj);
global.defaultModulesDir = config.defaultModulesDir;
@@ -245,7 +246,7 @@ function App () {
Log.log("Sockets connected & modules started ...");
return config;
return global.config;
};
/**

12
js/server_functions.js
View File

@@ -46,7 +46,7 @@ async function cors (req, res) {
return res.status(400).send(url);
} else {
url = match[1];
if (typeof config !== "undefined") {
if (typeof global.config !== "undefined") {
if (config.hideConfigSecrets) {
url = replaceSecretPlaceholder(url);
}
@@ -144,15 +144,15 @@ function getVersion (req, res) {
function getUserAgent () {
const defaultUserAgent = `Mozilla/5.0 (Node.js ${Number(process.version.match(/^v(\d+\.\d+)/)[1])}) MagicMirror/${global.version}`;
if (typeof config === "undefined") {
if (typeof global.config === "undefined") {
return defaultUserAgent;
}
switch (typeof config.userAgent) {
switch (typeof global.config.userAgent) {
case "function":
return config.userAgent();
return global.config.userAgent();
case "string":
return config.userAgent;
return global.config.userAgent;
default:
return defaultUserAgent;
}
@@ -163,7 +163,7 @@ function getUserAgent () {
* @returns {object} environment variables key: values
*/
function getEnvVarsAsObj () {
const obj = { modulesDir: `${config.foreignModulesDir}`, defaultModulesDir: `${config.defaultModulesDir}`, customCss: `${config.customCss}` };
const obj = { modulesDir: `${global.config.foreignModulesDir}`, defaultModulesDir: `${global.config.defaultModulesDir}`, customCss: `${global.config.customCss}` };
if (process.env.MM_MODULES_DIR) {
obj.modulesDir = process.env.MM_MODULES_DIR.replace(`${global.root_path}/`, "");
}