@loopstack/quota 0.21.0 → 0.22.0

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.
@@ -7,6 +7,7 @@ describe('AiGenerateTextQuotaCalculator', () => {
7
7
  tool: {},
8
8
  args: undefined,
9
9
  runContext: { userId: 'user-1' },
10
+ metadata: {},
10
11
  };
11
12
  beforeEach(() => {
12
13
  calculator = new ai_generate_text_quota_calculator_1.AiGenerateTextQuotaCalculator();
@@ -14,14 +15,31 @@ describe('AiGenerateTextQuotaCalculator', () => {
14
15
  it('should have quotaType "default-token"', () => {
15
16
  expect(calculator.quotaType).toBe('default-token');
16
17
  });
17
- it('should calculate total tokens from usage metadata', () => {
18
+ it('should calculate total tokens with output weighted at 5x', () => {
18
19
  const result = {
19
20
  data: {},
20
21
  metadata: { usage: { inputTokens: 100, outputTokens: 50 } },
21
22
  };
22
23
  expect(calculator.calculateQuotaUsage(context, result)).toEqual({
23
24
  quotaType: 'default-token',
24
- actualAmount: 150,
25
+ actualAmount: 350,
26
+ });
27
+ });
28
+ it('should include cache tokens weighted by relative cost', () => {
29
+ const result = {
30
+ data: {},
31
+ metadata: {
32
+ usage: {
33
+ inputTokens: 100,
34
+ outputTokens: 50,
35
+ cacheCreationInputTokens: 200,
36
+ cacheReadInputTokens: 1000,
37
+ },
38
+ },
39
+ };
40
+ expect(calculator.calculateQuotaUsage(context, result)).toEqual({
41
+ quotaType: 'default-token',
42
+ actualAmount: 700,
25
43
  });
26
44
  });
27
45
  it('should return null when metadata is missing', () => {
@@ -46,7 +64,7 @@ describe('AiGenerateTextQuotaCalculator', () => {
46
64
  };
47
65
  expect(calculator.calculateQuotaUsage(context, result)).toEqual({
48
66
  quotaType: 'default-token',
49
- actualAmount: 200,
67
+ actualAmount: 1000,
50
68
  });
51
69
  });
52
70
  it('should handle missing outputTokens', () => {
@@ -1 +1 @@
1
- {"version":3,"file":"ai-generate-text-quota.calculator.spec.js","sourceRoot":"","sources":["../../../src/calculators/__tests__/ai-generate-text-quota.calculator.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ai-generate-text-quota.calculator.spec.js","sourceRoot":"","sources":["../../../src/calculators/__tests__/ai-generate-text-quota.calculator.spec.ts"],"names":[],"mappings":"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"}
@@ -10,32 +10,24 @@ describe('ProcessingTimeQuotaCalculator', () => {
10
10
  it('should have quotaType "processing-time-ms"', () => {
11
11
  expect(calculator.quotaType).toBe('processing-time-ms');
12
12
  });
13
- it('should return duration from context metrics', () => {
13
+ it('should return duration from context metadata', () => {
14
14
  const context = {
15
15
  tool: {},
16
16
  args: undefined,
17
17
  runContext: { userId: 'user-1' },
18
- metrics: { durationMs: 1500 },
18
+ metadata: { durationMs: 1500 },
19
19
  };
20
20
  expect(calculator.calculateQuotaUsage(context, result)).toEqual({
21
21
  quotaType: 'processing-time-ms',
22
22
  actualAmount: 1500,
23
23
  });
24
24
  });
25
- it('should return null when metrics is undefined', () => {
25
+ it('should return null when metadata has no durationMs', () => {
26
26
  const context = {
27
27
  tool: {},
28
28
  args: undefined,
29
29
  runContext: { userId: 'user-1' },
30
- };
31
- expect(calculator.calculateQuotaUsage(context, result)).toBeNull();
32
- });
33
- it('should return null when durationMs is undefined', () => {
34
- const context = {
35
- tool: {},
36
- args: undefined,
37
- runContext: { userId: 'user-1' },
38
- metrics: {},
30
+ metadata: {},
39
31
  };
40
32
  expect(calculator.calculateQuotaUsage(context, result)).toBeNull();
41
33
  });
@@ -44,7 +36,7 @@ describe('ProcessingTimeQuotaCalculator', () => {
44
36
  tool: {},
45
37
  args: undefined,
46
38
  runContext: { userId: 'user-1' },
47
- metrics: { durationMs: 0 },
39
+ metadata: { durationMs: 0 },
48
40
  };
49
41
  expect(calculator.calculateQuotaUsage(context, result)).toBeNull();
50
42
  });
@@ -1 +1 @@
1
- {"version":3,"file":"processing-time-quota.calculator.spec.js","sourceRoot":"","sources":["../../../src/calculators/__tests__/processing-time-quota.calculator.spec.ts"],"names":[],"mappings":";;AACA,0FAAoF;AAEpF,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC7C,IAAI,UAAyC,CAAC;IAC9C,MAAM,MAAM,GAAe,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;IAExC,UAAU,CAAC,GAAG,EAAE;QACd,UAAU,GAAG,IAAI,gEAA6B,EAAE,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,OAAO,GAAyB;YACpC,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAgB;YAC9C,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;SAC9B,CAAC;QAEF,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YAC9D,SAAS,EAAE,oBAAoB;YAC/B,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,OAAO,GAAyB;YACpC,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAgB;SAC/C,CAAC;QAEF,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,OAAO,GAAyB;YACpC,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAgB;YAC9C,OAAO,EAAE,EAAE;SACZ,CAAC;QAEF,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,OAAO,GAAyB;YACpC,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAgB;YAC9C,OAAO,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE;SAC3B,CAAC;QAEF,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"processing-time-quota.calculator.spec.js","sourceRoot":"","sources":["../../../src/calculators/__tests__/processing-time-quota.calculator.spec.ts"],"names":[],"mappings":";;AACA,0FAAoF;AAEpF,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC7C,IAAI,UAAyC,CAAC;IAC9C,MAAM,MAAM,GAAe,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;IAExC,UAAU,CAAC,GAAG,EAAE;QACd,UAAU,GAAG,IAAI,gEAA6B,EAAE,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,OAAO,GAAyB;YACpC,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAgB;YAC9C,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;SAC/B,CAAC;QAEF,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YAC9D,SAAS,EAAE,oBAAoB;YAC/B,YAAY,EAAE,IAAI;SACnB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,OAAO,GAAyB;YACpC,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAgB;YAC9C,QAAQ,EAAE,EAAE;SACb,CAAC;QAEF,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,OAAO,GAAyB;YACpC,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAgB;YAC9C,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE;SAC5B,CAAC;QAEF,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"ai-generate-text-quota.calculator.d.ts","sourceRoot":"","sources":["../../src/calculators/ai-generate-text-quota.calculator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAEpF,qBAAa,6BAA8B,YAAW,mBAAmB;IACvE,SAAS,SAAmB;IAE5B,mBAAmB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI;CAS3F"}
1
+ {"version":3,"file":"ai-generate-text-quota.calculator.d.ts","sourceRoot":"","sources":["../../src/calculators/ai-generate-text-quota.calculator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AASpF,qBAAa,6BAA8B,YAAW,mBAAmB;IACvE,SAAS,SAAmB;IAE5B,mBAAmB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI;CAoB3F"}
@@ -1,13 +1,22 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.AiGenerateTextQuotaCalculator = void 0;
4
+ const TOKEN_COST_WEIGHTS = {
5
+ INPUT: 1,
6
+ OUTPUT: 5,
7
+ CACHE_CREATION: 1.25,
8
+ CACHE_READ: 0.1,
9
+ };
4
10
  class AiGenerateTextQuotaCalculator {
5
11
  quotaType = 'default-token';
6
12
  calculateQuotaUsage(_context, result) {
7
13
  const usage = result.metadata?.usage;
8
14
  if (!usage)
9
15
  return null;
10
- const totalTokens = (usage.inputTokens ?? 0) + (usage.outputTokens ?? 0);
16
+ const totalTokens = (usage.inputTokens ?? 0) * TOKEN_COST_WEIGHTS.INPUT +
17
+ (usage.outputTokens ?? 0) * TOKEN_COST_WEIGHTS.OUTPUT +
18
+ (usage.cacheCreationInputTokens ?? 0) * TOKEN_COST_WEIGHTS.CACHE_CREATION +
19
+ (usage.cacheReadInputTokens ?? 0) * TOKEN_COST_WEIGHTS.CACHE_READ;
11
20
  if (totalTokens === 0)
12
21
  return null;
13
22
  return { quotaType: this.quotaType, actualAmount: totalTokens };
@@ -1 +1 @@
1
- {"version":3,"file":"ai-generate-text-quota.calculator.js","sourceRoot":"","sources":["../../src/calculators/ai-generate-text-quota.calculator.ts"],"names":[],"mappings":";;;AAIA,MAAa,6BAA6B;IACxC,SAAS,GAAG,eAAe,CAAC;IAE5B,mBAAmB,CAAC,QAA8B,EAAE,MAAkB;QACpE,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,KAAoE,CAAC;QACpG,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,WAAW,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC;QACzE,IAAI,WAAW,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAEnC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;IAClE,CAAC;CACF;AAZD,sEAYC"}
1
+ {"version":3,"file":"ai-generate-text-quota.calculator.js","sourceRoot":"","sources":["../../src/calculators/ai-generate-text-quota.calculator.ts"],"names":[],"mappings":";;;AAIA,MAAM,kBAAkB,GAAG;IACzB,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,cAAc,EAAE,IAAI;IACpB,UAAU,EAAE,GAAG;CAChB,CAAC;AAEF,MAAa,6BAA6B;IACxC,SAAS,GAAG,eAAe,CAAC;IAE5B,mBAAmB,CAAC,QAA8B,EAAE,MAAkB;QACpE,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,KAOlB,CAAC;QACd,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,WAAW,GACf,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,kBAAkB,CAAC,KAAK;YACnD,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,kBAAkB,CAAC,MAAM;YACrD,CAAC,KAAK,CAAC,wBAAwB,IAAI,CAAC,CAAC,GAAG,kBAAkB,CAAC,cAAc;YACzE,CAAC,KAAK,CAAC,oBAAoB,IAAI,CAAC,CAAC,GAAG,kBAAkB,CAAC,UAAU,CAAC;QACpE,IAAI,WAAW,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAEnC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;IAClE,CAAC;CACF;AAvBD,sEAuBC"}
@@ -4,7 +4,7 @@ exports.ProcessingTimeQuotaCalculator = void 0;
4
4
  class ProcessingTimeQuotaCalculator {
5
5
  quotaType = 'processing-time-ms';
6
6
  calculateQuotaUsage(context, _result) {
7
- const durationMs = context.metrics?.durationMs;
7
+ const durationMs = context.metadata?.durationMs;
8
8
  if (typeof durationMs !== 'number' || durationMs === 0)
9
9
  return null;
10
10
  return { quotaType: this.quotaType, actualAmount: durationMs };
@@ -1 +1 @@
1
- {"version":3,"file":"processing-time-quota.calculator.js","sourceRoot":"","sources":["../../src/calculators/processing-time-quota.calculator.ts"],"names":[],"mappings":";;;AAIA,MAAa,6BAA6B;IACxC,SAAS,GAAG,oBAAoB,CAAC;IAEjC,mBAAmB,CAAC,OAA6B,EAAE,OAAmB;QACpE,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC;QAC/C,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACpE,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;IACjE,CAAC;CACF;AARD,sEAQC"}
1
+ {"version":3,"file":"processing-time-quota.calculator.js","sourceRoot":"","sources":["../../src/calculators/processing-time-quota.calculator.ts"],"names":[],"mappings":";;;AAIA,MAAa,6BAA6B;IACxC,SAAS,GAAG,oBAAoB,CAAC;IAEjC,mBAAmB,CAAC,OAA6B,EAAE,OAAmB;QACpE,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC;QAChD,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACpE,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;IACjE,CAAC;CACF;AARD,sEAQC"}
@@ -1 +1 @@
1
- {"version":3,"file":"quota.module.d.ts","sourceRoot":"","sources":["../src/quota.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAU,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAKrE,OAAO,EAAe,uBAAuB,EAAwC,MAAM,YAAY,CAAC;AAExG,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qBACa,WAAY,YAAW,YAAY;IAClC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBAAlB,kBAAkB,EAAE,uBAAuB;IAExE,YAAY;IAOZ,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,aAAa;IA2C3D,MAAM,CAAC,YAAY,IAAI,aAAa;CAQrC"}
1
+ {"version":3,"file":"quota.module.d.ts","sourceRoot":"","sources":["../src/quota.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAU,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAIrE,OAAO,EAAe,uBAAuB,EAAwC,MAAM,YAAY,CAAC;AAExG,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qBACa,WAAY,YAAW,YAAY;IAClC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBAAlB,kBAAkB,EAAE,uBAAuB;IAExE,YAAY;IAUZ,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,aAAa;IAuC3D,MAAM,CAAC,YAAY,IAAI,aAAa;CAQrC"}
@@ -16,7 +16,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
16
16
  exports.QuotaModule = void 0;
17
17
  const common_1 = require("@nestjs/common");
18
18
  const ioredis_1 = __importDefault(require("ioredis"));
19
- const common_2 = require("@loopstack/common");
20
19
  const calculators_1 = require("./calculators");
21
20
  const interfaces_1 = require("./interfaces");
22
21
  const services_1 = require("./services");
@@ -30,6 +29,9 @@ let QuotaModule = QuotaModule_1 = class QuotaModule {
30
29
  this.calculatorRegistry.register('AiGenerateText', aiTokenCalculator);
31
30
  this.calculatorRegistry.register('AiGenerateObject', aiTokenCalculator);
32
31
  this.calculatorRegistry.register('AiGenerateDocument', aiTokenCalculator);
32
+ this.calculatorRegistry.register('ClaudeGenerateText', aiTokenCalculator);
33
+ this.calculatorRegistry.register('ClaudeGenerateObject', aiTokenCalculator);
34
+ this.calculatorRegistry.register('ClaudeGenerateDocument', aiTokenCalculator);
33
35
  }
34
36
  static forRoot(options) {
35
37
  const enabled = options?.enabled ?? false;
@@ -63,12 +65,8 @@ let QuotaModule = QuotaModule_1 = class QuotaModule {
63
65
  },
64
66
  services_1.QuotaCalculatorRegistry,
65
67
  services_1.QuotaInterceptor,
66
- {
67
- provide: common_2.TOOL_EXECUTION_INTERCEPTORS,
68
- useExisting: services_1.QuotaInterceptor,
69
- },
70
68
  ],
71
- exports: [interfaces_1.QUOTA_CLIENT_SERVICE, services_1.QuotaClientService, services_1.QuotaCalculatorRegistry, common_2.TOOL_EXECUTION_INTERCEPTORS],
69
+ exports: [interfaces_1.QUOTA_CLIENT_SERVICE, services_1.QuotaClientService, services_1.QuotaCalculatorRegistry],
72
70
  };
73
71
  }
74
72
  static forRootAsync() {
@@ -1 +1 @@
1
- {"version":3,"file":"quota.module.js","sourceRoot":"","sources":["../src/quota.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAqE;AACrE,sDAA4B;AAC5B,8CAAgE;AAChE,+CAA8D;AAC9D,6CAAoD;AACpD,yCAAwG;AAUjG,IAAM,WAAW,mBAAjB,MAAM,WAAW;IACO;IAA7B,YAA6B,kBAA2C;QAA3C,uBAAkB,GAAlB,kBAAkB,CAAyB;IAAG,CAAC;IAE5E,YAAY;QACV,MAAM,iBAAiB,GAAG,IAAI,2CAA6B,EAAE,CAAC;QAC9D,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;QACtE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;QACxE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,OAA4B;QACzC,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,IAAI,KAAK,CAAC;QAE1C,MAAM,aAAa,GAAG;YACpB,OAAO,EAAE,sBAAW;YACpB,UAAU,EAAE,GAAiB,EAAE;gBAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,IAAI,iBAAK,CAAC;oBACf,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,WAAW;oBACvC,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI;oBAChC,QAAQ,EAAE,OAAO,EAAE,aAAa;oBAChC,MAAM,EAAE,CAAC;oBACT,oBAAoB,EAAE,CAAC;oBACvB,aAAa,CAAC,KAAa;wBACzB,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;oBACrC,CAAC;iBACF,CAAC,CAAC;YACL,CAAC;SACF,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE;gBACT,aAAa;gBACb,6BAAkB;gBAClB;oBACE,OAAO,EAAE,iCAAoB;oBAC7B,WAAW,EAAE,6BAAkB;iBAChC;gBACD,kCAAuB;gBACvB,2BAAgB;gBAChB;oBACE,OAAO,EAAE,oCAA2B;oBACpC,WAAW,EAAE,2BAAgB;iBAC9B;aACF;YACD,OAAO,EAAE,CAAC,iCAAoB,EAAE,6BAAkB,EAAE,kCAAuB,EAAE,oCAA2B,CAAC;SAC1G,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY;QACjB,OAAO,aAAW,CAAC,OAAO,CAAC;YACzB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM;YAC7C,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU;YACjE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,MAAM,EAAE,EAAE,CAAC;YACzF,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc;SAC9E,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA7DY,kCAAW;sBAAX,WAAW;IADvB,IAAA,eAAM,EAAC,EAAE,CAAC;qCAEwC,kCAAuB;GAD7D,WAAW,CA6DvB"}
1
+ {"version":3,"file":"quota.module.js","sourceRoot":"","sources":["../src/quota.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAqE;AACrE,sDAA4B;AAC5B,+CAA8D;AAC9D,6CAAoD;AACpD,yCAAwG;AAUjG,IAAM,WAAW,mBAAjB,MAAM,WAAW;IACO;IAA7B,YAA6B,kBAA2C;QAA3C,uBAAkB,GAAlB,kBAAkB,CAAyB;IAAG,CAAC;IAE5E,YAAY;QACV,MAAM,iBAAiB,GAAG,IAAI,2CAA6B,EAAE,CAAC;QAC9D,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;QACtE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;QACxE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;QAC1E,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;QAC1E,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CAAC;QAC5E,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,wBAAwB,EAAE,iBAAiB,CAAC,CAAC;IAChF,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,OAA4B;QACzC,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,IAAI,KAAK,CAAC;QAE1C,MAAM,aAAa,GAAG;YACpB,OAAO,EAAE,sBAAW;YACpB,UAAU,EAAE,GAAiB,EAAE;gBAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,IAAI,iBAAK,CAAC;oBACf,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,WAAW;oBACvC,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI;oBAChC,QAAQ,EAAE,OAAO,EAAE,aAAa;oBAChC,MAAM,EAAE,CAAC;oBACT,oBAAoB,EAAE,CAAC;oBACvB,aAAa,CAAC,KAAa;wBACzB,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;oBACrC,CAAC;iBACF,CAAC,CAAC;YACL,CAAC;SACF,CAAC;QAEF,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE;gBACT,aAAa;gBACb,6BAAkB;gBAClB;oBACE,OAAO,EAAE,iCAAoB;oBAC7B,WAAW,EAAE,6BAAkB;iBAChC;gBACD,kCAAuB;gBACvB,2BAAgB;aACjB;YACD,OAAO,EAAE,CAAC,iCAAoB,EAAE,6BAAkB,EAAE,kCAAuB,CAAC;SAC7E,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY;QACjB,OAAO,aAAW,CAAC,OAAO,CAAC;YACzB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,MAAM;YAC7C,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU;YACjE,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,MAAM,EAAE,EAAE,CAAC;YACzF,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc;SAC9E,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA5DY,kCAAW;sBAAX,WAAW;IADvB,IAAA,eAAM,EAAC,EAAE,CAAC;qCAEwC,kCAAuB;GAD7D,WAAW,CA4DvB"}
@@ -14,6 +14,7 @@ function createContext(toolName, overrides) {
14
14
  tool: new FakeTool(toolName),
15
15
  args: undefined,
16
16
  runContext: { userId: 'user-1' },
17
+ metadata: {},
17
18
  ...overrides,
18
19
  };
19
20
  }
@@ -21,6 +22,7 @@ describe('QuotaInterceptor', () => {
21
22
  let interceptor;
22
23
  let quotaClientService;
23
24
  let registry;
25
+ const noopNext = jest.fn().mockResolvedValue({ data: {} });
24
26
  beforeEach(() => {
25
27
  quotaClientService = {
26
28
  checkQuota: jest.fn().mockResolvedValue({ exceeded: false, used: 0, limit: -1 }),
@@ -28,18 +30,20 @@ describe('QuotaInterceptor', () => {
28
30
  };
29
31
  registry = new quota_calculator_registry_service_1.QuotaCalculatorRegistry();
30
32
  interceptor = new quota_interceptor_1.QuotaInterceptor(quotaClientService, registry);
33
+ noopNext.mockClear();
31
34
  });
32
- describe('beforeExecute', () => {
35
+ describe('before execution (quota checks)', () => {
33
36
  it('should check processing time quota even when no calculator is registered', async () => {
34
37
  const context = createContext('UnknownTool');
35
- await interceptor.beforeExecute(context);
38
+ await interceptor.intercept(context, noopNext);
36
39
  expect(quotaClientService.checkQuota).toHaveBeenCalledWith('user-1', 'processing-time-ms');
37
40
  expect(quotaClientService.checkQuota).toHaveBeenCalledTimes(1);
38
41
  });
39
42
  it('should throw when processing time quota is exceeded for any tool', async () => {
40
43
  quotaClientService.checkQuota.mockResolvedValue({ exceeded: true, used: 60000, limit: 60000 });
41
44
  const context = createContext('UnknownTool');
42
- await expect(interceptor.beforeExecute(context)).rejects.toThrow('Quota exceeded for "processing-time-ms": 60000/60000');
45
+ await expect(interceptor.intercept(context, noopNext)).rejects.toThrow('Quota exceeded for "processing-time-ms": 60000/60000');
46
+ expect(noopNext).not.toHaveBeenCalled();
43
47
  });
44
48
  it('should check both processing time and tool-specific quota', async () => {
45
49
  registry.register('AiGenerateText', {
@@ -47,7 +51,7 @@ describe('QuotaInterceptor', () => {
47
51
  calculateQuotaUsage: jest.fn(),
48
52
  });
49
53
  const context = createContext('AiGenerateText');
50
- await interceptor.beforeExecute(context);
54
+ await interceptor.intercept(context, noopNext);
51
55
  expect(quotaClientService.checkQuota).toHaveBeenCalledWith('user-1', 'processing-time-ms');
52
56
  expect(quotaClientService.checkQuota).toHaveBeenCalledWith('user-1', 'default-token');
53
57
  expect(quotaClientService.checkQuota).toHaveBeenCalledTimes(2);
@@ -61,7 +65,8 @@ describe('QuotaInterceptor', () => {
61
65
  .mockResolvedValueOnce({ exceeded: false, used: 0, limit: -1 })
62
66
  .mockResolvedValueOnce({ exceeded: true, used: 1000, limit: 1000 });
63
67
  const context = createContext('AiGenerateText');
64
- await expect(interceptor.beforeExecute(context)).rejects.toThrow('Quota exceeded for "default-token": 1000/1000');
68
+ await expect(interceptor.intercept(context, noopNext)).rejects.toThrow('Quota exceeded for "default-token": 1000/1000');
69
+ expect(noopNext).not.toHaveBeenCalled();
65
70
  });
66
71
  it('should not throw when all quotas are within limits', async () => {
67
72
  registry.register('AiGenerateText', {
@@ -70,19 +75,18 @@ describe('QuotaInterceptor', () => {
70
75
  });
71
76
  quotaClientService.checkQuota.mockResolvedValue({ exceeded: false, used: 500, limit: 1000 });
72
77
  const context = createContext('AiGenerateText');
73
- await expect(interceptor.beforeExecute(context)).resolves.toBeUndefined();
78
+ await expect(interceptor.intercept(context, noopNext)).resolves.toBeDefined();
74
79
  });
75
80
  });
76
- describe('afterExecute', () => {
77
- const result = { data: {} };
81
+ describe('after execution (usage reporting)', () => {
78
82
  it('should report processing time for every tool', async () => {
79
- const context = createContext('UnknownTool', { metrics: { durationMs: 250 } });
80
- await interceptor.afterExecute(context, result);
83
+ const context = createContext('UnknownTool', { metadata: { durationMs: 250 } });
84
+ await interceptor.intercept(context, noopNext);
81
85
  expect(quotaClientService.report).toHaveBeenCalledWith('user-1', 'processing-time-ms', 250);
82
86
  });
83
- it('should not report processing time when metrics are missing', async () => {
87
+ it('should not report processing time when metadata has no durationMs', async () => {
84
88
  const context = createContext('UnknownTool');
85
- await interceptor.afterExecute(context, result);
89
+ await interceptor.intercept(context, noopNext);
86
90
  expect(quotaClientService.report).not.toHaveBeenCalled();
87
91
  });
88
92
  it('should report tool-specific usage when calculator returns usage', async () => {
@@ -90,8 +94,8 @@ describe('QuotaInterceptor', () => {
90
94
  quotaType: 'default-token',
91
95
  calculateQuotaUsage: jest.fn().mockReturnValue({ quotaType: 'default-token', actualAmount: 500 }),
92
96
  });
93
- const context = createContext('AiGenerateText', { metrics: { durationMs: 1000 } });
94
- await interceptor.afterExecute(context, result);
97
+ const context = createContext('AiGenerateText', { metadata: { durationMs: 1000 } });
98
+ await interceptor.intercept(context, noopNext);
95
99
  expect(quotaClientService.report).toHaveBeenCalledWith('user-1', 'processing-time-ms', 1000);
96
100
  expect(quotaClientService.report).toHaveBeenCalledWith('user-1', 'default-token', 500);
97
101
  expect(quotaClientService.report).toHaveBeenCalledTimes(2);
@@ -101,17 +105,11 @@ describe('QuotaInterceptor', () => {
101
105
  quotaType: 'default-token',
102
106
  calculateQuotaUsage: jest.fn().mockReturnValue(null),
103
107
  });
104
- const context = createContext('AiGenerateText', { metrics: { durationMs: 100 } });
105
- await interceptor.afterExecute(context, result);
108
+ const context = createContext('AiGenerateText', { metadata: { durationMs: 100 } });
109
+ await interceptor.intercept(context, noopNext);
106
110
  expect(quotaClientService.report).toHaveBeenCalledTimes(1);
107
111
  expect(quotaClientService.report).toHaveBeenCalledWith('user-1', 'processing-time-ms', 100);
108
112
  });
109
113
  });
110
- describe('onError', () => {
111
- it('should not throw', async () => {
112
- const context = createContext('AiGenerateText');
113
- await expect(interceptor.onError(context, new Error('fail'))).resolves.toBeUndefined();
114
- });
115
- });
116
114
  });
117
115
  //# sourceMappingURL=quota.interceptor.spec.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"quota.interceptor.spec.js","sourceRoot":"","sources":["../../../src/services/__tests__/quota.interceptor.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"quota.interceptor.spec.js","sourceRoot":"","sources":["../../../src/services/__tests__/quota.interceptor.spec.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"quota-client.service.d.ts","sourceRoot":"","sources":["../../src/services/quota-client.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;AAE9E,eAAO,MAAM,WAAW,gBAAgB,CAAC;AAEzC,qBACa,kBAAmB,YAAW,2BAA2B;IAMlE,OAAO,CAAC,QAAQ,CAAC,KAAK;IALxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;gBAK3C,KAAK,EAAE,KAAK,GAAG,IAAI;IAGhC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAsCxE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB9E,OAAO,CAAC,GAAG;CAGZ"}
1
+ {"version":3,"file":"quota-client.service.d.ts","sourceRoot":"","sources":["../../src/services/quota-client.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,eAAe,CAAC;AAE9E,eAAO,MAAM,WAAW,gBAAgB,CAAC;AAEzC,qBACa,kBAAmB,YAAW,2BAA2B;IAMlE,OAAO,CAAC,QAAQ,CAAC,KAAK;IALxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;gBAK3C,KAAK,EAAE,KAAK,GAAG,IAAI;IAGhC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2CxE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB9E,OAAO,CAAC,GAAG;CAGZ"}
@@ -30,8 +30,10 @@ let QuotaClientService = QuotaClientService_1 = class QuotaClientService {
30
30
  const limitKey = this.key(userId, quotaType, 'limit');
31
31
  try {
32
32
  const [usedStr, limitStr] = await Promise.all([this.redis.get(usedKey), this.redis.get(limitKey)]);
33
+ this.logger.debug(`Quota check for user=${userId} type=${quotaType}: usedKey=${usedKey} usedStr=${usedStr}, limitKey=${limitKey} limitStr=${limitStr}, redisHost=${this.redis.options?.host}:${this.redis.options?.port}`);
33
34
  const used = usedStr ? parseInt(usedStr, 10) : 0;
34
35
  if (limitStr == null) {
36
+ this.logger.warn(`No limit key found in Redis for user=${userId} type=${quotaType} — blocking by default`);
35
37
  return { exceeded: true, used, limit: 0 };
36
38
  }
37
39
  const limit = parseInt(limitStr, 10);
@@ -1 +1 @@
1
- {"version":3,"file":"quota-client.service.js","sourceRoot":"","sources":["../../src/services/quota-client.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"quota-client.service.js","sourceRoot":"","sources":["../../src/services/quota-client.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAsE;AAIzD,QAAA,WAAW,GAAG,aAAa,CAAC;AAGlC,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAMV;IALF,MAAM,GAAG,IAAI,eAAM,CAAC,oBAAkB,CAAC,IAAI,CAAC,CAAC;IAE9D,YAGmB,KAAmB;QAAnB,UAAK,GAAL,KAAK,CAAc;IACnC,CAAC;IAEJ,KAAK,CAAC,UAAU,CAAC,MAAc,EAAE,SAAiB;QAChD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC;QACjD,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAEtD,IAAI,CAAC;YACH,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAEnG,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,wBAAwB,MAAM,SAAS,SAAS,aAAa,OAAO,YAAY,OAAO,cAAc,QAAQ,aAAa,QAAQ,eAAe,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,CACxM,CAAC;YAEF,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAGjD,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,MAAM,SAAS,SAAS,wBAAwB,CAAC,CAAC;gBAC3G,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YAC5C,CAAC;YAED,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAGrC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;gBACjB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;YAC1C,CAAC;YAED,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;gBAClB,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;YACzC,CAAC;YAED,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,+BAA+B,MAAM,WAAW,SAAS,KAAK,MAAM,CAAC,KAAK,CAAC,yBAAyB,CACrG,CAAC;YACF,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC;QACjD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,SAAiB,EAAE,MAAc;QAC5D,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAEpD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,gCAAgC,MAAM,WAAW,SAAS,KAAK,MAAM,CAAC,KAAK,CAAC,yBAAyB,CACtG,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,GAAG,CAAC,MAAc,EAAE,SAAiB,EAAE,MAAc;QAC3D,OAAO,QAAQ,MAAM,UAAU,SAAS,IAAI,MAAM,EAAE,CAAC;IACvD,CAAC;CACF,CAAA;AAvEY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,iBAAQ,GAAE,CAAA;IACV,WAAA,IAAA,eAAM,EAAC,mBAAW,CAAC,CAAA;;GALX,kBAAkB,CAuE9B"}
@@ -1,14 +1,12 @@
1
- import { ToolExecutionContext, ToolExecutionInterceptor, ToolResult } from '@loopstack/common';
1
+ import { ToolExecutionContext, ToolInterceptor, ToolResult } from '@loopstack/common';
2
2
  import { QuotaCalculatorRegistry } from './quota-calculator-registry.service';
3
3
  import { QuotaClientService } from './quota-client.service';
4
- export declare class QuotaInterceptor implements ToolExecutionInterceptor {
4
+ export declare class QuotaInterceptor implements ToolInterceptor {
5
5
  private readonly quotaClientService;
6
6
  private readonly calculatorRegistry;
7
7
  private readonly logger;
8
8
  private readonly processingTimeCalculator;
9
9
  constructor(quotaClientService: QuotaClientService, calculatorRegistry: QuotaCalculatorRegistry);
10
- beforeExecute(context: ToolExecutionContext): Promise<void>;
11
- afterExecute(context: ToolExecutionContext, result: ToolResult): Promise<void>;
12
- onError(_context: ToolExecutionContext, _error: unknown): Promise<void>;
10
+ intercept(context: ToolExecutionContext, next: () => Promise<ToolResult>): Promise<ToolResult>;
13
11
  }
14
12
  //# sourceMappingURL=quota.interceptor.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"quota.interceptor.d.ts","sourceRoot":"","sources":["../../src/services/quota.interceptor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/F,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,qBACa,gBAAiB,YAAW,wBAAwB;IAK7D,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IALrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAuC;gBAG7D,kBAAkB,EAAE,kBAAkB,EACtC,kBAAkB,EAAE,uBAAuB;IAGxD,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB3D,YAAY,CAAC,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB9E,OAAO,CAAC,QAAQ,EAAE,oBAAoB,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAG9E"}
1
+ {"version":3,"file":"quota.interceptor.d.ts","sourceRoot":"","sources":["../../src/services/quota.interceptor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AAE1G,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,qBACa,gBAAiB,YAAW,eAAe;IAKpD,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IALrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAuC;gBAG7D,kBAAkB,EAAE,kBAAkB,EACtC,kBAAkB,EAAE,uBAAuB;IAGxD,SAAS,CAAC,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;CAyCrG"}
@@ -12,6 +12,7 @@ var QuotaInterceptor_1;
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
13
  exports.QuotaInterceptor = void 0;
14
14
  const common_1 = require("@nestjs/common");
15
+ const common_2 = require("@loopstack/common");
15
16
  const calculators_1 = require("../calculators");
16
17
  const quota_calculator_registry_service_1 = require("./quota-calculator-registry.service");
17
18
  const quota_client_service_1 = require("./quota-client.service");
@@ -24,42 +25,39 @@ let QuotaInterceptor = QuotaInterceptor_1 = class QuotaInterceptor {
24
25
  this.quotaClientService = quotaClientService;
25
26
  this.calculatorRegistry = calculatorRegistry;
26
27
  }
27
- async beforeExecute(context) {
28
+ async intercept(context, next) {
28
29
  const userId = context.runContext.userId;
30
+ const toolClassName = context.tool.constructor.name;
29
31
  const timeCheck = await this.quotaClientService.checkQuota(userId, this.processingTimeCalculator.quotaType);
30
32
  if (timeCheck.exceeded) {
31
33
  throw new Error(`Quota exceeded for "${this.processingTimeCalculator.quotaType}": ${timeCheck.used}/${timeCheck.limit}`);
32
34
  }
33
- const toolClassName = context.tool.constructor.name;
34
35
  const calculator = this.calculatorRegistry.get(toolClassName);
35
- if (!calculator)
36
- return;
37
- const checkResult = await this.quotaClientService.checkQuota(userId, calculator.quotaType);
38
- if (checkResult.exceeded) {
39
- throw new Error(`Quota exceeded for "${calculator.quotaType}": ${checkResult.used}/${checkResult.limit}`);
36
+ if (calculator) {
37
+ const checkResult = await this.quotaClientService.checkQuota(userId, calculator.quotaType);
38
+ if (checkResult.exceeded) {
39
+ throw new Error(`Quota exceeded for "${calculator.quotaType}": ${checkResult.used}/${checkResult.limit}`);
40
+ }
40
41
  }
41
- }
42
- async afterExecute(context, result) {
43
- const userId = context.runContext.userId;
42
+ const result = await next();
43
+ const durationMs = context.metadata.durationMs ?? 0;
44
44
  const timeUsage = this.processingTimeCalculator.calculateQuotaUsage(context, result);
45
45
  if (timeUsage) {
46
- await this.quotaClientService.report(userId, timeUsage.quotaType, timeUsage.actualAmount);
46
+ const amount = durationMs || timeUsage.actualAmount;
47
+ await this.quotaClientService.report(userId, timeUsage.quotaType, amount);
47
48
  }
48
- const toolClassName = context.tool.constructor.name;
49
- const calculator = this.calculatorRegistry.get(toolClassName);
50
- if (!calculator)
51
- return;
52
- const usage = calculator.calculateQuotaUsage(context, result);
53
- if (!usage)
54
- return;
55
- await this.quotaClientService.report(userId, usage.quotaType, usage.actualAmount);
56
- }
57
- async onError(_context, _error) {
49
+ if (calculator) {
50
+ const usage = calculator.calculateQuotaUsage(context, result);
51
+ if (usage) {
52
+ await this.quotaClientService.report(userId, usage.quotaType, usage.actualAmount);
53
+ }
54
+ }
55
+ return result;
58
56
  }
59
57
  };
60
58
  exports.QuotaInterceptor = QuotaInterceptor;
61
59
  exports.QuotaInterceptor = QuotaInterceptor = QuotaInterceptor_1 = __decorate([
62
- (0, common_1.Injectable)(),
60
+ (0, common_2.UseToolInterceptor)({ priority: 50 }),
63
61
  __metadata("design:paramtypes", [quota_client_service_1.QuotaClientService,
64
62
  quota_calculator_registry_service_1.QuotaCalculatorRegistry])
65
63
  ], QuotaInterceptor);
@@ -1 +1 @@
1
- {"version":3,"file":"quota.interceptor.js","sourceRoot":"","sources":["../../src/services/quota.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AAEpD,gDAA+D;AAC/D,2FAA8E;AAC9E,iEAA4D;AAGrD,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAKR;IACA;IALF,MAAM,GAAG,IAAI,eAAM,CAAC,kBAAgB,CAAC,IAAI,CAAC,CAAC;IAC3C,wBAAwB,GAAG,IAAI,2CAA6B,EAAE,CAAC;IAEhF,YACmB,kBAAsC,EACtC,kBAA2C;QAD3C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,uBAAkB,GAAlB,kBAAkB,CAAyB;IAC3D,CAAC;IAEJ,KAAK,CAAC,aAAa,CAAC,OAA6B;QAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;QAGzC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QAC5G,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,uBAAuB,IAAI,CAAC,wBAAwB,CAAC,SAAS,MAAM,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,KAAK,EAAE,CACxG,CAAC;QACJ,CAAC;QAGD,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC9D,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;QAC3F,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,uBAAuB,UAAU,CAAC,SAAS,MAAM,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC;QAC5G,CAAC;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAA6B,EAAE,MAAkB;QAClE,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;QAGzC,MAAM,SAAS,GAAG,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACrF,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;QAC5F,CAAC;QAGD,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC9D,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,MAAM,KAAK,GAAG,UAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;IACpF,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAA8B,EAAE,MAAe;IAE7D,CAAC;CACF,CAAA;AAtDY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAM4B,yCAAkB;QAClB,2DAAuB;GANnD,gBAAgB,CAsD5B"}
1
+ {"version":3,"file":"quota.interceptor.js","sourceRoot":"","sources":["../../src/services/quota.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAwC;AACxC,8CAA0G;AAC1G,gDAA+D;AAC/D,2FAA8E;AAC9E,iEAA4D;AAGrD,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAKR;IACA;IALF,MAAM,GAAG,IAAI,eAAM,CAAC,kBAAgB,CAAC,IAAI,CAAC,CAAC;IAC3C,wBAAwB,GAAG,IAAI,2CAA6B,EAAE,CAAC;IAEhF,YACmB,kBAAsC,EACtC,kBAA2C;QAD3C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,uBAAkB,GAAlB,kBAAkB,CAAyB;IAC3D,CAAC;IAEJ,KAAK,CAAC,SAAS,CAAC,OAA6B,EAAE,IAA+B;QAC5E,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;QACzC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAGpD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QAC5G,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACb,uBAAuB,IAAI,CAAC,wBAAwB,CAAC,SAAS,MAAM,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,KAAK,EAAE,CACxG,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC9D,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;YAC3F,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CAAC,uBAAuB,UAAU,CAAC,SAAS,MAAM,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC;YAC5G,CAAC;QACH,CAAC;QAGD,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QAG5B,MAAM,UAAU,GAAI,OAAO,CAAC,QAAQ,CAAC,UAAqB,IAAI,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACrF,IAAI,SAAS,EAAE,CAAC;YAEd,MAAM,MAAM,GAAG,UAAU,IAAI,SAAS,CAAC,YAAY,CAAC;YACpD,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,KAAK,GAAG,UAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC9D,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;YACpF,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AAlDY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,2BAAkB,EAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;qCAMI,yCAAkB;QAClB,2DAAuB;GANnD,gBAAgB,CAkD5B"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@loopstack/quota",
3
3
  "displayName": "Loopstack Quota Module",
4
4
  "description": "Opt-in quota tracking and enforcement for Loopstack workflows",
5
- "version": "0.21.0",
5
+ "version": "0.22.0",
6
6
  "license": "BSL",
7
7
  "author": {
8
8
  "name": "Jakob Klippel",
@@ -19,7 +19,7 @@
19
19
  "watch": "nest build --watch"
20
20
  },
21
21
  "dependencies": {
22
- "@loopstack/common": "^0.22.2",
22
+ "@loopstack/common": "^0.25.0",
23
23
  "@nestjs/common": "^11.1.16",
24
24
  "ioredis": "^5.10.0"
25
25
  },