@dnax/core 0.15.1 → 0.15.3

package/app/hono.ts

@@ -52,78 +52,6 @@ function HonoInstance(): typeof app {
     })
   );
 
-  if (Cfg?.server?.logger) {
-    if (typeof Cfg?.server?.logger == "function" && Cfg?.server?.logger) {
-      app.use(async (c, next) => {
-        const start = Date.now();
-        const { action, collection, cleanDeep, useCache } = c.req.query() as Q;
-        Cfg.server.logger(c, {
-          mode: "incomming",
-          start: start,
-          action: action,
-          collection: collection,
-          cleanDeep: cleanDeep,
-          useCache: stringToBoolean(useCache, false),
-          method: c.req.method,
-          url: c.req.url,
-          path: c.req.path,
-        });
-        await next();
-        const duration = Date.now() - start;
-        Cfg.server.logger(c, {
-          mode: "outgoing",
-          duration,
-          start,
-          action,
-          collection,
-          cleanDeep,
-          useCache: stringToBoolean(useCache, false),
-          method: c.req.method,
-          url: c.req.url,
-          status: c.res.status,
-          path: c.req.path,
-        });
-      });
-    }
-    if (typeof Cfg?.server?.logger == "boolean" && Cfg?.server?.logger) {
-      app.use(async (c, next) => {
-        let ip =
-          c.req.raw.headers?.get("CF-Connecting-IP") ||
-          c.req.raw.headers?.get("x-forwarded-for") ||
-          c.req.raw.headers?.get("x-real-ip");
-        const origin =
-          c.req?.header("Origin") || c.req.raw?.headers?.get("Origin") || "";
-        const info = getConnInfo(c);
-        if (c.req.method == "OPTIONS") return await next();
-        const start = Date.now();
-        const { action, collection, cleanDeep, useCache, name } =
-          c.req.query() as Q;
-        // Log the incoming request
-        console.log(
-          `<-- ${ip || info.remote.address} ${origin} | ${c.req.method.gray} ${
-            c.req.path?.gray
-          } -C ${colors.blue(`${collection || ""}`)} -A ${
-            action?.gray || ""
-          } -Sn ${name?.gray || ""} -t ${
-            moment(start).format("YYYY-DD-MM:HH:mm:ss").gray
-          } \n`
-        );
-
-        await next();
-        // Calculate the duration of the request processing
-        const duration = Date.now() - start;
-        console.log(
-          `--> ${ip || info.remote.address} ${origin} | ${c.req.method.gray} ${
-            c.req.path?.gray
-          } -C ${colors.blue(`${collection || ""}`)} -A ${
-            action?.gray || ""
-          } -Sn ${name?.gray || ""} -s ${c.res.status} -d ${colors.green(
-            `(${duration}ms)`
-          )} -t ${moment().format("YYYY-DD-MM:HH:mm:ss").gray} \n`
-        );
-      });
-    }
-  }
   app.use(
     ipRestriction(getConnInfo, {
       allowList: Cfg?.server?.whiteListIps || [],
@@ -160,12 +88,10 @@ function HonoInstance(): typeof app {
   app.use(async (c, next) => {
     return asyncLocalStorage.run(new Map(), async () => {
       let cookie = getCookie(c);
-      let secretKeyStudio = cookie["_STUDIO_SECRET_KEY_"] || null;
       let session = sessionStorage();
       var token = jwt.getToken("Bearer", c.req.header()["authorization"]) || "";
       var { decode, valid, error } = jwt.verify(token);
       let sessionData = {};
-
       if (valid && decode) {
         await localSession
           .get(decode?.sessionId)

package/lib/socket/instance.ts

@@ -1,11 +1,15 @@
 import type { ServerWebSocket, WebSocketHandler, Server } from "bun";
 import { EventEmitter } from "events";
+import { Cfg } from "../../config";
 import { v4 } from "uuid";
 const wsClients = new Map<string, ServerWebSocket>();
 const wsEvents: optionsIo[] = [];
 
 class Io {
-  constructor() {}
+  id: string | null;
+  constructor() {
+    this.id = null;
+  }
   on(event: string, cb: Function) {
     wsEvents.push({
       type: "on",
@@ -13,16 +17,30 @@ class Io {
       cb: cb,
     });
   }
+  to(id: string) {
+    const newInstance = new Io();
+    newInstance.id = id;
+    return newInstance;
+  }
   emit(event: string, data: any) {
-    wsEvents.push({
-      type: "emit",
-      event: event,
-      data: data,
+    if (!this?.id || this.id == null) {
+      console.error("No id found");
+    }
+
+    if (this.id) {
+      let client = wsClients.get(this.id);
+      client?.send(JSON.stringify({ type: "emit", event, data }));
+    }
+  }
+  broadcast(event: string, data: any) {
+    wsClients.forEach((client) => {
+      client.send(JSON.stringify({ type: "emit", event, data }));
     });
   }
 }
 
 const io = new Io();
+Cfg.io = io;
 type optionsIo = {
   type: "on" | "emit";
   event: string | "connection" | "close";
@@ -41,7 +59,7 @@ export type socketIoType = {
       emit: (event: string, data: any) => void;
     }) => void
   ) => void;
-  emit: (event: string, data: any) => void;
+  emit: (event: string, id: string, data: any) => void;
   broadcast: (event: string, data: any) => void;
 };
 

package/package.json

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

package/types/index.ts

@@ -190,7 +190,7 @@ export type hooksCtx = (ctx: {
   c?: Context;
   rest: InstanceType<typeof useRest>;
   session?: sessionCtx;
-  io: Io;
+  io: socketIoType;
 }) => any;
 
 export type ctxApi = {
@@ -364,12 +364,19 @@ export type Config = {
   server: {
     logger?: Boolean | loggerFunction;
     whiteListIps?: Array<string>;
-    blackListIps?: Array<string>;
+    blackListIps?: string[];
     cors?: {
-      origin: string[];
+      origin:
+        | string[]
+        | ((ctx: { origin: string; c: Context }) => string[])
+        | string;
+      /**
+       * default true
+       @default true
+       */
       credentials?: boolean;
-      allowMethods?: Array<string>;
-      allowHeaders?: Array<string>;
+      allowMethods?: string[];
+      allowHeaders?: string[];
     };
     socket?: {
       /**
@@ -438,7 +445,7 @@ export type routeOption = {
    */
   base: string; // base URL
   handler: (ctx: {
-    io: Io;
+    io: socketIoType;
     router: {
       post: (path: string, clb: (c: Context) => void) => {};
       get: (path: string, clb: (c: Context) => void) => {};
@@ -450,7 +457,7 @@ export type endpointCtx = {
   enabled: boolean;
   handler: (ctx: {
     rest: InstanceType<typeof useRest>;
-    io: Io;
+    io: socketIoType;
     router: {
       post: (path: string, clb: (c: Context) => void) => {};
       get: (path: string, clb: (c: Context) => void) => {};
@@ -462,7 +469,7 @@ export type routeCtx = {
   enabled: boolean;
   handler: (ctx: {
     rest: InstanceType<typeof useRest>;
-    io: Io;
+    io: socketIoType;
     router: {
       post: (path: string, clb: (c: Context) => void) => {};
       get: (path: string, clb: (c: Context) => void) => {};
@@ -505,7 +512,7 @@ export type Service = {
      *  authenticated user or no
      */
     isAuth: boolean;
-    io: Io;
+    io: socketIoType;
   }) => any;
   exec?: (ctx: {
     /**
@@ -525,7 +532,7 @@ export type Service = {
      *  authenticated user or no
      */
     isAuth: boolean;
-    io: Io;
+    io: socketIoType;
   }) => any;
 };