@mojaloop/sdk-scheme-adapter 24.9.7 → 24.9.8-snapshot.11

package/modules/api-svc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-api-svc",
-  "version": "21.0.0-snapshot.37",
+  "version": "21.0.0-snapshot.49",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -68,7 +68,7 @@
     "@mojaloop/central-services-error-handling": "13.1.0",
     "@mojaloop/central-services-logger": "11.9.0",
     "@mojaloop/central-services-metrics": "12.6.0",
-    "@mojaloop/central-services-shared": "18.26.2",
+    "@mojaloop/central-services-shared": "18.27.0",
     "@mojaloop/event-sdk": "14.5.1",
     "@mojaloop/logging-bc-client-lib": "0.5.8",
     "@mojaloop/ml-schema-transformer-lib": "2.7.1",
@@ -86,6 +86,7 @@
     "javascript-state-machine": "3.1.0",
     "js-yaml": "4.1.0",
     "json-schema-ref-parser": "9.0.9",
+    "knex": "3.1.0",
     "koa": "3.0.0",
     "koa-body": "6.0.1",
     "lodash": "4.17.21",
@@ -95,7 +96,7 @@
     "prom-client": "15.1.3",
     "promise-timeout": "1.3.0",
     "random-word-slugs": "0.1.7",
-    "redis": "5.1.1",
+    "redis": "5.5.5",
     "uuidv4": "6.2.13",
     "ws": "8.18.2"
   },

package/modules/api-svc/src/InboundServer/api.yaml

@@ -67,7 +67,9 @@ paths:
         - ping
       operationId: handlePostPing
       requestBody:
-        description: The object sent in the POST/PUT `/ping` requests with validation request ID.
+        description: >-
+          The object sent in the POST/PUT `/ping` requests with validation
+          request ID.
         required: true
         content:
           application/json:

package/modules/api-svc/src/InboundServer/index.js

@@ -26,7 +26,6 @@
  ******/
 const Koa = require('koa');
 
-const _ = require('lodash');
 const assert = require('assert').strict;
 const https = require('https');
 const http = require('http');
@@ -87,16 +86,6 @@ class InboundApi extends EventEmitter {
         return this._api.callback();
     }
 
-    _updatePeerJwsKeys(peerJwsKeys) {
-        if (this._conf.pm4mlEnabled && !_.isEqual(this._jwsVerificationKeys, peerJwsKeys) &&
-            this._jwsVerificationKeys && typeof this._jwsVerificationKeys === 'object') {
-            this._logger && this._logger.isVerboseEnabled && this._logger.verbose('Clearing existing JWS verification keys');
-            Object.keys(this._jwsVerificationKeys).forEach(key => delete this._jwsVerificationKeys[key]);
-            this._logger && this._logger.isVerboseEnabled && this._logger.verbose('Assigning new peer JWS keys');
-            Object.assign(this._jwsVerificationKeys, peerJwsKeys);
-        }
-    }
-
     _startJwsWatcher() {
         const FS_EVENT_TYPES = {
             CHANGE: 'change',

package/modules/api-svc/src/index.js

@@ -69,6 +69,8 @@ class Server extends EventEmitter {
         this.conf = conf;
         this.logger = logger;
         this.cache = createCache(conf);
+        this.peerJWSKeys = _.cloneDeep(conf?.peerJWSKeys);
+        this.jwsSigningKey = _.cloneDeep(conf?.jwsSigningKey);
 
         this.metricsClient = new MetricsClient();
         this.metricsServer = new MetricsServer({
@@ -140,8 +142,60 @@ class Server extends EventEmitter {
     }
 
     _shouldUpdateInboundServer(newConf) {
-        return !_.isEqual(this.conf.inbound, newConf.inbound)
-            || !_.isEqual(this.conf.outbound, newConf.outbound);
+        const isInboundDifferent = !_.isEqual(this.conf.inbound, newConf.inbound);
+        const isOutboundDifferent = !_.isEqual(this.conf.outbound, newConf.outbound);
+        const isPeerJWSKeysDifferent = !_.isEqual(this.peerJWSKeys, newConf.peerJWSKeys);
+        const isJwsSigningKeyDifferent = !_.isEqual(this.jwsSigningKey, newConf.jwsSigningKey);
+
+        if (isInboundDifferent) {
+            this.logger.debug('Inbound config is different', {
+                oldInbound: this.conf.inbound,
+                newInbound: newConf.inbound
+            });
+        }
+        if (isOutboundDifferent) {
+            this.logger.debug('Outbound config is different (checked in inbound update)', {
+                oldOutbound: this.conf.outbound,
+                newOutbound: newConf.outbound
+            });
+        }
+
+        if (isPeerJWSKeysDifferent) {
+            this.logger.debug('Peer JWS Keys config is different', {
+                oldPeerJWSKeys: this.peerJWSKeys,
+                newPeerJWSKeys: newConf.peerJWSKeys
+            });
+        }
+
+        if (isJwsSigningKeyDifferent) {
+            this.logger.debug('JWS Signing Key config is different', {
+                oldJwsSigningKey: this.conf.jwsSigningKey,
+                newJwsSigningKey: newConf.jwsSigningKey
+            });
+        }
+
+        return isInboundDifferent || isOutboundDifferent || isPeerJWSKeysDifferent || isJwsSigningKeyDifferent;
+    }
+
+    _shouldUpdateOutboundServer(newConf) {
+        const isOutboundDifferent = !_.isEqual(this.conf.outbound, newConf.outbound);
+        const isJwsSigningKeyDifferent = !_.isEqual(this.jwsSigningKey, newConf.jwsSigningKey);
+
+        if (isOutboundDifferent) {
+            this.logger.debug('Outbound config is different', {
+                oldOutbound: this.conf.outbound,
+                newOutbound: newConf.outbound
+            });
+        }
+
+        if (isJwsSigningKeyDifferent) {
+            this.logger.debug('JWS Signing Key config is different', {
+                oldJwsSigningKey: this.jwsSigningKey,
+                newJwsSigningKey: newConf.jwsSigningKey
+            });
+        }
+
+        return isOutboundDifferent || isJwsSigningKeyDifferent;
     }
 
     async start() {
@@ -229,8 +283,11 @@ class Server extends EventEmitter {
         }
 
         this.logger.isDebugEnabled && this.logger.push({ oldConf: this.conf.inbound, newConf: newConf.inbound }).debug('Inbound server configuration');
-        const updateInboundServer = this._shouldUpdateInboundServer(this.conf, newConf);
+        const updateInboundServer = this._shouldUpdateInboundServer(newConf);
         if (updateInboundServer) {
+            const stopStartLabel = 'InboundServer stop/start duration';
+            // eslint-disable-next-line no-console
+            console.time(stopStartLabel);
             await this.inboundServer.stop();
             this.inboundServer = new InboundServer(
                 newConf,
@@ -244,14 +301,17 @@ class Server extends EventEmitter {
                 this.emit('error', errMessage);
             });
             await this.inboundServer.start();
+            // eslint-disable-next-line no-console
+            console.timeEnd(stopStartLabel);
             restartActionsTaken.updateInboundServer = true;
         }
 
-        this.inboundServer._api._updatePeerJwsKeys(newConf.peerJWSKeys);
-
         this.logger.isDebugEnabled && this.logger.push({ oldConf: this.conf.outbound, newConf: newConf.outbound }).debug('Outbound server configuration');
-        const updateOutboundServer = !_.isEqual(this.conf.outbound, newConf.outbound);
+        const updateOutboundServer = this._shouldUpdateOutboundServer(newConf);
         if (updateOutboundServer) {
+            const stopStartLabel = 'OutboundServer stop/start duration';
+            // eslint-disable-next-line no-console
+            console.time(stopStartLabel);
             await this.outboundServer.stop();
             this.outboundServer = new OutboundServer(
                 newConf,
@@ -266,6 +326,8 @@ class Server extends EventEmitter {
                 this.emit('error', errMessage);
             });
             await this.outboundServer.start();
+            // eslint-disable-next-line no-console
+            console.timeEnd(stopStartLabel);
             restartActionsTaken.updateOutboundServer = true;
         }
 
@@ -360,6 +422,8 @@ class Server extends EventEmitter {
         }
 
         this.conf = newConf;
+        this.peerJWSKeys = _.cloneDeep(newConf.peerJWSKeys);
+        this.jwsSigningKey = _.cloneDeep(newConf.jwsSigningKey);
 
         await oldCache?.disconnect();
 

package/modules/api-svc/test/unit/InboundServer.test.js

@@ -490,59 +490,5 @@ describe('Inbound Server', () => {
 
             expect(Jws.validator.__validationKeys['mock-jws'].toString()).toEqual('foo-key-updated');
         });
-
-        it('should overwrite an existing peer JWS key when _updatePeerJwsKeys is called with the same key name', async () => {
-            // Arrange
-            const serverConfig = JSON.parse(JSON.stringify(defaultConfig));
-            serverConfig.validateInboundJws = true;
-            const cache = new Cache({
-                cacheUrl: serverConfig.cacheUrl,
-                logger: logger.push({ component: 'cache' }),
-                unsubscribeTimeoutMs: serverConfig.unsubscribeTimeoutMs,
-            });
-            serverConfig.validateInboundJws = true;
-            serverConfig.pm4mlEnabled = true;
-            serverConfig.peerJWSKeys = {
-                'peer1': 'original-key'
-            };
-            const svr = new InboundServer(serverConfig, logger, cache);
-
-            // Save reference before update
-            const keysRef = svr._api._jwsVerificationKeys;
-
-            // Act: Overwrite the key
-            svr._api._updatePeerJwsKeys({ 'peer1': 'new-key' });
-
-            // Assert
-            expect(svr._api._jwsVerificationKeys['peer1']).toBe('new-key');
-            expect(svr._api._jwsVerificationKeys).toBe(keysRef); // memory reference unchanged
-        });
-
-        it('should add a new peer JWS key when _updatePeerJwsKeys is called with a new key name', async () => {
-            // Arrange
-            const serverConfig = JSON.parse(JSON.stringify(defaultConfig));
-            serverConfig.validateInboundJws = true;
-            const cache = new Cache({
-                cacheUrl: serverConfig.cacheUrl,
-                logger: logger.push({ component: 'cache' }),
-                unsubscribeTimeoutMs: serverConfig.unsubscribeTimeoutMs,
-            });
-            serverConfig.validateInboundJws = true;
-            serverConfig.pm4mlEnabled = true;
-            serverConfig.peerJWSKeys = {
-                'peer1': 'original-key'
-            };
-            const svr = new InboundServer(serverConfig, logger, cache);
-
-            // Save reference before update
-            const keysRef = svr._api._jwsVerificationKeys;
-
-            // Act: Add a new key
-            svr._api._updatePeerJwsKeys({ 'peer1': 'original-key', 'peer2': 'another-key' });
-            // Assert
-            expect(svr._api._jwsVerificationKeys['peer1']).toBe('original-key');
-            expect(svr._api._jwsVerificationKeys['peer2']).toBe('another-key');
-            expect(svr._api._jwsVerificationKeys).toBe(keysRef); // memory reference unchanged
-        });
     });
 });

package/modules/outbound-command-event-handler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-outbound-command-event-handler",
-  "version": "0.3.0-snapshot.34",
+  "version": "0.3.0-snapshot.46",
   "description": "Mojaloop sdk scheme adapter command event handler",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@mojaloop/api-snippets": "17.10.3",
-    "@mojaloop/central-services-shared": "18.26.2",
+    "@mojaloop/central-services-shared": "18.27.0",
     "@mojaloop/logging-bc-client-lib": "0.5.8",
     "@mojaloop/logging-bc-public-types-lib": "0.5.5",
     "@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",
@@ -51,7 +51,7 @@
     "convict": "6.2.4",
     "express": "4.21.2",
     "openapi-backend": "5.12.0",
-    "redis": "5.1.1",
+    "redis": "5.5.5",
     "swagger-ui-express": "5.0.1",
     "yamljs": "0.3.0"
   },
@@ -65,8 +65,8 @@
     "@types/supertest": "6.0.3",
     "@types/swagger-ui-express": "4.1.8",
     "@types/yamljs": "0.2.34",
-    "@typescript-eslint/eslint-plugin": "8.33.0",
-    "@typescript-eslint/parser": "8.33.0",
+    "@typescript-eslint/eslint-plugin": "8.33.1",
+    "@typescript-eslint/parser": "8.33.1",
     "copyfiles": "2.4.1",
     "eslint": "9.15.0",
     "jest": "29.7.0",

package/modules/outbound-domain-event-handler/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mojaloop/sdk-scheme-adapter-outbound-domain-event-handler",
-    "version": "0.3.0-snapshot.34",
+    "version": "0.3.0-snapshot.46",
     "description": "mojaloop sdk scheme adapter outbound domain event handler",
     "license": "Apache-2.0",
     "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",
@@ -49,7 +49,7 @@
         "convict": "6.2.4",
         "express": "4.21.2",
         "openapi-backend": "5.12.0",
-        "redis": "5.1.1",
+        "redis": "5.5.5",
         "swagger-ui-express": "5.0.1",
         "yamljs": "0.3.0"
     },
@@ -62,8 +62,8 @@
         "@types/supertest": "6.0.3",
         "@types/swagger-ui-express": "4.1.8",
         "@types/yamljs": "0.2.34",
-        "@typescript-eslint/eslint-plugin": "8.33.0",
-        "@typescript-eslint/parser": "8.33.0",
+        "@typescript-eslint/eslint-plugin": "8.33.1",
+        "@typescript-eslint/parser": "8.33.1",
         "copyfiles": "2.4.1",
         "eslint": "9.15.0",
         "jest": "29.7.0",

package/modules/private-shared-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.34",
+  "version": "0.4.0-snapshot.46",
   "description": "SDK Scheme Adapter private shared library.",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/accounts-and-balances-bc/tree/main/modules/private-types",
@@ -30,20 +30,20 @@
   },
   "dependencies": {
     "@mojaloop/api-snippets": "17.10.3",
-    "@mojaloop/central-services-shared": "18.26.2",
+    "@mojaloop/central-services-shared": "18.27.0",
     "@mojaloop/logging-bc-public-types-lib": "0.5.5",
     "@mojaloop/platform-shared-lib-messaging-types-lib": "0.7.2",
     "@mojaloop/platform-shared-lib-nodejs-kafka-client-lib": "0.5.18",
     "ajv": "8.17.1",
-    "redis": "5.1.1",
+    "redis": "5.5.5",
     "uuid": "11.1.0"
   },
   "devDependencies": {
     "@eslint/compat": "1.2.9",
     "@types/node": "22.15.29",
     "@types/uuid": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "8.33.0",
-    "@typescript-eslint/parser": "8.33.0",
+    "@typescript-eslint/eslint-plugin": "8.33.1",
+    "@typescript-eslint/parser": "8.33.1",
     "eslint": "9.15.0",
     "jest": "29.7.0",
     "npm-check-updates": "16.7.10",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "24.9.7",
+  "version": "24.9.8-snapshot.11",
   "description": "mojaloop sdk-scheme-adapter",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter",
@@ -84,8 +84,8 @@
     "@types/jest": "29.5.14",
     "@types/node": "22.15.29",
     "@types/node-cache": "4.2.5",
-    "@typescript-eslint/eslint-plugin": "8.33.0",
-    "@typescript-eslint/parser": "8.33.0",
+    "@typescript-eslint/eslint-plugin": "8.33.1",
+    "@typescript-eslint/parser": "8.33.1",
     "audit-ci": "7.1.0",
     "eslint": "9.15.0",
     "eslint-config-airbnb-typescript": "18.0.0",