@wandzai/utils 1.0.33 → 1.0.35-test-encode-uri

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wandzai/utils",
-  "version": "1.0.33",
+  "version": "1.0.35-test-encode-uri",
   "description": "Common used utilities library",
   "main": "src/index",
   "scripts": {

package/src/encrypt-decrypt.js

@@ -4,13 +4,13 @@ exports.decryptData = exports.encryptData = void 0;
 const CryptoJS = require("crypto-js");
 const key = '66807eb6-f5c0-4245-8e4c-0c5d3f80f203';
 const encryptData = (data) => {
-    const encryptedData = CryptoJS.AES.encrypt(JSON.stringify(data), key).toString();
+    const encryptedData = CryptoJS.RC4.encrypt(JSON.stringify(data), key).toString();
     return encodeURIComponent(encryptedData);
 };
 exports.encryptData = encryptData;
 const decryptData = (data) => {
     const decodedEncrypted = decodeURIComponent(data);
-    const bytes = CryptoJS.AES.decrypt(decodedEncrypted, key);
+    const bytes = CryptoJS.RC4.decrypt(decodedEncrypted, key);
     return JSON.parse(bytes.toString(CryptoJS.enc.Utf8));
 };
 exports.decryptData = decryptData;

package/src/http.d.ts

@@ -1,4 +1,4 @@
 import { Request } from 'express';
 export declare function getIpFromHttpRequest(req: Request): string;
-export declare function buildUriBodyString(json: object): string;
+export declare function buildUriBodyString(queryParams: Record<string, any>): string;
 export declare function getEncodedQueryParams(fullUrl: string): object;

package/src/http.js

@@ -9,9 +9,9 @@ function getIpFromHttpRequest(req) {
 }
 exports.getIpFromHttpRequest = getIpFromHttpRequest;
 ;
-function buildUriBodyString(json) {
-    return Object.entries(json)
-        .map(([key, val]) => `${encodeURIComponent(key)}=${encodeURIComponent(val)}`)
+function buildUriBodyString(queryParams) {
+    return Object.keys(queryParams)
+        .map((key) => `${encodeURIComponent(key)}=${encodeURIComponent(JSON.stringify(queryParams[key]))}`)
         .join('&');
 }
 exports.buildUriBodyString = buildUriBodyString;
@@ -24,7 +24,12 @@ function getEncodedQueryParams(fullUrl) {
     const queryString = fullUrl.substring(queryStringStartIndex + 1);
     const data = querystring.parse(queryString);
     return Object.keys(data).reduce((acc, key) => {
-        acc[key] = JSON.parse(data[key]);
+        try {
+            acc[key] = JSON.parse(data[key]);
+        }
+        catch (e) {
+            acc[key] = data[key];
+        }
         return acc;
     }, {});
 }

package/src/http.js.map

@@ -1 +1 @@
-{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../libs/utils/src/http.ts"],"names":[],"mappings":";;;AACA,2CAA2C;AAM3C,SAAgB,oBAAoB,CAAC,GAAY;IAChD,OAAO,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC;QACpC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;QAC7D,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;AAC7B,CAAC;AAJD,oDAIC;AAAA,CAAC;AAEF,SAAgB,kBAAkB,CAAC,IAAY;IAC9C,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SACzB,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;SAC5E,IAAI,CAAC,GAAG,CAAC,CAAC;AACb,CAAC;AAJD,gDAIC;AAAA,CAAC;AAEF,SAAgB,qBAAqB,CAAC,OAAe;IACpD,MAAM,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACnD,IAAI,qBAAqB,KAAK,CAAC,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,CAAC;IACX,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,qBAAqB,GAAG,CAAC,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAE5C,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5C,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAW,CAAC,CAAC;QAC3C,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAAE,CAAC,CAAC;AACR,CAAC;AAbD,sDAaC"}
+{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../libs/utils/src/http.ts"],"names":[],"mappings":";;;AACA,2CAA2C;AAM3C,SAAgB,oBAAoB,CAAC,GAAY;IAChD,OAAO,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC;QACpC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;QAC7D,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;AAC7B,CAAC;AAJD,oDAIC;AAAA,CAAC;AAEF,SAAgB,kBAAkB,CAAC,WAAgC;IAClE,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;SAC7B,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;SAClG,IAAI,CAAC,GAAG,CAAC,CAAC;AACb,CAAC;AAJD,gDAIC;AAAA,CAAC;AAQF,SAAgB,qBAAqB,CAAC,OAAe;IACpD,MAAM,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACnD,IAAI,qBAAqB,KAAK,CAAC,CAAC,EAAE,CAAC;QAClC,OAAO,EAAE,CAAC;IACX,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,qBAAqB,GAAG,CAAC,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAE5C,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC5C,IAAI,CAAC;YACJ,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAW,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;QACD,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAAE,CAAC,CAAC;AACR,CAAC;AAjBD,sDAiBC"}

package/src/logger.d.ts

@@ -0,0 +1,12 @@
+import { Logger } from 'winston';
+export interface IMeta {
+    clientTag?: string;
+    domain?: string;
+    campaignId?: string;
+    userId?: string;
+    trackingGuid?: string;
+}
+export interface IEnrichedLogger extends Logger {
+    createChildLogger(meta?: IMeta): Logger;
+}
+export declare function customLogger(serviceName: string): IEnrichedLogger;

package/src/logger.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.customLogger = void 0;
+const uuid_1 = require("uuid");
+const winston = require("winston");
+const { createLogger, format, transports } = winston;
+const createEnrichedLogger = (serviceName) => {
+    const logger = createLogger({
+        level: 'debug',
+        defaultMeta: { service: serviceName },
+        transports: [
+            process.env.NX_LOG_READABLE === 'true'
+                ? new transports.Console({
+                    format: format.simple(),
+                })
+                : new transports.Console({
+                    format: format.json(),
+                }),
+        ],
+    });
+    return {
+        getLogger: () => {
+            return logger;
+        },
+        createChildLogger: (meta) => {
+            let combinedMeta = { trackingGuid: (0, uuid_1.v4)() };
+            if (meta)
+                combinedMeta = { ...combinedMeta, ...meta };
+            return logger.child(combinedMeta);
+        },
+    };
+};
+function customLogger(serviceName) {
+    const enrichedLogger = createEnrichedLogger(serviceName);
+    const handler = {
+        get: function (target, prop, receiver) {
+            if (prop === 'createChildLogger') {
+                return target.createChildLogger;
+            }
+            return target.getLogger()[prop];
+        },
+    };
+    return new Proxy(enrichedLogger, handler);
+}
+exports.customLogger = customLogger;
+//# sourceMappingURL=logger.js.map

package/src/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../libs/utils/src/logger.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAClC,mCAAmC;AAGnC,MAAM,EAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAC,GAAG,OAAO,CAAC;AAcnD,MAAM,oBAAoB,GAAG,CAAC,WAAmB,EAAE,EAAE;IACjD,MAAM,MAAM,GAAG,YAAY,CAAC;QACxB,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,EAAC,OAAO,EAAE,WAAW,EAAC;QACnC,UAAU,EAAE;YACR,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM;gBAClC,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC;oBACrB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;iBAC1B,CAAC;gBACF,CAAC,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC;oBACrB,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;iBACxB,CAAC;SACT;KACJ,CAAC,CAAC;IAEH,OAAO;QACH,SAAS,EAAE,GAAG,EAAE;YACZ,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,iBAAiB,EAAE,CAAC,IAAY,EAAE,EAAE;YAChC,IAAI,YAAY,GAAG,EAAC,YAAY,EAAE,IAAA,SAAM,GAAE,EAAC,CAAC;YAC5C,IAAI,IAAI;gBAAE,YAAY,GAAG,EAAC,GAAG,YAAY,EAAE,GAAG,IAAI,EAAC,CAAC;YACpD,OAAO,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACtC,CAAC;KACJ,CAAC;AACN,CAAC,CAAC;AAEF,SAAgB,YAAY,CAAC,WAAmB;IAC5C,MAAM,cAAc,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG;QACZ,GAAG,EAAE,UAAU,MAAM,EAAE,IAAI,EAAE,QAAQ;YACjC,IAAI,IAAI,KAAK,mBAAmB,EAAE,CAAC;gBAC/B,OAAO,MAAM,CAAC,iBAAiB,CAAC;YACpC,CAAC;YAED,OAAO,MAAM,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;KACJ,CAAC;IAEF,OAAO,IAAI,KAAK,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAC9C,CAAC;AAbD,oCAaC"}