drapcode-utility 1.6.1 → 1.6.3

package/build/encryption/crypt.js

@@ -55,7 +55,7 @@ var encryptData = function (data, key) { return __awaiter(void 0, void 0, void 0
             return [2 /*return*/, handleExtraString(result, true)];
         }
         catch (error) {
-            console.log("\n Error: ", error);
+            console.error("\n Error: ", error);
             return [2 /*return*/, data];
         }
         return [2 /*return*/];
@@ -76,7 +76,7 @@ var decryptData = function (data, key) { return __awaiter(void 0, void 0, void 0
             return [2 /*return*/, decryptedBuffer.toString()];
         }
         catch (error) {
-            console.log("\n Error: ", error);
+            console.error("\n Error: ", error);
             return [2 /*return*/, data];
         }
         return [2 /*return*/];

package/build/encryption/file.js

@@ -96,7 +96,7 @@ var encryptFile = function (filePath, key) { return __awaiter(void 0, void 0, vo
                 return [2 /*return*/, encryptedFilePath];
             case 3:
                 error_1 = _a.sent();
-                console.log("\n Error: ", error_1);
+                console.error("\n Error: ", error_1);
                 throw error_1;
             case 4: return [2 /*return*/];
         }
@@ -125,7 +125,7 @@ var decryptFile = function (encryptedFilePath, key) { return __awaiter(void 0, v
                 return [2 /*return*/, decryptedFilePath];
             case 3:
                 error_2 = _a.sent();
-                console.log("Error:", error_2);
+                console.error("Error:", error_2);
                 throw error_2;
             case 4: return [2 /*return*/];
         }

package/build/errors/axios-error.js

@@ -8,15 +8,15 @@ var parseAxiosError = function (error) {
     var response = error.response, request = error.request, message = error.message;
     var errData = "", errStatus = 400;
     if (response) {
-        console.log("err.response.data: ", response.data);
-        console.log("err.response.status: ", response.status);
-        console.log("err.response.headers", response.headers);
+        console.error("err.response.data: ", response.data);
+        console.error("err.response.status: ", response.status);
+        console.error("err.response.headers", response.headers);
         errData = response.data;
         errStatus = response.status;
     }
     else if (request) {
         errData = "No Response Received from the API";
-        console.log("err.request: ", request);
+        console.error("err.request: ", request);
     }
     else {
         if (message.includes("ECONNABORTED")) {

package/build/format-fields/index.js

@@ -104,7 +104,7 @@ var xssSanitizer = function (req, res, next) {
             req.headers = (0, exports.cleanXssValuesFromData)(req.headers);
     }
     catch (error) {
-        console.log("\n error :>> ", error);
+        console.error("\n error :>> ", error);
     }
     next();
 };
@@ -127,7 +127,7 @@ var cleanXssValuesFromData = function (data, fields) {
         return data;
     }
     catch (error) {
-        console.log("\n error :>> ", error);
+        console.error("\n error :>> ", error);
     }
 };
 exports.cleanXssValuesFromData = cleanXssValuesFromData;
@@ -149,7 +149,7 @@ var sanitizeFieldValue = function (value) {
         if (Array.isArray(value)) {
             value = value.map(function (val) { return sanitizeFieldValue(val); });
         }
-        else if (typeof value === 'object' && value !== null) {
+        else if (typeof value === "object" && value !== null) {
             var tempItem = value;
             var itemKeys = Object.keys(tempItem);
             if (itemKeys.length) {

package/build/middlewares/interceptor-logger.js

@@ -1,41 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.interceptLogger = void 0;
-var drapcode_logger_1 = require("drapcode-logger");
-var date_util_1 = require("../utils/date-util");
 var interceptLogger = function (req, res, next) {
-    var loggerPath = process.env.LOG_FOLDER_PATH || "/tmp/logs";
-    var originalUrl = req.originalUrl, method = req.method, body = req.body, params = req.params, query = req.query, db = req.db, projectName = req.projectName, projectId = req.projectId, ip = req.ip;
-    var reqObject = {
-        uri: originalUrl,
-        method: method,
-        body: body,
-        params: params,
-        query: query,
-        dbName: "",
-        message: "",
-        line: "",
-        ip: ip,
+    return next();
+    /**
+    let loggerPath = process.env.LOG_FOLDER_PATH || "/tmp/logs";
+    const {
+      originalUrl,
+      method,
+      body,
+      params,
+      query,
+      db,
+      projectName,
+      projectId,
+      ip,
+    } = req;
+  
+    const reqObject = {
+      uri: originalUrl,
+      method,
+      body,
+      params,
+      query,
+      dbName: "",
+      message: "",
+      line: "",
+      ip,
     };
     if (db) {
-        reqObject["dbName"] = db.name;
+      reqObject["dbName"] = db.name;
     }
+  
     if (projectName) {
-        loggerPath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerDateFormat)());
+      loggerPath = `${loggerPath}/${projectName}/${createLoggerDateFormat()}`;
+    } else if (projectId) {
+      loggerPath = `${loggerPath}/${projectId}/${createLoggerDateFormat()}`;
+    } else {
+      loggerPath = `${loggerPath}/${createLoggerDateFormat()}`;
     }
-    else if (projectId) {
-        loggerPath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerDateFormat)());
-    }
-    else {
-        loggerPath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerDateFormat)());
-    }
-    var logger = new drapcode_logger_1.FileLogger(loggerPath).createLogger();
-    var oldSend = res.send;
-    res.send = function (data) {
-        logger.info(data);
-        oldSend.apply(res, arguments);
-        // saveRequest(req, data);
+    const logger = new FileLogger(loggerPath).createLogger();
+    let oldSend = res.send;
+    res.send = function (data: any) {
+      logger.info(data);
+      oldSend.apply(res, arguments);
+      // saveRequest(req, data);
     };
     next();
+     */
 };
 exports.interceptLogger = interceptLogger;

package/build/utils/query-parser.js

@@ -63,7 +63,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
     if (currentUserSetting === void 0) { currentUserSetting = {}; }
     if (lookupConfig === void 0) { lookupConfig = []; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var filterQuery, rlsFilterQuery, aggregateQuery, queryStr, searchQueryObj, _a, searchAggregateQuery, likeQuery, finalQuery, _b, searchAggregateQuery, likeQuery, projection, finder, sortBy, orderBy, offset, limit, direction, str;
+        var filterQuery, rlsFilterQuery, aggregateQuery, queryStr, searchQueryObj, _a, searchAggregateQuery, likeQuery, finalQuery, _b, searchAggregateQuery, likeQuery, projection, finder, sortBy, orderBy, offset, limit, resetLimit, direction, str;
         var _c, _d, _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -148,10 +148,16 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     }
                     offset = externalParams.offset || 0;
                     limit = externalParams.limit || 20000;
+                    resetLimit = externalParams.resetLimit || false;
                     if (externalParams.pagination == "false") {
                         limit = 0;
                         sortBy = 0;
                     }
+                    // Reset limit value to 1 in case filter is of type FIND or when it's a COUNT finder for FIND filter
+                    if (finder === "FIND" || (finder === "COUNT" && resetLimit)) {
+                        offset = 0;
+                        limit = 1;
+                    }
                     if (finder != "COUNT" && sortBy) {
                         direction = orderBy && orderBy == "asc" ? 1 : -1;
                         aggregateQuery.push({ $sort: (_e = {}, _e[sortBy] = direction, _e._id = 1, _e) });

package/build/utils/s3-util.js

@@ -246,7 +246,7 @@ var processAndRemoveExifDataFromImg = function (files) { return __awaiter(void 0
             case 2: return [2 /*return*/, promises];
             case 3:
                 error_2 = _a.sent();
-                console.log("\n error :>> ", error_2);
+                console.error("\n error :>> ", error_2);
                 return [3 /*break*/, 4];
             case 4: return [2 /*return*/];
         }
@@ -311,7 +311,7 @@ var processAndRemoveScriptFromSVG = function (files) { return __awaiter(void 0,
             case 2: return [3 /*break*/, 4];
             case 3:
                 error_3 = _a.sent();
-                console.log("\n error :>> ", error_3);
+                console.error("\n error :>> ", error_3);
                 return [3 /*break*/, 4];
             case 4: return [2 /*return*/];
         }

package/build/utils/util.js

@@ -392,7 +392,7 @@ var parseJsonString = function (str) {
         return JSON.parse(str);
     }
     catch (e) {
-        console.log("Error: ", e);
+        console.error("Error: ", e);
         return {};
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -39,7 +39,7 @@
     "dompurify": "^3.1.7",
     "drapcode-constant": "^1.4.9",
     "drapcode-logger": "^1.1.9",
-    "drapcode-redis": "^1.0.7",
+    "drapcode-redis": "^1.0.8",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",