@dnax/core 0.25.1 → 0.27.0

package/app/index.ts

@@ -85,22 +85,24 @@ async function runApp(config?: configRunApp, clb?: Function) {
             process.env.NODE_ENV === "production"
               ? "production"
               : process.env?.NODE_ENV || "development"
-          }`.italic.blue.green + "\n";
-        info += `Server: http://localhost:${PORT}\n`.italic.blue;
+          }`.green + "\n";
+        info += `Server: http://localhost:${PORT}\n`.green;
+        //info += `Jwt Secret: ${Cfg.server.jwt?.secret}\n`.gray;
         info += `\n`;
         info += "TENANTS  :".gray.italic.underline;
         info += `\n`;
         Cfg.tenants?.map((t: any) => {
           info += `\n${t?.name?.blue || "_"} : ${t?.id?.green}`.italic;
         });
-        info += `\n`;
+        info += `\n\n`;
+        info += `🔄 ${new Date().toLocaleString()}`.gray;
 
         if (clb) clb();
 
         console.log(
           boxen(info, {
             borderStyle: "round",
-            title: `@dnax/server ${pkg.version}`.italic,
+            title: `@dnax/server ${pkg.version}`,
             padding: 1,
             dimBorder: true,
             titleAlignment: "center",

package/config/index.ts

@@ -1,13 +1,22 @@
 import { cors } from "hono/cors";
 import { Config } from "./../types/index";
 import type { Config } from "../types";
+
+import { systemCache } from "../lib/bento";
 import { Glob } from "bun";
 import path from "path";
+import { v4 } from "uuid";
+
 const ROOT_PATH = process.cwd();
 const Cfg: Config = {
+  clusterMode: false,
   cwd: process.cwd(),
   server: {
     port: 4000,
+    jwt: {
+      secret: null,
+      expiresIn: "7d",
+    },
   },
 
   tenants: [
@@ -22,22 +31,39 @@ const Cfg: Config = {
   ],
 };
 
-function setCfg(config: Config) {
+async function setCfg(config: Config) {
   if (!config?.clusterMode) Cfg.clusterMode = true;
   Cfg.clusterMode = config?.clusterMode ?? false;
-  Cfg.server = config.server;
+  Cfg.server = {
+    ...Cfg.server,
+    ...config.server,
+  };
   Cfg.tenants = config?.tenants;
   Cfg.email = config?.email;
 
-  Cfg.studio = {
-    enabled: config.studio?.enabled ?? false,
-    enableIps: config.studio?.enableIps ?? false,
-    whiteListIps: config.studio?.whiteListIps ?? [],
-    secretKey: config?.studio?.secretKey ?? "",
-  };
+  if (!Cfg?.server?.jwt?.expiresIn) {
+    Cfg["server"]["jwt"]["expiresIn"] = "7d";
+  }
+
+  if (!Cfg?.server?.jwt.secret && process?.env?.JWT_SECRET) {
+    Cfg.server.jwt.secret = process.env.JWT_SECRET;
+  }
+
+  if (!Cfg?.server?.jwt?.secret) {
+    let jwtSecret = await systemCache.get(".jwt.json");
+    if (!jwtSecret) {
+      jwtSecret = v4().replaceAll("-", "");
+      await systemCache.set({
+        key: ".jwt.json",
+        value: jwtSecret,
+      });
+    }
+    Cfg.server.jwt.secret = jwtSecret;
+  }
 
-  if (!Cfg.studio?.secretKey && Cfg?.studio?.enabled) {
-    console.error("Please provide  a studio secret key");
+  if (!Cfg?.server.jwt?.secret) {
+    console.error("JWT_SECRET is not defined");
+    process.exit(1);
   }
 
   if (!Cfg?.server.port) {
@@ -56,15 +82,15 @@ function setCfg(config: Config) {
 async function loadCfg() {
   let configPath = process.cwd() + `/config/app.ts`;
   await import(path.join(configPath))
-    .then((inject: { default: Config }) => {
+    .then(async (inject: { default: Config }) => {
       // Cfg.tenants = inject.default?.tenants || [];
       // Cfg.server = inject.default?.server || [];
 
-      setCfg(inject.default);
+      await setCfg(inject.default);
       //console.log(Cfg);
     })
     .catch((err) => {
-      console.error("/config/app.ts not set ");
+      console.error("/config/app.ts ::", err?.message);
     });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.25.1",
+  "version": "0.27.0",
   "module": "index.ts",
   "type": "module",
   "bin": {

package/types/index.ts

@@ -414,6 +414,10 @@ export type Config = {
     logger?: Boolean | loggerFunction;
     whiteListIps?: Array<string>;
     blackListIps?: string[];
+    jwt?: {
+      secret: string;
+      expiresIn?: string;
+    };
     cors?: {
       origin:
         | string[]

package/utils/index.ts

@@ -4,6 +4,7 @@ import { mapKeys } from "radash";
 import { cleanDoubleSlashes } from "ufo";
 import path from "path";
 import { parse, format } from "@lukeed/ms";
+import { Cfg } from "../config";
 import jwto from "jsonwebtoken";
 import generateUniqueId from "generate-unique-id";
 import dayjs from "dayjs";
@@ -15,7 +16,9 @@ import dotJson from "dot-object";
 import deepCopy from "deepcopy";
 import { applyPatch, createPatch, Pointer } from "rfc6902";
 
-const JWT_SECRET = process?.env?.JWT_SECRET || "secret-libv";
+
+const JWT_SECRET = process?.env?.JWT_SECRET || null;
+
 import * as _ from "radash";
 import { email } from "../lib/mail";