@dnax/core 0.60.6 → 0.62.0

package/driver/mongo/rest.ts

@@ -376,6 +376,7 @@ class useRest {
 
         if (col?.customApi?.insertOne && useCustomApi) {
           let result = await col?.customApi?.insertOne({
+            error: fn.error,
             io: Cfg.io,
             session: sessionStorage(),
             data: toJson(data),
@@ -527,6 +528,7 @@ class useRest {
 
         if (col?.customApi?.insertMany && useCustomApi) {
           let result = await col?.customApi?.insertMany({
+            error: fn.error,
             io: Cfg.io,
             session: sessionStorage(),
             data: toJson(data),
@@ -728,6 +730,7 @@ class useRest {
         if (col?.customApi?.find && useCustomApi) {
           let result = (await col?.customApi?.find({
             io: Cfg.io,
+            error: fn.error,
             session: sessionStorage(),
             params: params,
             rest: new useRest({
@@ -864,6 +867,7 @@ class useRest {
         if (col?.customApi?.count && useCustomApi) {
           let result = (await col?.customApi?.count({
             io: Cfg.io,
+            error: fn.error,
             session: sessionStorage(),
             params: params,
             rest: new useRest({
@@ -984,6 +988,7 @@ class useRest {
         if (col?.customApi?.findOne && useCustomApi) {
           let result = await col?.customApi?.findOne({
             io: Cfg.io,
+            error: fn.error,
             session: sessionStorage(),
             id: id,
             params: params,
@@ -1114,6 +1119,7 @@ class useRest {
         if (col?.customApi?.updateOne && useCustomApi) {
           let result = await col?.customApi?.updateOne({
             io: Cfg.io,
+            error: fn.error,
             session: sessionStorage(),
             update: update,
             id: id,
@@ -1542,6 +1548,7 @@ class useRest {
         if (col?.customApi?.updateMany && useCustomApi) {
           let result = await col?.customApi?.updateMany({
             io: Cfg.io,
+            error: fn.error,
             session: sessionStorage(),
             update: update,
             ids: ids,
@@ -1731,6 +1738,7 @@ class useRest {
         if (col?.customApi?.deleteOne && useCustomApi) {
           let result = await col?.customApi?.deleteOne({
             io: Cfg.io,
+            error: fn.error,
             session: sessionStorage(),
             id: id,
             rest: new useRest({
@@ -1869,6 +1877,7 @@ class useRest {
         if (col?.customApi?.deleteMany && useCustomApi) {
           let result = await col?.customApi?.deleteMany({
             io: Cfg.io,
+            error: fn.error,
             session: sessionStorage(),
             ids: ids,
             rest: new useRest({

package/lib/socket/instance.ts

@@ -2,6 +2,7 @@ import type { ServerWebSocket, WebSocketHandler, Server } from "bun";
 import { EventEmitter } from "events";
 import { Cfg } from "../../config";
 import { v4 } from "uuid";
+import { uuid } from "../../utils";
 const wsClients = new Map<string, ServerWebSocket>();
 const wsEvents: optionsIo[] = [];
 
@@ -36,7 +37,7 @@ class Io {
   }
   emit(event: string, data: any) {
     if (!this?.id || this.id == null) {
-      console.error("No id found");
+      console.error("ws:: No id found");
     }
 
     if (this.id) {
@@ -133,6 +134,7 @@ function webSocketServer(server: Server): WebSocketHandler {
         let clb_ = null;
         if (options?.uuid) {
           clb_ = (data: any) => {
+            //console.log("MMM", data);
             ws.send(
               JSON.stringify({ type: "emit", event: options?.uuid, data })
             );
@@ -150,7 +152,14 @@ function webSocketServer(server: Server): WebSocketHandler {
                 broadcast: (event: string, data: any) => {
                   // send to all clients
                   wsClients.forEach((client) => {
-                    client.send(JSON.stringify({ type: "emit", event, data }));
+                    client.send(
+                      JSON.stringify({
+                        type: "emit",
+                        event,
+                        data,
+                        uuid: options?.uuid,
+                      })
+                    );
                   });
                 },
                 emit: (event: string, data: any) =>

package/package.json

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

package/types/index.ts

@@ -261,10 +261,11 @@ export type ctxApi = {
   rest: useRest;
   data?: any;
   session?: sessionCtx;
-  io?: socketIoType;
+  io: socketIoType;
   params?: findParam;
   id?: string;
   ids?: string[];
+  error: typeof fn.error;
   update?: updateParams;
 };