account-lookup-service 17.12.3-connection-lost.0 → 17.12.3-snapshot.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "account-lookup-service",
   "description": "Account Lookup Service is used to validate Party and Participant lookups.",
-  "version": "17.12.3-connection-lost.0",
+  "version": "17.12.3-snapshot.1",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [

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

@@ -168,7 +168,9 @@ class BasePartiesService {
 
   async sendDeleteOracleRequest (headers, params) {
     this.stepInProgress('sendDeleteOracleRequest')
-    return this.deps.oracle.oracleRequest(headers, RestMethods.DELETE, params, null, null, this.deps.cache)
+    const result = await this.deps.oracle.oracleRequest(headers, RestMethods.DELETE, params, null, null, this.deps.cache)
+    this.log.verbose('sendDeleteOracleRequest is done', { params })
+    return result
   }
 
   async removeProxyGetPartiesTimeoutCache (alsReq) {

package/src/lib/config.js

@@ -175,7 +175,8 @@ const config = {
   FEATURE_ENABLE_EXTENDED_PARTY_ID_TYPE: RC.FEATURE_ENABLE_EXTENDED_PARTY_ID_TYPE || false,
   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
+  DELETE_PARTICIPANT_VALIDATION_ENABLED: RC.DELETE_PARTICIPANT_VALIDATION_ENABLED || false,
+  HTTP_REQUEST_TIMEOUT_MS: RC.HTTP_REQUEST_TIMEOUT_MS ?? 20_000
 }
 
 if (config.JWS_SIGN) {

package/src/models/oracle/facade.js

@@ -43,7 +43,10 @@ const { Headers, RestMethods, ReturnCodes } = Enums.Http
 const sendHttpRequest = ({ method, ...restArgs }) => request.sendRequest({
   ...restArgs,
   method: method.toUpperCase(),
-  hubNameRegex
+  hubNameRegex,
+  axiosRequestOptionsOverride: {
+    timeout: Config.HTTP_REQUEST_TIMEOUT_MS
+  }
 })
 
 /**

package/src/models/participantEndpoint/facade.js

@@ -37,6 +37,9 @@ const { logger } = require('../../lib')
 const { hubNameRegex } = require('../../lib/util').hubNameConfig
 
 const uriRegex = /(?:^.*)(\/(participants|parties|quotes|transfers)(\/.*)*)$/
+const axiosRequestOptionsOverride = {
+  timeout: Config.HTTP_REQUEST_TIMEOUT_MS
+}
 
 /**
  * @module src/models/participantEndpoint/facade
@@ -115,7 +118,8 @@ exports.sendRequest = async (headers, requestedParticipant, endpointType, method
       span,
       protocolVersions,
       hubNameRegex,
-      apiType: Config.API_TYPE
+      apiType: Config.API_TYPE,
+      axiosRequestOptionsOverride
     }
     logger.debug('participant - sendRequest params:', { params })
     params.jwsSigner = defineJwsSigner(Config, headers, requestedEndpoint)
@@ -252,7 +256,8 @@ exports.sendErrorToParticipant = async (participantName, endpointType, errorInfo
       hubNameRegex,
       span,
       protocolVersions,
-      apiType: Config.API_TYPE
+      apiType: Config.API_TYPE,
+      axiosRequestOptionsOverride
     }
     logger.debug('participant - sendErrorToParticipant params: ', { params })
     params.jwsSigner = defineJwsSigner(Config, clonedHeaders, requesterErrorEndpoint)

package/src/server.js

@@ -45,12 +45,6 @@ const OracleEndpointCache = require('./models/oracle/oracleEndpointCached')
 const Handlers = require('./handlers/register')
 
 const connectDatabase = async (dbConfig) => {
-  if (dbConfig.pool) {
-    dbConfig.pool.afterCreate = (connection, done) => {
-      connection.on('end', () => { connection.__knex__disposed = 'Connection ended' })
-      done(null, connection)
-    }
-  }
   await Db.connect(dbConfig)
   logger.info('Database connected')
 }

package/test/unit/models/participantEndpoint/facade.test.js

@@ -188,6 +188,26 @@ describe('participantEndpoint Facade', () => {
 
       expect(mockSendRequest.mock.lastCall[0].jwsSigner).toBeTruthy()
     })
+
+    it('should add default timeout to sendRequest', async () => {
+      const mockedConfig = {
+        JWS_SIGN: false,
+        FSPIOP_SOURCE_TO_SIGN: mockHubName,
+        PROTOCOL_VERSIONS: fixtures.protocolVersionsDto(),
+        HTTP_REQUEST_TIMEOUT_MS: 1000
+      }
+      jest.mock('../../../../src/lib/config', () => (mockedConfig))
+      mockGetEndpoint.mockImplementation(() => 'https://example.com/12345')
+      mockSendRequest.mockImplementation(async () => true)
+      const ParticipantFacade = require(`${src}/models/participantEndpoint/facade`)
+
+      const headers = {}
+      const requestedParticipant = {}
+      const endpointType = 'URL'
+
+      await ParticipantFacade.sendRequest(headers, requestedParticipant, endpointType)
+      expect(mockSendRequest.mock.calls[0][0].axiosRequestOptionsOverride.timeout).toBe(mockedConfig.HTTP_REQUEST_TIMEOUT_MS)
+    })
   })
 
   describe('validateParticipant', () => {