From a406a31da46cc1ba311ed4abd971ee94f0f538dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Victor=20Hagelb=C3=A4ck?= <swevictor@gmail.com>
Date: Mon, 1 Feb 2021 21:12:05 +0100
Subject: [PATCH] Make config extend default config and log merged params
 verbose at startup

---
 plejd/Configuration.js | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/plejd/Configuration.js b/plejd/Configuration.js
index 6376bb0..7b3a1d2 100644
--- a/plejd/Configuration.js
+++ b/plejd/Configuration.js
@@ -1,14 +1,26 @@
 const fs = require('fs');
 
 class Configuration {
-  static _config = null;
+  static _options = null;
 
-  static getConfiguration() {
-    if (!Configuration._config) {
+  static getOptions() {
+    if (!Configuration._options) {
       const rawData = fs.readFileSync('/data/options.json');
-      Configuration._config = JSON.parse(rawData);
+      const config = JSON.parse(rawData);
+
+      const defaultRawData = fs.readFileSync('/plejd/config.json');
+      const defaultConfig = JSON.parse(defaultRawData).options;
+
+      Configuration._options = { ...defaultConfig, ...config };
+
+      console.log('Config:', {
+        ...Configuration._options,
+        username: '---scrubbed---',
+        password: '---scrubbed---',
+        mqttPassword: '---scrubbed---',
+      });
     }
-    return Configuration._config;
+    return Configuration._options;
   }
 }