@dnax/core 0.17.1 → 0.17.3

package/app/hono.ts

@@ -37,6 +37,7 @@ import { getTenant } from "../lib/tenant";
 import { checkPermission, getPermission } from "../lib/permissions";
 import { ipRestriction } from "hono/ip-restriction";
 import { logger } from "hono/logger";
+import { csrf } from "hono/csrf";
 import { v4 } from "uuid";
 const cache = bentoCache.namespace("DNAX_API");
 const app = new Hono();
@@ -52,6 +53,8 @@ function HonoInstance(): typeof app {
     })
   );
 
+  app.use(csrf());
+
   app.use(
     ipRestriction(getConnInfo, {
       allowList: Cfg?.server?.whiteListIps || [],
@@ -427,8 +430,11 @@ function HonoInstance(): typeof app {
           response = await rest.aggregate(collection, body.pipeline || []);
         }
 
-        // udpateOne
-
+        // count
+        if (action == "count") {
+          response = await rest.count(collection, body?.params || {});
+        }
+        // find
         if (action == "find") {
           let keyCache = bentoKey({
             data: body,
@@ -439,7 +445,9 @@ function HonoInstance(): typeof app {
             if (responseFromCache) {
               response = responseFromCache;
             } else {
-              response = await rest.find(collection, body?.params || {});
+              response = await rest.find(collection, body?.params || {}, {
+                withMeta: body?.withMeta || false,
+              });
               await cache.set({
                 key: keyCache,
                 value: response,
@@ -447,7 +455,9 @@ function HonoInstance(): typeof app {
               });
             }
           } else {
-            response = await rest.find(collection, body?.params || {});
+            response = await rest.find(collection, body?.params || {}, {
+              withMeta: body?.withMeta || false,
+            });
           }
         }
         if (action == "findOne") {

package/app/studio.ts

@@ -13,8 +13,11 @@ function setApiStudio(app: InstanceType<typeof Hono>) {
         "tenant_id",
       ]);
     });
+
     let config = {
       collections: collections,
+      serverId: Cfg.server?.id,
+      tenantId: c?.req?.header()["tenant-id"],
     };
 
     return c.json(config);

package/define/index.ts

@@ -18,7 +18,19 @@ import { Cfg } from "../config/";
 import { deepMerge, freeze } from "../utils";
 import { config } from "valibot";
 
-function Config(config: Config) {
+function Config(
+  config: Omit<
+    Config,
+    | "permissions"
+    | "cwd"
+    | "collections"
+    | "endpoints"
+    | "services"
+    | "crons"
+    | "routes"
+    | "sockets"
+  >
+) {
   return config;
 }
 

package/driver/mongo/connect.ts

@@ -20,7 +20,7 @@ async function connectToMongo(t: Tenant) {
         resolve(t);
       })
       .catch((error) => {
-        console.error(error?.message);
+        console.error(`Failed to connect Tenant ${t.id} : `, error?.message);
         t.database.isConnected = false;
       });
 

package/driver/mongo/rest.ts

@@ -41,6 +41,7 @@ type optionCb = {
   cleanDeep?: boolean;
   useCustomApi?: boolean;
   elementAt?: Number | null;
+  withMeta?: boolean;
 };
 
 type QueryBatchType<T extends "findOne" | "find"> = {
@@ -550,12 +551,18 @@ class useRest {
     collection: string,
     params: findParam,
     options?: optionCb
-  ): Promise<object[]> {
+  ): Promise<
+    object[] | { data: object[]; meta: { total: number; count: number } }
+  > {
     return new Promise(async (resolve, reject) => {
       try {
         if (options?.cleanDeep) {
           params = cleanDeep(params);
         }
+        let meta: { total: number; count: number } = {
+          total: 0,
+          count: 0,
+        };
         let useHook = options?.useHook ?? this.#useHook;
         let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
         let sharedData = {};
@@ -641,12 +648,39 @@ class useRest {
         if (typeof options?.elementAt == "number" && options?.elementAt) {
           resultDocs = resultDocs[options?.elementAt] ?? null;
         }
+
+        if (options?.withMeta) {
+          meta.count = await this.#tenant.database.db
+            ?.collection(collection)
+            .countDocuments({
+              ...(params?.$match || {}),
+            })
+            .then((e) => e || 0)
+            .catch((err) => 0);
+          meta.total = await this.#tenant.database.db
+            ?.collection(collection)
+            .estimatedDocumentCount();
+
+          return resolve({
+            data: resultDocs,
+            meta: meta,
+          });
+        }
+
         return resolve(resultDocs);
       } catch (err) {
         return reject(err);
       }
     });
   }
+  /**
+   *
+   * @param collection
+   * @param params
+   * @param options
+   * @returns
+   */
+
   async findOne(
     collection: string,
     id: string,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.17.1",
+  "version": "0.17.3",
   "module": "index.ts",
   "type": "module",
   "bin": {
@@ -12,7 +12,9 @@
     "@types/mime-types": "^2.1.4",
     "@types/nodemailer": "^6.4.15",
     "@types/pidusage": "^2.0.5",
-    "@types/uuid": "^10.0.0"
+    "@types/uuid": "^10.0.0",
+    "@types/dot-object": "^2.1.6",
+    "@types/jsonwebtoken": "9.0.6"
   },
   "peerDependencies": {
     "typescript": "^5.0.0"
@@ -21,28 +23,23 @@
     "@clack/prompts": "^0.7.0",
     "@colors/colors": "^1.6.0",
     "@lukeed/ms": "^2.0.2",
-    "@mistralai/mistralai": "^1.3.4",
     "@orama/orama": "^2.0.23",
-    "@types/dot-object": "^2.1.6",
-    "@types/jsonwebtoken": "^9.0.6",
     "bentocache": "^1.0.0-beta.9",
     "boxen": "^7.1.1",
-    "chokidar": "^3.6.0",
+    "chokidar": "3.6.0",
     "clean-deep": "^3.4.0",
-    "cohere-ai": "^7.14.0",
     "collect.js": "^4.36.1",
     "consola": "^3.2.3",
     "cookie": "^0.6.0",
-    "croner": "^8.1.1",
+    "croner": "8.1.1",
     "deepcopy": "^2.1.0",
     "docxtemplater": "^3.54.1",
-    "dot-object": "^2.1.5",
+    "dot-object": "2.1.5",
     "find-open-port": "^2.0.3",
     "fs-extra": "^11.2.0",
     "generate-unique-id": "^2.0.3",
-    "groq-sdk": "^0.8.0",
-    "hono": "^4.6.3",
-    "joi": "^17.13.3",
+    "hono": "4.6.14",
+    "joi": "17.13.3",
     "json-joy": "16.8.0",
     "jsonwebtoken": "^9.0.2",
     "libreoffice-convert": "^1.6.0",
@@ -51,8 +48,6 @@
     "moment": "^2.30.1",
     "mongodb": "^6.11.0",
     "nodemailer": "^6.9.14",
-    "ollama": "^0.5.10",
-    "openai": "^4.73.1",
     "pidusage": "^3.0.2",
     "pizzip": "^3.1.7",
     "radash": "^12.1.0",

package/types/index.ts

@@ -371,6 +371,7 @@ export type Config = {
   };
 
   server: {
+    id?: string;
     logger?: Boolean | loggerFunction;
     whiteListIps?: Array<string>;
     blackListIps?: string[];
@@ -445,7 +446,8 @@ export type Q = {
     | "auth"
     | "upload"
     | "execService"
-    | "batch";
+    | "batch"
+    | "count";
 };
 
 export type routeOption = {