Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix get request params #199

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix get request params #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61abeac
fix request
florincoz Dec 18, 2023
ed38bd2
bump version
florincoz Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
40 changes: 20 additions & 20 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/auth/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
8 changes: 4 additions & 4 deletions packages/cache/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/elastic/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions packages/http/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
},
Expand Down
29 changes: 28 additions & 1 deletion packages/http/src/api/api.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -270,4 +273,28 @@ export class ApiService {
stack: error.stack,
};
}

private generateHash(key: string): string {
return crypto.createHash('sha256')
tanghel marked this conversation as resolved.
Show resolved Hide resolved
.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 '';
}
}
4 changes: 2 additions & 2 deletions packages/monitoring/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -41,4 +41,4 @@
"publishConfig": {
"access": "public"
}
}
}
4 changes: 2 additions & 2 deletions packages/rabbitmq/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions packages/redis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -40,4 +40,4 @@
"publishConfig": {
"access": "public"
}
}
}
Loading