@dnax/core 0.52.4 → 0.54.0

package/app/ctrl.ts

@@ -1,6 +1,6 @@
 import type { Q } from "../types/";
 const actions = [
-  "findOneAndUpdate",
+  // "findOneAndUpdate",
   "findOne",
   "find",
   "insertOne",

package/app/hono.ts

@@ -295,6 +295,10 @@ 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)) {
+        throw new ContextError(`Action ${action} not found`, 400);
+      }
 
       useCache = stringToBoolean(useCache, false);
       if (body?.useCache) useCache = stringToBoolean(body.useCache, false);
@@ -304,11 +308,6 @@ function HonoInstance(): typeof app {
         c: c,
       });
 
-      // Controlle action
-      if (!getAction(action)) {
-        throw new ContextError(`Action ${action} not found`, 400);
-      }
-
       if (action == "execToolkit") {
         let tookit = toolkit;
 

package/driver/mongo/rest.ts

@@ -4,7 +4,13 @@ import { getCollection, getKeyFields } from "../../lib/collection";
 import { getTenant } from "../../lib/tenant";
 import type { Actions, Collection, Tenant } from "./../../types/index";
 import { isArray, omit } from "radash";
-import { ChangeStream, ClientSession, MongoClient, ObjectId } from "mongodb";
+import {
+  ChangeStream,
+  ClientSession,
+  MongoClient,
+  ObjectId,
+  type FilterOperations,
+} from "mongodb";
 import { contextError, fn, toJson, dotJson, getEntryBykeys } from "../../utils";
 import v, { type Schema } from "joi";
 import type { Context } from "hono";
@@ -114,7 +120,32 @@ class useRest {
       save: async (activityInput) => {
         return await restActivity.save(this.#tenant, activityInput);
       },
-      list: async (activityFilter) => {
+      list: async (
+        activityFilter
+      ): Promise<
+        {
+          [key: string]: any;
+          collection: string;
+          action: string;
+          transaction: boolean;
+          internal: boolean;
+          ip: string;
+          auth: boolean;
+          role: string;
+          user: string;
+          state: any;
+          createdAt: string;
+          updatedAt: string;
+          _id: string;
+          data: {
+            ids?: string[];
+            data?: any;
+            id?: string;
+            update?: updateParams;
+            filter?: any;
+          };
+        }[]
+      > => {
         return await restActivity
           .list(this.#tenant, activityFilter || {})
           .then((e) => e)
@@ -378,18 +409,6 @@ class useRest {
             }),
           });
         }
-        restActivity.save(this.#tenant, {
-          collection: collection,
-          data: {
-            input: data,
-          },
-          transaction: this.#session ? true : false,
-          action: "insertOne",
-          user:
-            sessionStorage()?.get()?.state?.user ||
-            sessionStorage()?.get()?.state?.by ||
-            null,
-        });
 
         try {
           col?.cache?.watch({
@@ -412,6 +431,23 @@ class useRest {
             .addDocuments([toJson(data)])
             .catch();
         }
+
+        // if action done
+        restActivity.save(this.#tenant, {
+          collection: collection,
+          data: {
+            data: data,
+            id: data?._id,
+          },
+          transaction: this.#session ? true : false,
+          action: "insertOne",
+          internal: sessionStorage()?.get() ? false : true,
+          ip: sessionStorage()?.get()?._v?.ip,
+          auth: sessionStorage()?.get()?.isAuth,
+          role: sessionStorage()?.get()?.role!,
+          user: sessionStorage()?.get()?.state?.user,
+          state: sessionStorage()?.get()?.state,
+        });
         return resolve(toJson(data));
       } catch (err) {
         return reject(err);
@@ -520,18 +556,7 @@ class useRest {
             }),
           });
         }
-        restActivity.save(this.#tenant, {
-          collection: collection,
-          data: {
-            input: toJson(data),
-          },
-          action: "insertMany",
-          transaction: this.#session ? true : false,
-          user:
-            sessionStorage()?.get().state?.user ||
-            sessionStorage()?.get().state?.by ||
-            null,
-        });
+
         try {
           col?.cache?.watch({
             action: "insertMany",
@@ -551,6 +576,22 @@ class useRest {
             .addDocuments(toJson(data))
             .catch();
         }
+        // if insertMany done
+        restActivity.save(this.#tenant, {
+          collection: collection,
+          data: {
+            data: toJson(data),
+            ids: data?.map((e) => e?._id),
+          },
+          action: "insertMany",
+          transaction: this.#session ? true : false,
+          internal: sessionStorage()?.get() ? false : true,
+          ip: sessionStorage()?.get()?._v?.ip,
+          auth: sessionStorage()?.get()?.isAuth,
+          role: sessionStorage()?.get()?.role!,
+          user: sessionStorage()?.get()?.state?.user,
+          state: sessionStorage()?.get()?.state,
+        });
         return resolve(toJson(data));
       } catch (err) {
         reject(err);
@@ -1137,20 +1178,6 @@ class useRest {
           });
         }
 
-        restActivity.save(this.#tenant, {
-          collection: collection,
-          data: {
-            input: update,
-            id: id,
-            ids: [id],
-          },
-          transaction: this.#session ? true : false,
-          action: "updateOne",
-          user:
-            sessionStorage().get().state?.user ||
-            sessionStorage().get().state?.by ||
-            null,
-        });
         try {
           col?.cache?.watch({
             action: "insertMany",
@@ -1170,6 +1197,23 @@ class useRest {
             .updateDocuments([{ ...toJson(result?.doc || {}) }])
             .catch();
         }
+        // if updateOne done
+        restActivity.save(this.#tenant, {
+          collection: collection,
+          data: {
+            update: update,
+            id: id,
+            ids: [id],
+          },
+          transaction: this.#session ? true : false,
+          action: "updateOne",
+          internal: sessionStorage()?.get() ? false : true,
+          ip: sessionStorage()?.get()?._v?.ip,
+          auth: sessionStorage()?.get()?.isAuth,
+          role: sessionStorage()?.get()?.role!,
+          user: sessionStorage()?.get()?.state?.user,
+          state: sessionStorage()?.get()?.state,
+        });
         return resolve(toJson(result?.doc || {}));
       } catch (err) {
         return reject(err);
@@ -1252,6 +1296,22 @@ class useRest {
         }
         ``;
 
+        restActivity.save(this.#tenant, {
+          collection: collection,
+          data: {
+            update: update,
+            filter: filter,
+          },
+          transaction: this.#session ? true : false,
+          action: "findAndUpdate",
+          internal: sessionStorage()?.get() ? false : true,
+          ip: sessionStorage()?.get()?._v?.ip,
+          auth: sessionStorage()?.get()?.isAuth,
+          role: sessionStorage()?.get()?.role!,
+          user: sessionStorage()?.get()?.state?.user,
+          state: sessionStorage()?.get()?.state,
+        });
+
         return resolve({
           docs: result.docs,
           matchedCount: up_?.matchedCount || 0,
@@ -1336,6 +1396,22 @@ class useRest {
             ])
             .catch();
         }
+        // if findOneAndUpdate
+        restActivity.save(this.#tenant, {
+          collection: collection,
+          data: {
+            update: update,
+            filter: filter,
+          },
+          transaction: this.#session ? true : false,
+          action: "findOneAndUpdate",
+          internal: sessionStorage()?.get() ? false : true,
+          ip: sessionStorage()?.get()?._v?.ip,
+          auth: sessionStorage()?.get()?.isAuth,
+          role: sessionStorage()?.get()?.role!,
+          user: sessionStorage()?.get()?.state?.user,
+          state: sessionStorage()?.get()?.state,
+        });
         return resolve(result.doc);
       } catch (err) {
         return reject(err);
@@ -1532,20 +1608,7 @@ class useRest {
               }),
             });
           }
-          restActivity.save(this.#tenant, {
-            collection: collection,
-            data: {
-              input: update,
-              ids: ids,
-            },
-            action: "updateMany",
-            transaction: this.#session ? true : false,
-            internal: sessionStorage()?.get() ? false : true,
-            user:
-              sessionStorage().get().state?.user ||
-              sessionStorage().get().state?.by ||
-              null,
-          });
+
           try {
             col?.cache?.watch({
               action: "updateMany",
@@ -1565,6 +1628,22 @@ class useRest {
               .updateDocuments(result.docs)
               .catch();
           }
+          // if updateMany done
+          restActivity.save(this.#tenant, {
+            collection: collection,
+            data: {
+              update: update,
+              ids: ids,
+            },
+            action: "updateMany",
+            transaction: this.#session ? true : false,
+            internal: sessionStorage()?.get() ? false : true,
+            ip: sessionStorage()?.get()?._v?.ip,
+            auth: sessionStorage()?.get()?.isAuth,
+            role: sessionStorage()?.get()?.role!,
+            user: sessionStorage()?.get()?.state?.user,
+            state: sessionStorage()?.get()?.state,
+          });
           return resolve(result.docs);
         } else {
           throw new contextError("List of id required", 400);
@@ -1666,20 +1745,7 @@ class useRest {
             }),
           });
         }
-        restActivity.save(this.#tenant, {
-          collection: collection,
-          data: {
-            input: doc,
-            id: id,
-            ids: [id],
-          },
-          transaction: this.#session ? true : false,
-          action: "deleteOne",
-          user:
-            sessionStorage().get().state?.user ||
-            sessionStorage().get().state?.by ||
-            null,
-        });
+
         try {
           col?.cache?.watch({
             action: "deleteOne",
@@ -1691,7 +1757,7 @@ class useRest {
           });
         } catch (err) {}
         if (
-          this.#tenant.searchEngine.meilisearch.enabled &&
+          this.#tenant?.searchEngine?.meilisearch?.enabled &&
           col?.searchEngine?.meilisearch?.dispatchAction == "auto"
         ) {
           this.meilisearch.client
@@ -1699,6 +1765,24 @@ class useRest {
             .deleteDocument(id)
             .catch();
         }
+
+        // if deleteOne done
+        restActivity.save(this.#tenant, {
+          collection: collection,
+          data: {
+            data: doc,
+            id: id,
+          },
+          transaction: this.#session ? true : false,
+          action: "deleteOne",
+          internal: sessionStorage()?.get() ? false : true,
+          ip: sessionStorage()?.get()?._v?.ip,
+          auth: sessionStorage()?.get()?.isAuth,
+          role: sessionStorage()?.get()?.role!,
+          user: sessionStorage()?.get()?.state?.user,
+          state: sessionStorage()?.get()?.state,
+        });
+
         return resolve(doc);
       } catch (err) {
         return resolve(err);
@@ -1801,19 +1885,6 @@ class useRest {
           });
         }
 
-        restActivity.save(this.#tenant, {
-          collection: collection,
-          data: {
-            input: null,
-            ids: ids,
-          },
-          transaction: this.#session ? true : false,
-          action: "deleteMany",
-          user:
-            sessionStorage().get().state?.user ||
-            sessionStorage().get().state?.by ||
-            null,
-        });
         try {
           col?.cache?.watch({
             action: "deleteMany",
@@ -1825,7 +1896,7 @@ class useRest {
           });
         } catch (err) {}
         if (
-          this.#tenant.searchEngine.meilisearch.enabled &&
+          this.#tenant?.searchEngine?.meilisearch?.enabled &&
           col?.searchEngine?.meilisearch?.dispatchAction == "auto"
         ) {
           this.meilisearch.client
@@ -1833,6 +1904,22 @@ class useRest {
             .deleteDocuments(deletedIds)
             .catch();
         }
+        // if deleteMany done
+        restActivity.save(this.#tenant, {
+          collection: collection,
+          data: {
+            input: null,
+            ids: ids,
+          },
+          transaction: this.#session ? true : false,
+          action: "deleteMany",
+          internal: sessionStorage()?.get() ? false : true,
+          ip: sessionStorage()?.get()?._v?.ip,
+          auth: sessionStorage()?.get()?.isAuth,
+          role: sessionStorage()?.get()?.role!,
+          user: sessionStorage()?.get()?.state?.user,
+          state: sessionStorage()?.get()?.state,
+        });
         return resolve(deletedIds);
       } catch (err) {
         return reject(err);
@@ -1853,10 +1940,12 @@ class useRest {
           collection: Collection,
           data: {},
           action: "dropCollection",
-          user:
-            sessionStorage()?.get()?.state?.user ||
-            sessionStorage()?.get()?.state?.by ||
-            null,
+          internal: sessionStorage()?.get() ? false : true,
+          ip: sessionStorage()?.get()?._v?.ip,
+          auth: sessionStorage()?.get()?.isAuth,
+          role: sessionStorage()?.get()?.role!,
+          user: sessionStorage()?.get()?.state?.user,
+          state: sessionStorage()?.get()?.state,
         });
         return resolve(r);
       } catch (err) {
@@ -1947,6 +2036,8 @@ const restActivity = {
       user?: object;
       transaction?: boolean;
       auth?: boolean;
+      state?: object;
+      role?: string;
     }
   ) => {
     return await tenant.database.db
@@ -1962,6 +2053,8 @@ const restActivity = {
           createdAt: moment().format(),
           updatedAt: moment().format(),
           user: activity?.user,
+          state: activity?.state,
+          role: activity?.role,
           transaction: activity?.transaction ?? false,
         })
       )

package/lib/asyncLocalStorage.ts

@@ -22,11 +22,15 @@ function isSetAsyncLocalStorage() {
 }
 const sessionStorage = () => ({
   get(): {
-    state: object;
+    state: {
+      [key: string]: any;
+      user: any;
+    };
     _v: {
       isAuth: boolean;
       reqAt?: string;
       setAt?: string;
+      ip?: string;
     };
     role: string | null | undefined;
     token?: string;

package/package.json

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