@mojaloop/sdk-scheme-adapter 24.10.0-snapshot.0 → 24.10.1

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 # Changelog: [mojaloop/sdk-scheme-adapter](https://github.com/mojaloop/sdk-scheme-adapter)
+### [24.10.1](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.10.0...v24.10.1) (2025-06-09)
+
+
+### Chore
+
+* **csi-1494:** more restarting logic ([#587](https://github.com/mojaloop/sdk-scheme-adapter/issues/587)) ([fcaa375](https://github.com/mojaloop/sdk-scheme-adapter/commit/fcaa3753ccb974669f1814d2cd7ca031305b8e8f))
+
 ## [24.10.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.9.7...v24.10.0) (2025-06-05)
 
 

package/modules/api-svc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-api-svc",
-  "version": "21.0.0-snapshot.50",
+  "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",
@@ -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",

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

@@ -142,6 +142,8 @@ class Server extends EventEmitter {
     _shouldUpdateInboundServer(newConf) {
         const isInboundDifferent = !_.isEqual(this.conf.inbound, newConf.inbound);
         const isOutboundDifferent = !_.isEqual(this.conf.outbound, newConf.outbound);
+        const isPeerJWSKeysDifferent = !_.isEqual(this.conf.peerJWSKeys, newConf.peerJWSKeys);
+        const isJwsSigningKeyDifferent = !_.isEqual(this.conf.jwsSigningKey, newConf.jwsSigningKey);
 
         if (isInboundDifferent) {
             this.logger.debug('Inbound config is different', {
@@ -156,11 +158,26 @@ class Server extends EventEmitter {
             });
         }
 
-        return isInboundDifferent || isOutboundDifferent;
+        if (isPeerJWSKeysDifferent) {
+            this.logger.debug('Peer JWS Keys config is different', {
+                oldPeerJWSKeys: this.conf.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.conf.jwsSigningKey, newConf.jwsSigningKey);
 
         if (isOutboundDifferent) {
             this.logger.debug('Outbound config is different', {
@@ -169,29 +186,14 @@ class Server extends EventEmitter {
             });
         }
 
-        return isOutboundDifferent;
-    }
-
-    _shouldUpdatePeerJWSKeys(newConf) {
-        const isPeerJWSKeysDifferent = !_.isEqual(this.conf.peerJWSKeys, newConf.peerJWSKeys);
-        if (isPeerJWSKeysDifferent) {
-            this.logger.debug('Peer JWS Keys config is different', {
-                oldPeerJWSKeys: this.conf.peerJWSKeys,
-                newPeerJWSKeys: newConf.peerJWSKeys
-            });
-        }
-        return isPeerJWSKeysDifferent;
-    }
-
-    _shouldUpdateJwsSigningKey(newConf) {
-        const isJwsSigningKeyDifferent = !_.isEqual(this.conf.jwsSigningKey, newConf.jwsSigningKey);
         if (isJwsSigningKeyDifferent) {
             this.logger.debug('JWS Signing Key config is different', {
                 oldJwsSigningKey: this.conf.jwsSigningKey,
                 newJwsSigningKey: newConf.jwsSigningKey
             });
         }
-        return isJwsSigningKeyDifferent;
+
+        return isOutboundDifferent || isJwsSigningKeyDifferent;
     }
 
     async start() {
@@ -281,6 +283,9 @@ 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(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,
@@ -294,12 +299,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.logger.isDebugEnabled && this.logger.push({ oldConf: this.conf.outbound, newConf: newConf.outbound }).debug('Outbound server configuration');
         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,
@@ -314,22 +324,11 @@ class Server extends EventEmitter {
                 this.emit('error', errMessage);
             });
             await this.outboundServer.start();
+            // eslint-disable-next-line no-console
+            console.timeEnd(stopStartLabel);
             restartActionsTaken.updateOutboundServer = true;
         }
 
-        const updatePeerJWSKeys = this._shouldUpdatePeerJWSKeys(newConf);
-        if (updatePeerJWSKeys) {
-            Object.keys(this.conf.peerJWSKeys).forEach(key => { delete this.conf.peerJWSKeys[key]; });
-            Object.assign(this.conf.peerJWSKeys, _.cloneDeep(newConf.peerJWSKeys));
-            restartActionsTaken.updatePeerJWSKeys = true;
-        }
-
-        const updateJwsSigningKey = this._shouldUpdateJwsSigningKey(newConf);
-        if (updateJwsSigningKey) {
-            this.conf.jwsSigningKey = newConf.jwsSigningKey;
-            restartActionsTaken.updateJwsSigningKey = true;
-        }
-
         const updateFspiopEventHandler = !_.isEqual(this.conf.outbound, newConf.outbound)
             && this.conf.fspiopEventHandler.enabled;
         if (updateFspiopEventHandler) {

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

@@ -123,37 +123,5 @@ describe('Server', () => {
             await new Promise((wait) => setTimeout(wait, 1000));
             expect(server.restart).toHaveBeenCalledWith(newConfOutbound);
         });
-
-        it('restarts when peerJWSKeys is different', async () => {
-            const newConfPeerJWSKeys = JSON.parse(JSON.stringify(conf));
-            newConfPeerJWSKeys.peerJWSKeys = { ...conf.peerJWSKeys, newKey: 'newValue' };
-
-            expect(server._shouldUpdatePeerJWSKeys(newConfPeerJWSKeys)).toBe(true);
-
-            controlServer.broadcastConfigChange(newConfPeerJWSKeys);
-            await new Promise((wait) => setTimeout(wait, 1000));
-            expect(server.restart).toHaveBeenCalledWith(newConfPeerJWSKeys);
-        });
-
-        it('does not update when peerJWSKeys is the same', async () => {
-            const newConfPeerJWSKeys = JSON.parse(JSON.stringify(conf));
-            expect(server._shouldUpdatePeerJWSKeys(newConfPeerJWSKeys)).toBe(false);
-        });
-
-        it('restarts when jwsSigningKey is different', async () => {
-            const newConfJwsSigningKey = JSON.parse(JSON.stringify(conf));
-            newConfJwsSigningKey.jwsSigningKey = { ...conf.jwsSigningKey, key: 'differentKey' };
-
-            expect(server._shouldUpdateJwsSigningKey(newConfJwsSigningKey)).toBe(true);
-
-            controlServer.broadcastConfigChange(newConfJwsSigningKey);
-            await new Promise((wait) => setTimeout(wait, 1000));
-            expect(server.restart).toHaveBeenCalledWith(newConfJwsSigningKey);
-        });
-
-        it('does not update when jwsSigningKey is the same', async () => {
-            const newConfJwsSigningKey = JSON.parse(JSON.stringify(conf));
-            expect(server._shouldUpdateJwsSigningKey(newConfJwsSigningKey)).toBe(false);
-        });
     });
 });

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.47",
+  "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/",

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.47",
+    "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/",

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

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.47",
+  "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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "24.10.0-snapshot.0",
+  "version": "24.10.1",
   "description": "mojaloop sdk-scheme-adapter",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter",