@dnax/core 0.15.3 → 0.15.4

package/lib/cron/index.ts

@@ -22,18 +22,21 @@ async function initCron() {
               let cronTask = new Cron(cronOpt.pattern, {
                 ...cleanDeep(cronOpt.options),
               });
-              cronOpt.handler({
-                io: Cfg.io,
-                rest: new useRest({
+              let cronTaskExec = cronOpt?.exec || cronOpt?.handler;
+              if (cronTaskExec && typeof cronTaskExec == "function") {
+                cronTaskExec({
+                  io: Cfg.io,
+                  rest: new useRest({
+                    tenant_id: t.id,
+                  }),
+                  task: cronTask,
+                });
+                cronTasks.push({
                   tenant_id: t.id,
-                }),
-                task: cronTask,
-              });
-              cronTasks.push({
-                tenant_id: t.id,
-                name: cronOpt.name,
-                cron: cronOpt,
-              });
+                  name: cronOpt.name,
+                  cron: cronOpt,
+                });
+              }
             }
           })
           .catch((err) => {

package/lib/permissions.ts

@@ -15,7 +15,7 @@ async function loadPermissions() {
   let permissions: permissionSchema[] = [];
   if (Cfg.tenants) {
     for await (let t of Cfg.tenants) {
-      let tenantPath = `${t.dir}/permissions/**/**.rabc.{ts,js}`;
+      let tenantPath = `${t.dir}/permissions/**/**.rbac.{ts,js}`;
       const glob = new Glob(tenantPath);
 
       for await (let file of glob.scan({

package/lib/socket/instance.ts

@@ -5,12 +5,21 @@ import { v4 } from "uuid";
 const wsClients = new Map<string, ServerWebSocket>();
 const wsEvents: optionsIo[] = [];
 
+/**
+ * reason for disconnection
+ */
+type reasonType = any;
+export type callbackType = (
+  socket: socketIoType,
+  data: any | reasonType
+) => void;
+
 class Io {
   id: string | null;
   constructor() {
     this.id = null;
   }
-  on(event: string, cb: Function) {
+  on(event: string, cb: callbackType) {
     wsEvents.push({
       type: "on",
       event: event,
@@ -54,12 +63,9 @@ export type socketIoType = {
   id: string;
   on: <T extends "connection" | "close" | string>(
     event: T,
-    cb: (socket: {
-      id: string;
-      emit: (event: string, data: any) => void;
-    }) => void
+    cb: callbackType
   ) => void;
-  emit: (event: string, id: string, data: any) => void;
+  emit: (event: string, data: any) => void;
   broadcast: (event: string, data: any) => void;
 };
 
@@ -89,13 +95,31 @@ function webSocketServer(server: Server): WebSocketHandler {
       });
     },
     close(ws, code, reason) {
-      console.log("close", code, reason);
-      console.log(ws.id);
+      // get all closed events
+      let evs = wsEvents.filter((e) => e.event == "close" && e?.type == "on");
+
+      evs.map((ev) => {
+        if (ev && ev.cb) {
+          ev.cb(
+            {
+              id: ws.id,
+              broadcast: (event: string, data: any) => {
+                wsClients.forEach((client) => {
+                  client.send(JSON.stringify({ type: "emit", event, data }));
+                });
+              },
+            },
+            reason
+          );
+        }
+      });
+      // console.log("close", code, reason);
+      // console.log(ws.id);
     },
     message: (ws, message: any) => {
       try {
         let options: optionsIo = JSON.parse(message);
-
+        //console.log(options);
         // find all listeners : On
         let evs = wsEvents.filter(
           (e) => e.event == options?.event && e?.type == "on"
@@ -103,10 +127,11 @@ function webSocketServer(server: Server): WebSocketHandler {
 
         // run all listeners function if matchs
         evs?.map((ev) => {
-          if (ev && ev.cb) {
-            ev.cb({
-              data: options.data,
-              ws: {
+          ws.token = options?.token || null;
+          if (ev && ev?.cb) {
+            ev.cb(
+              {
+                id: ws.id,
                 broadcast: (event: string, data: any) => {
                   // send to all clients
                   wsClients.forEach((client) => {
@@ -116,12 +141,14 @@ function webSocketServer(server: Server): WebSocketHandler {
                 emit: (event: string, data: any) =>
                   ws.send(JSON.stringify({ type: "emit", event, data })),
               },
-            });
+              options.data
+            );
           }
         });
 
         //wsEvents.on(options.event)
-      } catch (err) {
+      } catch (err: any) {
+        console.log(err?.message);
         //console.log("Not a valid JSON string", err?.message);
       }
     },

package/package.json

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

package/types/index.ts

@@ -123,7 +123,7 @@ export type Field = {
 
 export type cronCtx = {
   rest: InstanceType<typeof useRest>;
-  io: Io;
+  io: socketIoType;
   task: InstanceType<typeof Cron>;
 };
 
@@ -137,7 +137,8 @@ export type cronConfig = {
     stopAt?: Date;
     paused?: Boolean;
   };
-  handler: (ctx: cronCtx) => void;
+  handler?: (ctx: cronCtx) => void;
+  exec?: (ctx: cronCtx) => void;
 };
 
 export type middlewareCtx = (ctx: {