@mojaloop/central-services-shared 18.3.4 → 18.4.0-snapshot.10

package/CHANGELOG.md

@@ -2,35 +2,6 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [18.3.4](https://github.com/mojaloop/central-services-shared/compare/v18.3.3...v18.3.4) (2024-04-09)
-
-
-### Chore
-
-* updated 3p dependencies to address moderate vulns ([#367](https://github.com/mojaloop/central-services-shared/issues/367)) ([08d1c74](https://github.com/mojaloop/central-services-shared/commit/08d1c7474e00fd12585274f39f349f8dea65ffb9))
-
-### [18.3.3](https://github.com/mojaloop/central-services-shared/compare/v18.3.2...v18.3.3) (2024-04-05)
-
-
-### Chore
-
-* overrides to 3p dependencies to address vulnerabilities ([#366](https://github.com/mojaloop/central-services-shared/issues/366)) ([8e87809](https://github.com/mojaloop/central-services-shared/commit/8e87809c8f552d18dd644fe1242987cec178414c))
-
-### [18.3.2](https://github.com/mojaloop/central-services-shared/compare/v18.3.1...v18.3.2) (2024-04-05)
-
-
-### Chore
-
-* dependency updates to address issues ([#365](https://github.com/mojaloop/central-services-shared/issues/365)) ([6dd4a53](https://github.com/mojaloop/central-services-shared/commit/6dd4a53fd5092a3af566032fd7a8f4a968778d4d))
-
-### [18.3.1](https://github.com/mojaloop/central-services-shared/compare/v18.3.0...v18.3.1) (2024-04-04)
-
-
-### Chore
-
-* **deps:** bump express from 4.18.2 to 4.19.2 ([#363](https://github.com/mojaloop/central-services-shared/issues/363)) ([248bad2](https://github.com/mojaloop/central-services-shared/commit/248bad29d36ad9a09832792f45d3a2d8d66ae2da))
-* **deps:** bump follow-redirects from 1.15.5 to 1.15.6 ([#364](https://github.com/mojaloop/central-services-shared/issues/364)) ([eed3eeb](https://github.com/mojaloop/central-services-shared/commit/eed3eebf0adefeed5f954d5aa31eddc730e04325))
-
 ## [18.3.0](https://github.com/mojaloop/central-services-shared/compare/v18.2.0...v18.3.0) (2024-03-07)
 
 

package/CODEOWNERS

@@ -6,7 +6,7 @@
 ## @global-owner1 and @global-owner2 will be requested for
 ## review when someone opens a pull request.
 #*       @global-owner1 @global-owner2
-* @mdebarros @elnyry-sam-k @vijayg10 @kleyow @oderayi
+* @mdebarros @elnyry-sam-k @vijayg10 @kleyow
 
 ## Order is important; the last matching pattern takes the most
 ## precedence. When someone opens a pull request that only

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/central-services-shared",
-  "version": "18.3.4",
+  "version": "18.4.0-snapshot.10",
   "description": "Shared code for mojaloop central services",
   "license": "Apache-2.0",
   "author": "ModusBox",
@@ -71,7 +71,7 @@
     "yaml": "2.4.1"
   },
   "devDependencies": {
-    "@hapi/hapi": "21.3.8",
+    "@hapi/hapi": "21.3.9",
     "@hapi/joi": "17.1.1",
     "audit-ci": "^6.6.1",
     "base64url": "3.0.1",
@@ -90,24 +90,19 @@
     "tape": "5.7.5",
     "tapes": "4.1.0"
   },
-  "overrides": {
-    "shins": {
-      "ejs": "^3.1.7",
-      "sanitize-html": "2.12.1",
-      "jsonpointer": "5.0.0",
-      "markdown-it": "12.3.2",
-      "yargs-parser": "13.1.2",
-      "postcss": "8.4.31"
-    }
-  },
   "peerDependencies": {
-    "@mojaloop/central-services-error-handling": ">=13.x.x",
+    "@mojaloop/central-services-error-handling": ">=12.x.x",
     "@mojaloop/central-services-logger": ">=11.x.x",
     "@mojaloop/central-services-metrics": ">=12.x.x",
     "@mojaloop/event-sdk": ">=14.x.x",
     "ajv": "8.x.x",
     "ajv-keywords": "5.x.x"
   },
+  "overrides": {
+    "shins": {
+      "ejs": "3.1.7"
+    }
+  },
   "peerDependenciesMeta": {
     "@mojaloop/central-services-error-handling": {
       "optional": false

package/src/enums/accounts.js

@@ -56,7 +56,9 @@ const TransferParticipantRoleType = {
   PAYEE_DFSP: 2,
   HUB: 3,
   DFSP_SETTLEMENT: 4,
-  DFSP_POSITION: 5
+  DFSP_POSITION: 5,
+  INITIATING_FSP: 6,
+  COUNTER_PARTY_FSP: 7
 }
 
 const PartyAccountTypes = {

package/src/enums/endpoints.js

@@ -53,12 +53,16 @@ const FspEndpointTypes = {
   FSPIOP_CALLBACK_URL_TRANSFER_POST: 'FSPIOP_CALLBACK_URL_TRANSFER_POST',
   FSPIOP_CALLBACK_URL_TRANSFER_PUT: 'FSPIOP_CALLBACK_URL_TRANSFER_PUT',
   FSPIOP_CALLBACK_URL_TRANSFER_ERROR: 'FSPIOP_CALLBACK_URL_TRANSFER_ERROR',
+  FSPIOP_CALLBACK_URL_FX_TRANSFER_POST: 'FSPIOP_CALLBACK_URL_FX_TRANSFER_POST',
+  FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT: 'FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT',
+  FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR: 'FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR',
   ALARM_NOTIFICATION_URL: 'ALARM_NOTIFICATION_URL',
   ALARM_NOTIFICATION_TOPIC: 'ALARM_NOTIFICATION_TOPIC',
   NET_DEBIT_CAP_THRESHOLD_BREACH_EMAIL: 'NET_DEBIT_CAP_THRESHOLD_BREACH_EMAIL',
   NET_DEBIT_CAP_ADJUSTMENT_EMAIL: 'NET_DEBIT_CAP_ADJUSTMENT_EMAIL',
   SETTLEMENT_TRANSFER_POSITION_CHANGE_EMAIL: 'SETTLEMENT_TRANSFER_POSITION_CHANGE_EMAIL',
   FSPIOP_CALLBACK_URL_QUOTES: 'FSPIOP_CALLBACK_URL_QUOTES',
+  FSPIOP_CALLBACK_URL_FX_QUOTES: 'FSPIOP_CALLBACK_URL_FX_QUOTES',
   FSPIOP_CALLBACK_URL_BULK_QUOTES: 'FSPIOP_CALLBACK_URL_BULK_QUOTES',
   FSPIOP_CALLBACK_URL_BULK_TRANSFER_POST: 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_POST',
   FSPIOP_CALLBACK_URL_BULK_TRANSFER_PUT: 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_PUT',
@@ -111,6 +115,12 @@ const FspEndpointTemplates = {
   ORACLE_PARTICIPANTS_TYPE_ID_SUB_ID: '/participants/{{partyIdType}}/{{partyIdentifier}}?partySubIdOrType={{partySubIdOrType}}',
   ORACLE_PARTICIPANTS_TYPE_ID_CURRENCY_SUB_ID: '/participants/{{partyIdType}}/{{partyIdentifier}}?currency={{currency}}&partySubIdOrType={{partySubIdOrType}}',
   ORACLE_PARTICIPANTS_BATCH: '/participants',
+  FX_TRANSFERS_POST: '/fxTransfers',
+  FX_TRANSFERS_PUT: '/{{fsp}}/fxTransfers/{{ID}}',
+  FX_TRANSFERS_PUT_ERROR: '/{{fsp}}/fxTransfers/{{ID}}/error',
+  FX_QUOTES_POST: '/fxQuotes',
+  FX_QUOTES_PUT: '/{{fsp}}/fxQuotes/{{ID}}',
+  FX_QUOTES_ERROR_PUT: '/fxQuotes/{{ID}}/error',
   TRANSFERS_POST: '/transfers',
   TRANSFERS_PUT: '/{{fsp}}/transfers/{{ID}}',
   TRANSFERS_PUT_ERROR: '/{{fsp}}/transfers/{{ID}}/error',

package/src/enums/events.js

@@ -39,6 +39,7 @@ const Event = {
     ENDPOINTCACHE: 'endpointcache',
     EVENT: 'event',
     FULFIL: 'fulfil',
+    FX_QUOTE: 'fxquote',
     GET: 'get',
     NOTIFICATION: 'notification',
     ORACLE: 'oracle',
@@ -78,6 +79,20 @@ const Event = {
     FAIL: 'fail',
     FULFIL: 'fulfil',
     FULFIL_DUPLICATE: 'fulfil-duplicate',
+    FX_FULFIL: 'fx-fulfil',
+    FX_ABORT: 'fx-abort',
+    FX_COMMIT: 'fx-commit',
+    FX_PREPARE: 'fx-prepare',
+    FX_REJECT: 'fx-reject',
+    FX_RESERVE: 'fx-reserve',
+    FX_PREPARE_DUPLICATE: 'fx-prepare-duplicate',
+    FX_ABORT_VALIDATION: 'fx-abort-validation',
+    FX_RESERVED_ABORTED: 'fx-reserved-aborted',
+    FX_FULFIL_DUPLICATE: 'fx-fulfil-duplicate',
+    FX_ABORT_DUPLICATE: 'fx-abort-duplicate',
+    FX_TIMEOUT_RECEIVED: 'fx-timeout-received',
+    FX_TIMEOUT_RESERVED: 'fx-timeout-reserved',
+    FX_GET: 'fx-get',
     GET: 'get',
     INITIATE: 'initiate',
     LIMIT_ADJUSTMENT: 'limit-adjustment',

package/src/enums/fx.js

@@ -0,0 +1,38 @@
+/*****
+ License
+ --------------
+ Copyright © 2017 Bill & Melinda Gates Foundation
+ The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Gates Foundation organization for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+ * Gates Foundation
+ - Name Surname <name.surname@gatesfoundation.com>
+
+ * Vijay Kumar Guthi <vijaya.guthi@infitx.com>
+ --------------
+ ******/
+
+const FxTransferType = {
+  PAYER_CONVERSION: 1,
+  PAYEE_CONVERSION: 2
+}
+
+const FxParticipantCurrencyType = {
+  SOURCE: 1,
+  TARGET: 2
+}
+
+module.exports = {
+  FxTransferType,
+  FxParticipantCurrencyType
+}

package/src/enums/index.js

@@ -32,6 +32,7 @@ const Transfers = require('./transfers')
 const Events = require('./events')
 const Kafka = require('./kafka')
 const Tags = require('./tags')
+const Fx = require('./fx')
 
 module.exports = {
   Accounts,
@@ -41,5 +42,6 @@ module.exports = {
   Settlements,
   Transfers,
   Kafka,
-  Tags
+  Tags,
+  Fx
 }

package/src/enums/kafka.js

@@ -142,6 +142,26 @@ const TopicMap = {
       functionality: transferEventType.NOTIFICATION,
       action: transferEventAction.EVENT
     },
+    'fx-abort': {
+      functionality: transferEventType.NOTIFICATION,
+      action: transferEventAction.EVENT
+    },
+    'fx-commit': {
+      functionality: transferEventType.NOTIFICATION,
+      action: transferEventAction.EVENT
+    },
+    'fx-prepare': {
+      functionality: transferEventType.NOTIFICATION,
+      action: transferEventAction.EVENT
+    },
+    'fx-reject': {
+      functionality: transferEventType.NOTIFICATION,
+      action: transferEventAction.EVENT
+    },
+    'fx-reserve': {
+      functionality: transferEventType.NOTIFICATION,
+      action: transferEventAction.EVENT
+    },
     'prepare-duplicate': {
       functionality: transferEventType.NOTIFICATION,
       action: transferEventAction.EVENT
@@ -192,6 +212,26 @@ const TopicMap = {
       functionality: transferEventType.TRANSFER,
       action: transferEventAction.POSITION
     },
+    'fx-abort': {
+      functionality: transferEventType.TRANSFER,
+      action: transferEventAction.POSITION
+    },
+    'fx-commit': {
+      functionality: transferEventType.TRANSFER,
+      action: transferEventAction.POSITION
+    },
+    'fx-prepare': {
+      functionality: transferEventType.TRANSFER,
+      action: transferEventAction.POSITION
+    },
+    'fx-reject': {
+      functionality: transferEventType.TRANSFER,
+      action: transferEventAction.POSITION
+    },
+    'fx-reserve': {
+      functionality: transferEventType.TRANSFER,
+      action: transferEventAction.POSITION
+    },
     prepare: {
       functionality: transferEventType.TRANSFER,
       action: transferEventAction.POSITION

package/src/index.d.ts

@@ -60,12 +60,17 @@ declare namespace CentralServicesShared {
     FSPIOP_CALLBACK_URL_TRANSFER_POST = 'FSPIOP_CALLBACK_URL_TRANSFER_POST',
     FSPIOP_CALLBACK_URL_TRANSFER_PUT = 'FSPIOP_CALLBACK_URL_TRANSFER_PUT',
     FSPIOP_CALLBACK_URL_TRANSFER_ERROR = 'FSPIOP_CALLBACK_URL_TRANSFER_ERROR',
+    FSPIOP_CALLBACK_URL_FX_TRANSFER_POST = 'FSPIOP_CALLBACK_URL_FX_TRANSFER_POST',
+    FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT = 'FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT',
+    FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR = 'FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR',
     ALARM_NOTIFICATION_URL = 'ALARM_NOTIFICATION_URL',
     ALARM_NOTIFICATION_TOPIC = 'ALARM_NOTIFICATION_TOPIC',
     NET_DEBIT_CAP_THRESHOLD_BREACH_EMAIL = 'NET_DEBIT_CAP_THRESHOLD_BREACH_EMAIL',
     NET_DEBIT_CAP_ADJUSTMENT_EMAIL = 'NET_DEBIT_CAP_ADJUSTMENT_EMAIL',
     SETTLEMENT_TRANSFER_POSITION_CHANGE_EMAIL = 'SETTLEMENT_TRANSFER_POSITION_CHANGE_EMAIL',
     FSPIOP_CALLBACK_URL_QUOTES = 'FSPIOP_CALLBACK_URL_QUOTES',
+    FSPIOP_CALLBACK_URL_FX_QUOTES = 'FSPIOP_CALLBACK_URL_FX_QUOTES',
+    FSPIOP_CALLBACK_URL_BULK_QUOTES = 'FSPIOP_CALLBACK_URL_BULK_QUOTES',
     FSPIOP_CALLBACK_URL_BULK_TRANSFER_POST = 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_POST',
     FSPIOP_CALLBACK_URL_BULK_TRANSFER_PUT = 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_PUT',
     FSPIOP_CALLBACK_URL_BULK_TRANSFER_ERROR = 'FSPIOP_CALLBACK_URL_BULK_TRANSFER_ERROR',
@@ -125,6 +130,9 @@ declare namespace CentralServicesShared {
       FSPIOP_CALLBACK_URL_PARTIES_SUB_ID_PUT: FspEndpointTypesEnum.FSPIOP_CALLBACK_URL_PARTIES_SUB_ID_PUT;
       FSPIOP_CALLBACK_URL_PARTIES_PUT_ERROR: FspEndpointTypesEnum.FSPIOP_CALLBACK_URL_PARTIES_PUT_ERROR;
       FSPIOP_CALLBACK_URL_PARTIES_SUB_ID_PUT_ERROR: FspEndpointTypesEnum.FSPIOP_CALLBACK_URL_PARTIES_SUB_ID_PUT_ERROR;
+      FSPIOP_CALLBACK_URL_FX_TRANSFER_POST: FspEndpointTypesEnum.FSPIOP_CALLBACK_URL_FX_TRANSFER_POST;
+      FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT: FspEndpointTypesEnum.FSPIOP_CALLBACK_URL_FX_TRANSFER_PUT;
+      FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR: FspEndpointTypesEnum.FSPIOP_CALLBACK_URL_FX_TRANSFER_ERROR;
       FSPIOP_CALLBACK_URL_TRANSFER_POST: FspEndpointTypesEnum.FSPIOP_CALLBACK_URL_TRANSFER_POST;
       FSPIOP_CALLBACK_URL_TRANSFER_PUT: FspEndpointTypesEnum.FSPIOP_CALLBACK_URL_TRANSFER_PUT;
       FSPIOP_CALLBACK_URL_TRANSFER_ERROR: FspEndpointTypesEnum.FSPIOP_CALLBACK_URL_TRANSFER_ERROR;
@@ -184,12 +192,20 @@ declare namespace CentralServicesShared {
       ORACLE_PARTICIPANTS_TYPE_ID_SUB_ID: string;
       ORACLE_PARTICIPANTS_TYPE_ID_CURRENCY_SUB_ID: string;
       ORACLE_PARTICIPANTS_BATCH: string;
+      FX_TRANSFERS_POST: string;
+      FX_TRANSFERS_PUT: string;
+      FX_TRANSFERS_PUT_ERROR: string;
+      FX_QUOTES_POST: string;
+      FX_QUOTES_PUT: string;
+      FX_QUOTES_ERROR_PUT: string;
       TRANSFERS_POST: string;
       TRANSFERS_PUT: string;
       TRANSFERS_PUT_ERROR: string;
       BULK_TRANSFERS_POST: string;
       BULK_TRANSFERS_PUT: string;
       BULK_TRANSFERS_PUT_ERROR: string;
+      BULK_QUOTES_POST: string;
+      BULK_QUOTES_ERROR_PUT: string;
       TP_TRANSACTION_REQUEST_GET: string;
       TP_TRANSACTION_REQUEST_POST: string;
       TP_TRANSACTION_REQUEST_PUT: string;
@@ -241,6 +257,7 @@ declare namespace CentralServicesShared {
     ENDPOINTCACHE = 'endpointcache',
     EVENT = 'event',
     FULFIL = 'fulfil',
+    FX_QUOTE = 'fx-quote',
     GET = 'get',
     NOTIFICATION = 'notification',
     ORACLE = 'oracle',
@@ -255,6 +272,8 @@ declare namespace CentralServicesShared {
     TRANSFER = 'transfer',
     PARTY = 'party',
     PARTICIPANT = 'participant',
+    DEFERRED_SETTLEMENT = 'deferred-settlement',
+    GROSS_SETTLEMENT = 'gross-settlement',
     VERIFICATION = 'verification'
   }
 
@@ -279,6 +298,20 @@ declare namespace CentralServicesShared {
     FAIL = 'fail',
     FULFIL = 'fulfil',
     FULFIL_DUPLICATE = 'fulfil-duplicate',
+    FX_FULFIL = 'fx-fulfil',
+    FX_ABORT = 'fx-abort',
+    FX_COMMIT = 'fx-commit',
+    FX_PREPARE = 'fx-prepare',
+    FX_REJECT = 'fx-reject',
+    FX_RESERVE = 'fx-reserve',
+    FX_PREPARE_DUPLICATE = 'fx-prepare-duplicate',
+    FX_ABORT_VALIDATION = 'fx-abort-validation',
+    FX_RESERVED_ABORTED = 'fx-reserved-aborted',
+    FX_FULFIL_DUPLICATE = 'fx-fulfil-duplicate',
+    FX_ABORT_DUPLICATE = 'fx-abort-duplicate',
+    FX_TIMEOUT_RECEIVED = 'fx-timeout-received',
+    FX_TIMEOUT_RESERVED = 'fx-timeout-reserved',
+    FX_GET = 'fx-get',
     GET = 'get',
     INITIATE = 'initiate',
     LIMIT_ADJUSTMENT = 'limit-adjustment',
@@ -416,6 +449,20 @@ declare namespace CentralServicesShared {
           FAIL: EventActionEnum.FAIL;
           FULFIL: EventActionEnum.FULFIL;
           FULFIL_DUPLICATE: EventActionEnum.FULFIL_DUPLICATE;
+          FX_FULFIL: EventActionEnum.FX_FULFIL;
+          FX_ABORT: EventActionEnum.FX_ABORT,
+          FX_COMMIT: EventActionEnum.FX_COMMIT,
+          FX_PREPARE: EventActionEnum.FX_PREPARE,
+          FX_REJECT: EventActionEnum.FX_REJECT,
+          FX_RESERVE: EventActionEnum.FX_RESERVE,
+          FX_PREPARE_DUPLICATE: EventActionEnum.FX_PREPARE_DUPLICATE,
+          FX_ABORT_VALIDATION: EventActionEnum.FX_ABORT_VALIDATION,
+          FX_RESERVED_ABORTED: EventActionEnum.FX_RESERVED_ABORTED,
+          FX_FULFIL_DUPLICATE: EventActionEnum.FX_FULFIL_DUPLICATE,
+          FX_ABORT_DUPLICATE: EventActionEnum.FX_ABORT_DUPLICATE,
+          FX_TIMEOUT_RECEIVED: EventActionEnum.FX_TIMEOUT_RECEIVED,
+          FX_TIMEOUT_RESERVED: EventActionEnum.FX_TIMEOUT_RESERVED,
+          FX_GET: EventActionEnum.FX_GET,
           GET: EventActionEnum.GET;
           INITIATE: EventActionEnum.INITIATE;
           LIMIT_ADJUSTMENT: EventActionEnum.LIMIT_ADJUSTMENT;
@@ -457,6 +504,7 @@ declare namespace CentralServicesShared {
           ENDPOINTCACHE: EventTypeEnum.ENDPOINTCACHE;
           EVENT: EventTypeEnum.EVENT;
           FULFIL: EventTypeEnum.FULFIL;
+          FX_QUOTE: EventTypeEnum.FX_QUOTE;
           GET: EventTypeEnum.GET;
           NOTIFICATION: EventTypeEnum.NOTIFICATION;
           ORACLE: EventTypeEnum.ORACLE;
@@ -471,6 +519,8 @@ declare namespace CentralServicesShared {
           TRANSFER: EventTypeEnum.TRANSFER;
           PARTY: EventTypeEnum.PARTY;
           PARTICIPANT: EventTypeEnum.PARTICIPANT;
+          DEFERRED_SETTLEMENT: EventTypeEnum.DEFERRED_SETTLEMENT,
+          GROSS_SETTLEMENT: EventTypeEnum.GROSS_SETTLEMENT,
           VERIFICATION: EventTypeEnum.VERIFICATION;
         };
       };
@@ -547,6 +597,16 @@ declare namespace CentralServicesShared {
       AdminNotificationActions: {
         LIMIT_ADJUSTMENT: AdminNotificationActionsEnum.LIMIT_ADJUSTMENT;
       };
+    };
+    Fx: {
+      FxTransferType: {
+        PAYER_CONVERSION: number;
+        PAYEE_CONVERSION: number;
+      };
+      FxParticipantCurrencyType: {
+        SOURCE: number,
+        TARGET: number
+      };
     }
   }
   interface Endpoints {

package/src/util/endpoints.js

@@ -26,16 +26,16 @@
 'use strict'
 
 const Logger = require('@mojaloop/central-services-logger')
+const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Catbox = require('@hapi/catbox')
 const CatboxMemory = require('@hapi/catbox-memory')
+const Mustache = require('mustache')
 const { Map } = require('immutable')
-const Http = require('./http')
 const Enum = require('../enums')
+const Http = require('./http')
+const request = require('./request')
 const partition = 'endpoint-cache'
 const clientOptions = { partition }
-const Mustache = require('mustache')
-const request = require('./request')
-const ErrorHandler = require('@mojaloop/central-services-error-handling')
 const Metrics = require('@mojaloop/central-services-metrics')
 
 let client
@@ -51,7 +51,7 @@ let switchEndpoint
  * @returns {object} endpointMap Returns the object containing the endpoints for given fsp id
  */
 const fetchEndpoints = async (fsp) => {
-  const histTimer = !!Metrics.isInitiated() && Metrics.getHistogram(
+  const histTimer = Metrics.getHistogram(
     'fetchParticipants',
     'fetchParticipants - Metrics for fetchParticipants',
     ['success']
@@ -117,11 +117,12 @@ exports.initializeCache = async (policyOptions) => {
  * @param {string} fsp - the id of the fsp
  * @param {string} endpointType - the type of the endpoint
  * @param {object} options - contains the options for the mustache template function
+ * @param {object} renderOptions - contains the options for the rendering the endpoint
  *
  * @returns {string} - Returns the endpoint, throws error if failure occurs
  */
-exports.getEndpoint = async (switchUrl, fsp, endpointType, options = {}) => {
-  const histTimer = !!Metrics.isInitiated() && Metrics.getHistogram(
+exports.getEndpoint = async (switchUrl, fsp, endpointType, options = {}, renderOptions = {}) => {
+  const histTimer = Metrics.getHistogram(
     'getEndpoint',
     'getEndpoint - Metrics for getEndpoint with cache hit rate',
     ['success', 'hit']
@@ -139,10 +140,19 @@ exports.getEndpoint = async (switchUrl, fsp, endpointType, options = {}) => {
       } else {
         histTimer({ success: true, hit: true })
       }
-      return Mustache.render(new Map(endpoints.value).get(endpointType), options)
+      const endpoint = new Map(endpoints.value).get(endpointType)
+      if (renderOptions.path) {
+        const renderedEndpoint = (endpoint === undefined) ? endpoint : endpoint + renderOptions.path
+        return Mustache.render(renderedEndpoint, options)
+      }
+      return Mustache.render(endpoint, options)
+    }
+    let endpoint = new Map(endpoints).get(endpointType)
+    if (renderOptions.path) {
+      endpoint = (endpoint === undefined) ? endpoint : endpoint + renderOptions.path
     }
     histTimer({ success: true, hit: false })
-    return Mustache.render(new Map(endpoints).get(endpointType), options)
+    return Mustache.render(endpoint, options)
   } catch (err) {
     histTimer({ success: false, hit: false })
     Logger.isErrorEnabled && Logger.error(`participantEndpointCache::getEndpoint:: ERROR:'${err}'`)
@@ -164,35 +174,20 @@ exports.getEndpoint = async (switchUrl, fsp, endpointType, options = {}) => {
  * @returns {string} - Returns the rendered endpoint, throws error if failure occurs
  */
 exports.getEndpointAndRender = async (switchUrl, fsp, endpointType, path = '', options) => {
-  const histTimer = !!Metrics.isInitiated() && Metrics.getHistogram(
+  const histTimer = Metrics.getHistogram(
     'getEndpointAndRender',
-    'getEndpoint - Metrics for getEndpointAndRender with cache hit rate',
-    ['success', 'hit']
+    'getEndpoint - Metrics for getEndpointAndRender',
+    ['success']
   ).startTimer()
   switchEndpoint = switchUrl
   Logger.isDebugEnabled && Logger.debug(`participantEndpointCache::getEndpointAndRender::endpointType - ${endpointType}`)
-  try {
-    // If a service passes in `getDecoratedValue` as true, then an object
-    // { value, cached, report } is returned, where value is the cached value,
-    // `cached` is null on a cache miss.
-    const endpoints = await policy.get(fsp)
-    if ('value' in endpoints && 'cached' in endpoints) {
-      if (endpoints.cached === null) {
-        histTimer({ success: true, hit: false })
-      } else {
-        histTimer({ success: true, hit: true })
-      }
-      const endpoint = new Map(endpoints.value).get(endpointType)
-      const renderedEndpoint = (endpoint === undefined) ? endpoint : endpoint + path
-      return Mustache.render(renderedEndpoint, options)
-    }
 
-    const endpoint = new Map(endpoints).get(endpointType)
-    const renderedEndpoint = (endpoint === undefined) ? endpoint : endpoint + path
-    histTimer({ success: true, hit: false })
-    return Mustache.render(renderedEndpoint, options)
+  try {
+    const endpoint = exports.getEndpoint(switchUrl, fsp, endpointType, options, { path })
+    histTimer({ success: true })
+    return endpoint
   } catch (err) {
-    histTimer({ success: false, hit: false })
+    histTimer({ success: false })
     Logger.isErrorEnabled && Logger.error(`participantEndpointCache::getEndpointAndRender:: ERROR:'${err}'`)
     throw ErrorHandler.Factory.reformatFSPIOPError(err)
   }

package/src/util/hapi/plugins/headerValidation.js

@@ -18,11 +18,14 @@ const defaultProtocolResources = [
   'bulkTransfers',
   'bulkQuotes',
   'transactionRequests',
-  'authorizations'
+  'authorizations',
+  'fxQuotes',
+  'fxTransfers'
 ]
 
 const defaultProtocolVersions = [
   ...protocolVersions.ONE,
+  ...protocolVersions.TWO,
   protocolVersions.anyVersion
 ]
 

package/src/util/headerValidation/index.js

@@ -5,12 +5,14 @@ const _ = require('lodash')
 
 const protocolVersions = {
   anyVersion: Symbol('Any'),
-  ONE: ['1', '1.0', '1.1']
+  ONE: ['1', '1.0', '1.1'],
+  TWO: ['2', '2.0']
 }
 
 const protocolVersionsMap = [
   { key: '1', value: '0' },
-  { key: '1', value: '1' }
+  { key: '1', value: '1' },
+  { key: '2', value: '0' }
 ]
 
 // Some convenience functions for generating regexes for header matching

package/src/util/kafka/index.js

@@ -306,7 +306,10 @@ const proceed = async (defaultKafkaConfig, params, opts) => {
   if (fromSwitch) {
     message.value.to = message.value.from
     message.value.from = Enum.Http.Headers.FSPIOP.SWITCH.value
-    if (message.value.content.headers) message.value.content.headers[Enum.Http.Headers.FSPIOP.DESTINATION] = message.value.to
+    if (message.value.content.headers) {
+      message.value.content.headers[Enum.Http.Headers.FSPIOP.SOURCE] = message.value.from
+      message.value.content.headers[Enum.Http.Headers.FSPIOP.DESTINATION] = message.value.to
+    }
   }
   if (typeof toDestination === 'string') {
     message.value.to = toDestination

package/src/util/participants.js

@@ -48,7 +48,7 @@ let switchEndpoint
 * @returns {object} participant Returns the object containing the participants
 */
 const fetchParticipant = async (fsp) => {
-  const histTimer = !!Metrics.isInitiated() && Metrics.getHistogram(
+  const histTimer = Metrics.getHistogram(
     'fetchParticipant',
     'fetchParticipant - Metrics for fetchParticipant',
     ['success']
@@ -103,7 +103,7 @@ exports.initializeCache = async (policyOptions) => {
 * @returns {string} - Returns the endpoint, throws error if failure occurs
 */
 exports.getParticipant = async (switchUrl, fsp) => {
-  const histTimer = !!Metrics.isInitiated() && Metrics.getHistogram(
+  const histTimer = Metrics.getHistogram(
     'getParticipant',
     'getParticipant - Metrics for getParticipant with cache hit rate',
     ['success', 'hit']

package/src/util/request.js

@@ -39,9 +39,6 @@ const MISSING_FUNCTION_PARAMETERS = 'Missing parameters for function'
 // By default it would insert `"Accept":"application/json, text/plain, */*"`.
 delete request.defaults.headers.common.Accept
 
-// Enable keepalive for http
-request.defaults.httpAgent = new http.Agent({ keepAlive: true })
-
 /**
  * @function sendRequest
  *
@@ -80,7 +77,7 @@ const sendRequest = async (
   protocolVersions = undefined,
   axiosRequestOptionsOverride = {}
 ) => {
-  const histTimerEnd = !!Metrics.isInitiated() && Metrics.getHistogram(
+  const histTimerEnd = Metrics.getHistogram(
     'sendRequest',
     `sending ${method} request to: ${url} from: ${source} to: ${destination}`,
     ['success', 'source', 'destination', 'method']
@@ -107,6 +104,7 @@ const sendRequest = async (
       headers: transformedHeaders,
       data: payload,
       responseType,
+      httpAgent: new http.Agent({ keepAlive: true }),
       ...axiosRequestOptionsOverride
     }
     // if jwsSigner is passed then sign the request
@@ -122,7 +120,7 @@ const sendRequest = async (
     const response = await request(requestOptions)
     Logger.isDebugEnabled && Logger.debug(`Success: sendRequest::response ${JSON.stringify(response, Object.getOwnPropertyNames(response))}`)
     !!sendRequestSpan && await sendRequestSpan.finish()
-    !!histTimerEnd && histTimerEnd({ success: true, source, destination, method })
+    histTimerEnd({ success: true, source, destination, method })
     return response
   } catch (error) {
     Logger.isErrorEnabled && Logger.error(error)
@@ -148,7 +146,7 @@ const sendRequest = async (
       await sendRequestSpan.error(fspiopError, state)
       await sendRequestSpan.finish(fspiopError.message, state)
     }
-    !!histTimerEnd && histTimerEnd({ success: false, source, destination, method })
+    histTimerEnd({ success: false, source, destination, method })
     throw fspiopError
   }
 }

package/test/unit/util/endpoints.test.js

@@ -1,17 +1,18 @@
 'use strict'
 
 const Test = require('tapes')(require('tape'))
-const src = '../../../src'
+const Mustache = require('mustache')
+const Catbox = require('@hapi/catbox')
+const Logger = require('@mojaloop/central-services-logger')
 const Sinon = require('sinon')
+
+const src = '../../../src'
 const Cache = require(`${src}/util/endpoints`)
 const request = require(`${src}/util/request`)
-const Catbox = require('@hapi/catbox')
 const Config = require('../../util/config')
 const Http = require(`${src}/util`).Http
 const Enum = require(`${src}`).Enum
-const Mustache = require('mustache')
 const Helper = require('../../util/helper')
-const Logger = require('@mojaloop/central-services-logger')
 const FSPIOP_CALLBACK_URL_TRANSFER_PUT = Enum.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_TRANSFER_PUT
 const Metrics = require('@mojaloop/central-services-metrics')
 
@@ -60,6 +61,10 @@ Test('Cache Test', cacheTest => {
       try {
         const result = await Cache.getEndpoint(Config.ENDPOINT_SOURCE_URL, fsp, endpointType, { transferId: '97b01bd3-b223-415b-b37b-ab5bef9bdbed' })
         test.equal(result, expected, 'The results match')
+
+        const result2 = await Cache.getEndpoint(Config.ENDPOINT_SOURCE_URL, fsp, endpointType, { transferId: '97b01bd3-b223-415b-b37b-ab5bef9bdbed' }, { path: '/additionalPath' })
+        test.equal(result2, `${expected}/additionalPath`, 'The results match')
+
         await Cache.stopCache()
         test.end()
       } catch (err) {
@@ -83,6 +88,10 @@ Test('Cache Test', cacheTest => {
       try {
         const result = await Cache.getEndpoint(Config.ENDPOINT_SOURCE_URL, fsp, endpointType, { transferId: '97b01bd3-b223-415b-b37b-ab5bef9bdbed' })
         test.equal(result, expected, 'The results match')
+
+        const result2 = await Cache.getEndpoint(Config.ENDPOINT_SOURCE_URL, fsp, endpointType, { transferId: '97b01bd3-b223-415b-b37b-ab5bef9bdbed' }, { path: '/additionalPath' })
+        test.equal(result2, `${expected}/additionalPath`, 'The results match')
+
         await Cache.stopCache()
         test.end()
       } catch (err) {
@@ -102,13 +111,11 @@ Test('Cache Test', cacheTest => {
       try {
         await Cache.getEndpoint(Config.ENDPOINT_SOURCE_URL, fsp, endpointType, { transferId: '97b01bd3-b223-415b-b37b-ab5bef9bdbed' })
         test.fail('should throw error')
-        await Cache.stopCache()
-        test.end()
       } catch (e) {
         test.ok(e instanceof Error)
-        await Cache.stopCache()
-        test.end()
       }
+      await Cache.stopCache()
+      test.end()
     })
 
     getEndpointTest.test('throw error', async (test) => {