Revamp default config / schema

Author: Dmitri Farkov

.gitignore

@@ -1,3 +1,3 @@
 dist
 node_modules
-config.yml
+config.dev.yml

default-config.yml

@@ -2,4 +2,5 @@ log: debug
 api:
   templates:
 mqtt:
+  port: 1883
 onvif:

package-lock.json

@@ -20,6 +20,7 @@
     "eslint-plugin-import": "2.20.1",
     "i": "0.3.6",
     "lodash.at": "4.6.0",
+    "merge-deep": "3.0.2",
     "nodemon": "2.0.2",
     "npm": "6.14.4",
     "onvif": "0.6.2",

package.json

@@ -4,6 +4,7 @@ import fs, { exists } from 'fs';
 import yaml from 'yaml';
 import process from 'process';
 import validator from './ConfigValidator';
+import merge from 'merge-deep';
 import logger, { setLoggingLevel } from './Logger';
 
 const DEFAULT_CONFIG_PATH = path.resolve(__dirname, '../default-config.yml');
@@ -67,13 +68,12 @@ class Config {
     const defaultConfig = this._loadDefaultConfig();
     const userConfig = this._loadUserConfig();
 
-    const mergedConfig = {
-      ...defaultConfig,
-      ...userConfig
-    };
+    const mergedConfig = merge(
+      defaultConfig,
+      userConfig
+    );
 
     this._validate(mergedConfig);
-
     return mergedConfig;
   };
 

src/Config.js

@@ -28,6 +28,11 @@ const configSchema = new Schema({
     host: {
       required: true,
     },
+    port: {
+      required: true,
+    },
+    username: String,
+    password: String,
   },
   onvif: {
     type: Array,