@mojaloop/sdk-scheme-adapter 24.2.0 → 24.2.1-snapshot.0

package/modules/api-svc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-api-svc",
-  "version": "21.0.0-snapshot.25",
+  "version": "21.0.0-snapshot.27",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -68,14 +68,14 @@
     "@mojaloop/central-services-error-handling": "13.0.7",
     "@mojaloop/central-services-logger": "11.5.5",
     "@mojaloop/central-services-metrics": "12.4.5",
-    "@mojaloop/central-services-shared": "18.21.0",
-    "@mojaloop/event-sdk": "14.1.5",
+    "@mojaloop/central-services-shared": "18.22.1",
+    "@mojaloop/event-sdk": "14.3.0",
     "@mojaloop/logging-bc-client-lib": "0.5.8",
     "@mojaloop/ml-schema-transformer-lib": "2.5.6",
     "@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",
-    "@mojaloop/sdk-standard-components": "19.9.0",
+    "@mojaloop/sdk-standard-components": "19.10.0-snapshot.1",
     "ajv": "8.17.1",
-    "axios": "1.8.1",
+    "axios": "1.8.2",
     "body-parser": "1.20.3",
     "co-body": "6.2.0",
     "dotenv": "16.4.7",

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

@@ -30,7 +30,7 @@ require('dotenv').config();
 const fs = require('node:fs');
 const yaml = require('js-yaml');
 const { from } = require('env-var');
-const { Logger } = require('@mojaloop/sdk-standard-components').Logger;
+const { LOG_LEVELS } = require('./lib/logger');
 const { API_TYPES, RESOURCE_VERSIONS_STRING } = require('./constants');
 
 function getFileContent (path) {
@@ -90,7 +90,7 @@ module.exports = {
         mgmtAPILatencyAssumption: env.get('MGMT_API_LATENCY_ASSUMPTION').default('2000').asIntPositive(),
     },
     idGenerator: env.get('ID_GENERATOR').default('{"type":"ulid"}').asJsonObject(),
-    logLevel: env.get('LOG_LEVEL').default('info').asEnum(Logger.logLevels),
+    logLevel: env.get('LOG_LEVEL').default('info').asEnum(LOG_LEVELS),
     inbound: {
         port: env.get('INBOUND_LISTEN_PORT').default('4000').asPortNumber(),
         tls: {

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

@@ -48,7 +48,8 @@ const Router = require('./lib/router');
 const Validate = require('./lib/validate');
 const Cache = require('./lib/cache');
 const { SDKStateEnum } = require('./lib/model/common');
-const { createAuthClient, createLogger } = require('./lib/utils');
+const { createAuthClient } = require('./lib/utils');
+const { createLogger } = require('./lib/logger');
 
 const LOG_ID = {
     INBOUND:   { app: 'mojaloop-connector-inbound-api' },

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

@@ -0,0 +1,47 @@
+/*****
+ 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
+ * Eugen Klymniuk <eugen.klymniuk@infitx.com>
+
+ --------------
+ ******/
+
+const { hostname } = require('node:os');
+const { loggerFactory, LOG_LEVELS } = require('@mojaloop/sdk-standard-components').Logger;
+
+const createLogger = (conf = {}) => {
+    const {
+        context = {
+            // If we're running from a Mojaloop helm chart deployment, we'll have a SIM_NAME
+            simulator: process.env['SIM_NAME'],
+            hostname: hostname(),
+        },
+        isJsonOutput = false,
+    } = conf;
+
+    return loggerFactory({ context, isJsonOutput });
+};
+
+module.exports = {
+    createLogger,
+    LOG_LEVELS,
+};

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

@@ -25,25 +25,8 @@
  --------------
  ******/
 
-const { hostname } = require('node:os');
 const { randomBytes } = require('node:crypto');
-const { WSO2Auth, Logger } = require('@mojaloop/sdk-standard-components');
-
-const SDK_LOGGER_HIERARCHY = Logger.Logger.logLevels.reverse();
-
-const createLogger = (conf) => new Logger.Logger({
-    context: {
-    // If we're running from a Mojaloop helm chart deployment, we'll have a SIM_NAME
-        simulator: process.env['SIM_NAME'],
-        hostname: hostname(),
-    },
-    opts: {
-        // todo: should be done inside Logger code
-        levels: SDK_LOGGER_HIERARCHY.slice(SDK_LOGGER_HIERARCHY.indexOf(conf.logLevel)),
-        isJsonOutput: conf.isJsonOutput,
-    },
-    stringify: Logger.buildStringify({ isJsonOutput: conf.isJsonOutput }),
-});
+const { WSO2Auth } = require('@mojaloop/sdk-standard-components');
 
 const createAuthClient = (conf, logger) => {
     const { wso2, outbound } = conf;
@@ -88,7 +71,6 @@ const generateTraceparent = (traceId = randomBytes(16).toString('hex')) => {
 
 module.exports = {
     createAuthClient,
-    createLogger,
     generateTraceparent,
     transformHeadersIsoToFspiop
 };

package/modules/api-svc/test/integration/lib/cache.test.js

@@ -31,7 +31,7 @@
 jest.dontMock('redis');
 
 const Cache = require('~/lib/cache');
-const { Logger } = require('@mojaloop/sdk-standard-components');
+const { createLogger } = require('~/lib/logger');
 const env = require('../testEnv');
 
 const defaultCacheConfig = {
@@ -40,12 +40,7 @@ const defaultCacheConfig = {
 };
 
 const createCache = async (config) => {
-    config.logger = new Logger.Logger({
-        context: {
-            app: 'mojaloop-sdk-inboundCache'
-        },
-        stringify: Logger.buildStringify({ space: 4 }),
-    });
+    config.logger = createLogger({ context: { app: 'mojaloop-sdk-inboundCache' } });
     const cache = new Cache(config);
     await cache.connect();
 

package/modules/api-svc/test/integration-pm4ml/mockServers/managementService/config.js

@@ -26,9 +26,10 @@
  ******/
 'use strict';
 
-const fs = require('fs');
 require('dotenv').config();
+const fs = require('fs');
 const { from } = require('env-var');
+const { LOG_LEVELS } = require('../../../../src/lib/logger');
 
 function getFileContent (path) {
     if (!fs.existsSync(path)) {
@@ -43,7 +44,7 @@ const env = from(process.env, {
 });
 
 module.exports = {
-    logLevel: env.get('LOG_LEVEL').default('info').asEnum(['trace', 'debug', 'info', 'warn', 'error', 'fatal']),
+    logLevel: env.get('LOG_LEVEL').default('info').asEnum(LOG_LEVELS),
     server: {
         port: env.get('SERVER_LISTEN_PORT').default('4005').asPortNumber(),
     },

package/modules/api-svc/test/integration-pm4ml/mockServers/managementService/index.js

@@ -1,42 +1,43 @@
+const express = require('express');
+const { createLogger } = require('../../../../src/lib/logger');
 const Config = require('./config');
 const ManagementService = require('./server');
-const { Logger } = require('@mojaloop/sdk-standard-components');
-const express = require('express')
-const app = express()
-
-const logger = new Logger.Logger({
-    ctx: {
-      simulator: 'test',
-      hostname: 'test',
+
+const app = express();
+
+const logger = createLogger({
+    context: {
+        simulator: 'test',
+        hostname: 'test',
     }
-  });
+});
 
 const managementServer = new ManagementService.Server({
     port: Config.server.port,
-    logger: logger,
+    logger,
 });
 
 // Test API Server
 app.use(express.json());
 
 app.get('/health', (req, res) => {
-  res.send('OK')
-})
+    res.send('OK');
+});
 
 app.post('/updateOutboundTLSConfig', (req, res) => {
-  managementServer.updateOutboundTLSConfig(req.body);
-  res.status(200).json({
-    message: 'Updated configuration'
-  })
-})
+    managementServer.updateOutboundTLSConfig(req.body);
+    res.status(200).json({
+        message: 'Updated configuration'
+    });
+});
 
 app.post('/resetConfig', (req, res) => {
-  managementServer.resetConfig();
-  res.status(200).json({
-    message: 'Reset Done'
-  })
-})
+    managementServer.resetConfig();
+    res.status(200).json({
+        message: 'Reset Done'
+    });
+});
 
 app.listen(Config.testAPIServer.port, () => {
-  logger.log(`Test API Server listening on port ${Config.testAPIServer.port}`)
-})
+    logger.log(`Test API Server listening on port ${Config.testAPIServer.port}`);
+});

package/modules/api-svc/test/integration-pm4ml/mockServers/managementService/server.js

@@ -11,7 +11,6 @@
 const ws = require('ws');
 const jsonPatch = require('fast-json-patch');
 const randomPhrase = require('./lib/randomphrase');
-const { Logger } = require('@mojaloop/sdk-standard-components');
 
 const INIT_CONFIG = require('./initConfig')
 

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

@@ -28,7 +28,7 @@
 const { BackendEventHandler } = require('../../src/BackendEventHandler');
 const { BackendRequests } = require('../../src/lib/model/lib/requests');
 const { SDKStateEnum } = require('../../src/lib/model/common');
-const { Logger } = require('@mojaloop/sdk-standard-components');
+const { createLogger } = require('../../src/lib/logger');
 const config = require('./data/defaultConfig.json');
 const bulkTransactionResponse = require('./lib/model/data/bulkTransactionResponse.json');
 const {
@@ -42,7 +42,7 @@ const {
     KafkaDomainEventProducer,
 } = require('@mojaloop/sdk-scheme-adapter-private-shared-lib');
 
-const logger = new Logger.Logger({ context: { app: 'BackendEventHandler' }, stringify: () => '' });
+const logger = createLogger({ context: { app: 'BackendEventHandler' }, stringify: () => '' });
 
 describe('BackendEventHandler', () => {
     const putBulkTransactions = jest.spyOn(BackendRequests.prototype, 'putBulkTransactions').mockImplementation(async () => ({}));

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

@@ -24,12 +24,13 @@
 
  --------------
  ******/
-const ControlAgent = require('~/ControlAgent');
-const TestControlServer = require('./ControlServer');
-const { Logger } = require('@mojaloop/sdk-standard-components');
 
 jest.mock('~/lib/cache');
 
+const ControlAgent = require('~/ControlAgent');
+const { createLogger } = require('~/lib/logger');
+const TestControlServer = require('./ControlServer');
+
 // TODO:
 // - diff against master to determine what else needs testing
 // - especially look for assertions in the code
@@ -59,7 +60,7 @@ describe('ControlAgent', () => {
         const changedConfig = { ...appConfig, some: 'thing' };
 
         beforeAll(async () => {
-            logger = new Logger.Logger({ stringify: () => '' });
+            logger = createLogger({ stringify: () => '' });
             server = new TestControlServer.Server({ logger, appConfig });
             client = await ControlAgent.Client.Create({
                 address: 'localhost',

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

@@ -33,10 +33,6 @@ process.env.CACHE_URL = 'redis://172.17.0.2:6379';
 process.env.MGMT_API_WS_URL = '0.0.0.0';
 process.env.SUPPORTED_CURRENCIES='USD';
 
-const { FSPIOPEventHandler } = require('../../src/FSPIOPEventHandler');
-const bulkQuoteRequest = require('../unit/lib/model/data/bulkQuoteRequest.json');
-const { Logger } = require('@mojaloop/sdk-standard-components');
-const config = require('./data/defaultConfig.json');
 const {
     PartyInfoRequestedDmEvt,
     BulkQuotesRequestedDmEvt,
@@ -45,6 +41,8 @@ const {
     KafkaDomainEventProducer,
 } = require('@mojaloop/sdk-scheme-adapter-private-shared-lib');
 
+const { FSPIOPEventHandler } = require('../../src/FSPIOPEventHandler');
+const { createLogger } = require('../../src/lib/logger');
 const {
     OutboundBulkQuotesModel,
     PartiesModel,
@@ -52,7 +50,10 @@ const {
     SDKStateEnum
 } = require('../../src/lib/model');
 
-const logger = new Logger.Logger({ context: { app: 'FSPIOPEventHandler' }, stringify: () => '' });
+const bulkQuoteRequest = require('../unit/lib/model/data/bulkQuoteRequest.json');
+const config = require('./data/defaultConfig.json');
+
+const logger = createLogger({ context: { app: 'FSPIOPEventHandler' }, stringify: () => '' });
 
 describe('FSPIOPEventHandler', () => {
     let fspiopEventHandler;

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

@@ -37,17 +37,17 @@ jest.mock('../../src/lib/cache');
 jest.mock('../../src/lib/model/lib/requests', () => require('./lib/model/mockedLibRequests'));
 
 const supertest = require('supertest');
-const { Logger } = require('@mojaloop/sdk-standard-components');
-
 const InboundServer = require('../../src/InboundServer');
 const Cache = require('../../src/lib/cache');
 const config = require('../../src/config');
 const helpers = require('../helpers');
+const { createLogger } = require('../../src/lib/logger');
+
 const isoBodies = require('./inboundApi/data/isoBodies');
 const commonHttpHeaders = require('./data/commonHttpHeaders');
 const transactionRequestResponse = require('./lib/model/data/transactionRequestResponse');
 
-const logger = new Logger.Logger();
+const logger = createLogger();
 
 const createIsoHeaders = resource => ({
     ...commonHttpHeaders,

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

@@ -47,16 +47,17 @@ jest.mock('@mojaloop/sdk-standard-components');
 jest.mock('~/lib/cache');
 jest.mock('~/lib/model/lib/requests', () => require('./lib/model/mockedLibRequests'));
 
+const { Jws } = require('@mojaloop/sdk-standard-components');
+const { createLogger } = require('~/lib/logger');
 const InboundServer = require('~/InboundServer');
 const Cache = require('~/lib/cache');
-const { Jws, Logger } = require('@mojaloop/sdk-standard-components');
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
 const http = require('http');
 const https = require('https');
 
-const logger = new Logger.Logger();
+const logger = createLogger();
 
 describe('Inbound Server', () => {
     describe('PUT /parties', () => {

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

@@ -33,23 +33,22 @@ process.env.CACHE_URL = 'redis://172.17.0.2:6379';
 process.env.MGMT_API_WS_URL = '0.0.0.0';
 process.env.SUPPORTED_CURRENCIES='USD';
 
+jest.mock('@mojaloop/sdk-standard-components');
+jest.mock('~/lib/cache');
+jest.mock('~/lib/model/lib/requests', () => require('./lib/model/mockedLibRequests'));
+
 const supertest = require('supertest');
+const WebSocket = require('ws');
+const TestServer = require('~/TestServer');
+const Cache = require('~/lib/cache');
+const InboundServer = require('~/InboundServer');
+const { createLogger } = require('~/lib/logger');
 
 const defaultConfig = require('./data/defaultConfig');
 const putPartiesBody = require('./data/putPartiesBody');
 const postQuotesBody = require('./data/postQuotesBody');
 const putParticipantsBody = require('./data/putParticipantsBody');
 const commonHttpHeaders = require('./data/commonHttpHeaders');
-const WebSocket = require('ws');
-const { Logger } = require('@mojaloop/sdk-standard-components');
-
-jest.mock('~/lib/cache');
-jest.mock('@mojaloop/sdk-standard-components');
-jest.mock('~/lib/model/lib/requests', () => require('./lib/model/mockedLibRequests'));
-
-const Cache = require('~/lib/cache');
-const InboundServer = require('~/InboundServer');
-const TestServer = require('~/TestServer');
 
 const createWsClient = async (port, path) => {
     const result = new WebSocket(`ws://127.0.0.1:${port}${path}`);
@@ -67,7 +66,7 @@ describe('Test Server', () => {
     beforeEach(async () => {
         Cache.mockClear();
 
-        logger = new Logger.Logger({ stringify: () => '' });
+        logger = createLogger({ stringify: () => '' });
 
         serverConfig = {
             ...JSON.parse(JSON.stringify(defaultConfig)),

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

@@ -2,7 +2,7 @@ const { mockAxios, jsonContentTypeHeader} = require('../../../helpers');
 
 const OpenAPIResponseValidator = require('openapi-response-validator').default;
 
-const { Logger } = require('@mojaloop/sdk-standard-components');
+const { createLogger } = require('../../../../src/lib/logger');
 const postTransfersSimpleBody = require('./data/postTransfersSimpleBody');
 
 /**
@@ -112,7 +112,7 @@ function createGetTransfersTester({ reqInbound, reqOutbound, apiSpecsOutbound })
 function createPostTransfersTester({
     requestValidatorInbound, reqInbound, reqOutbound, apiSpecsOutbound
 }) {
-    const logger = new Logger.Logger({ context: { app: 'outbound-model-unit-tests' } });
+    const logger =createLogger({ context: { app: 'outbound-model-unit-tests' } });
 
     /**
      *

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

@@ -2,12 +2,13 @@ const fs = require('fs');
 const path = require('path');
 const yaml = require('js-yaml');
 const supertest = require('supertest');
-const { Logger, WSO2Auth } = require('@mojaloop/sdk-standard-components');
+const { WSO2Auth } = require('@mojaloop/sdk-standard-components');
 
+const { createLogger } = require('~/lib/logger');
+const { MetricsClient } = require('~/lib/metrics');
 const Validate = require('~/lib/validate');
 const InboundServer = require('~/InboundServer');
 const OutboundServer = require('~/OutboundServer');
-const { MetricsClient } = require('~/lib/metrics');
 const Cache = require('~/lib/cache');
 
 const ServerType = {
@@ -50,7 +51,7 @@ const createValidators = async () => {
 };
 
 const createTestServers = async (config) => {
-    const logger = new Logger.Logger({ stringify: () => '' });
+    const logger = createLogger({ stringify: () => '' });
     const defConfig = structuredClone(config);
     const cache = new Cache({
         cacheUrl: defConfig.cacheUrl,

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

@@ -25,7 +25,8 @@
  --------------
  ******/
 
-const { Ilp, Logger  } = jest.requireActual('@mojaloop/sdk-standard-components');
+const { Ilp } = jest.requireActual('@mojaloop/sdk-standard-components');
+const { createLogger } = require('../../src/lib/logger');
 const mocks = require('./lib/model/data/mocks');
 
 describe('ILP Tests -->', () => {
@@ -36,7 +37,7 @@ describe('ILP Tests -->', () => {
     beforeEach(() => {
         ilp = Ilp.ilpFactory(Ilp.ILP_VERSIONS.v4, {
             secret: 'test',
-            logger: new Logger.Logger(),
+            logger: createLogger(),
         });
         fxQuotesPayload = mocks.mockFxQuotesPayload();
         fxpBeResponse = mocks.mockFxQuotesInternalResponse();

package/modules/api-svc/test/unit/inboundApi/handlers-iso20022.test.js

@@ -21,17 +21,17 @@ process.env.SUPPORTED_CURRENCIES='USD';
 
 jest.mock('../../../src/lib/model');
 
-const { Logger } = require('@mojaloop/sdk-standard-components');
 const handlers = require('../../../src/InboundServer/handlers');
 const Model = require('../../../src/lib/model').InboundTransfersModel;
 const QuotesModel = require('../../../src/lib/model').QuotesModel;
 const PartiesModel = require('../../../src/lib/model').PartiesModel;
 const TransfersModel = require('../../../src/lib/model').TransfersModel;
+const { createLogger } = require('../../../src/lib/logger');
 
 const { createIsoHeader } = require('../../helpers');
 const isoBodies = require('./data/isoBodies.json');
 
-const logger = new Logger.Logger({ context: { app: 'inbound-handlers-unit-test' } });
+const logger = createLogger({ context: { app: 'inbound-handlers-unit-test' } });
 
 describe('Inbound API handlers transforming incoming ISO20022 message bodies', () => {
     describe('POST /quotes', () => {
@@ -92,7 +92,7 @@ describe('Inbound API handlers transforming incoming ISO20022 message bodies', (
                             'ID': '1234567890'
                         }
                     },
-                    logger: new Logger.Logger({ context: { app: 'inbound-handlers-unit-test' }, stringify: () => '' }),
+                    logger,
                     cache: {
                         publish: jest.fn(() => Promise.resolve(true))
                     }
@@ -142,7 +142,7 @@ describe('Inbound API handlers transforming incoming ISO20022 message bodies', (
                             'ID': '1234567890'
                         }
                     },
-                    logger: new Logger.Logger({ context: { app: 'inbound-handlers-unit-test' }, stringify: () => '' }),
+                    logger,
                     cache: {
                         publish: jest.fn(() => Promise.resolve(true))
                     }
@@ -212,7 +212,7 @@ describe('Inbound API handlers transforming incoming ISO20022 message bodies', (
                     conf: {
                         isIsoApi: true,
                     },
-                    logger: new Logger.Logger({ context: { app: 'inbound-handlers-unit-test' }, stringify: () => '' }),
+                    logger,
                     cache: {
                         publish: jest.fn(() => Promise.resolve(true))
                     }