config endpoint must handle functions in module configs

Author: khassel

js/main.js

@@ -475,7 +475,19 @@ const MM = (function () {
 	const loadConfig = async function () {
 		try {
 			const res = await fetch(new URL("config/", `${location.origin}${config.basePath}`));
-			config = JSON.parse(await res.text());
+
+			config = JSON.parse(await res.text(), (key, value) => {
+				if (typeof value === "string") {
+					// checks for classic function OR arrow function
+					const isFunction = value.includes("function") || value.includes("=>");
+
+					if (isFunction) {
+					// eval() often needs brackets around
+						return eval(`(${value})`);
+					}
+				}
+				return value;
+			});
 		} catch (error) {
 			Log.error("Unable to retrieve config", error);
 		}

js/server.js

@@ -111,12 +111,22 @@ function Server (configObj) {
 			const getStartup = (req, res) => res.send(startUp);
 
 			const getConfig = (req, res) => {
+				let obj;
 				if (config.hideConfigSecrets) {
-					res.send(configObj.redactedConf);
+					obj = configObj.redactedConf;
 				} else {
-					res.send(configObj.fullConf);
+					obj = configObj.fullConf;
 				}
+				const jsonString = JSON.stringify(obj, (key, value) => {
+					if (typeof value === "function") {
+						return value.toString();
+					}
+					return value;
+				});
+				res.set("Content-Type", "application/json");
+				res.send(jsonString);
 			};
+
 			app.get("/config", (req, res) => getConfig(req, res));
 
 			app.get("/cors", async (req, res) => await cors(req, res));

tests/configs/config_functions.js

@@ -0,0 +1,33 @@
+/*eslint object-shorthand: ["error", "always", { "methodsIgnorePattern": "^roundToInt2$" }]*/
+
+let config = require(`${process.cwd()}/tests/configs/default.js`).configFactory({
+	modules: [
+		{
+			module: "clock",
+			position: "middle_center",
+			config: {
+				moduleFunctions: {
+					roundToInt1: (value) => {
+						try {
+							return Math.round(parseFloat(value));
+						} catch {
+							return value;
+						}
+					},
+					roundToInt2: function (value) {
+						try {
+							return Math.round(parseFloat(value));
+						} catch {
+							return value;
+						}
+					}
+				}
+			}
+		}
+	]
+});
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {
+	module.exports = config;
+}

tests/e2e/config_functions_spec.js

@@ -0,0 +1,16 @@
+const helpers = require("./helpers/global-setup");
+
+describe("config with module function", () => {
+	beforeAll(async () => {
+		await helpers.startApplication("tests/configs/config_functions.js");
+	});
+
+	afterAll(async () => {
+		await helpers.stopApplication();
+	});
+
+	it("config should resolve module functions", () => {
+		expect(config.modules[0].config.moduleFunctions.roundToInt1(13.3)).toBe(13);
+		expect(config.modules[0].config.moduleFunctions.roundToInt2(13.3)).toBe(13);
+	});
+});