@mondart/nestjs-common-module-bottleneck 3.1.0 → 3.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/interceptors/bottleneck.interceptor.d.ts.map +1 -1
- package/dist/interceptors/bottleneck.interceptor.js +6 -5
- package/dist/interceptors/bottleneck.interceptor.js.map +1 -1
- package/dist/interfaces/bottleneck-options.interface.d.ts +4 -1
- package/dist/interfaces/bottleneck-options.interface.d.ts.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bottleneck.interceptor.d.ts","sourceRoot":"","sources":["../../src/interceptors/bottleneck.interceptor.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,gBAAgB,EAIhB,eAAe,EAEhB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAOzC,OAAO,EAEL,uBAAuB,EACxB,MAAM,4CAA4C,CAAC;AAEpD,qBACa,qBAAsB,YAAW,eAAe;IAKzD,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAN5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkD;gBAItD,OAAO,EAAE,uBAAuB,EAChC,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,SAAS;IAGvC,SAAS,CAAC,GAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW;
|
|
1
|
+
{"version":3,"file":"bottleneck.interceptor.d.ts","sourceRoot":"","sources":["../../src/interceptors/bottleneck.interceptor.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,gBAAgB,EAIhB,eAAe,EAEhB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAOzC,OAAO,EAEL,uBAAuB,EACxB,MAAM,4CAA4C,CAAC;AAEpD,qBACa,qBAAsB,YAAW,eAAe;IAKzD,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAN5B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkD;gBAItD,OAAO,EAAE,uBAAuB,EAChC,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,SAAS;IAGvC,SAAS,CAAC,GAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW;CA6FnD"}
|
|
@@ -35,7 +35,7 @@ let BottleneckInterceptor = BottleneckInterceptor_1 = class BottleneckIntercepto
|
|
|
35
35
|
const skip = this.reflector.getAllAndOverride(bottleneck_const_1.SKIP_CART_BOTTLENECK_KEY, [ctx.getHandler(), ctx.getClass()]);
|
|
36
36
|
const useBottleneck = this.reflector.getAllAndOverride(bottleneck_const_1.USE_CART_BOTTLENECK_KEY, [ctx.getHandler(), ctx.getClass()]);
|
|
37
37
|
const config = this.reflector.getAllAndOverride(bottleneck_const_1.CONFIG_CART_BOTTLENECK_KEY, [ctx.getHandler(), ctx.getClass()]);
|
|
38
|
-
const { basePath,
|
|
38
|
+
const { basePath, requestKey, useGlobal, maxConcurrent, minTime, ...rest } = {
|
|
39
39
|
...this.options,
|
|
40
40
|
...config,
|
|
41
41
|
};
|
|
@@ -45,11 +45,12 @@ let BottleneckInterceptor = BottleneckInterceptor_1 = class BottleneckIntercepto
|
|
|
45
45
|
return next.handle();
|
|
46
46
|
}
|
|
47
47
|
const req = ctx.switchToHttp().getRequest();
|
|
48
|
-
const
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
const resolvedRequestKey = requestKey?.(req);
|
|
49
|
+
const requestKeyValue = resolvedRequestKey?.value;
|
|
50
|
+
if (!requestKeyValue) {
|
|
51
|
+
throw new common_1.ServiceUnavailableException(`${resolvedRequestKey?.key} is required in request: ${url}`);
|
|
51
52
|
}
|
|
52
|
-
const key = `${basePath}/${
|
|
53
|
+
const key = `${basePath}/${resolvedRequestKey?.key}:${requestKeyValue}`;
|
|
53
54
|
const bottleneckOptions = {
|
|
54
55
|
maxQueueSize: 100,
|
|
55
56
|
maxConcurrent: maxConcurrent || 1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bottleneck.interceptor.js","sourceRoot":"","sources":["../../src/interceptors/bottleneck.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,2CAQwB;AACxB,+BAA2C;AAC3C,uEAAmE;AACnE,uCAAyC;AACzC,oEAIuC;AAEvC,6FAGoD;AAG7C,IAAM,qBAAqB,6BAA3B,MAAM,qBAAqB;IAGhC,YAEE,OAAiD,EAChC,iBAAoC,EACpC,SAAoB;QAFpB,YAAO,GAAP,OAAO,CAAyB;QAChC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,cAAS,GAAT,SAAS,CAAW;QANtB,WAAM,GAAW,IAAI,eAAM,CAAC,uBAAqB,CAAC,IAAI,CAAC,CAAC;IAOtE,CAAC;IAEJ,SAAS,CAAC,GAAqB,EAAE,IAAiB;QAChD,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;QAE3B,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAC3C,2CAAwB,EACxB,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CACnC,CAAC;QACF,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CACpD,0CAAuB,EACvB,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CACnC,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAC7C,6CAA0B,EAC1B,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CACnC,CAAC;QAEF,MAAM,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"bottleneck.interceptor.js","sourceRoot":"","sources":["../../src/interceptors/bottleneck.interceptor.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,10 @@ export declare const BOTTLENECK_MODULE_OPTIONS = "BOTTLENECK_MODULE_OPTIONS";
|
|
|
3
3
|
export interface BottleneckModuleOptions {
|
|
4
4
|
appName?: string;
|
|
5
5
|
basePath?: string;
|
|
6
|
-
|
|
6
|
+
requestKey?: (req: any) => {
|
|
7
|
+
key: string;
|
|
8
|
+
value: string;
|
|
9
|
+
} | null;
|
|
7
10
|
useGlobal?: boolean;
|
|
8
11
|
maxConcurrent?: number | null;
|
|
9
12
|
minTime?: number | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bottleneck-options.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/bottleneck-options.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEtD,eAAO,MAAM,yBAAyB,8BAA8B,CAAC;AAErE,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,
|
|
1
|
+
{"version":3,"file":"bottleneck-options.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/bottleneck-options.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEtD,eAAO,MAAM,yBAAyB,8BAA8B,CAAC;AAErE,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACjE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,uBAAuB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,yBAAyB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,YAAY,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE;QACN,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,OAAO,CAAC;KACf,CAAC;CACH;AAED,MAAM,WAAW,uBAAuB;IACtC,mBAAmB,EAAE,MACjB,OAAO,CAAC,uBAAuB,CAAC,GAChC,uBAAuB,CAAC;CAC7B;AAED,MAAM,WAAW,4BAA6B,SAAQ,IAAI,CACxD,cAAc,EACd,SAAS,CACV;IACC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAC;IACzC,WAAW,CAAC,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC5C,UAAU,CAAC,EAAE,CACX,GAAG,IAAI,EAAE,GAAG,EAAE,KACX,OAAO,CAAC,uBAAuB,CAAC,GAAG,uBAAuB,CAAC;CACjE"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mondart/nestjs-common-module-bottleneck",
|
|
3
|
-
"version": "3.1
|
|
3
|
+
"version": "3.2.1",
|
|
4
4
|
"description": "Bottleneck throttling and queue utilities for NestJS.",
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "Mondart"
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"build": "tsc -p tsconfig.json"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@mondart/nestjs-common-module-core": "^3.
|
|
20
|
+
"@mondart/nestjs-common-module-core": "^3.2.0",
|
|
21
21
|
"bottleneck": "^2.19.5",
|
|
22
22
|
"@nestjs/cqrs": "^11.0.1"
|
|
23
23
|
},
|
|
@@ -31,4 +31,4 @@
|
|
|
31
31
|
"publishConfig": {
|
|
32
32
|
"access": "public"
|
|
33
33
|
}
|
|
34
|
-
}
|
|
34
|
+
}
|