From 61abeacd6ef37d9b1fcfcf1c55a1f7697e912451 Mon Sep 17 00:00:00 2001 From: Florin Cozloschi <115977960+florincoz@users.noreply.github.com> Date: Mon, 18 Dec 2023 13:59:34 +0200 Subject: [PATCH 1/2] fix request --- packages/http/src/api/api.service.ts | 29 +++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/packages/http/src/api/api.service.ts b/packages/http/src/api/api.service.ts index 00537c4b..d2e67d51 100644 --- a/packages/http/src/api/api.service.ts +++ b/packages/http/src/api/api.service.ts @@ -5,6 +5,7 @@ import { PerformanceProfiler, MetricsService } from "@multiversx/sdk-nestjs-moni import { ApiSettings } from "./entities/api.settings"; import { ApiModuleOptions } from "./entities/api.module.options"; import { PendingExecuter } from "@multiversx/sdk-nestjs-common"; +import crypto from 'crypto'; @Injectable() export class ApiService { @@ -80,7 +81,9 @@ export class ApiService { const config = await this.getConfig(settings); try { - return await this.requestsExecuter.execute(url, async () => await axios.get(url, config)); + const params = this.getParamsAsString(settings.params); + const requestHash = this.generateHash(`${url}-${params}`); + return await this.requestsExecuter.execute(requestHash, async () => await axios.get(url, config)); } catch (error: any) { let handled = false; if (errorHandler) { @@ -270,4 +273,28 @@ export class ApiService { stack: error.stack, }; } + + private generateHash(key: string): string { + return crypto.createHash('sha256') + .update(key) + .digest('hex'); + } + + private getParamsAsString(params?: any): string { + if (!params) { + return ''; + } + if (typeof params === 'string') { + return params; + } + + if (typeof params === 'object') { + try { + return JSON.stringify(params); + } catch (e) { + return ''; + } + } + return ''; + } } From ed38bd2e26691f39336b4588833fd3598036ee81 Mon Sep 17 00:00:00 2001 From: Florin Cozloschi <115977960+florincoz@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:09:41 +0200 Subject: [PATCH 2/2] bump version --- lerna.json | 4 ++-- package-lock.json | 40 ++++++++++++++++---------------- packages/auth/package.json | 8 +++---- packages/cache/package.json | 8 +++---- packages/common/package.json | 4 ++-- packages/elastic/package.json | 4 ++-- packages/http/package.json | 6 ++--- packages/monitoring/package.json | 4 ++-- packages/rabbitmq/package.json | 4 ++-- packages/redis/package.json | 4 ++-- 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/lerna.json b/lerna.json index 130f4813..743043e0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,9 +1,9 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "3.0.0", + "version": "3.0.1-beta.3", "packages": [ "packages/*" ], "npmClient": "npm" -} \ No newline at end of file +} diff --git a/package-lock.json b/package-lock.json index e6cb52a5..2dd26d16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13796,7 +13796,7 @@ }, "packages/auth": { "name": "@multiversx/sdk-nestjs-auth", - "version": "3.0.0", + "version": "3.0.1-beta.3", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^12.15.0", @@ -13812,15 +13812,15 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-cache": "^3.0.0", - "@multiversx/sdk-nestjs-common": "^3.0.0", - "@multiversx/sdk-nestjs-monitoring": "^3.0.0", + "@multiversx/sdk-nestjs-cache": "^3.0.1-beta.3", + "@multiversx/sdk-nestjs-common": "^3.0.1-beta.3", + "@multiversx/sdk-nestjs-monitoring": "^3.0.1-beta.3", "@nestjs/common": "^10.x" } }, "packages/cache": { "name": "@multiversx/sdk-nestjs-cache", - "version": "3.0.0", + "version": "3.0.1-beta.3", "license": "GPL-3.0-or-later", "dependencies": { "lru-cache": "^8.0.4", @@ -13838,9 +13838,9 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^3.0.0", - "@multiversx/sdk-nestjs-monitoring": "^3.0.0", - "@multiversx/sdk-nestjs-redis": "^3.0.0", + "@multiversx/sdk-nestjs-common": "^3.0.1-beta.3", + "@multiversx/sdk-nestjs-monitoring": "^3.0.1-beta.3", + "@multiversx/sdk-nestjs-redis": "^3.0.1-beta.3", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" } @@ -13853,7 +13853,7 @@ }, "packages/common": { "name": "@multiversx/sdk-nestjs-common", - "version": "3.0.0", + "version": "3.0.1-beta.3", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-core": "^12.15.0", @@ -13871,7 +13871,7 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-monitoring": "^3.0.0", + "@multiversx/sdk-nestjs-monitoring": "^3.0.1-beta.3", "@nestjs/common": "^10.x", "@nestjs/config": "^3.x", "@nestjs/core": "^10.x", @@ -13886,7 +13886,7 @@ }, "packages/elastic": { "name": "@multiversx/sdk-nestjs-elastic", - "version": "3.0.0", + "version": "3.0.1-beta.3", "license": "GPL-3.0-or-later", "devDependencies": { "@typescript-eslint/eslint-plugin": "^5.12.0", @@ -13895,13 +13895,13 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-http": "^3.0.0", + "@multiversx/sdk-nestjs-http": "^3.0.1-beta.3", "@nestjs/common": "^10.x" } }, "packages/http": { "name": "@multiversx/sdk-nestjs-http", - "version": "3.0.0", + "version": "3.0.1-beta.3", "license": "GPL-3.0-or-later", "dependencies": { "@multiversx/sdk-native-auth-client": "^1.0.6", @@ -13917,8 +13917,8 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^3.0.0", - "@multiversx/sdk-nestjs-monitoring": "^3.0.0", + "@multiversx/sdk-nestjs-common": "^3.0.1-beta.3", + "@multiversx/sdk-nestjs-monitoring": "^3.0.1-beta.3", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" } @@ -13934,7 +13934,7 @@ }, "packages/monitoring": { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "3.0.0", + "version": "3.0.1-beta.3", "license": "GPL-3.0-or-later", "dependencies": { "prom-client": "^14.0.1", @@ -13953,7 +13953,7 @@ }, "packages/rabbitmq": { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "3.0.0", + "version": "3.0.1-beta.3", "license": "GPL-3.0-or-later", "dependencies": { "@golevelup/nestjs-rabbitmq": "4.0.0", @@ -13968,13 +13968,13 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^3.0.0", + "@multiversx/sdk-nestjs-common": "^3.0.1-beta.3", "@nestjs/common": "^10.x" } }, "packages/redis": { "name": "@multiversx/sdk-nestjs-redis", - "version": "3.0.0", + "version": "3.0.1-beta.3", "license": "GPL-3.0-or-later", "dependencies": { "ioredis": "^5.2.3" @@ -13991,4 +13991,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/auth/package.json b/packages/auth/package.json index bacbf385..67bfe67f 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-auth", - "version": "3.0.0", + "version": "3.0.1-beta.3", "description": "Multiversx SDK Nestjs auth package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -38,9 +38,9 @@ "jsonwebtoken": "^9.0.0" }, "peerDependencies": { - "@multiversx/sdk-nestjs-cache": "^3.0.0", - "@multiversx/sdk-nestjs-common": "^3.0.0", - "@multiversx/sdk-nestjs-monitoring": "^3.0.0", + "@multiversx/sdk-nestjs-cache": "^3.0.1-beta.3", + "@multiversx/sdk-nestjs-common": "^3.0.1-beta.3", + "@multiversx/sdk-nestjs-monitoring": "^3.0.1-beta.3", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/cache/package.json b/packages/cache/package.json index 7e820b67..a1e49d3e 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-cache", - "version": "3.0.0", + "version": "3.0.1-beta.3", "description": "Multiversx SDK Nestjs cache package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -40,9 +40,9 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^3.0.0", - "@multiversx/sdk-nestjs-monitoring": "^3.0.0", - "@multiversx/sdk-nestjs-redis": "^3.0.0", + "@multiversx/sdk-nestjs-common": "^3.0.1-beta.3", + "@multiversx/sdk-nestjs-monitoring": "^3.0.1-beta.3", + "@multiversx/sdk-nestjs-redis": "^3.0.1-beta.3", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" }, diff --git a/packages/common/package.json b/packages/common/package.json index 7404e5db..ce47c9cd 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-common", - "version": "3.0.0", + "version": "3.0.1-beta.3", "description": "Multiversx SDK Nestjs common package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -40,7 +40,7 @@ "winston": "^3.7.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-monitoring": "^3.0.0", + "@multiversx/sdk-nestjs-monitoring": "^3.0.1-beta.3", "@nestjs/common": "^10.x", "@nestjs/config": "^3.x", "@nestjs/core": "^10.x", diff --git a/packages/elastic/package.json b/packages/elastic/package.json index 3d9334e2..bd151fa6 100644 --- a/packages/elastic/package.json +++ b/packages/elastic/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-elastic", - "version": "3.0.0", + "version": "3.0.1-beta.3", "description": "Multiversx SDK Nestjs elastic package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -31,7 +31,7 @@ "typescript": "^4.3.5" }, "peerDependencies": { - "@multiversx/sdk-nestjs-http": "^3.0.0", + "@multiversx/sdk-nestjs-http": "^3.0.1-beta.3", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/http/package.json b/packages/http/package.json index a60bebd0..978ef685 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-http", - "version": "3.0.0", + "version": "3.0.1-beta.3", "description": "Multiversx SDK Nestjs http package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -38,8 +38,8 @@ "axios": "^0.27.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^3.0.0", - "@multiversx/sdk-nestjs-monitoring": "^3.0.0", + "@multiversx/sdk-nestjs-common": "^3.0.1-beta.3", + "@multiversx/sdk-nestjs-monitoring": "^3.0.1-beta.3", "@nestjs/common": "^10.x", "@nestjs/core": "^10.x" }, diff --git a/packages/monitoring/package.json b/packages/monitoring/package.json index 31557f04..07037c17 100644 --- a/packages/monitoring/package.json +++ b/packages/monitoring/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-monitoring", - "version": "3.0.0", + "version": "3.0.1-beta.3", "description": "Multiversx SDK Nestjs monitoring package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -41,4 +41,4 @@ "publishConfig": { "access": "public" } -} \ No newline at end of file +} diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index ed710da6..1570afe7 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-rabbitmq", - "version": "3.0.0", + "version": "3.0.1-beta.3", "description": "Multiversx SDK Nestjs rabbitmq client package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -37,7 +37,7 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "@multiversx/sdk-nestjs-common": "^3.0.0", + "@multiversx/sdk-nestjs-common": "^3.0.1-beta.3", "@nestjs/common": "^10.x" }, "publishConfig": { diff --git a/packages/redis/package.json b/packages/redis/package.json index 93bab5e8..249c03a2 100644 --- a/packages/redis/package.json +++ b/packages/redis/package.json @@ -1,6 +1,6 @@ { "name": "@multiversx/sdk-nestjs-redis", - "version": "3.0.0", + "version": "3.0.1-beta.3", "description": "Multiversx SDK Nestjs redis client package", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -40,4 +40,4 @@ "publishConfig": { "access": "public" } -} \ No newline at end of file +}