@puca/puca-core 12.14.0 → 13.0.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.
- package/dist/core/services/abstract-controller.d.ts +2 -1
- package/dist/core/services/abstract-controller.js +10 -0
- package/dist/core/services/abstract-controller.js.map +1 -1
- package/dist/core/services/crud-base-testable.service.js +4 -1
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/domain-life-cycle.service.d.ts +3 -1
- package/dist/core/services/domain-life-cycle.service.js +4 -1
- package/dist/core/services/domain-life-cycle.service.js.map +1 -1
- package/dist/core/services/index.js +5 -5
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.js +2 -1
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/llm/llm.service.d.ts +28 -15
- package/dist/core/services/llm/llm.service.js +144 -76
- package/dist/core/services/llm/llm.service.js.map +1 -1
- package/dist/core/services/llm/token-budget.service.d.ts +7 -2
- package/dist/core/services/llm/token-budget.service.js +57 -23
- package/dist/core/services/llm/token-budget.service.js.map +1 -1
- package/dist/core/services/mcp/mcp-server.service.d.ts +16 -1
- package/dist/core/services/mcp/mcp-server.service.js +17 -9
- package/dist/core/services/mcp/mcp-server.service.js.map +1 -1
- package/dist/core/services/monitor.d.ts +7 -4
- package/dist/core/services/monitor.js +29 -5
- package/dist/core/services/monitor.js.map +1 -1
- package/dist/core/services/mq/mq.service.d.ts +6 -10
- package/dist/core/services/mq/mq.service.js +167 -20
- package/dist/core/services/mq/mq.service.js.map +1 -1
- package/dist/core/services/report.service.js +13 -0
- package/dist/core/services/report.service.js.map +1 -1
- package/dist/core/services/task.service.d.ts +2 -0
- package/dist/core/services/task.service.js.map +1 -1
- package/dist/essential/module-config.service.js +2 -2
- package/dist/essential/module-config.service.js.map +1 -1
- package/dist/models/crud-controller-especification-environment.d.ts +11 -3
- package/dist/models/crud-controller-especification-environment.js.map +1 -1
- package/dist/models/crud-controller-especification.d.ts +1 -1
- package/dist/orm/cases/vanilla/sql-builder/select.service.js +20 -18
- package/dist/orm/cases/vanilla/sql-builder/select.service.js.map +1 -1
- package/dist/orm/services/transaction.js +3 -1
- package/dist/orm/services/transaction.js.map +1 -1
- package/dist/packages/crm/crm.service.js +5 -1
- package/dist/packages/crm/crm.service.js.map +1 -1
- package/dist/plugins/final-user-query-language/final-user-query-language.js +5 -5
- package/dist/plugins/final-user-query-language/final-user-query-language.js.map +1 -1
- package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.d.ts +3 -0
- package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.js +13 -6
- package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.js.map +1 -1
- package/dist/plugins/nestjs/puca-auth.decorators.js +3 -0
- package/dist/plugins/nestjs/puca-auth.decorators.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/fuql-grammar.js +139 -32
- package/fuql-grammar.ne +128 -22
- package/fuql-snapshot/COMAC_MATERIAL_DE_CONSTRUCAO_L_ONDE__Cliente____Chave__nica_____43767__E__Nota_Fiscal____Data______02_06_2025_.json +55 -0
- package/fuql-snapshot/ONDE_N_O_f4___v5_E_f5___v6.json +39 -0
- package/fuql-snapshot/ONDE_Responsavel_CONTEM_raphael.json +17 -0
- package/fuql-snapshot/ONDE_Responsavel__CONTEM_raphael.json +31 -0
- package/fuql-snapshot/ONDE__123_____123_.json +19 -0
- package/fuql-snapshot/ONDE__Etapa____Nome____teste.json +17 -0
- package/fuql-snapshot/ONDE__N_O_f4___v5_E_f5___v6_.json +43 -0
- package/fuql-snapshot/ONDE___idade___18__E__nome____Raphael__OU_nome____Carvalho__.json +104 -0
- package/fuql-snapshot/ONDE__nome_____sobrenome_.json +19 -0
- package/fuql-snapshot/ONDE_data___01_01_2023.json +16 -0
- package/fuql-snapshot/ONDE_nome___1_000_00.json +16 -0
- package/fuql-snapshot/ONDE_nome___Raphael_Carvalho_de_Aguiar.json +16 -0
- package/fuql-snapshot/ONDE_nome____.json +16 -0
- package/fuql-snapshot/ONDE_nome_____Raphael__E_N_O_sobrenome____Carvalho_.json +46 -0
- package/fuql-snapshot/ONDE_responsavel___puca_user.json +16 -0
- package/fuql-snapshot/a223.json +6 -0
- package/fuql-snapshot/bom_dia_ONDE_nome____Raphael_Carvalho_de_Aguiar_.json +18 -0
- package/package.json +1 -1
|
@@ -19,18 +19,31 @@ export interface ToolDefinitionConfig {
|
|
|
19
19
|
};
|
|
20
20
|
};
|
|
21
21
|
required?: string[];
|
|
22
|
+
oneOf?: {
|
|
23
|
+
required: string[];
|
|
24
|
+
}[];
|
|
22
25
|
additionalProperties?: boolean;
|
|
23
26
|
};
|
|
24
27
|
}
|
|
25
28
|
export interface ToolDefinition<T> {
|
|
26
29
|
config: ToolDefinitionConfig;
|
|
27
30
|
handler: (args: T) => Promise<{
|
|
31
|
+
isError: boolean;
|
|
28
32
|
content: {
|
|
29
33
|
type: 'text';
|
|
30
34
|
text: string;
|
|
31
35
|
}[];
|
|
32
36
|
}>;
|
|
33
37
|
}
|
|
38
|
+
export interface PucaInternalMcpEspecification {
|
|
39
|
+
path: string;
|
|
40
|
+
scope: string;
|
|
41
|
+
availableToAssistent?: boolean;
|
|
42
|
+
assistantProps?: {
|
|
43
|
+
examples: string;
|
|
44
|
+
keywords: string[];
|
|
45
|
+
};
|
|
46
|
+
}
|
|
34
47
|
export declare class McpServer {
|
|
35
48
|
private readonly secondaryDataBase;
|
|
36
49
|
private readonly server;
|
|
@@ -53,7 +66,9 @@ export declare class McpServerInstanceGerenciator {
|
|
|
53
66
|
private readonly servers;
|
|
54
67
|
private instances;
|
|
55
68
|
constructor(secondaryDataBase: SecondaryDatabase);
|
|
56
|
-
registerMcpServer(name: string, server: McpServerBuildFunction
|
|
69
|
+
registerMcpServer(name: string, server: McpServerBuildFunction, opts: {
|
|
70
|
+
pucaInternalEspecification: PucaInternalMcpEspecification;
|
|
71
|
+
}): Promise<void>;
|
|
57
72
|
process(name: string, { req, res, user }: {
|
|
58
73
|
req: Request;
|
|
59
74
|
res: Response;
|
|
@@ -27,12 +27,6 @@ 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
|
-
}
|
|
36
30
|
});
|
|
37
31
|
this.server.setRequestHandler(types_js_1.ListToolsRequestSchema, async () => ({
|
|
38
32
|
tools: list.map((tool) => tool.config)
|
|
@@ -61,8 +55,8 @@ class McpServer {
|
|
|
61
55
|
await this.secondaryDataBase.get(resource.uri);
|
|
62
56
|
if (!r) {
|
|
63
57
|
r = await (async () => {
|
|
64
|
-
const
|
|
65
|
-
return
|
|
58
|
+
const response = await axios_1.default.get(resource.uri);
|
|
59
|
+
return response.data.raw;
|
|
66
60
|
})();
|
|
67
61
|
await this.secondaryDataBase.setex(resource.uri, 60 * 60 * 1, r);
|
|
68
62
|
}
|
|
@@ -98,8 +92,22 @@ class McpServerInstanceGerenciator {
|
|
|
98
92
|
});
|
|
99
93
|
}, 1000 * 60);
|
|
100
94
|
}
|
|
101
|
-
async registerMcpServer(name, server) {
|
|
95
|
+
async registerMcpServer(name, server, opts) {
|
|
102
96
|
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));
|
|
103
111
|
}
|
|
104
112
|
async process(name, { req, res, user }) {
|
|
105
113
|
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":";;;AACA,wEAAgF;AAChF,0FAAkG;AAClG,iCAAyB;AACzB,iEAK2C;
|
|
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,9 +1,8 @@
|
|
|
1
1
|
import { ModuleConfigService } from '../../essential/module-config.service';
|
|
2
|
-
import { EnvConfigService } from '../../essential/envs-config.service';
|
|
3
2
|
import { ConfigService } from '../../essential/config.service';
|
|
4
3
|
export declare class MonitorService {
|
|
4
|
+
private readonly domain;
|
|
5
5
|
private readonly moduleConfigService;
|
|
6
|
-
private readonly envConfigService;
|
|
7
6
|
private readonly configService;
|
|
8
7
|
private readonly logger;
|
|
9
8
|
private static readonly URL;
|
|
@@ -11,8 +10,12 @@ export declare class MonitorService {
|
|
|
11
10
|
private static readonly ORG;
|
|
12
11
|
private static readonly BUCKET;
|
|
13
12
|
private readonly batch;
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
private interval;
|
|
14
|
+
constructor(domain: string, moduleConfigService: ModuleConfigService, configService: ConfigService);
|
|
15
|
+
init(): Promise<void>;
|
|
16
|
+
destroy(): Promise<void>;
|
|
17
|
+
hit(measurement: string, tags: any, value: number, precision?: "s" | "ms" | "us" | "ns"): Promise<void>;
|
|
18
|
+
alert(measurement: string, message: string): Promise<void>;
|
|
16
19
|
private computeData;
|
|
17
20
|
private flush;
|
|
18
21
|
}
|
|
@@ -5,17 +5,22 @@ const _ = require("lodash");
|
|
|
5
5
|
const axios_1 = require("axios");
|
|
6
6
|
const logger_1 = require("./logger");
|
|
7
7
|
class MonitorService {
|
|
8
|
-
constructor(
|
|
8
|
+
constructor(domain, moduleConfigService, configService) {
|
|
9
|
+
this.domain = domain;
|
|
9
10
|
this.moduleConfigService = moduleConfigService;
|
|
10
|
-
this.envConfigService = envConfigService;
|
|
11
11
|
this.configService = configService;
|
|
12
12
|
this.logger = new logger_1.Logger('MonitorService');
|
|
13
13
|
this.batch = [];
|
|
14
|
-
|
|
14
|
+
}
|
|
15
|
+
async init() {
|
|
16
|
+
this.interval = setInterval(() => {
|
|
15
17
|
this.flush();
|
|
16
18
|
}, 60000);
|
|
17
19
|
}
|
|
18
|
-
async
|
|
20
|
+
async destroy() {
|
|
21
|
+
clearInterval(this.interval);
|
|
22
|
+
}
|
|
23
|
+
async hit(measurement, tags, value, precision = 's') {
|
|
19
24
|
this.batch.push({
|
|
20
25
|
precision,
|
|
21
26
|
measurement,
|
|
@@ -23,6 +28,21 @@ class MonitorService {
|
|
|
23
28
|
value
|
|
24
29
|
});
|
|
25
30
|
}
|
|
31
|
+
async alert(measurement, message) {
|
|
32
|
+
const module = await this.moduleConfigService.getModuleConfig();
|
|
33
|
+
const discordChannel = 'https://discord.com/api/webhooks/1379568992724713472/o-kY0nCxMsxN9GDcZ0RdX_5p16A_mUN4h7TWdrAqBIsSar5dLAvt4beZcrjbplpCAMgz';
|
|
34
|
+
axios_1.default.post(discordChannel, {
|
|
35
|
+
content: `**[${this.domain}]** ${module.name}\n${message}`
|
|
36
|
+
}, {
|
|
37
|
+
headers: {
|
|
38
|
+
'Content-Type': 'application/json'
|
|
39
|
+
}
|
|
40
|
+
})
|
|
41
|
+
.catch(error => {
|
|
42
|
+
var _a;
|
|
43
|
+
this.logger.error('Failed to send alert to Discord', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.message);
|
|
44
|
+
});
|
|
45
|
+
}
|
|
26
46
|
async computeData(points) {
|
|
27
47
|
const module = await this.moduleConfigService.getModuleConfig();
|
|
28
48
|
const secret = await this.configService.getSecret();
|
|
@@ -36,7 +56,11 @@ class MonitorService {
|
|
|
36
56
|
data.push(['version', version]);
|
|
37
57
|
data.push(['domain', secret.namespace]);
|
|
38
58
|
data.push(['env', env]);
|
|
39
|
-
const
|
|
59
|
+
const normalize = (value) => {
|
|
60
|
+
const valueStr = `${value}`;
|
|
61
|
+
return valueStr.replace(/[^a-zA-Z0-9]/g, '').replace(/ /g, '_');
|
|
62
|
+
};
|
|
63
|
+
const dataStr = data.map(([key, value]) => `${_.snakeCase(key)}=${normalize(value)}`).join(',');
|
|
40
64
|
result.push(`${_.snakeCase(point.measurement)},${dataStr} value=${point.value}`);
|
|
41
65
|
}
|
|
42
66
|
return result.join('\n');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../../src/core/services/monitor.ts"],"names":[],"mappings":";;;AAAA,4BAA2B;AAC3B,iCAAyB;AAGzB,qCAAiC;
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../../src/core/services/monitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Options } from 'amqplib';
|
|
2
2
|
import { ConfigService } from '../../../essential/config.service';
|
|
3
|
+
import { MonitorService } from '../monitor';
|
|
3
4
|
export interface ConsumeOptions extends Options.Consume {
|
|
4
5
|
delayBeforeRetry?: number;
|
|
5
6
|
maxSimultaneousMessages?: number;
|
|
@@ -10,19 +11,14 @@ export interface PublishOptions extends Options.Publish {
|
|
|
10
11
|
export declare class MqService {
|
|
11
12
|
private readonly domain;
|
|
12
13
|
private readonly configService;
|
|
13
|
-
private
|
|
14
|
-
private static readonly DEAD_LETTER_QUEUE;
|
|
15
|
-
private static readonly RETRY_EXCHANGE;
|
|
14
|
+
private readonly monitorService;
|
|
16
15
|
private readonly logger;
|
|
17
|
-
private
|
|
18
|
-
private
|
|
19
|
-
|
|
20
|
-
private additionalChannels;
|
|
21
|
-
constructor(domain: string, configService: ConfigService);
|
|
22
|
-
private connect;
|
|
16
|
+
private instance;
|
|
17
|
+
private ready;
|
|
18
|
+
constructor(domain: string, configService: ConfigService, monitorService: MonitorService);
|
|
23
19
|
init(): Promise<void>;
|
|
24
20
|
shutdown(): Promise<void>;
|
|
25
|
-
private
|
|
21
|
+
private waitForReady;
|
|
26
22
|
assertQueue(queue: string, options?: Options.AssertQueue): Promise<import("amqplib").Replies.AssertQueue>;
|
|
27
23
|
assertExchange(exchange: string, type?: string, options?: Options.AssertExchange): Promise<import("amqplib").Replies.AssertExchange>;
|
|
28
24
|
bindQueue(queue: string, exchange: string, pattern: string, args?: any): Promise<import("amqplib").Replies.Empty>;
|
|
@@ -4,12 +4,14 @@ exports.MqService = void 0;
|
|
|
4
4
|
const _ = require("lodash");
|
|
5
5
|
const amqplib_1 = require("amqplib");
|
|
6
6
|
const logger_1 = require("../logger");
|
|
7
|
-
|
|
7
|
+
const events_1 = require("events");
|
|
8
|
+
class MqServiceInstance {
|
|
8
9
|
constructor(domain, configService) {
|
|
9
10
|
this.domain = domain;
|
|
10
11
|
this.configService = configService;
|
|
11
12
|
this.closing = false;
|
|
12
|
-
this.logger = new logger_1.Logger(
|
|
13
|
+
this.logger = new logger_1.Logger(MqServiceInstance.name);
|
|
14
|
+
this.eventEmmiter = new events_1.EventEmitter();
|
|
13
15
|
this.queues = {};
|
|
14
16
|
this.additionalChannels = [];
|
|
15
17
|
}
|
|
@@ -40,17 +42,16 @@ class MqService {
|
|
|
40
42
|
if (this.closing) {
|
|
41
43
|
return;
|
|
42
44
|
}
|
|
43
|
-
this.
|
|
44
|
-
throw new Error('Connection to RabbitMQ closed');
|
|
45
|
+
this.eventEmmiter.emit('connectionClosed');
|
|
45
46
|
});
|
|
46
47
|
this.connection.on('error', (error) => {
|
|
47
48
|
this.logger.error('Connection to RabbitMQ error', error);
|
|
48
49
|
});
|
|
49
|
-
const mainChannel = await this.
|
|
50
|
-
await mainChannel.assertQueue(
|
|
50
|
+
const mainChannel = await this.createChannel('mainChannel');
|
|
51
|
+
await mainChannel.assertQueue(MqServiceInstance.DEAD_LETTER_QUEUE, {
|
|
51
52
|
durable: true
|
|
52
53
|
});
|
|
53
|
-
await mainChannel.assertExchange(
|
|
54
|
+
await mainChannel.assertExchange(MqServiceInstance.RETRY_EXCHANGE, 'x-delayed-message', {
|
|
54
55
|
durable: true,
|
|
55
56
|
arguments: {
|
|
56
57
|
'x-delayed-type': 'direct'
|
|
@@ -58,13 +59,30 @@ class MqService {
|
|
|
58
59
|
});
|
|
59
60
|
this.mainChannel = mainChannel;
|
|
60
61
|
}
|
|
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
|
+
}
|
|
61
72
|
async init() {
|
|
62
73
|
await this.connect();
|
|
63
74
|
}
|
|
64
75
|
async shutdown() {
|
|
65
76
|
this.closing = true;
|
|
66
|
-
this.connection
|
|
67
|
-
|
|
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');
|
|
68
86
|
await this.mainChannel.close();
|
|
69
87
|
for (const { channel } of Object.values(this.queues)) {
|
|
70
88
|
await channel.close();
|
|
@@ -72,7 +90,7 @@ class MqService {
|
|
|
72
90
|
for (const channel of this.additionalChannels) {
|
|
73
91
|
await channel.close();
|
|
74
92
|
}
|
|
75
|
-
await
|
|
93
|
+
await connection.close();
|
|
76
94
|
}
|
|
77
95
|
computeExpBackoff(delay, retryCount) {
|
|
78
96
|
const base = 2;
|
|
@@ -82,7 +100,7 @@ class MqService {
|
|
|
82
100
|
async assertQueue(queue, options) {
|
|
83
101
|
const mainChannel = this.mainChannel;
|
|
84
102
|
const queueCreated = await mainChannel.assertQueue(queue, Object.assign({ durable: true }, options));
|
|
85
|
-
await mainChannel.bindQueue(queue,
|
|
103
|
+
await mainChannel.bindQueue(queue, MqServiceInstance.RETRY_EXCHANGE, queue);
|
|
86
104
|
return queueCreated;
|
|
87
105
|
}
|
|
88
106
|
async assertExchange(exchange, type = 'fanout', options) {
|
|
@@ -94,10 +112,6 @@ class MqService {
|
|
|
94
112
|
return await mainChannel.bindQueue(queue, exchange, pattern, args);
|
|
95
113
|
}
|
|
96
114
|
async publish(exchange, routingKey, content, options) {
|
|
97
|
-
if (!this.connection) {
|
|
98
|
-
this.logger.warn('channel not initialized');
|
|
99
|
-
return;
|
|
100
|
-
}
|
|
101
115
|
const mainChannel = this.mainChannel;
|
|
102
116
|
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 }) }));
|
|
103
117
|
}
|
|
@@ -106,7 +120,7 @@ class MqService {
|
|
|
106
120
|
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 }) }));
|
|
107
121
|
}
|
|
108
122
|
async consume(queue, onMessage, options) {
|
|
109
|
-
const channel = ((options === null || options === void 0 ? void 0 : options.maxSimultaneousMessages) ? await this.
|
|
123
|
+
const channel = ((options === null || options === void 0 ? void 0 : options.maxSimultaneousMessages) ? await this.createChannel(`channel-${queue}`) : this.mainChannel);
|
|
110
124
|
if (options === null || options === void 0 ? void 0 : options.maxSimultaneousMessages) {
|
|
111
125
|
await channel.prefetch(options.maxSimultaneousMessages);
|
|
112
126
|
this.additionalChannels.push(channel);
|
|
@@ -150,7 +164,7 @@ class MqService {
|
|
|
150
164
|
'max-retry-count': maxRetryCount,
|
|
151
165
|
'first-try': firstTry
|
|
152
166
|
};
|
|
153
|
-
channel.publish(
|
|
167
|
+
channel.publish(MqServiceInstance.RETRY_EXCHANGE, queue, msg.content, { headers });
|
|
154
168
|
channel.ack(msg);
|
|
155
169
|
}
|
|
156
170
|
else if (retryCount >= maxRetryCount) {
|
|
@@ -162,7 +176,7 @@ class MqService {
|
|
|
162
176
|
max_retry_count: maxRetryCount,
|
|
163
177
|
first_try: firstTry,
|
|
164
178
|
};
|
|
165
|
-
channel.sendToQueue(
|
|
179
|
+
channel.sendToQueue(MqServiceInstance.DEAD_LETTER_QUEUE, Buffer.from(JSON.stringify(deadContent)));
|
|
166
180
|
channel.ack(msg);
|
|
167
181
|
this.logger.error('Mensagem descartada', msg.content.toString(), error);
|
|
168
182
|
}
|
|
@@ -189,8 +203,141 @@ class MqService {
|
|
|
189
203
|
});
|
|
190
204
|
await mainChannel.sendToQueue(queue, Buffer.from(JSON.stringify(args)));
|
|
191
205
|
}
|
|
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, monitorService) {
|
|
223
|
+
this.domain = domain;
|
|
224
|
+
this.configService = configService;
|
|
225
|
+
this.monitorService = monitorService;
|
|
226
|
+
this.logger = new logger_1.Logger(MqService.name);
|
|
227
|
+
this.ready = false;
|
|
228
|
+
}
|
|
229
|
+
async init() {
|
|
230
|
+
const connect = async () => {
|
|
231
|
+
this.ready = false;
|
|
232
|
+
const instance = new MqServiceInstance(this.domain, this.configService);
|
|
233
|
+
instance.onDisconnect(async () => {
|
|
234
|
+
this.ready = false;
|
|
235
|
+
this.logger.warn('RabbitMQ connection lost, reinitializing instance...');
|
|
236
|
+
this.monitorService.alert('rabbitmq-connection-lost', 'Conexão com RabbitMQ perdida, reinicializando instância...');
|
|
237
|
+
return await connect()
|
|
238
|
+
.then(async () => {
|
|
239
|
+
instance.shutdown()
|
|
240
|
+
.catch((error) => {
|
|
241
|
+
});
|
|
242
|
+
})
|
|
243
|
+
.catch(async (error) => {
|
|
244
|
+
this.logger.error('Failed to reconnect to RabbitMQ', error);
|
|
245
|
+
this.logger.error('Critical error in RabbitMQ service, shutting down the process...');
|
|
246
|
+
process.exit(1);
|
|
247
|
+
});
|
|
248
|
+
});
|
|
249
|
+
await instance.init();
|
|
250
|
+
this.instance = instance;
|
|
251
|
+
this.ready = true;
|
|
252
|
+
};
|
|
253
|
+
await connect();
|
|
254
|
+
}
|
|
255
|
+
async shutdown() {
|
|
256
|
+
await this.instance.shutdown();
|
|
257
|
+
}
|
|
258
|
+
async waitForReady() {
|
|
259
|
+
if (this.ready) {
|
|
260
|
+
return;
|
|
261
|
+
}
|
|
262
|
+
return new Promise((resolve) => {
|
|
263
|
+
const interval = setInterval(() => {
|
|
264
|
+
if (this.ready) {
|
|
265
|
+
clearInterval(interval);
|
|
266
|
+
resolve();
|
|
267
|
+
}
|
|
268
|
+
}, 100);
|
|
269
|
+
});
|
|
270
|
+
}
|
|
271
|
+
async assertQueue(queue, options) {
|
|
272
|
+
await this.waitForReady();
|
|
273
|
+
try {
|
|
274
|
+
return await this.instance.assertQueue(queue, options);
|
|
275
|
+
}
|
|
276
|
+
catch (error) {
|
|
277
|
+
this.monitorService.alert('rabbitmq-assert-queue-failed', `Failed to assert queue ${queue}: ${error.message}`);
|
|
278
|
+
throw error;
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
async assertExchange(exchange, type = 'fanout', options) {
|
|
282
|
+
await this.waitForReady();
|
|
283
|
+
try {
|
|
284
|
+
return await this.instance.assertExchange(exchange, type, options);
|
|
285
|
+
}
|
|
286
|
+
catch (error) {
|
|
287
|
+
this.monitorService.alert('rabbitmq-assert-exchange-failed', `Failed to assert exchange ${exchange}: ${error.message}`);
|
|
288
|
+
throw error;
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
async bindQueue(queue, exchange, pattern, args) {
|
|
292
|
+
await this.waitForReady();
|
|
293
|
+
try {
|
|
294
|
+
return await this.instance.bindQueue(queue, exchange, pattern, args);
|
|
295
|
+
}
|
|
296
|
+
catch (error) {
|
|
297
|
+
this.monitorService.alert('rabbitmq-bind-queue-failed', `Failed to bind queue ${queue} to exchange ${exchange}: ${error.message}`);
|
|
298
|
+
throw error;
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
async publish(exchange, routingKey, content, options) {
|
|
302
|
+
await this.waitForReady();
|
|
303
|
+
try {
|
|
304
|
+
return await this.instance.publish(exchange, routingKey, content, options);
|
|
305
|
+
}
|
|
306
|
+
catch (error) {
|
|
307
|
+
this.monitorService.alert('rabbitmq-publish-failed', `Failed to publish to exchange ${exchange} with routingKey ${routingKey}: ${error.message}`);
|
|
308
|
+
throw error;
|
|
309
|
+
}
|
|
310
|
+
}
|
|
311
|
+
async sendToQueue(queue, content, options) {
|
|
312
|
+
await this.waitForReady();
|
|
313
|
+
try {
|
|
314
|
+
return await this.instance.sendToQueue(queue, content, options);
|
|
315
|
+
}
|
|
316
|
+
catch (error) {
|
|
317
|
+
this.monitorService.alert('rabbitmq-send-to-queue-failed', `Failed to send to queue ${queue}: ${error.message}`);
|
|
318
|
+
throw error;
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
async consume(queue, onMessage, options) {
|
|
322
|
+
await this.waitForReady();
|
|
323
|
+
try {
|
|
324
|
+
return await this.instance.consume(queue, onMessage, options);
|
|
325
|
+
}
|
|
326
|
+
catch (error) {
|
|
327
|
+
this.monitorService.alert('rabbitmq-consume-failed', `Failed to consume queue ${queue}: ${error.message}`);
|
|
328
|
+
throw error;
|
|
329
|
+
}
|
|
330
|
+
}
|
|
331
|
+
async ensure(funcImpl, args = null) {
|
|
332
|
+
await this.waitForReady();
|
|
333
|
+
try {
|
|
334
|
+
return await this.instance.ensure(funcImpl, args);
|
|
335
|
+
}
|
|
336
|
+
catch (error) {
|
|
337
|
+
this.monitorService.alert('rabbitmq-ensure-failed', `Failed to ensure: ${error.message}`);
|
|
338
|
+
throw error;
|
|
339
|
+
}
|
|
340
|
+
}
|
|
192
341
|
}
|
|
193
342
|
exports.MqService = MqService;
|
|
194
|
-
MqService.DEAD_LETTER_QUEUE = 'general-dead-letter-queue';
|
|
195
|
-
MqService.RETRY_EXCHANGE = 'general-retry-exchange';
|
|
196
343
|
//# sourceMappingURL=mq.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mq.service.js","sourceRoot":"","sources":["../../../../src/core/services/mq/mq.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mq.service.js","sourceRoot":"","sources":["../../../../src/core/services/mq/mq.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -269,6 +269,19 @@ class ReportService {
|
|
|
269
269
|
if (mode === ReportMode.PublicSyncPermanent) {
|
|
270
270
|
return link;
|
|
271
271
|
}
|
|
272
|
+
else {
|
|
273
|
+
await this.notificationService.send({
|
|
274
|
+
channels: ['toast'],
|
|
275
|
+
method: 'success',
|
|
276
|
+
destination: user.puca_pid,
|
|
277
|
+
link: `0=document-viewer/${encodeURIComponent(link)}?name=${documentName}&type=${documentType}`,
|
|
278
|
+
user,
|
|
279
|
+
title: `O relatório '${documentName}' está disponível`,
|
|
280
|
+
shortMessage: null,
|
|
281
|
+
htmlMessage: null,
|
|
282
|
+
expires: 604800
|
|
283
|
+
});
|
|
284
|
+
}
|
|
272
285
|
}
|
|
273
286
|
async renderData(args) {
|
|
274
287
|
if (!args.mode) {
|