@dnax/core 0.60.0 → 0.60.2

package/app/hono.ts

@@ -133,6 +133,7 @@ function HonoInstance(): typeof app {
           role: sessionData?.role || null,
           _v: { ...(_v || {}) },
           isAuth: true,
+          uuid: sessionData?.uuid || null,
         });
       } else {
         // no valid token
@@ -379,6 +380,7 @@ function HonoInstance(): typeof app {
                 role: sessionStorage().get().role || null,
                 user: sessionStorage().get().state?.user,
                 state: sessionStorage().get().state,
+                uuid: sessionStorage().get().uuid,
                 ip:
                   c.req.raw.headers?.get("CF-Connecting-IP") ||
                   c.req.raw.headers?.get("x-forwarded-for") ||
@@ -403,6 +405,7 @@ function HonoInstance(): typeof app {
                 user: sessionStorage().get().state?.user,
                 state: sessionStorage().get().state,
                 role: sessionStorage().get().role || null,
+                uuid: sessionStorage().get().uuid,
                 ip:
                   c.req.raw.headers?.get("CF-Connecting-IP") ||
                   c.req.raw.headers?.get("x-forwarded-for") ||

package/driver/mongo/rest.ts

@@ -95,6 +95,7 @@ class useRest {
         ids?: string[];
         id?: string;
       };
+      uuid?: string;
       action: string;
       ip?: string;
       user?: object;
@@ -469,6 +470,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
         });
         return resolve(toJson(data));
       } catch (err) {
@@ -613,6 +615,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
         });
         return resolve(toJson(data));
       } catch (err) {
@@ -1235,6 +1238,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
         });
         return resolve(toJson(result?.doc || {}));
       } catch (err) {
@@ -1332,6 +1336,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
         });
 
         return resolve({
@@ -1433,6 +1438,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
         });
         return resolve(result.doc);
       } catch (err) {
@@ -1665,6 +1671,7 @@ class useRest {
             role: sessionStorage()?.get()?.role!,
             user: sessionStorage()?.get()?.state?.user,
             state: sessionStorage()?.get()?.state,
+            uuid: sessionStorage()?.get()?.uuid,
           });
           return resolve(result.docs);
         } else {
@@ -1804,6 +1811,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
         });
 
         return resolve(doc);
@@ -1942,6 +1950,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
         });
         return resolve(deletedIds);
       } catch (err) {
@@ -1969,6 +1978,7 @@ class useRest {
           role: sessionStorage()?.get()?.role!,
           user: sessionStorage()?.get()?.state?.user,
           state: sessionStorage()?.get()?.state,
+          uuid: sessionStorage()?.get()?.uuid,
         });
         return resolve(r);
       } catch (err) {
@@ -2042,6 +2052,7 @@ const restActivity = {
     activity: {
       collection?: string;
       data: any;
+      uuid?: string | undefined | null;
       action: string;
       internal?: boolean;
       ip?: string;
@@ -2069,6 +2080,7 @@ const restActivity = {
           state: activity?.state,
           role: activity?.role,
           transaction: activity?.transaction ?? false,
+          uuid: activity?.uuid,
         })
       )
       .catch();

package/lib/asyncLocalStorage.ts

@@ -2,7 +2,7 @@ import { AsyncLocalStorage } from "node:async_hooks";
 import type { sessionCtx } from "../types";
 import { localSession } from "./session";
 import { v4 } from "uuid";
-import { jwt } from "../utils";
+import { jwt, uuid } from "../utils";
 import { Cfg } from "../config";
 const asyncLocalStorage = new AsyncLocalStorage();
 const key = "___sessionStorage___";
@@ -24,10 +24,10 @@ const sessionStorage = () => ({
   get(): {
     state: {
       [key: string]: any;
-      user: any;
+      user?: any;
     };
-    _v: {
-      isAuth: boolean;
+    _v?: {
+      isAuth?: boolean;
       reqAt?: string;
       setAt?: string;
       ip?: string;
@@ -35,6 +35,7 @@ const sessionStorage = () => ({
     role: string | null | undefined;
     token?: string;
     isAuth?: boolean;
+    uuid?: string;
   } {
     if (!isSetAsyncLocalStorage()) return { state: {}, _v: {}, role: null };
     let store = asyncLocalStorage?.getStore() as InstanceType<typeof Map>;
@@ -54,6 +55,7 @@ const sessionStorage = () => ({
     input: {
       id?: string;
       state?: object;
+      uuid?: string;
       _v?: object;
       role?: string;
       token?: string;
@@ -72,14 +74,19 @@ const sessionStorage = () => ({
       );
     }
     let store = asyncLocalStorage?.getStore() as InstanceType<typeof Map>;
-    if (!input?.id) {
+    if (!input?.uuid) {
       input.id = v4();
     }
 
+    if (!input?.uuid) {
+      input.uuid = v4();
+    }
+
     let data = {
       isAuth: input?.isAuth ?? false,
       state: input?.state || {},
       role: input?.role || null,
+      uuid: input?.uuid,
       _v: {
         ...(input?._v || {}),
         setAt: new Date().toString(),
@@ -93,6 +100,7 @@ const sessionStorage = () => ({
           id: input.id,
           state: input?.state,
           role: input?.role || null,
+          uuid: input?.uuid,
           _v: {
             ...(input?._v || {}),
             setAt: new Date().toString(),
@@ -116,6 +124,7 @@ const sessionStorage = () => ({
       role: input.role,
       token: input.token,
       id: input.id,
+      uuid: input.uuid,
     };
   },
 });

package/package.json

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

package/types/index.ts

@@ -205,6 +205,7 @@ export type sessionCtx = {
     role: string | null | undefined;
     token: string | null | undefined;
     isAuth: boolean;
+    uuid: string;
   };
 };