skyeye-svc-common-utils 1.0.62 → 1.0.63

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skyeye-svc-common-utils",
-  "version": "1.0.62",
+  "version": "1.0.63",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

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}`);
+    }
 }