update merge package version

update to merge v2.1.1 due to vulnerability in 1.2.1
consequently a breakage is introduced - cloning regular expressions no longer works, so merge(false, ...) needs to be called instead - should have no impact on gateway app even if references to original merged metrics are kept in merged objects.

Author: LowPowerLab

gateway.js

@@ -95,9 +95,9 @@ global.loadMetricsFile = function(file, globalizeFunctions, fatal) {
     try {
       var tmp = require(file);
       if (!global.metricsDef) global.metricsDef = {};
-      metricsDef.metrics = merge(true, metricsDef.metrics, tmp.metrics);
-      metricsDef.motes = merge(true, metricsDef.motes, tmp.motes);
-      metricsDef.events = merge(true, metricsDef.events, tmp.events);
+      metricsDef.metrics = merge(false, metricsDef.metrics, tmp.metrics);
+      metricsDef.motes = merge(false, metricsDef.motes, tmp.motes);
+      metricsDef.events = merge(false, metricsDef.events, tmp.events);
       if (globalizeFunctions) {
         Object.getOwnPropertyNames(tmp).forEach(function(variable){
           let type = typeof tmp[variable];
@@ -111,7 +111,7 @@ global.loadMetricsFile = function(file, globalizeFunctions, fatal) {
       delete tmp.metrics;
       delete tmp.motes;
       delete tmp.events;
-      metricsDef = merge(true, metricsDef, tmp); //merge anything else (properties, variables, objects, functions)
+      metricsDef = merge(false, metricsDef, tmp); //merge anything else (properties, variables, objects, functions)
     } catch (ex) {
       console.error(`FAIL LOADING METRICS MODULE [${file}]: ${ex.message}\n${ex.stack}`);
       if (fatal) throw ex;

package.json

@@ -9,17 +9,17 @@
   },
   "author": "Felix Rusu (https://github.com/LowPowerLab)",
   "homepage": "http://lowpowerlab.com/gateway",
-  "license" : "CC-BY-NC-SA-4.0",
+  "license": "CC-BY-NC-SA-4.0",
   "bugs": {
     "url": "https://github.com/LowPowerLab/RaspberryPi-Gateway/issues",
-    "email": "bugs@lowpowerlab.com"
+    "email": "support@lowpowerlab.com"
   },
   "contributors": "Felix Rusu (https://github.com/LowPowerLab)",
   "dependencies": {
     "colors": "~1.4",
     "console-stamp": "^0.2.7",
     "json5": "~2.1.0",
-    "merge": "^1.2.1",
+    "merge": "^2.1.1",
     "nconf": "~0.10.0",
     "nedb": "~1.8",
     "nodemailer": "^6.4.6",