expresso-macchiato 0.4.2 → 0.4.4-dev.0

package/dist/index.d.mts

@@ -472,7 +472,7 @@ type SocketWrapperConstructor<Metadata extends Record<string, any> = any> = {
     clientConnectionKey?: string;
     connectionMiddleware?: SocketConnectionMiddleware<Metadata>;
     afterClientConnect?: (self: SocketWrapper, client: Socket, metadata?: Metadata) => Promise<void>;
-    onClientDisconnect?: (self: SocketWrapper, client: Socket, ...params: any[]) => Promise<void>;
+    onClientDisconnect?: (self: SocketWrapper, clientId: string, ...params: any[]) => Promise<void>;
     listeners?: Record<string, (self: SocketWrapper, client: Socket, metadata: any, ...params: any[]) => Promise<void>>;
 };
 
@@ -483,7 +483,7 @@ declare class SocketWrapper<Metadata extends Record<string, any> = any> {
     protected namespace?: Namespace;
     constructor(data: SocketWrapperConstructor<Metadata>);
     setupConnection: (io: Server$1) => void;
-    protected handleDisconnection: (client: Socket) => void;
+    protected handleDisconnection: (clientId: string) => void;
     broadcast: (eventName: string, data: any) => void;
     broadcastExceptClient: (clientId: string, eventName: string, data: any) => void;
     sendToClient: (clientId: string, eventName: string, data: any) => void;

package/dist/index.d.ts

@@ -472,7 +472,7 @@ type SocketWrapperConstructor<Metadata extends Record<string, any> = any> = {
     clientConnectionKey?: string;
     connectionMiddleware?: SocketConnectionMiddleware<Metadata>;
     afterClientConnect?: (self: SocketWrapper, client: Socket, metadata?: Metadata) => Promise<void>;
-    onClientDisconnect?: (self: SocketWrapper, client: Socket, ...params: any[]) => Promise<void>;
+    onClientDisconnect?: (self: SocketWrapper, clientId: string, ...params: any[]) => Promise<void>;
     listeners?: Record<string, (self: SocketWrapper, client: Socket, metadata: any, ...params: any[]) => Promise<void>>;
 };
 
@@ -483,7 +483,7 @@ declare class SocketWrapper<Metadata extends Record<string, any> = any> {
     protected namespace?: Namespace;
     constructor(data: SocketWrapperConstructor<Metadata>);
     setupConnection: (io: Server$1) => void;
-    protected handleDisconnection: (client: Socket) => void;
+    protected handleDisconnection: (clientId: string) => void;
     broadcast: (eventName: string, data: any) => void;
     broadcastExceptClient: (clientId: string, eventName: string, data: any) => void;
     sendToClient: (clientId: string, eventName: string, data: any) => void;

package/dist/index.js

@@ -664,11 +664,12 @@ var RouterWrapper = class {
           const callBackFunction = async (req, res) => {
             try {
               const handlerRes = await currentMethod.handler(req, res);
+              log.gold(`Handling res on [${method}] ${this.data.basePath}${path3}`, handlerRes);
               if (handlerRes.contentType) {
                 res.set("Content-Type", handlerRes.contentType);
                 res.status(_nullishCoalesce(handlerRes.status, () => ( 200))).send(handlerRes.result);
-              } else if (typeof handlerRes.result === "object") res.status(handlerRes.status).json(handlerRes.result);
-              else res.status(handlerRes.status).send(handlerRes.result);
+              } else if (typeof handlerRes.result === "object") res.status(_nullishCoalesce(handlerRes.status, () => ( 200))).json(handlerRes.result);
+              else res.status(_nullishCoalesce(handlerRes.status, () => ( 200))).send(handlerRes.result);
             } catch (err) {
               fullLogNok("api", `[${method}] ${this.data.basePath}${path3} => ${_nullishCoalesce(err.message, () => ( err))}`);
               res.status(500).send(_nullishCoalesce(_optionalChain([err, 'optionalAccess', _41 => _41.message]), () => ( err)));
@@ -738,7 +739,7 @@ var SocketWrapper = class {
             this.connectedClients.set(finalClientId, { socket: client, connectedAt: /* @__PURE__ */ new Date(), metadata });
             if (this.data.afterClientConnect) this.data.afterClientConnect(this, client, metadata);
             for (const eventName in _nullishCoalesce(this.data.listeners, () => ( []))) client.on(eventName, (...params) => _optionalChain([this, 'access', _46 => _46.data, 'access', _47 => _47.listeners, 'optionalAccess', _48 => _48[eventName], 'call', _49 => _49(this, client, metadata, ...params)]));
-            client.on("disconnect", () => this.handleDisconnection(client));
+            client.on("disconnect", () => this.handleDisconnection(finalClientId));
           } catch (err) {
             fullLogNok(`SOCKETWRAPPER`, `[${this.socketNamespace.toUpperCase()}]`, err);
           }
@@ -747,11 +748,11 @@ var SocketWrapper = class {
         fullLogNok(`SOCKETWRAPPER`, `[${this.socketNamespace.toUpperCase()}]`, err);
       }
     };
-    this.handleDisconnection = (client) => {
+    this.handleDisconnection = (clientId) => {
       try {
         if (!this.namespace) throw new Error("Socket.IO not initialized");
-        this.connectedClients.delete(client.id);
-        if (this.data.onClientDisconnect) this.data.onClientDisconnect(this, client);
+        this.connectedClients.delete(clientId);
+        if (this.data.onClientDisconnect) this.data.onClientDisconnect(this, clientId);
       } catch (err) {
         fullLogNok(`SOCKETWRAPPER`, `[${this.socketNamespace.toUpperCase()}]`, err);
       }

package/dist/index.mjs

@@ -664,11 +664,12 @@ var RouterWrapper = class {
           const callBackFunction = async (req, res) => {
             try {
               const handlerRes = await currentMethod.handler(req, res);
+              log.gold(`Handling res on [${method}] ${this.data.basePath}${path3}`, handlerRes);
               if (handlerRes.contentType) {
                 res.set("Content-Type", handlerRes.contentType);
                 res.status(handlerRes.status ?? 200).send(handlerRes.result);
-              } else if (typeof handlerRes.result === "object") res.status(handlerRes.status).json(handlerRes.result);
-              else res.status(handlerRes.status).send(handlerRes.result);
+              } else if (typeof handlerRes.result === "object") res.status(handlerRes.status ?? 200).json(handlerRes.result);
+              else res.status(handlerRes.status ?? 200).send(handlerRes.result);
             } catch (err) {
               fullLogNok("api", `[${method}] ${this.data.basePath}${path3} => ${err.message ?? err}`);
               res.status(500).send(err?.message ?? err);
@@ -738,7 +739,7 @@ var SocketWrapper = class {
             this.connectedClients.set(finalClientId, { socket: client, connectedAt: /* @__PURE__ */ new Date(), metadata });
             if (this.data.afterClientConnect) this.data.afterClientConnect(this, client, metadata);
             for (const eventName in this.data.listeners ?? []) client.on(eventName, (...params) => this.data.listeners?.[eventName](this, client, metadata, ...params));
-            client.on("disconnect", () => this.handleDisconnection(client));
+            client.on("disconnect", () => this.handleDisconnection(finalClientId));
           } catch (err) {
             fullLogNok(`SOCKETWRAPPER`, `[${this.socketNamespace.toUpperCase()}]`, err);
           }
@@ -747,11 +748,11 @@ var SocketWrapper = class {
         fullLogNok(`SOCKETWRAPPER`, `[${this.socketNamespace.toUpperCase()}]`, err);
       }
     };
-    this.handleDisconnection = (client) => {
+    this.handleDisconnection = (clientId) => {
       try {
         if (!this.namespace) throw new Error("Socket.IO not initialized");
-        this.connectedClients.delete(client.id);
-        if (this.data.onClientDisconnect) this.data.onClientDisconnect(this, client);
+        this.connectedClients.delete(clientId);
+        if (this.data.onClientDisconnect) this.data.onClientDisconnect(this, clientId);
       } catch (err) {
         fullLogNok(`SOCKETWRAPPER`, `[${this.socketNamespace.toUpperCase()}]`, err);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expresso-macchiato",
-  "version": "0.4.2",
+  "version": "0.4.4-dev.0",
   "author": "Alessio Velluso",
   "license": "MIT",
   "description": "Description",

package/types/socket.sptypes.ts

@@ -18,6 +18,6 @@ export type SocketWrapperConstructor<Metadata extends Record<string, any> = any>
     clientConnectionKey?:string,
     connectionMiddleware?:SocketConnectionMiddleware<Metadata>
     afterClientConnect?: (self:SocketWrapper, client:Socket, metadata?:Metadata) => Promise<void>
-    onClientDisconnect?:(self:SocketWrapper, client:Socket, ...params:any[]) => Promise<void>
+    onClientDisconnect?:(self:SocketWrapper, clientId:string, ...params:any[]) => Promise<void>
     listeners?:Record<string, (self:SocketWrapper, client:Socket, metadata:any, ...params:any[]) => Promise<void>>
 }