From cc92fcc3592ccb9bb4dd9dc3a5f60b884df0784d Mon Sep 17 00:00:00 2001 From: Kalin Krustev Date: Thu, 26 Dec 2024 09:02:56 +0000 Subject: [PATCH 1/3] chore: monorepo --- .gitignore | 2 ++ package.json | 10 +++++----- src/handlers/monitoringServer.js | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 6a1fd5f8..018e0099 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,5 @@ typings/ # https://devspace.sh/ devspace* .devspace/**.* + +.rush diff --git a/package.json b/package.json index ca24290c..9f86b2d8 100644 --- a/package.json +++ b/package.json @@ -111,13 +111,13 @@ "@mojaloop/central-services-health": "15.0.0", "@mojaloop/central-services-logger": "11.5.1", "@mojaloop/central-services-metrics": "12.4.2", - "@mojaloop/central-services-shared": "18.14.1", - "@mojaloop/central-services-stream": "11.4.1", - "@mojaloop/event-sdk": "14.1.1", + "@mojaloop/central-services-shared": "workspace:*", + "@mojaloop/central-services-stream": "workspace:*", + "@mojaloop/event-sdk": "workspace:*", "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.1", "@mojaloop/ml-number": "11.2.4", - "@mojaloop/ml-schema-transformer-lib": "2.4.2", - "@mojaloop/sdk-standard-components": "18.1.0", + "@mojaloop/ml-schema-transformer-lib": "workspace:*", + "@mojaloop/sdk-standard-components": "workspace:*", "ajv": "8.17.1", "ajv-keywords": "5.1.0", "axios": "1.7.9", diff --git a/src/handlers/monitoringServer.js b/src/handlers/monitoringServer.js index 11a36d3b..2911b203 100644 --- a/src/handlers/monitoringServer.js +++ b/src/handlers/monitoringServer.js @@ -45,7 +45,7 @@ const createMonitoringServer = async (port, consumersMap, db) => { server.app.db = db server.app.consumersMap = consumersMap - await server.register([HealthPlugin, Metrics.plugin]) + await server.register([HealthPlugin, !config.instrumentationMetricsDisabled && Metrics.plugin].filter(Boolean)) await server.start() Logger.info(`Monitoring server running at: ${server.info.uri}`) From 5da3859aced255f21b1a21ab1742a5a18b8269ea Mon Sep 17 00:00:00 2001 From: Kalin Krustev Date: Thu, 26 Dec 2024 10:36:06 +0000 Subject: [PATCH 2/3] chore: deps --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9f86b2d8..e2f2f143 100644 --- a/package.json +++ b/package.json @@ -111,13 +111,13 @@ "@mojaloop/central-services-health": "15.0.0", "@mojaloop/central-services-logger": "11.5.1", "@mojaloop/central-services-metrics": "12.4.2", - "@mojaloop/central-services-shared": "workspace:*", - "@mojaloop/central-services-stream": "workspace:*", - "@mojaloop/event-sdk": "workspace:*", + "@mojaloop/central-services-shared": "^18.14.1", + "@mojaloop/central-services-stream": "11.4.1", + "@mojaloop/event-sdk": "14.1.1", "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.1", "@mojaloop/ml-number": "11.2.4", - "@mojaloop/ml-schema-transformer-lib": "workspace:*", - "@mojaloop/sdk-standard-components": "workspace:*", + "@mojaloop/ml-schema-transformer-lib": "^2.4.2", + "@mojaloop/sdk-standard-components": "^19.6.2", "ajv": "8.17.1", "ajv-keywords": "5.1.0", "axios": "1.7.9", From 2bcb9d607ce9c3d8582915be091ed104a44a625e Mon Sep 17 00:00:00 2001 From: Kalin Krustev Date: Wed, 8 Jan 2025 09:23:37 +0000 Subject: [PATCH 3/3] chore: dependencies --- package-lock.json | 137 ++++++++++++++++++++++++++++++++++++++-------- package.json | 10 ++-- 2 files changed, 120 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39e93597..d1e81b9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,17 +13,17 @@ "@hapi/hapi": "21.3.12", "@hapi/inert": "7.1.0", "@hapi/vision": "7.0.3", - "@mojaloop/central-services-error-handling": "13.0.2", + "@mojaloop/central-services-error-handling": "13.0.3", "@mojaloop/central-services-health": "15.0.0", "@mojaloop/central-services-logger": "11.5.1", - "@mojaloop/central-services-metrics": "12.4.2", - "@mojaloop/central-services-shared": "18.15.0", - "@mojaloop/central-services-stream": "11.4.1", + "@mojaloop/central-services-metrics": "12.4.3", + "@mojaloop/central-services-shared": "18.15.1", + "@mojaloop/central-services-stream": "11.4.2", "@mojaloop/event-sdk": "14.1.1", "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.1", "@mojaloop/ml-number": "11.2.4", - "@mojaloop/ml-schema-transformer-lib": "2.5.1", - "@mojaloop/sdk-standard-components": "18.1.0", + "@mojaloop/ml-schema-transformer-lib": "^2.5.1", + "@mojaloop/sdk-standard-components": "^19.6.2", "ajv": "8.17.1", "ajv-keywords": "5.1.0", "axios": "1.7.9", @@ -1768,9 +1768,10 @@ } }, "node_modules/@mojaloop/central-services-error-handling": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-error-handling/-/central-services-error-handling-13.0.2.tgz", - "integrity": "sha512-HSxI7OrtPdA94aHNWmAD50Ve8lR6FmgOX2LaZSL/TPfx22PVTTht0eXU+IQSN/srF20f2tvCa2CdFxWBQf6Ilg==", + "version": "13.0.3", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-error-handling/-/central-services-error-handling-13.0.3.tgz", + "integrity": "sha512-/cXY2uVnCaQwDAxnUeXqpu0y2pX6UVxfJoh2dpeG1zDKkJLZuKXHUcTMNtkeDgU62IsaFt2Jfw+MhV3H6HpYIA==", + "license": "Apache-2.0", "dependencies": { "fast-safe-stringify": "2.1.1", "lodash": "4.17.21" @@ -1851,18 +1852,19 @@ } }, "node_modules/@mojaloop/central-services-metrics": { - "version": "12.4.2", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-metrics/-/central-services-metrics-12.4.2.tgz", - "integrity": "sha512-0XFW9nBJNY70tya/DEYlGl12adfb/3cAWuHv88vF8JI+JQAIE/6ePyET1Wb3tMp0BUcjFF5b1XbbYcOF69wKZQ==", + "version": "12.4.3", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-metrics/-/central-services-metrics-12.4.3.tgz", + "integrity": "sha512-bAnxpt/jWbWWbJ2OoAruJiC3yZM/tXq8rc6kFhEW5MquWoPmXaO2TyAFC1IA+xY4KwMZT8DQieYxdK7IzwM5ng==", "license": "Apache-2.0", "dependencies": { "prom-client": "15.1.3" } }, "node_modules/@mojaloop/central-services-shared": { - "version": "18.15.0", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-18.15.0.tgz", - "integrity": "sha512-2pjGva6DuXtHRUjhh9zEzkkEdNMH/WQdL8cmh/NqiI7XlL9YJOK6Dvw6PhnTgAOP1WTrhYffVKi1ypF0Eywi+Q==", + "version": "18.15.1", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-shared/-/central-services-shared-18.15.1.tgz", + "integrity": "sha512-cpsplBd30ToI+uL7ArFM2catgY+/dOtapy4GZasN5gHZTO2U3fPQICudShhILZKpRAeKa2bdtycY6Lq+raNP7w==", + "license": "Apache-2.0", "dependencies": { "@hapi/catbox": "12.1.1", "@hapi/catbox-memory": "5.0.1", @@ -1933,9 +1935,10 @@ } }, "node_modules/@mojaloop/central-services-stream": { - "version": "11.4.1", - "resolved": "https://registry.npmjs.org/@mojaloop/central-services-stream/-/central-services-stream-11.4.1.tgz", - "integrity": "sha512-LbnT/JAqliL8xWf/vCt5fJGIP8+o5Gcx265GPXbJPKSQrJ8UV5cUs1CIv0S/nYjrZuvfeEI3RQYuc93NF9qO3g==", + "version": "11.4.2", + "resolved": "https://registry.npmjs.org/@mojaloop/central-services-stream/-/central-services-stream-11.4.2.tgz", + "integrity": "sha512-ImJRCH6AHwxAux/1VWWMaxNaBvg21/fy5BR9qEcCyTWeacc8tQaCxyy6gXhmXHb7JtM94hnf+FcyYrBlAvZf+w==", + "license": "Apache-2.0", "dependencies": { "async": "3.2.6", "async-exit-hook": "2.0.1", @@ -2069,17 +2072,47 @@ } }, "node_modules/@mojaloop/sdk-standard-components": { - "version": "18.1.0", - "resolved": "https://registry.npmjs.org/@mojaloop/sdk-standard-components/-/sdk-standard-components-18.1.0.tgz", - "integrity": "sha512-8g4JuVl3f9t80OEtvn9BeUtlZIW4kcL40f72FZobtqQjAZ+yz4J0BlWS/OEJDpuYV1qoyxGiuMRojKqP2Yio7g==", + "version": "19.6.2", + "resolved": "https://registry.npmjs.org/@mojaloop/sdk-standard-components/-/sdk-standard-components-19.6.2.tgz", + "integrity": "sha512-5w1Y6J2AnLPGJxti3qa4iDPX3Ts6BJLVMCSnfxWoSqi45PM+6ElhP2r2Pxvr5lrNDp2VKnhEolEPXyiftBEutQ==", + "license": "Apache-2.0", "dependencies": { + "@mojaloop/ml-schema-transformer-lib": "^2.4.1", + "axios": "1.7.9", + "axios-retry": "4.5.0", "base64url": "3.0.1", "fast-safe-stringify": "^2.1.1", - "ilp-packet": "2.2.0", + "ilp-packet": "3.1.3", + "ilp-packet-v1": "2.2.0", "jsonwebtoken": "9.0.2", "jws": "4.0.0" } }, + "node_modules/@mojaloop/sdk-standard-components/node_modules/ilp-packet": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/ilp-packet/-/ilp-packet-3.1.3.tgz", + "integrity": "sha512-FBsiPQbHPdLPI6jdA+sQO+4fFBuMc212yCdNXMqoGJdic2GFHF/E8P9bTorIVRZRVExhWDE5givqCMguupW8VA==", + "license": "Apache-2.0", + "dependencies": { + "extensible-error": "^1.0.2", + "oer-utils": "^5.1.2" + } + }, + "node_modules/@mojaloop/sdk-standard-components/node_modules/long": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", + "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==", + "license": "Apache-2.0" + }, + "node_modules/@mojaloop/sdk-standard-components/node_modules/oer-utils": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/oer-utils/-/oer-utils-5.1.2.tgz", + "integrity": "sha512-VhkvT3bthHrbnwBOG9vGpDFB8XHrIitpZY2nC+3scZI2Tf17g8YmeDK6wsA7HpdjGXMsbf14fRgltBXwhzrWOw==", + "dependencies": { + "@types/long": "4.0.1", + "long": "^4.0.0" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -2354,6 +2387,12 @@ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, + "node_modules/@types/long": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz", + "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==", + "license": "MIT" + }, "node_modules/@types/minimist": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", @@ -3019,6 +3058,18 @@ "proxy-from-env": "^1.1.0" } }, + "node_modules/axios-retry": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-4.5.0.tgz", + "integrity": "sha512-aR99oXhpEDGo0UuAlYcn2iGRds30k366Zfa05XWScR9QaQD4JYiP3/1Qt1u7YlefUOK+cn0CcwoL1oefavQUlQ==", + "license": "Apache-2.0", + "dependencies": { + "is-retry-allowed": "^2.2.0" + }, + "peerDependencies": { + "axios": "0.x || 1.x" + } + }, "node_modules/babel-jest": { "version": "29.7.0", "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", @@ -7474,6 +7525,36 @@ "oer-utils": "^1.3.2" } }, + "node_modules/ilp-packet-v1": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ilp-packet-v1/-/ilp-packet-v1-2.2.0.tgz", + "integrity": "sha512-bNsvjJ2/5Pl/qoVoSo4e/ZPoKv3xSm0VCO3fOPS+Yl5L4SZ6QRI972vclZKBwWDT19he2TgFZAmwe4RUzQ31jg==", + "license": "Apache-2.0", + "dependencies": { + "bignumber.js": "^5.0.0", + "extensible-error": "^1.0.2", + "long": "^3.2.0", + "oer-utils": "^1.3.2" + } + }, + "node_modules/ilp-packet-v1/node_modules/bignumber.js": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-5.0.0.tgz", + "integrity": "sha512-KWTu6ZMVk9sxlDJQh2YH1UOnfDP8O8TpxUxgQG/vKASoSnEjK9aVuOueFaPcQEYQ5fyNXNTOYwYw3099RYebWg==", + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/ilp-packet-v1/node_modules/long": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", + "integrity": "sha512-ZYvPPOMqUwPoDsbJaR10iQJYnMuZhRTvHYl62ErLIEX7RgFlziSBUUvrt3OVfc47QlHHpzPZYP17g3Fv7oeJkg==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.6" + } + }, "node_modules/ilp-packet/node_modules/bignumber.js": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-5.0.0.tgz", @@ -7981,6 +8062,18 @@ "node": ">=0.10.0" } }, + "node_modules/is-retry-allowed": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz", + "integrity": "sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-set": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", diff --git a/package.json b/package.json index 3e1edb55..874fdf46 100644 --- a/package.json +++ b/package.json @@ -110,16 +110,16 @@ "@hapi/hapi": "21.3.12", "@hapi/inert": "7.1.0", "@hapi/vision": "7.0.3", - "@mojaloop/central-services-error-handling": "13.0.2", + "@mojaloop/central-services-error-handling": "13.0.3", "@mojaloop/central-services-health": "15.0.0", "@mojaloop/central-services-logger": "11.5.1", - "@mojaloop/central-services-metrics": "12.4.2", - "@mojaloop/central-services-shared": "18.15.0", - "@mojaloop/central-services-stream": "11.4.1", + "@mojaloop/central-services-metrics": "12.4.3", + "@mojaloop/central-services-shared": "18.15.1", + "@mojaloop/central-services-stream": "11.4.2", "@mojaloop/event-sdk": "14.1.1", "@mojaloop/inter-scheme-proxy-cache-lib": "2.3.1", "@mojaloop/ml-number": "11.2.4", - "@mojaloop/ml-schema-transformer-lib": "^2.4.2", + "@mojaloop/ml-schema-transformer-lib": "^2.5.1", "@mojaloop/sdk-standard-components": "^19.6.2", "ajv": "8.17.1", "ajv-keywords": "5.1.0",