serverpreconfigured 2.2.2 → 2.2.4

package/dist/logs/logs.d.ts

@@ -10,11 +10,15 @@ export interface SaveLogOptions {
     userId?: number;
     data: string;
     severity: LogSeverity;
+    addPath?: string;
+    filePrefix?: string;
     penTestSuspcion?: boolean;
     req?: Request;
     ip?: string;
     url?: string;
 }
+export declare function stringfyError(err: any): string;
+export declare function getIpFromRequest(req: Request): string;
 export declare function saveInternalErrorLog(req: Request, error: any, options?: {
     penTestSuspcion?: boolean;
     severity?: LogSeverity;

package/dist/logs/logs.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveLog = exports.saveInternalErrorLog = exports.LogSeverity = exports.BASE_LOG_PATH = void 0;
+exports.saveLog = exports.saveInternalErrorLog = exports.getIpFromRequest = exports.stringfyError = exports.LogSeverity = exports.BASE_LOG_PATH = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 exports.BASE_LOG_PATH = './logs';
@@ -41,11 +41,24 @@ function stringfyError(err) {
     }
     return retData;
 }
+exports.stringfyError = stringfyError;
+function getIpFromRequest(req) {
+    //@
+    let ips = (req.headers['cf-connecting-ip'] ||
+        req.headers['x-real-ip'] ||
+        req.headers['x-forwarded-for'] ||
+        req.ip || '');
+    if (typeof (ips) == 'string') {
+        ips = ips.split(',');
+    }
+    return ips[0].trim();
+}
+exports.getIpFromRequest = getIpFromRequest;
 function saveInternalErrorLog(req, error, options) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const ip = req.ip;
+            const ip = getIpFromRequest(req);
             const url = req.originalUrl;
             //@ts-ignore
             const userId = (_a = req.user) === null || _a === void 0 ? void 0 : _a.id;
@@ -70,6 +83,12 @@ function saveLog(options) {
         fs_1.default.mkdirSync(exports.BASE_LOG_PATH);
     }
     let basePath = exports.BASE_LOG_PATH;
+    if (options.addPath) {
+        basePath = path_1.default.join(basePath, options.addPath);
+        if (!fs_1.default.existsSync(basePath)) {
+            fs_1.default.mkdirSync(basePath);
+        }
+    }
     if (options.userId) {
         basePath = path_1.default.join(basePath, options.userId.toString());
     }
@@ -79,7 +98,7 @@ function saveLog(options) {
     if (!fs_1.default.existsSync(basePath)) {
         fs_1.default.mkdirSync(basePath);
     }
-    let fileName = path_1.default.join(basePath, `${getDateString(new Date())}.csv`);
+    let fileName = path_1.default.join(basePath, `${options.filePrefix ? options.filePrefix + '_' : ""}${getDateString(new Date())}.csv`);
     let data = "";
     if (fs_1.default.existsSync(fileName)) {
         data = fs_1.default.readFileSync(fileName).toString() + "\n";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverpreconfigured",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "\"Pre-configured server with authentication system and database integration\"",
   "main": "dist/server.js",
   "keywords": [

package/src/logs/logs.ts

@@ -12,6 +12,8 @@ export interface SaveLogOptions{
     userId?:number;
     data:string;
     severity:LogSeverity;
+    addPath?:string;
+    filePrefix?:string;
     penTestSuspcion?:boolean;
     req?:Request;
     ip?:string;
@@ -19,7 +21,7 @@ export interface SaveLogOptions{
 }
 
 
-function stringfyError(err:any):string{
+export function stringfyError(err:any):string{
    const type=typeof(err);
    if(type!=='object')
       return err.toString();
@@ -36,9 +38,22 @@ function stringfyError(err:any):string{
    }
    return retData;
 }
+export function getIpFromRequest(req:Request){
+        //@
+        let ips = (
+            req.headers['cf-connecting-ip'] ||
+            req.headers['x-real-ip'] ||
+            req.headers['x-forwarded-for'] ||
+            req.ip || ''
+        );
+        if(typeof(ips)=='string'){
+            ips=ips.split(',');
+        }
+        return ips[0].trim();
+}
 export async function saveInternalErrorLog(req:Request,error:any,options?:{penTestSuspcion?:boolean,severity?:LogSeverity}){
      try{
-         const ip=req.ip;
+         const ip=getIpFromRequest(req);
          const url=req.originalUrl;
          //@ts-ignore
          const userId=req.user?.id;
@@ -60,6 +75,12 @@ export function saveLog(options:SaveLogOptions){
         fs.mkdirSync(BASE_LOG_PATH);
     }
     let basePath=BASE_LOG_PATH;
+    if(options.addPath){
+        basePath=path.join(basePath,options.addPath);
+        if(!fs.existsSync(basePath)){
+            fs.mkdirSync(basePath);
+        }
+    }
     if(options.userId){
          basePath=path.join(basePath,options.userId.toString());
     }else{
@@ -68,7 +89,7 @@ export function saveLog(options:SaveLogOptions){
     if(!fs.existsSync(basePath)){
         fs.mkdirSync(basePath);
     }
-    let fileName=path.join(basePath,`${getDateString(new Date())}.csv`);
+    let fileName=path.join(basePath,`${options.filePrefix?options.filePrefix+'_':""}${getDateString(new Date())}.csv`);
     let data="";
     if(fs.existsSync(fileName)){
         data=fs.readFileSync(fileName).toString()+"\n";