@mojaloop/database-lib 11.1.3 → 11.1.4-snapshot.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/database-lib",
-  "version": "11.1.3",
+  "version": "11.1.4-snapshot.1",
   "description": "Shared database code for central services",
   "main": "src/index.js",
   "license": "Apache-2.0",
@@ -43,7 +43,7 @@
     "release": "standard-version --releaseCommitMessageFormat 'chore(release): {{currentTag}} [skip ci]'"
   },
   "dependencies": {
-    "@mojaloop/central-services-error-handling": "13.0.6",
+    "@mojaloop/central-services-error-handling": "13.0.7",
     "knex": "3.1.0",
     "lodash": "4.17.21",
     "mysql": "2.18.1"
@@ -70,9 +70,9 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@mojaloop/sdk-standard-components": ">=19.x.x",
+    "@mojaloop/sdk-standard-components": "19.10.3",
     "audit-ci": "^7.1.0",
-    "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/src/database.js

@@ -29,6 +29,7 @@ class Database {
     this._knex = null
     this._tables = []
     this._schema = null
+    this._signalHandlersRegistered = false // Track if signal handlers are already registered
 
     this._listTableQueries = {
       mysql: (knex) => {
@@ -78,14 +79,27 @@ class Database {
     this._knex = await configureKnex(config)
     this._tables = await this._listTables()
     await this._setTableProperties()
+
+    // Register signal handlers only once
+    if (!this._signalHandlersRegistered) {
+      process.on('SIGINT', async () => {
+        await this._handleShutdown('SIGINT')
+      })
+      process.on('SIGTERM', async () => {
+        await this._handleShutdown('SIGTERM')
+      })
+      this._signalHandlersRegistered = true
+    }
   }
 
   async disconnect () {
     if (this._knex) {
+      console.log('Closing database connection...')
       this._removeTableProperties()
       this._tables = []
       await this._knex.destroy()
       this._knex = null
+      console.log('Database connection closed.')
     }
   }
 
@@ -135,6 +149,13 @@ class Database {
     }
     return this._knex.client.pool.numPendingAcquires()
   }
+
+  async _handleShutdown (signal) {
+    console.log(`Received ${signal}, shutting down database...`)
+    await this.disconnect()
+    console.log('Cleanup complete. Exiting process.')
+    process.exit(0)
+  }
 }
 
 const configureKnex = async ({ maxPendingAcquire, ...config }) => {

package/test/unit/database.test.js

@@ -382,5 +382,56 @@ Test('database', databaseTest => {
     getPendingAcquiresTest.end()
   })
 
+  databaseTest.test('connect should', connectTest => {
+    connectTest.test('register signal handlers only once', async test => {
+      const processOnStub = sandbox.stub(process, 'on')
+
+      await dbInstance.connect(connectionConfig)
+      await dbInstance.connect(connectionConfig)
+
+      test.ok(processOnStub.calledTwice)
+      test.ok(processOnStub.calledWith('SIGINT'))
+      test.ok(processOnStub.calledWith('SIGTERM'))
+      test.equal(dbInstance._signalHandlersRegistered, true)
+
+      processOnStub.restore()
+      test.end()
+    })
+
+    connectTest.test('handle SIGINT signal', async test => {
+      const processOnStub = sandbox.stub(process, 'on')
+      const handleShutdownStub = sandbox.stub(dbInstance, '_handleShutdown')
+
+      await dbInstance.connect(connectionConfig)
+      const sigintHandler = processOnStub.firstCall.args[1]
+
+      await sigintHandler()
+
+      test.ok(handleShutdownStub.calledOnceWith('SIGINT'))
+
+      processOnStub.restore()
+      handleShutdownStub.restore()
+      test.end()
+    })
+
+    connectTest.test('handle SIGTERM signal', async test => {
+      const processOnStub = sandbox.stub(process, 'on')
+      const handleShutdownStub = sandbox.stub(dbInstance, '_handleShutdown')
+
+      await dbInstance.connect(connectionConfig)
+      const sigtermHandler = processOnStub.secondCall.args[1]
+
+      await sigtermHandler()
+
+      test.ok(handleShutdownStub.calledOnceWith('SIGTERM'))
+
+      processOnStub.restore()
+      handleShutdownStub.restore()
+      test.end()
+    })
+
+    connectTest.end()
+  })
+
   databaseTest.end()
 })