@puca/puca-core 10.8.3 → 10.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/services/index.d.ts +2 -0
- package/dist/core/services/index.js +5 -3
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/life-cycle.service.d.ts +3 -1
- package/dist/core/services/life-cycle.service.js +5 -1
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/mq/mq.service.d.ts +26 -0
- package/dist/core/services/mq/mq.service.js +140 -0
- package/dist/core/services/mq/mq.service.js.map +1 -0
- package/dist/core/services/storage/implementation/s3-client.service.d.ts +5 -1
- package/dist/core/services/storage/implementation/s3-client.service.js +29 -2
- package/dist/core/services/storage/implementation/s3-client.service.js.map +1 -1
- package/dist/core/services/storage/storage.service.d.ts +3 -1
- package/dist/core/services/storage/storage.service.js +8 -3
- package/dist/core/services/storage/storage.service.js.map +1 -1
- package/dist/core/services/user.service.js +0 -1
- package/dist/core/services/user.service.js.map +1 -1
- package/dist/models/secret.d.ts +6 -0
- package/dist/orm/services/repository.js +12 -4
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/orm/services/sql-executor.d.ts +0 -2
- package/dist/orm/services/sql-executor.js +1 -249
- package/dist/orm/services/sql-executor.js.map +1 -1
- package/dist/plugins/eval/eval.service.js +4 -1
- package/dist/plugins/eval/eval.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -1
|
@@ -26,6 +26,7 @@ import { IncrementalSearchService } from './incremental-search.service';
|
|
|
26
26
|
import { LinkBuilder } from './link-builder';
|
|
27
27
|
import { PluginService } from './plugin.service';
|
|
28
28
|
import { SystemParametersEnvs } from './system-parameters-envs.service';
|
|
29
|
+
import { MqService } from './mq/mq.service';
|
|
29
30
|
export declare const jobExecutorFactory: JobExecutorFactory;
|
|
30
31
|
export declare const singleInstanceEnsureService: SingleInstanceEnsureService;
|
|
31
32
|
export declare const evalServiceFactory: EvalServiceFactory;
|
|
@@ -53,4 +54,5 @@ export declare const selectManyDataService: SelectManyDataService;
|
|
|
53
54
|
export declare const userService: UserService;
|
|
54
55
|
export declare const pluginService: PluginService;
|
|
55
56
|
export declare const linkBuilder: LinkBuilder;
|
|
57
|
+
export declare const mqService: MqService;
|
|
56
58
|
export declare const lifeCycleService: LifeCycleService;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.lifeCycleService = exports.linkBuilder = exports.pluginService = exports.userService = exports.selectManyDataService = exports.reportService = exports.followersService = exports.notificationService = exports.emailService = exports.oneSignalService = exports.webSocketService = exports.installService = exports.incrementalSearchService = exports.tablePermissionService = exports.moduleEspecificationService = exports.bootstrapService = exports.migrationService = exports.sourceService = exports.comunicationService = exports.comunicationHttpService = exports.userConfigService = exports.authService = exports.storageServiceManager = exports.jobService = exports.systemParametersEnvs = exports.evalServiceFactory = exports.singleInstanceEnsureService = exports.jobExecutorFactory = void 0;
|
|
3
|
+
exports.lifeCycleService = exports.mqService = exports.linkBuilder = exports.pluginService = exports.userService = exports.selectManyDataService = exports.reportService = exports.followersService = exports.notificationService = exports.emailService = exports.oneSignalService = exports.webSocketService = exports.installService = exports.incrementalSearchService = exports.tablePermissionService = exports.moduleEspecificationService = exports.bootstrapService = exports.migrationService = exports.sourceService = exports.comunicationService = exports.comunicationHttpService = exports.userConfigService = exports.authService = exports.storageServiceManager = exports.jobService = exports.systemParametersEnvs = exports.evalServiceFactory = exports.singleInstanceEnsureService = exports.jobExecutorFactory = void 0;
|
|
4
4
|
const plugins_1 = require("../../plugins");
|
|
5
5
|
const essential_1 = require("../../essential");
|
|
6
6
|
const services_1 = require("../../orm/services");
|
|
@@ -38,12 +38,13 @@ const link_builder_1 = require("./link-builder");
|
|
|
38
38
|
const plugin_service_1 = require("./plugin.service");
|
|
39
39
|
const system_parameters_envs_service_1 = require("./system-parameters-envs.service");
|
|
40
40
|
const cases_1 = require("../../orm/cases");
|
|
41
|
+
const mq_service_1 = require("./mq/mq.service");
|
|
41
42
|
exports.jobExecutorFactory = new job_executor_service_1.JobExecutorFactory(essential_1.configService, essential_1.envConfigService, plugins_1.uuidService, essential_1.auditService);
|
|
42
43
|
exports.singleInstanceEnsureService = new single_instance_ensure_service_1.SingleInstanceEnsureService(exports.jobExecutorFactory);
|
|
43
44
|
exports.evalServiceFactory = new eval_service_1.EvalServiceFactory(services_1.repositoryFactory, plugins_1.uuidService);
|
|
44
45
|
exports.systemParametersEnvs = new system_parameters_envs_service_1.SystemParametersEnvs(services_1.repositoryFactory, essential_1.configService);
|
|
45
46
|
exports.jobService = new job_service_1.JobService(new job_client_1.JobClientManager(essential_1.configService), essential_1.configService, essential_1.moduleConfigService);
|
|
46
|
-
exports.storageServiceManager = new storage_service_1.StorageServiceManager(essential_1.configService);
|
|
47
|
+
exports.storageServiceManager = new storage_service_1.StorageServiceManager(services_1.redisManagerService, essential_1.configService);
|
|
47
48
|
exports.authService = new auth_service_1.AuthService(essential_1.configService, services_1.repositoryFactory, essential_1.moduleConfigService, plugins_1.uuidService);
|
|
48
49
|
exports.userConfigService = new user_config_service_1.UserConfigService(essential_1.moduleConfigService, services_1.repositoryFactory, essential_1.configService, exports.evalServiceFactory);
|
|
49
50
|
exports.comunicationHttpService = new comunication_http_service_1.ComunicationServiceHttp(essential_1.configService);
|
|
@@ -70,5 +71,6 @@ exports.selectManyDataService = new select_many_data_service_1.SelectManyDataSer
|
|
|
70
71
|
exports.userService = new user_service_1.UserService(services_1.repositoryFactory);
|
|
71
72
|
exports.pluginService = new plugin_service_1.PluginService(essential_1.configService, exports.comunicationService, essential_1.envConfigService);
|
|
72
73
|
exports.linkBuilder = new link_builder_1.LinkBuilder(essential_1.envConfigService);
|
|
73
|
-
exports.
|
|
74
|
+
exports.mqService = new mq_service_1.MqService(essential_1.configService, essential_1.envConfigService);
|
|
75
|
+
exports.lifeCycleService = new life_cycle_service_1.LifeCycleService(services_1.databaseManagerService, services_1.redisManagerService, exports.bootstrapService, essential_1.envConfigService, exports.installService, exports.webSocketService, essential_1.configService, services_1.sqlService, exports.reportService, exports.jobExecutorFactory, exports.evalServiceFactory, exports.oneSignalService, exports.incrementalSearchService, exports.emailService, essential_1.auditService, exports.authService, exports.userService, exports.pluginService, services_1.repositoryFactory, exports.systemParametersEnvs, exports.mqService);
|
|
74
76
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":";;;AAAA,2CAA+D;AAC/D,+CAAqG;AACrG,iDAAyJ;AACzJ,2DAAuD;AACvD,8EAA0E;AAC1E,6DAAwD;AACxD,qEAAiE;AACjE,uDAAmD;AACnD,+DAA0D;AAC1D,6DAAwD;AACxD,iDAA6C;AAC7C,+DAAkE;AAClE,oFAAkH;AAClH,0FAAmF;AACnF,4DAAwD;AACxD,wFAAmF;AACnF,qDAAiD;AACjD,iEAA6D;AAC7D,2DAAuD;AACvD,iDAAoD;AACpD,mDAA+C;AAC/C,qFAA+E;AAC/E,iDAAoD;AACpD,8EAAyE;AACzE,yEAAoE;AACpE,mFAA8E;AAC9E,uEAAkI;AAClI,6EAAyD;AACzD,2DAAuD;AACvD,mDAAmE;AACnE,yEAAmE;AACnE,iDAA6C;AAC7C,6EAA0F;AAC1F,iDAA6C;AAC7C,qDAAiD;AACjD,qFAAuE;AACvE,2CAA4D;AAE/
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ import { UserService } from './user.service';
|
|
|
19
19
|
import { PluginService } from './plugin.service';
|
|
20
20
|
import { RepositoryFactory } from '../../orm/services/repository-factory';
|
|
21
21
|
import { SystemParametersEnvs } from './system-parameters-envs.service';
|
|
22
|
+
import { MqService } from './mq/mq.service';
|
|
22
23
|
export interface StartArgs {
|
|
23
24
|
appModule: any;
|
|
24
25
|
execBootStrap?: boolean;
|
|
@@ -50,11 +51,12 @@ export declare class LifeCycleService {
|
|
|
50
51
|
private readonly pluginService;
|
|
51
52
|
private readonly repositoryFactory;
|
|
52
53
|
private readonly systemParametersEnvs;
|
|
54
|
+
private readonly mqService;
|
|
53
55
|
private readonly logger;
|
|
54
56
|
private _isReady;
|
|
55
57
|
private app;
|
|
56
58
|
private readonly intervals;
|
|
57
|
-
constructor(databaseManagerService: DatabaseManagerService, redisManagerService: RedisManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService, webSocketService: WebSocketService, configService: ConfigService, sqlService: SqlService, reportService: ReportService, jobExecutorFactory: JobExecutorFactory, evalServiceFactory: EvalServiceFactory, oneSignalService: OneSignalService, incrementalSearchService: IncrementalSearchService, emailService: EmailService, auditService: AuditService, authService: AuthService, userService: UserService, pluginService: PluginService, repositoryFactory: RepositoryFactory, systemParametersEnvs: SystemParametersEnvs);
|
|
59
|
+
constructor(databaseManagerService: DatabaseManagerService, redisManagerService: RedisManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService, webSocketService: WebSocketService, configService: ConfigService, sqlService: SqlService, reportService: ReportService, jobExecutorFactory: JobExecutorFactory, evalServiceFactory: EvalServiceFactory, oneSignalService: OneSignalService, incrementalSearchService: IncrementalSearchService, emailService: EmailService, auditService: AuditService, authService: AuthService, userService: UserService, pluginService: PluginService, repositoryFactory: RepositoryFactory, systemParametersEnvs: SystemParametersEnvs, mqService: MqService);
|
|
58
60
|
shutdown(opt?: ShutdownArgs): Promise<void>;
|
|
59
61
|
start(args: StartArgs): Promise<INestApplication>;
|
|
60
62
|
private connectToRedis;
|
|
@@ -8,7 +8,7 @@ const logger_1 = require("./logger");
|
|
|
8
8
|
const job_executor_service_1 = require("./job-executor/job-executor.service");
|
|
9
9
|
const query_params_middleware_1 = require("../../plugins/nestjs/query-params.middleware");
|
|
10
10
|
class LifeCycleService {
|
|
11
|
-
constructor(databaseManagerService, redisManagerService, bootstrapService, envConfigService, installService, webSocketService, configService, sqlService, reportService, jobExecutorFactory, evalServiceFactory, oneSignalService, incrementalSearchService, emailService, auditService, authService, userService, pluginService, repositoryFactory, systemParametersEnvs) {
|
|
11
|
+
constructor(databaseManagerService, redisManagerService, bootstrapService, envConfigService, installService, webSocketService, configService, sqlService, reportService, jobExecutorFactory, evalServiceFactory, oneSignalService, incrementalSearchService, emailService, auditService, authService, userService, pluginService, repositoryFactory, systemParametersEnvs, mqService) {
|
|
12
12
|
this.databaseManagerService = databaseManagerService;
|
|
13
13
|
this.redisManagerService = redisManagerService;
|
|
14
14
|
this.bootstrapService = bootstrapService;
|
|
@@ -29,6 +29,7 @@ class LifeCycleService {
|
|
|
29
29
|
this.pluginService = pluginService;
|
|
30
30
|
this.repositoryFactory = repositoryFactory;
|
|
31
31
|
this.systemParametersEnvs = systemParametersEnvs;
|
|
32
|
+
this.mqService = mqService;
|
|
32
33
|
this.logger = new logger_1.Logger('LifeCycleService');
|
|
33
34
|
this._isReady = false;
|
|
34
35
|
this.intervals = [];
|
|
@@ -39,6 +40,7 @@ class LifeCycleService {
|
|
|
39
40
|
const serviceTasks = [];
|
|
40
41
|
serviceTasks.push(this.repositoryFactory.shutdown);
|
|
41
42
|
serviceTasks.push(() => job_executor_service_1.JobExecutor.shutdown(true));
|
|
43
|
+
serviceTasks.push(this.mqService.shutdown);
|
|
42
44
|
const essencialTasks = [];
|
|
43
45
|
essencialTasks.push(this.webSocketService.disconnect);
|
|
44
46
|
essencialTasks.push(this.databaseManagerService.get().disconnect);
|
|
@@ -118,6 +120,8 @@ class LifeCycleService {
|
|
|
118
120
|
activateReportJobProcessator: args.activateReportJobProcessator
|
|
119
121
|
});
|
|
120
122
|
doneEvent('reportService');
|
|
123
|
+
await this.mqService.init();
|
|
124
|
+
doneEvent('mqService');
|
|
121
125
|
await this.auditService.start({
|
|
122
126
|
app: this.app,
|
|
123
127
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":";;;AACA,+BAA8B;AAE9B,mGAG8D;AAG9D,uCAA2C;AAC3C,qCAAkC;AAQlC,8EAAsF;AAUtF,0FAAqF;
|
|
1
|
+
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { Options } from 'amqplib';
|
|
2
|
+
import { ConfigService } from '../../../essential/config.service';
|
|
3
|
+
import { EnvConfigService } from '../../../essential/envs-config.service';
|
|
4
|
+
export interface ConsumeOptions extends Options.Consume {
|
|
5
|
+
delayBeforeRetry?: number;
|
|
6
|
+
}
|
|
7
|
+
export declare class MqService {
|
|
8
|
+
private readonly configService;
|
|
9
|
+
private readonly envConfigService;
|
|
10
|
+
private static readonly DEAD_LETTER_QUEUE;
|
|
11
|
+
private static readonly RETRY_EXCHANGE;
|
|
12
|
+
private readonly logger;
|
|
13
|
+
private connection;
|
|
14
|
+
private channel;
|
|
15
|
+
private prefix;
|
|
16
|
+
constructor(configService: ConfigService, envConfigService: EnvConfigService);
|
|
17
|
+
init(): Promise<void>;
|
|
18
|
+
shutdown(): Promise<void>;
|
|
19
|
+
private computeExpBackoff;
|
|
20
|
+
assertQueue(oQueue: string, options?: Options.AssertQueue): Promise<import("amqplib").Replies.AssertQueue>;
|
|
21
|
+
assertExchange(oExchange: string, type: string, options?: Options.AssertExchange): Promise<import("amqplib").Replies.AssertExchange>;
|
|
22
|
+
bindQueue(oQueue: string, source: string, pattern: string, args?: any): Promise<import("amqplib").Replies.Empty>;
|
|
23
|
+
publish(oExchange: string, routingKey: string, content: any, options?: Options.Publish): Promise<boolean>;
|
|
24
|
+
sendToQueue(oQueue: string, content: any, options?: Options.Publish): Promise<boolean>;
|
|
25
|
+
consume<T>(oQueue: string, onMessage: (msg: T) => Promise<void>, options?: ConsumeOptions): Promise<void>;
|
|
26
|
+
}
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MqService = void 0;
|
|
4
|
+
const amqplib_1 = require("amqplib");
|
|
5
|
+
const logger_1 = require("../logger");
|
|
6
|
+
class MqService {
|
|
7
|
+
constructor(configService, envConfigService) {
|
|
8
|
+
this.configService = configService;
|
|
9
|
+
this.envConfigService = envConfigService;
|
|
10
|
+
this.logger = new logger_1.Logger('MqService');
|
|
11
|
+
}
|
|
12
|
+
async init() {
|
|
13
|
+
const { rabbitMq } = await this.configService.getSecret();
|
|
14
|
+
if (!rabbitMq) {
|
|
15
|
+
this.logger.warn('rabbitMq not defined');
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
this.prefix = await this.envConfigService.getEnvByName('MAIN_DOMAIN', 'localhost:3999');
|
|
19
|
+
const { hostname, port, username, password } = rabbitMq;
|
|
20
|
+
this.connection = await amqplib_1.connect({
|
|
21
|
+
hostname,
|
|
22
|
+
port,
|
|
23
|
+
username,
|
|
24
|
+
password,
|
|
25
|
+
});
|
|
26
|
+
this.channel = await this.connection.createChannel();
|
|
27
|
+
await this.channel.assertQueue(`${this.prefix}.${MqService.DEAD_LETTER_QUEUE}`, {
|
|
28
|
+
durable: true
|
|
29
|
+
});
|
|
30
|
+
await this.channel.assertExchange(`${this.prefix}.${MqService.RETRY_EXCHANGE}`, 'x-delayed-message', {
|
|
31
|
+
durable: true,
|
|
32
|
+
arguments: {
|
|
33
|
+
'x-delayed-type': 'direct'
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
async shutdown() {
|
|
38
|
+
if (!this.channel) {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
await this.channel.close();
|
|
42
|
+
await this.connection.close();
|
|
43
|
+
}
|
|
44
|
+
computeExpBackoff(delay, retryCount) {
|
|
45
|
+
const base = 2;
|
|
46
|
+
const delayTime = Math.pow(base, retryCount) * delay;
|
|
47
|
+
return delayTime;
|
|
48
|
+
}
|
|
49
|
+
async assertQueue(oQueue, options) {
|
|
50
|
+
if (!this.channel) {
|
|
51
|
+
this.logger.warn('channel not initialized');
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
const queue = `${this.prefix}.${oQueue}`;
|
|
55
|
+
const queueCreated = await this.channel.assertQueue(queue, Object.assign({ durable: true }, options));
|
|
56
|
+
await this.channel.bindQueue(queue, `${this.prefix}.${MqService.RETRY_EXCHANGE}`, queue);
|
|
57
|
+
return queueCreated;
|
|
58
|
+
}
|
|
59
|
+
async assertExchange(oExchange, type, options) {
|
|
60
|
+
if (!this.channel) {
|
|
61
|
+
this.logger.warn('channel not initialized');
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
const exchange = `${this.prefix}.${oExchange}`;
|
|
65
|
+
return await this.channel.assertExchange(exchange, type, Object.assign({ durable: true }, options));
|
|
66
|
+
}
|
|
67
|
+
async bindQueue(oQueue, source, pattern, args) {
|
|
68
|
+
if (!this.channel) {
|
|
69
|
+
this.logger.warn('channel not initialized');
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
const queue = `${this.prefix}.${oQueue}`;
|
|
73
|
+
return await this.channel.bindQueue(queue, source, pattern, args);
|
|
74
|
+
}
|
|
75
|
+
async publish(oExchange, routingKey, content, options) {
|
|
76
|
+
if (!this.channel) {
|
|
77
|
+
this.logger.warn('channel not initialized');
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
const exchange = `${this.prefix}.${oExchange}`;
|
|
81
|
+
return await this.channel.publish(exchange, routingKey, Buffer.from(JSON.stringify(content)), options);
|
|
82
|
+
}
|
|
83
|
+
async sendToQueue(oQueue, content, options) {
|
|
84
|
+
if (!this.channel) {
|
|
85
|
+
this.logger.warn('channel not initialized');
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
const queue = `${this.prefix}.${oQueue}`;
|
|
89
|
+
return await this.channel.sendToQueue(queue, Buffer.from(JSON.stringify(content)), options);
|
|
90
|
+
}
|
|
91
|
+
async consume(oQueue, onMessage, options) {
|
|
92
|
+
if (!this.channel) {
|
|
93
|
+
this.logger.warn('channel not initialized');
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
const queue = `${this.prefix}.${oQueue}`;
|
|
97
|
+
await this.channel.consume(queue, async (msg) => {
|
|
98
|
+
if (msg) {
|
|
99
|
+
try {
|
|
100
|
+
const msgT = JSON.parse(msg.content.toString());
|
|
101
|
+
await onMessage(msgT);
|
|
102
|
+
this.channel.ack(msg);
|
|
103
|
+
}
|
|
104
|
+
catch (error) {
|
|
105
|
+
const retryCount = msg.properties.headers['retry-count'] || 0;
|
|
106
|
+
const maxRetryCount = msg.properties.headers['max-retry-count'] || 15;
|
|
107
|
+
const delayTime = this.computeExpBackoff(Math.abs((options === null || options === void 0 ? void 0 : options.delayBeforeRetry) || 1000), retryCount);
|
|
108
|
+
const firstTry = msg.properties.headers['first-try'] || new Date().toISOString();
|
|
109
|
+
if (retryCount < maxRetryCount) {
|
|
110
|
+
this.logger.warn(`Mensagem falhou no processamento. Tentativa ${retryCount + 1}/${maxRetryCount}. Reenviando para a fila com delay de ${delayTime}...`);
|
|
111
|
+
const headers = {
|
|
112
|
+
'x-delay': delayTime,
|
|
113
|
+
'retry-count': retryCount + 1,
|
|
114
|
+
'max-retry-count': maxRetryCount,
|
|
115
|
+
'first-try': firstTry
|
|
116
|
+
};
|
|
117
|
+
this.channel.publish(`${this.prefix}.${MqService.RETRY_EXCHANGE}`, queue, msg.content, { headers });
|
|
118
|
+
this.channel.ack(msg);
|
|
119
|
+
}
|
|
120
|
+
else if (retryCount >= maxRetryCount) {
|
|
121
|
+
this.logger.warn(`Mensagem falhou após ${maxRetryCount} tentativas. Descartando mensagem...`);
|
|
122
|
+
const deadContent = {
|
|
123
|
+
content: msg.content.toString(),
|
|
124
|
+
queue_name: queue,
|
|
125
|
+
retry_count: retryCount,
|
|
126
|
+
max_retry_count: maxRetryCount,
|
|
127
|
+
first_try: firstTry,
|
|
128
|
+
};
|
|
129
|
+
this.channel.sendToQueue(`${this.prefix}.${MqService.DEAD_LETTER_QUEUE}`, Buffer.from(JSON.stringify(deadContent)));
|
|
130
|
+
this.channel.ack(msg);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
}, options);
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
exports.MqService = MqService;
|
|
138
|
+
MqService.DEAD_LETTER_QUEUE = 'general-dead-letter-queue';
|
|
139
|
+
MqService.RETRY_EXCHANGE = 'general-retry-exchange';
|
|
140
|
+
//# sourceMappingURL=mq.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mq.service.js","sourceRoot":"","sources":["../../../../src/core/services/mq/mq.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { Response } from 'express';
|
|
3
3
|
import { StorageService } from '../storage.service';
|
|
4
4
|
import { FileString } from '../../../../plugins/file-system/file-system.service';
|
|
5
|
+
import { RedisManagerService } from '../../../../orm/services/managers/redis-manager.service';
|
|
5
6
|
export interface S3Config {
|
|
6
7
|
region: string;
|
|
7
8
|
accessKeyId: string;
|
|
@@ -9,10 +10,13 @@ export interface S3Config {
|
|
|
9
10
|
bucket: string;
|
|
10
11
|
}
|
|
11
12
|
export declare class S3ClientService implements StorageService {
|
|
13
|
+
private readonly redisManagerService;
|
|
12
14
|
private readonly s3Config;
|
|
13
15
|
private readonly namespace;
|
|
14
16
|
private readonly s3Client;
|
|
15
|
-
|
|
17
|
+
private redisInstance;
|
|
18
|
+
constructor(redisManagerService: RedisManagerService, s3Config: S3Config, namespace: string);
|
|
19
|
+
init(): Promise<void>;
|
|
16
20
|
writeFile({ path, buffer, cacheControl, publicLink }: {
|
|
17
21
|
path: string;
|
|
18
22
|
buffer: Buffer;
|
|
@@ -3,11 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.S3ClientService = void 0;
|
|
4
4
|
const aws_sdk_1 = require("aws-sdk");
|
|
5
5
|
class S3ClientService {
|
|
6
|
-
constructor(s3Config, namespace) {
|
|
6
|
+
constructor(redisManagerService, s3Config, namespace) {
|
|
7
|
+
this.redisManagerService = redisManagerService;
|
|
7
8
|
this.s3Config = s3Config;
|
|
8
9
|
this.namespace = namespace;
|
|
9
10
|
this.s3Client = new aws_sdk_1.S3(s3Config);
|
|
10
11
|
}
|
|
12
|
+
async init() {
|
|
13
|
+
this.redisInstance = await this.redisManagerService.get();
|
|
14
|
+
}
|
|
11
15
|
async writeFile({ path, buffer, cacheControl, publicLink = false }) {
|
|
12
16
|
const uploadParams = {
|
|
13
17
|
Bucket: this.s3Config.bucket,
|
|
@@ -28,7 +32,9 @@ class S3ClientService {
|
|
|
28
32
|
});
|
|
29
33
|
}
|
|
30
34
|
async readFileResponse({ path, res, mode = 'redirect' }) {
|
|
31
|
-
const
|
|
35
|
+
const maxAge = 600;
|
|
36
|
+
const link = await this.getDownloadLink({ path, expires: maxAge });
|
|
37
|
+
res.setHeader('Cache-Control', `max-age=${maxAge}`);
|
|
32
38
|
switch (mode) {
|
|
33
39
|
case 'link': {
|
|
34
40
|
res.setHeader('download-mode', 'link');
|
|
@@ -43,11 +49,31 @@ class S3ClientService {
|
|
|
43
49
|
}
|
|
44
50
|
}
|
|
45
51
|
async getDownloadLink({ path, expires = 600, publicLink = false }) {
|
|
52
|
+
if (expires) {
|
|
53
|
+
const cacheLink = await new Promise((response, reject) => {
|
|
54
|
+
this.redisInstance.get(`S3ClientService.getDownloadLink-${path}`, (err, data) => {
|
|
55
|
+
if (err) {
|
|
56
|
+
return reject(err);
|
|
57
|
+
}
|
|
58
|
+
response(data);
|
|
59
|
+
});
|
|
60
|
+
});
|
|
61
|
+
if (cacheLink) {
|
|
62
|
+
return cacheLink;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
46
65
|
const completePath = await this.buildCompletePath({
|
|
47
66
|
path,
|
|
48
67
|
});
|
|
68
|
+
const addLinkOnCache = async (link) => {
|
|
69
|
+
if (!expires) {
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
this.redisInstance.set(`S3ClientService.getDownloadLink-${path}`, link, 'EX', expires);
|
|
73
|
+
};
|
|
49
74
|
if (publicLink) {
|
|
50
75
|
const link = `https://${this.s3Config.bucket}.s3.${this.s3Config.region}.amazonaws.com/${completePath}`;
|
|
76
|
+
await addLinkOnCache(link);
|
|
51
77
|
return link;
|
|
52
78
|
}
|
|
53
79
|
const params = {
|
|
@@ -56,6 +82,7 @@ class S3ClientService {
|
|
|
56
82
|
Expires: expires,
|
|
57
83
|
};
|
|
58
84
|
const link = await this.s3Client.getSignedUrlPromise('getObject', params);
|
|
85
|
+
await addLinkOnCache(link);
|
|
59
86
|
return link;
|
|
60
87
|
}
|
|
61
88
|
async readFile({ path, pathFormat = 'default' }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"s3-client.service.js","sourceRoot":"","sources":["../../../../../src/core/services/storage/implementation/s3-client.service.ts"],"names":[],"mappings":";;;AAAA,qCAA6B;
|
|
1
|
+
{"version":3,"file":"s3-client.service.js","sourceRoot":"","sources":["../../../../../src/core/services/storage/implementation/s3-client.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { Response } from 'express';
|
|
3
3
|
import { FileString } from '../../../plugins/file-system/file-system.service';
|
|
4
4
|
import { ConfigService } from '../../../essential/config.service';
|
|
5
|
+
import { RedisManagerService } from '../../../orm/services/managers/redis-manager.service';
|
|
5
6
|
export declare abstract class StorageService {
|
|
6
7
|
abstract writeFile(args: {
|
|
7
8
|
path: string;
|
|
@@ -30,10 +31,11 @@ export declare abstract class StorageService {
|
|
|
30
31
|
}): Promise<FileString[]>;
|
|
31
32
|
}
|
|
32
33
|
export declare class StorageServiceManager {
|
|
34
|
+
private readonly redisManagerService;
|
|
33
35
|
private readonly configService;
|
|
34
36
|
private readonly logger;
|
|
35
37
|
private status;
|
|
36
38
|
private instance;
|
|
37
|
-
constructor(configService: ConfigService);
|
|
39
|
+
constructor(redisManagerService: RedisManagerService, configService: ConfigService);
|
|
38
40
|
getInstance(): Promise<StorageService>;
|
|
39
41
|
}
|
|
@@ -7,7 +7,8 @@ class StorageService {
|
|
|
7
7
|
}
|
|
8
8
|
exports.StorageService = StorageService;
|
|
9
9
|
class StorageServiceManager {
|
|
10
|
-
constructor(configService) {
|
|
10
|
+
constructor(redisManagerService, configService) {
|
|
11
|
+
this.redisManagerService = redisManagerService;
|
|
11
12
|
this.configService = configService;
|
|
12
13
|
this.logger = new logger_1.Logger('StorageServiceManager');
|
|
13
14
|
this.status = 'New';
|
|
@@ -21,13 +22,17 @@ class StorageServiceManager {
|
|
|
21
22
|
const implementations = [
|
|
22
23
|
{
|
|
23
24
|
apply: () => true,
|
|
24
|
-
build: () =>
|
|
25
|
+
build: async () => {
|
|
26
|
+
const s3 = new s3_client_service_1.S3ClientService(this.redisManagerService, configS3, namespace);
|
|
27
|
+
await s3.init();
|
|
28
|
+
return s3;
|
|
29
|
+
},
|
|
25
30
|
name: 'S3ClientService',
|
|
26
31
|
},
|
|
27
32
|
];
|
|
28
33
|
const implementation = implementations.find(i => i.apply());
|
|
29
34
|
this.logger.debug(`Storage iniciado usando a implementação: ${implementation.name}`);
|
|
30
|
-
this.instance = implementation.build();
|
|
35
|
+
this.instance = await implementation.build();
|
|
31
36
|
this.status = 'Ready';
|
|
32
37
|
}
|
|
33
38
|
return this.instance;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../../../src/core/services/storage/storage.service.ts"],"names":[],"mappings":";;;AACA,0EAAqE;AACrE,sCAAmC;
|
|
1
|
+
{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../../../src/core/services/storage/storage.service.ts"],"names":[],"mappings":";;;AACA,0EAAqE;AACrE,sCAAmC;AAInC,MAAsB,cAAc;CAgBnC;AAhBD,wCAgBC;AAED,MAAa,qBAAqB;IAKhC,YACmB,mBAAwC,EACxC,aAA4B;QAD5B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,kBAAa,GAAb,aAAa,CAAe;QAN9B,WAAM,GAAG,IAAI,eAAM,CAAC,uBAAuB,CAAC,CAAA;QACrD,WAAM,GAAgC,KAAK,CAAA;IAM/C,CAAC;IAEL,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;YAChC,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAA;SAC3C;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE;YACzB,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;YAEpE,MAAM,eAAe,GAAG;gBACtB;oBACE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI;oBACjB,KAAK,EAAE,KAAK,IAAI,EAAE;wBAChB,MAAM,EAAE,GAAG,IAAI,mCAAe,CAAC,IAAI,CAAC,mBAAmB,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;wBAC7E,MAAM,EAAE,CAAC,IAAI,EAAE,CAAA;wBACf,OAAO,EAAE,CAAA;oBACX,CAAC;oBACD,IAAI,EAAE,iBAAiB;iBACxB;aACF,CAAC;YACF,MAAM,cAAc,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;YAC5D,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,4CAA4C,cAAc,CAAC,IAAI,EAAE,CAClE,CAAC;YACF,IAAI,CAAC,QAAQ,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,CAAC;YAC7C,IAAI,CAAC,MAAM,GAAG,OAAO,CAAA;SACtB;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;CACF;AArCD,sDAqCC"}
|
|
@@ -55,7 +55,6 @@ class CacheHelper {
|
|
|
55
55
|
class UserService {
|
|
56
56
|
constructor(repositoryFactory) {
|
|
57
57
|
this.logger = new logger_1.Logger(UserService.name);
|
|
58
|
-
debugger;
|
|
59
58
|
const nameList = ['system_user_puca_base_api_rules', 'companies_user'];
|
|
60
59
|
this.selectManyCache = new CacheHelper(repositoryFactory, 'puca_base_api_select_many_data', {
|
|
61
60
|
fields: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/core/services/user.service.ts"],"names":[],"mappings":";;;AAAA,4BAA2B;AAK3B,qDAAkE;AAGlE,qCAAiC;AAgBjC,MAAM,WAAW;IAGf,YACmB,iBAAoC,EACpC,SAAiB,EACjB,YAA2B,EAC3B,cAAoD;QAHpD,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,cAAS,GAAT,SAAS,CAAQ;QACjB,iBAAY,GAAZ,YAAY,CAAe;QAC3B,mBAAc,GAAd,cAAc,CAAsC;QANtD,cAAS,GAAQ,EAAE,CAAA;IAOhC,CAAC;IAGL,KAAK,CAAC,IAAI;QACR,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAI;YAC3D,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAC/B,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;YACvB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SAC1B;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAI;YACjE,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,OAAO,EAAE,CAAC;SACX,CAAC,CAAA;QAEF,eAAe,CAAC,QAAQ,CAAC,CAAC,KAKzB,EAAE,EAAE;YACH,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,CAAC,CAAA;gBAClF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;oBAChB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;iBAChC;gBACD,OAAM;aACP;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,CAAC,CAAA;YAC/E,MAAM,OAAO,mCACR,OAAO,GACP,KAAK,CAAC,GAAG,CACb,CAAA;YAED,IAAI,IAAI,CAAC,cAAc,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;gBACjE,OAAM;aACP;YAED,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC,QAAQ,CAAC,CAAA;YAClF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;gBAChB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;aAC7B;iBAAM;gBACL,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,OAAO,CAAA;aAChC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,CAAC,MAA6B;QACnC,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;SACnC;QACD,OAAO,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IACnD,CAAC;CACF;AACD,MAAa,WAAW;IAOtB,YACE,iBAAoC;QAPrB,WAAM,GAAG,IAAI,eAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QASpD,
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/core/services/user.service.ts"],"names":[],"mappings":"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"}
|
package/dist/models/secret.d.ts
CHANGED
|
@@ -311,12 +311,15 @@ class Repository {
|
|
|
311
311
|
user,
|
|
312
312
|
disablePermissionSystem
|
|
313
313
|
});
|
|
314
|
-
await this.transaction.serialExec(commands);
|
|
315
|
-
return entity;
|
|
314
|
+
const response = await this.transaction.serialExec(commands);
|
|
315
|
+
return { entity, response };
|
|
316
316
|
}
|
|
317
317
|
async insert(args) {
|
|
318
318
|
try {
|
|
319
|
-
const r = await this._insert(Object.assign({ disablePermissionSystem: false }, args));
|
|
319
|
+
const { entity: r, response } = await this._insert(Object.assign({ disablePermissionSystem: false }, args));
|
|
320
|
+
if (!response.filter(r => r.name === 'insertPuca' || r.name === 'insertUser').reduce((a, b) => a + b.rowsAffected, 0)) {
|
|
321
|
+
throw new Error('Falha ao executar o insert, verifique se o usuário tem permissão para realizar a operação');
|
|
322
|
+
}
|
|
320
323
|
this.transaction.afterCommit(async () => {
|
|
321
324
|
await this.redisClient.publish(`${this.table}.change`, JSON.stringify({
|
|
322
325
|
version: 2,
|
|
@@ -370,7 +373,12 @@ class Repository {
|
|
|
370
373
|
user,
|
|
371
374
|
disablePermissionSystem
|
|
372
375
|
});
|
|
373
|
-
|
|
376
|
+
if (!inserted.response
|
|
377
|
+
.filter(r => r.name === 'insertPuca' || r.name === 'insertUser')
|
|
378
|
+
.reduce((a, b) => a + b.rowsAffected, 0)) {
|
|
379
|
+
throw new Error('Falha ao executar o insert/update, verifique se o usuário tem permissão para realizar a operação');
|
|
380
|
+
}
|
|
381
|
+
entity.puca_pid = inserted.entity.puca_pid;
|
|
374
382
|
mode = 'new';
|
|
375
383
|
}
|
|
376
384
|
this.transaction.afterCommit(async () => {
|