account-lookup-service 17.1.0 → 17.2.1-snapshot.0

package/.ncurc.yaml

@@ -1,5 +1,6 @@
 ## Add a TODO comment indicating the reason for each rejected dependency upgrade added to this list, and what should be done to resolve it (i.e. handle it through a story, etc).
 reject: [
   # TODO: v6+ (ref: https://github.com/sindresorhus/get-port/releases/tag/v6.0.0) is an ESM library and thus not compatible with CommonJS. Future story needed to resolve.
-  "get-port"
+  "get-port",
+  "@mojaloop/inter-scheme-proxy-cache-lib" # remove it after merging snapshot
 ]

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.
 
+## [17.2.0](https://github.com/mojaloop/account-lookup-service/compare/v17.1.0...v17.2.0) (2025-02-26)
+
+
+### Features
+
+* update count metrics, fix int, update oracle code null currency ([#526](https://github.com/mojaloop/account-lookup-service/issues/526)) ([62167a5](https://github.com/mojaloop/account-lookup-service/commit/62167a5357b800af93bc0c4d950c0efbc6850a82))
+
 ## [17.1.0](https://github.com/mojaloop/account-lookup-service/compare/v17.0.3...v17.1.0) (2025-02-20)
 
 

package/docker-compose.yml

@@ -46,10 +46,15 @@ services:
     command:
       - "sh"
       - "-c"
-      - "sh /opt/wait-for/wait-for-account-lookup-service.sh && node src/index.js server"
+      - "npm run start:apiAndAdmin"
     ports:
       - "4001:4001"
       - "4002:4002"
+    depends_on:
+      mysql-als:
+        condition: service_healthy
+      central-ledger:
+        condition: service_healthy
     healthcheck:
       test: ["CMD", "sh", "-c" ,"apk --no-cache add curl", ";", "curl", "http://localhost:4001/health"]
       timeout: 20s
@@ -64,7 +69,8 @@ services:
       - "-c"
       - "node src/handlers/index.js h --timeout"
     depends_on:
-     - redis-node-0
+      account-lookup-service:
+        condition: service_healthy
     ports:
       - "4003:4003"
     healthcheck:

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.1.0",
+  "version": "17.2.1-snapshot.0",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -40,6 +40,7 @@
   "scripts": {
     "start": "LOG_LEVEL=debug node src/index.js server",
     "start:all": "run-p start:api start:admin start:handlers",
+    "start:apiAndAdmin": "run-p start:api start:admin",
     "start:api": "node src/index.js server --api",
     "start:admin": "node src/index.js server --admin",
     "start:handlers": "node src/handlers/index.js handlers --timeout",
@@ -49,7 +50,7 @@
     "lint:fix": "npm run standard:fix",
     "dev": "nodemon src/index.js server",
     "test": "npm run test:unit",
-    "test:unit": "NODE_OPTIONS='--experimental-vm-modules' jest --runInBand",
+    "test:unit": "NODE_OPTIONS='--experimental-vm-modules --max-old-space-size=8192' jest --runInBand",
     "test:coverage": "npm test -- --coverage --coverageThreshold='{}'",
     "test:coverage-check": "npm test -- --coverage",
     "test:junit": "npm test -- --reporters=default --reporters=jest-junit",
@@ -91,22 +92,22 @@
     "@hapi/inert": "7.1.0",
     "@hapi/vision": "7.0.3",
     "@mojaloop/central-services-error-handling": "13.0.6",
-    "@mojaloop/central-services-health": "15.0.3",
+    "@mojaloop/central-services-health": "15.0.4",
     "@mojaloop/central-services-logger": "11.5.5",
     "@mojaloop/central-services-metrics": "12.4.5",
-    "@mojaloop/central-services-shared": "18.18.0",
-    "@mojaloop/central-services-stream": "11.4.4",
-    "@mojaloop/database-lib": "11.1.2",
-    "@mojaloop/event-sdk": "14.1.3",
-    "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.1",
-    "@mojaloop/ml-schema-transformer-lib": "2.5.2",
-    "@mojaloop/sdk-standard-components": "19.6.4",
+    "@mojaloop/central-services-shared": "18.20.0",
+    "@mojaloop/central-services-stream": "11.5.1",
+    "@mojaloop/database-lib": "11.1.3",
+    "@mojaloop/event-sdk": "14.1.5",
+    "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.3-snapshot.0",
+    "@mojaloop/ml-schema-transformer-lib": "2.5.4",
+    "@mojaloop/sdk-standard-components": "19.7.0",
     "@now-ims/hapi-now-auth": "2.1.0",
     "ajv": "8.17.1",
     "ajv-keywords": "5.1.0",
     "blipp": "4.0.2",
     "commander": "13.1.0",
-    "cron": "4.0.0",
+    "cron": "4.1.0",
     "fast-safe-stringify": "^2.1.1",
     "hapi-auth-bearer-token": "8.0.0",
     "joi": "17.13.3",
@@ -162,7 +163,7 @@
   "devDependencies": {
     "@types/jest": "29.5.14",
     "audit-ci": "^7.1.0",
-    "axios": "1.7.9",
+    "axios": "1.8.1",
     "axios-retry": "^4.5.0",
     "docdash": "2.0.2",
     "dotenv": "^16.4.7",
@@ -172,7 +173,7 @@
     "jest-junit": "16.0.0",
     "jsdoc": "4.0.4",
     "nodemon": "3.1.9",
-    "npm-check-updates": "17.1.14",
+    "npm-check-updates": "17.1.15",
     "nyc": "17.1.0",
     "pre-commit": "1.2.2",
     "proxyquire": "2.1.3",

package/scripts/_wait4_all.js

@@ -12,7 +12,9 @@ const expectedContainers = [
   'als_mysql',
   'als_kafka',
   'als_mysql_central_ledger',
-  'als_central-ledger'
+  'als_central-ledger',
+  'als_account-lookup-service',
+  'als_account-lookup-service-handlers'
   // ## NOTE: These are not needed for Integration Tests
   // 'kowl'
 ]

package/src/domain/oracle/oracle.js

@@ -35,6 +35,7 @@ const cachedOracleEndpoint = require('../../models/oracle/oracleEndpointCached')
 const partyIdType = require('../../models/partyIdType')
 const endpointType = require('../../models/endpointType')
 const currency = require('../../models/currency')
+const util = require('../../lib/util')
 
 /**
  * @function createOracle
@@ -49,7 +50,6 @@ exports.createOracle = async (payload) => {
     'Create Oracle',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   let step
 
   try {
@@ -91,15 +91,7 @@ exports.createOracle = async (payload) => {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
     const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'createOracle',
-      step
-    })
-    throw fspiopError
+    util.rethrowAndCountFspiopError(fspiopError, { operation: 'createOracle', step })
   }
 }
 
@@ -116,7 +108,6 @@ exports.getOracle = async (query) => {
     'Get Oracle',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   let step
   try {
     let oracleEndpointModelList
@@ -160,15 +151,7 @@ exports.getOracle = async (query) => {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
     const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'getOracle',
-      step
-    })
-    throw fspiopError
+    util.rethrowAndCountFspiopError(fspiopError, { operation: 'getOracle', step })
   }
 }
 
@@ -186,7 +169,6 @@ exports.updateOracle = async (params, payload) => {
     'Update Oracle',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   let step
   try {
     step = 'getOracleEndpointById-1'
@@ -247,15 +229,7 @@ exports.updateOracle = async (params, payload) => {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
     const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'updateOracle',
-      step
-    })
-    throw fspiopError
+    util.rethrowAndCountFspiopError(fspiopError, { operation: 'updateOracle', step })
   }
 }
 
@@ -272,7 +246,6 @@ exports.deleteOracle = async (params) => {
     'Delete Oracle',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   try {
     await oracleEndpoint.destroyOracleEndpointById(params.ID)
     histTimerEnd({ success: true })
@@ -281,13 +254,6 @@ exports.deleteOracle = async (params) => {
     histTimerEnd({ success: false })
     Logger.isErrorEnabled && Logger.error(err)
     const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'deleteOracle'
-    })
-    throw fspiopError
+    util.rethrowAndCountFspiopError(fspiopError, { operation: 'deleteOracle' })
   }
 }

package/src/domain/participants/participants.js

@@ -37,6 +37,7 @@ const participant = require('../../models/participantEndpoint/facade')
 const Config = require('../../lib/config')
 const { logger } = require('../../lib')
 const { ERROR_MESSAGES } = require('../../constants')
+const util = require('../../lib/util')
 
 const { FSPIOPErrorCodes } = ErrorHandler.Enums
 
@@ -58,7 +59,6 @@ const getParticipantsByTypeAndID = async (headers, params, method, query, span,
     'Get participants by ID',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   const log = logger.child('getParticipantsByTypeAndID')
   const type = params.Type
   const partySubIdOrType = params.SubId
@@ -128,14 +128,9 @@ const getParticipantsByTypeAndID = async (headers, params, method, query, span,
   } catch (err) {
     log.warn('error in getParticipantsByTypeAndID', err)
     fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'getParticipantsByTypeAndID',
-      step
-    })
+    if (fspiopError) {
+      util.countFspiopError(fspiopError, { operation: 'getParticipantsByTypeAndID', step })
+    }
     try {
       await participant.sendErrorToParticipant(
         headers[Enums.Http.Headers.FSPIOP.SOURCE],
@@ -180,7 +175,6 @@ const putParticipantsByTypeAndID = async (headers, params, method, payload, cach
     'Put participants by type and ID',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   let step
   try {
     logger.info('putParticipantsByTypeAndID::begin')
@@ -249,14 +243,9 @@ const putParticipantsByTypeAndID = async (headers, params, method, payload, cach
       // we've already sent a sync response- we cannot throw.
       logger.error('error in participant.sendErrorToParticipant:', exc)
     }
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'putParticipantsByTypeAndID',
-      step
-    })
+    if (fspiopError) {
+      util.countFspiopError(fspiopError, { operation: 'putParticipantsByTypeAndID', step })
+    }
     histTimerEnd({ success: false })
   }
 }
@@ -280,7 +269,6 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
     'Put participants error by type and ID',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   let step
   try {
     const partySubIdOrType = params.SubId || undefined
@@ -325,14 +313,7 @@ const putParticipantsErrorByTypeAndID = async (headers, params, payload, dataUri
         headers,
         params
       )
-      const extensions = err.extensions || []
-      const system = extensions.find((element) => element.key === 'system')?.value || ''
-      errorCounter.inc({
-        code: fspiopError?.apiErrorCode?.code,
-        system,
-        operation: 'putParticipantsErrorByTypeAndID',
-        step
-      })
+      util.countFspiopError(fspiopError, { operation: 'putParticipantsErrorByTypeAndID', step })
     } catch (exc) {
       // We can't do anything else here- we _must_ handle all errors _within_ this function because
       // we've already sent a sync response- we cannot throw.
@@ -359,7 +340,6 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
     'Post participants',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   const childSpan = span ? span.getChild('postParticipants') : undefined
   let fspiopError
   let step
@@ -431,14 +411,9 @@ const postParticipants = async (headers, method, params, payload, span, cache) =
   } catch (err) {
     logger.error('error in postParticipants:', err)
     fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err, ErrorHandler.Enums.FSPIOPErrorCodes.ADD_PARTY_INFO_ERROR)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'postParticipants',
-      step
-    })
+    if (fspiopError) {
+      util.countFspiopError(fspiopError, { operation: 'postParticipants', step })
+    }
     try {
       const errorCallbackEndpointType = params.SubId
         ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR
@@ -476,7 +451,6 @@ const postParticipantsBatch = async (headers, method, requestPayload, span) => {
     'Post participants batch',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   const requestId = requestPayload.requestId
   const log = logger.child({ context: 'postParticipantsBatch', requestId })
   const childSpan = span ? span.getChild('postParticipantsBatch') : undefined
@@ -563,14 +537,9 @@ const postParticipantsBatch = async (headers, method, requestPayload, span) => {
   } catch (err) {
     log.error('error in postParticipantsBatch', err)
     fspiopError = ErrorHandler.Factory.reformatFSPIOPError(err)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'postParticipantsBatch',
-      step
-    })
+    if (fspiopError) {
+      util.countFspiopError(fspiopError, { operation: 'postParticipantsBatch', step })
+    }
     try {
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_BATCH_PUT_ERROR,
         fspiopError.toApiErrorObject(Config.ERROR_HANDLING), headers, undefined, requestPayload)
@@ -606,7 +575,6 @@ const deleteParticipants = async (headers, params, method, query, cache) => {
     'Delete participants',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   const log = logger.child('deleteParticipants')
   let step
   try {
@@ -659,14 +627,7 @@ const deleteParticipants = async (headers, params, method, query, cache) => {
       const errorCallbackEndpointType = params.SubId ? Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_SUB_ID_PUT_ERROR : Enums.EndPoints.FspEndpointTypes.FSPIOP_CALLBACK_URL_PARTICIPANT_PUT_ERROR
       await participant.sendErrorToParticipant(headers[Enums.Http.Headers.FSPIOP.SOURCE], errorCallbackEndpointType,
         fspiopError.toApiErrorObject(Config.ERROR_HANDLING), headers, params)
-      const extensions = err.extensions || []
-      const system = extensions.find((element) => element.key === 'system')?.value || ''
-      errorCounter.inc({
-        code: fspiopError?.apiErrorCode?.code,
-        system,
-        operation: 'deleteParticipants',
-        step
-      })
+      util.countFspiopError(fspiopError, { operation: 'deleteParticipants', step })
     } catch (exc) {
       // We can't do anything else here- we _must_ handle all errors _within_ this function because
       // we've already sent a sync response- we cannot throw.

package/src/domain/parties/getPartiesByTypeAndID.js

@@ -35,6 +35,7 @@ const { ERROR_MESSAGES } = require('../../constants')
 const { logger } = require('../../lib')
 const Config = require('../../lib/config')
 const utils = require('./utils')
+const util = require('../../lib/util')
 
 const { FspEndpointTypes, FspEndpointTemplates } = Enum.EndPoints
 const { Headers, RestMethods } = Enum.Http
@@ -87,7 +88,6 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
     'Get party by Type and Id',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   const proxyEnabled = !!(Config.PROXY_CACHE_CONFIG.enabled && proxyCache)
   const type = params.Type
   const partySubId = params.SubId
@@ -245,14 +245,9 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
   } catch (err) {
     fspiopError = await handleErrorOnSendingCallback(err, headers, params, requester)
     histTimerEnd({ success: false })
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'getPartiesByTypeAndID',
-      step
-    })
+    if (fspiopError) {
+      util.countFspiopError(fspiopError, { operation: 'getPartiesByTypeAndID', step })
+    }
   } finally {
     await utils.finishSpanWithError(childSpan, fspiopError)
   }

package/src/domain/parties/parties.js

@@ -41,6 +41,7 @@ const { ERROR_MESSAGES } = require('../../constants')
 const { logger } = require('../../lib')
 const Config = require('../../lib/config')
 const utils = require('./utils')
+const util = require('../../lib/util')
 const getPartiesByTypeAndID = require('./getPartiesByTypeAndID')
 
 const log = logger.child('domain:put-parties')
@@ -65,7 +66,6 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
     'Put parties by type and id',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   const type = params.Type
   const partySubId = params.SubId
   const source = headers[Headers.FSPIOP.SOURCE]
@@ -134,14 +134,9 @@ const putPartiesByTypeAndID = async (headers, params, method, payload, dataUri,
     histTimerEnd({ success: true })
   } catch (err) {
     const fspiopError = await handleErrorOnSendingCallback(err, headers, params, sendTo)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'putPartiesByTypeAndID',
-      step
-    })
+    if (fspiopError) {
+      util.countFspiopError(fspiopError, { operation: 'putPartiesByTypeAndID', step })
+    }
     histTimerEnd({ success: false })
   }
 }
@@ -165,7 +160,6 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
     'Put parties error by type and id',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   const partySubId = params.SubId
   const destination = headers[Headers.FSPIOP.DESTINATION]
   const callbackEndpointType = utils.errorPartyCbType(partySubId)
@@ -220,14 +214,9 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
     histTimerEnd({ success: true })
   } catch (err) {
     fspiopError = await handleErrorOnSendingCallback(err, headers, params, sendTo)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'putPartiesErrorByTypeAndID',
-      step
-    })
+    if (fspiopError) {
+      util.countFspiopError(fspiopError, { operation: 'putPartiesErrorByTypeAndID', step })
+    }
     histTimerEnd({ success: false })
   } finally {
     await utils.finishSpanWithError(childSpan, fspiopError)

package/src/domain/timeout/index.js

@@ -46,6 +46,7 @@ const Participant = require('../../models/participantEndpoint/facade')
 const { ERROR_MESSAGES } = require('../../constants')
 const { timeoutCallbackDto } = require('./dto')
 const { logger } = require('../../lib')
+const util = require('../../lib/util')
 
 const timeoutInterschemePartiesLookups = async ({ proxyCache, batchSize }) => {
   return proxyCache.processExpiredAlsKeys(sendTimeoutCallback, batchSize)
@@ -57,7 +58,6 @@ const sendTimeoutCallback = async (cacheKey) => {
     'Egress - Interscheme parties lookup timeout callback',
     ['success']
   ).startTimer()
-  const errorCounter = Metrics.getCounter('errorCount')
   let step
   const [, destination, partyType, partyId] = cacheKey.split(':')
   const { errorInformation, params, headers, endpointType, span } = await timeoutCallbackDto({ destination, partyId, partyType })
@@ -74,14 +74,8 @@ const sendTimeoutCallback = async (cacheKey) => {
     logger.warn('error in sendTimeoutCallback: ', err)
     histTimerEnd({ success: false })
     const fspiopError = reformatFSPIOPError(err)
-    const extensions = err.extensions || []
-    const system = extensions.find((element) => element.key === 'system')?.value || ''
-    errorCounter.inc({
-      code: fspiopError?.apiErrorCode?.code,
-      system,
-      operation: 'sendTimeoutCallback',
-      step
-    })
+    util.countFspiopError(fspiopError, { operation: 'sendTimeoutCallback', step })
+
     await finishSpan(span, fspiopError)
     throw fspiopError
   }

package/src/handlers/index.js

@@ -30,6 +30,7 @@
  ******/
 'use strict'
 
+const process = require('node:process')
 const { Command } = require('commander')
 const Package = require('../../package.json')
 const Server = require('../server')
@@ -37,6 +38,15 @@ const { HANDLER_TYPES } = require('../constants')
 const Config = require('../lib/config')
 const log = require('../lib').logger.child('ALS-timeout-handler')
 
+process.on('uncaughtExceptionMonitor', (err) => {
+  log.error(`uncaughtException: ${err?.message}`, err)
+  process.exit(2)
+})
+process.on('unhandledRejection', (err) => {
+  log.error(`unhandledRejection: ${err?.message}`, err)
+  process.exit(3)
+})
+
 const Program = new Command()
 
 Program
@@ -51,12 +61,12 @@ Program.command('handlers')
     const handlers = []
 
     if (args.timeout) {
-      log.debug('CLI: Executing --timeout')
+      log.verbose('CLI: Executing --timeout')
       handlers.push(HANDLER_TYPES.TIMEOUT)
     }
 
     if (handlers.length === 0) {
-      log.debug('CLI: No handlers specified')
+      log.info('CLI: No handlers specified')
       return
     }
 

package/src/handlers/monitoring/index.js

@@ -17,8 +17,7 @@
 ******/
 const Hapi = require('@hapi/hapi')
 const Metrics = require('@mojaloop/central-services-metrics')
-const { plugin: HealthPlugin } = require('./plugins/health')
-const MetricsPlugin = require('@mojaloop/central-services-metrics').plugin
+const healthPlugin = require('./plugins/health').plugin
 const { logger } = require('../../lib')
 
 let server
@@ -26,7 +25,7 @@ let server
 const create = async ({ port, metricsConfig }) => {
   Metrics.setup(metricsConfig)
   server = new Hapi.Server({ port })
-  await server.register([HealthPlugin, MetricsPlugin])
+  await server.register([healthPlugin, Metrics.plugin])
 }
 
 const start = async ({ enabled, port, metricsConfig, proxyCache }) => {
@@ -39,7 +38,7 @@ const start = async ({ enabled, port, metricsConfig, proxyCache }) => {
 
 const stop = async () => {
   await Promise.all([
-    server?.stop(),
+    server.stop(),
     server.app.proxyCache?.disconnect()
   ])
   server = null

package/src/handlers/monitoring/plugins/health.js

@@ -20,8 +20,8 @@
 
 const { HealthCheck } = require('@mojaloop/central-services-shared').HealthCheck
 const { defaultHealthHandler } = require('@mojaloop/central-services-health')
-const packageJson = require('../../../../package.json')
 const { getProxyCacheHealth } = require('../../../lib/healthCheck/subServiceHealth')
+const packageJson = require('../../../../package.json')
 
 let healthCheck
 

package/src/handlers/register.js

@@ -47,17 +47,18 @@ const Monitoring = require('./monitoring')
 const registerHandlers = async (handlers, options) => {
   const { logger } = options
   await init(options)
-  handlers.forEach(handler => {
+
+  for (const handler of handlers) {
     switch (handler) {
       case HANDLER_TYPES.TIMEOUT:
         logger.debug('Registering Timeout Handler')
-        TimeoutHandler.register(options)
+        await TimeoutHandler.register(options)
         break
       default:
         logger.warn(`Handler ${handler} not found`)
         break
     }
-  })
+  }
 }
 
 /**

package/src/lib/healthCheck/subServiceHealth.js

@@ -24,8 +24,7 @@
 'use strict'
 
 const { statusEnum, serviceName } = require('@mojaloop/central-services-shared').HealthCheck.HealthCheckEnums
-const Logger = require('@mojaloop/central-services-logger')
-
+const { logger } = require('../../lib')
 const MigrationLockModel = require('../../models/misc/migrationLock')
 
 /**
@@ -45,7 +44,7 @@ const getSubServiceHealthDatastore = async () => {
       status = statusEnum.DOWN
     }
   } catch (err) {
-    Logger.isDebugEnabled && Logger.debug(`getSubServiceHealthDatastore failed with error ${err.message}.`)
+    logger.warn(`error in getSubServiceHealthDatastore: ${err?.message}`, err)
     status = statusEnum.DOWN
   }
 
@@ -63,12 +62,12 @@ const getSubServiceHealthDatastore = async () => {
  * @returns Promise<SubServiceHealth> The SubService health object for the proxy cache
  */
 const getProxyCacheHealth = async (proxyCache) => {
-  let status = statusEnum.OK
+  let status
 
   try {
     status = await proxyCache.healthCheck() ? statusEnum.OK : statusEnum.DOWN
   } catch (err) {
-    Logger.isDebugEnabled && Logger.debug(`getProxyCacheHealth failed with error ${err.message}.`)
+    logger.warn(`error in getProxyCacheHealth: ${err?.message}`, err)
     status = statusEnum.DOWN
   }
 

package/src/lib/util.js

@@ -1,8 +1,9 @@
 const util = require('util')
 const Path = require('path')
 const Enum = require('@mojaloop/central-services-shared').Enum
-const { HeaderValidation, Hapi } = require('@mojaloop/central-services-shared').Util
+const { HeaderValidation, Hapi, rethrow } = require('@mojaloop/central-services-shared').Util
 const Config = require('../lib/config')
+const { logger } = require('./index')
 
 const getSpanTags = ({ headers }, transactionType, transactionAction) => {
   const tags = {
@@ -55,6 +56,20 @@ function getStackOrInspect (err) {
   return err?.stack || util.inspect(err)
 }
 
+const rethrowAndCountFspiopError = (error, options) => {
+  options.loggerOverride = logger
+  rethrow.rethrowAndCountFspiopError(error, options)
+}
+
+const rethrowDatabaseError = (error) => {
+  rethrow.rethrowDatabaseError(error, { loggerOverride: logger })
+}
+
+const countFspiopError = (error, options) => {
+  options.loggerOverride = logger
+  rethrow.countFspiopError(error, options)
+}
+
 module.exports = {
   getSpanTags,
   pathForInterface,
@@ -62,5 +77,8 @@ module.exports = {
   hubNameConfig: {
     hubName: Config.HUB_NAME,
     hubNameRegex: HeaderValidation.getHubNameRegex(Config.HUB_NAME)
-  }
+  },
+  rethrowAndCountFspiopError,
+  rethrowDatabaseError,
+  countFspiopError
 }

package/src/models/currency/currency.js

@@ -26,7 +26,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const ErrorHandler = require('@mojaloop/central-services-error-handling')
+const util = require('../../lib/util')
 
 /**
  * @function getCurrencyById
@@ -39,16 +39,7 @@ const getCurrencyById = async (currencyId) => {
   try {
     return Db.from('currency').findOne({ currencyId, isActive: true })
   } catch (err) {
-    const extensions = [{
-      key: 'system',
-      value: '["db"]'
-    }]
-    throw ErrorHandler.Factory.reformatFSPIOPError(
-      err,
-      undefined,
-      undefined,
-      extensions
-    )
+    util.rethrowDatabaseError(err)
   }
 }
 

package/src/models/endpointType/endpointType.js

@@ -26,7 +26,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const ErrorHandler = require('@mojaloop/central-services-error-handling')
+const util = require('../../lib/util')
 
 /**
  * @function getEndpointTypeByType
@@ -39,16 +39,7 @@ const getEndpointTypeByType = async (type) => {
   try {
     return Db.from('endpointType').findOne({ type, isActive: true })
   } catch (err) {
-    const extensions = [{
-      key: 'system',
-      value: '["db"]'
-    }]
-    throw ErrorHandler.Factory.reformatFSPIOPError(
-      err,
-      undefined,
-      undefined,
-      extensions
-    )
+    util.rethrowDatabaseError(err)
   }
 }
 

package/src/models/oracle/oracleEndpoint.js

@@ -26,11 +26,7 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const ErrorHandler = require('@mojaloop/central-services-error-handling')
-const extensions = [{
-  key: 'system',
-  value: '["db"]'
-}]
+const util = require('../../lib/util')
 
 const getOracleEndpointByType = async (type) => {
   try {
@@ -47,12 +43,7 @@ const getOracleEndpointByType = async (type) => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(
-      err,
-      undefined,
-      undefined,
-      extensions
-    )
+    util.rethrowDatabaseError(err)
   }
 }
 
@@ -73,12 +64,7 @@ const getOracleEndpointByTypeAndCurrency = async (type, currencyId) => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(
-      err,
-      undefined,
-      undefined,
-      extensions
-    )
+    util.rethrowDatabaseError(err)
   }
 }
 
@@ -98,12 +84,7 @@ const getOracleEndpointByCurrency = async (currencyId) => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(
-      err,
-      undefined,
-      undefined,
-      extensions
-    )
+    util.rethrowDatabaseError(err)
   }
 }
 
@@ -123,12 +104,7 @@ const getOracleEndpointById = async (oracleEndpointId) => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(
-      err,
-      undefined,
-      undefined,
-      extensions
-    )
+    util.rethrowDatabaseError(err)
   }
 }
 
@@ -146,12 +122,7 @@ const getAllOracleEndpoint = async () => {
           'pt.name as idType', 'oracleEndpoint.currencyId as currency', 'oracleEndpoint.isDefault')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(
-      err,
-      undefined,
-      undefined,
-      extensions
-    )
+    util.rethrowDatabaseError(err)
   }
 }
 
@@ -161,7 +132,7 @@ const getAllOracleEndpointsByMatchCondition = async (oracleEndpointModel, partyI
       return builder.innerJoin('endpointType AS et', 'oracleEndpoint.endpointTypeId', 'et.endpointTypeId')
         .innerJoin('partyIdType AS pt', 'oracleEndpoint.partyIdTypeId', 'pt.partyIdTypeId')
         .where({
-          'oracleEndpoint.currencyId': oracleEndpointModel.currency,
+          'oracleEndpoint.currencyId': oracleEndpointModel?.currency || null,
           'et.endpointTypeId': endpointTypeId,
           'pt.partyIdTypeId': partyIdTypeId,
           'oracleEndpoint.isActive': 1
@@ -171,12 +142,7 @@ const getAllOracleEndpointsByMatchCondition = async (oracleEndpointModel, partyI
           'oracleEndpoint.isActive', 'oracleEndpoint.partyIdTypeId', 'oracleEndpoint.endpointTypeId', 'oracleEndpoint.currencyId')
     })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(
-      err,
-      undefined,
-      undefined,
-      extensions
-    )
+    util.rethrowDatabaseError(err)
   }
 }
 
@@ -184,12 +150,7 @@ const createOracleEndpoint = async (oracleEndpointModel) => {
   try {
     return await Db.from('oracleEndpoint').insert(oracleEndpointModel)
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(
-      err,
-      undefined,
-      undefined,
-      extensions
-    )
+    util.rethrowDatabaseError(err)
   }
 }
 
@@ -197,12 +158,7 @@ const updateOracleEndpointById = async (id, oracleEndpointModel) => {
   try {
     return await Db.from('oracleEndpoint').update({ oracleEndpointId: id }, oracleEndpointModel)
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(
-      err,
-      undefined,
-      undefined,
-      extensions
-    )
+    util.rethrowDatabaseError(err)
   }
 }
 
@@ -210,12 +166,7 @@ const setIsActiveOracleEndpoint = async (oracleType, isActive) => {
   try {
     return await Db.from('oracleEndpoint').update({ oracleType }, { isActive })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(
-      err,
-      undefined,
-      undefined,
-      extensions
-    )
+    util.rethrowDatabaseError(err)
   }
 }
 
@@ -223,12 +174,7 @@ const destroyOracleEndpointById = async (oracleEndpointId) => {
   try {
     return await Db.from('oracleEndpoint').update({ oracleEndpointId }, { isActive: false })
   } catch (err) {
-    throw ErrorHandler.Factory.reformatFSPIOPError(
-      err,
-      undefined,
-      undefined,
-      extensions
-    )
+    util.rethrowDatabaseError(err)
   }
 }
 

package/src/models/partyIdType/partyIdType.js

@@ -26,22 +26,13 @@
 'use strict'
 
 const Db = require('../../lib/db')
-const ErrorHandler = require('@mojaloop/central-services-error-handling')
+const util = require('../../lib/util')
 
 const getPartyIdTypeByName = async (name) => {
   try {
     return Db.from('partyIdType').findOne({ name, isActive: true })
   } catch (err) {
-    const extensions = [{
-      key: 'system',
-      value: '["db"]'
-    }]
-    throw ErrorHandler.Factory.reformatFSPIOPError(
-      err,
-      undefined,
-      undefined,
-      extensions
-    )
+    util.rethrowDatabaseError(err)
   }
 }
 

package/src/server.js

@@ -33,6 +33,7 @@ const { Endpoints, Participants, proxies, OpenapiBackend } = require('@mojaloop/
 const { createProxyCache } = require('@mojaloop/inter-scheme-proxy-cache-lib')
 
 const { name, version } = require('../package.json')
+const { logger } = require('./lib')
 const Db = require('./lib/db')
 const Util = require('./lib/util')
 const Plugins = require('./plugins')
@@ -56,7 +57,8 @@ const createConnectedProxyCache = async (proxyCacheConfig) => {
     proxyCacheConfig.type,
     proxyCacheConfig.proxyConfig
   )
-  await proxyCache.connect()
+  const connStatus = await proxyCache.connect()
+  logger.info('proxyCache connected', { connStatus, proxyCacheConfig })
   return proxyCache
 }
 
@@ -106,13 +108,6 @@ const createServer = async (port, api, routes, isAdmin, proxyCacheConfig, proxyM
 
   server.route(routes)
 
-  // Initialize the error count metric
-  Metrics.getCounter(
-    'errorCount',
-    'Error count',
-    ['code', 'system', 'operation', 'step']
-  )
-
   // TODO: follow instructions https://github.com/anttiviljami/openapi-backend/blob/master/DOCS.md#postresponsehandler-handler
   await server.start()
 
@@ -174,13 +169,16 @@ const initializeAdmin = async (appConfig) => {
   RUN_MIGRATIONS && await migrate()
   const OpenAPISpecPath = Util.pathForInterface({ isAdmin: true, isMockInterface: false })
   const api = await OpenapiBackend.initialise(OpenAPISpecPath, APIHandlers.AdminHandlers)
-
+  await Promise.all([
+    OracleEndpointCache.initialize(),
+    Cache.initCache()
+  ])
   return createServer(ADMIN_PORT, api, Routes.AdminRoutes(api), true, PROXY_CACHE_CONFIG)
 }
 
 const initializeHandlers = async (handlers, appConfig, logger) => {
   const proxyCache = await createConnectedProxyCache(appConfig.PROXY_CACHE_CONFIG)
-  const options = { proxyCache, batchSize: appConfig.HANDLERS_TIMEOUT_BATCH_SIZE, logger }
+  const options = { proxyCache, logger, batchSize: appConfig.HANDLERS_TIMEOUT_BATCH_SIZE }
   await Handlers.registerHandlers(handlers, options)
 }
 

package/test/integration/domain/oracle/index.test.js

@@ -82,6 +82,15 @@ describe('Oracle', () => {
     }
   }
 
+  const oracleUsdMsisdnNoCurrencyUrlPayload = {
+    isDefault: true,
+    oracleIdType: 'MSISDN',
+    endpoint: {
+      value: 'http://localhost:8444',
+      endpointType: 'URL'
+    }
+  }
+
   describe('Create', () => {
     it('creates an oracle', async () => {
       const result = await Oracle.createOracle(oracleAuhMsisdnUrlPayload, createHeaders, testSpan)
@@ -126,6 +135,15 @@ describe('Oracle', () => {
       const createdId = oracleEndpointResult[0].oracleEndpointId
       await Db.from('oracleEndpoint').destroy({ oracleEndpointId: createdId })
     })
+
+    it('creates an oracle without a currency', async () => {
+      const result = await Oracle.createOracle(oracleUsdMsisdnNoCurrencyUrlPayload, createHeaders, testSpan)
+      expect(result).toBe(true)
+
+      const oracleEndpointResult = await OracleModel.getOracleEndpointByType('MSISDN')
+      const createdId = oracleEndpointResult[0].oracleEndpointId
+      await Db.from('oracleEndpoint').destroy({ oracleEndpointId: createdId })
+    })
   })
 
   describe('Update', () => {

package/test/integration/domain/timeout/index.test.js

@@ -6,7 +6,7 @@ const config = require('../../../../src/lib/config')
 
 const wait = (sec) => new Promise(resolve => setTimeout(resolve, sec * 1000))
 
-const CRON_TIMEOUT_SEC = 10 // see TIMEXP
+const CRON_TIMEOUT_SEC = 15 // see TIMEXP
 
 describe('Timeout Handler', () => {
   const { type, proxyConfig } = config.PROXY_CACHE_CONFIG

package/test/unit/domain/participants/participants.test.js

@@ -1369,7 +1369,7 @@ describe('participant Tests', () => {
 
       // Assert
       expect(logStub.getCall(0).firstArg).toBe(ERROR_MESSAGES.sourceFspNotFound)
-      expect(logStub.getCall(2).lastArg).toEqual(cbError)
+      expect(logStub.getCall(3).lastArg).toEqual(cbError)
     })
 
     it('handles error when `oracleBatchRequest` returns no result', async () => {

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

@@ -246,7 +246,7 @@ describe('Parties Tests', () => {
       await partiesDomain.getPartiesByTypeAndID(Helper.getByTypeIdRequest.headers, Helper.getByTypeIdRequest.params, Helper.getByTypeIdRequest.method, Helper.getByTypeIdRequest.query)
 
       // Assert
-      expect(loggerStub.callCount).toBe(1)
+      expect(loggerStub.callCount).toBe(2)
       expect(participant.sendErrorToParticipant.callCount).toBe(1)
 
       const { errorInformation } = participant.sendErrorToParticipant.getCall(0).args[2]
@@ -893,7 +893,7 @@ describe('Parties Tests', () => {
 
       // Assert
       expect(participant.sendErrorToParticipant.callCount).toBe(1)
-      expect(loggerStub.callCount).toBe(1)
+      expect(loggerStub.callCount).toBe(2)
       const sendErrorCallArgs = participant.sendErrorToParticipant.getCall(0).args
       expect(sendErrorCallArgs[1]).toBe(expectedCallbackEnpointType)
     })
@@ -914,7 +914,7 @@ describe('Parties Tests', () => {
 
       // Assert
       expect(participant.sendErrorToParticipant.callCount).toBe(1)
-      expect(loggerStub.callCount).toBe(1)
+      expect(loggerStub.callCount).toBe(2)
       const sendErrorCallArgs = participant.sendErrorToParticipant.getCall(0).args
       expect(sendErrorCallArgs[1]).toBe(expectedCallbackEnpointType)
     })