account-lookup-service 17.2.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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "account-lookup-service",
   "description": "Account Lookup Service is used to validate Party and Participant lookups.",
-  "version": "17.2.0",
+  "version": "17.2.1-snapshot.0",
   "license": "Apache-2.0",
   "author": "ModusBox",
   "contributors": [
@@ -95,11 +95,11 @@
     "@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.19.0",
+    "@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",
+    "@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",

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/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
 }
 
@@ -176,7 +178,7 @@ const initializeAdmin = async (appConfig) => {
 
 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)
 }