@mojaloop/sdk-scheme-adapter 24.9.8-snapshot.5 → 24.9.8-snapshot.7

package/modules/api-svc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-api-svc",
-  "version": "21.0.0-snapshot.43",
+  "version": "21.0.0-snapshot.45",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",

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,7 +186,14 @@ class Server extends EventEmitter {
             });
         }
 
-        return isOutboundDifferent;
+        if (isJwsSigningKeyDifferent) {
+            this.logger.debug('JWS Signing Key config is different', {
+                oldJwsSigningKey: this.conf.jwsSigningKey,
+                newJwsSigningKey: newConf.jwsSigningKey
+            });
+        }
+
+        return isOutboundDifferent || isJwsSigningKeyDifferent;
     }
 
     async start() {
@@ -259,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,
@@ -272,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,
@@ -292,23 +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;
         }
 
-        if(!_.isEqual(this.conf.jwsSigningKey, newConf.jwsSigningKey) ||
-           !_.isEqual(this.conf.peerJWSKeys, newConf.peerJWSKeys)) {
-            this.logger.isDebugEnabled && this.logger.push({
-                oldJwsSigningKey: this.conf.jwsSigningKey,
-                newJwsSigningKey: newConf.jwsSigningKey,
-                oldPeerJWSKeys: this.conf.peerJWSKeys,
-                newPeerJWSKeys: newConf.peerJWSKeys
-            }).debug('JWS signing key or peer JWS keys configuration changed');
-            this.outboundServer._conf.jwsSigningKey = newConf.jwsSigningKey;
-            this.outboundServer._conf.peerJWSKeys = newConf.peerJWSKeys;
-            this.inboundServer._conf.jwsSigningKey = newConf.jwsSigningKey;
-            this.inboundServer._conf.peerJWSKeys = newConf.peerJWSKeys;
-        }
-
         const updateFspiopEventHandler = !_.isEqual(this.conf.outbound, newConf.outbound)
             && this.conf.fspiopEventHandler.enabled;
         if (updateFspiopEventHandler) {

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.40",
+  "version": "0.3.0-snapshot.42",
   "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.40",
+    "version": "0.3.0-snapshot.42",
     "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.40",
+  "version": "0.4.0-snapshot.42",
   "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.9.8-snapshot.5",
+  "version": "24.9.8-snapshot.7",
   "description": "mojaloop sdk-scheme-adapter",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter",