response-standardizer 1.0.4 → 1.0.6

package/dist/index.d.ts

@@ -15,6 +15,7 @@ export declare const initKeycloak: (config: {
     service?: string;
     realm?: string;
 }) => Promise<void>;
-export declare const protect: (allowedRoles?: string[]) => (req: any, res: any, next: any) => void | ((req: any, res: any, next: any) => void);
+export declare const protect: (allowedRoles?: string[]) => (req: any, res: any, next: any) => void;
 export declare const RestResponse: RestResponseFunctions;
 export declare const RestMiddleware: RestMiddlewareFunctions;
+export declare const log: (level: "INFO" | "WARN" | "ERROR", message: string, meta?: any) => void;

package/dist/index.js

@@ -1,6 +1,7 @@
 import { generateRequestId, getTimestamp } from "./utils.js";
 import axios from "axios";
 import jwt from "jsonwebtoken";
+import path from "path";
 let KEYCLOAK_PUBLIC_KEY = null;
 export const initKeycloak = async (config) => {
     const KEYCLOAK_SERVICE = config.service ?? "localhost";
@@ -23,7 +24,7 @@ export const protect = (allowedRoles) => {
             const decoded = jwt.verify(token, KEYCLOAK_PUBLIC_KEY, { algorithms: ["RS256"] });
             req.user = decoded;
             if (allowedRoles)
-                return role(allowedRoles);
+                return role(req, res, next, allowedRoles);
             next();
         }
         catch (err) {
@@ -32,24 +33,22 @@ export const protect = (allowedRoles) => {
         }
     };
 };
-const role = (allowedRoles) => {
-    return (req, res, next) => {
-        const user = req.user;
-        if (!user) {
-            return RestResponse.unauthorized(req, res);
-        }
-        const realmRoles = (user?.realm_access?.roles ?? []).map((r) => r.toUpperCase());
-        const clientRoles = Object.values(user?.resource_access ?? {})
-            .flatMap((r) => r.roles ?? [])
-            .map((r) => r.toUpperCase());
-        const allowedUpper = allowedRoles.map(r => r.toUpperCase());
-        const allRoles = [...realmRoles, ...clientRoles];
-        const hasAccess = allowedUpper.some((role) => allRoles.includes(role));
-        if (!hasAccess) {
-            return RestResponse.accessDenied(req, res);
-        }
-        next();
-    };
+const role = (req, res, next, allowedRoles) => {
+    const user = req.user;
+    if (!user) {
+        return RestResponse.unauthorized(req, res);
+    }
+    const realmRoles = (user?.realm_access?.roles ?? []).map((r) => r.toUpperCase());
+    const clientRoles = Object.values(user?.resource_access ?? {})
+        .flatMap((r) => r.roles ?? [])
+        .map((r) => r.toUpperCase());
+    const allowedUpper = allowedRoles.map(r => r.toUpperCase());
+    const allRoles = [...realmRoles, ...clientRoles];
+    const hasAccess = allowedUpper.some((role) => allRoles.includes(role));
+    if (!hasAccess) {
+        return RestResponse.accessDenied(req, res);
+    }
+    next();
 };
 const success = (req, res, data, message = null) => {
     res.status(200).json({ data, message });
@@ -119,3 +118,38 @@ const responseHandlerMiddleware = (req, res, next) => {
 export const RestMiddleware = {
     responseHandlerMiddleware
 };
+const colors = {
+    RESET: "\x1b[0m",
+    RED: "\x1b[31m",
+    GREEN: "\x1b[32m",
+    YELLOW: "\x1b[33m"
+};
+const isProduction = process.env.NODE_ENV === "production";
+export const log = (level, message, meta) => {
+    const timestamp = new Date().toISOString();
+    // انتخاب رنگ فقط در dev
+    let color = colors.RESET;
+    if (!isProduction) {
+        if (level === "INFO")
+            color = colors.GREEN;
+        if (level === "WARN")
+            color = colors.YELLOW;
+        if (level === "ERROR")
+            color = colors.RED;
+    }
+    // گرفتن stack trace
+    const stack = new Error().stack?.split("\n")[2]; // خط Caller
+    let location = "";
+    if (stack) {
+        const match = stack.match(/\((.*):(\d+):(\d+)\)/);
+        if (match) {
+            const fileName = path.basename(match[1]);
+            const line = match[2];
+            const column = match[3];
+            location = `${fileName}:${line}:${column}`;
+        }
+    }
+    const metaStr = meta ? `. ${JSON.stringify(meta)}` : "";
+    // چاپ لاگ
+    console.log(`${color}[${timestamp}][${location}][${level}] ${message}${metaStr}${colors.RESET}`);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "response-standardizer",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Express middleware to standardize API responses",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -3,6 +3,7 @@ import { ErrorFields, PaginationMeta, StandardResponse, RestResponseFunctions, R
 import { generateRequestId, getTimestamp } from "./utils.js";
 import axios from "axios";
 import jwt from "jsonwebtoken";
+import path from "path";
 declare global {
   namespace Express {
     interface Response {
@@ -40,7 +41,7 @@ export const protect = (allowedRoles?: string[]) => {
             const decoded = jwt.verify(token, KEYCLOAK_PUBLIC_KEY, { algorithms: ["RS256"] });
             (req as any).user = decoded;
             if(allowedRoles)
-                return role(allowedRoles);
+                return role(req, res, next, allowedRoles);
             
             next();
         } catch (err) {
@@ -50,9 +51,8 @@ export const protect = (allowedRoles?: string[]) => {
     }
   
 }
-const role = (allowedRoles: string[]) => {
-  return (req: any, res: any, next: any) => {
-    const user = req.user;
+const role = (req: any, res: any, next: any, allowedRoles: string[]) => {
+  const user = req.user;
     if (!user) {
       return RestResponse.unauthorized(req, res);
     }
@@ -69,8 +69,6 @@ const role = (allowedRoles: string[]) => {
       return RestResponse.accessDenied(req, res)
     }
     next()
-  }
-  
 }
 const success = <T>(req: Request, res: Response, data: T, message: string | null = null) => {
     res.status(200).json({ data, message });
@@ -176,4 +174,44 @@ const responseHandlerMiddleware = (
 
 export const RestMiddleware: RestMiddlewareFunctions = {
     responseHandlerMiddleware
-}
+}
+
+
+const colors = {
+    RESET: "\x1b[0m",
+    RED: "\x1b[31m",
+    GREEN: "\x1b[32m",
+    YELLOW: "\x1b[33m"
+};
+
+const isProduction = process.env.NODE_ENV === "production";
+
+export const log = (level: "INFO" | "WARN" | "ERROR", message: string, meta?: any) => {
+    const timestamp = new Date().toISOString();
+
+    // انتخاب رنگ فقط در dev
+    let color = colors.RESET;
+    if (!isProduction) {
+        if (level === "INFO") color = colors.GREEN;
+        if (level === "WARN") color = colors.YELLOW;
+        if (level === "ERROR") color = colors.RED;
+    }
+
+    // گرفتن stack trace
+    const stack = new Error().stack?.split("\n")[2]; // خط Caller
+    let location = "";
+    if (stack) {
+        const match = stack.match(/\((.*):(\d+):(\d+)\)/);
+        if (match) {
+            const fileName = path.basename(match[1]);
+            const line = match[2];
+            const column = match[3];
+            location = `${fileName}:${line}:${column}`;
+        }
+    }
+
+    const metaStr = meta ? `. ${JSON.stringify(meta)}` : "";
+
+    // چاپ لاگ
+    console.log(`${color}[${timestamp}][${location}][${level}] ${message}${metaStr}${colors.RESET}`);
+};