@mojaloop/bulk-api-adapter 17.2.2 → 17.2.4

package/src/handlers/notification/index.js

@@ -335,6 +335,32 @@ const isConnected = async () => {
   return true
 }
 
+/**
+ * @function isHealthy
+ *
+ * @description
+ *   Gets the health for the broker using the consumer's isHealthy() method
+ *   from central-services-stream which performs comprehensive checks:
+ *   - isConnected() - basic connection status
+ *   - isAssigned() - consumer has partition assignments
+ *   - isPollHealthy() - last poll was within healthCheckPollInterval
+ *   - getMetadataSync() - all subscribed topics exist in broker metadata
+ *
+ * @returns {Promise<boolean>} - true if healthy, false otherwise
+ */
+const isHealthy = async () => {
+  try {
+    const healthy = await notificationConsumer.isHealthy()
+    if (!healthy) {
+      Logger.isWarnEnabled && Logger.warn('Notification consumer is not healthy')
+    }
+    return healthy
+  } catch (err) {
+    Logger.isWarnEnabled && Logger.warn(`isHealthy check failed: ${err.message}`)
+    return false
+  }
+}
+
 /**
  * @function getJWSSigner
  *
@@ -358,5 +384,6 @@ module.exports = {
   startConsumer,
   processMessage,
   consumeMessage,
-  isConnected
+  isConnected,
+  isHealthy
 }

package/src/lib/healthCheck/subServiceHealth.js

@@ -32,15 +32,26 @@ const axios = require('axios')
 /**
  * @function getSubServiceHealthBroker
  *
- * @description Gets the health for the Notification broker
+ * @description
+ *   Gets the health for the broker using the consumer's isHealthy() method
+ *   from central-services-stream which performs comprehensive checks:
+ *   - isConnected() - basic connection status
+ *   - isAssigned() - consumer has partition assignments
+ *   - isPollHealthy() - last poll was within healthCheckPollInterval
+ *   - getMetadataSync() - all subscribed topics exist in broker metadata
+ *
  * @returns Promise<SubServiceHealth> The SubService health object for the broker
  */
 const getSubServiceHealthBroker = async () => {
   let status = statusEnum.OK
   try {
-    await Notification.isConnected()
+    const isHealthy = await Notification.isHealthy()
+    if (!isHealthy) {
+      Logger.isDebugEnabled && Logger.debug('getSubServiceHealthBroker: consumer is not healthy')
+      status = statusEnum.DOWN
+    }
   } catch (err) {
-    Logger.debug(`getSubServiceHealthBroker failed with error: ${err.message}.`)
+    Logger.isDebugEnabled && Logger.debug(`getSubServiceHealthBroker failed with error: ${err.message}.`)
     status = statusEnum.DOWN
   }
 

package/test/unit/health.test.js

@@ -15,7 +15,7 @@ Test('health handler', (handlerTest) => {
 
   handlerTest.beforeEach(t => {
     sandbox = Sinon.createSandbox()
-    sandbox.stub(Notification, 'isConnected')
+    sandbox.stub(Notification, 'isHealthy')
     sandbox.stub(axios, 'get')
     healthHandler = proxyquire('../../src/api/handlers/health', {})
     t.end()
@@ -29,7 +29,7 @@ Test('health handler', (handlerTest) => {
 
   handlerTest.test('/health should', healthTest => {
     healthTest.test('return the correct response when the health check is up', async test => {
-      Notification.isConnected.resolves(true)
+      Notification.isHealthy.resolves(true)
       axios.get.resolves({ data: { status: 'OK' } })
       const expectedResponseCode = 200
       const {
@@ -41,7 +41,7 @@ Test('health handler', (handlerTest) => {
     })
 
     healthTest.test('return the correct response when the health check is up in API mode only (Config.HANDLERS_DISABLED=true)', async test => {
-      Notification.isConnected.resolves(true)
+      Notification.isHealthy.resolves(true)
 
       Config.HANDLERS_DISABLED = true
       healthHandler = proxyquire('../../src/api/handlers/health', {})
@@ -57,7 +57,7 @@ Test('health handler', (handlerTest) => {
 
     healthTest.test('return the correct response when the health check is down', async test => {
       healthHandler = proxyquire('../../src/api/handlers/health', {})
-      Notification.isConnected.throws(new Error('Error connecting to consumer'))
+      Notification.isHealthy.resolves(false)
       axios.get.resolves({ data: { status: 'OK' } })
       const expectedResponseCode = 502
       const {