skyeye-svc-common-utils 1.0.61 → 1.0.63

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export * from './utils/appConst';
 export * from './utils/commonUtils';
 export * from './utils/authentication/auth';
 export * from './utils/logger/logger';
-export { default as morganLogger } from './utils/logger/morganLogger';
+export * from './utils/logger/morganLogger';
 export * from './utils/middleware/handleError';
 export * from './utils/middleware/isPublicUser';
 export * from './utils/middleware/overwriteConst';

package/dist/index.js

@@ -13,18 +13,13 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.morganLogger = void 0;
 __exportStar(require("./utils/appConfig"), exports);
 __exportStar(require("./utils/appConst"), exports);
 __exportStar(require("./utils/commonUtils"), exports);
 __exportStar(require("./utils/authentication/auth"), exports);
 __exportStar(require("./utils/logger/logger"), exports);
-var morganLogger_1 = require("./utils/logger/morganLogger");
-Object.defineProperty(exports, "morganLogger", { enumerable: true, get: function () { return __importDefault(morganLogger_1).default; } });
+__exportStar(require("./utils/logger/morganLogger"), exports);
 __exportStar(require("./utils/middleware/handleError"), exports);
 __exportStar(require("./utils/middleware/isPublicUser"), exports);
 __exportStar(require("./utils/middleware/overwriteConst"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,mDAAiC;AACjC,sDAAoC;AACpC,8DAA4C;AAC5C,wDAAsC;AACtC,4DAAsE;AAA7D,6HAAA,OAAO,OAAgB;AAChC,iEAA+C;AAC/C,kEAAgD;AAChD,oEAAkD;AAClD,uEAAqD;AACrD,mEAAiD;AACjD,gEAA8C;AAC9C,qDAAmC;AACnC,4DAA0C;AAC1C,oEAAkD;AAClD,gEAA8C;AAC9C,mEAAiD;AACjD,gEAA8C;AAC9C,+DAA6C;AAC7C,gEAA8C;AAC9C,mDAAiC;AACjC,yDAAuC;AACvC,mEAAiD;AACjD,2CAAyB;AACzB,oDAAkC;AAClC,uDAAqC;AACrC,mEAAiD;AACjD,+DAA6C;AAC7C,4EAA0D"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAkC;AAClC,mDAAiC;AACjC,sDAAoC;AACpC,8DAA4C;AAC5C,wDAAsC;AACtC,8DAA4C;AAC5C,iEAA+C;AAC/C,kEAAgD;AAChD,oEAAkD;AAClD,uEAAqD;AACrD,mEAAiD;AACjD,gEAA8C;AAC9C,qDAAmC;AACnC,4DAA0C;AAC1C,oEAAkD;AAClD,gEAA8C;AAC9C,mEAAiD;AACjD,gEAA8C;AAC9C,+DAA6C;AAC7C,gEAA8C;AAC9C,mDAAiC;AACjC,yDAAuC;AACvC,mEAAiD;AACjD,2CAAyB;AACzB,oDAAkC;AAClC,uDAAqC;AACrC,mEAAiD;AACjD,+DAA6C;AAC7C,4EAA0D"}

package/dist/interfaces/index.d.ts

@@ -6,3 +6,5 @@ import { SubcriptionFeaturePermissionModel } from './subcriptionFeaturePermissio
 import { GrpcListRequest } from './grpcListRequest';
 import { GrpcServiceResponse } from './grpcServiceResponse';
 export { ApiResponse, ServiceResponse, UserInfo, Pagination, SubcriptionFeaturePermissionModel, GrpcListRequest, GrpcServiceResponse };
+export * from './internalHttp/request';
+export * from './internalHttp/response';

package/dist/interfaces/index.js

@@ -1,4 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubcriptionFeaturePermissionModel = exports.Pagination = exports.UserInfo = void 0;
 const userInfo_1 = require("./userInfo");
@@ -7,4 +21,6 @@ const pagination_1 = require("./pagination");
 Object.defineProperty(exports, "Pagination", { enumerable: true, get: function () { return pagination_1.Pagination; } });
 const subcriptionFeaturePermissionModel_1 = require("./subcriptionFeaturePermissionModel");
 Object.defineProperty(exports, "SubcriptionFeaturePermissionModel", { enumerable: true, get: function () { return subcriptionFeaturePermissionModel_1.SubcriptionFeaturePermissionModel; } });
+__exportStar(require("./internalHttp/request"), exports);
+__exportStar(require("./internalHttp/response"), exports);
 //# sourceMappingURL=index.js.map

package/dist/interfaces/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":";;;AAEA,yCAAsC;AAQlC,yFARK,mBAAQ,OAQL;AAPZ,6CAA0C;AAQtC,2FARK,uBAAU,OAQL;AAPd,2FAAwF;AAQpF,kHARK,qEAAiC,OAQL"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,yCAAsC;AAQlC,yFARK,mBAAQ,OAQL;AAPZ,6CAA0C;AAQtC,2FARK,uBAAU,OAQL;AAPd,2FAAwF;AAQpF,kHARK,qEAAiC,OAQL;AAIrC,yDAAuC;AACvC,0DAAwC"}

package/dist/interfaces/internalHttp/request/index.d.ts

@@ -0,0 +1 @@
+export * from './search';

package/dist/interfaces/internalHttp/request/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./search"), exports);
+//# sourceMappingURL=index.js.map

package/dist/interfaces/internalHttp/request/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/interfaces/internalHttp/request/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB"}

package/dist/interfaces/internalHttp/request/search.d.ts

@@ -0,0 +1,9 @@
+import { GrpcContentListReq } from "../../../models";
+export interface IContentAggregateByMentionedCompanyWithFiltersFilter {
+    identifier: string;
+    filter: Partial<GrpcContentListReq>;
+}
+export interface IContentAggregateByMentionedCompanyWithFiltersRequest {
+    isOverallMentionCountRequired: boolean;
+    filters: Array<IContentAggregateByMentionedCompanyWithFiltersFilter>;
+}

package/dist/interfaces/internalHttp/request/search.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=search.js.map

package/dist/interfaces/internalHttp/request/search.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/interfaces/internalHttp/request/search.ts"],"names":[],"mappings":""}

package/dist/interfaces/internalHttp/response/index.d.ts

@@ -0,0 +1 @@
+export * from './search';

package/dist/interfaces/internalHttp/response/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./search"), exports);
+//# sourceMappingURL=index.js.map

package/dist/interfaces/internalHttp/response/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/interfaces/internalHttp/response/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB"}

package/dist/interfaces/internalHttp/response/search.d.ts

@@ -0,0 +1,10 @@
+export interface IMentionedCompany {
+    companyGuid: string;
+    companyName: string;
+    mentionCount: number;
+}
+export interface IContentAggregateByMentionedCompanyWithFiltersResponseItem {
+    identifier: string;
+    totalMentionedCompany: number;
+    mentionedCompanies: IMentionedCompany[];
+}

package/dist/interfaces/internalHttp/response/search.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=search.js.map

package/dist/interfaces/internalHttp/response/search.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/interfaces/internalHttp/response/search.ts"],"names":[],"mappings":""}

package/dist/lib/httpClient.d.ts

@@ -1,3 +1,4 @@
+import { Response } from 'node-fetch';
 import { UserInfo } from '../interfaces';
 export declare function httpRequest(method: string, url: string, data?: any, headers?: any): Promise<Response>;
 export declare function sendInternalHttpRequest(userInfo: UserInfo, client: string, endpoint: string, data?: any, method?: string, select?: string[]): Promise<any>;

package/dist/lib/httpClient.js

@@ -8,26 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendInternalHttpRequest = exports.httpRequest = void 0;
+const node_fetch_1 = __importDefault(require("node-fetch"));
 const commonUtils_1 = require("../utils/commonUtils");
 const commonUtils_2 = require("../utils/commonUtils");
 const appConst_1 = require("../utils/appConst");
-const fetch = require('node-fetch');
+const logger_1 = require("../utils/logger/logger");
 function httpRequest(method, url, data = null, headers = (0, appConst_1.jsonContentTypeHeaders)()) {
     return __awaiter(this, void 0, void 0, function* () {
-        let init = {};
-        init = data === null ? {
-            method: method,
-            cache: "no-cache",
-            headers: headers
-        } : {
-            method: method,
-            cache: "no-cache",
-            headers: headers,
-            body: JSON.stringify(data)
+        const init = {
+            method,
+            headers,
+            body: data === null ? undefined : JSON.stringify(data)
         };
-        return fetch(url, init);
+        return (0, node_fetch_1.default)(url, init);
     });
 }
 exports.httpRequest = httpRequest;
@@ -42,9 +40,15 @@ function sendInternalHttpRequest(userInfo, client, endpoint, data = null, method
             let token = `${appConst_1.commonAppConst.httpHeader.BEARER} ${yield (0, commonUtils_2.generateJWT)(userInfo)}`;
             headers[appConst_1.commonAppConst.httpHeader.AUTHORIZATION] = token;
         }
-        return httpRequest(method, url, data, headers).then(response => {
+        let response;
+        try {
+            response = yield httpRequest(method, url, data, headers);
             return response.json();
-        });
+        }
+        catch (err) {
+            logger_1.logger.error(`Error while sending internal http request, receiving response: ${response}`);
+            throw new Error(`${err}`);
+        }
     });
 }
 exports.sendInternalHttpRequest = sendInternalHttpRequest;

package/dist/lib/httpClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../../src/lib/httpClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,sDAA6E;AAC7E,sDAAmD;AACnD,gDAA0E;AAC1E,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAEpC,SAAsB,WAAW,CAAC,MAAc,EAAE,GAAY,EAAG,OAAY,IAAI,EAAE,UAAgB,IAAA,iCAAsB,GAAE;;QACzH,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,CAAE;YACpB,MAAM,EAAE,MAAM;YACd,KAAK,EAAE,UAAU;YACjB,OAAO,EAAE,OAAO;SACnB,CAAC,CAAC,CAAC;YACF,MAAM,EAAE,MAAM;YACd,KAAK,EAAE,UAAU;YACjB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CAAC;QAEF,OAAO,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAdD,kCAcC;AAED,SAAsB,uBAAuB,CAAC,QAAiB,EAAE,MAAc,EAAE,QAAgB,EAAE,OAAY,IAAI,EAAE,MAAe,EAAE,MAAgB;;QACpJ,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,yBAAc,CAAC,UAAU,CAAC,IAAI,CAAC;QAClD,MAAM,cAAc,GAAG,MAAM,IAAA,+BAAiB,EAAC,MAAM,CAAC,CAAA;QACtD,MAAM,GAAG,GAAG,cAAc,GAAG,QAAQ,CAAC;QACtC,IAAI,OAAO,GAAO,IAAA,iCAAsB,GAAE,CAAC;QAC3C,IAAG,QAAQ,EAAC;YACV,QAAQ,GAAG,MAAM,IAAA,gCAAkB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YACrD,IAAI,KAAK,GAAW,GAAG,yBAAc,CAAC,UAAU,CAAC,MAAM,IAAI,MAAM,IAAA,yBAAW,EAAC,QAAQ,CAAC,EAAE,CAAC;YACzF,OAAO,CAAC,yBAAc,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC;SAC1D;QACD,OAAO,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC7D,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAA;QACxB,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA;AAbD,0DAaC"}
+{"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../../src/lib/httpClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4DAA0D;AAE1D,sDAA6E;AAC7E,sDAAmD;AACnD,gDAA0E;AAC1E,mDAAgD;AAEhD,SAAsB,WAAW,CAAC,MAAc,EAAE,GAAY,EAAG,OAAY,IAAI,EAAE,UAAgB,IAAA,iCAAsB,GAAE;;QACvH,MAAM,IAAI,GAAgB;YACtB,MAAM;YACN,OAAO;YACP,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SACzD,CAAA;QACD,OAAO,IAAA,oBAAK,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CAAA;AAPD,kCAOC;AAED,SAAsB,uBAAuB,CAAC,QAAiB,EAAE,MAAc,EAAE,QAAgB,EAAE,OAAY,IAAI,EAAE,MAAe,EAAE,MAAgB;;QAClJ,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,yBAAc,CAAC,UAAU,CAAC,IAAI,CAAC;QAClD,MAAM,cAAc,GAAG,MAAM,IAAA,+BAAiB,EAAC,MAAM,CAAC,CAAA;QACtD,MAAM,GAAG,GAAG,cAAc,GAAG,QAAQ,CAAC;QACtC,IAAI,OAAO,GAAO,IAAA,iCAAsB,GAAE,CAAC;QAC3C,IAAG,QAAQ,EAAC;YACR,QAAQ,GAAG,MAAM,IAAA,gCAAkB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;YACrD,IAAI,KAAK,GAAW,GAAG,yBAAc,CAAC,UAAU,CAAC,MAAM,IAAI,MAAM,IAAA,yBAAW,EAAC,QAAQ,CAAC,EAAE,CAAC;YACzF,OAAO,CAAC,yBAAc,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC;SAC5D;QAED,IAAI,QAAkB,CAAC;QACvB,IAAI;YACA,QAAQ,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YACzD,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC1B;QACD,OAAO,GAAG,EAAE;YACR,eAAM,CAAC,KAAK,CAAC,kEAAkE,QAAQ,EAAE,CAAC,CAAC;YAC3F,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC;SAC7B;IACL,CAAC;CAAA;AApBD,0DAoBC"}

package/dist/models/search/grpcCompanyListReq.d.ts

@@ -22,5 +22,15 @@ export declare class GrpcCompanyListReq {
     pLBeforeTaxFrom: number;
     pLBeforeTaxTo: number;
     isPrimary: boolean;
+    enableUniverse: boolean;
+    source: string[];
+    searchFields: string[];
+    secondarySearchFields: string[];
+    scoringProfile: string;
+    highlightFields: string;
+    highlightPreTag: string;
+    highlightPostTag: string;
+    relationship: string;
+    relationshipCountries: string[];
     constructor();
 }

package/dist/models/search/grpcCompanyListReq.js

@@ -26,6 +26,16 @@ class GrpcCompanyListReq {
         this.pLBeforeTaxFrom = null;
         this.pLBeforeTaxTo = null;
         this.isPrimary = null;
+        this.enableUniverse = null;
+        this.source = null;
+        this.searchFields = null;
+        this.secondarySearchFields = null;
+        this.scoringProfile = null;
+        this.highlightFields = null;
+        this.highlightPreTag = null;
+        this.highlightPostTag = null;
+        this.relationship = null;
+        this.relationshipCountries = null;
     }
 }
 exports.GrpcCompanyListReq = GrpcCompanyListReq;

package/dist/models/search/grpcCompanyListReq.js.map

@@ -1 +1 @@
-{"version":3,"file":"grpcCompanyListReq.js","sourceRoot":"","sources":["../../../src/models/search/grpcCompanyListReq.ts"],"names":[],"mappings":";;;AAAA,MAAa,kBAAkB;IAyB3B;QACI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACjC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC;QACrC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;QACnC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAClC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAChC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IAC1B,CAAC;CACJ;AAlDD,gDAkDC"}
+{"version":3,"file":"grpcCompanyListReq.js","sourceRoot":"","sources":["../../../src/models/search/grpcCompanyListReq.ts"],"names":[],"mappings":";;;AAAA,MAAa,kBAAkB;IAmC3B;QACI,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACjC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC;QACrC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;QACnC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAClC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAChC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;QAClC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;QAC7B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;IACtC,CAAC;CACJ;AAtED,gDAsEC"}

package/dist/utils/authentication/auth.js

@@ -17,15 +17,15 @@ const appConfig_1 = require("../appConfig");
 const appConst_1 = require("../appConst");
 const interfaces_1 = require("../../interfaces");
 const jwtUtils_1 = require("../commonUtils/jwtUtils");
-const apm_1 = require("../monitoring/apm");
+// import { apmStartTransaction, apmEndTransaction, apmSetUserContext } from '../monitoring/apm';
 const appUtils_1 = require("../commonUtils/appUtils");
 const appConfigKeyRetriever_1 = require("../commonUtils/appConfigKeyRetriever");
 function auth(req, res, next) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
-        if (req.url !== '/') {
-            yield (0, apm_1.apmStartTransaction)(req, res);
-        }
+        // if (req.url !== '/') {
+        //     await apmStartTransaction(req, res);
+        // } 
         if (req.url.indexOf('?') !== -1) {
             req.url = req.url.split('?')[0];
         }
@@ -137,7 +137,7 @@ function auth(req, res, next) {
                     userInfo.exp = Math.floor(Date.now() / 1000 + 3600);
                     userInfo.internalUsage = true;
                     res.locals.userInfo = userInfo;
-                    yield (0, apm_1.apmSetUserContext)(userInfo);
+                    // await apmSetUserContext(userInfo);
                 }
             }
         }
@@ -149,9 +149,7 @@ function auth(req, res, next) {
             return next();
         }
         else {
-            if (req.url !== '/') {
-                yield (0, apm_1.apmEndTransaction)(res);
-            }
+            // if (req.url !== '/') { await apmEndTransaction(res); }
             if (errorMessage) {
                 return res.status(statusCode).send(errorMessage);
             }

package/dist/utils/authentication/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/utils/authentication/auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/utils/authentication/auth.ts"],"names":[],"mappings":"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"}

package/dist/utils/commonUtils/appUtils.d.ts

@@ -11,3 +11,31 @@ export declare function userInfoToFeatureListByName(userInfo: UserInfo, featureN
 export declare function userInfoSimplifier(userInfo: UserInfo, select?: string[]): Promise<any>;
 export declare function userInfoFetcher(mode: string, userInfo?: UserInfo, authorizationHeader?: string, subKey?: string, userGuid?: string): Promise<UserInfo>;
 export declare function getInternalClient(client: string): Promise<string>;
+/**
+ * The function `getValidUserSubscriptionFeature` takes in a list of user subscription features,
+ * optional feature names, and a boolean flag indicating whether to include postfixes, and
+ * returns a list of valid features based on the user subscription.
+ * @param {string[]} userSubscriptionFeatures - An array of strings representing the features that the
+ * user has subscribed to.
+ * @param {string[]} [targetFeatureNames] - An optional array of feature list names. If provided, only
+ * the features from these feature lists will be considered. If not provided, all features will be
+ * considered.
+ * @param {boolean} [isPostfixNeeded=false] - A boolean flag indicating whether or not to include the
+ * postfix "|" in the returned valid features. If set to true, the valid features will include the
+ * postfix. If set to false, the valid features will not include the postfix.
+ * @returns an array of valid features from the user's subscription.
+ */
+export declare function getValidUserSubscriptionFeature(userSubscriptionFeatures: string[], targetFeatureNames?: string[], isPostfixNeeded?: boolean): string[];
+/**
+ * The function `getValidFeaturesFromInputFeatures` returns a list of valid features based on the
+ * intersection of userFeatures and inputFeatures, with an option to return all userFeatures if no
+ * intersection is found and isdefaultAll is true.
+ * @param {string[]} userFeatures - An array of features that the user has.
+ * @param {string[]} inputFeatures - An array of features that are requested.
+ * @param {boolean} [isdefaultAll=true] - A boolean flag indicating whether all user features should be
+ * returned if there are no valid features found in the intersection of userFeatures and inputFeatures.
+ * If isdefaultAll is set to true and there are no valid features found, the function will return all
+ * userFeatures. If isdefaultAll is set to false
+ * @returns an array of valid features.
+ */
+export declare function getValidFeaturesFromInputFeatures(userFeatures: string[], inputFeatures: string[], isdefaultAll?: boolean): string[];

package/dist/utils/commonUtils/appUtils.js

@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInternalClient = exports.userInfoFetcher = exports.userInfoSimplifier = exports.userInfoToFeatureListByName = exports.getUnlockedCode = exports.getLockedCode = exports.buildPaginationModel = exports.mappingToServiceResponse = exports.mappingToStringList = exports.mappingToModelList = exports.mappingToModel = void 0;
+exports.getValidFeaturesFromInputFeatures = exports.getValidUserSubscriptionFeature = exports.getInternalClient = exports.userInfoFetcher = exports.userInfoSimplifier = exports.userInfoToFeatureListByName = exports.getUnlockedCode = exports.getLockedCode = exports.buildPaginationModel = exports.mappingToServiceResponse = exports.mappingToStringList = exports.mappingToModelList = exports.mappingToModel = void 0;
+const lodash_1 = require("lodash");
 const logger_1 = require("../logger/logger");
 const interfaces_1 = require("../../interfaces");
 const appConst_1 = require("../../utils/appConst");
@@ -174,4 +175,62 @@ function getInternalClient(client) {
     });
 }
 exports.getInternalClient = getInternalClient;
+/**
+ * The function `getValidUserSubscriptionFeature` takes in a list of user subscription features,
+ * optional feature names, and a boolean flag indicating whether to include postfixes, and
+ * returns a list of valid features based on the user subscription.
+ * @param {string[]} userSubscriptionFeatures - An array of strings representing the features that the
+ * user has subscribed to.
+ * @param {string[]} [targetFeatureNames] - An optional array of feature list names. If provided, only
+ * the features from these feature lists will be considered. If not provided, all features will be
+ * considered.
+ * @param {boolean} [isPostfixNeeded=false] - A boolean flag indicating whether or not to include the
+ * postfix "|" in the returned valid features. If set to true, the valid features will include the
+ * postfix. If set to false, the valid features will not include the postfix.
+ * @returns an array of valid features from the user's subscription.
+ */
+function getValidUserSubscriptionFeature(userSubscriptionFeatures, targetFeatureNames, isPostfixNeeded = false) {
+    if (userSubscriptionFeatures.length === 0)
+        return [];
+    // Get list of feature list with feature list name(s) if provided, else include all feature list
+    const availableFeatureList = targetFeatureNames ? skyeye_common_const_1.allApplicationFeatures.filter(o => targetFeatureNames.includes(o.featureName)) : skyeye_common_const_1.allApplicationFeatures;
+    // Flatten list of feature list to get featureCode only, and push to a set for easy read
+    const availableFeatures = new Set((0, lodash_1.flatten)(availableFeatureList.map(o => o.features)).map(o => o.featureCode));
+    // User feature is valid only if it can be found in the available features
+    const userValidFeatures = [];
+    for (const userFeature of userSubscriptionFeatures) {
+        const [featureCode, postfix] = userFeature.split("|");
+        /**
+         * for feature with locked postfix e.g. "AntaraNews|LOCKED",
+         * take both feature code and postfix for comparison;
+         *
+         * for features without postfix e.g. "AntaraNews"
+         * OR, feature with number postfix e.g. "RADAR_COUNT|3",
+         * only take feature code for comparison
+         */
+        let isValid = skyeye_common_const_1.commonAppConst.lockedFeature.endsWith(postfix) ? availableFeatures.has(userFeature) : availableFeatures.has(featureCode);
+        if (isValid)
+            userValidFeatures.push(isPostfixNeeded ? userFeature : featureCode);
+    }
+    return userValidFeatures;
+}
+exports.getValidUserSubscriptionFeature = getValidUserSubscriptionFeature;
+/**
+ * The function `getValidFeaturesFromInputFeatures` returns a list of valid features based on the
+ * intersection of userFeatures and inputFeatures, with an option to return all userFeatures if no
+ * intersection is found and isdefaultAll is true.
+ * @param {string[]} userFeatures - An array of features that the user has.
+ * @param {string[]} inputFeatures - An array of features that are requested.
+ * @param {boolean} [isdefaultAll=true] - A boolean flag indicating whether all user features should be
+ * returned if there are no valid features found in the intersection of userFeatures and inputFeatures.
+ * If isdefaultAll is set to true and there are no valid features found, the function will return all
+ * userFeatures. If isdefaultAll is set to false
+ * @returns an array of valid features.
+ */
+function getValidFeaturesFromInputFeatures(userFeatures, inputFeatures, isdefaultAll = true) {
+    // Get the intersection of userFeature and inputFeatures
+    const targetFeatures = inputFeatures.filter(o => userFeatures.includes(o));
+    return (targetFeatures.length == 0) && isdefaultAll ? userFeatures : targetFeatures;
+}
+exports.getValidFeaturesFromInputFeatures = getValidFeaturesFromInputFeatures;
 //# sourceMappingURL=appUtils.js.map

package/dist/utils/commonUtils/appUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"appUtils.js","sourceRoot":"","sources":["../../../src/utils/commonUtils/appUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"appUtils.js","sourceRoot":"","sources":["../../../src/utils/commonUtils/appUtils.ts"],"names":[],"mappings":"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"}

package/dist/utils/commonUtils/responseUtils.js

@@ -33,7 +33,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserInfo = exports.sendResponse = exports.messageParser = exports.failResponse = exports.successResponse = void 0;
-const apm_1 = require("../monitoring/apm");
+// import { apmEndTransaction } from '../monitoring/apm';
 const logger_1 = require("../logger/logger");
 const appConst_1 = require("../appConst");
 const _ = __importStar(require("lodash"));
@@ -50,7 +50,7 @@ function successResponse(res, next, result) {
             totalCount: result.totalCount,
             aggregation: result.aggregation
         };
-        yield (0, apm_1.apmEndTransaction)(res);
+        // await apmEndTransaction(res);
         res.send(response);
     });
 }
@@ -95,7 +95,7 @@ function filterHandler(data, fields) {
 function failResponse(res, message = "", statusCode = 200) {
     return __awaiter(this, void 0, void 0, function* () {
         let response = { isSuccess: false, message: message };
-        yield (0, apm_1.apmEndTransaction)(res);
+        // await apmEndTransaction(res);
         res.status(statusCode).send(response);
         if (messageParser(message)) {
             logger_1.logger.error(`shut down by process.exit`);

package/dist/utils/commonUtils/responseUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"responseUtils.js","sourceRoot":"","sources":["../../../src/utils/commonUtils/responseUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"responseUtils.js","sourceRoot":"","sources":["../../../src/utils/commonUtils/responseUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,yDAAyD;AACzD,6CAA0C;AAC1C,0CAA+C;AAC/C,0CAA4B;AAG5B,SAAsB,eAAe,CAAC,GAAa,EAAE,IAAkB,EAAE,MAAuB;;QAC5F,IAAI,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAA,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;QAC1D,IAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YAClB,MAAM,CAAC,IAAI,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;SACzD;QACD,IAAI,QAAQ,GAAgB;YACxB,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,WAAW,EAAE,MAAM,CAAC,WAAW;SAClC,CAAA;QACD,gCAAgC;QAChC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvB,CAAC;CAAA;AAdD,0CAcC;AAED,SAAe,aAAa,CAAC,IAAS,EAAE,MAAgB;;QACpD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACtE,IAAI,eAAe,GAAO,EAAE,CAAA;QAC5B,IAAI,WAAW,GAAY,EAAE,CAAA;QAC7B,IAAG,UAAU,CAAC,MAAM,EAAE;YAClB,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACnB,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACjC,IAAI,EAAE,GAAG,EAAE,CAAA;gBACX,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACjB,IAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;oBACrB,IAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE;wBAC/C,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,CAAA;wBACxB,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;qBACvB;oBACD,eAAe,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;iBAC/B;YACL,CAAC,CAAC,CAAA;SACL;QACD,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAE,CAAO,CAAK,EAAE,EAAE;YAC/C,IAAI,aAAa,GAAQ,EAAE,CAAC;YAC5B,aAAa,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;YACjC,IAAG,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvB,KAAK,MAAM,CAAC,IAAI,WAAW,EAAE;oBACzB,IAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;wBACpB,IAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE;4BAClB,aAAa,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;yBACxB;wBACD,aAAa,CAAC,CAAC,CAAC,GAAG,MAAM,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAA;qBACnE;iBACJ;aACJ;YACD,OAAO,aAAa,CAAA;QACxB,CAAC,CAAA,CAAC,CAAC,CAAA;QACH,OAAO,IAAI,CAAA;IACf,CAAC;CAAA;AAED,SAAsB,YAAY,CAAC,GAAa,EAAE,UAAkB,EAAE,EAAE,aAAqB,GAAG;;QAC5F,IAAI,QAAQ,GAAgB,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACnE,gCAAgC;QAChC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAG,aAAa,CAAC,OAAO,CAAC,EAAE;YACvB,eAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAA;YACzC,OAAO,CAAC,IAAI,EAAE,CAAC;SAClB;IACL,CAAC;CAAA;AARD,oCAQC;AAED,SAAgB,aAAa,CAAC,UAAkB,EAAE;IAC9C,KAAK,IAAI,CAAC,IAAI,2BAAgB,EAAE;QAC5B,IAAG,OAAO,CAAC,QAAQ,CAAC,2BAAgB,CAAC,CAAC,CAAC,CAAC,EAAE;YACtC,OAAO,IAAI,CAAC;SACf;KACJ;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAPD,sCAOC;AAED,SAAsB,YAAY,CAAC,GAAa,EAAE,IAAkB,EAAE,MAAuB;;QACzF,IAAI,MAAM,CAAC,SAAS,EAAE;YAClB,MAAM,eAAe,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SAC5C;aACI;YACD,MAAM,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;SAC3C;IACL,CAAC;CAAA;AAPD,oCAOC;AAED,SAAgB,WAAW,CAAC,GAAa;IACrC,OAAO,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;AAC/B,CAAC;AAFD,kCAEC"}

package/dist/utils/documentation/swagger.js

@@ -17,12 +17,19 @@ let swaggerDefinition = {
                 type: "apiKey",
                 name: "x-api-key",
                 in: "header"
+            },
+            "bearerAuth": {
+                type: "http",
+                name: "JWT Token",
+                scheme: "bearer",
+                in: "header"
             }
         }
     },
     security: [
         {
-            "xApiKey": ['read', 'write']
+            "xApiKey": ['read', 'write'],
+            "bearerAuth": ['read', 'write']
         }
     ],
 };

package/dist/utils/documentation/swagger.js.map

@@ -1 +1 @@
-{"version":3,"file":"swagger.js","sourceRoot":"","sources":["../../../src/utils/documentation/swagger.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAyC;AACzC,4CAA+C;AAE/C,qBAAqB;AACrB,IAAI,iBAAiB,GAAG;IACpB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,2BAAe,CAAC,OAAO;IAC7B,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,2BAAe,CAAC,gBAAgB,EAAE,CAAC;IACpD,UAAU,EAAE;QACR,eAAe,EAAE;YACb,SAAS,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,WAAW;gBACjB,EAAE,EAAE,QAAQ;aACf;SACJ;KACJ;IACD,QAAQ,EAAE;QACN;YACI,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;SAC/B;KACJ;CACJ,CAAC;AAEF,+BAA+B;AAC/B,IAAI,OAAO,GAAG;IACV,4BAA4B;IAC5B,iBAAiB,EAAE,iBAAiB;IACpC,uBAAuB;IACvB,IAAI,EAAE,CAAC,SAAS,GAAG,yCAAyC,EAAE,SAAS,GAAG,iCAAiC,EAAE,SAAS,GAAG,iCAAiC,CAAC;CAC9J,CAAC;AAEW,QAAA,WAAW,GAAG,IAAA,uBAAY,EAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"swagger.js","sourceRoot":"","sources":["../../../src/utils/documentation/swagger.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAyC;AACzC,4CAA+C;AAE/C,qBAAqB;AACrB,IAAI,iBAAiB,GAAG;IACpB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,2BAAe,CAAC,OAAO;IAC7B,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,2BAAe,CAAC,gBAAgB,EAAE,CAAC;IACpD,UAAU,EAAE;QACR,eAAe,EAAE;YACb,SAAS,EAAE;gBACP,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,WAAW;gBACjB,EAAE,EAAE,QAAQ;aACf;YACD,YAAY,EAAE;gBACV,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,WAAW;gBACjB,MAAM,EAAE,QAAQ;gBAChB,EAAE,EAAE,QAAQ;aACf;SACJ;KACJ;IACD,QAAQ,EAAE;QACN;YACI,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YAC5B,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;SAClC;KACJ;CACJ,CAAC;AAEF,+BAA+B;AAC/B,IAAI,OAAO,GAAG;IACV,4BAA4B;IAC5B,iBAAiB,EAAE,iBAAiB;IACpC,uBAAuB;IACvB,IAAI,EAAE,CAAC,SAAS,GAAG,yCAAyC,EAAE,SAAS,GAAG,iCAAiC,EAAE,SAAS,GAAG,iCAAiC,CAAC;CAC9J,CAAC;AAEW,QAAA,WAAW,GAAG,IAAA,uBAAY,EAAC,OAAO,CAAC,CAAC"}

package/dist/utils/logger/logger.js

@@ -1,4 +1,15 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -8,22 +19,40 @@ const winston_1 = require("winston");
 const winston_daily_rotate_file_1 = __importDefault(require("winston-daily-rotate-file"));
 const appConfig_1 = require("../appConfig");
 exports.logger = (0, winston_1.createLogger)({
-    level: 'info',
-    format: winston_1.format.combine(winston_1.format.timestamp({
-        format: 'YYYY-MM-DD HH:mm:ss'
-    }), winston_1.format.errors({ stack: true }), winston_1.format.align(), winston_1.format.printf(info => {
-        return `${info.timestamp} - ${info.level}: ${info.message}`;
-    })),
+    defaultMeta: {
+        service: appConfig_1.commonAppConfig.AppName
+    },
+    exitOnError: false,
     transports: [
-        new winston_daily_rotate_file_1.default({ filename: appConfig_1.commonAppConfig.LogPath + 'backend-error-%DATE%.log', level: 'error', datePattern: 'YYYY-MM-DD' }),
-        new winston_daily_rotate_file_1.default({ filename: appConfig_1.commonAppConfig.LogPath + 'backend-combined-%DATE%.log', datePattern: 'YYYY-MM-DD' })
-    ]
+        new winston_daily_rotate_file_1.default({
+            filename: appConfig_1.commonAppConfig.LogPath + 'backend-combined-%DATE%.log',
+            datePattern: 'YYYY-MM-DD',
+            format: winston_1.format.combine(winston_1.format.json(), winston_1.format.timestamp(), winston_1.format.printf((_a) => {
+                var { timestamp, level, message } = _a, metadata = __rest(_a, ["timestamp", "level", "message"]);
+                return JSON.stringify(Object.assign({ timestamp,
+                    level,
+                    message }, (metadata || {})));
+            }))
+        }),
+        new winston_daily_rotate_file_1.default({
+            filename: appConfig_1.commonAppConfig.LogPath + 'backend-error-%DATE%.log',
+            level: 'error',
+            datePattern: 'YYYY-MM-DD',
+            format: winston_1.format.combine(winston_1.format.json(), winston_1.format.timestamp(), winston_1.format.printf((_a) => {
+                var { timestamp, level, message } = _a, metadata = __rest(_a, ["timestamp", "level", "message"]);
+                return JSON.stringify(Object.assign({ timestamp,
+                    level,
+                    message }, (metadata || {})));
+            }))
+        })
+    ],
+    format: winston_1.format.combine(winston_1.format.timestamp())
 });
-// If we're not in production then **ALSO** log to the `console`
-// with the colorized simple format.
-if (appConfig_1.commonAppConfig.NodeEnv !== 'production') {
-    exports.logger.add(new winston_1.transports.Console({
-        format: winston_1.format.combine(winston_1.format.colorize(), winston_1.format.simple())
-    }));
-}
+exports.logger.add(new winston_1.transports.Console({
+    format: winston_1.format.combine(winston_1.format.json(), winston_1.format.metadata(), winston_1.format.timestamp(), winston_1.format.printf(({ timestamp, level, message, metadata }) => {
+        return JSON.stringify(Object.assign({ timestamp,
+            level,
+            message }, (metadata || {})));
+    }))
+}));
 //# sourceMappingURL=logger.js.map

package/dist/utils/logger/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger/logger.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAyD;AACzD,0FAAwD;AACxD,4CAA6C;AAEhC,QAAA,MAAM,GAAG,IAAA,sBAAY,EAAC;IACjC,KAAK,EAAE,MAAM;IACb,MAAM,EAAE,gBAAM,CAAC,OAAO,CACpB,gBAAM,CAAC,SAAS,CAAC;QACf,MAAM,EAAE,qBAAqB;KAC9B,CAAC,EACF,gBAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAC9B,gBAAM,CAAC,KAAK,EAAE,EACd,gBAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,GAAG,IAAI,CAAC,SAAS,MAAM,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,OAAO,EAAE,CAAA;IAC5D,CAAC,CAAC,CACN;IACD,UAAU,EAAE;QACV,IAAI,mCAAe,CAAC,EAAE,QAAQ,EAAE,2BAAe,CAAC,OAAO,GAAG,0BAA0B,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAC,YAAY,EAAE,CAAC;QACjI,IAAI,mCAAe,CAAC,EAAE,QAAQ,EAAE,2BAAe,CAAC,OAAO,GAAG,6BAA6B,EAAE,WAAW,EAAC,YAAY,EAAE,CAAC;KACrH;CACF,CAAC,CAAC;AAEH,gEAAgE;AAChE,oCAAoC;AACpC,IAAI,2BAAe,CAAC,OAAO,KAAK,YAAY,EAAE;IAC5C,cAAM,CAAC,GAAG,CAAC,IAAI,oBAAU,CAAC,OAAO,CAAC;QAChC,MAAM,EAAE,gBAAM,CAAC,OAAO,CACpB,gBAAM,CAAC,QAAQ,EAAE,EACjB,gBAAM,CAAC,MAAM,EAAE,CAChB;KACF,CAAC,CAAC,CAAC;CACL"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger/logger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qCAAyD;AACzD,0FAAwD;AACxD,4CAA6C;AAEhC,QAAA,MAAM,GAAG,IAAA,sBAAY,EAAC;IACjC,WAAW,EAAE;QACT,OAAO,EAAE,2BAAe,CAAC,OAAO;KACnC;IACD,WAAW,EAAE,KAAK;IAClB,UAAU,EAAE;QACR,IAAI,mCAAe,CAAC;YAChB,QAAQ,EAAE,2BAAe,CAAC,OAAO,GAAG,6BAA6B;YACjE,WAAW,EAAE,YAAY;YACzB,MAAM,EAAE,gBAAM,CAAC,OAAO,CAClB,gBAAM,CAAC,IAAI,EAAE,EACb,gBAAM,CAAC,SAAS,EAAE,EAClB,gBAAM,CAAC,MAAM,CAAC,CAAC,EAA0C,EAAE,EAAE;oBAA9C,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,OAAe,EAAV,QAAQ,cAAxC,iCAA0C,CAAF;gBACnD,OAAO,IAAI,CAAC,SAAS,iBACjB,SAAS;oBACT,KAAK;oBACL,OAAO,IACJ,CAAC,QAAQ,IAAI,EAAE,CAAC,EACrB,CAAC;YACP,CAAC,CAAC,CACL;SACJ,CAAC;QACF,IAAI,mCAAe,CAAC;YAClB,QAAQ,EAAE,2BAAe,CAAC,OAAO,GAAG,0BAA0B;YAC9D,KAAK,EAAE,OAAO;YACd,WAAW,EAAE,YAAY;YACzB,MAAM,EAAE,gBAAM,CAAC,OAAO,CAClB,gBAAM,CAAC,IAAI,EAAE,EACb,gBAAM,CAAC,SAAS,EAAE,EAClB,gBAAM,CAAC,MAAM,CAAC,CAAC,EAA0C,EAAE,EAAE;oBAA9C,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,OAAe,EAAV,QAAQ,cAAxC,iCAA0C,CAAF;gBACnD,OAAO,IAAI,CAAC,SAAS,iBACjB,SAAS;oBACT,KAAK;oBACL,OAAO,IACJ,CAAC,QAAQ,IAAI,EAAE,CAAC,EACrB,CAAC;YACP,CAAC,CAAC,CACL;SACJ,CAAC;KACH;IACD,MAAM,EAAE,gBAAM,CAAC,OAAO,CAAC,gBAAM,CAAC,SAAS,EAAE,CAAC;CAC3C,CAAC,CAAC;AAGH,cAAM,CAAC,GAAG,CACN,IAAI,oBAAU,CAAC,OAAO,CAAC;IACnB,MAAM,EAAE,gBAAM,CAAC,OAAO,CAClB,gBAAM,CAAC,IAAI,EAAE,EACb,gBAAM,CAAC,QAAQ,EAAE,EACjB,gBAAM,CAAC,SAAS,EAAE,EAClB,gBAAM,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;QACtD,OAAO,IAAI,CAAC,SAAS,iBACjB,SAAS;YACT,KAAK;YACL,OAAO,IACJ,CAAC,QAAQ,IAAI,EAAE,CAAC,EACrB,CAAC;IACP,CAAC,CAAC,CACL;CACJ,CAAC,CACL,CAAC"}

package/dist/utils/logger/morganLogger.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="qs" />
 /// <reference types="express" />
-declare const _default: import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
-export default _default;
+export declare const morganFile: import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
+export declare const morganConsole: import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;

package/dist/utils/logger/morganLogger.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.morganConsole = exports.morganFile = void 0;
 const fs_1 = __importDefault(require("fs"));
 const morgan_1 = __importDefault(require("morgan"));
 const rotating_file_stream_1 = __importDefault(require("rotating-file-stream"));
@@ -22,6 +23,19 @@ var accessLogStream = (0, rotating_file_stream_1.default)(FileNameGenerator, {
     interval: '1d',
     path: appConfig_1.commonAppConfig.LogPath
 });
+const jsonFormat = function (tokens, req, res) {
+    return JSON.stringify({
+        "method": tokens.method(req, res),
+        "url": tokens.url(req, res),
+        "status": tokens.status(req, res),
+        "contentLength": tokens.res(req, res, 'content-length'),
+        "responseTime": tokens['response-time'](req, res) + 'ms',
+        "totalTime": tokens['total-time'](req, res) + 'ms',
+        "httpVersion": tokens['http-version'](req, res),
+        "service": appConfig_1.commonAppConfig.AppName
+    });
+};
 // setup the logger
-exports.default = (0, morgan_1.default)('combined', { stream: accessLogStream });
+exports.morganFile = (0, morgan_1.default)(jsonFormat, { stream: accessLogStream, });
+exports.morganConsole = (0, morgan_1.default)(jsonFormat);
 //# sourceMappingURL=morganLogger.js.map

package/dist/utils/logger/morganLogger.js.map

@@ -1 +1 @@
-{"version":3,"file":"morganLogger.js","sourceRoot":"","sources":["../../../src/utils/logger/morganLogger.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,oDAA4B;AAC5B,gFAAuC;AACvC,4CAA6C;AAC7C,4DAAoC;AAEpC,8BAA8B;AAC9B,YAAE,CAAC,UAAU,CAAC,2BAAe,CAAC,OAAO,CAAC,IAAI,YAAE,CAAC,SAAS,CAAC,2BAAe,CAAC,OAAO,CAAC,CAAA;AAE/E,SAAS,iBAAiB,CAAC,IAAS,EAAE,KAAY;IAC9C,IAAI,CAAC,IAAI,EACT;QACI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;KACrB;IACD,IAAI,QAAQ,GAAa,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA,CAAC,CAAC,EAAE,CAAC;IACnE,OAAO,kBAAkB,IAAA,oBAAU,EAAC,IAAI,EAAC,YAAY,CAAC,GAAG,QAAQ,MAAM,CAAC;AAE5E,CAAC;AAED,iCAAiC;AACjC,IAAI,eAAe,GAAG,IAAA,8BAAG,EAAC,iBAAiB,EAAE;IAC3C,QAAQ,EAAE,IAAI;IACd,IAAI,EAAE,2BAAe,CAAC,OAAO;CAC9B,CAAC,CAAA;AAEF,mBAAmB;AACnB,kBAAe,IAAA,gBAAM,EAAC,UAAU,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAA"}
+{"version":3,"file":"morganLogger.js","sourceRoot":"","sources":["../../../src/utils/logger/morganLogger.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,oDAA4B;AAC5B,gFAAuC;AACvC,4CAA6C;AAC7C,4DAAoC;AAEpC,8BAA8B;AAC9B,YAAE,CAAC,UAAU,CAAC,2BAAe,CAAC,OAAO,CAAC,IAAI,YAAE,CAAC,SAAS,CAAC,2BAAe,CAAC,OAAO,CAAC,CAAA;AAE/E,SAAS,iBAAiB,CAAC,IAAS,EAAE,KAAY;IAC9C,IAAI,CAAC,IAAI,EACT;QACI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;KACrB;IACD,IAAI,QAAQ,GAAa,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA,CAAC,CAAC,EAAE,CAAC;IACnE,OAAO,kBAAkB,IAAA,oBAAU,EAAC,IAAI,EAAC,YAAY,CAAC,GAAG,QAAQ,MAAM,CAAC;AAE5E,CAAC;AAED,iCAAiC;AACjC,IAAI,eAAe,GAAG,IAAA,8BAAG,EAAC,iBAAiB,EAAE;IAC3C,QAAQ,EAAE,IAAI;IACd,IAAI,EAAE,2BAAe,CAAC,OAAO;CAC9B,CAAC,CAAA;AAGF,MAAM,UAAU,GAAG,UAAU,MAAW,EAAE,GAAQ,EAAE,GAAQ;IAC1D,OAAO,IAAI,CAAC,SAAS,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;QACjC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC;QAC3B,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;QACjC,eAAe,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,CAAC;QACvD,cAAc,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI;QACxD,WAAW,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI;QAClD,aAAa,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC;QAC/C,SAAS,EAAE,2BAAe,CAAC,OAAO;KACnC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,mBAAmB;AACN,QAAA,UAAU,GAAG,IAAA,gBAAM,EAAC,UAAU,EAAE,EAAE,MAAM,EAAE,eAAe,GAAG,CAAC,CAAA;AAE7D,QAAA,aAAa,GAAI,IAAA,gBAAM,EAAC,UAAU,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skyeye-svc-common-utils",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,7 +20,6 @@
   },
   "homepage": "https://github.com/HandshakesByDC/SkyEye-SVC-Common-Utils#readme",
   "dependencies": {
-    "@azure/core-rest-pipeline": "1.12.2",
     "@azure/data-tables": "^13.2.2",
     "@azure/identity": "latest",
     "@azure/keyvault-secrets": "latest",

package/src/lib/httpClient.ts

@@ -1,36 +1,37 @@
+import fetch, { Response, RequestInit } from 'node-fetch';
 import { UserInfo } from '../interfaces';
 import { getInternalClient, userInfoSimplifier } from '../utils/commonUtils';
 import { generateJWT } from '../utils/commonUtils';
 import {commonAppConst, jsonContentTypeHeaders } from '../utils/appConst';
-const fetch = require('node-fetch');
+import { logger } from '../utils/logger/logger';
 
 export async function httpRequest(method: string, url : string,  data: any = null, headers : any = jsonContentTypeHeaders()): Promise<Response> {
-  let init = {};
-  init = data === null ?  {
-      method: method,
-      cache: "no-cache",
-      headers: headers
-  } : {
-    method: method,
-    cache: "no-cache",
-    headers: headers,
-    body: JSON.stringify(data)
-  };
-
-  return fetch(url, init);
+    const init: RequestInit = {
+        method,
+        headers,
+        body: data === null ? undefined : JSON.stringify(data)
+    }
+    return fetch(url, init);
 }
 
 export async function sendInternalHttpRequest(userInfo:UserInfo, client: string, endpoint: string, data: any = null, method?: string, select?:string[]) {
-  method = method ?? commonAppConst.httpMethod.POST;
-  const internalClient = await getInternalClient(client)
-  const url = internalClient + endpoint;
-  let headers:any = jsonContentTypeHeaders();
-  if(userInfo){
-    userInfo = await userInfoSimplifier(userInfo, select)
-    let token: string = `${commonAppConst.httpHeader.BEARER} ${await generateJWT(userInfo)}`;
-    headers[commonAppConst.httpHeader.AUTHORIZATION] = token;
-  }
-  return httpRequest(method, url, data, headers).then(response => {
-    return response.json()
-  })
+    method = method ?? commonAppConst.httpMethod.POST;
+    const internalClient = await getInternalClient(client)
+    const url = internalClient + endpoint;
+    let headers:any = jsonContentTypeHeaders();
+    if(userInfo){
+        userInfo = await userInfoSimplifier(userInfo, select)
+        let token: string = `${commonAppConst.httpHeader.BEARER} ${await generateJWT(userInfo)}`;
+        headers[commonAppConst.httpHeader.AUTHORIZATION] = token;
+    }
+
+    let response: Response;
+    try {
+        response = await httpRequest(method, url, data, headers);
+        return response.json();
+    }
+    catch (err) {
+        logger.error(`Error while sending internal http request, receiving response: ${response}`);
+        throw new Error(`${err}`);
+    }
 }