Merging Pro to Dev

dev/playgrounds/ground1/index.ts

@@ -11,10 +11,6 @@ import { Router, JoorResponse } from 'joor';
 import Joor from 'joor';
 import path from 'node:path';
 
-process.env.JOOR_LOGGER_ENABLE_CONSOLE_LOGGING = 'false';
-process.env.JOOR_LOGGER_ENABLE_FILE_LOGGING = 'true';
-process.env.JOOR_RESPONSE_STREAM_CHUNK_SIZE = '200000';
-
 const app = new Joor();
 
 (async () => {

dev/playgrounds/ground1/joor.config.ts

@@ -1,9 +1,17 @@
-// import { JOOR_CONFIG } from 'joor';
-const config = {
+import { JOOR_CONFIG } from 'joor';
+const config: JOOR_CONFIG = {
   server: {
     port: 3000,
     host: 'localhost',
-    mode: 'http',
+    mode: 'tls',
+  },
+  mode: 'development',
+  logger: {
+    maxFileSize: 1024,
+    enable: {
+      file: true,
+      console: false,
+    },
   },
 };
 

src/core/config/configuration.ts

@@ -3,6 +3,8 @@ import path from 'node:path';
 
 import Jrror from '@/core/error/index';
 // import validateConfig from '@/helpers/validateConfig';
+import JoorError from '@/core/error/JoorError';
+import logger from '@/helpers/joorLogger';
 import JOOR_CONFIG from '@/types/config';
 
 /**
@@ -84,9 +86,8 @@ class Configuration {
     process.env.JOOR_LOGGER_ENABLE_CONSOLE_LOGGING =
       (Configuration.configData?.logger?.enable?.console?.toString() ??
       Configuration.configData?.mode === 'development')
-        ? 'true'
+        ? Configuration.configData?.logger?.enable?.console?.toString()
         : 'false';
-
     if (Configuration.configData?.env?.values) {
       const keys = Object.keys(Configuration.configData.env.values);
       keys.forEach((key) => {
@@ -103,7 +104,15 @@ class Configuration {
   public async getConfig(): Promise<JOOR_CONFIG> {
     // Load the configuration data if not already loaded
     if (Configuration.configData === null) {
-      await this.loadConfig();
+      try {
+        await this.loadConfig();
+      } catch (error: unknown) {
+        if (error instanceof Jrror || error instanceof JoorError) {
+          error.handle();
+        } else {
+          logger.error(error);
+        }
+      }
     }
 
     return Configuration.configData as JOOR_CONFIG;

src/data/joor.ts

@@ -1,5 +1,5 @@
 const joorData = {
-  docs: 'https://joor.xyz/docs',
+  docs: 'https://joor.socioy.com',
   currentVersion: '0.1',
   docsVersion: 'v1',
 };

src/index.ts

@@ -6,6 +6,7 @@ import { httpLogger, cors, serveStaticFiles } from '@/middlewares';
 import env from '@/packages/env';
 import Logger from '@/packages/logger';
 import marker from '@/packages/marker';
+import JOOR_CONFIG from '@/types/config';
 import { JoorRequest } from '@/types/request';
 import { ROUTE_HANDLER } from '@/types/route';
 
@@ -29,4 +30,4 @@ export {
 };
 
 // export types
-export { JoorRequest, ROUTE_HANDLER };
+export { JoorRequest, ROUTE_HANDLER, JOOR_CONFIG };

src/packages/logger/logger.ts

@@ -46,6 +46,7 @@ class Logger {
       // Ensure that the log file has a .log extension
       this.path = `${this.path}.log`;
     }
+    this.originalPath = this.path;
     this.formatCallBack = formatCallBack ?? this.formatCallBack; // Custom format callback, default is basic timestamped message
     // Start interval to flush logs every 10 seconds by default
     this.flushInterval = setInterval(() => {
@@ -61,6 +62,7 @@ class Logger {
   // Default configuration for the logger
   private name = 'logger'; // Default logger name
   private path = nodePath.resolve(process.cwd(), 'logs.log'); // Default path for the log file
+  private originalPath = this.path; // Store the original path for potential future use
   private formatCallBack: LOGGER_FORMAT_CALLBACK = (
     timestamp: LOGGER_TIMESTAMP,
     message: LOGGER_MESSAGE
@@ -143,7 +145,7 @@ class Logger {
 
           if (fileStats.size > maxFileSize) {
             // if file size exceeds 10MB, write to a new file
-            this.path = this.path.replace(
+            this.path = this.originalPath.replace(
               '.log',
               `-${new Date().toISOString()}.log`
             );