@mojaloop/sdk-scheme-adapter 24.0.7-snapshot.7 → 24.1.0-snapshot.1

package/.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 setup: true
 orbs:
-  build: mojaloop/build@1.0.53
+  build: mojaloop/build@1.0.55
 workflows:
   setup:
     jobs:

package/CHANGELOG.md

@@ -1,4 +1,18 @@
 # Changelog: [mojaloop/sdk-scheme-adapter](https://github.com/mojaloop/sdk-scheme-adapter)
+### [24.0.8](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.0.7...v24.0.8) (2025-02-12)
+
+
+### Bug Fixes
+
+* **csi-1170:** fix fxQuote with RECEIVE amountType ([#542](https://github.com/mojaloop/sdk-scheme-adapter/issues/542)) ([b9b1c8e](https://github.com/mojaloop/sdk-scheme-adapter/commit/b9b1c8e8c4d1decbd624cbd20534f069b4f25952))
+
+### [24.0.7](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.0.6...v24.0.7) (2025-02-10)
+
+
+### Bug Fixes
+
+* **csi-1191:** log server restarts more accurately ([#543](https://github.com/mojaloop/sdk-scheme-adapter/issues/543)) ([c325ed0](https://github.com/mojaloop/sdk-scheme-adapter/commit/c325ed0d8a0902831f3f1b2dc5868d76025faa33))
+
 ### [24.0.6](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.0.5...v24.0.6) (2025-02-04)
 
 

package/modules/api-svc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-api-svc",
-  "version": "21.0.0-snapshot.17",
+  "version": "21.0.0-snapshot.21",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -64,11 +64,11 @@
   },
   "dependencies": {
     "@koa/cors": "^5.0.0",
-    "@mojaloop/api-snippets": "17.7.11",
-    "@mojaloop/central-services-error-handling": "^13.0.5",
-    "@mojaloop/central-services-logger": "^11.5.4",
-    "@mojaloop/central-services-metrics": "^12.4.4",
-    "@mojaloop/central-services-shared": "^18.17.0",
+    "@mojaloop/api-snippets": "17.8.0",
+    "@mojaloop/central-services-error-handling": "^13.0.6",
+    "@mojaloop/central-services-logger": "^11.5.5",
+    "@mojaloop/central-services-metrics": "^12.4.5",
+    "@mojaloop/central-services-shared": "^18.18.0",
     "@mojaloop/event-sdk": "^14.1.3",
     "@mojaloop/logging-bc-client-lib": "0.5.8",
     "@mojaloop/ml-schema-transformer-lib": "^2.5.2",
@@ -86,7 +86,7 @@
     "javascript-state-machine": "^3.1.0",
     "js-yaml": "^4.1.0",
     "json-schema-ref-parser": "^9.0.9",
-    "koa": "^2.15.3",
+    "koa": "^2.15.4",
     "koa-body": "^6.0.1",
     "lodash": "^4.17.21",
     "module-alias": "^2.2.3",
@@ -100,8 +100,8 @@
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.7",
-    "@babel/preset-env": "^7.26.7",
+    "@babel/core": "^7.26.9",
+    "@babel/preset-env": "^7.26.9",
     "@redocly/openapi-cli": "^1.0.0-beta.95",
     "@types/jest": "^29.5.14",
     "axios-mock-adapter": "^2.1.0",

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

@@ -202,10 +202,13 @@ class Server extends EventEmitter {
     }
 
     async restart(newConf) {
+        const restartActionsTaken = {};
+
         this.logger.isDebugEnabled && this.logger.debug('Server is restarting...');
         const updateLogger = !_.isEqual(newConf.isJsonOutput, this.conf.isJsonOutput);
         if (updateLogger) {
             this.logger = createLogger(newConf);
+            restartActionsTaken.updateLogger = true;
         }
 
         let oldCache;
@@ -216,6 +219,7 @@ class Server extends EventEmitter {
             await this.cache.disconnect();
             this.cache = createCache(newConf, this.logger);
             await this.cache.connect();
+            restartActionsTaken.updateCache = true;
         }
 
         const updateWSO2 = !_.isEqual(this.conf.wso2, newConf.wso2)
@@ -227,6 +231,7 @@ class Server extends EventEmitter {
                 this.emit('error', 'WSO2 auth error in InboundApi', msg);
             });
             await this.wso2.auth.start();
+            restartActionsTaken.updateWSO2 = true;
         }
 
         this.logger.isDebugEnabled && this.logger.push({ oldConf: this.conf.inbound, newConf: newConf.inbound }).debug('Inbound server configuration');
@@ -246,6 +251,7 @@ class Server extends EventEmitter {
                 this.emit('error', errMessage);
             });
             await this.inboundServer.start();
+            restartActionsTaken.updateInboundServer = true;
         }
 
         this.logger.isDebugEnabled && this.logger.push({ oldConf: this.conf.outbound, newConf: newConf.outbound }).debug('Outbound server configuration');
@@ -265,6 +271,7 @@ class Server extends EventEmitter {
                 this.emit('error', errMessage);
             });
             await this.outboundServer.start();
+            restartActionsTaken.updateOutboundServer = true;
         }
 
         const updateFspiopEventHandler = !_.isEqual(this.conf.outbound, newConf.outbound)
@@ -278,6 +285,7 @@ class Server extends EventEmitter {
                 wso2: this.wso2,
             });
             await this.fspiopEventHandler.start();
+            restartActionsTaken.updateFspiopEventHandler = true;
         }
 
         const updateControlClient = !_.isEqual(this.conf.control, newConf.control);
@@ -298,6 +306,7 @@ class Server extends EventEmitter {
                         control: { stopped: Date.now() }
                     }));
                 }, RESTART_INTERVAL_MS));
+                restartActionsTaken.updateControlClient = true;
             }
         }
 
@@ -312,6 +321,7 @@ class Server extends EventEmitter {
                     logger: this.logger.push(LOG_ID.OAUTHTEST),
                 });
                 await this.oauthTestServer.start();
+                restartActionsTaken.updateOAuthTestServer = true;
             }
         }
 
@@ -325,6 +335,7 @@ class Server extends EventEmitter {
                     cache: this.cache,
                 });
                 await this.testServer.start();
+                restartActionsTaken.updateTestServer = true;
             }
         }
 
@@ -333,7 +344,12 @@ class Server extends EventEmitter {
         await Promise.all([
             oldCache?.disconnect(),
         ]);
-        this.logger.isDebugEnabled && this.logger.debug('Server is restarted');
+
+        if (Object.keys(restartActionsTaken).length > 0) {
+            this.logger.isDebugEnabled && this.logger.debug('Server is restarted', { restartActionsTaken });
+        } else {
+            this.logger.isDebugEnabled && this.logger.debug('Server not restarted, no config changes detected');
+        }
     }
 
     stop() {

package/modules/api-svc/src/lib/model/OutboundTransfersModel.js

@@ -400,12 +400,6 @@ class OutboundTransfersModel {
 
                         this.data.needFx = this._isFxNeeded(this._supportedCurrencies, payee.supportedCurrencies, this.data.currency, this.data.amountType);
                         this.data.supportedCurrencies = payee.supportedCurrencies;
-                        
-                        // if (this.data.amountType == AmountTypes.RECEIVE) {
-                        //     if ( !this._supportedCurrencies.includes(this.data.currency) ) {
-                        //         this.data.supportedCurrencies = this._supportedCurrencies;
-                        //     }
-                        // }
                     }
 
                     this._logger.isVerboseEnabled && this._logger.push({
@@ -1109,6 +1103,29 @@ class OutboundTransfersModel {
             };
         }
 
+        if (this._apiType  === API_TYPES.iso20022) {
+            // Append keys from quoteResponse extensionList with specific prefixes
+            const quoteResponseExtensions = this.data.quoteResponse.body.extensionList?.extension;
+            if (quoteResponseExtensions) {
+                const prefixes = [
+                    'CdtTrfTxInf.Cdtr.',
+                    'CdtTrfTxInf.CdtrAcct.',
+                    'CdtTrfTxInf.CdtrAgt.',
+                    'CdtTrfTxInf.InstrForCdtrAgt.',
+                    'CdtTrfTxInf.InstrForNxtAgt.'
+                ];
+                const filteredExtensions = quoteResponseExtensions.filter(ext => 
+                    prefixes.some(prefix => ext.key.startsWith(prefix))
+                );
+                if (filteredExtensions.length > 0) {
+                    if (!prepare.extensionList) {
+                        prepare.extensionList = { extension: [] };
+                    }
+                    prepare.extensionList.extension.push(...filteredExtensions);
+                }
+            }
+        }
+
         return prepare;
     }
 
@@ -1281,7 +1298,7 @@ class OutboundTransfersModel {
                 // first remove any merge keys that we do not want to allow to be changed
                 // note that we could do this in the swagger also. this is to put a responsibility
                 // on this model to defend itself.
-                const permittedMergeKeys = ['acceptParty', 'acceptConversion', 'acceptQuote', 'amount', 'to'];
+                const permittedMergeKeys = ['acceptParty', 'acceptConversion', 'acceptQuote', 'acceptQuoteOrConversion', 'amount', 'to'];
                 Object.keys(mergeData).forEach(k => {
                     if(permittedMergeKeys.indexOf(k) === -1) {
                         delete mergeData[k]; // try to avoid mutation of parameters
@@ -1358,7 +1375,9 @@ class OutboundTransfersModel {
                 }
 
                 case States.FX_QUOTE_RECEIVED: {
-                    if (!this.data.acceptConversion) {
+                    if ((this.data.acceptConversion !== undefined && this.data.acceptConversion === false) ||
+                        (this.data.acceptQuoteOrConversion !== undefined && this.data.acceptQuoteOrConversion === false) ||
+                        (this.data.acceptConversion === undefined && this.data.acceptQuoteOrConversion === undefined)) {
                         await this.stateMachine.abort(ErrorMessages.fxQuoteRejectedByBackend);
                         await this._save();
                         return this.getResponse();
@@ -1380,7 +1399,10 @@ class OutboundTransfersModel {
                 }
 
                 case States.QUOTE_RECEIVED: {
-                    if (!this._autoAcceptQuotes && !this.data.acceptQuote) {
+                    if (!this._autoAcceptQuotes &&
+                        ((this.data.acceptQuote !== undefined && this.data.acceptQuote === false) ||
+                        (this.data.acceptQuoteOrConversion !== undefined && this.data.acceptQuoteOrConversion === false) ||
+                        (this.data.acceptQuote === undefined && this.data.acceptQuoteOrConversion === undefined))) {
                         // resuming after a party resolution halt, backend did not accept the party.
                         await this.stateMachine.abort(ErrorMessages.quoteRejectedByBackend);
                         await this._save();

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.16",
+  "version": "0.3.0-snapshot.20",
   "description": "Mojaloop sdk scheme adapter command event handler",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",
@@ -41,8 +41,8 @@
     "snapshot": "standard-version --no-verify --skip.changelog --prerelease snapshot --releaseCommitMessageFormat 'chore(snapshot): {{currentTag}}'"
   },
   "dependencies": {
-    "@mojaloop/api-snippets": "17.7.11",
-    "@mojaloop/central-services-shared": "^18.17.0",
+    "@mojaloop/api-snippets": "17.8.0",
+    "@mojaloop/central-services-shared": "^18.18.0",
     "@mojaloop/logging-bc-client-lib": "^0.5.8",
     "@mojaloop/logging-bc-public-types-lib": "^0.5.4",
     "@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",
@@ -59,13 +59,13 @@
     "@types/convict": "^6.1.6",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.4",
     "@types/node-cache": "^4.2.5",
     "@types/supertest": "^6.0.2",
     "@types/swagger-ui-express": "4.1.7",
     "@types/yamljs": "^0.2.34",
-    "@typescript-eslint/eslint-plugin": "^8.23.0",
-    "@typescript-eslint/parser": "^8.23.0",
+    "@typescript-eslint/eslint-plugin": "^8.24.1",
+    "@typescript-eslint/parser": "^8.24.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.16",
+    "version": "0.3.0-snapshot.20",
     "description": "mojaloop sdk scheme adapter outbound domain event handler",
     "license": "Apache-2.0",
     "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",
@@ -41,7 +41,7 @@
         "snapshot": "standard-version --no-verify --skip.changelog --prerelease snapshot --releaseCommitMessageFormat 'chore(snapshot): {{currentTag}}'"
     },
     "dependencies": {
-        "@mojaloop/api-snippets": "17.7.11",
+        "@mojaloop/api-snippets": "17.8.0",
         "@mojaloop/logging-bc-client-lib": "^0.5.8",
         "@mojaloop/logging-bc-public-types-lib": "^0.5.4",
         "@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",
@@ -56,13 +56,13 @@
         "@types/convict": "^6.1.6",
         "@types/express": "^5.0.0",
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.13.1",
+        "@types/node": "^22.13.4",
         "@types/node-cache": "^4.2.5",
         "@types/supertest": "^6.0.2",
         "@types/swagger-ui-express": "^4.1.7",
         "@types/yamljs": "^0.2.34",
-        "@typescript-eslint/eslint-plugin": "^8.23.0",
-        "@typescript-eslint/parser": "^8.23.0",
+        "@typescript-eslint/eslint-plugin": "^8.24.1",
+        "@typescript-eslint/parser": "^8.24.1",
         "copyfiles": "^2.4.1",
         "eslint": "^9.15.0",
         "jest": "^29.7.0",

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

@@ -1,12 +1,12 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.15",
+  "version": "0.4.0-snapshot.19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-      "version": "0.4.0-snapshot.15",
+      "version": "0.4.0-snapshot.19",
       "license": "Apache-2.0",
       "dependencies": {
         "@mojaloop/api-snippets": "17.7.9",

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

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.16",
+  "version": "0.4.0-snapshot.20",
   "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",
@@ -29,21 +29,21 @@
     "snapshot": "standard-version --no-verify --skip.changelog --prerelease snapshot --releaseCommitMessageFormat 'chore(snapshot): {{currentTag}}'"
   },
   "dependencies": {
-    "@mojaloop/api-snippets": "17.7.11",
-    "@mojaloop/central-services-shared": "^18.17.0",
+    "@mojaloop/api-snippets": "17.8.0",
+    "@mojaloop/central-services-shared": "^18.18.0",
     "@mojaloop/logging-bc-public-types-lib": "^0.5.4",
     "@mojaloop/platform-shared-lib-messaging-types-lib": "^0.7.1",
     "@mojaloop/platform-shared-lib-nodejs-kafka-client-lib": "0.5.18",
     "ajv": "^8.17.1",
     "redis": "^4.7.0",
-    "uuid": "^11.0.5"
+    "uuid": "^11.1.0"
   },
   "devDependencies": {
     "@eslint/compat": "^1.2.6",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.4",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.23.0",
-    "@typescript-eslint/parser": "^8.23.0",
+    "@typescript-eslint/eslint-plugin": "^8.24.1",
+    "@typescript-eslint/parser": "^8.24.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.0.7-snapshot.7",
+  "version": "24.1.0-snapshot.1",
   "description": "mojaloop sdk-scheme-adapter",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter",
@@ -82,10 +82,10 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.4",
     "@types/node-cache": "^4.2.5",
-    "@typescript-eslint/eslint-plugin": "^8.23.0",
-    "@typescript-eslint/parser": "^8.23.0",
+    "@typescript-eslint/eslint-plugin": "^8.24.1",
+    "@typescript-eslint/parser": "^8.24.1",
     "audit-ci": "^7.1.0",
     "eslint": "^9.15.0",
     "eslint-config-airbnb-typescript": "^18.0.0",