@dnax/core 0.74.8 → 0.75.0

package/app/hono.ts

@@ -44,6 +44,7 @@ import { csrf } from "hono/csrf";
 import { v4 } from "uuid";
 import type { SearchParams } from "meilisearch";
 import { utils } from "..";
+import { get } from "http";
 const app = new Hono();
 const API_PATH = "/api";
 
@@ -95,6 +96,7 @@ function HonoInstance(): typeof app {
       // blackList: Cfg.server?.ipBlackList || [],
     })
   );
+
   app.use(secureHeaders());
   //app.use(compress());
 
@@ -172,7 +174,7 @@ function HonoInstance(): typeof app {
     });
   });
 
-  // Access controle for api
+  // Access controle for API
   app.use(cleanPath(API_PATH), async (c, next) => {
     let session = sessionStorage();
 
@@ -317,8 +319,9 @@ function HonoInstance(): typeof app {
       }
       const service = getService(name, c.var["tenant-id"]);
       const col = getCollection(collection, c.var["tenant-id"]);
-      // Controlle action
-      if (!getAction(action)) {
+
+      // Controlle des actions à mener
+      if (!getAction(action) && !col?.customApi?.hasOwnProperty(action)) {
         throw new ContextError(`Action ${action} not found`, 400);
       }
 
@@ -330,12 +333,6 @@ function HonoInstance(): typeof app {
         c: c,
       });
 
-      if (action == "execToolkit") {
-        let tookit = toolkit;
-
-        return;
-      }
-
       if (action == "execService") {
         // Exec service
         if (!service) return fn.error("Service not found", 404);
@@ -357,7 +354,7 @@ function HonoInstance(): typeof app {
         return c.json(response);
       }
 
-      if (!getAction(action) || !collection) {
+      if (!collection) {
         throw new ContextError(`Collection ${collection} not found`, 404);
       }
 
@@ -660,6 +657,10 @@ function HonoInstance(): typeof app {
           response = await rest.insertOne(collection, body?.data || {});
         }
 
+        if (!getAction(action) && col?.customApi?.hasOwnProperty(action)) {
+          response = await rest.customApi(collection, action, body?.data || {});
+        }
+
         if (action == "insertMany") {
           response = await rest.insertMany(collection, body?.data || {});
         }

package/driver/mongo/rest.ts

@@ -2183,6 +2183,7 @@ class useRest {
         let useCustomApi = options?.useCustomApi ?? this.#useCustomApi;
 
         let col = getCollection(collection, this.#tenant_id);
+        if (!col) return fn.error(`Collection ${collection} not found`, 404);
         let sharedData = {};
         if (col?.hooks?.beforeOperation && useHook) {
           await col.hooks.beforeOperation({
@@ -2346,6 +2347,42 @@ class useRest {
       }
     });
   }
+
+  /**
+   * Custom API function
+   * @param collection
+   * @param action
+   * @param data
+   * @returns
+   */
+  async customApi(collection: string, action: string, data: object) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        let col = getCollection(collection, this.#tenant_id);
+        if (!col) return fn.error(`Collection ${collection} not found`, 404);
+        if (col?.customApi?.[action]) {
+          let result = await col?.customApi?.[action]({
+            error: fn.error,
+            io: Cfg.io,
+            session: sessionStorage(),
+            data: toJson(data),
+            rest: new useRest({
+              session: this.#session,
+              useHook: false,
+              tenant_id: this.#tenant_id,
+              useCustomApi: false,
+            }),
+          });
+          resolve(result);
+        } else {
+          return fn.error(`Action ${action} not found`, 404);
+        }
+      } catch (err) {
+        return reject(err);
+      }
+    });
+  }
+
   async deleteMany(
     collection: string,
     ids: Array<string>,
@@ -2359,6 +2396,7 @@ class useRest {
 
         let sharedData = {};
         let col = getCollection(collection, this.#tenant_id);
+        if (!col) return fn.error(`Collection ${collection} not found`, 404);
         if (col?.hooks?.beforeOperation && useHook) {
           await col.hooks.beforeOperation({
             sharedData: sharedData,

package/driver/mongo/utils.ts

@@ -340,10 +340,14 @@ async function randomCode(
         excludeSymbols: f?.random?.excludeSymbols || [],
       });
 
-      if (f?.random?.startWith) {
+      if (f?.random?.startWith && typeof f?.random?.startWith == "string") {
         code = f?.random?.startWith + code;
       }
 
+      if (f?.random?.startWith && typeof f?.random?.startWith == "function") {
+        code = f?.random?.startWith(code);
+      }
+
       if (f?.random?.endWith) {
         code = code + f?.random?.endWith;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnax/core",
-  "version": "0.74.8",
+  "version": "0.75.0",
   "module": "index.ts",
   "type": "module",
   "bin": {},
@@ -34,14 +34,14 @@
     "dot-object": "2.1.5",
     "fs-extra": "^11.2.0",
     "generate-unique-id": "^2.0.3",
-    "hono": "4.9.5",
+    "hono": "4.10.0",
     "joi": "17.13.3",
     "json-joy": "16.8.0",
     "jsonwebtoken": "^9.0.2",
     "mime-types": "^2.1.35",
     "minio": "^8.0.5",
     "moment": "^2.30.1",
-    "mongodb": "6.18.0",
+    "mongodb": "6.20.0",
     "nodemailer": "^7.0.5",
     "ora": "^8.2.0",
     "pidusage": "^4.0.0",
@@ -51,6 +51,6 @@
     "ssh2": "^1.16.0",
     "ufo": "^1.5.4",
     "urlencode": "^2.0.0",
-    "uuid": "^11.1.0"
+    "uuid": "^13.0.0"
   }
 }

package/types/index.ts

@@ -323,6 +323,8 @@ export type Collection = {
     })=>Promise<any>;
   };
   customApi?: {
+    [key:string]:(ctx:ctxApi)=>any;
+    } & {
     aggregate?: (ctx: ctxApi) => Array<object> | null | undefined | typeof fn.error;
     insertOne?: (ctx: ctxApi) => object | null | undefined | typeof fn.error;
     insertMany?: (ctx: ctxApi) => Array<any> | null | undefined | typeof fn.error;
@@ -373,7 +375,9 @@ export type Collection = {
     beforeListActivity?: hooksCtx;
     afterListActivity?: hooksCtx;
   };
-  access?: {
+  access?:{
+    [key:string]:accessCtx;
+  } &{
     "*"?: accessCtx;
     beforeAction?: accessCtx;
     allAction?: accessCtx;
@@ -737,10 +741,7 @@ export type endpointCtx = {
     serveStatic:typeof serveStatic ;
     rest: InstanceType<typeof useRest>;
     io: socketIoType;
-    router: {
-      post: (path: string, clb: (c: Context) => any) => {};
-      get: (path: string, clb: (c: Context) => any) => {};
-    };
+    router: InstanceType<typeof Hono>;
   }) => any;
 };