@mojaloop/central-services-shared 18.6.0-proxy.3 → 18.6.0-proxy.5

package/.circleci/config.yml

@@ -9,4 +9,3 @@ workflows:
           filters:
             tags:
               only: /v\d+(\.\d+){2}(-(snapshot|hotfix|perf)\.\d+)?/
-

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.5.2](https://github.com/mojaloop/central-services-shared/compare/v18.5.1...v18.5.2) (2024-07-04)
+
+
+### Chore
+
+* **mojaloop/csi-190:** update enums for proxy transfer states ([#388](https://github.com/mojaloop/central-services-shared/issues/388)) ([735d30a](https://github.com/mojaloop/central-services-shared/commit/735d30a92416ec024d094affd69b41781c0e11e3))
+
 ### [18.5.1](https://github.com/mojaloop/central-services-shared/compare/v18.5.0...v18.5.1) (2024-06-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/central-services-shared",
-  "version": "18.6.0-proxy.3",
+  "version": "18.6.0-proxy.5",
   "description": "Shared code for mojaloop central services",
   "license": "Apache-2.0",
   "author": "ModusBox",

package/src/enums/events.js

@@ -101,6 +101,7 @@ const Event = {
     POSITION_PREPARE: 'position-prepare',
     POSITION_FULFIL: 'position-fulfil',
     PREPARE: 'prepare',
+    FORWARDED: 'forwarded',
     PREPARE_DUPLICATE: 'prepare-duplicate',
     PROCESSING: 'processing',
     RECORD_FUNDS_IN: 'recordFundsIn',

package/src/enums/transfers.js

@@ -38,6 +38,7 @@ const TransferInternalState = {
   RECEIVED_PREPARE: 'RECEIVED_PREPARE',
   RECEIVED_REJECT: 'RECEIVED_REJECT',
   RESERVED: 'RESERVED',
+  RESERVED_FORWARDED: 'RESERVED_FORWARDED',
   RESERVED_TIMEOUT: 'RESERVED_TIMEOUT'
 }
 

package/src/index.d.ts

@@ -316,6 +316,7 @@ declare namespace CentralServicesShared {
     POSITION_PREPARE = 'position-prepare',
     POSITION_FULFIL = 'position-fulfil',
     PREPARE = 'prepare',
+    FORWARDED = 'forwarded',
     PREPARE_DUPLICATE = 'prepare-duplicate',
     PROCESSING = 'processing',
     RECORD_FUNDS_IN = 'recordFundsIn',
@@ -349,6 +350,7 @@ declare namespace CentralServicesShared {
     RECEIVED_PREPARE = 'RECEIVED_PREPARE',
     RECEIVED_REJECT = 'RECEIVED_REJECT',
     RESERVED = 'RESERVED',
+    RESERVED_FORWARDED = 'RESERVED_FORWARDED',
     RESERVED_TIMEOUT = 'RESERVED_TIMEOUT'
   }
 

package/src/util/endpoints.js

@@ -147,6 +147,8 @@ exports.getEndpoint = async (switchUrl, fsp, endpointType, options = {}, renderO
   ).startTimer()
   switchEndpoint = switchUrl
   Logger.isDebugEnabled && Logger.debug(`participantEndpointCache::getEndpoint::endpointType - ${endpointType}`)
+  let proxyId
+  const result = url => proxyConfig ? { url, proxyId } : url
   try {
     // If a service passes in `getDecoratedValue` as true, then an object
     // { value, cached, report } is returned, where value is the cached value,
@@ -158,7 +160,7 @@ exports.getEndpoint = async (switchUrl, fsp, endpointType, options = {}, renderO
         proxy = proxyLib.createProxyCache(type, config)
         await proxy.connect()
       }
-      const proxyId = await proxy.lookupProxyByDfspId(fsp)
+      proxyId = await proxy.lookupProxyByDfspId(fsp)
       endpoints = proxyId && await policy.get(proxyId)
     }
     if (!endpoints) throw ErrorHandler.CreateFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND)
@@ -171,16 +173,16 @@ exports.getEndpoint = async (switchUrl, fsp, endpointType, options = {}, renderO
       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 result(Mustache.render(renderedEndpoint, options))
       }
-      return Mustache.render(endpoint, options)
+      return result(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(endpoint, options)
+    return result(Mustache.render(endpoint, options))
   } catch (err) {
     histTimer({ success: false, hit: false })
     Logger.isErrorEnabled && Logger.error(`participantEndpointCache::getEndpoint:: ERROR:'${err}'`)

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

@@ -122,8 +122,10 @@ Test('Cache Test', (cacheTest) => {
         { fsp: proxiedFsp }
       )
       const endpointType = FSPIOP_CALLBACK_URL_TRANSFER_PUT
-      const expected =
-        'http://localhost:1080/transfers/97b01bd3-b223-415b-b37b-ab5bef9bdbed'
+      const expected = {
+        url: 'http://localhost:1080/transfers/97b01bd3-b223-415b-b37b-ab5bef9bdbed',
+        proxyId: 'fsp'
+      }
 
       await Cache.initializeCache(Config.ENDPOINT_CACHE_CONFIG, {
         hubName, hubNameRegex
@@ -144,7 +146,7 @@ Test('Cache Test', (cacheTest) => {
           undefined,
           {}
         )
-        test.equal(result, expected, 'The results match')
+        test.deepEqual(result, expected, 'The results match')
 
         await Cache.stopCache()
         test.end()