@dnax/core 0.60.3 → 0.60.5

package/app/hono.ts

@@ -99,7 +99,9 @@ function HonoInstance(): typeof app {
     return asyncLocalStorage.run(new Map(), async () => {
       let cookie = getCookie(c);
       let session = sessionStorage();
-      var token = jwt.getToken("Bearer", c.req.header()["authorization"]) || "";
+      var token =
+        jwt.getToken("Bearer", c.req.header()["authorization"]) || null;
+
       var { decode, valid, error } = jwt.verify(token);
       let sessionData = {};
       if (valid && decode && decode?.session) {

package/lib/socket/index.ts

@@ -1,5 +1,4 @@
 import { Cfg } from "../../config";
-import { Server } from "socket.io";
 import consola from "consola";
 import { Glob } from "bun";
 import path from "path";

package/lib/socket/instance.ts

@@ -5,13 +5,16 @@ import { v4 } from "uuid";
 const wsClients = new Map<string, ServerWebSocket>();
 const wsEvents: optionsIo[] = [];
 
+type _clbFunc = (data: any) => void;
+
 /**
  * reason for disconnection
  */
 type reasonType = any;
 export type callbackType = (
   socket: socketIoType,
-  data: any | reasonType
+  data: any | reasonType,
+  clb?: _clbFunc
 ) => void;
 
 class Io {
@@ -75,7 +78,6 @@ function webSocketServer(server: Server): WebSocketHandler {
       let id = v4();
       ws.id = id;
       wsClients.set(id, ws);
-
       // set Id to client and emit it
       ws.send(JSON.stringify({ type: "setId", id: id }));
       // run all listenners event for connection
@@ -127,6 +129,17 @@ function webSocketServer(server: Server): WebSocketHandler {
           (e) => e.event == options?.event && e?.type == "on"
         );
 
+        // callback to
+        let clb_ = null;
+        if (options?.uuid) {
+          clb_ = (data: any) => {
+            ws.send(
+              JSON.stringify({ type: "emit", event: options?.uuid, data })
+            );
+          };
+        } else {
+          clb_ = () => {};
+        }
         // run all listeners function if matchs
         evs?.map((ev) => {
           ws.token = options?.token || null;
@@ -141,9 +154,17 @@ function webSocketServer(server: Server): WebSocketHandler {
                   });
                 },
                 emit: (event: string, data: any) =>
-                  ws.send(JSON.stringify({ type: "emit", event, data })),
+                  ws.send(
+                    JSON.stringify({
+                      type: "emit",
+                      event,
+                      data,
+                      uuid: options?.uuid,
+                    })
+                  ),
               },
-              options.data
+              options?.data,
+              clb_
             );
           }
         });

package/package.json

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

package/utils/index.ts

@@ -28,7 +28,15 @@ function copy(data: object): object | any {
 }
 
 const jwt = {
-  verify: (token: string): { decode: any; valid: boolean; error: any } => {
+  verify: (
+    token: string | null | undefined
+  ): { decode: any; valid: boolean; error: any } => {
+    if (!token)
+      return {
+        decode: null,
+        valid: false,
+        error: "Token required",
+      };
     const JWT_SECRET = String(Cfg.server?.jwt?.secret);
     let decode = null;
     let valid = true;