@dnax/core 0.30.0 → 0.30.2

package/config/index.ts

@@ -1,7 +1,7 @@
 import { cors } from "hono/cors";
 import { Config } from "./../types/index";
 import type { Config } from "../types";
-
+import fs from "fs-extra";
 import { systemCache } from "../lib/bento";
 import { Glob } from "bun";
 import path from "path";
@@ -58,6 +58,7 @@ async function setCfg(config: Config) {
       await systemCache.set({
         key: ".jwt.json",
         value: jwtSecret,
+        ttl: "2y",
       });
     }
     Cfg.server.jwt.secret = jwtSecret;

package/driver/mongo/rest.ts

@@ -631,6 +631,19 @@ class useRest {
 
         result.docs = toJson(result.docs);
 
+        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();
+        }
+
         if (col?.hooks?.afterFind && useHook) {
           await col.hooks.afterFind({
             sharedData: sharedData,
@@ -638,6 +651,7 @@ class useRest {
             io: Cfg.io,
             driver: "mongodb",
             action: "find",
+            meta: meta,
             count: result?.docs?.length || 0,
             params: params,
             session: sessionStorage(),
@@ -656,17 +670,6 @@ class useRest {
         }
 
         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,

package/lib/bento/index.ts

@@ -21,6 +21,7 @@ if (!fs?.existsSync(path.resolve(cacheDirectoryData + "bentocache"))) {
 
 const systemCache = new BentoCache({
   default: "systemCache",
+
   stores: {
     systemCache: bentostore().useL2Layer(
       fileDriver({

package/package.json

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

package/types/index.ts

@@ -200,6 +200,7 @@ export type hooksCtx = (ctx: {
   sharedData?: any;
   action?: Actions;
   c?: Context;
+  meta?: { total: number; count: number; [key: string]: any };
   rest: InstanceType<typeof useRest>;
   session?: sessionCtx;
   io: socketIoType;