@dnax/core 0.30.5 → 0.31.0

package/app/hono.ts

@@ -421,13 +421,12 @@ function HonoInstance(): typeof app {
               let allFiles = parseBody?.file;
               for await (let file of allFiles) {
                 let d;
-                if (Array.isArray(data)) {
+                if (Array.isArray(data) && data.length) {
                   d = data[indexedData];
                 } else {
                   d = data;
                 }
                 let insertedFile = await drive.write(file.name, file);
-
                 insertedFiles.push({
                   ...d,
                   _file: insertedFile,
@@ -464,23 +463,50 @@ function HonoInstance(): typeof app {
         }
         // find
         if (action == "find") {
-          let keyCache = bentoKey({
-            data: body,
-            query: c.req.query,
-          });
-          if (useCache) {
-            let responseFromCache = await cache.get(keyCache);
-            if (responseFromCache) {
-              response = responseFromCache;
-            } else {
-              response = await rest.find(collection, body?.params || {}, {
-                withMeta: body?.withMeta || false,
+          if (col?.cache?.enabled && useCache) {
+            let keyCache = bentoKey({
+              data: body,
+              query: c.req.query,
+            });
+
+            // if customCache
+            if (col?.cache?.customCache) {
+              let fetchFromCache = await col?.cache?.customCache({
+                action: action,
+                rest: rest,
+                session: sessionStorage(),
+                c: c,
               });
-              await cache.set({
+
+              if (!fetchFromCache.isStale) {
+                response = fetchFromCache.data;
+              } else {
+                response = await rest.find(collection, body?.params || {}, {
+                  withMeta: body?.withMeta || false,
+                });
+              }
+            }
+            // if not customCache
+            if (!col?.cache?.customCache) {
+              let responseFromCache = await cache.get({
                 key: keyCache,
-                value: response,
-                ttl: col?.cache?.ttl || "1m",
               });
+              if (responseFromCache) {
+                response = responseFromCache;
+              } else {
+                response = await rest.find(collection, body?.params || {}, {
+                  withMeta: body?.withMeta || false,
+                });
+                await cache.set({
+                  key: keyCache,
+                  value: response,
+                  ttl: col?.cache?.ttl || "1m",
+                });
+              }
+
+              /* response = await rest.find(collection, body?.params || {}, {
+                  withMeta: body?.withMeta || false,
+                }); */
             }
           } else {
             response = await rest.find(collection, body?.params || {}, {
@@ -581,6 +607,7 @@ function HonoInstance(): typeof app {
 
     // Obtenir le type MIME du fichier
     const mimeType = mime.lookup(filePath);
+
     // Si ce n'est pas une image, retourner le fichier original
     if (!mimeType || !mimeType?.startsWith("image/")) {
       const originalFile = fs.readFileSync(filePath);

package/package.json

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

package/types/index.ts

@@ -276,8 +276,27 @@ export type Collection = {
     findOne?: (ctx: ctxApi) => object;
     count?: (ctx: ctxApi) => number;
   };
+  /**
+   * Cache available for action 'find' | 'findOne'
+   */
   cache?: {
-    ttl?: string;
+    enabled?: boolean;
+    ttl: string;
+    triggerEvents: ["find", "findOne"];
+    /**
+     * Overwrite cache bahavior
+     * @param ctx
+     * @returns <any>
+     */
+    customCache?: (ctx: {
+      action: "find" | "findOne";
+      rest: InstanceType<typeof useRest>;
+      c: Context;
+      session: sessionCtx;
+    }) => {
+      isStale: boolean;
+      data: any;
+    };
   };
   schema?: object;
   auth?: {

package/utils/index.ts

@@ -10,6 +10,7 @@ import generateUniqueId from "generate-unique-id";
 import dayjs from "dayjs";
 import { Otp } from "../lib/opt";
 import collect from "collect.js";
+import mime from "mime-types";
 import * as uuid from "uuid";
 import * as urlencode from "urlencode";
 import dotJson from "dot-object";
@@ -108,11 +109,15 @@ function isDate(date: string): boolean {
   const dateRegex3 = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/;
   // le regex pour cette forme 2024-11-30T21:36:12+00:00
   const dateRegex4 = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+\d{2}:\d{2}$/;
+  const dateRegex5 = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\+\d{2}:\d{2}$/;
+  const dateRegex6 = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\+\d{2}$/;
   let isDate_ =
     !isNaN(Date.parse(date)) &&
     (dateRegex.test(date) ||
       dateRegex2.test(date) ||
       dateRegex4.test(date) ||
+      dateRegex5.test(date) ||
+      dateRegex6.test(date) ||
       dateRegex3.test(date));
   if (isDate_) return true;
   try {
@@ -369,6 +374,7 @@ const password = {
 
 const contextError = ContextError;
 export {
+  mime,
   dotJson,
   uuid,
   pick,