Reuse deep merge method from shared options class in handler config c…

…lass

packages/rjs-handler/src/Config.ts

@@ -2,6 +2,7 @@ import { existsSync, readFileSync } from "fs";
 import { resolve } from "path";
 
 import { TJSON } from "./.shared/global.types";
+import { Options } from "./.shared/Options";
 
 import _config from "./_config.json";
 
@@ -15,23 +16,31 @@ export class Config {
 
 				continue;
 			}
-            
+			
 			sourceObj[key] = Config.deepMergeObjects(
                 targetObj[key] as TJSON, sourceObj[key] as TJSON
 			);
 		}
-        
+		
 		return { ...targetObj, ...sourceObj };
 	}
-
+	
 	private readonly obj: TJSON;
 
 	constructor(path: string, name?: string, forDev: boolean = false, defaultsObj: TJSON = {}) {
 		this.obj = defaultsObj;
-		this.obj = Config.deepMergeObjects(this.obj, this.parseFile(path, name));
-		this.obj = Config.deepMergeObjects(this.obj, this.parseFile(path, name, forDev ? _config.configNameInfixDev : _config.configNameInfixProd));
+		this.obj = new Options(
+			this.parseFile(path, name),
+			this.obj
+		).object;
+		this.obj = new Options(
+			this.parseFile(
+				path, name, forDev ? _config.configNameInfixDev : _config.configNameInfixProd
+			),
+			this.obj
+		).object;
 	}
-
+	
 	private parseFile(path: string, name: string, modeInfix?: string): TJSON {
 		const configFilePath: string = resolve(
 			path,

packages/rjs-handler/test/unit/_api.js

@@ -19,12 +19,18 @@ module.exports.request = async (sReq, headerFilters = null, hideBody = false, me
             sRes.headers = filteredHeaders;
         }
     }
+
     if(hideBody) {
         delete sRes.body;
     } else if(metaBody) {
         sRes.body = {
             length: sRes.body ? Buffer.byteLength(sRes.body) : 0
         };
+    } else {
+        try {
+            sRes.body = sRes.body.toString();
+            sRes.body = JSON.parse(sRes.body);
+        } catch {}
     }
 
     return sRes;

packages/rjs-handler/test/unit/get.test.js

@@ -13,7 +13,7 @@ new UnitTest("GET /")
         "Server": "rapidJS",
         "Content-Length": 12
     },
-    body: Buffer.from("TEST (index)")
+    body: "TEST (index)"
 });
 
 new UnitTest("GET /compress.txt")
@@ -60,5 +60,5 @@ new UnitTest("GET /out.txt (built)")
 }, []))
 .expect({
 	status: 200,
-	body: Buffer.from("O\nP1\nP2")
+	body: "O\nP1\nP2"
 });

packages/rjs-handler/test/unit/post.test.js

@@ -14,9 +14,9 @@ new UnitTest("POST /route1")
     headers: {
         "Content-Type": "application/json"
     },
-    body: Buffer.from(JSON.stringify({
+    body: {
         data: 3
-    }))
+    }
 });
 
 new UnitTest("POST /route1")
@@ -29,9 +29,9 @@ new UnitTest("POST /route1")
 }, []))
 .expect({
     status: 200,
-    body: Buffer.from(JSON.stringify({
-        data: "value"
-    }))
+    body: {
+        data: "value1"
+    }
 });
 
 new UnitTest("POST /route2")
@@ -44,9 +44,9 @@ new UnitTest("POST /route2")
 }, []))
 .expect({
     status: 200,
-    body: Buffer.from(JSON.stringify({
-        data: "value"
-    }))
+    body: {
+        data: "value2"
+    }
 });
 
 new UnitTest("POST /route2 (no body)")

packages/rjs-server/src/Instance.ts

@@ -6,6 +6,8 @@ import { Logger } from "./Logger";
 import { Cluster } from "@rapidjs.org/server-cluster";
 import { IHandlerOptions } from "@rapidjs.org/rjs-handler";
 
+import _config from "./_config.json";
+
 
 export function createInstance(options?: Partial<IHandlerOptions>, clusterSize?: IClusterSize): Promise<Instance> {
 	return new Promise((resolve) => {
@@ -25,7 +27,7 @@ export class Instance extends Cluster {
 			baseSize: options.dev ? 1 : (clusterSize ?? {}).threads
 		});
 
-		const logger: Logger = new Logger(options.cwd);
+		const logger: Logger = new Logger(join(options.cwd, _config.logsDirName));
 
 		this.on("stdout", (message: string) => logger.info(message));
 		this.on("stderr", (message: string) => logger.error(message));

packages/rjs-server/src/Logger.ts

@@ -12,7 +12,7 @@ export class Logger {
 
 	constructor(logsDirPath: string|null = null, silent: boolean = false) {
 		this.silent = silent;
-
+		
 		if(!logsDirPath) return;
 
 		this.logsDirPath = resolve(logsDirPath);

packages/rjs-server/src/_config.json

@@ -0,0 +1,3 @@
+{
+    "logsDirName": ".logs",
+}

packages/server-cluster/test/unit/cluster.test.js

@@ -16,7 +16,7 @@ new UnitTest("Cluster setup")
 
         const tids = new Set();
         for(let i = 0; i < ROUNDTRIP_AMOUNT; i++) {
-            new UnitTest(`Thread roundtrip (${i})`)
+            new UnitTest(`Cluster roundtrip (${i})`)
             .actual(async () => {
                 const sRes = await cluster.handleRequest({
                     sReq: `test:request:${i}`

packages/shared/Options.ts

@@ -19,9 +19,9 @@ export class Options<T> {
 		}
 		return targetObj;
 	};
-
-	private obj: T;
 
+	private obj: T;
+
 	constructor(obj: Partial<T>, defaultsObj: T) {
 		this.obj = Options.deepMerge(defaultsObj, obj) as T;
 	}