account-lookup-service 17.13.0 → 17.14.0-snapshot.3

package/src/domain/parties/services/GetPartiesService.js

@@ -26,10 +26,10 @@
  ******/
 
 const { ERROR_MESSAGES } = require('../../../constants')
+const { PROXY_CACHE_EXPIRES_IN_SEC } = require('../../../lib/config')
 const BasePartiesService = require('./BasePartiesService')
 
 const { RestMethods } = BasePartiesService.enums()
-const proxyCacheTtlSec = 40 // todo: make configurable
 
 class GetPartiesService extends BasePartiesService {
   async handleRequest () {
@@ -294,11 +294,11 @@ class GetPartiesService extends BasePartiesService {
     this.stepInProgress('#setProxyListToCache')
     const alsReq = this.deps.partiesUtils.alsRequestDto(source, params)
 
-    const isCached = await this.deps.proxyCache.setSendToProxiesList(alsReq, proxyNames, proxyCacheTtlSec)
+    const isCached = await this.deps.proxyCache.setSendToProxiesList(alsReq, proxyNames, PROXY_CACHE_EXPIRES_IN_SEC)
     if (!isCached) {
       throw super.createFspiopIdNotFoundError(ERROR_MESSAGES.failedToCacheSendToProxiesList)
     }
-    this.log.verbose('#setProxyListToCache is done: ', { alsReq, proxyNames, proxyCacheTtlSec })
+    this.log.verbose('#setProxyListToCache is done: ', { alsReq, proxyNames, PROXY_CACHE_EXPIRES_IN_SEC })
     return alsReq
   }
 

package/src/domain/parties/services/PutPartiesErrorService.js

@@ -31,7 +31,7 @@ class PutPartiesErrorService extends BasePartiesService {
   async handleRequest () {
     if (this.state.proxyEnabled && this.state.proxy) {
       const alsReq = this.deps.partiesUtils.alsRequestDto(this.state.destination, this.inputs.params)
-      const isInterSchemeDiscoveryCase = await this.deps.proxyCache.isPendingCallback(alsReq)
+      const isInterSchemeDiscoveryCase = await this.deps.proxyCache.isPendingCallback(alsReq, this.state.proxy)
       this.log.verbose(`isInterSchemeDiscoveryCase: ${isInterSchemeDiscoveryCase}`, this.state)
 
       if (isInterSchemeDiscoveryCase) {
@@ -41,11 +41,11 @@ class PutPartiesErrorService extends BasePartiesService {
           return
         }
       } else {
-        const isExternal = await this.#isPartyFromExternalDfsp()
+        const isExternal = await this.#isPartyFromExternalDfsp() // !!! DO not clear oracle for the error callback for the same inter-scheme discovery flow
         if (isExternal) {
           this.log.info('need to cleanup oracle coz party is from external DFSP')
           await this.cleanupOracle()
-          await this.removeProxyGetPartiesTimeoutCache(alsReq) // think if we need this
+          await this.removeProxyGetPartiesTimeoutCache(alsReq) // todo: think if we need this
         }
       }
     }
@@ -66,9 +66,9 @@ class PutPartiesErrorService extends BasePartiesService {
   async checkLastProxyCallback (alsReq) {
     this.stepInProgress('checkLastProxyCallback')
     const { proxy } = this.state
-    const isLast = await this.deps.proxyCache.receivedErrorResponse(alsReq, proxy)
-    this.log.info(`got ${isLast ? '' : 'NOT '}last inter-scheme error callback from a proxy`, { proxy, alsReq, isLast })
-    return isLast
+    const isLastWithoutSuccess = await this.deps.proxyCache.receivedErrorResponse(alsReq, proxy)
+    this.log.info(`got ${isLastWithoutSuccess ? '' : 'NOT '}last inter-scheme error callback from a proxy`, { proxy, alsReq, isLastWithoutSuccess })
+    return isLastWithoutSuccess
   }
 
   async sendErrorCallbackToParticipant () {

package/src/domain/parties/services/PutPartiesService.js

@@ -67,10 +67,10 @@ class PutPartiesService extends BasePartiesService {
     if (this.state.proxyEnabled) {
       this.stepInProgress('checkProxySuccessResponse')
       const { headers, params } = this.inputs
-      const { destination, source } = this.state
+      const { destination, source, proxy } = this.state
       const alsReq = this.deps.partiesUtils.alsRequestDto(destination, params)
 
-      const isExists = await this.deps.proxyCache.receivedSuccessResponse(alsReq)
+      const isExists = await this.deps.proxyCache.receivedSuccessResponse(alsReq, proxy)
       if (!isExists) {
         this.log.verbose('NOT inter-scheme receivedSuccessResponse case')
         await this.removeProxyGetPartiesTimeoutCache(alsReq)

package/src/lib/config.js

@@ -176,7 +176,8 @@ const config = {
   PROTOCOL_VERSIONS: getProtocolVersions(DEFAULT_PROTOCOL_VERSION, RC.PROTOCOL_VERSIONS),
   PROXY_CACHE_CONFIG: RC.PROXY_CACHE,
   DELETE_PARTICIPANT_VALIDATION_ENABLED: RC.DELETE_PARTICIPANT_VALIDATION_ENABLED || false,
-  HTTP_REQUEST_TIMEOUT_MS: RC.HTTP_REQUEST_TIMEOUT_MS ?? 20_000
+  HTTP_REQUEST_TIMEOUT_MS: RC.HTTP_REQUEST_TIMEOUT_MS ?? 20_000,
+  PROXY_CACHE_EXPIRES_IN_SEC: RC.PROXY_CACHE_EXPIRES_IN_SEC ?? 20
 }
 
 if (config.JWS_SIGN) {

package/src/models/oracle/facade.js

@@ -141,6 +141,7 @@ const sendOracleGetRequest = async ({
   const log = logger.child({ component: 'sendOracleGetRequest', params })
 
   try {
+    let hit = false // cache hit
     let cachedOracleFspResponse
     cachedOracleFspResponse = cache && cache.get(cache.createKey(`oracleSendRequest_${url}`))
 
@@ -161,12 +162,12 @@ const sendOracleGetRequest = async ({
         cache.createKey(`oracleSendRequest_${url}`),
         cachedOracleFspResponse
       )
-      histTimerEnd({ success: true, hit: false })
     } else {
+      hit = true
       cachedOracleFspResponse = cachedOracleFspResponse.item
-      histTimerEnd({ success: true, hit: true })
-      logger.debug('[oracleRequest]: cache hit for fsp for partyId lookup')
     }
+    logger.verbose(`[oracleRequest]: cache hit for partyId lookup: ${hit}`, { url, source, destination })
+    histTimerEnd({ success: true, hit })
 
     return cachedOracleFspResponse
   } catch (err) {

package/test/integration/api/parties.test.js

@@ -30,7 +30,7 @@ const { createProxyCache } = require('@mojaloop/inter-scheme-proxy-cache-lib')
 const config = require('../../../src/lib/config')
 const fixtures = require('../../fixtures')
 const { AlsApiClient, ProxyApiClient } = require('../../util')
-const { PAYER_DFSP, PARTY_ID_TYPE } = require('../constants')
+const { PAYER_DFSP, PARTY_ID_TYPE, PROXY_NAME } = require('../constants')
 
 const alsClient = new AlsApiClient()
 const proxyClient = new ProxyApiClient() // mock ISPA
@@ -43,6 +43,10 @@ describe('Parties Endpoints Tests -->', () => {
     await proxyCache.connect()
   })
 
+  // beforeEach(async () => {
+  //   await proxyCache.redisClient.flushdb()
+  // })
+
   afterAll(async () => {
     await proxyCache.disconnect()
   })
@@ -51,7 +55,7 @@ describe('Parties Endpoints Tests -->', () => {
     test('should do GET /parties/{Type}/{ID} call to proxy', async () => {
       const partyId = 'PT123456789'
       const alsReq = fixtures.mockAlsRequestDto(PAYER_DFSP, PARTY_ID_TYPE, partyId)
-      let isExists = await proxyCache.receivedSuccessResponse(alsReq)
+      let isExists = await proxyCache.receivedSuccessResponse(alsReq, PROXY_NAME)
       expect(isExists).toBe(false)
 
       let history = await proxyClient.deleteHistory()
@@ -72,7 +76,7 @@ describe('Parties Endpoints Tests -->', () => {
       expect(history[0].path).toBe(`/oracle/participants/${PARTY_ID_TYPE}/${partyId}`)
       expect(history[1].path).toBe(`/parties/${PARTY_ID_TYPE}/${partyId}`)
 
-      isExists = await proxyCache.receivedSuccessResponse(alsReq)
+      isExists = await proxyCache.receivedSuccessResponse(alsReq, PROXY_NAME)
       expect(isExists).toBe(true)
     })
 

package/test/unit/domain/parties/parties.test.js

@@ -534,7 +534,7 @@ describe('Parties Tests', () => {
 
     it('should perform sendToProxies alsRequest, if no destination-header and no data in oracle response', async () => {
       Config.PROXY_CACHE_CONFIG.enabled = true
-      const proxyNames = ['proxyA', 'proxyB']
+      const proxyNames = [`proxyA-${Date.now()}`, `proxyB-${Date.now()}`]
       Util.proxies.getAllProxiesNames = sandbox.stub().resolves(proxyNames)
       oracle.oracleRequest = sandbox.stub().resolves(null)
       participant.validateParticipant = sandbox.stub().resolves({})
@@ -546,12 +546,12 @@ describe('Parties Tests', () => {
       const headers = fixtures.partiesCallHeadersDto({ source, destination })
       const alsReq = partiesUtils.alsRequestDto(source, Helper.getByTypeIdRequest.params)
 
-      let isExists = await proxyCache.receivedSuccessResponse(alsReq) // no in cache
+      let isExists = await proxyCache.receivedSuccessResponse(alsReq, proxyNames[0]) // no in cache
       expect(isExists).toBe(false)
 
       await partiesDomain.getPartiesByTypeAndID(headers, Helper.getByTypeIdRequest.params, Helper.getByTypeIdRequest.method, Helper.getByTypeIdRequest.query, Helper.mockSpan(), null, proxyCache)
 
-      isExists = await proxyCache.receivedSuccessResponse(alsReq)
+      isExists = await proxyCache.receivedSuccessResponse(alsReq, proxyNames[0])
       expect(isExists).toBe(true)
       expect(participant.sendErrorToParticipant.callCount).toBe(0)
       expect(participant.sendRequest.callCount).toBe(proxyNames.length)
@@ -682,8 +682,8 @@ describe('Parties Tests', () => {
     it('should update oracle with partyDetails received from proxy, if previous alsReq is cached', async () => {
       Config.PROXY_CACHE_CONFIG.enabled = true
       const source = `source-${Date.now()}`
-      const destination = `payer-fsp-${Date.now()}`
-      const proxy = `proxy-${Date.now()}`
+      const destination = `payeeDfsp-${Date.now()}`
+      const proxy = `proxyAB-${Date.now()}`
 
       participant.validateParticipant = sandbox.stub()
         .onFirstCall().resolves(null) // payee