From c7f8d903d3c330b0dd2e7c61fcab578e339f1878 Mon Sep 17 00:00:00 2001 From: Parnic Date: Sat, 4 Jan 2025 19:32:07 -0600 Subject: [PATCH] Finish setting up prettier, fix its complaints --- .prettierignore | 1 + .prettierrc | 1 + MMM-IntelliCenter.js | 26 +++++++++++++------------- eslint.config.mjs | 4 ++-- node_helper.js | 38 +++++++++++++++++++------------------- 5 files changed, 36 insertions(+), 34 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..ace15b8 --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +/.github/ \ No newline at end of file diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/.prettierrc @@ -0,0 +1 @@ +{} diff --git a/MMM-IntelliCenter.js b/MMM-IntelliCenter.js index 5674fde..e384ad2 100644 --- a/MMM-IntelliCenter.js +++ b/MMM-IntelliCenter.js @@ -22,7 +22,7 @@ Module.register("MMM-IntelliCenter", { pHTankLevelMax: 6, serverAddress: "", serverPort: 0, - multicastInterface: "" + multicastInterface: "", }, start() { @@ -31,7 +31,7 @@ Module.register("MMM-IntelliCenter", { (!this.config.controls || this.config.controls.length === 0) ) { Log.warn( - "Controls are enabled, but no controls are configured. See README for info on setting up controls." + "Controls are enabled, but no controls are configured. See README for info on setting up controls.", ); this.config.showControls = false; } @@ -84,7 +84,7 @@ Module.register("MMM-IntelliCenter", { contents.push({ header: "Pool temp", data: `${poolData.status.currentTemp[0]}°${!isPoolActive(poolData.status) ? " (last)" : ""}`, - class: this.config.contentClass + className + class: this.config.contentClass + className, }); } if (this.config.showSpaTemp) { @@ -98,14 +98,14 @@ Module.register("MMM-IntelliCenter", { contents.push({ header: "Spa temp", data: `${poolData.status.currentTemp[1]}°${!isSpaActive(poolData.status) ? " (last)" : ""}`, - class: this.config.contentClass + className + class: this.config.contentClass + className, }); } if (this.config.showPH) { let dataStr = poolData.status.pH; if (this.config.showPHTankLevel) { const percent = Math.round( - ((poolData.status.pHTank - 1) / this.config.pHTankLevelMax) * 100 + ((poolData.status.pHTank - 1) / this.config.pHTankLevelMax) * 100, ); let cls = ""; if (this.config.colored) { @@ -128,28 +128,28 @@ Module.register("MMM-IntelliCenter", { contents.push({ header: "pH", data: dataStr, - class: this.config.contentClass + class: this.config.contentClass, }); } if (this.config.showOrp) { contents.push({ header: "ORP", data: poolData.status.orp, - class: this.config.contentClass + class: this.config.contentClass, }); } if (this.config.showSaltLevel) { contents.push({ header: "Salt PPM", data: poolData.status.saltPPM, - class: this.config.contentClass + class: this.config.contentClass, }); } if (this.config.showSaturation) { contents.push({ header: "Saturation", data: poolData.status.saturation, - class: this.config.contentClass + class: this.config.contentClass, }); } if (this.config.showControls) { @@ -187,7 +187,7 @@ Module.register("MMM-IntelliCenter", { }" data-state="${on ? "1" : "0"}">
${ name }
`, - class: this.config.contentClass + class: this.config.contentClass, }); } else if (controlObj.type === "heatpoint") { if ( @@ -207,7 +207,7 @@ Module.register("MMM-IntelliCenter", { contents.push({ data: dataHtml, - class: this.config.contentClass + class: this.config.contentClass, }); } else if (controlObj.type === "heatmode") { if ( @@ -233,7 +233,7 @@ Module.register("MMM-IntelliCenter", { }" data-state="${on ? "1" : "0"}" data-mode="${mode.toString()}">
${ controlObj.name }
`, - class: this.config.contentClass + class: this.config.contentClass, }); } else { Log.warn("circuit with unknown type, unable to display:"); @@ -296,7 +296,7 @@ Module.register("MMM-IntelliCenter", { } else if (notification === "INTELLICENTER_RECONNECTING") { showReconnectOverlay(true); } - } + }, }); function showReconnectOverlay(show) { diff --git a/eslint.config.mjs b/eslint.config.mjs index 86c466c..89cb320 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -3,6 +3,6 @@ import eslint from "@eslint/js"; export default [ eslint.configs.recommended, { - ignores: ["eslint.config.mjs"] - } + ignores: ["eslint.config.mjs"], + }, ]; diff --git a/node_helper.js b/node_helper.js index 763f5d3..cde6e44 100644 --- a/node_helper.js +++ b/node_helper.js @@ -27,7 +27,7 @@ module.exports = NodeHelper.create({ this.setCircuitState(circuitState, (poolStatus) => { this.sendSocketNotification("INTELLICENTER_CIRCUIT_DONE", { circuitState, - status: poolStatus + status: poolStatus, }); }); }, @@ -36,7 +36,7 @@ module.exports = NodeHelper.create({ this.setHeatpointState(heatpoint, (poolStatus) => { this.sendSocketNotification("INTELLICENTER_HEATPOINT_DONE", { heatpoint, - status: poolStatus + status: poolStatus, }); }); }, @@ -45,7 +45,7 @@ module.exports = NodeHelper.create({ this.setHeatstateState(heatstate, (poolStatus) => { this.sendSocketNotification("INTELLICENTER_HEATSTATE_DONE", { heatstate, - status: poolStatus + status: poolStatus, }); }); }, @@ -54,7 +54,7 @@ module.exports = NodeHelper.create({ this.setLights(lightCmd, (poolStatus) => { this.sendSocketNotification("INTELLICENTER_LIGHTCMD_DONE", { lightCmd, - status: poolStatus + status: poolStatus, }); }); }, @@ -73,7 +73,7 @@ module.exports = NodeHelper.create({ }, () => { this.notifyReconnecting(); - } + }, ); } else if (poolData.status) { this.sendSocketNotification("INTELLICENTER_RESULT", poolData); @@ -116,7 +116,7 @@ module.exports = NodeHelper.create({ foundUnit .on("error", (e) => { Log.error( - `[MMM-IntelliCenter] error in unit connection. restarting the connection process in ${reconnectDelayMs / 1000} seconds` + `[MMM-IntelliCenter] error in unit connection. restarting the connection process in ${reconnectDelayMs / 1000} seconds`, ); Log.error(e); @@ -128,7 +128,7 @@ module.exports = NodeHelper.create({ }) .on("close", () => { Log.error( - `[MMM-IntelliCenter] unit connection closed unexpectedly. restarting the connection process in ${reconnectDelayMs / 1000} seconds` + `[MMM-IntelliCenter] unit connection closed unexpectedly. restarting the connection process in ${reconnectDelayMs / 1000} seconds`, ); reconnectCb(); @@ -139,7 +139,7 @@ module.exports = NodeHelper.create({ }) .once("connected", () => { Log.info( - "[MMM-IntelliCenter] logged into unit. getting basic configuration..." + "[MMM-IntelliCenter] logged into unit. getting basic configuration...", ); foundUnit.send(new messages.GetSystemInformation()).then(() => { Log.info("[MMM-IntelliCenter] got it!"); @@ -147,7 +147,7 @@ module.exports = NodeHelper.create({ }) .once("controllerConfig", (config) => { Log.info( - "[MMM-IntelliCenter] configuration received. adding client..." + "[MMM-IntelliCenter] configuration received. adding client...", ); poolData.controllerConfig = config; poolData.degStr = this.config.degC ? "C" : "F"; @@ -155,7 +155,7 @@ module.exports = NodeHelper.create({ }) .once("addClient", () => { Log.info( - "[MMM-IntelliCenter] client added successfully and listening for changes" + "[MMM-IntelliCenter] client added successfully and listening for changes", ); foundUnit.getPoolStatus(); // Connection seems to time out every 10 minutes without some sort of request made @@ -163,7 +163,7 @@ module.exports = NodeHelper.create({ () => { foundUnit.pingServer(); }, - 1 * 60 * 1000 + 1 * 60 * 1000, ); }) .on("poolStatus", (status) => { @@ -182,7 +182,7 @@ module.exports = NodeHelper.create({ .on("serverFound", (server) => { finder.close(); Log.info( - `[MMM-IntelliCenter] local unit found at ${server.addressStr}:${server.port}` + `[MMM-IntelliCenter] local unit found at ${server.addressStr}:${server.port}`, ); foundUnit = new Unit(server.addressStr, server.port); @@ -193,7 +193,7 @@ module.exports = NodeHelper.create({ }) .on("error", (e) => { Log.error( - `[MMM-IntelliCenter] error trying to find a server. scheduling a retry in ${reconnectDelayMs / 1000} seconds` + `[MMM-IntelliCenter] error trying to find a server. scheduling a retry in ${reconnectDelayMs / 1000} seconds`, ); Log.error(e); this.resetFoundUnit(); @@ -205,7 +205,7 @@ module.exports = NodeHelper.create({ finder.search(); unitFinderRetry = setInterval(() => { Log.info( - `[MMM-IntelliCenter] didn't find any units within ${unitFinderTimeoutMs / 1000} seconds, trying again...` + `[MMM-IntelliCenter] didn't find any units within ${unitFinderTimeoutMs / 1000} seconds, trying again...`, ); finder.search(); }, unitFinderTimeoutMs); @@ -219,7 +219,7 @@ module.exports = NodeHelper.create({ this.config.serverPort ) { Log.info( - `[MMM-IntelliCenter] connecting directly to configured unit at ${this.config.serverAddress}:${this.config.serverPort}` + `[MMM-IntelliCenter] connecting directly to configured unit at ${this.config.serverAddress}:${this.config.serverPort}`, ); foundUnit = new Unit(this.config.serverAddress, this.config.serverPort); } @@ -238,7 +238,7 @@ module.exports = NodeHelper.create({ } Log.info( - `[MMM-IntelliCenter] setting circuit ${circuitState.id} to ${circuitState.state}` + `[MMM-IntelliCenter] setting circuit ${circuitState.id} to ${circuitState.state}`, ); foundUnit.setCircuitState(0, circuitState.id, circuitState.state); foundUnit.getPoolStatus(); @@ -251,7 +251,7 @@ module.exports = NodeHelper.create({ } Log.info( - `[MMM-IntelliCenter] setting heatpoint for body ${heatpoint.body} to ${heatpoint.temperature} deg` + `[MMM-IntelliCenter] setting heatpoint for body ${heatpoint.body} to ${heatpoint.temperature} deg`, ); foundUnit.setSetPoint(0, heatpoint.body, heatpoint.temperature); foundUnit.getPoolStatus(); @@ -264,7 +264,7 @@ module.exports = NodeHelper.create({ } Log.info( - `[MMM-IntelliCenter] setting heat state for body ${heatstate.body} to ${heatstate.state}` + `[MMM-IntelliCenter] setting heat state for body ${heatstate.body} to ${heatstate.state}`, ); foundUnit.setHeatMode(0, heatstate.body, heatstate.state); foundUnit.getPoolStatus(); @@ -279,5 +279,5 @@ module.exports = NodeHelper.create({ Log.info(`[MMM-IntelliCenter] sending light command ${lightCmd}`); foundUnit.sendLightCommand(0, lightCmd); foundUnit.getPoolStatus(); - } + }, });