uapi-json 1.17.5 → 1.18.0

package/README.md

@@ -89,6 +89,24 @@ It also has several useful helpers to handle errors.
 
 `logFunction` - set custom logging function that should match next shape `(...args) => {}`. Will receive all requests and responses from uapi/terminal.
 
+`httpsAgent` - set custom HTTPS agent for all requests created by the service. If the agent has `options.timeout`, that value is used as the request timeout.
+
+```javascript
+const https = require('https');
+
+const TerminalService = uAPI.createTerminalService({
+  auth,
+  options: {
+    httpsAgent: new https.Agent({
+      keepAlive: true,
+      maxSockets: 1,
+      maxFreeSockets: 1,
+      timeout: 90000,
+    }),
+  },
+});
+```
+
 ### Auth object
 <a name="auth"></a>
 

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "uapi-json",
-  "version": "1.17.5",
+  "version": "1.18.0",
   "description": "Travelport Universal API",
   "main": "src/",
+  "engines": {
+    "node": ">=20"
+  },
   "files": [
     "src/",
     "README.md",
@@ -27,37 +30,37 @@
     "node",
     "travelport"
   ],
-  "author": "Mark Orel <mail.ormark@gmail.com>",
   "contributors": [
-    "Dmitry Chertousov <d.chertousov@gmail.com>",
     "Artem Pylypchuk <articicejuice@gmail.com>",
-    "Yevhenii Huselietov <d46k16@gmail.com>",
+    "Dmytro Chertousov <d.chertousov@gmail.com>",
+    "Mark Orel <mail.ormark@gmail.com>",
     "Mark Omarov <dev.mark.omarov@gmail.com>",
-    "Oleksii Duvanov <colden.aid@gmail.com>"
+    "Oleksii Duvanov <colden.aid@gmail.com>",
+    "Yevhenii Huselietov <d46k16@gmail.com>"
   ],
   "license": "MIT",
   "dependencies": {
-    "axios": "^1.9.0",
+    "axios": "~1.15.0",
     "galileo-screen": "1.0.5",
-    "handlebars": "^4.7.8",
-    "handlebars-helper-equal": "^1.0.0",
-    "joi": "^17.13.3",
-    "moment": "^2.30.1",
-    "node-errors-helpers": "^1.0.0",
-    "pretty-data": "^0.40.0",
-    "promise-retry": "^2.0.1",
-    "xml2js": "^0.6.2"
+    "handlebars": "~4.7.9",
+    "handlebars-helper-equal": "~1.0.0",
+    "joi": "~18.1.2",
+    "moment": "~2.30.1",
+    "node-errors-helpers": "~1.0.0",
+    "pretty-data": "~0.40.0",
+    "promise-retry": "~2.0.1",
+    "xml2js": "~0.6.2"
   },
   "devDependencies": {
     "chai": "^4.5.0",
     "eslint": "^8.39.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.29.0",
-    "mocha": "^11.5.0",
+    "eslint-plugin-import": "^2.32.0",
+    "mocha": "^11.7.5",
     "nyc": "^17.1.0",
-    "proxyquire": "^2.1.3",
-    "readline2": "^1.0.1",
-    "sinon": "^20.0.0",
+    "proxyquire": "~2.1.3",
+    "readline2": "~1.0.1",
+    "sinon": "^21.0.0",
     "sinon-chai": "^3.7.0"
   }
 }

package/src/Request/uapi-parser.js

@@ -36,8 +36,9 @@ function mergeLeaf(item) {
   return { ...item, ...leaf };
 }
 
-function Parser(root, uapiVersion, env, debug, config, provider) {
+function Parser(root, uapiVersion, env, debug, config, provider, log) {
   this.debug = debug;
+  this.log = log || console.info;
   if (!config) {
     this.config = defaultConfig(uapiVersion);
   } else {
@@ -212,7 +213,7 @@ Parser.prototype.parse = function (xml) {
 
       const end = new Date() - start;
       if (this.debug > 1) {
-        console.info('uAPI_Parse execution time: %dms', end);
+        this.log('uAPI_Parse execution time: %dms', end);
       }
 
       return data[self.rootObject];

package/src/Request/uapi-request.js

@@ -1,5 +1,6 @@
 const handlebars = require('handlebars');
 const axios = require('axios');
+const https = require('https');
 const { pd } = require('pretty-data');
 const {
   RequestValidationError,
@@ -13,6 +14,14 @@ const configInit = require('../config');
 
 handlebars.registerHelper('equal', require('handlebars-helper-equal'));
 
+const REQUEST_AGENT_OPTIONS = {
+  keepAlive: true,
+  keepAliveMsecs: 5000,
+  maxSockets: 20,
+  maxFreeSockets: 20,
+};
+const httpsAgent = new https.Agent(REQUEST_AGENT_OPTIONS);
+
 /**
  * basic function for requests/responses
  * @param  {string} service          service url for current response (gateway)
@@ -43,6 +52,15 @@ module.exports = function uapiRequest(
 
   const config = configInit(auth.region);
   const log = options.logFunction || console.log;
+  const customHttpsAgent = options.httpsAgent;
+  const requestHttpsAgent = customHttpsAgent || httpsAgent;
+  const requestTimeout = (
+    customHttpsAgent
+    && customHttpsAgent.options
+    && typeof customHttpsAgent.options.timeout === 'number'
+  )
+    ? customHttpsAgent.options.timeout
+    : config.timeout || 5000;
 
   // Performing checks
   if (!service || service.length <= 0) {
@@ -64,7 +82,7 @@ module.exports = function uapiRequest(
     }
 
     // create a v52 uAPI parser with default params and request data in env
-    const uParser = new Parser(rootObject, 'v52_0', params, debugMode, null, auth.provider);
+    const uParser = new Parser(rootObject, 'v52_0', params, debugMode, null, auth.provider, log);
 
     const validateInput = () => (
       Promise.resolve(params)
@@ -85,7 +103,8 @@ module.exports = function uapiRequest(
         const response = await axios.request({
           url: service,
           method: 'POST',
-          timeout: config.timeout || 5000,
+          timeout: requestTimeout,
+          httpsAgent: requestHttpsAgent,
           auth: {
             username: auth.username,
             password: auth.password,
@@ -156,7 +175,6 @@ 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));
@@ -169,7 +187,8 @@ module.exports = function uapiRequest(
           params,
           debugMode,
           errParserConfig,
-          auth.provider
+          auth.provider,
+          log
         );
         const errData = errParser.mergeLeafRecursive(parsedXML['SOAP:Fault'][0]); // parse error data
         return errorHandler.call(errParser, errData);

package/src/Services/Air/AirFormat.js

@@ -197,7 +197,7 @@ function formatPassengerCategories(pricingInfo) {
 
         [code] = list;
         if (!list[0] || list.length !== 1) { // TODO throw error
-          console.log('Warning: different categories '
+          console.warn('Warning: different categories '
             + list.join() + ' in single fare calculation ' + key + ' in fare ' + key);
         }
         passengerCounts[code] = count;

package/src/Services/Air/AirParser.js

@@ -218,7 +218,7 @@ function airPrice(obj) {
 
   let pricingSolution = 0;
   if (priceKeys.length > 1) {
-    console.log('More than one solution found in booking. Resolving the cheapest one.');
+    console.warn('More than one solution found in booking. Resolving the cheapest one.');
     const solutions = priceKeys.map((key) => pricingSolutions[key]);
 
     [pricingSolution] = solutions.sort(
@@ -347,7 +347,7 @@ function airPriceRspPricingSolutionXML(obj) {
   let pricingSolution = 0;
   if (pricingSolutions.length > 1) {
     // TODO: Check result for multiple passenger type results.
-    console.log('More than one solution found in booking. Resolving the cheapest one.');
+    console.warn('More than one solution found in booking. Resolving the cheapest one.');
     [pricingSolution] = pricingSolutions.sort(
       (a, b) => parseFloat(a.$.TotalPrice.slice(3)) - parseFloat(b.$.TotalPrice.slice(3))
     );

package/src/Services/Terminal/Terminal.js

@@ -207,6 +207,8 @@ module.exports = function (settings) {
 
   // Get terminal ID
   const getTerminalId = (sessionToken) => getHashSubstr(sessionToken);
+  const isClosed = () => state.terminalState === TERMINAL_STATE_CLOSED;
+  const isInitialized = () => state.terminalState !== TERMINAL_STATE_NONE;
 
   const terminal = {
     getToken: async () => {
@@ -251,6 +253,20 @@ module.exports = function (settings) {
         throw err;
       }
     },
+    isClosed,
+    isInitialized,
+    closeSessionSafe: async () => {
+      if (isClosed()) {
+        console.warn('UAPI-JSON WARNING: Terminal session is already closed');
+        return;
+      }
+      if (!isInitialized()) {
+        console.warn('UAPI-JSON WARNING: Terminal session is not initialized');
+        return;
+      }
+
+      await terminal.closeSession().catch(console.error);
+    },
     closeSession: () => getSessionToken()
       .then(
         (sessionToken) => service.closeSession({

package/src/Services/Terminal/TerminalErrors.js

@@ -50,6 +50,7 @@ Object.assign(TerminalRuntimeError, createErrorsList({
   InvalidAccount: ['Invalid account', errorCodes.Validation],
   TerminalUnexpectedError: ['Unexpected error message is returned by Travelport system. Please check PNR and try again later.', errorCodes.Validation],
   TerminalUnexpectedFinancialError: ['Unexpected error message is returned by Travelport system. Please check PNR and new Fare calculation. If the problem persists, contact your local helpdesk.', errorCodes.Validation],
+  InvalidResponseFromHCA: 'Invalid response from HCA',
 }, TerminalRuntimeError));
 
 module.exports = {

package/src/Services/Terminal/TerminalParser.js

@@ -24,12 +24,12 @@ function errorHandler(rsp) {
         screen: faultString,
         pcc: utils.getErrorPcc(rsp.faultstring),
       });
+    case '2614':
+      throw new TerminalRuntimeError.InvalidResponseFromHCA({ screen: faultString });
     case '6207': // Error retrieving AccessProfile Unable to retrieve enough Dynamic GTIDs for this transaction
     case '6119': // Host system error
     case '14058': // Could not locate Session Token Information Session May Have Timed Out
-      throw new RequestRuntimeError.UAPIServiceError({
-        screen: faultString,
-      });
+      throw new RequestRuntimeError.UAPIServiceError({ screen: faultString });
     default:
       throw new RequestRuntimeError.UnhandledError(null, new TerminalRuntimeError(rsp));
   }