deep merges config

evolutionleo · Aug 15, 2022 · bf2d885 · bf2d885
1 parent 86f0926
commit bf2d885
Show file tree

Hide file tree

Showing 8 changed files with 91 additions and 9 deletions.
diff --git a/JavascriptServer/config.js b/JavascriptServer/config.js
@@ -1,4 +1,5 @@
 // get the command line arguments
+import { mergeDeep } from '#util/deep_merge';
 import trace from '#util/logging';
 import chalk from 'chalk';
 import minimist from 'minimist';
@@ -58,6 +59,11 @@ const prod_config = {
     port: args.port || 1337,
     ws_port: args.ws_port || 3000,
 
+
+    room: {
+        rooms_path: './rooms'
+    },
+
     ssl_enabled: false,
     ssl_cert_path: '/etc/letsencrypt/live/example.com/cert.pem',
     ssl_key_path: '/etc/letsencrypt/live/example.com/privkey.pem',
@@ -99,16 +105,16 @@ const env = args.env || 'dev';
 
 
 const config = {};
-Object.assign(config, common_config);
+mergeDeep(config, common_config);
 
 if (env === 'production' || env === 'prod' || args.prod) {
-    Object.assign(config, prod_config);
+    mergeDeep(config, prod_config);
 }
 else if (env === 'development' || env === 'dev' || args.dev) {
-    Object.assign(config, dev_config);
+    mergeDeep(config, dev_config);
 }
 else {
-    Object.assign(config, default_config);
+    mergeDeep(config, default_config);
 }
 
 

diff --git a/JavascriptServer/internal/util/deep_merge.js b/JavascriptServer/internal/util/deep_merge.js
@@ -0,0 +1,36 @@
+// Copied from stack overflow lmao
+// (https://stackoverflow.com/questions/27936772/how-to-deep-merge-instead-of-shallow-merge)
+
+/**
+ * Simple object check.
+ * @param item
+ * @returns {boolean}
+ */
+export function isObject(item) {
+    return (item && typeof item === 'object' && !Array.isArray(item));
+}
+
+/**
+* Deep merge two objects.
+* @param target
+* @param ...sources
+*/
+export function mergeDeep(target, ...sources) {
+    if (!sources.length)
+        return target;
+    const source = sources.shift();
+
+    if (isObject(target) && isObject(source)) {
+        for (const key in source) {
+            if (isObject(source[key])) {
+                if (!target[key])
+                    Object.assign(target, { [key]: {} });
+                mergeDeep(target[key], source[key]);
+            } else {
+                Object.assign(target, { [key]: source[key] });
+            }
+        }
+    }
+
+    return mergeDeep(target, ...sources);
+}
diff --git a/Release/GMClient.zip b/Release/GMClient.zip
diff --git a/Release/JSServer.zip b/Release/JSServer.zip
diff --git a/Release/TSServer.zip b/Release/TSServer.zip
diff --git a/Release/Warp.yymps b/Release/Warp.yymps
diff --git a/TypescriptServer/src/config.ts b/TypescriptServer/src/config.ts
@@ -1,4 +1,5 @@
 // get the command line arguments
+import { mergeDeep } from '#util/deep_merge';
 import trace from '#util/logging';
 import chalk from 'chalk';
 import minimist from 'minimist';
@@ -22,7 +23,7 @@ const common_config = {
 
     room: {
         // .yy room loading
-        rooms_path: '../Client/rooms',
+        rooms_path: '../Client/rooms', // (overriden in prod config)
         warn_on_unknown_entity: true,
 
         starting_room: 'Test Room',
@@ -58,6 +59,11 @@ const prod_config = {
     port: args.port || 1337,
     ws_port: args.ws_port || 3000,
 
+
+    room: {
+        rooms_path: './rooms'
+    },
+
     ssl_enabled: false,
     ssl_cert_path: '/etc/letsencrypt/live/example.com/cert.pem',
     ssl_key_path: '/etc/letsencrypt/live/example.com/privkey.pem',
@@ -110,16 +116,16 @@ const env = args.env || 'dev'
 
 
 const config:any = {};
-Object.assign(config, common_config);
+mergeDeep(config, common_config);
 
 if (env === 'production' || env === 'prod' || args.prod) {
-    Object.assign(config, prod_config);
+    mergeDeep(config, prod_config);
 }
 else if (env === 'development' || env === 'dev' || args.dev) {
-    Object.assign(config, dev_config);
+    mergeDeep(config, dev_config);
 }
 else {
-    Object.assign(config, default_config);
+    mergeDeep(config, default_config);
 }
 
 

diff --git a/TypescriptServer/src/internal/util/deep_merge.ts b/TypescriptServer/src/internal/util/deep_merge.ts
@@ -0,0 +1,34 @@
+// Copied from stack overflow lmao
+// (https://stackoverflow.com/questions/27936772/how-to-deep-merge-instead-of-shallow-merge)
+
+/**
+ * Simple object check.
+ * @param item
+ * @returns {boolean}
+ */
+export function isObject(item) {
+    return (item && typeof item === 'object' && !Array.isArray(item));
+}
+
+/**
+* Deep merge two objects.
+* @param target
+* @param ...sources
+*/
+export function mergeDeep(target:object, ...sources) {
+    if (!sources.length) return target;
+    const source = sources.shift();
+
+    if (isObject(target) && isObject(source)) {
+        for (const key in source) {
+            if (isObject(source[key])) {
+                if (!target[key]) Object.assign(target, { [key]: {} });
+                mergeDeep(target[key], source[key]);
+            } else {
+                Object.assign(target, { [key]: source[key] });
+            }
+        }
+    }
+
+    return mergeDeep(target, ...sources);
+}