@puca/puca-core 12.13.13 → 12.14.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.
Files changed (37) hide show
  1. package/dist/core/services/domain-life-cycle.service.d.ts +1 -3
  2. package/dist/core/services/domain-life-cycle.service.js +1 -4
  3. package/dist/core/services/domain-life-cycle.service.js.map +1 -1
  4. package/dist/core/services/index.js +3 -3
  5. package/dist/core/services/index.js.map +1 -1
  6. package/dist/core/services/llm/llm.service.d.ts +2 -11
  7. package/dist/core/services/llm/llm.service.js +70 -123
  8. package/dist/core/services/llm/llm.service.js.map +1 -1
  9. package/dist/core/services/llm/token-budget.service.d.ts +2 -7
  10. package/dist/core/services/llm/token-budget.service.js +23 -57
  11. package/dist/core/services/llm/token-budget.service.js.map +1 -1
  12. package/dist/core/services/mcp/mcp-server.service.d.ts +1 -16
  13. package/dist/core/services/mcp/mcp-server.service.js +9 -17
  14. package/dist/core/services/mcp/mcp-server.service.js.map +1 -1
  15. package/dist/core/services/monitor.d.ts +4 -5
  16. package/dist/core/services/monitor.js +5 -14
  17. package/dist/core/services/monitor.js.map +1 -1
  18. package/dist/core/services/mq/mq.service.d.ts +9 -1
  19. package/dist/core/services/mq/mq.service.js +20 -99
  20. package/dist/core/services/mq/mq.service.js.map +1 -1
  21. package/dist/core/services/report.service.js +0 -13
  22. package/dist/core/services/report.service.js.map +1 -1
  23. package/dist/core/services/task.service.d.ts +0 -2
  24. package/dist/core/services/task.service.js.map +1 -1
  25. package/dist/essential/module-config.service.js +2 -2
  26. package/dist/essential/module-config.service.js.map +1 -1
  27. package/dist/packages/crm/crm.service.js +1 -3
  28. package/dist/packages/crm/crm.service.js.map +1 -1
  29. package/dist/plugins/final-user-query-language/final-user-query-language.js +5 -5
  30. package/dist/plugins/final-user-query-language/final-user-query-language.js.map +1 -1
  31. package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.d.ts +0 -3
  32. package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.js +6 -13
  33. package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.js.map +1 -1
  34. package/dist/tsconfig.tsbuildinfo +1 -1
  35. package/fuql-grammar.js +6 -113
  36. package/fuql-grammar.ne +6 -113
  37. package/package.json +1 -1
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.TokenBudgetService = void 0;
4
- const _ = require("lodash");
5
4
  const essential_1 = require("../../../essential");
6
5
  const logger_1 = require("../logger");
7
6
  class TokenBudgetService {
@@ -26,16 +25,6 @@ class TokenBudgetService {
26
25
  if (!maxSharedTokenBudget) {
27
26
  this.logger.debug('No max shared token budget defined');
28
27
  }
29
- if (sharedTokenBudget < 0) {
30
- this.logger.debug('Shared token budget is negative, resetting to 0');
31
- sharedTokenBudget = 0;
32
- await this.secondaryDatabase.set(`shared-token-budget`, `${sharedTokenBudget}`);
33
- }
34
- else if (sharedTokenBudget > maxSharedTokenBudget) {
35
- this.logger.debug('Shared token budget is greater than max, resetting to max');
36
- sharedTokenBudget = maxSharedTokenBudget;
37
- await this.secondaryDatabase.set(`shared-token-budget`, `${sharedTokenBudget}`);
38
- }
39
28
  const increaseSharedTokenBudget = async (oAmount) => {
40
29
  const amount = Math.max(Math.min(oAmount, maxSharedTokenBudget - sharedTokenBudget), 0);
41
30
  if (!amount) {
@@ -47,23 +36,19 @@ class TokenBudgetService {
47
36
  const setConsumedBudget = async (userId, amount) => {
48
37
  this.secondaryDatabase.set(`user-token-tokens-${userId}`, `${amount}`);
49
38
  };
50
- for (const user of activeUsers) {
51
- const { puca_pid: userId, username } = user;
52
- const recharge = Math.floor(((+(await this.envCofigService.getEnvByName('USER_TOKEN_BUDGET_PER_HOUR', 0))) * 8 / 24));
39
+ for (const userId of activeUsers) {
40
+ const hourBudget = +(await this.envCofigService.getEnvByName('USER_TOKEN_BUDGET_PER_HOUR', 0));
53
41
  const userBudget = await this._getTokenBudget(userId);
54
- if (userBudget.consumed < recharge) {
55
- increaseSharedTokenBudget(recharge - userBudget.consumed);
42
+ this.monitorService.hit('user-token-budget', { userId }, userBudget.budget, 'h');
43
+ if (userBudget.consumed < hourBudget) {
44
+ increaseSharedTokenBudget(hourBudget - userBudget.consumed);
56
45
  }
57
46
  if (userBudget.consumed) {
58
- const newConsumed = Math.max(userBudget.consumed - recharge, 0);
47
+ const newConsumed = Math.max(userBudget.consumed - hourBudget, 0);
59
48
  setConsumedBudget(userId, newConsumed);
60
- this.monitorService.hit('user-token-budget', {
61
- userId,
62
- user: username,
63
- }, userBudget.budget - newConsumed);
64
49
  }
65
50
  }
66
- this.monitorService.hit('shared-token-budget', {}, sharedTokenBudget);
51
+ this.monitorService.hit('shared-token-budget', {}, sharedTokenBudget, 'h');
67
52
  };
68
53
  const jobExecutor = this.jobExecutorFactory.get('budget-consolidation');
69
54
  jobExecutor.process(1, budgetConsolidation);
@@ -85,7 +70,7 @@ class TokenBudgetService {
85
70
  };
86
71
  };
87
72
  const { data: activeUsers } = await userRepository.findBy({
88
- fields: ['puca_pid', 'username'],
73
+ fields: ['puca_pid'],
89
74
  key: [
90
75
  coalesce('active', '$active'),
91
76
  coalesce('billing_mode', '$billing_mode'),
@@ -101,16 +86,16 @@ class TokenBudgetService {
101
86
  user: null,
102
87
  disablePermissionSystem: true,
103
88
  });
104
- return activeUsers;
89
+ return activeUsers.map((user) => user.puca_pid);
105
90
  }
106
91
  async _getTokenBudget(userId) {
107
92
  const userTokenBudget = +(await this.envCofigService.getEnvByName('USER_TOKEN_BUDGET_PER_HOUR', Number.MAX_SAFE_INTEGER));
108
93
  if (userTokenBudget === Number.MAX_SAFE_INTEGER) {
109
94
  this.logger.debug('No user token budget defined');
110
95
  }
111
- const userConsumedTokens = +(await this.secondaryDatabase.get(`user-token-tokens-${userId}`));
96
+ const userConsumedTokens = +(await this.secondaryDatabase.get(`user-token-tokens-${userId}`)) || 0;
112
97
  return {
113
- budget: userTokenBudget * 8,
98
+ budget: userTokenBudget * 24,
114
99
  consumed: userConsumedTokens
115
100
  };
116
101
  }
@@ -119,56 +104,37 @@ class TokenBudgetService {
119
104
  return sharedTokenBudget;
120
105
  }
121
106
  async getUserTokenBudget(userId) {
122
- const { budget: oUserTokenBudget, consumed: userConsumedBudget } = await this._getTokenBudget(userId);
107
+ const { budget: userTokenBudget, consumed: userConsumedBudget } = await this._getTokenBudget(userId);
123
108
  const sharedTokenBudget = Math.max(await this._getSharedTokenBudget(), 0);
124
- const userTokenBudget = oUserTokenBudget + (process.env.ENVIRONMENT.toUpperCase() === 'PRODUCTION' ? 0 : userConsumedBudget);
125
109
  return {
110
+ budget: userTokenBudget + sharedTokenBudget,
126
111
  consumed: userConsumedBudget,
127
112
  userBudget: userTokenBudget,
113
+ userConsumed: userConsumedBudget,
128
114
  sharedBudget: sharedTokenBudget,
129
- totalBudget: userTokenBudget + sharedTokenBudget,
130
115
  };
131
116
  }
132
- async decrementUserTokenBudget(userId, inputToken, outputToken, opts) {
133
- if (!(opts === null || opts === void 0 ? void 0 : opts.preference)) {
134
- _.set(opts, 'preference', 'user');
135
- }
117
+ async decrementUserTokenBudget(userId, inputToken, outputToken) {
136
118
  const outputTokenRatio = +(await this.envCofigService.getEnvByName('OUTPUT_TOKEN_RATIO', 1));
137
119
  const budget = await this.getUserTokenBudget(userId);
138
- const userAvailableBudget = budget.userBudget - budget.consumed;
120
+ const userAvailableBudget = budget.userBudget - budget.userConsumed;
139
121
  const incUserTokenTokens = async (userId, amount) => {
140
122
  if (!amount) {
141
123
  return;
142
124
  }
143
125
  this.secondaryDatabase.incBy(`user-token-tokens-${userId}`, Math.ceil(amount));
144
126
  };
145
- const applyToUser = (amount) => {
146
- incUserTokenTokens(userId, amount);
147
- };
148
- const applyToShared = async (amount) => {
149
- this.secondaryDatabase.incBy(`shared-token-budget`, Math.floor(-amount));
150
- };
151
- const [apply1, apply2] = opts.preference === 'shared' ? [applyToShared, applyToUser] : [applyToUser, applyToShared];
152
- const budget1 = opts.preference === 'shared' ?
153
- budget.sharedBudget :
154
- userAvailableBudget;
155
127
  const amount = inputToken + (outputToken * outputTokenRatio);
156
- const consumedBudget1 = Math.min(budget1, amount);
157
- apply1(consumedBudget1);
158
- const overConsumedBudget = Math.max(amount - budget1, 0);
128
+ incUserTokenTokens(userId, Math.min(amount, userAvailableBudget));
129
+ const overConsumedBudget = Math.max(amount - userAvailableBudget, 0);
159
130
  if (!overConsumedBudget) {
160
- return {
161
- userConsumed: opts.preference === 'user' ? amount : 0,
162
- sharedBudget: opts.preference === 'shared' ? amount : 0,
163
- totalConsumed: amount
164
- };
131
+ return amount;
165
132
  }
166
- apply2(overConsumedBudget);
167
- return {
168
- userConsumed: opts.preference === 'user' ? consumedBudget1 : overConsumedBudget,
169
- sharedBudget: opts.preference === 'shared' ? consumedBudget1 : overConsumedBudget,
170
- totalConsumed: amount
133
+ const descrSharedTokenBudget = async (amount) => {
134
+ this.secondaryDatabase.incBy(`shared-token-budget`, Math.floor(-amount));
171
135
  };
136
+ descrSharedTokenBudget(overConsumedBudget);
137
+ return amount;
172
138
  }
173
139
  }
174
140
  exports.TokenBudgetService = TokenBudgetService;
@@ -1 +1 @@
1
- {"version":3,"file":"token-budget.service.js","sourceRoot":"","sources":["../../../../src/core/services/llm/token-budget.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"token-budget.service.js","sourceRoot":"","sources":["../../../../src/core/services/llm/token-budget.service.ts"],"names":[],"mappings":";;;AAAA,kDAAwD;AAMxD,sCAAkC;AAIlC,MAAa,kBAAkB;IAG7B,YACmB,iBAAoC,EACpC,iBAAoC,EACpC,eAAiC,EACjC,kBAAsC,EACtC,cAA8B;QAJ9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,oBAAe,GAAf,eAAe,CAAkB;QACjC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,mBAAc,GAAd,cAAc,CAAgB;QAPhC,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;IAQzD,CAAC;IAEL,KAAK,CAAC,IAAI;QACR,MAAM,MAAM,GAAG,CAAC,MAAM,+BAAmB,CAAC,eAAe,EAAE,CAAC,CAAC,IAAI,CAAA;QACjE,IAAG,MAAM,KAAK,eAAe,EAAE;YAC7B,OAAM;SACP;QACD,MAAM,mBAAmB,GAAG,KAAK,IAAI,EAAE;YACrC,IAAI,iBAAiB,GAAG,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAA;YAE1D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;YAC/C,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC;gBACnG,WAAW,CAAC,MAAM,CAAA;YAEpB,IAAI,CAAC,oBAAoB,EAAE;gBACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAA;aACxD;YAED,MAAM,yBAAyB,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;gBAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CACrB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,oBAAoB,GAAG,iBAAiB,CAAC,EAC3D,CAAC,CACF,CAAA;gBACD,IAAI,CAAC,MAAM,EAAE;oBACX,OAAM;iBACP;gBACD,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAC1B,qBAAqB,EACrB,MAAM,CACP,CAAA;gBACD,iBAAiB,IAAI,MAAM,CAAA;YAC7B,CAAC,CAAA;YAED,MAAM,iBAAiB,GAAG,KAAK,EAAE,MAAc,EAAE,MAAc,EAAE,EAAE;gBACjE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CACxB,qBAAqB,MAAM,EAAE,EAC7B,GAAG,MAAM,EAAE,CACZ,CAAA;YACH,CAAC,CAAA;YAED,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE;gBAChC,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,4BAA4B,EAAE,CAAC,CAAC,CAAC,CAAA;gBAC9F,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;gBAErD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,EAAE,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;gBAEhF,IAAI,UAAU,CAAC,QAAQ,GAAG,UAAU,EAAE;oBACpC,yBAAyB,CAAC,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAA;iBAC5D;gBAED,IAAI,UAAU,CAAC,QAAQ,EAAE;oBACvB,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,GAAG,UAAU,EAAE,CAAC,CAAC,CAAA;oBACjE,iBAAiB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;iBACvC;aACF;YAED,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,qBAAqB,EAAE,EAAE,EAAE,iBAAiB,EAAE,GAAG,CAAC,CAAA;QAE5E,CAAC,CAAA;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;QACvE,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAA;QAC3C,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE;YACpB,GAAG,EAAE,sBAAsB;YAC3B,MAAM,EAAE;gBAEN,IAAI,EAAE,WAAW;aAClB;SACF,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAEtD;YACD,SAAS,EAAE,2BAA2B;SACvC,CAAC,CAAA;QAEF,MAAM,QAAQ,GAAG,CAAC,KAAa,EAAE,QAAgB,EAAE,EAAE;YACnD,OAAO;gBACL,QAAQ,EAAE,UAAU;gBACpB,IAAI,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;aACxB,CAAA;QACH,CAAC,CAAA;QAED,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC;YACxD,MAAM,EAAE,CAAC,UAAU,CAAC;YACpB,GAAG,EAAE;gBACH,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;gBAC7B,QAAQ,CAAC,cAAc,EAAE,eAAe,CAAC;aAC1C;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,IAAI;gBACd,cAAc,EAAE,SAAS;aAC1B;YACD,KAAK,EAAE;gBACL,IAAI;gBACJ,SAAS;aACV;YACD,IAAI,EAAE,IAAI;YACV,uBAAuB,EAAE,IAAI;SAC9B,CAAC,CAAA;QAEF,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACjD,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,MAAc;QAI1C,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,4BAA4B,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAA;QAEzH,IAAI,eAAe,KAAK,MAAM,CAAC,gBAAgB,EAAE;YAC/C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAA;SAClD;QAED,MAAM,kBAAkB,GAEpB,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAChC,qBAAqB,MAAM,EAAE,CAC9B,CAAC,IAAI,CAAC,CAAA;QAEX,OAAO;YACL,MAAM,EAAE,eAAe,GAAG,EAAE;YAC5B,QAAQ,EAAE,kBAAkB;SAC7B,CAAA;IACH,CAAC;IAEO,KAAK,CAAC,qBAAqB;QACjC,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAC1D,qBAAqB,CACtB,CAAC,IAAI,CAAC,CAAA;QAEP,OAAO,iBAAiB,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,MAAc;QACrC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;QACpG,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC,CAAA;QAEzE,OAAO;YACL,MAAM,EAAE,eAAe,GAAG,iBAAiB;YAC3C,QAAQ,EAAE,kBAAkB;YAE5B,UAAU,EAAE,eAAe;YAC3B,YAAY,EAAE,kBAAkB;YAEhC,YAAY,EAAE,iBAAiB;SAChC,CAAA;IACH,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,MAAc,EAAE,UAAkB,EAAE,WAAmB;QAEpF,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,CAAA;QAE5F,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;QAEpD,MAAM,mBAAmB,GAAG,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,YAAY,CAAA;QAEnE,MAAM,kBAAkB,GAAG,KAAK,EAAE,MAAc,EAAE,MAAc,EAAE,EAAE;YAClE,IAAG,CAAC,MAAM,EAAE;gBACV,OAAM;aACP;YACD,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAC1B,qBAAqB,MAAM,EAAE,EAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAClB,CAAA;QACH,CAAC,CAAA;QAED,MAAM,MAAM,GAAG,UAAU,GAAG,CAAC,WAAW,GAAG,gBAAgB,CAAC,CAAA;QAE5D,kBAAkB,CAAC,MAAM,EACvB,IAAI,CAAC,GAAG,CACN,MAAM,EACN,mBAAmB,CACpB,CACF,CAAA;QAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,mBAAmB,EAAE,CAAC,CAAC,CAAA;QACpE,IAAI,CAAC,kBAAkB,EAAE;YACvB,OAAO,MAAM,CAAA;SACd;QAED,MAAM,sBAAsB,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;YACtD,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAC1B,qBAAqB,EACrB,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CACpB,CAAA;QACH,CAAC,CAAA;QAED,sBAAsB,CAAC,kBAAkB,CAAC,CAAA;QAC1C,OAAO,MAAM,CAAA;IACf,CAAC;CAEF;AA3MD,gDA2MC"}
@@ -19,31 +19,18 @@ export interface ToolDefinitionConfig {
19
19
  };
20
20
  };
21
21
  required?: string[];
22
- oneOf?: {
23
- required: string[];
24
- }[];
25
22
  additionalProperties?: boolean;
26
23
  };
27
24
  }
28
25
  export interface ToolDefinition<T> {
29
26
  config: ToolDefinitionConfig;
30
27
  handler: (args: T) => Promise<{
31
- isError: boolean;
32
28
  content: {
33
29
  type: 'text';
34
30
  text: string;
35
31
  }[];
36
32
  }>;
37
33
  }
38
- export interface PucaInternalMcpEspecification {
39
- path: string;
40
- scope: string;
41
- availableToAssistent?: boolean;
42
- assistantProps?: {
43
- examples: string;
44
- keywords: string[];
45
- };
46
- }
47
34
  export declare class McpServer {
48
35
  private readonly secondaryDataBase;
49
36
  private readonly server;
@@ -66,9 +53,7 @@ export declare class McpServerInstanceGerenciator {
66
53
  private readonly servers;
67
54
  private instances;
68
55
  constructor(secondaryDataBase: SecondaryDatabase);
69
- registerMcpServer(name: string, server: McpServerBuildFunction, opts: {
70
- pucaInternalEspecification: PucaInternalMcpEspecification;
71
- }): Promise<void>;
56
+ registerMcpServer(name: string, server: McpServerBuildFunction): Promise<void>;
72
57
  process(name: string, { req, res, user }: {
73
58
  req: Request;
74
59
  res: Response;
@@ -27,6 +27,12 @@ class McpServer {
27
27
  additionalProperties: false
28
28
  };
29
29
  }
30
+ if (!tool.config.inputSchema.required) {
31
+ tool.config.inputSchema.required = [];
32
+ }
33
+ if (!tool.config.inputSchema.additionalProperties) {
34
+ tool.config.inputSchema.additionalProperties = false;
35
+ }
30
36
  });
31
37
  this.server.setRequestHandler(types_js_1.ListToolsRequestSchema, async () => ({
32
38
  tools: list.map((tool) => tool.config)
@@ -55,8 +61,8 @@ class McpServer {
55
61
  await this.secondaryDataBase.get(resource.uri);
56
62
  if (!r) {
57
63
  r = await (async () => {
58
- const response = await axios_1.default.get(resource.uri);
59
- return response.data.raw;
64
+ const manual = await axios_1.default.get(resource.uri);
65
+ return manual.data.raw;
60
66
  })();
61
67
  await this.secondaryDataBase.setex(resource.uri, 60 * 60 * 1, r);
62
68
  }
@@ -92,22 +98,8 @@ class McpServerInstanceGerenciator {
92
98
  });
93
99
  }, 1000 * 60);
94
100
  }
95
- async registerMcpServer(name, server, opts) {
101
+ async registerMcpServer(name, server) {
96
102
  this.servers[name] = server;
97
- const internalEspecification = opts.pucaInternalEspecification;
98
- if (!internalEspecification) {
99
- return;
100
- }
101
- if (!internalEspecification.path) {
102
- throw new Error('pucaInternalEspecification.path is required');
103
- }
104
- if (!internalEspecification.scope) {
105
- throw new Error('pucaInternalEspecification.scope is required');
106
- }
107
- if (!internalEspecification.availableToAssistent) {
108
- internalEspecification.availableToAssistent = false;
109
- }
110
- await this.secondaryDataBase.set(`puca-mcp-server:${name}:config`, JSON.stringify(internalEspecification));
111
103
  }
112
104
  async process(name, { req, res, user }) {
113
105
  const sessionId = req.headers['mcp-session-id'] || user.puca_pid;
@@ -1 +1 @@
1
- {"version":3,"file":"mcp-server.service.js","sourceRoot":"","sources":["../../../../src/core/services/mcp/mcp-server.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mcp-server.service.js","sourceRoot":"","sources":["../../../../src/core/services/mcp/mcp-server.service.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,9 @@
1
1
  import { ModuleConfigService } from '../../essential/module-config.service';
2
+ import { EnvConfigService } from '../../essential/envs-config.service';
2
3
  import { ConfigService } from '../../essential/config.service';
3
4
  export declare class MonitorService {
4
5
  private readonly moduleConfigService;
6
+ private readonly envConfigService;
5
7
  private readonly configService;
6
8
  private readonly logger;
7
9
  private static readonly URL;
@@ -9,11 +11,8 @@ export declare class MonitorService {
9
11
  private static readonly ORG;
10
12
  private static readonly BUCKET;
11
13
  private readonly batch;
12
- private interval;
13
- constructor(moduleConfigService: ModuleConfigService, configService: ConfigService);
14
- init(): Promise<void>;
15
- destroy(): Promise<void>;
16
- hit(measurement: string, tags: any, value: number, precision?: "s" | "ms" | "us" | "ns"): Promise<void>;
14
+ constructor(moduleConfigService: ModuleConfigService, envConfigService: EnvConfigService, configService: ConfigService);
15
+ hit(measurement: string, tags: any, value: number, precision: "d" | "h" | "m" | "s" | "ms" | "us" | "ns"): Promise<void>;
17
16
  private computeData;
18
17
  private flush;
19
18
  }
@@ -5,21 +5,17 @@ const _ = require("lodash");
5
5
  const axios_1 = require("axios");
6
6
  const logger_1 = require("./logger");
7
7
  class MonitorService {
8
- constructor(moduleConfigService, configService) {
8
+ constructor(moduleConfigService, envConfigService, configService) {
9
9
  this.moduleConfigService = moduleConfigService;
10
+ this.envConfigService = envConfigService;
10
11
  this.configService = configService;
11
12
  this.logger = new logger_1.Logger('MonitorService');
12
13
  this.batch = [];
13
- }
14
- async init() {
15
- this.interval = setInterval(() => {
14
+ setInterval(() => {
16
15
  this.flush();
17
16
  }, 60000);
18
17
  }
19
- async destroy() {
20
- clearInterval(this.interval);
21
- }
22
- async hit(measurement, tags, value, precision = 's') {
18
+ async hit(measurement, tags, value, precision) {
23
19
  this.batch.push({
24
20
  precision,
25
21
  measurement,
@@ -40,11 +36,7 @@ class MonitorService {
40
36
  data.push(['version', version]);
41
37
  data.push(['domain', secret.namespace]);
42
38
  data.push(['env', env]);
43
- const normalize = (value) => {
44
- const valueStr = `${value}`;
45
- return valueStr.replace(/[^a-zA-Z0-9]/g, '').replace(/ /g, '_');
46
- };
47
- const dataStr = data.map(([key, value]) => `${_.snakeCase(key)}=${normalize(value)}`).join(',');
39
+ const dataStr = data.map(([key, value]) => `${_.snakeCase(key)}=${value}`).join(',');
48
40
  result.push(`${_.snakeCase(point.measurement)},${dataStr} value=${point.value}`);
49
41
  }
50
42
  return result.join('\n');
@@ -65,7 +57,6 @@ class MonitorService {
65
57
  timeout: 30000
66
58
  }).catch(e => {
67
59
  var _a;
68
- debugger;
69
60
  this.logger.error('Error sending data to monitor', ((_a = e.response) === null || _a === void 0 ? void 0 : _a.data) || e.message, points.length);
70
61
  });
71
62
  }
@@ -1 +1 @@
1
- {"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../../src/core/services/monitor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../../src/core/services/monitor.ts"],"names":[],"mappings":"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"}
@@ -10,11 +10,19 @@ export interface PublishOptions extends Options.Publish {
10
10
  export declare class MqService {
11
11
  private readonly domain;
12
12
  private readonly configService;
13
+ private closing;
14
+ private static readonly DEAD_LETTER_QUEUE;
15
+ private static readonly RETRY_EXCHANGE;
13
16
  private readonly logger;
14
- private instance;
17
+ private mainChannel;
18
+ private readonly queues;
19
+ private connection;
20
+ private additionalChannels;
15
21
  constructor(domain: string, configService: ConfigService);
22
+ private connect;
16
23
  init(): Promise<void>;
17
24
  shutdown(): Promise<void>;
25
+ private computeExpBackoff;
18
26
  assertQueue(queue: string, options?: Options.AssertQueue): Promise<import("amqplib").Replies.AssertQueue>;
19
27
  assertExchange(exchange: string, type?: string, options?: Options.AssertExchange): Promise<import("amqplib").Replies.AssertExchange>;
20
28
  bindQueue(queue: string, exchange: string, pattern: string, args?: any): Promise<import("amqplib").Replies.Empty>;
@@ -4,14 +4,12 @@ exports.MqService = void 0;
4
4
  const _ = require("lodash");
5
5
  const amqplib_1 = require("amqplib");
6
6
  const logger_1 = require("../logger");
7
- const events_1 = require("events");
8
- class MqServiceInstance {
7
+ class MqService {
9
8
  constructor(domain, configService) {
10
9
  this.domain = domain;
11
10
  this.configService = configService;
12
11
  this.closing = false;
13
- this.logger = new logger_1.Logger(MqServiceInstance.name);
14
- this.eventEmmiter = new events_1.EventEmitter();
12
+ this.logger = new logger_1.Logger('MqService');
15
13
  this.queues = {};
16
14
  this.additionalChannels = [];
17
15
  }
@@ -42,16 +40,17 @@ class MqServiceInstance {
42
40
  if (this.closing) {
43
41
  return;
44
42
  }
45
- this.eventEmmiter.emit('connectionClosed');
43
+ this.logger.warn('Connection to RabbitMQ closed, reconnecting...');
44
+ throw new Error('Connection to RabbitMQ closed');
46
45
  });
47
46
  this.connection.on('error', (error) => {
48
47
  this.logger.error('Connection to RabbitMQ error', error);
49
48
  });
50
- const mainChannel = await this.createChannel('mainChannel');
51
- await mainChannel.assertQueue(MqServiceInstance.DEAD_LETTER_QUEUE, {
49
+ const mainChannel = await this.connection.createChannel();
50
+ await mainChannel.assertQueue(MqService.DEAD_LETTER_QUEUE, {
52
51
  durable: true
53
52
  });
54
- await mainChannel.assertExchange(MqServiceInstance.RETRY_EXCHANGE, 'x-delayed-message', {
53
+ await mainChannel.assertExchange(MqService.RETRY_EXCHANGE, 'x-delayed-message', {
55
54
  durable: true,
56
55
  arguments: {
57
56
  'x-delayed-type': 'direct'
@@ -59,30 +58,13 @@ class MqServiceInstance {
59
58
  });
60
59
  this.mainChannel = mainChannel;
61
60
  }
62
- async createChannel(name) {
63
- const channel = await this.connection.createChannel();
64
- channel.on('error', (error) => {
65
- this.logger.error('Main channel error', error);
66
- });
67
- channel.on('close', () => {
68
- this.eventEmmiter.emit('channelClosed', name);
69
- });
70
- return channel;
71
- }
72
61
  async init() {
73
62
  await this.connect();
74
63
  }
75
64
  async shutdown() {
76
65
  this.closing = true;
77
- if (!this.connection) {
78
- return;
79
- }
80
- const connection = this.connection;
81
- this.connection = null;
82
- this.eventEmmiter.removeAllListeners('connectionClosed');
83
- this.eventEmmiter.removeAllListeners('channelClosed');
84
- connection.removeAllListeners('close');
85
- connection.removeAllListeners('error');
66
+ this.connection.removeAllListeners('close');
67
+ this.connection.removeAllListeners('error');
86
68
  await this.mainChannel.close();
87
69
  for (const { channel } of Object.values(this.queues)) {
88
70
  await channel.close();
@@ -90,7 +72,7 @@ class MqServiceInstance {
90
72
  for (const channel of this.additionalChannels) {
91
73
  await channel.close();
92
74
  }
93
- await connection.close();
75
+ await this.connection.close();
94
76
  }
95
77
  computeExpBackoff(delay, retryCount) {
96
78
  const base = 2;
@@ -100,7 +82,7 @@ class MqServiceInstance {
100
82
  async assertQueue(queue, options) {
101
83
  const mainChannel = this.mainChannel;
102
84
  const queueCreated = await mainChannel.assertQueue(queue, Object.assign({ durable: true }, options));
103
- await mainChannel.bindQueue(queue, MqServiceInstance.RETRY_EXCHANGE, queue);
85
+ await mainChannel.bindQueue(queue, MqService.RETRY_EXCHANGE, queue);
104
86
  return queueCreated;
105
87
  }
106
88
  async assertExchange(exchange, type = 'fanout', options) {
@@ -112,6 +94,10 @@ class MqServiceInstance {
112
94
  return await mainChannel.bindQueue(queue, exchange, pattern, args);
113
95
  }
114
96
  async publish(exchange, routingKey, content, options) {
97
+ if (!this.connection) {
98
+ this.logger.warn('channel not initialized');
99
+ return;
100
+ }
115
101
  const mainChannel = this.mainChannel;
116
102
  return await mainChannel.publish(exchange, routingKey, Buffer.from(JSON.stringify(content)), Object.assign(Object.assign({}, _.omit(options, 'disableRetry')), { headers: Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.headers), { 'max-retry-count': (options === null || options === void 0 ? void 0 : options.disableRetry) ? 0 : 15 }) }));
117
103
  }
@@ -120,7 +106,7 @@ class MqServiceInstance {
120
106
  return await mainChannel.sendToQueue(queue, Buffer.from(JSON.stringify(content)), Object.assign(Object.assign({}, _.omit(options, 'disableRetry')), { headers: Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.headers), { 'max-retry-count': (options === null || options === void 0 ? void 0 : options.disableRetry) ? 0 : 15 }) }));
121
107
  }
122
108
  async consume(queue, onMessage, options) {
123
- const channel = ((options === null || options === void 0 ? void 0 : options.maxSimultaneousMessages) ? await this.createChannel(`channel-${queue}`) : this.mainChannel);
109
+ const channel = ((options === null || options === void 0 ? void 0 : options.maxSimultaneousMessages) ? await this.connection.createChannel() : this.mainChannel);
124
110
  if (options === null || options === void 0 ? void 0 : options.maxSimultaneousMessages) {
125
111
  await channel.prefetch(options.maxSimultaneousMessages);
126
112
  this.additionalChannels.push(channel);
@@ -164,7 +150,7 @@ class MqServiceInstance {
164
150
  'max-retry-count': maxRetryCount,
165
151
  'first-try': firstTry
166
152
  };
167
- channel.publish(MqServiceInstance.RETRY_EXCHANGE, queue, msg.content, { headers });
153
+ channel.publish(MqService.RETRY_EXCHANGE, queue, msg.content, { headers });
168
154
  channel.ack(msg);
169
155
  }
170
156
  else if (retryCount >= maxRetryCount) {
@@ -176,7 +162,7 @@ class MqServiceInstance {
176
162
  max_retry_count: maxRetryCount,
177
163
  first_try: firstTry,
178
164
  };
179
- channel.sendToQueue(MqServiceInstance.DEAD_LETTER_QUEUE, Buffer.from(JSON.stringify(deadContent)));
165
+ channel.sendToQueue(MqService.DEAD_LETTER_QUEUE, Buffer.from(JSON.stringify(deadContent)));
180
166
  channel.ack(msg);
181
167
  this.logger.error('Mensagem descartada', msg.content.toString(), error);
182
168
  }
@@ -203,73 +189,8 @@ class MqServiceInstance {
203
189
  });
204
190
  await mainChannel.sendToQueue(queue, Buffer.from(JSON.stringify(args)));
205
191
  }
206
- onDisconnect(callback) {
207
- this.eventEmmiter.once('connectionClosed', () => {
208
- if (this.closing)
209
- return;
210
- callback();
211
- });
212
- this.eventEmmiter.once('channelClosed', (name) => {
213
- if (this.closing)
214
- return;
215
- callback();
216
- });
217
- }
218
- }
219
- MqServiceInstance.DEAD_LETTER_QUEUE = 'general-dead-letter-queue';
220
- MqServiceInstance.RETRY_EXCHANGE = 'general-retry-exchange';
221
- class MqService {
222
- constructor(domain, configService) {
223
- this.domain = domain;
224
- this.configService = configService;
225
- this.logger = new logger_1.Logger(MqService.name);
226
- }
227
- async init() {
228
- const connect = async () => {
229
- const instance = new MqServiceInstance(this.domain, this.configService);
230
- instance.onDisconnect(async () => {
231
- this.logger.warn('RabbitMQ connection lost, reinitializing instance...');
232
- return await connect()
233
- .then(async () => {
234
- instance.shutdown()
235
- .catch((error) => {
236
- });
237
- })
238
- .catch(async (error) => {
239
- this.logger.error('Failed to reconnect to RabbitMQ', error);
240
- this.logger.error('Critical error in RabbitMQ service, shutting down the process...');
241
- process.exit(1);
242
- });
243
- });
244
- await instance.init();
245
- this.instance = instance;
246
- };
247
- await connect();
248
- }
249
- async shutdown() {
250
- await this.instance.shutdown();
251
- }
252
- async assertQueue(queue, options) {
253
- return await this.instance.assertQueue(queue, options);
254
- }
255
- async assertExchange(exchange, type = 'fanout', options) {
256
- return await this.instance.assertExchange(exchange, type, options);
257
- }
258
- async bindQueue(queue, exchange, pattern, args) {
259
- return await this.instance.bindQueue(queue, exchange, pattern, args);
260
- }
261
- async publish(exchange, routingKey, content, options) {
262
- return await this.instance.publish(exchange, routingKey, content, options);
263
- }
264
- async sendToQueue(queue, content, options) {
265
- return await this.instance.sendToQueue(queue, content, options);
266
- }
267
- async consume(queue, onMessage, options) {
268
- return await this.instance.consume(queue, onMessage, options);
269
- }
270
- async ensure(funcImpl, args = null) {
271
- return await this.instance.ensure(funcImpl, args);
272
- }
273
192
  }
274
193
  exports.MqService = MqService;
194
+ MqService.DEAD_LETTER_QUEUE = 'general-dead-letter-queue';
195
+ MqService.RETRY_EXCHANGE = 'general-retry-exchange';
275
196
  //# sourceMappingURL=mq.service.js.map