@dnax/core 0.10.2 → 0.10.4

package/app/hono.ts

@@ -75,10 +75,9 @@ function HonoInstance(): typeof app {
     if (typeof Cfg?.server?.logger == "boolean" && Cfg?.server?.logger) {
       app.use(async (c, next) => {
         let ip =
-          c.req.header("cf-connecting-ip") ||
-          c.req.header("x-forwarded-for") ||
-          c.req.header("x-client-ip") ||
-          c.req.header("x-forwarded-for");
+          c.req.raw.headers?.get("CF-Connecting-IP") ||
+          c.req.raw.headers?.get("x-forwarded-for") ||
+          c.req.raw.headers?.get("x-real-ip");
         const origin =
           c.req?.header("Origin") || c.req.raw?.headers?.get("Origin") || "";
         const info = getConnInfo(c);
@@ -146,11 +145,6 @@ function HonoInstance(): typeof app {
   //eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjoibm9tIiwiaWF0IjoxNzE3Nzc0MDQzLCJleHAiOjE3MTc3NzQxMDN9.Ud4-0y8pa4SMIcSn8PU1A-sjC-hT4ZVe_u3AdChyIJU
   // Middlewares Injection
   app.use(async (c, next) => {
-    let IP_ =
-      c.req.header("cf-connecting-ip") ||
-      c.req.header("x-forwarded-for") ||
-      c.req.header("x-client-ip") ||
-      c.req.header("x-forwarded-for");
     return asyncLocalStorage.run(new Map(), async () => {
       let cookie = getCookie(c);
       let secretKeyStudio = cookie["_STUDIO_SECRET_KEY_"] || null;
@@ -171,7 +165,10 @@ function HonoInstance(): typeof app {
 
       let _v = {
         token: token || null,
-        ip: IP_,
+        ip:
+          c.req.raw.headers?.get("CF-Connecting-IP") ||
+          c.req.raw.headers?.get("x-forwarded-for") ||
+          c.req.raw.headers?.get("x-real-ip"),
         isAuth: valid ? true : false,
         reqAt: moment().format().toString(),
         setAt: sessionData?._v?.setAt || null,

package/config/index.ts

@@ -24,7 +24,8 @@ const Cfg: Config = {
 
 function setCfg(config: Config) {
   Cfg.server = config.server;
-  Cfg.tenants = config.tenants;
+  Cfg.tenants = config?.tenants;
+  Cfg.email = config?.email;
 
   Cfg.studio = {
     enabled: config.studio?.enabled ?? false,
@@ -56,7 +57,7 @@ async function loadCfg() {
     .then((inject: { default: Config }) => {
       // Cfg.tenants = inject.default?.tenants || [];
       // Cfg.server = inject.default?.server || [];
-      ///console.log(inject.default);
+
       setCfg(inject.default);
       //console.log(Cfg);
     })

package/index.ts

@@ -7,6 +7,7 @@ import define from "./define";
 import moment from "moment";
 import * as utils from "./utils";
 import { searchEngine } from "./lib/orama";
+import { dataCache } from "./lib/bento";
 
 /**
  *  v is internal data validation and based of Joi validation.
@@ -15,4 +16,4 @@ import { searchEngine } from "./lib/orama";
  */
 const v = Joi;
 
-export { runApp, define, utils, useRest, v, searchEngine };
+export { runApp, define, utils, useRest, v, searchEngine, dataCache };

package/lib/bento/index.ts

@@ -5,12 +5,19 @@ import { v4 } from "uuid";
 import fs from "fs-extra";
 import path from "path";
 const cacheDirectory = path.join(process.cwd(), "/.cache/system/");
-
+const cacheDirectoryData = path.join(process.cwd(), "/.cache/data/");
 if (!fs?.existsSync(cacheDirectory + "bentocache")) {
   fs.mkdirSync(cacheDirectory + "bentocache", {
     recursive: true,
   });
 }
+
+if (!fs?.existsSync(cacheDirectoryData + "bentocache")) {
+  fs.mkdirSync(cacheDirectory + "bentocache", {
+    recursive: true,
+  });
+}
+
 const systemCache = new BentoCache({
   default: "systemCache",
   stores: {
@@ -24,6 +31,19 @@ const systemCache = new BentoCache({
   },
 });
 
+const dataCache = new BentoCache({
+  default: "systemCache",
+  stores: {
+    systemCache: bentostore().useL2Layer(
+      fileDriver({
+        directory: cacheDirectoryData,
+        pruneInterval: "1h",
+        //maxSize: 100 * 1024 * 1024,
+      })
+    ),
+  },
+});
+
 const bentoCache = new BentoCache({
   default: "dnaxCache",
   stores: {
@@ -53,4 +73,4 @@ function bentoKey(data: object | string) {
 
 const sessionCache = systemCache.namespace("tokens");
 
-export { bentoCache, bentoKey, systemCache, sessionCache };
+export { bentoCache, bentoKey, systemCache, sessionCache, dataCache };

package/lib/mail.ts

@@ -109,7 +109,57 @@ function verifySmtpConnection(smtpConfig: emailConfigType["smtpOptions"]) {
   });
 }
 
+function send(
+  options: {
+    config?: emailConfigType;
+    mailOptions?: {
+      from?: string;
+      text?: string;
+      html?: string;
+      subject?: string;
+      to?: string | Array<string> | null | undefined;
+      replyTo?: string;
+      cc?: string | Array<string> | null | undefined;
+      bcc?: string | Array<string> | null | undefined;
+    };
+  } = {}
+) {
+  return new Promise(async (resolve, reject) => {
+    try {
+      const smtp = options?.config?.smtpOptions || Cfg.email?.smtpOptions;
+
+      const transport = createTransport({
+        ...smtp,
+      });
+
+      var response = await transport.sendMail({
+        from:
+          options?.mailOptions?.from ||
+          `${options?.config?.fromName || ""} <${
+            options?.config?.fromAddress || ""
+          }>`,
+        to: options?.mailOptions?.to || undefined,
+        subject: options?.mailOptions?.subject || "",
+        text: options?.mailOptions?.text || "",
+        html: options?.mailOptions?.html || "",
+        replyTo: options?.mailOptions?.replyTo || undefined,
+        cc: options?.mailOptions?.cc || undefined,
+        bcc: options?.mailOptions?.bcc || undefined,
+      });
+      resolve(response);
+    } catch (err) {
+      reject(err);
+    }
+  });
+}
+
+function getConfig() {
+  return Cfg?.email || {};
+}
+
 const email = {
+  getConfig,
+  send,
   sendEmail,
   sendLocalEmail,
   updateLocalEmailConfig,

package/package.json

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

package/types/index.ts

@@ -306,7 +306,7 @@ export type loggerFunction = (
     action?: string;
     collection?: string;
     cleanDeep?: boolean;
-    
+
     useCache?: boolean;
     method: string;
     url?: string;
@@ -477,8 +477,8 @@ export type Service = {
 
 export type emailConfigType = {
   provider: "smtp";
-  fromName: string;
-  fromAddress: string;
+  fromName?: string;
+  fromAddress?: string;
   smtpOptions?: {
     host: string;
     port: number;