@dnax/core 0.4.9 → 0.5.1

package/app/hono.ts

@@ -20,16 +20,35 @@ import { pick } from "radash";
 import { secureHeaders } from "hono/secure-headers";
 import { getTenant } from "../lib/tenant";
 import { checkPermission, getPermission } from "../lib/permissions";
+import { ipRestriction } from "hono/ip-restriction";
+import { logger } from "hono/logger";
 const app = new Hono();
 
 const API_PATH = "/api";
 function HonoInstance(): typeof app {
+  if (Cfg?.server?.logger) {
+    if (typeof Cfg?.server?.logger == "function") {
+      app.use(async (c, next) => {
+        Cfg?.server?.logger(c);
+        return await next();
+      });
+    }
+    if (typeof Cfg?.server?.logger == "boolean") {
+      app.use(logger());
+    }
+  }
+  app.use(
+    ipRestriction(getConnInfo, {
+      allowList: Cfg?.server?.whiteListIps || [],
+      denyList: Cfg?.server?.blackListIps || [],
+      // blackList: Cfg.server?.ipBlackList || [],
+    })
+  );
   app.use(secureHeaders());
-
   app.use(
     cors({
       origin: Cfg.server?.cors?.origin || [],
-      credentials: true,
+      credentials: Cfg.server?.cors?.credentials || true,
     })
   );
   //eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjoibm9tIiwiaWF0IjoxNzE3Nzc0MDQzLCJleHAiOjE3MTc3NzQxMDN9.Ud4-0y8pa4SMIcSn8PU1A-sjC-hT4ZVe_u3AdChyIJU
@@ -41,8 +60,11 @@ function HonoInstance(): typeof app {
       let session = sessionStorage();
       var token = jwt.getToken("Bearer", c.req.header()["authorization"]) || "";
       var { decode, valid, error } = jwt.verify(token);
-      c.set("_STUDIO_SECRET_KEY_", secretKeyStudio);
-      c.set("isStudio", isStudio(secretKeyStudio));
+      if (valid && decode?.studio) {
+        // FIX STUDIO INFO
+        c.set("_STUDIO_SECRET_KEY_", secretKeyStudio);
+        c.set("isStudio", isStudio(secretKeyStudio));
+      }
       let _v = {
         token: token || null,
         ip:
@@ -379,7 +401,7 @@ function HonoInstance(): typeof app {
 
       return c.json(response);
     } catch (err: any) {
-      // if (Cfg?.debug) console.log(err?.message);
+      if (Cfg?.debug) console.log(err?.message | err);
       if (err?.code && (err?.code < 200 || err?.code > 599)) {
         err.code = 409;
       }
@@ -390,9 +412,10 @@ function HonoInstance(): typeof app {
     }
   });
 
-  app.post("/api/studio", (c, next) => {
+  app.post("/api/studio", async (c, next) => {
     let cookie = getCookie(c);
-    let secretKeyStudio = cookie["_STUDIO_SECRET_KEY_"];
+    let body = await c?.req?.json();
+    let secretKeyStudio = body?.secret || cookie["_STUDIO_SECRET_KEY_"];
     let canPerform = isStudio(secretKeyStudio);
     let cf = {
       collections: Cfg.collections?.map((c) =>
@@ -405,6 +428,7 @@ function HonoInstance(): typeof app {
       return c.json({
         auth: true,
         data: cf,
+        token: jwt.sign({ studio: true }),
       });
     } else {
       c.status(403);

package/lib/orama/index.ts

@@ -87,4 +87,11 @@ class searchEngine {
   }
 }
 
+const engine = new searchEngine({
+  schema: {},
+  store: {
+    filename: "data.db",
+  },
+});
+
 export { searchEngine };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.4.9",
+  "version": "0.5.1",
   "module": "index.ts",
   "type": "module",
   "bin": {
@@ -29,7 +29,7 @@
     "find-open-port": "^2.0.3",
     "fs-extra": "^11.2.0",
     "generate-unique-id": "^2.0.3",
-    "hono": "^4.5.4",
+    "hono": "^4.5.9",
     "joi": "^17.13.3",
     "json-joy": "^16.8.0",
     "jsonwebtoken": "^9.0.2",

package/types/index.ts

@@ -294,6 +294,8 @@ export type Collection = {
   }>;
 };
 
+export type loggerFunction = (c: Context) => void;
+
 export type Config = {
   email?: {
     provider: "smtp";
@@ -335,8 +337,12 @@ export type Config = {
   };
 
   server: {
+    logger?: Boolean | loggerFunction;
+    whiteListIps?: Array<string>;
+    blackListIps?: Array<string>;
     cors?: {
       origin: string[];
+      credentials?: boolean;
     };
     socket?: {
       /**