add moduleConfig

Author: bugsounet

js/app.js

@@ -133,14 +133,17 @@ function App () {
 			}
 			checkDeprecatedOptions(c);
 			var finalConfig = Object.assign(defaults, c);
-			if (finalConfig.modules.length) {
+
+			/*
+      if (finalConfig.modules.length) {
 				for (const [index, module] of finalConfig.modules.entries()) {
 					const moduleConfig = await loadModuleConfig(module);
-					console.log("=> moduleConfig", moduleConfig, index, module.module);
-					if (moduleConfig) finalConfig.modules[index].config = moduleConfig;
+					if (moduleConfig) {
+            finalConfig.modules[index].config = moduleConfig;
+          }
 				}
 			}
-			console.log("finalConfig --->", finalConfig);
+      */
 			return finalConfig;
 		} catch (e) {
 			if (e.code === "ENOENT") {
@@ -254,31 +257,28 @@ function App () {
 		Log.log("All module helpers loaded.");
 	}
 
+	/*
 	function loadModuleConfig (module) {
-		console.log("[loadModuleConfig] module", module);
-
 		if (module.moduleConfig) {
 			var moduleFolder = path.resolve(`${__dirname}/../modules/`, module.module);
 
 			if (defaultModules.includes(module.module)) {
 				moduleFolder = path.resolve(`${__dirname}/../modules/default/`, module.module);
 			}
 
-
 			const moduleConfigFile = `${moduleFolder}/config/config.js`;
 			console.log("[loadModuleConfig] moduleConfigFile", moduleConfigFile);
 			try {
 				fs.accessSync(moduleConfigFile, fs.R_OK);
 				const configFile = require(moduleConfigFile);
-				console.log("[loadModuleConfig] configFile", configFile);
 				return configFile;
 			} catch (e) {
 				Log.error(`${moduleConfigFile} loading error for module: ${module.module}.`, e.message);
 				return null;
 			}
 		}
 	}
-
+*/
 	/**
 	 * Compare two semantic version numbers and return the difference.
 	 * @param {string} a Version number a.
@@ -311,7 +311,6 @@ function App () {
 	 */
 	this.start = async function () {
 		config = await loadConfig();
-
 		Log.setLogLevel(config.logLevel);
 
 		// get the used module positions
@@ -321,10 +320,6 @@ function App () {
 		for (const module of config.modules) {
 			if (module.disabled) continue;
 			if (module.module) {
-				//const moduleConfig = await loadModuleConfig(module)
-				//console.log("=> moduleConfig", moduleConfig)
-				//if (moduleConfig) module.config = moduleConfig
-
 				if (Utils.moduleHasValidPosition(module.position) || typeof (module.position) === "undefined") {
 					// Only add this module to be loaded if it is not a duplicate (repeated instance of the same module)
 					if (!modules.includes(module.module)) {

js/loader.js

@@ -107,6 +107,7 @@ const Loader = (function () {
 				hiddenOnStartup: moduleData.hiddenOnStartup,
 				header: moduleData.header,
 				configDeepMerge: typeof moduleData.configDeepMerge === "boolean" ? moduleData.configDeepMerge : false,
+				moduleConfig: moduleData.moduleConfig,
 				config: moduleData.config,
 				classes: typeof moduleData.classes !== "undefined" ? `${moduleData.classes} ${module}` : module
 			});
@@ -148,6 +149,10 @@ const Loader = (function () {
 	 * @param {Module} mObj Modules instance.
 	 */
 	const bootstrapModule = async function (module, mObj) {
+		if (module.moduleConfig) {
+			Log.log(`Init config for: ${module.name}`);
+			await mObj.moduleConfig(module);
+		}
 		Log.info(`Bootstrapping module: ${module.name}`);
 		mObj.setData(module);
 

js/main.js

@@ -479,7 +479,6 @@ const MM = (function () {
 		}
 
 		config = Object.assign({}, defaults, config);
-		console.log("config:", config);
 	};
 
 	/**

js/module.js

@@ -226,6 +226,21 @@ const Module = Class.extend({
 		this.config = deep ? configMerge({}, this.defaults, config) : Object.assign({}, this.defaults, config);
 	},
 
+	moduleConfig (module) {
+		console.log("ok", module);
+		return new Promise(function (resolve) {
+			fetch(`${module.path}/config/config.js`)
+				.then((response) => response.text())
+				.then((txt) => {
+					console.log("1--->", txt);
+					const definedConfig = eval(txt);
+					console.log("2---->", definedConfig);
+					//module.config = json
+					//resolve()
+				});
+		});
+	},
+
 	/**
 	 * Returns a socket object. If it doesn't exist, it's created.
 	 * It also registers the notification callback.