@mojaloop/sdk-scheme-adapter 24.12.0-snapshot.4 → 24.12.0-snapshot.6

package/modules/api-svc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-api-svc",
-  "version": "21.0.0-snapshot.68",
+  "version": "21.0.0-snapshot.70",
   "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.2",
     "@mojaloop/central-services-logger": "11.10.0",
     "@mojaloop/central-services-metrics": "12.7.1",
-    "@mojaloop/central-services-shared": "18.33.2",
+    "@mojaloop/central-services-shared": "18.33.3",
     "@mojaloop/event-sdk": "14.7.0",
     "@mojaloop/logging-bc-client-lib": "0.5.8",
     "@mojaloop/ml-schema-transformer-lib": "2.7.8",

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

@@ -174,6 +174,10 @@ class InboundApi extends EventEmitter {
             maxSockets: this._conf.outbound?.maxSockets || 256,
         });
 
+        // Prevent accidental logging of agent internals
+        httpAgent.toJSON = () => ({ type: 'BackendHttpAgent', keepAlive: httpAgent.keepAlive });
+        httpsAgent.toJSON = () => ({ type: 'BackendHttpsAgent', keepAlive: httpsAgent.keepAlive });
+
         this._logger.isInfoEnabled && this._logger.info('Created shared HTTP and HTTPS agents for backend requests');
 
         return {

package/modules/api-svc/src/OutboundServer/handlers.js

@@ -130,7 +130,7 @@ const createOutboundTransfersModel = (ctx) => new OutboundTransfersModel({
     logger: ctx.state.logger,
     wso2: ctx.state.wso2,
     metricsClient: ctx.state.metricsClient,
-    sharedAgents: ctx.state.sharedAgents,
+    mojaloopSharedAgents: ctx.state.sharedAgents,
 });
 
 const createOutboundBulkTransfersModel = (ctx) => new OutboundBulkTransfersModel({
@@ -467,7 +467,7 @@ const postAccounts = async (ctx) => {
             cache: ctx.state.cache,
             logger: ctx.state.logger,
             wso2: ctx.state.wso2,
-            sharedAgents: ctx.state.sharedAgents,
+            mojaloopSharedAgents: ctx.state.sharedAgents,
         });
 
         const state = {
@@ -498,7 +498,7 @@ const deleteAccountByTypeAndId = async (ctx) => {
             cache: ctx.state.cache,
             logger: ctx.state.logger,
             wso2: ctx.state.wso2,
-            sharedAgents: ctx.state.sharedAgents,
+            mojaloopSharedAgents: ctx.state.sharedAgents,
         });
 
         const args = {

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

@@ -25,7 +25,6 @@
  --------------
  ******/
 const http = require('http');
-const https = require('https');
 
 const Koa = require('koa');
 const koaBody = require('koa-body').default;
@@ -113,33 +112,9 @@ class OutboundServer extends EventEmitter {
         this._logger = logger.push({ app: this.constructor.name });
         this._server = null;
 
-        // Use provided shared Mojaloop agents or create fallback ones
-        if (mojaloopSharedAgents) {
-            this._httpAgent = mojaloopSharedAgents.httpAgent;
-            this._httpsAgent = mojaloopSharedAgents.httpsAgent;
-            this._logger.isInfoEnabled && this._logger.info('Using shared Mojaloop HTTP and HTTPS agents for OutboundServer');
-        } else {
-            // Fallback: Create shared HTTP and HTTPS agents to prevent agent recreation per request
-            this._httpAgent = new http.Agent({
-                keepAlive: true,
-                maxSockets: conf.outbound.maxSockets || 256,
-            });
-
-            // Create HTTPS agent based on TLS configuration
-            const httpsAgentOptions = {
-                keepAlive: true,
-                maxSockets: conf.outbound.maxSockets || 256,
-            };
-
-            // Apply TLS configuration if mTLS is enabled
-            if (conf.outbound.tls.mutualTLS.enabled && conf.outbound.tls.creds) {
-                Object.assign(httpsAgentOptions, conf.outbound.tls.creds);
-            }
-
-            this._httpsAgent = new https.Agent(httpsAgentOptions);
-
-            this._logger.isInfoEnabled && this._logger.info('Created fallback shared HTTP and HTTPS agents with keepAlive enabled');
-        }
+        this._httpAgent = mojaloopSharedAgents.httpAgent;
+        this._httpsAgent = mojaloopSharedAgents.httpsAgent;
+        this._logger.isInfoEnabled && this._logger.info('Using shared Mojaloop HTTP and HTTPS agents for OutboundServer');
         if (conf.backendEventHandler.enabled) {
             this._eventLogger = new DefaultLogger(BC_CONFIG.bcName, 'backend-api-handler', '0.0.1', conf.logLevel);
             this._eventProducer = new KafkaDomainEventProducer(conf.backendEventHandler.domainEventProducer, this._eventLogger);

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

@@ -299,6 +299,7 @@ class Server extends EventEmitter {
                 this.logger,
                 this.cache,
                 this.wso2,
+                this.mojaloopSharedAgents,
             );
             this.inboundServer.on('error', (...args) => {
                 const errMessage = 'Unhandled error in Inbound Server';
@@ -324,6 +325,7 @@ class Server extends EventEmitter {
                 this.cache,
                 this.metricsClient,
                 this.wso2,
+                this.mojaloopSharedAgents,
             );
             this.outboundServer.on('error', (...args) => {
                 const errMessage = 'Unhandled error in Outbound Server';
@@ -474,6 +476,10 @@ class Server extends EventEmitter {
 
         const httpsAgent = new https.Agent(httpsAgentOptions);
 
+        // Prevent accidental logging of agent internals
+        httpAgent.toJSON = () => ({ type: 'HttpAgent', keepAlive: httpAgent.keepAlive });
+        httpsAgent.toJSON = () => ({ type: 'HttpsAgent', keepAlive: httpsAgent.keepAlive });
+
         this.logger.isInfoEnabled && this.logger.info('Created shared HTTP and HTTPS agents for Mojaloop switch communication');
 
         return {

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

@@ -48,7 +48,7 @@ class AccountsModel {
         this._logger = config.logger;
         this._requestProcessingTimeoutSeconds = config.requestProcessingTimeoutSeconds;
         this._dfspId = config.dfspId;
-        this._sharedAgents = config.sharedAgents;
+        this._mojaloopSharedAgents = config.mojaloopSharedAgents;
 
         const mojaloopRequestsConfig = {
             logger: this._logger,
@@ -66,9 +66,9 @@ class AccountsModel {
         };
 
         // Add shared agents to prevent HTTPS agent recreation per request
-        if (this._sharedAgents) {
-            mojaloopRequestsConfig.httpAgent = this._sharedAgents.httpAgent;
-            mojaloopRequestsConfig.httpsAgent = this._sharedAgents.httpsAgent;
+        if (this._mojaloopSharedAgents) {
+            mojaloopRequestsConfig.httpAgent = this._mojaloopSharedAgents.httpAgent;
+            mojaloopRequestsConfig.httpsAgent = this._mojaloopSharedAgents.httpsAgent;
             this._logger.isDebugEnabled && this._logger.debug('Using shared HTTP/HTTPS agents for AccountsModel MojaloopRequests');
         }
 

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

@@ -71,7 +71,7 @@ class OutboundTransfersModel {
         this._useQuoteSourceFSPAsTransferPayeeFSP = config.useQuoteSourceFSPAsTransferPayeeFSP;
         this._checkIlp = config.checkIlp;
         this._multiplePartiesResponse = config.multiplePartiesResponse;
-        this._sharedAgents = config.sharedAgents;
+        this._mojaloopSharedAgents = config.mojaloopSharedAgents;
         this._multiplePartiesResponseSeconds = config.multiplePartiesResponseSeconds;
         this._sendFinalNotificationIfRequested = config.sendFinalNotificationIfRequested;
         this._apiType = config.apiType;
@@ -106,10 +106,10 @@ class OutboundTransfersModel {
         };
 
         // Add shared agents to prevent HTTPS agent recreation per request
-        if (this._sharedAgents) {
-            mojaloopRequestsConfig.httpAgent = this._sharedAgents.httpAgent;
-            mojaloopRequestsConfig.httpsAgent = this._sharedAgents.httpsAgent;
-            this._logger.isDebugEnabled && this._logger.debug('Using shared HTTP/HTTPS agents for MojaloopRequests');
+        if (this._mojaloopSharedAgents) {
+            mojaloopRequestsConfig.httpAgent = this._mojaloopSharedAgents.httpAgent;
+            mojaloopRequestsConfig.httpsAgent = this._mojaloopSharedAgents.httpsAgent;
+            this._logger.isDebugEnabled && this._logger.debug('Using shared HTTP/HTTPS agents for OutboundTransfersModel MojaloopRequests');
         }
 
         this._requests = new MojaloopRequests(mojaloopRequestsConfig);

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

@@ -40,6 +40,7 @@ const supertest = require('supertest');
 const InboundServer = require('../../src/InboundServer');
 const Cache = require('../../src/lib/cache');
 const config = require('../../src/config');
+const { createMockSharedAgents } = require('./api/utils');
 const helpers = require('../helpers');
 const { logger } = require('../../src/lib/logger');
 
@@ -56,7 +57,7 @@ describe('Inbound Server ISO-20022 Tests -->', () => {
     let server;
 
     beforeEach(async () => {
-        server = new InboundServer(config, logger, new Cache(config));
+        server = new InboundServer(config, logger, new Cache(config), null, createMockSharedAgents());
         await server?.start();
     });
 

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

@@ -42,6 +42,7 @@ const postQuotesBody = require('./data/postQuotesBody');
 const putParticipantsBody = require('./data/putParticipantsBody');
 const commonHttpHeaders = require('./data/commonHttpHeaders');
 const isoBodies = require('./inboundApi/data/isoBodies.json');
+const { createMockSharedAgents } = require('./api/utils');
 
 jest.mock('@mojaloop/sdk-standard-components');
 jest.mock('~/lib/cache');
@@ -51,6 +52,9 @@ const { Jws } = require('@mojaloop/sdk-standard-components');
 const { logger } = require('~/lib/logger');
 const InboundServer = require('~/InboundServer');
 const Cache = require('~/lib/cache');
+
+// Create shared mock agents for all tests
+const mockSharedAgents = createMockSharedAgents();
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
@@ -74,7 +78,7 @@ describe('Inbound Server', () => {
                 logger: logger.push({ component: 'cache' }),
                 unsubscribeTimeoutMs: serverConfig.unsubscribeTimeoutMs,
             });
-            const svr = new InboundServer(serverConfig, logger, cache);
+            const svr = new InboundServer(serverConfig, logger, cache, null, mockSharedAgents);
             await svr.start();
             await supertest(svr._server)
                 .put('/parties/MSISDN/123456789')
@@ -96,7 +100,7 @@ describe('Inbound Server', () => {
             const body = contentType.includes(ISO_20022_HEADER_PART)
                 ? isoBodies.putPartiesRequest
                 : putPartiesBody;
-            const svr = new InboundServer(serverConfig, logger, cache);
+            const svr = new InboundServer(serverConfig, logger, cache, null, mockSharedAgents);
             await svr.start();
             const result = await supertest(svr._server)
                 .put('/parties/MSISDN/123456789')
@@ -179,7 +183,7 @@ describe('Inbound Server', () => {
                 logger: logger.push({ component: 'cache' }),
                 unsubscribeTimeoutMs: serverConfig.unsubscribeTimeoutMs,
             });
-            const svr = new InboundServer(serverConfig, logger, cache);
+            const svr = new InboundServer(serverConfig, logger, cache, null, mockSharedAgents);
             await svr.start();
             await supertest(svr._server)
                 .post('/quotes')
@@ -199,7 +203,7 @@ describe('Inbound Server', () => {
                 logger: logger.push({ component: 'cache' }),
                 unsubscribeTimeoutMs: serverConfig.unsubscribeTimeoutMs,
             });
-            const svr = new InboundServer(serverConfig, logger, cache);
+            const svr = new InboundServer(serverConfig, logger, cache, null, mockSharedAgents);
             await svr.start();
             const result = await supertest(svr._server)
                 .post('/quotes')
@@ -276,7 +280,7 @@ describe('Inbound Server', () => {
                 logger: logger.push({ component: 'cache' }),
                 unsubscribeTimeoutMs: serverConfig.unsubscribeTimeoutMs,
             });
-            const svr = new InboundServer(serverConfig, logger, cache);
+            const svr = new InboundServer(serverConfig, logger, cache, null, mockSharedAgents);
             await svr.start();
             await supertest(svr._server)
                 .put('/participants/00000000-0000-1000-a000-000000000002')
@@ -296,7 +300,7 @@ describe('Inbound Server', () => {
                 logger: logger.push({ component: 'cache' }),
                 unsubscribeTimeoutMs: serverConfig.unsubscribeTimeoutMs,
             });
-            const svr = new InboundServer(serverConfig, logger, cache);
+            const svr = new InboundServer(serverConfig, logger, cache, null, mockSharedAgents);
             await svr.start();
             const result = await supertest(svr._server)
                 .put('/participants/00000000-0000-1000-a000-000000000002')
@@ -386,7 +390,7 @@ describe('Inbound Server', () => {
                 logger: logger.push({ component: 'cache' }),
                 unsubscribeTimeoutMs: defConfig.unsubscribeTimeoutMs,
             });
-            const server = new InboundServer(defConfig, logger, cache);
+            const server = new InboundServer(defConfig, logger, cache, null, mockSharedAgents);
             await server.start();
             if (enableTls) {
                 expect(httpsServerSpy).toHaveBeenCalled();
@@ -421,7 +425,7 @@ describe('Inbound Server', () => {
                 logger: logger.push({ component: 'cache' }),
                 unsubscribeTimeoutMs: serverConfig.unsubscribeTimeoutMs,
             });
-            svr = new InboundServer(serverConfig, logger, cache);
+            svr = new InboundServer(serverConfig, logger, cache, null, mockSharedAgents);
             await svr.start();
         });
 

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

@@ -43,6 +43,7 @@ const TestServer = require('~/TestServer');
 const Cache = require('~/lib/cache');
 const InboundServer = require('~/InboundServer');
 const { logger } = require('~/lib/logger');
+const { createMockSharedAgents } = require('./api/utils');
 
 const defaultConfig = require('./data/defaultConfig');
 const putPartiesBody = require('./data/putPartiesBody');
@@ -83,7 +84,7 @@ describe('Test Server', () => {
         expect(testServer._server.listening).toBe(true);
         testReq = supertest.agent(testServer._server);
 
-        inboundServer = new InboundServer(serverConfig, logger, cache);
+        inboundServer = new InboundServer(serverConfig, logger, cache, null, createMockSharedAgents());
         await inboundServer.start();
         inboundReq = supertest(inboundServer._server);
 

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

@@ -1,5 +1,7 @@
 const fs = require('fs');
 const path = require('path');
+const http = require('http');
+const https = require('https');
 const yaml = require('js-yaml');
 const supertest = require('supertest');
 const { WSO2Auth } = require('@mojaloop/sdk-standard-components');
@@ -16,6 +18,20 @@ const ServerType = {
     Outbound: 'Outbound',
 };
 
+/**
+ * Create mock shared agents for testing
+ */
+function createMockSharedAgents() {
+    const httpAgent = new http.Agent({ keepAlive: true });
+    const httpsAgent = new https.Agent({ keepAlive: true });
+
+    // Prevent logging of agent internals in tests
+    httpAgent.toJSON = () => ({ type: 'MockHttpAgent', keepAlive: true });
+    httpsAgent.toJSON = () => ({ type: 'MockHttpsAgent', keepAlive: true });
+
+    return { httpAgent, httpsAgent };
+}
+
 /**
  * Get OpenAPI spec and Validator for specified server
  * @param {ServerType} serverType
@@ -69,11 +85,13 @@ const createTestServers = async (config) => {
         }),
         retryWso2AuthFailureTimes: defConfig.wso2.requestAuthFailureRetryTimes,
     };
-    const serverOutbound = new OutboundServer(defConfig, logger, cache, metricsClient, wso2);
+    const mockSharedAgents = createMockSharedAgents();
+
+    const serverOutbound = new OutboundServer(defConfig, logger, cache, metricsClient, wso2, mockSharedAgents);
     await serverOutbound.start();
     const reqOutbound = supertest(serverOutbound._server);
 
-    const serverInbound = new InboundServer(defConfig, logger, cache, wso2);
+    const serverInbound = new InboundServer(defConfig, logger, cache, wso2, mockSharedAgents);
     await serverInbound.start();
     const reqInbound = supertest(serverInbound._server);
 
@@ -94,4 +112,5 @@ module.exports = {
     createValidators,
     createTestServers,
     destroyTestServers,
+    createMockSharedAgents,
 };

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.63",
+  "version": "0.3.0-snapshot.65",
   "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": "18.1.1",
-    "@mojaloop/central-services-shared": "18.33.2",
+    "@mojaloop/central-services-shared": "18.33.3",
     "@mojaloop/logging-bc-client-lib": "0.5.8",
     "@mojaloop/logging-bc-public-types-lib": "0.5.6",
     "@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",

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.63",
+    "version": "0.3.0-snapshot.65",
     "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.63",
+  "version": "0.4.0-snapshot.65",
   "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,7 +30,7 @@
   },
   "dependencies": {
     "@mojaloop/api-snippets": "18.1.1",
-    "@mojaloop/central-services-shared": "18.33.2",
+    "@mojaloop/central-services-shared": "18.33.3",
     "@mojaloop/logging-bc-public-types-lib": "0.5.6",
     "@mojaloop/platform-shared-lib-messaging-types-lib": "0.7.3",
     "@mojaloop/platform-shared-lib-nodejs-kafka-client-lib": "0.5.18",

package/package.json

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