@mojaloop/sdk-scheme-adapter 24.10.4 → 24.10.6-snapshot.0

package/CHANGELOG.md

@@ -1,4 +1,12 @@
 # Changelog: [mojaloop/sdk-scheme-adapter](https://github.com/mojaloop/sdk-scheme-adapter)
+### [24.10.5](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.10.4...v24.10.5) (2025-08-01)
+
+
+### Chore
+
+* fix vuls and update deps ([#599](https://github.com/mojaloop/sdk-scheme-adapter/issues/599)) ([f40131a](https://github.com/mojaloop/sdk-scheme-adapter/commit/f40131a9f65b888dce3cea5eb0149c1044e5a062))
+* **sbom:** update sbom [skip ci] ([f42ef94](https://github.com/mojaloop/sdk-scheme-adapter/commit/f42ef94e6708d0fc8483d0da50c820a9838182e0))
+
 ### [24.10.4](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.10.3...v24.10.4) (2025-07-31)
 
 

package/modules/api-svc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-api-svc",
-  "version": "21.0.0-snapshot.49",
+  "version": "21.0.0-snapshot.50",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -96,7 +96,7 @@
     "prom-client": "15.1.3",
     "promise-timeout": "1.3.0",
     "random-word-slugs": "0.1.7",
-    "redis": "5.7.0",
+    "redis": "5.8.0",
     "uuidv4": "6.2.13",
     "ws": "8.18.3"
   },

package/modules/api-svc/src/lib/cache.js

@@ -27,6 +27,8 @@
 'use strict';
 
 const redis = require('redis');
+const EventEmitter = require('events');
+const { TimeoutError } = require('./model/common/TimeoutError');
 
 const CONN_ST = {
     CONNECTED: 'CONNECTED',
@@ -41,6 +43,7 @@ const CONN_ST = {
 class Cache {
     constructor(config) {
         this._config = config;
+        this._channelEmitter = new EventEmitter();
 
         if(!config.cacheUrl || !config.logger) {
             throw new Error('Cache config requires cacheUrl and logger properties');
@@ -196,6 +199,57 @@ class Cache {
         return id;
     }
 
+    /**
+     * Subscribes to a channel for some period and always returns resolved promise
+     *
+     * @param {string} channel - The channel name to subscribe to
+     * @param {boolean} [needParse=true] - specify if the message should be parsed before returning
+     *
+     * @returns {Promise} - Promise that resolves with a message or an error
+     */
+    async subscribeToOneMessageWithTimerNew(channel, requestProcessingTimeoutSeconds, needParse = true) {
+        let subscription;
+
+        return new Promise((resolve, reject) => {
+
+            const timer = setTimeout(async () => {
+                if (subscription) {
+                    this._channelEmitter.removeListener(channel, subscription);
+                }
+                // If there are no listeners left for this channel, we can unsubscribe
+                if (this._channelEmitter.listenerCount(channel) === 0) {
+                    if (this._subscriptionClient) {
+                        await this._subscriptionClient.unsubscribe(channel);
+                    }
+                }
+                const errMessage = 'Timeout error';
+                this._logger.push({ channel }).warn(errMessage);
+                reject(new TimeoutError(errMessage));
+            }, requestProcessingTimeoutSeconds * 1000);
+
+            subscription = (message) => {
+                this._logger.push({ channel, message, needParse }).debug('subscribeToOneMessageWithTimer is done');
+                clearTimeout(timer);
+                resolve(needParse ? JSON.parse(message) : message);
+            };
+            this._channelEmitter.once(channel, subscription);
+
+            this._subscriptionClient.subscribe(channel, async (msg) => {
+                this._channelEmitter.emit(channel, msg);
+                // If there are no listeners left for this channel, we can unsubscribe
+                if (this._channelEmitter.listenerCount(channel) === 0) {
+                    if (this._subscriptionClient) {
+                        await this._subscriptionClient.unsubscribe(channel);
+                    }
+                }
+            })
+                .catch(err => {
+                    this._logger.push({ channel, err }).warn(`error in subscribeToOneMessageWithTimer: ${err.message}`);
+                    reject(err);
+                });
+        });
+    }
+
     /**
      * Subscribes to a channel for some period and always returns resolved promise
      *

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

@@ -40,6 +40,7 @@ const PartiesModel = require('./PartiesModel');
 const {
     AmountTypes,
     BackendError,
+    TimeoutError,
     CacheKeyPrefixes,
     Directions,
     ErrorMessages,
@@ -321,147 +322,121 @@ class OutboundTransfersModel {
 
             let latencyTimerDone;
 
-            // hook up a subscriber to handle response messages
-            const subId = await this._cache.subscribe(payeeKey, (cn, msg, subId) => {
-                try {
-                    if(latencyTimerDone) {
-                        latencyTimerDone();
-                    }
-                    this.metrics.partyLookupResponses.inc();
-
-                    this.data.getPartiesResponse = JSON.parse(msg);
-                    if (this.data.getPartiesResponse.body?.errorInformation) {
-                        // this is an error response to our GET /parties request
-                        const err = new BackendError(`Got an error response resolving party: ${safeStringify(this.data.getPartiesResponse.body, { depth: Infinity })}`, 500);
-                        err.mojaloopError = this.data.getPartiesResponse.body;
-                        // cancel the timeout handler
-                        clearTimeout(timeout);
-                        return reject(err);
-                    }
-                    let payee = this.data.getPartiesResponse.body;
-
-                    if(!payee.party) {
-                        // we should never get a non-error response without a party, but just in case...
-                        // cancel the timeout handler
-                        clearTimeout(timeout);
-                        return reject(new Error(`Resolved payee has no party object: ${safeStringify(payee)}`));
-                    }
-
-                    payee = payee.party;
-
-                    // cancel the timeout handler
-                    clearTimeout(timeout);
-
-                    this._logger.isVerboseEnabled && this._logger.push({ payee }).verbose('Payee resolved');
+            // now we have a timeout handler and a cache subscriber hooked up we can fire off
+            // a GET /parties request to the switch
+            try {
+                const channel = payeeKey;
+                const subscribing = this._cache.subscribeToOneMessageWithTimerNew(channel, this._requestProcessingTimeoutSeconds);
 
-                    // stop listening for payee resolution messages
-                    // no need to await for the unsubscribe to complete.
-                    // we dont really care if the unsubscribe fails but we should log it regardless
-                    this._cache.unsubscribe(payeeKey, subId, true).catch(e => {
-                        this._logger.isErrorEnabled && this._logger.error(`Error unsubscribing (in callback) ${payeeKey} ${subId}: ${e.stack || safeStringify(e)}`);
-                    });
+                latencyTimerDone = this.metrics.partyLookupLatency.startTimer();
+                const res = await this._requests.getParties(
+                    this.data.to.idType,
+                    this.data.to.idValue,
+                    this.data.to.idSubValue,
+                    this.data.to.fspId,
+                    this.#createOtelHeaders()
+                );
 
-                    // check we got the right payee and info we need
-                    if(payee.partyIdInfo.partyIdType !== this.data.to.idType) {
-                        const err = new Error(`Expecting resolved payee party IdType to be ${this.data.to.idType} but got ${payee.partyIdInfo.partyIdType}`);
-                        return reject(err);
-                    }
+                this.data.getPartiesRequest = res.originalRequest;
 
-                    if(payee.partyIdInfo.partyIdentifier !== this.data.to.idValue) {
-                        const err = new Error(`Expecting resolved payee party identifier to be ${this.data.to.idValue} but got ${payee.partyIdInfo.partyIdentifier}`);
-                        return reject(err);
-                    }
+                this.metrics.partyLookupRequests.inc();
+                this._logger.isDebugEnabled && this._logger.push({ peer: res }).debug('Party lookup sent to peer');
 
-                    if(payee.partyIdInfo.partySubIdOrType !== this.data.to.idSubValue) {
-                        const err = new Error(`Expecting resolved payee party subTypeId to be ${this.data.to.idSubValue} but got ${payee.partyIdInfo.partySubIdOrType}`);
-                        return reject(err);
-                    }
+                const message = await subscribing;
 
-                    if(!payee.partyIdInfo.fspId) {
-                        const err = new Error(`Expecting resolved payee party to have an FSPID: ${safeStringify(payee.partyIdInfo)}`);
-                        return reject(err);
-                    }
+                if(latencyTimerDone) {
+                    latencyTimerDone();
+                }
+                this.metrics.partyLookupResponses.inc();
 
-                    // now we got the payee, add the details to our data so we can use it
-                    // in the quote request
-                    this.data.to.fspId = payee.partyIdInfo.fspId;
-                    if(payee.partyIdInfo.extensionList) {
-                        this.data.to.extensionList  = payee.partyIdInfo.extensionList.extension;
-                    }
-                    if(payee.personalInfo) {
-                        if(payee.personalInfo.complexName) {
-                            this.data.to.firstName = payee.personalInfo.complexName.firstName || this.data.to.firstName;
-                            this.data.to.middleName = payee.personalInfo.complexName.middleName || this.data.to.middleName;
-                            this.data.to.lastName = payee.personalInfo.complexName.lastName || this.data.to.lastName;
-                        }
-                        this.data.to.dateOfBirth = payee.personalInfo.dateOfBirth;
-                    }
+                this.data.getPartiesResponse = message;
+                if (this.data.getPartiesResponse.body?.errorInformation) {
+                    // this is an error response to our GET /parties request
+                    const err = new BackendError(`Got an error response resolving party: ${safeStringify(this.data.getPartiesResponse.body, { depth: Infinity })}`, 500);
+                    err.mojaloopError = this.data.getPartiesResponse.body;
+                    return reject(err);
+                }
+                let payee = this.data.getPartiesResponse.body;
 
-                    if (Array.isArray(payee.supportedCurrencies)) {
-                        if (!payee.supportedCurrencies.length) {
-                            throw new Error(ErrorMessages.noSupportedCurrencies);
-                        }
+                if(!payee.party) {
+                    // we should never get a non-error response without a party, but just in case...
+                    return reject(new Error(`Resolved payee has no party object: ${safeStringify(payee)}`));
+                }
 
-                        this.data.needFx = this._isFxNeeded(this._supportedCurrencies, payee.supportedCurrencies, this.data.currency, this.data.amountType);
-                        this.data.supportedCurrencies = payee.supportedCurrencies;
-                    }
+                payee = payee.party;
 
-                    this._logger.isVerboseEnabled && this._logger.push({
-                        transferId: this.data.transferId,
-                        homeTransactionId: this.data.homeTransactionId,
-                        needFx: this.data.needFx,
-                    }).verbose('Payee validation passed');
+                this._logger.isVerboseEnabled && this._logger.push({ payee }).verbose('Payee resolved');
 
-                    return resolve(payee);
+                // check we got the right payee and info we need
+                if(payee.partyIdInfo.partyIdType !== this.data.to.idType) {
+                    const err = new Error(`Expecting resolved payee party IdType to be ${this.data.to.idType} but got ${payee.partyIdInfo.partyIdType}`);
+                    return reject(err);
                 }
-                catch (err) {
+
+                if(payee.partyIdInfo.partyIdentifier !== this.data.to.idValue) {
+                    const err = new Error(`Expecting resolved payee party identifier to be ${this.data.to.idValue} but got ${payee.partyIdInfo.partyIdentifier}`);
                     return reject(err);
                 }
-            });
 
-            // set up a timeout for the resolution
-            const timeout = setTimeout(() => {
-                const err = new BackendError(`Timeout resolving payee for transfer ${this.data.transferId}`, 504);
+                if(payee.partyIdInfo.partySubIdOrType !== this.data.to.idSubValue) {
+                    const err = new Error(`Expecting resolved payee party subTypeId to be ${this.data.to.idSubValue} but got ${payee.partyIdInfo.partySubIdOrType}`);
+                    return reject(err);
+                }
 
-                // we dont really care if the unsubscribe fails but we should log it regardless
-                this._cache.unsubscribe(payeeKey, subId, true).catch(e => {
-                    this._logger.isErrorEnabled && this._logger.error(`Error unsubscribing (in timeout handler) ${payeeKey} ${subId}: ${e.stack || safeStringify(e)}`);
-                });
+                if(!payee.partyIdInfo.fspId) {
+                    const err = new Error(`Expecting resolved payee party to have an FSPID: ${safeStringify(payee.partyIdInfo)}`);
+                    return reject(err);
+                }
 
-                if(latencyTimerDone) {
-                    latencyTimerDone();
+                // now we got the payee, add the details to our data so we can use it
+                // in the quote request
+                this.data.to.fspId = payee.partyIdInfo.fspId;
+                if(payee.partyIdInfo.extensionList) {
+                    this.data.to.extensionList  = payee.partyIdInfo.extensionList.extension;
+                }
+                if(payee.personalInfo) {
+                    if(payee.personalInfo.complexName) {
+                        this.data.to.firstName = payee.personalInfo.complexName.firstName || this.data.to.firstName;
+                        this.data.to.middleName = payee.personalInfo.complexName.middleName || this.data.to.middleName;
+                        this.data.to.lastName = payee.personalInfo.complexName.lastName || this.data.to.lastName;
+                    }
+                    this.data.to.dateOfBirth = payee.personalInfo.dateOfBirth;
                 }
 
-                return reject(err);
-            }, this._requestProcessingTimeoutSeconds * 1000);
+                if (Array.isArray(payee.supportedCurrencies)) {
+                    if (!payee.supportedCurrencies.length) {
+                        throw new Error(ErrorMessages.noSupportedCurrencies);
+                    }
 
-            // now we have a timeout handler and a cache subscriber hooked up we can fire off
-            // a GET /parties request to the switch
-            try {
-                latencyTimerDone = this.metrics.partyLookupLatency.startTimer();
-                const res = await this._requests.getParties(
-                    this.data.to.idType,
-                    this.data.to.idValue,
-                    this.data.to.idSubValue,
-                    this.data.to.fspId,
-                    this.#createOtelHeaders()
-                );
+                    this.data.needFx = this._isFxNeeded(this._supportedCurrencies, payee.supportedCurrencies, this.data.currency, this.data.amountType);
+                    this.data.supportedCurrencies = payee.supportedCurrencies;
+                }
 
-                this.data.getPartiesRequest = res.originalRequest;
+                this._logger.isVerboseEnabled && this._logger.push({
+                    transferId: this.data.transferId,
+                    homeTransactionId: this.data.homeTransactionId,
+                    needFx: this.data.needFx,
+                }).verbose('Payee validation passed');
 
-                this.metrics.partyLookupRequests.inc();
-                this._logger.isDebugEnabled && this._logger.push({ peer: res }).debug('Party lookup sent to peer');
+                return resolve(payee);
             }
             catch(err) {
-                // cancel the timeout and unsubscribe before rejecting the promise
-                clearTimeout(timeout);
-
-                // we dont really care if the unsubscribe fails but we should log it regardless
-                this._cache.unsubscribe(payeeKey, subId, true).catch(e => {
-                    this._logger.isErrorEnabled && this._logger.error(`Error unsubscribing ${payeeKey} ${subId}: ${e.stack || safeStringify(e)}`);
-                });
-
-                return reject(err);
+                this._logger.isErrorEnabled && this._logger.error(`Error in resolvePayee ${payeeKey}: ${err.stack || safeStringify(err)}`);
+                // If type of error is BackendError, it will be handled by the state machine
+                if (err instanceof BackendError) {
+                    this.data.lastError = err;
+                    return reject(err);
+                }
+                // Check if the error is a TimeoutError, and if so, reject with a BackendError
+                if (err instanceof TimeoutError) {
+                    const error = new BackendError(`Timeout resolving payee for transfer ${this.data.transferId}`, 504);
+                    this.data.lastError = error;
+                    return reject(error);
+                }
+                // otherwise, just throw a generic error
+                const error = new BackendError(`Error resolving payee for transfer ${this.data.transferId}: ${err.message}`, 500);
+                this.data.lastError = error;
+                return reject(error);
             }
         });
     }

package/modules/api-svc/src/lib/model/common/TimeoutError.js

@@ -0,0 +1,41 @@
+/*****
+ License
+ --------------
+ Copyright © 2020-2025 Mojaloop Foundation
+ The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+ Contributors
+ --------------
+ This is the official list of the Mojaloop project contributors for this file.
+ Names of the original copyright holders (individuals or organizations)
+ should be listed with a '*' in the first column. People who have
+ contributed from an organization can be listed under the organization
+ that actually holds the copyright for their contributions (see the
+ Mojaloop Foundation for an example). Those individuals should have
+ their names indented and be marked with a '-'. Email address can be added
+ optionally within square brackets <email>.
+
+ * Mojaloop Foundation
+ - Name Surname <name.surname@mojaloop.io>
+
+ * Infitx
+ - Vijay Kumar Guthi - <vijaya.guthi@infitx.com>
+ --------------
+ ******/
+'use strict';
+
+class TimeoutError extends Error {
+    constructor(msg) {
+        super(msg);
+        this.name = 'TimeoutError';
+    }
+}
+
+
+module.exports = {
+    TimeoutError
+};

package/modules/api-svc/src/lib/model/common/index.js

@@ -28,10 +28,12 @@
  ******/
 const Enums = require('./Enums');
 const { BackendError } = require('./BackendError');
+const { TimeoutError } = require('./TimeoutError');
 const PersistentStateMachine = require('./PersistentStateMachine');
 
 module.exports = {
     ...Enums,
     BackendError,
+    TimeoutError,
     PersistentStateMachine
 };

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

@@ -147,7 +147,7 @@ describe('Outbound Transfers API', () => {
                 parties: {
                     put: () => new Promise(
                         resolve => setTimeout(() => resolve(putPartiesBody),
-                            2000)),
+                            3000)),
                 },
             };
             return testPostTransfers(putBodyFn, 504, postTransfersErrorTimeoutResponse);

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.46",
+  "version": "0.3.0-snapshot.47",
   "description": "Mojaloop sdk scheme adapter command event handler",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",
@@ -51,7 +51,7 @@
     "convict": "6.2.4",
     "express": "4.21.2",
     "openapi-backend": "5.13.0",
-    "redis": "5.7.0",
+    "redis": "5.8.0",
     "swagger-ui-express": "5.0.1",
     "yamljs": "0.3.0"
   },
@@ -60,13 +60,13 @@
     "@types/convict": "6.1.6",
     "@types/express": "5.0.3",
     "@types/jest": "30.0.0",
-    "@types/node": "24.1.0",
+    "@types/node": "24.2.0",
     "@types/node-cache": "4.2.5",
     "@types/supertest": "6.0.3",
     "@types/swagger-ui-express": "4.1.8",
     "@types/yamljs": "0.2.34",
-    "@typescript-eslint/eslint-plugin": "8.38.0",
-    "@typescript-eslint/parser": "8.38.0",
+    "@typescript-eslint/eslint-plugin": "8.39.0",
+    "@typescript-eslint/parser": "8.39.0",
     "copyfiles": "2.4.1",
     "eslint": "9.15.0",
     "jest": "29.7.0",
@@ -74,9 +74,9 @@
     "npm-check-updates": "16.7.10",
     "replace": "1.2.2",
     "standard-version": "9.5.0",
-    "ts-jest": "29.4.0",
+    "ts-jest": "29.4.1",
     "ts-node": "10.9.2",
-    "typescript": "5.8.3"
+    "typescript": "5.9.2"
   },
   "nodemonConfig": {
     "watch": [

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.46",
+    "version": "0.3.0-snapshot.47",
     "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.13.0",
-        "redis": "5.7.0",
+        "redis": "5.8.0",
         "swagger-ui-express": "5.0.1",
         "yamljs": "0.3.0"
     },
@@ -57,13 +57,13 @@
         "@types/convict": "6.1.6",
         "@types/express": "5.0.3",
         "@types/jest": "30.0.0",
-        "@types/node": "24.1.0",
+        "@types/node": "24.2.0",
         "@types/node-cache": "4.2.5",
         "@types/supertest": "6.0.3",
         "@types/swagger-ui-express": "4.1.8",
         "@types/yamljs": "0.2.34",
-        "@typescript-eslint/eslint-plugin": "8.38.0",
-        "@typescript-eslint/parser": "8.38.0",
+        "@typescript-eslint/eslint-plugin": "8.39.0",
+        "@typescript-eslint/parser": "8.39.0",
         "copyfiles": "2.4.1",
         "eslint": "9.15.0",
         "jest": "29.7.0",
@@ -71,9 +71,9 @@
         "npm-check-updates": "16.7.10",
         "replace": "1.2.2",
         "standard-version": "9.5.0",
-        "ts-jest": "29.4.0",
+        "ts-jest": "29.4.1",
         "ts-node": "10.9.2",
-        "typescript": "5.8.3"
+        "typescript": "5.9.2"
     },
     "nodemonConfig": {
         "watch": [

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

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.46",
+  "version": "0.4.0-snapshot.47",
   "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",
@@ -35,23 +35,23 @@
     "@mojaloop/platform-shared-lib-messaging-types-lib": "0.7.3",
     "@mojaloop/platform-shared-lib-nodejs-kafka-client-lib": "0.5.18",
     "ajv": "8.17.1",
-    "redis": "5.7.0",
+    "redis": "5.8.0",
     "uuid": "11.1.0"
   },
   "devDependencies": {
     "@eslint/compat": "1.3.1",
-    "@types/node": "24.1.0",
+    "@types/node": "24.2.0",
     "@types/uuid": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "8.38.0",
-    "@typescript-eslint/parser": "8.38.0",
+    "@typescript-eslint/eslint-plugin": "8.39.0",
+    "@typescript-eslint/parser": "8.39.0",
     "eslint": "9.15.0",
     "jest": "29.7.0",
     "npm-check-updates": "16.7.10",
     "replace": "1.2.2",
     "standard-version": "9.5.0",
-    "ts-jest": "29.4.0",
+    "ts-jest": "29.4.1",
     "tslib": "2.8.1",
-    "typescript": "5.8.3"
+    "typescript": "5.9.2"
   },
   "standard-version": {
     "scripts": {