Release 2.24.0 (#3141)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Karsten Hassel <hassel@gmx.de> Co-authored-by: Malte Hallström <46646495+SkySails@users.noreply.github.com> Co-authored-by: Veeck <github@veeck.de> Co-authored-by: veeck <michael@veeck.de> Co-authored-by: dWoolridge <dwoolridge@charter.net> Co-authored-by: Johan <jojjepersson@yahoo.se> Co-authored-by: Dario Mratovich <dario_mratovich@hotmail.com> Co-authored-by: Dario Mratovich <dario.mratovich@outlook.com> Co-authored-by: Magnus <34011212+MagMar94@users.noreply.github.com> Co-authored-by: Naveen <172697+naveensrinivasan@users.noreply.github.com> Co-authored-by: buxxi <buxxi@omfilm.net> Co-authored-by: Thomas Hirschberger <47733292+Tom-Hirschberger@users.noreply.github.com> Co-authored-by: Kristjan ESPERANTO <35647502+KristjanESPERANTO@users.noreply.github.com> Co-authored-by: Andrés Vanegas Jiménez <142350+angeldeejay@users.noreply.github.com> Co-authored-by: Dave Child <dave@addedbytes.com> Co-authored-by: grenagit <46225780+grenagit@users.noreply.github.com> Co-authored-by: Grena <grena@grenabox.fr> Co-authored-by: Magnus Marthinsen <magmar@online.no> Co-authored-by: Patrick <psieg@users.noreply.github.com> Co-authored-by: Piotr Rajnisz <56397164+rajniszp@users.noreply.github.com> Co-authored-by: Suthep Yonphimai <tomzt@users.noreply.github.com> Co-authored-by: CarJem Generations (Carter Wallace) <cwallacecs@gmail.com> Co-authored-by: Nicholas Fogal <nfogal.misc@gmail.com> Co-authored-by: JakeBinney <126349119+JakeBinney@users.noreply.github.com> Co-authored-by: OWL4C <124401812+OWL4C@users.noreply.github.com> Co-authored-by: Oscar Björkman <17575446+oscarb@users.noreply.github.com> Co-authored-by: Ismar Slomic <ismar@slomic.no> Co-authored-by: Jørgen Veum-Wahlberg <jorgen.wahlberg@amedia.no> Co-authored-by: Eddie Hung <6740044+eddiehung@users.noreply.github.com> Co-authored-by: Bugsounet - Cédric <github@bugsounet.fr> Co-authored-by: bugsounet <bugsounet@bugsounet.fr> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-21 04:45:17 +00:00 · 2023-07-01 21:17:31 +02:00
parent abe5c08a52
commit e87f50e64a
74 changed files with 2570 additions and 2437 deletions
--- a/js/app.js
+++ b/js/app.js
@@ -44,7 +44,6 @@ process.on("uncaughtException", function (err) {

 /**
 * The core app.
- *
 * @class
 */
 function App() {
@@ -53,7 +52,6 @@ function App() {

 	/**
 	 * Loads the config file. Combines it with the defaults and returns the config
-	 *
 	 * @async
 	 * @returns {Promise<object>} the loaded config or the defaults if something goes wrong
 	 */
@@ -78,7 +76,7 @@ function App() {
 			// save current config.js
 			try {
 				if (fs.existsSync(configFilename)) {
-					fs.copyFileSync(configFilename, `${configFilename}_${Date.now()}`);
+					fs.copyFileSync(configFilename, `${configFilename}-old`);
 				}
 			} catch (err) {
 				Log.warn(`Could not copy ${configFilename}: ${err.message}`);
@@ -135,7 +133,6 @@ function App() {
 	/**
 	 * Checks the config for deprecated options and throws a warning in the logs
 	 * if it encounters one option from the deprecated.js list
-	 *
 	 * @param {object} userConfig The user config
 	 */
 	function checkDeprecatedOptions(userConfig) {
@@ -150,7 +147,6 @@ function App() {

 	/**
 	 * Loads a specific module.
-	 *
 	 * @param {string} module The name of the module (including subpath).
 	 */
 	function loadModule(module) {
@@ -204,36 +200,21 @@ function App() {

 	/**
 	 * Loads all modules.
-	 *
-	 * @param {string[]} modules All modules to be loaded
+	 * @param {Module[]} modules All modules to be loaded
+	 * @returns {Promise} A promise that is resolved when all modules been loaded
 	 */
 	async function loadModules(modules) {
-		return new Promise((resolve) => {
-			Log.log("Loading module helpers ...");
+		Log.log("Loading module helpers ...");

-			/**
-			 *
-			 */
-			function loadNextModule() {
-				if (modules.length > 0) {
-					const nextModule = modules[0];
-					loadModule(nextModule);
-					modules = modules.slice(1);
-					loadNextModule();
-				} else {
-					// All modules are loaded
-					Log.log("All module helpers loaded.");
-					resolve();
-				}
-			}
+		for (let module of modules) {
+			await loadModule(module);
+		}

-			loadNextModule();
-		});
+		Log.log("All module helpers loaded.");
 	}

 	/**
 	 * Compare two semantic version numbers and return the difference.
-	 *
 	 * @param {string} a Version number a.
 	 * @param {string} b Version number b.
 	 * @returns {number} A positive number if a is larger than b, a negative
@@ -259,7 +240,6 @@ function App() {
 	 * Start the core app.
 	 *
 	 * It loads the config, then it loads all modules.
-	 *
 	 * @async
 	 * @returns {Promise<object>} the config used
 	 */
@@ -274,6 +254,7 @@ function App() {
 				modules.push(module.module);
 			}
 		}
+
 		await loadModules(modules);

 		httpServer = new Server(config);
@@ -312,7 +293,6 @@ function App() {
 	 * exists.
 	 *
 	 * Added to fix #1056
-	 *
 	 * @returns {Promise} A promise that is resolved when all node_helpers and
 	 * the http server has been closed
 	 */
--- a/js/check_config.js
+++ b/js/check_config.js
@@ -18,7 +18,6 @@ const Utils = require(`${rootPath}/js/utils.js`);
 /**
 * Returns a string with path of configuration file.
 * Check if set by environment variable MM_CONFIG_FILE
- *
 * @returns {string} path and filename of the config file
 */
 function getConfigFile() {
--- a/js/class.js
+++ b/js/class.js
@@ -82,7 +82,6 @@

 /**
 * Define the clone method for later use. Helper Method.
- *
 * @param {object} obj Object to be cloned
 * @returns {object} the cloned object
 */
--- a/js/electron.js
+++ b/js/electron.js
@@ -126,13 +126,6 @@ function createWindow() {
 	});
 }

-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-app.on("ready", function () {
-	Log.log("Launching application.");
-	createWindow();
-});
-
 // Quit when all windows are closed.
 app.on("window-all-closed", function () {
 	if (process.env.JEST_WORKER_ID !== undefined) {
@@ -178,5 +171,11 @@ app.on("certificate-error", (event, webContents, url, error, certificate, callba
 // Start the core application if server is run on localhost
 // This starts all node helpers and starts the webserver.
 if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].includes(config.address)) {
-	core.start().then((c) => (config = c));
+	core.start().then((c) => {
+		config = c;
+		app.whenReady().then(() => {
+			Log.log("Launching application.");
+			createWindow();
+		});
+	});
 }
--- a/js/fetch.js
+++ b/js/fetch.js
@@ -4,7 +4,6 @@
 *
 * Attention: After some discussion we always return the third party
 * implementation until the node implementation is stable and more tested
- *
 * @see https://github.com/MichMich/MagicMirror/pull/2952
 * @see https://github.com/MichMich/MagicMirror/issues/2649
 * @param {string} url to be fetched
--- a/js/loader.js
+++ b/js/loader.js
@@ -52,7 +52,6 @@ const Loader = (function () {

 	/**
 	 * Retrieve list of all modules.
-	 *
 	 * @returns {object[]} module data as configured in config
 	 */
 	const getAllModules = function () {
@@ -61,7 +60,6 @@ const Loader = (function () {

 	/**
 	 * Generate array with module information including module paths.
-	 *
 	 * @returns {object[]} Module information.
 	 */
 	const getModuleData = function () {
@@ -103,7 +101,6 @@ const Loader = (function () {

 	/**
 	 * Load modules via ajax request and create module objects.
-	 *
 	 * @param {object} module Information about the module we want to load.
 	 * @returns {Promise<void>} resolved when module is loaded
 	 */
@@ -131,7 +128,6 @@ const Loader = (function () {

 	/**
 	 * Bootstrap modules by setting the module data and loading the scripts & styles.
-	 *
 	 * @param {object} module Information about the module we want to load.
 	 * @param {Module} mObj Modules instance.
 	 */
@@ -153,7 +149,6 @@ const Loader = (function () {

 	/**
 	 * Load a script or stylesheet by adding it to the dom.
-	 *
 	 * @param {string} fileName Path of the file we want to load.
 	 * @returns {Promise} resolved when the file is loaded
 	 */
@@ -229,7 +224,6 @@ const Loader = (function () {
 		/**
 		 * Load a file (script or stylesheet).
 		 * Prevent double loading and search for files in the vendor folder.
-		 *
 		 * @param {string} fileName Path of the file we want to load.
 		 * @param {Module} module The module that calls the loadFile function.
 		 * @returns {Promise} resolved when the file is loaded
--- a/js/main.js
+++ b/js/main.js
@@ -68,7 +68,6 @@ const MM = (function () {

 	/**
 	 * Select the wrapper dom object for a specific position.
-	 *
 	 * @param {string} position The name of the position.
 	 * @returns {HTMLElement | void} the wrapper element
 	 */
@@ -85,7 +84,6 @@ const MM = (function () {

 	/**
 	 * Send a notification to all modules.
-	 *
 	 * @param {string} notification The identifier of the notification.
 	 * @param {*} payload The payload of the notification.
 	 * @param {Module} sender The module that sent the notification.
@@ -102,7 +100,6 @@ const MM = (function () {

 	/**
 	 * Update the dom for a specific module.
-	 *
 	 * @param {Module} module The module that needs an update.
 	 * @param {number} [speed] The (optional) number of microseconds for the animation.
 	 * @returns {Promise} Resolved when the dom is fully updated.
@@ -129,7 +126,6 @@ const MM = (function () {

 	/**
 	 * Update the dom with the specified content
-	 *
 	 * @param {Module} module The module that needs an update.
 	 * @param {number} [speed] The (optional) number of microseconds for the animation.
 	 * @param {string} newHeader The new header that is generated.
@@ -167,7 +163,6 @@ const MM = (function () {

 	/**
 	 * Check if the content has changed.
-	 *
 	 * @param {Module} module The module to check.
 	 * @param {string} newHeader The new header that is generated.
 	 * @param {HTMLElement} newContent The new content that is generated.
@@ -198,7 +193,6 @@ const MM = (function () {

 	/**
 	 * Update the content of a module on screen.
-	 *
 	 * @param {Module} module The module to check.
 	 * @param {string} newHeader The new header that is generated.
 	 * @param {HTMLElement} newContent The new content that is generated.
@@ -224,15 +218,12 @@ const MM = (function () {

 	/**
 	 * Hide the module.
-	 *
 	 * @param {Module} module The module to hide.
 	 * @param {number} speed The speed of the hide animation.
 	 * @param {Function} callback Called when the animation is done.
 	 * @param {object} [options] Optional settings for the hide method.
 	 */
-	const hideModule = function (module, speed, callback, options) {
-		options = options || {};
-
+	const hideModule = function (module, speed, callback, options = {}) {
 		// set lockString if set in options.
 		if (options.lockString) {
 			// Log.log("Has lockstring: " + options.lockString);
@@ -271,15 +262,12 @@ const MM = (function () {

 	/**
 	 * Show the module.
-	 *
 	 * @param {Module} module The module to show.
 	 * @param {number} speed The speed of the show animation.
 	 * @param {Function} callback Called when the animation is done.
 	 * @param {object} [options] Optional settings for the show method.
 	 */
-	const showModule = function (module, speed, callback, options) {
-		options = options || {};
-
+	const showModule = function (module, speed, callback, options = {}) {
 		// remove lockString if set in options.
 		if (options.lockString) {
 			const index = module.lockStrings.indexOf(options.lockString);
@@ -380,13 +368,11 @@ const MM = (function () {

 	/**
 	 * Adds special selectors on a collection of modules.
-	 *
 	 * @param {Module[]} modules Array of modules.
 	 */
 	const setSelectionMethodsForModules = function (modules) {
 		/**
 		 * Filter modules with the specified classes.
-		 *
 		 * @param {string|string[]} className one or multiple classnames (array or space divided).
 		 * @returns {Module[]} Filtered collection of modules.
 		 */
@@ -396,7 +382,6 @@ const MM = (function () {

 		/**
 		 * Filter modules without the specified classes.
-		 *
 		 * @param {string|string[]} className one or multiple classnames (array or space divided).
 		 * @returns {Module[]} Filtered collection of modules.
 		 */
@@ -406,7 +391,6 @@ const MM = (function () {

 		/**
 		 * Filters a collection of modules based on classname(s).
-		 *
 		 * @param {string|string[]} className one or multiple classnames (array or space divided).
 		 * @param {boolean} include if the filter should include or exclude the modules with the specific classes.
 		 * @returns {Module[]} Filtered collection of modules.
@@ -435,7 +419,6 @@ const MM = (function () {

 		/**
 		 * Removes a module instance from the collection.
-		 *
 		 * @param {object} module The module instance to remove from the collection.
 		 * @returns {Module[]} Filtered collection of modules.
 		 */
@@ -450,7 +433,6 @@ const MM = (function () {

 		/**
 		 * Walks thru a collection of modules and executes the callback with the module as an argument.
-		 *
 		 * @param {Function} callback The function to execute with the module as an argument.
 		 */
 		const enumerate = function (callback) {
@@ -491,7 +473,6 @@ const MM = (function () {

 		/**
 		 * Gets called when all modules are started.
-		 *
 		 * @param {Module[]} moduleObjects All module instances.
 		 */
 		modulesStarted: function (moduleObjects) {
@@ -506,7 +487,6 @@ const MM = (function () {

 		/**
 		 * Send a notification to all modules.
-		 *
 		 * @param {string} notification The identifier of the notification.
 		 * @param {*} payload The payload of the notification.
 		 * @param {Module} sender The module that sent the notification.
@@ -533,7 +513,6 @@ const MM = (function () {

 		/**
 		 * Update the dom for a specific module.
-		 *
 		 * @param {Module} module The module that needs an update.
 		 * @param {number} [speed] The number of microseconds for the animation.
 		 */
@@ -554,7 +533,6 @@ const MM = (function () {

 		/**
 		 * Returns a collection of all modules currently active.
-		 *
 		 * @returns {Module[]} A collection of all modules currently active.
 		 */
 		getModules: function () {
@@ -564,7 +542,6 @@ const MM = (function () {

 		/**
 		 * Hide the module.
-		 *
 		 * @param {Module} module The module to hide.
 		 * @param {number} speed The speed of the hide animation.
 		 * @param {Function} callback Called when the animation is done.
@@ -577,7 +554,6 @@ const MM = (function () {

 		/**
 		 * Show the module.
-		 *
 		 * @param {Module} module The module to show.
 		 * @param {number} speed The speed of the show animation.
 		 * @param {Function} callback Called when the animation is done.
--- a/js/module.js
+++ b/js/module.js
@@ -46,7 +46,6 @@ const Module = Class.extend({

 	/**
 	 * Returns a list of scripts the module requires to be loaded.
-	 *
 	 * @returns {string[]} An array with filenames.
 	 */
 	getScripts: function () {
@@ -55,7 +54,6 @@ const Module = Class.extend({

 	/**
 	 * Returns a list of stylesheets the module requires to be loaded.
-	 *
 	 * @returns {string[]} An array with filenames.
 	 */
 	getStyles: function () {
@@ -66,7 +64,6 @@ const Module = Class.extend({
 	 * Returns a map of translation files the module requires to be loaded.
 	 *
 	 * return Map<String, String> -
-	 *
 	 * @returns {*} A map with langKeys and filenames.
 	 */
 	getTranslations: function () {
@@ -77,7 +74,6 @@ const Module = Class.extend({
 	 * Generates the dom which needs to be displayed. This method is called by the MagicMirror² core.
 	 * This method can to be subclassed if the module wants to display info on the mirror.
 	 * Alternatively, the getTemplate method could be subclassed.
-	 *
 	 * @returns {HTMLElement|Promise} The dom or a promise with the dom to display.
 	 */
 	getDom: function () {
@@ -111,7 +107,6 @@ const Module = Class.extend({
 	 * Generates the header string which needs to be displayed if a user has a header configured for this module.
 	 * This method is called by the MagicMirror² core, but only if the user has configured a default header for the module.
 	 * This method needs to be subclassed if the module wants to display modified headers on the mirror.
-	 *
 	 * @returns {string} The header to display above the header.
 	 */
 	getHeader: function () {
@@ -123,7 +118,6 @@ const Module = Class.extend({
 	 * This method needs to be subclassed if the module wants to use a template.
 	 * It can either return a template sting, or a template filename.
 	 * If the string ends with '.html' it's considered a file from within the module's folder.
-	 *
 	 * @returns {string} The template string of filename.
 	 */
 	getTemplate: function () {
@@ -133,7 +127,6 @@ const Module = Class.extend({
 	/**
 	 * Returns the data to be used in the template.
 	 * This method needs to be subclassed if the module wants to use a custom data.
-	 *
 	 * @returns {object} The data for the template
 	 */
 	getTemplateData: function () {
@@ -142,7 +135,6 @@ const Module = Class.extend({

 	/**
 	 * Called by the MagicMirror² core when a notification arrives.
-	 *
 	 * @param {string} notification The identifier of the notification.
 	 * @param {*} payload The payload of the notification.
 	 * @param {Module} sender The module that sent the notification.
@@ -158,7 +150,6 @@ const Module = Class.extend({
 	/**
 	 * Returns the nunjucks environment for the current module.
 	 * The environment is checked in the _nunjucksEnvironment instance variable.
-	 *
 	 * @returns {object} The Nunjucks Environment
 	 */
 	nunjucksEnvironment: function () {
@@ -180,7 +171,6 @@ const Module = Class.extend({

 	/**
 	 * Called when a socket notification arrives.
-	 *
 	 * @param {string} notification The identifier of the notification.
 	 * @param {*} payload The payload of the notification.
 	 */
@@ -208,7 +198,6 @@ const Module = Class.extend({

 	/**
 	 * Set the module data.
-	 *
 	 * @param {object} data The module data
 	 */
 	setData: function (data) {
@@ -222,7 +211,6 @@ const Module = Class.extend({

 	/**
 	 * Set the module config and combine it with the module defaults.
-	 *
 	 * @param {object} config The combined module config.
 	 * @param {boolean} deep Merge module config in deep.
 	 */
@@ -233,7 +221,6 @@ const Module = Class.extend({
 	/**
 	 * Returns a socket object. If it doesn't exist, it's created.
 	 * It also registers the notification callback.
-	 *
 	 * @returns {MMSocket} a socket object
 	 */
 	socket: function () {
@@ -250,7 +237,6 @@ const Module = Class.extend({

 	/**
 	 * Retrieve the path to a module file.
-	 *
 	 * @param {string} file Filename
 	 * @returns {string} the file path
 	 */
@@ -260,7 +246,6 @@ const Module = Class.extend({

 	/**
 	 * Load all required stylesheets by requesting the MM object to load the files.
-	 *
 	 * @returns {Promise<void>}
 	 */
 	loadStyles: function () {
@@ -269,7 +254,6 @@ const Module = Class.extend({

 	/**
 	 * Load all required scripts by requesting the MM object to load the files.
-	 *
 	 * @returns {Promise<void>}
 	 */
 	loadScripts: function () {
@@ -278,7 +262,6 @@ const Module = Class.extend({

 	/**
 	 * Helper method to load all dependencies.
-	 *
 	 * @param {string} funcName Function name to call to get scripts or styles.
 	 * @returns {Promise<void>}
 	 */
@@ -301,6 +284,7 @@ const Module = Class.extend({

 	/**
 	 * Load all translations.
+	 * @returns {Promise<void>}
 	 */
 	loadTranslations: async function () {
 		const translations = this.getTranslations() || {};
@@ -329,7 +313,6 @@ const Module = Class.extend({

 	/**
 	 * Request the translation for a given key with optional variables and default value.
-	 *
 	 * @param {string} key The key of the string to translate
 	 * @param {string|object} [defaultValueOrVariables] The default value or variables for translating.
 	 * @param {string} [defaultValue] The default value with variables.
@@ -344,7 +327,6 @@ const Module = Class.extend({

 	/**
 	 * Request an (animated) update of the module.
-	 *
 	 * @param {number} [speed] The speed of the animation.
 	 */
 	updateDom: function (speed) {
@@ -353,7 +335,6 @@ const Module = Class.extend({

 	/**
 	 * Send a notification to all modules.
-	 *
 	 * @param {string} notification The identifier of the notification.
 	 * @param {*} payload The payload of the notification.
 	 */
@@ -363,7 +344,6 @@ const Module = Class.extend({

 	/**
 	 * Send a socket notification to the node helper.
-	 *
 	 * @param {string} notification The identifier of the notification.
 	 * @param {*} payload The payload of the notification.
 	 */
@@ -373,55 +353,55 @@ const Module = Class.extend({

 	/**
 	 * Hide this module.
-	 *
 	 * @param {number} speed The speed of the hide animation.
 	 * @param {Function} callback Called when the animation is done.
 	 * @param {object} [options] Optional settings for the hide method.
 	 */
-	hide: function (speed, callback, options) {
-		if (typeof callback === "object") {
-			options = callback;
-			callback = function () {};
-		}
+	hide: function (speed, callback, options = {}) {
+		let usedCallback = callback || function () {};
+		let usedOptions = options;

-		callback = callback || function () {};
-		options = options || {};
+		if (typeof callback === "object") {
+			Log.error("Parameter mismatch in module.hide: callback is not an optional parameter!");
+			usedOptions = callback;
+			usedCallback = function () {};
+		}

 		MM.hideModule(
 			this,
 			speed,
 			() => {
 				this.suspend();
-				callback();
+				usedCallback();
 			},
-			options
+			usedOptions
 		);
 	},

 	/**
 	 * Show this module.
-	 *
 	 * @param {number} speed The speed of the show animation.
 	 * @param {Function} callback Called when the animation is done.
 	 * @param {object} [options] Optional settings for the show method.
 	 */
 	show: function (speed, callback, options) {
-		if (typeof callback === "object") {
-			options = callback;
-			callback = function () {};
-		}
+		let usedCallback = callback || function () {};
+		let usedOptions = options;

-		callback = callback || function () {};
-		options = options || {};
+		if (typeof callback === "object") {
+			Log.error("Parameter mismatch in module.show: callback is not an optional parameter!");
+			usedOptions = callback;
+			usedCallback = function () {};
+		}

 		MM.showModule(
 			this,
 			speed,
 			() => {
 				this.resume();
-				callback();
+				usedCallback();
 			},
-			options
+			usedOptions
 		);
 	}
 });
@@ -445,7 +425,6 @@ const Module = Class.extend({
 * -------
 *
 * Todo: idea of Mich determinate what do you want to merge or not
- *
 * @param {object} result the initial object
 * @returns {object} the merged config
 */
@@ -507,7 +486,6 @@ window.Module = Module;

 /**
 * Compare two semantic version numbers and return the difference.
- *
 * @param {string} a Version number a.
 * @param {string} b Version number b.
 * @returns {number} A positive number if a is larger than b, a negative
--- a/js/node_helper.js
+++ b/js/node_helper.js
@@ -32,7 +32,6 @@ const NodeHelper = Class.extend({

 	/**
 	 * This method is called when a socket notification arrives.
-	 *
 	 * @param {string} notification The identifier of the notification.
 	 * @param {*}  payload The payload of the notification.
 	 */
@@ -42,7 +41,6 @@ const NodeHelper = Class.extend({

 	/**
 	 * Set the module name.
-	 *
 	 * @param {string} name Module name.
 	 */
 	setName(name) {
@@ -51,7 +49,6 @@ const NodeHelper = Class.extend({

 	/**
 	 * Set the module path.
-	 *
 	 * @param {string} path Module path.
 	 */
 	setPath(path) {
@@ -123,7 +120,6 @@ NodeHelper.checkFetchStatus = function (response) {
 /**
 * Look at the specified error and return an appropriate error type, that
 * can be translated to a detailed error message
- *
 * @param {Error} error the error from fetching something
 * @returns {string} the string of the detailed error message in the translations
 */
--- a/js/server.js
+++ b/js/server.js
@@ -19,7 +19,6 @@ const { cors, getConfig, getHtml, getVersion } = require("./server_functions");

 /**
 * Server
- *
 * @param {object} config The MM config
 * @class
 */
@@ -31,7 +30,6 @@ function Server(config) {

 	/**
 	 * Opens the server for incoming connections
-	 *
 	 * @returns {Promise} A promise that is resolved when the server listens to connections
 	 */
 	this.open = function () {
@@ -106,7 +104,6 @@ function Server(config) {

 	/**
 	 * Closes the server and destroys all lingering connections to it.
-	 *
 	 * @returns {Promise} A promise that resolves when server has successfully shut down
 	 */
 	this.close = function () {
--- a/js/server_functions.js
+++ b/js/server_functions.js
@@ -5,7 +5,6 @@ const fetch = require("./fetch");

 /**
 * Gets the config.
- *
 * @param {Request} req - the request
 * @param {Response} res - the result
 */
@@ -19,7 +18,6 @@ function getConfig(req, res) {
 * Example input request url: /cors?sendheaders=header1:value1,header2:value2&expectedheaders=header1,header2&url=http://www.test.com/path?param1=value1
 *
 * Only the url-param of the input request url is required. It must be the last parameter.
- *
 * @param {Request} req - the request
 * @param {Response} res - the result
 */
@@ -57,7 +55,6 @@ async function cors(req, res) {

 /**
 * Gets headers and values to attach to the web request.
- *
 * @param {string} url - The url containing the headers and values to send.
 * @returns {object} An object specifying name and value of the headers.
 */
@@ -79,7 +76,6 @@ function getHeadersToSend(url) {

 /**
 * Gets the headers expected from the response.
- *
 * @param {string} url - The url containing the expected headers from the response.
 * @returns {string[]} headers - The name of the expected headers.
 */
@@ -97,7 +93,6 @@ function geExpectedRecievedHeaders(url) {

 /**
 * Gets the HTML to display the magic mirror.
- *
 * @param {Request} req - the request
 * @param {Response} res - the result
 */
@@ -116,7 +111,6 @@ function getHtml(req, res) {

 /**
 * Gets the MagicMirror version.
- *
 * @param {Request} req - the request
 * @param {Response} res - the result
 */
--- a/js/socketclient.js
+++ b/js/socketclient.js
@@ -44,10 +44,7 @@ const MMSocket = function (moduleName) {
 		notificationCallback = callback;
 	};

-	this.sendNotification = (notification, payload) => {
-		if (typeof payload === "undefined") {
-			payload = {};
-		}
+	this.sendNotification = (notification, payload = {}) => {
 		this.socket.emit(notification, payload);
 	};
 };
--- a/js/translator.js
+++ b/js/translator.js
@@ -9,13 +9,12 @@
 const Translator = (function () {
 	/**
 	 * Load a JSON file via XHR.
-	 *
 	 * @param {string} file Path of the file we want to load.
 	 * @returns {Promise<object>} the translations in the specified file
 	 */
 	async function loadJSON(file) {
 		const xhr = new XMLHttpRequest();
-		return new Promise(function (resolve, reject) {
+		return new Promise(function (resolve) {
 			xhr.overrideMimeType("application/json");
 			xhr.open("GET", file, true);
 			xhr.onreadystatechange = function () {
@@ -43,21 +42,17 @@ const Translator = (function () {

 		/**
 		 * Load a translation for a given key for a given module.
-		 *
 		 * @param {Module} module The module to load the translation for.
 		 * @param {string} key The key of the text to translate.
 		 * @param {object} variables The variables to use within the translation template (optional)
 		 * @returns {string} the translated key
 		 */
-		translate: function (module, key, variables) {
-			variables = variables || {}; // Empty object by default
-
+		translate: function (module, key, variables = {}) {
 			/**
 			 * Combines template and variables like:
 			 * template: "Please wait for {timeToWait} before continuing with {work}."
 			 * variables: {timeToWait: "2 hours", work: "painting"}
 			 * to: "Please wait for 2 hours before continuing with painting."
-			 *
 			 * @param {string} template Text with placeholder
 			 * @param {object} variables Variables for the placeholder
 			 * @returns {string} the template filled with the variables
@@ -66,10 +61,11 @@ const Translator = (function () {
 				if (Object.prototype.toString.call(template) !== "[object String]") {
 					return template;
 				}
+				let templateToUse = template;
 				if (variables.fallback && !template.match(new RegExp("{.+}"))) {
-					template = variables.fallback;
+					templateToUse = variables.fallback;
 				}
-				return template.replace(new RegExp("{([^}]+)}", "g"), function (_unused, varName) {
+				return templateToUse.replace(new RegExp("{([^}]+)}", "g"), function (_unused, varName) {
 					return varName in variables ? variables[varName] : `{${varName}}`;
 				});
 			}
@@ -99,7 +95,6 @@ const Translator = (function () {

 		/**
 		 * Load a translation file (json) and remember the data.
-		 *
 		 * @param {Module} module The module to load the translation file for.
 		 * @param {string} file Path of the file we want to load.
 		 * @param {boolean} isFallback Flag to indicate fallback translations.
@@ -118,7 +113,6 @@ const Translator = (function () {

 		/**
 		 * Load the core translations.
-		 *
 		 * @param {string} lang The language identifier of the core language.
 		 */
 		loadCoreTranslations: async function (lang) {