uapi-json 1.17.0 → 1.17.2

package/docs/Terminal.md

@@ -26,6 +26,8 @@ on how to use emulation.
 In case you want to handle some specific errors from uAPI, you can provde `uapiErrorHandler` function
 in options.
 
+Function should return response from retried command or any other command.
+
 Footprint of the functions should be as follows:
 ```javascript
 async (
@@ -33,6 +35,8 @@ async (
   { command, error: err }
 ) => {
   // your code goes here
+  // response is an array of strings (lines of terminal response)
+  return response;
 }
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uapi-json",
-  "version": "1.17.0",
+  "version": "1.17.2",
   "description": "Travelport Universal API",
   "main": "src/",
   "files": [

package/src/Request/uapi-request.js

@@ -75,61 +75,71 @@ module.exports = function uapiRequest(
           return reqType;
         }));
 
-    const sendRequest = function (xml) {
+    const sendRequest = async (xml) => {
       if (debugMode) {
         log('Request URL: ', service);
         log('Request XML: ', pd.xml(xml));
       }
-      return axios.request({
-        url: service,
-        method: 'POST',
-        timeout: config.timeout || 5000,
-        auth: {
-          username: auth.username,
-          password: auth.password,
-        },
-        headers: {
-          'Accept-Encoding': 'gzip',
-          'Content-Type': 'text/xml',
-        },
-        data: xml,
-      })
-        .then((response) => {
-          if (debugMode) {
-            log('Response SOAP: ', pd.xml(response.data));
-          }
-          return response.data;
-        })
-        .catch((e) => {
-          const rsp = e.response;
 
-          if (['ECONNREFUSED', 'ECONNRESET'].includes(e.code)) {
-            return Promise.reject(new RequestRuntimeError.UAPIServiceError(e));
-          }
+      try {
+        const response = await axios.request({
+          url: service,
+          method: 'POST',
+          timeout: config.timeout || 5000,
+          auth: {
+            username: auth.username,
+            password: auth.password,
+          },
+          headers: {
+            'Accept-Encoding': 'gzip',
+            'Content-Type': 'text/xml',
+          },
+          data: xml,
+        });
 
-          if (['ECONNABORTED'].includes(e.code)) {
-            return Promise.reject(new RequestRuntimeError.UAPIServiceTimeout(e));
-          }
+        if (debugMode) {
+          log('Response SOAP: ', pd.xml(response.data));
+        }
 
-          if (!rsp) {
-            if (debugMode) {
-              log('Unexpected Error: ', pd.json(e));
-            }
+        return response.data;
+      } catch (e) {
+        const rsp = e.response;
 
-            return Promise.reject(new RequestSoapError.SoapUnexpectedError(e));
+        if (['ECONNREFUSED', 'ECONNRESET'].includes(e.code)) {
+          throw new RequestRuntimeError.UAPIServiceError(e);
+        }
+
+        if (['ECONNABORTED'].includes(e.code)) {
+          throw new RequestRuntimeError.UAPIServiceTimeout(e);
+        }
+
+        if (!rsp) {
+          if (debugMode) {
+            log('Unexpected Error: ', pd.json(e));
           }
 
-          const error = {
-            status: rsp.status,
-            data: rsp.data,
-          };
+          throw new RequestSoapError.SoapUnexpectedError(e);
+        }
 
+        // TVPT error response with 500 header
+        if (rsp.data.toUpperCase().includes('SOAP:FAULT')) {
           if (debugMode) {
-            log('Error Response SOAP: ', pd.json(error));
+            log('Response SOAP: ', pd.xml(rsp.data));
           }
+          return rsp.data;
+        }
 
-          return Promise.reject(new RequestSoapError.SoapRequestError(error));
-        });
+        const error = {
+          status: rsp.status,
+          data: rsp.data,
+        };
+
+        if (debugMode) {
+          log('Error Response SOAP: ', pd.json(error));
+        }
+
+        throw new RequestSoapError.SoapRequestError(error);
+      }
     };
 
     const parseResponse = function (response, parseParams) {
@@ -146,6 +156,7 @@ module.exports = function uapiRequest(
     };
 
     const validateSOAP = function (parsedXML) {
+      console.log(parsedXML);
       if (parsedXML['SOAP:Fault']) {
         if (debugMode > 2) {
           log('Parsed error response', pd.json(parsedXML));

package/src/Services/Terminal/Terminal.js

@@ -170,7 +170,7 @@ module.exports = function (settings) {
     } catch (e) {
       if (!isErrorRetriable(e) || times <= 0) {
         if (uapiErrorHandler) {
-          await uapiErrorHandler(
+          return uapiErrorHandler(
             executeCommandWithRetry,
             { command, error: e }
           );