Make config easier to work with

Author: garrettjoecox

command.ts

@@ -2,6 +2,7 @@ import { Config } from "./config.ts";
 import { JavaServer, JavaServerEvents } from "./java_server.ts";
 import get from "https://deno.land/x/[email protected]/src/object/get.ts";
 import { useEvents } from "./events.ts";
+import { defaultsDeep } from "./defaults_deep.ts";
 
 interface CommandEvent {
   player: string;
@@ -49,8 +50,7 @@ export function useCommand(javaServer: JavaServer) {
 
   useEvents(javaServer);
 
-  // @ts-ignore
-  javaServer.config = { command: DEFAULT_CONFIG, ...javaServer.config };
+  defaultsDeep(javaServer.config, { command: DEFAULT_CONFIG });
   javaServer.config.command.initialized = true;
 
   const regex = new RegExp(

defaults_deep.ts

@@ -0,0 +1,22 @@
+export function defaultsDeep(
+  target: Record<string, any>,
+  ...sources: Record<string, any>[]
+) {
+  sources.forEach((source) => {
+    for (const key in source) {
+      if (target.hasOwnProperty(key)) {
+        if (!Array.isArray(source[key]) && typeof source[key] === "object") {
+          defaultsDeep(target[key], source[key]);
+        }
+      } else {
+        target[key] = source[key];
+      }
+    }
+  });
+
+  return target;
+}
+
+export type DeepPartial<T> = {
+  [P in keyof T]?: DeepPartial<T[P]>;
+};

events.ts

@@ -1,6 +1,7 @@
 import { Config } from "./config.ts";
 import { JavaServer, JavaServerEvents } from "./java_server.ts";
 import get from "https://deno.land/x/[email protected]/src/object/get.ts";
+import { defaultsDeep } from "./defaults_deep.ts";
 
 export interface EventsConfig {
   initialized: boolean;
@@ -139,8 +140,7 @@ export function useEvents(javaServer: JavaServer) {
     return;
   }
 
-  // @ts-ignore
-  javaServer.config = { events: DEFAULT_CONFIG, ...javaServer.config };
+  defaultsDeep(javaServer.config, { events: DEFAULT_CONFIG });
   javaServer.config.events.initialized = true;
 
   javaServer.on("console", (consoleLine) => {

java_server.ts

@@ -2,6 +2,7 @@ import { EventEmitter } from "https://deno.land/[email protected]/node/events.ts";
 import { iter } from "https://deno.land/[email protected]/io/util.ts";
 import { Config } from "./config.ts";
 import { Buffer } from "https://deno.land/[email protected]/node/buffer.ts";
+import { defaultsDeep, DeepPartial } from "./defaults_deep.ts";
 
 export interface JavaServerConfig {
   jar: string;
@@ -46,9 +47,11 @@ export class JavaServer extends EventEmitter {
   public config: Config;
   private process?: Deno.Process;
 
-  constructor(config: Partial<Config> = {}) {
+  constructor(config: DeepPartial<Config> = {}) {
     super();
-    this.config = { javaServer: DEFAULT_CONFIG, ...config } as Config;
+    this.config = defaultsDeep(config, {
+      javaServer: DEFAULT_CONFIG,
+    }) as Config;
 
     this.stdinIter();
   }

mod.ts

@@ -43,7 +43,11 @@ import { useUtils } from "./utils.ts";
 // Example of using ScriptServer, which is both JavaServer & RconConnection
 () => {
   try {
-    const scriptServer = new ScriptServer();
+    const scriptServer = new ScriptServer({
+      command: {
+        prefix: "!",
+      },
+    });
 
     useEvents(scriptServer.javaServer);
     useCommand(scriptServer.javaServer);
@@ -55,7 +59,9 @@ import { useUtils } from "./utils.ts";
       });
     });
 
-    scriptServer.start();
+    console.log(scriptServer.config);
+
+    // scriptServer.start();
   } catch (error) {
     console.error(error);
   }

rcon_connection.ts

@@ -2,6 +2,7 @@ import { EventEmitter } from "https://deno.land/[email protected]/node/events.ts";
 import { Buffer } from "https://deno.land/[email protected]/node/buffer.ts";
 import { iter } from "https://deno.land/[email protected]/io/util.ts";
 import { Config } from "./config.ts";
+import { defaultsDeep, DeepPartial } from "./defaults_deep.ts";
 
 export interface RconConnectionConfig {
   host: string;
@@ -32,9 +33,11 @@ export class RconConnection extends EventEmitter {
   private connection?: Deno.Conn;
   private execId: number = RequestPacketId.Exec;
 
-  constructor(config: Partial<Config> = {}) {
+  constructor(config: DeepPartial<Config> = {}) {
     super();
-    this.config = { rconConnection: DEFAULT_CONFIG, ...config } as Config;
+    this.config = defaultsDeep(config, {
+      rconConnection: DEFAULT_CONFIG,
+    }) as Config;
 
     this.tick();
   }

script_server.ts

@@ -2,6 +2,7 @@ import { EventEmitter } from "https://deno.land/[email protected]/node/events.ts";
 import { JavaServer } from "./java_server.ts";
 import { RconConnection } from "./rcon_connection.ts";
 import get from "https://deno.land/x/[email protected]/src/object/get.ts";
+import { defaultsDeep, DeepPartial } from "./defaults_deep.ts";
 import { Config } from "./config.ts";
 
 export interface ScriptServerConfig {
@@ -31,9 +32,12 @@ export class ScriptServer extends EventEmitter {
   public rconConnection: RconConnection;
   public config: Config;
 
-  constructor(config: Partial<Config> = {}) {
+  constructor(config: DeepPartial<Config> = {}) {
     super();
-    this.config = { scriptServer: DEFAULT_CONFIG, ...config } as Config;
+    console.log(config);
+    this.config = defaultsDeep(config, {
+      scriptServer: DEFAULT_CONFIG,
+    }) as Config;
     this.javaServer = new JavaServer(config);
     this.rconConnection = new RconConnection(config);
   }

utils.ts

@@ -1,6 +1,7 @@
 import { Config } from "./config.ts";
 import { RconConnection } from "./rcon_connection.ts";
 import get from "https://deno.land/x/[email protected]/src/object/get.ts";
+import { defaultsDeep } from "./defaults_deep.ts";
 
 export type Dimension =
   | "minecraft:overworld"
@@ -52,8 +53,7 @@ export function useUtils(rconConnection: RconConnection) {
     return;
   }
 
-  rconConnection.config = {
-    // @ts-ignore
+  defaultsDeep(rconConnection.config, {
     utils: {
       initialized: false,
       flavorSpecific: {
@@ -99,6 +99,7 @@ export function useUtils(rconConnection: RconConnection) {
               x: parseFloat(location![1]),
               y: parseFloat(location![2]),
               z: parseFloat(location![3]),
+              dimension: await this.getDimension(player),
             };
           },
           async teleport(target, location) {
@@ -114,9 +115,9 @@ export function useUtils(rconConnection: RconConnection) {
           },
         },
       },
-    },
-    ...rconConnection.config,
-  };
+    } as UtilsConfig,
+  });
+
   rconConnection.config.utils.initialized = true;
 
   rconConnection.utils = get(