@puca/puca-core 11.8.12 → 11.8.13
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/auth.service.d.ts +0 -1
- package/dist/core/services/auth.service.js +1 -7
- package/dist/core/services/auth.service.js.map +1 -1
- package/dist/core/services/bootstrap-commands.js +1 -107
- package/dist/core/services/bootstrap-commands.js.map +1 -1
- package/dist/core/services/comunication/comunication-http.service.js +2 -11
- package/dist/core/services/comunication/comunication-http.service.js.map +1 -1
- package/dist/core/services/comunication/comunication.service.d.ts +3 -1
- package/dist/core/services/comunication/comunication.service.js +3 -2
- package/dist/core/services/comunication/comunication.service.js.map +1 -1
- package/dist/core/services/crud-base-testable.service.d.ts +4 -10
- package/dist/core/services/crud-base-testable.service.js +12 -21
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/crud-base.controller.d.ts +3 -4
- package/dist/core/services/crud-base.controller.js +15 -40
- package/dist/core/services/crud-base.controller.js.map +1 -1
- package/dist/core/services/crud-base.service.d.ts +1 -1
- package/dist/core/services/crud-base.service.js +1 -1
- package/dist/core/services/crud-base.service.js.map +1 -1
- package/dist/core/services/crud-front-base.service.d.ts +8 -34
- package/dist/core/services/crud-front-base.service.js +48 -66
- package/dist/core/services/crud-front-base.service.js.map +1 -1
- package/dist/core/services/email.service.d.ts +1 -2
- package/dist/core/services/email.service.js +26 -44
- package/dist/core/services/email.service.js.map +1 -1
- package/dist/core/services/eval.service.d.ts +1 -2
- package/dist/core/services/eval.service.js +7 -17
- package/dist/core/services/eval.service.js.map +1 -1
- package/dist/core/services/incremental-search.service.d.ts +1 -4
- package/dist/core/services/incremental-search.service.js +2 -8
- package/dist/core/services/incremental-search.service.js.map +1 -1
- package/dist/core/services/index.d.ts +32 -33
- package/dist/core/services/index.js +37 -44
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.d.ts +9 -7
- package/dist/core/services/install.service.js +14 -13
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/job/job.client.d.ts +0 -1
- package/dist/core/services/job/job.client.js +2 -8
- package/dist/core/services/job/job.client.js.map +1 -1
- package/dist/core/services/job/job.service.d.ts +0 -1
- package/dist/core/services/job/job.service.js +0 -3
- package/dist/core/services/job/job.service.js.map +1 -1
- package/dist/core/services/job-executor/job-executor.service.d.ts +7 -10
- package/dist/core/services/job-executor/job-executor.service.js +33 -66
- package/dist/core/services/job-executor/job-executor.service.js.map +1 -1
- package/dist/core/services/life-cycle.service.d.ts +67 -0
- package/dist/core/services/life-cycle.service.js +194 -0
- package/dist/core/services/life-cycle.service.js.map +1 -0
- package/dist/core/services/link-builder.d.ts +3 -3
- package/dist/core/services/link-builder.js +4 -5
- package/dist/core/services/link-builder.js.map +1 -1
- package/dist/core/services/migration/migration.service.d.ts +7 -7
- package/dist/core/services/migration/migration.service.js +18 -17
- package/dist/core/services/migration/migration.service.js.map +1 -1
- package/dist/core/services/module-especification.service.d.ts +3 -3
- package/dist/core/services/module-especification.service.js +6 -6
- package/dist/core/services/module-especification.service.js.map +1 -1
- package/dist/core/services/monitor.js +1 -1
- package/dist/core/services/monitor.js.map +1 -1
- package/dist/core/services/mq/mq.service.d.ts +1 -4
- package/dist/core/services/mq/mq.service.js +9 -32
- package/dist/core/services/mq/mq.service.js.map +1 -1
- package/dist/core/services/plugin.service.d.ts +1 -7
- package/dist/core/services/plugin.service.js +10 -11
- package/dist/core/services/plugin.service.js.map +1 -1
- package/dist/core/services/report.service.d.ts +1 -3
- package/dist/core/services/report.service.js +5 -5
- package/dist/core/services/report.service.js.map +1 -1
- package/dist/core/services/single-instance-ensure.service.d.ts +8 -0
- package/dist/core/services/single-instance-ensure.service.js +23 -0
- package/dist/core/services/single-instance-ensure.service.js.map +1 -0
- package/dist/core/services/storage/implementation/s3-client.service.d.ts +5 -3
- package/dist/core/services/storage/implementation/s3-client.service.js +7 -4
- package/dist/core/services/storage/implementation/s3-client.service.js.map +1 -1
- package/dist/core/services/storage/storage.service.d.ts +10 -10
- package/dist/core/services/storage/storage.service.js +9 -5
- package/dist/core/services/storage/storage.service.js.map +1 -1
- package/dist/core/services/system-parameters-envs.service.d.ts +0 -1
- package/dist/core/services/system-parameters-envs.service.js +1 -4
- package/dist/core/services/system-parameters-envs.service.js.map +1 -1
- package/dist/core/services/table-permission.service.d.ts +3 -1
- package/dist/core/services/table-permission.service.js +2 -1
- package/dist/core/services/table-permission.service.js.map +1 -1
- package/dist/core/services/user.service.js.map +1 -1
- package/dist/core/services/web-socket.service.d.ts +9 -6
- package/dist/core/services/web-socket.service.js +20 -26
- package/dist/core/services/web-socket.service.js.map +1 -1
- package/dist/essential/audit.service.d.ts +22 -0
- package/dist/essential/audit.service.js +52 -0
- package/dist/essential/audit.service.js.map +1 -0
- package/dist/essential/config.service.d.ts +0 -3
- package/dist/essential/config.service.js +5 -20
- package/dist/essential/config.service.js.map +1 -1
- package/dist/essential/envs-config.service.d.ts +0 -1
- package/dist/essential/envs-config.service.js +6 -9
- package/dist/essential/envs-config.service.js.map +1 -1
- package/dist/essential/index.d.ts +4 -3
- package/dist/essential/index.js +6 -5
- package/dist/essential/index.js.map +1 -1
- package/dist/essential/module-config.service.d.ts +3 -3
- package/dist/essential/module-config.service.js +4 -4
- package/dist/essential/module-config.service.js.map +1 -1
- package/dist/functions/index.d.ts +1 -2
- package/dist/functions/index.js +1 -2
- package/dist/functions/index.js.map +1 -1
- package/dist/models/crud-controller-especification-environment.d.ts +0 -9
- package/dist/models/crud-controller-especification-environment.js.map +1 -1
- package/dist/models/secret.d.ts +0 -1
- package/dist/orm/cases/bo/ddl.service.js.map +1 -1
- package/dist/orm/cases/bo/sql.service.js +19 -19
- package/dist/orm/cases/bo/sql.service.js.map +1 -1
- package/dist/orm/services/cache-repository/cache-repository-redis.d.ts +3 -3
- package/dist/orm/services/cache-repository/cache-repository-redis.js +4 -8
- package/dist/orm/services/cache-repository/cache-repository-redis.js.map +1 -1
- package/dist/orm/services/cache-repository/cache-repository.d.ts +3 -3
- package/dist/orm/services/cache-repository/cache-repository.js +3 -3
- package/dist/orm/services/cache-repository/cache-repository.js.map +1 -1
- package/dist/orm/services/cache.service.d.ts +5 -5
- package/dist/orm/services/cache.service.js +16 -13
- package/dist/orm/services/cache.service.js.map +1 -1
- package/dist/orm/services/index.d.ts +7 -8
- package/dist/orm/services/index.js +8 -11
- package/dist/orm/services/index.js.map +1 -1
- package/dist/orm/services/managers/database-manager.service.d.ts +2 -4
- package/dist/orm/services/managers/database-manager.service.js +9 -30
- package/dist/orm/services/managers/database-manager.service.js.map +1 -1
- package/dist/orm/services/managers/puca-orm-client.service.d.ts +0 -1
- package/dist/orm/services/managers/puca-orm-client.service.js +0 -3
- package/dist/orm/services/managers/puca-orm-client.service.js.map +1 -1
- package/dist/orm/services/managers/redis-manager.service.d.ts +6 -0
- package/dist/orm/services/managers/redis-manager.service.js +16 -0
- package/dist/orm/services/managers/redis-manager.service.js.map +1 -0
- package/dist/orm/services/repository-factory.d.ts +3 -3
- package/dist/orm/services/repository-factory.js +4 -4
- package/dist/orm/services/repository-factory.js.map +1 -1
- package/dist/orm/services/repository.d.ts +3 -3
- package/dist/orm/services/repository.js +5 -5
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/orm/services/transaction.d.ts +6 -4
- package/dist/orm/services/transaction.js +13 -24
- package/dist/orm/services/transaction.js.map +1 -1
- package/dist/plugins/file-system/file-system.service.d.ts +3 -6
- package/dist/plugins/file-system/file-system.service.js +5 -12
- package/dist/plugins/file-system/file-system.service.js.map +1 -1
- package/dist/plugins/index.d.ts +1 -4
- package/dist/plugins/index.js +2 -5
- package/dist/plugins/index.js.map +1 -1
- package/dist/plugins/nestjs/puca-auth.decorators.js +1 -1
- package/dist/plugins/nestjs/puca-auth.decorators.js.map +1 -1
- package/dist/plugins/nestjs/puca-auth.guard.js +1 -4
- package/dist/plugins/nestjs/puca-auth.guard.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/core/services/domain-life-cycle.service.d.ts +0 -43
- package/dist/core/services/domain-life-cycle.service.js +0 -107
- package/dist/core/services/domain-life-cycle.service.js.map +0 -1
- package/dist/core/services/server-life-cycle.service.d.ts +0 -23
- package/dist/core/services/server-life-cycle.service.js +0 -81
- package/dist/core/services/server-life-cycle.service.js.map +0 -1
- package/dist/orm/services/secundary-database/secundary-database.service.d.ts +0 -25
- package/dist/orm/services/secundary-database/secundary-database.service.js +0 -78
- package/dist/orm/services/secundary-database/secundary-database.service.js.map +0 -1
- package/dist/plugins/file-system/shared-file-system.service.d.ts +0 -25
- package/dist/plugins/file-system/shared-file-system.service.js +0 -121
- package/dist/plugins/file-system/shared-file-system.service.js.map +0 -1
- package/dist/plugins/multi-tenant/multi-tentant.adapter.d.ts +0 -15
- package/dist/plugins/multi-tenant/multi-tentant.adapter.js +0 -68
- package/dist/plugins/multi-tenant/multi-tentant.adapter.js.map +0 -1
- package/dist/plugins/multi-tenant/puca-hub.service.d.ts +0 -54
- package/dist/plugins/multi-tenant/puca-hub.service.js +0 -211
- package/dist/plugins/multi-tenant/puca-hub.service.js.map +0 -1
|
@@ -5,12 +5,13 @@ const cases_1 = require("../../../orm/cases");
|
|
|
5
5
|
const interfaces_1 = require("../../../orm/cases/bo/interfaces");
|
|
6
6
|
const logger_1 = require("../logger");
|
|
7
7
|
class MigrationService {
|
|
8
|
-
constructor(transactionFactory, repositoryFactory, moduleConfigService,
|
|
8
|
+
constructor(transactionFactory, repositoryFactory, moduleConfigService, redisManagerService, envConfigService, fileSystemService) {
|
|
9
9
|
this.transactionFactory = transactionFactory;
|
|
10
10
|
this.repositoryFactory = repositoryFactory;
|
|
11
11
|
this.moduleConfigService = moduleConfigService;
|
|
12
|
-
this.
|
|
13
|
-
this.
|
|
12
|
+
this.redisManagerService = redisManagerService;
|
|
13
|
+
this.envConfigService = envConfigService;
|
|
14
|
+
this.fileSystemService = fileSystemService;
|
|
14
15
|
this.logger = new logger_1.Logger('MigrationService');
|
|
15
16
|
}
|
|
16
17
|
async install({ ddlCommands, user, moduleName, notThrowErrors }) {
|
|
@@ -95,7 +96,7 @@ class MigrationService {
|
|
|
95
96
|
}
|
|
96
97
|
}
|
|
97
98
|
if (failMigrationList.length) {
|
|
98
|
-
const environment =
|
|
99
|
+
const environment = await this.envConfigService.getEnvByName('ENVIRONMENT', 'DEVELOPMENT');
|
|
99
100
|
const printErrors = () => {
|
|
100
101
|
failMigrationList.forEach(m => {
|
|
101
102
|
this.logger.error(m.id, m.error);
|
|
@@ -103,13 +104,10 @@ class MigrationService {
|
|
|
103
104
|
};
|
|
104
105
|
printErrors();
|
|
105
106
|
if (environment === 'PRODUCTION') {
|
|
106
|
-
|
|
107
|
+
setInterval(printErrors, 60000);
|
|
107
108
|
}
|
|
108
109
|
}
|
|
109
110
|
}
|
|
110
|
-
async destroy() {
|
|
111
|
-
clearInterval(this.interval);
|
|
112
|
-
}
|
|
113
111
|
async executeSql(command, user) {
|
|
114
112
|
const transaction = this.transactionFactory.get({
|
|
115
113
|
name: `execute-sql-${command}`,
|
|
@@ -162,9 +160,10 @@ class MigrationService {
|
|
|
162
160
|
user: c.user,
|
|
163
161
|
});
|
|
164
162
|
c.transaction.afterCommit(async () => {
|
|
165
|
-
this.
|
|
163
|
+
const redisCli = this.redisManagerService.get();
|
|
164
|
+
redisCli.publish('table_dictionary.change', tableDictionary.puca_pid);
|
|
166
165
|
fieldDictionary.data.forEach(fd => {
|
|
167
|
-
|
|
166
|
+
redisCli.publish('field_dictionary.change', fd.puca_pid);
|
|
168
167
|
});
|
|
169
168
|
});
|
|
170
169
|
}
|
|
@@ -224,7 +223,7 @@ class MigrationService {
|
|
|
224
223
|
},
|
|
225
224
|
});
|
|
226
225
|
c.transaction.afterCommit(async () => {
|
|
227
|
-
this.
|
|
226
|
+
this.redisManagerService.get().publish('field_dictionary.change', fieldDictionary.puca_pid);
|
|
228
227
|
});
|
|
229
228
|
}
|
|
230
229
|
async alterTableDropColumn(args) {
|
|
@@ -279,7 +278,7 @@ class MigrationService {
|
|
|
279
278
|
object_name: d.tableName,
|
|
280
279
|
transaction: d.transaction
|
|
281
280
|
});
|
|
282
|
-
this.
|
|
281
|
+
this.redisManagerService.get().publish('field_dictionary.change', fieldDictionary.puca_pid);
|
|
283
282
|
}
|
|
284
283
|
async alterTableSetCrudApi(args) {
|
|
285
284
|
const tablePid = (await this.repositoryFactory.getInstance({
|
|
@@ -341,10 +340,11 @@ class MigrationService {
|
|
|
341
340
|
object_name: d.tableName,
|
|
342
341
|
transaction: d.transaction
|
|
343
342
|
});
|
|
343
|
+
const redisCli = this.redisManagerService.get();
|
|
344
344
|
d.transaction.afterCommit(async () => {
|
|
345
|
-
|
|
345
|
+
redisCli.publish('table_dictionary.change', tableDictionary.puca_pid);
|
|
346
346
|
fieldDictionary.data.forEach(fd => {
|
|
347
|
-
|
|
347
|
+
redisCli.publish('field_dictionary.change', fd.puca_pid);
|
|
348
348
|
});
|
|
349
349
|
});
|
|
350
350
|
}
|
|
@@ -353,8 +353,8 @@ class MigrationService {
|
|
|
353
353
|
await c.transaction.serialExec(sqlCommandList);
|
|
354
354
|
}
|
|
355
355
|
async ensureDatabaseDependenciesIntegrity(c) {
|
|
356
|
-
const sqlCommandToGetDependencies = await this.
|
|
357
|
-
const sqlCommandToRecorverScriptsDependencies = await this.
|
|
356
|
+
const sqlCommandToGetDependencies = await this.fileSystemService.readStringFile(`${process.cwd()}//node_modules/@puca/puca-core/get-view-dependencies.sql`);
|
|
357
|
+
const sqlCommandToRecorverScriptsDependencies = await this.fileSystemService.readStringFile(`${process.cwd()}//node_modules/@puca/puca-core/get-scripts-dependencies.sql`);
|
|
358
358
|
const dependencies = await c.transaction.exec({ sql: sqlCommandToGetDependencies, args: [c.object_name], commandName: 'get-view-dependencies' });
|
|
359
359
|
if (!dependencies.length) {
|
|
360
360
|
await c.ddlMigration();
|
|
@@ -380,7 +380,8 @@ class MigrationService {
|
|
|
380
380
|
}
|
|
381
381
|
await c.ddlMigration();
|
|
382
382
|
try {
|
|
383
|
-
|
|
383
|
+
const sortedScriptsDependencies = dependencies.map(dn => scriptsDependencies.find(s => s.view_name === dn.obj_name));
|
|
384
|
+
await c.transaction.serialExec(sortedScriptsDependencies.map(s => ({ sql: s.ddl_script, commandName: 'create-view' })));
|
|
384
385
|
}
|
|
385
386
|
catch (e) {
|
|
386
387
|
this.logger.error(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.service.js","sourceRoot":"","sources":["../../../../src/core/services/migration/migration.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"migration.service.js","sourceRoot":"","sources":["../../../../src/core/services/migration/migration.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { ModuleConfigService } from "../../essential/module-config.service";
|
|
2
2
|
import { ModuleEspecification } from "../../models/module-especification";
|
|
3
|
-
import {
|
|
3
|
+
import { FileSystemService } from "../../plugins/file-system/file-system.service";
|
|
4
4
|
export declare class ModuleEspecificationService {
|
|
5
|
-
private readonly
|
|
5
|
+
private readonly fileSystemService;
|
|
6
6
|
private readonly moduleConfigService;
|
|
7
|
-
constructor(
|
|
7
|
+
constructor(fileSystemService: FileSystemService, moduleConfigService: ModuleConfigService);
|
|
8
8
|
get(): Promise<ModuleEspecification>;
|
|
9
9
|
}
|
|
@@ -2,22 +2,22 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ModuleEspecificationService = void 0;
|
|
4
4
|
class ModuleEspecificationService {
|
|
5
|
-
constructor(
|
|
6
|
-
this.
|
|
5
|
+
constructor(fileSystemService, moduleConfigService) {
|
|
6
|
+
this.fileSystemService = fileSystemService;
|
|
7
7
|
this.moduleConfigService = moduleConfigService;
|
|
8
8
|
}
|
|
9
9
|
async get() {
|
|
10
|
-
const ddlCommands = await this.
|
|
10
|
+
const ddlCommands = await this.fileSystemService.readJSONFile('./ddls.json', {
|
|
11
11
|
throwErrors: false,
|
|
12
12
|
});
|
|
13
13
|
const moduleConfig = await this.moduleConfigService.getModuleConfig();
|
|
14
|
-
const menuPlan = (await this.
|
|
14
|
+
const menuPlan = (await this.fileSystemService.readJSONFile('./menus.json', {
|
|
15
15
|
throwErrors: false,
|
|
16
16
|
})) || [];
|
|
17
|
-
const parameters = (await this.
|
|
17
|
+
const parameters = (await this.fileSystemService.readJSONFile('./parameters.json', {
|
|
18
18
|
throwErrors: false,
|
|
19
19
|
})) || [];
|
|
20
|
-
const moduleViews = (await this.
|
|
20
|
+
const moduleViews = (await this.fileSystemService.readJSONFile('./module-views.json', {
|
|
21
21
|
throwErrors: false,
|
|
22
22
|
})) || [];
|
|
23
23
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-especification.service.js","sourceRoot":"","sources":["../../../src/core/services/module-especification.service.ts"],"names":[],"mappings":";;;AASA,MAAa,2BAA2B;IACtC,
|
|
1
|
+
{"version":3,"file":"module-especification.service.js","sourceRoot":"","sources":["../../../src/core/services/module-especification.service.ts"],"names":[],"mappings":";;;AASA,MAAa,2BAA2B;IACtC,YAA6B,iBAAoC,EAAmB,mBAAwC;QAA/F,sBAAiB,GAAjB,iBAAiB,CAAmB;QAAmB,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAEjI,KAAK,CAAC,GAAG;QACP,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAE3D,aAAa,EAAE;YACf,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAC;QAEtE,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CACzD,cAAc,EACd;YACE,WAAW,EAAE,KAAK;SACnB,CACF,CAAC,IAAI,EAAE,CAAC;QAET,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAC3D,mBAAmB,EACnB;YACE,WAAW,EAAE,KAAK;SACnB,CACF,CAAC,IAAI,EAAE,CAAC;QAET,MAAM,WAAW,GAAG,CAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAC9D,qBAAqB,EACpB;YACE,WAAW,EAAE,KAAK;SACnB,CACF,CAAC,IAAI,EAAE,CAAC;QAET,OAAO;YACL,WAAW,EAAE,YAAY,CAAC,IAAI;YAC9B,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,WAAW;YACX,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,IAAI;YACZ,UAAU;YACV,WAAW;YACX,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;SACxB,CAAC;IAC5B,CAAC;CACF;AA5CD,kEA4CC"}
|
|
@@ -26,7 +26,7 @@ class MonitorService {
|
|
|
26
26
|
async computeData(points) {
|
|
27
27
|
const module = await this.moduleConfigService.getModuleConfig();
|
|
28
28
|
const secret = await this.configService.getSecret();
|
|
29
|
-
const env =
|
|
29
|
+
const env = await this.envConfigService.getEnvByName('ENVIRONMENT', 'DEVELOPMENT');
|
|
30
30
|
const moduleName = module.name;
|
|
31
31
|
const version = module.version;
|
|
32
32
|
const result = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../../src/core/services/monitor.ts"],"names":[],"mappings":";;;AAAA,4BAA2B;AAC3B,iCAAyB;AAGzB,qCAAiC;AAYjC,MAAa,cAAc;IAUzB,YACmB,mBAAwC,EACxC,gBAAkC,EAClC,aAA4B;QAF5B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAe;QAZ9B,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAgB,CAAC,CAAA;QAOrC,UAAK,GAAY,EAAE,CAAA;QAQlC,WAAW,CAAC,GAAG,EAAE;YACf,IAAI,CAAC,KAAK,EAAE,CAAA;QACd,CAAC,EAAE,KAAK,CAAC,CAAA;IACX,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,WAAmB,EAAE,IAAS,EAAE,KAAa,EAAE,SAAmC;QAK1F,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACd,SAAS;YACT,WAAW;YACX,IAAI;YACJ,KAAK;SACN,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,MAAe;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAA;QAC/D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;QACnD,MAAM,GAAG,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../../src/core/services/monitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ export interface ConsumeOptions extends Options.Consume {
|
|
|
5
5
|
maxSimultaneousMessages?: number;
|
|
6
6
|
}
|
|
7
7
|
export declare class MqService {
|
|
8
|
-
private readonly domain;
|
|
9
8
|
private readonly configService;
|
|
10
9
|
private closing;
|
|
11
10
|
private static readonly DEAD_LETTER_QUEUE;
|
|
@@ -14,8 +13,7 @@ export declare class MqService {
|
|
|
14
13
|
private mainChannel;
|
|
15
14
|
private readonly queues;
|
|
16
15
|
private connection;
|
|
17
|
-
|
|
18
|
-
constructor(domain: string, configService: ConfigService);
|
|
16
|
+
constructor(configService: ConfigService);
|
|
19
17
|
private connect;
|
|
20
18
|
init(): Promise<void>;
|
|
21
19
|
shutdown(): Promise<void>;
|
|
@@ -27,5 +25,4 @@ export declare class MqService {
|
|
|
27
25
|
publish(exchange: string, routingKey: string, content: any, options?: Options.Publish): Promise<boolean>;
|
|
28
26
|
sendToQueue(queue: string, content: any, options?: Options.Publish): Promise<boolean>;
|
|
29
27
|
consume<T>(queue: string, onMessage: (msg: T) => Promise<void>, options?: ConsumeOptions): Promise<void>;
|
|
30
|
-
ensure<T>(funcImpl: (args: T) => Promise<void>, args?: T): Promise<void>;
|
|
31
28
|
}
|
|
@@ -4,16 +4,18 @@ exports.MqService = void 0;
|
|
|
4
4
|
const amqplib_1 = require("amqplib");
|
|
5
5
|
const logger_1 = require("../logger");
|
|
6
6
|
class MqService {
|
|
7
|
-
constructor(
|
|
8
|
-
this.domain = domain;
|
|
7
|
+
constructor(configService) {
|
|
9
8
|
this.configService = configService;
|
|
10
9
|
this.closing = false;
|
|
11
10
|
this.logger = new logger_1.Logger('MqService');
|
|
12
11
|
this.queues = {};
|
|
13
|
-
this.additionalChannels = [];
|
|
14
12
|
}
|
|
15
13
|
async connect(t = 0) {
|
|
16
14
|
const { rabbitMq } = await this.configService.getSecret();
|
|
15
|
+
if (!rabbitMq) {
|
|
16
|
+
this.logger.warn('rabbitMq not defined');
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
17
19
|
if (!(rabbitMq === null || rabbitMq === void 0 ? void 0 : rabbitMq.hostname)) {
|
|
18
20
|
throw new Error('rabbitMq.hostname not defined');
|
|
19
21
|
}
|
|
@@ -24,7 +26,7 @@ class MqService {
|
|
|
24
26
|
port,
|
|
25
27
|
username,
|
|
26
28
|
password,
|
|
27
|
-
vhost: vhost ||
|
|
29
|
+
vhost: vhost || '/',
|
|
28
30
|
});
|
|
29
31
|
}
|
|
30
32
|
catch (error) {
|
|
@@ -32,7 +34,8 @@ class MqService {
|
|
|
32
34
|
if (t < 20) {
|
|
33
35
|
return await new Promise((resolve) => setTimeout(() => resolve(this.connect(t + 1)), 1000));
|
|
34
36
|
}
|
|
35
|
-
|
|
37
|
+
process.exit(1);
|
|
38
|
+
return;
|
|
36
39
|
}
|
|
37
40
|
this.logger.log('Connected to RabbitMQ');
|
|
38
41
|
this.connection.on('close', async () => {
|
|
@@ -40,7 +43,7 @@ class MqService {
|
|
|
40
43
|
return;
|
|
41
44
|
}
|
|
42
45
|
this.logger.warn('Connection to RabbitMQ closed, reconnecting...');
|
|
43
|
-
|
|
46
|
+
process.exit(1);
|
|
44
47
|
});
|
|
45
48
|
this.connection.on('error', (error) => {
|
|
46
49
|
this.logger.error('Connection to RabbitMQ error', error);
|
|
@@ -63,15 +66,10 @@ class MqService {
|
|
|
63
66
|
}
|
|
64
67
|
async shutdown() {
|
|
65
68
|
this.closing = true;
|
|
66
|
-
this.connection.removeAllListeners('close');
|
|
67
|
-
this.connection.removeAllListeners('error');
|
|
68
69
|
await this.mainChannel.close();
|
|
69
70
|
for (const { channel } of Object.values(this.queues)) {
|
|
70
71
|
await channel.close();
|
|
71
72
|
}
|
|
72
|
-
for (const channel of this.additionalChannels) {
|
|
73
|
-
await channel.close();
|
|
74
|
-
}
|
|
75
73
|
await this.connection.close();
|
|
76
74
|
}
|
|
77
75
|
async reconnectConsumers() {
|
|
@@ -111,7 +109,6 @@ class MqService {
|
|
|
111
109
|
const channel = ((options === null || options === void 0 ? void 0 : options.maxSimultaneousMessages) ? await this.connection.createChannel() : this.mainChannel);
|
|
112
110
|
if (options === null || options === void 0 ? void 0 : options.maxSimultaneousMessages) {
|
|
113
111
|
await channel.prefetch(options.maxSimultaneousMessages);
|
|
114
|
-
this.additionalChannels.push(channel);
|
|
115
112
|
}
|
|
116
113
|
this.queues[queue] = {
|
|
117
114
|
channel,
|
|
@@ -158,26 +155,6 @@ class MqService {
|
|
|
158
155
|
}
|
|
159
156
|
}, options);
|
|
160
157
|
}
|
|
161
|
-
async ensure(funcImpl, args = null) {
|
|
162
|
-
const mainChannel = this.mainChannel;
|
|
163
|
-
const { queue } = await mainChannel.assertQueue('', {
|
|
164
|
-
exclusive: true,
|
|
165
|
-
autoDelete: true,
|
|
166
|
-
});
|
|
167
|
-
mainChannel.consume(queue, async (msg) => {
|
|
168
|
-
const args = JSON.parse(msg.content.toString());
|
|
169
|
-
try {
|
|
170
|
-
await funcImpl(args);
|
|
171
|
-
mainChannel.ack(msg);
|
|
172
|
-
}
|
|
173
|
-
catch (error) {
|
|
174
|
-
this.logger.error('Failed to ensure', error);
|
|
175
|
-
await new Promise((resolve) => setTimeout(resolve, 1000));
|
|
176
|
-
mainChannel.nack(msg);
|
|
177
|
-
}
|
|
178
|
-
});
|
|
179
|
-
await mainChannel.sendToQueue(queue, Buffer.from(JSON.stringify(args)));
|
|
180
|
-
}
|
|
181
158
|
}
|
|
182
159
|
exports.MqService = MqService;
|
|
183
160
|
MqService.DEAD_LETTER_QUEUE = 'general-dead-letter-queue';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mq.service.js","sourceRoot":"","sources":["../../../../src/core/services/mq/mq.service.ts"],"names":[],"mappings":";;;AAAA,qCAA+D;AAE/D,sCAAmC;AASnC,MAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"mq.service.js","sourceRoot":"","sources":["../../../../src/core/services/mq/mq.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import { Method } from 'axios';
|
|
2
2
|
import { User } from '../../models/user';
|
|
3
3
|
import { ConfigService } from '../../essential/config.service';
|
|
4
|
-
import { CacheServiceFactory } from '../../orm/services/cache.service';
|
|
5
4
|
import { ComunicationService } from './comunication/comunication.service';
|
|
6
5
|
import { EnvConfigService } from '../../essential/envs-config.service';
|
|
7
|
-
import { LinkBuilder } from './link-builder';
|
|
8
|
-
import { RepositoryFactory } from '../../orm/services/repository-factory';
|
|
9
6
|
export interface Plugin {
|
|
10
7
|
name?: string;
|
|
11
8
|
label?: string;
|
|
@@ -22,12 +19,9 @@ export declare class PluginService {
|
|
|
22
19
|
private readonly configService;
|
|
23
20
|
private readonly comunicationService;
|
|
24
21
|
private readonly envConfigService;
|
|
25
|
-
private readonly linkBuilder;
|
|
26
|
-
private readonly cacheServiceFactory;
|
|
27
|
-
private readonly repositoryFactory;
|
|
28
22
|
private readonly logger;
|
|
29
23
|
private cachePluginList;
|
|
30
|
-
constructor(configService: ConfigService, comunicationService: ComunicationService, envConfigService: EnvConfigService
|
|
24
|
+
constructor(configService: ConfigService, comunicationService: ComunicationService, envConfigService: EnvConfigService);
|
|
31
25
|
init(): Promise<void>;
|
|
32
26
|
clearCache(): Promise<void>;
|
|
33
27
|
private getPluginLogRepository;
|
|
@@ -3,19 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PluginService = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
5
|
const axios_1 = require("axios");
|
|
6
|
+
const services_1 = require("../../orm/services");
|
|
6
7
|
const logger_1 = require("./logger");
|
|
8
|
+
const _1 = require(".");
|
|
7
9
|
class PluginService {
|
|
8
|
-
constructor(configService, comunicationService, envConfigService
|
|
10
|
+
constructor(configService, comunicationService, envConfigService) {
|
|
9
11
|
this.configService = configService;
|
|
10
12
|
this.comunicationService = comunicationService;
|
|
11
13
|
this.envConfigService = envConfigService;
|
|
12
|
-
this.linkBuilder = linkBuilder;
|
|
13
|
-
this.cacheServiceFactory = cacheServiceFactory;
|
|
14
|
-
this.repositoryFactory = repositoryFactory;
|
|
15
14
|
this.logger = new logger_1.Logger('PluginService');
|
|
16
15
|
}
|
|
17
16
|
async init() {
|
|
18
|
-
this.cachePluginList =
|
|
17
|
+
this.cachePluginList = services_1.cacheServiceFactory.get('pluginList', async () => {
|
|
19
18
|
return await this.getPluginsWithoutCache({
|
|
20
19
|
computeStatus: true
|
|
21
20
|
});
|
|
@@ -25,13 +24,13 @@ class PluginService {
|
|
|
25
24
|
await this.cachePluginList.invalidate();
|
|
26
25
|
}
|
|
27
26
|
getPluginLogRepository(args = {}) {
|
|
28
|
-
return
|
|
27
|
+
return services_1.repositoryFactory.getInstance({
|
|
29
28
|
tableName: 'puca_base_api_plugin_log',
|
|
30
29
|
transaction: args.transaction
|
|
31
30
|
});
|
|
32
31
|
}
|
|
33
32
|
getPluginRepository(args = {}) {
|
|
34
|
-
return
|
|
33
|
+
return services_1.repositoryFactory.getInstance({
|
|
35
34
|
tableName: 'puca_base_api_plugin',
|
|
36
35
|
transaction: args.transaction
|
|
37
36
|
});
|
|
@@ -51,7 +50,7 @@ class PluginService {
|
|
|
51
50
|
key: serverPlugin.key,
|
|
52
51
|
}
|
|
53
52
|
};
|
|
54
|
-
const
|
|
53
|
+
const domain = await this.envConfigService.getEnvByName('MAIN_DOMAIN', 'localhost:3999');
|
|
55
54
|
const { data: dataPlugins } = await axios_1.default.get(`${serverPlugin.host}/plugins/` + domain, config);
|
|
56
55
|
const filterPluginWithoutMultipleInstance = _.cloneDeep(dataPlugins.filter(plugin => !plugin.multiple_instances));
|
|
57
56
|
const filterPluginWithMultipleInstance = dataPlugins.filter(plugin => plugin.multiple_instances);
|
|
@@ -89,12 +88,12 @@ class PluginService {
|
|
|
89
88
|
key: serverPlugin.key,
|
|
90
89
|
}
|
|
91
90
|
};
|
|
92
|
-
const
|
|
91
|
+
const domain = await this.envConfigService.getEnvByName('MAIN_DOMAIN', 'localhost:3999');
|
|
93
92
|
const response = await axios_1.default.post(`${serverPlugin.host}/generate-token`, Object.assign(Object.assign({}, dataBody), { domain }), config);
|
|
94
93
|
return response.data.token;
|
|
95
94
|
}
|
|
96
95
|
async getPlugins() {
|
|
97
|
-
const environment =
|
|
96
|
+
const environment = await this.envConfigService.getEnvByName('ENVIRONMENT', 'DEVELOPMENT');
|
|
98
97
|
if (environment === 'DEVELOPMENT') {
|
|
99
98
|
return await this.getPluginsWithoutCache({ computeStatus: true });
|
|
100
99
|
}
|
|
@@ -165,7 +164,7 @@ class PluginService {
|
|
|
165
164
|
this.logger.verbose(args);
|
|
166
165
|
const url = args.plugin.url.startsWith('http')
|
|
167
166
|
? args.plugin.url
|
|
168
|
-
: await
|
|
167
|
+
: await _1.linkBuilder.build(args.plugin.url);
|
|
169
168
|
const options = {
|
|
170
169
|
headers: Object.assign({ 'Content-Type': 'application/json', 'server-authorization': args.plugin.secret, 'authorization': await this.computeToken(args.user) }, args.headers),
|
|
171
170
|
method: args.method || 'POST',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.service.js","sourceRoot":"","sources":["../../../src/core/services/plugin.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,iCAA0D;AAI1D,qCAAkC;
|
|
1
|
+
{"version":3,"file":"plugin.service.js","sourceRoot":"","sources":["../../../src/core/services/plugin.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ import { StorageServiceManager } from "./storage/storage.service";
|
|
|
5
5
|
import { ConfigService } from "../../essential/config.service";
|
|
6
6
|
import { JobExecutorFactory } from "./job-executor/job-executor.service";
|
|
7
7
|
import { RepositoryFactory } from '../../orm/services/repository-factory';
|
|
8
|
-
import { LinkBuilder } from './link-builder';
|
|
9
8
|
import { UserConfigService } from './user-config.service';
|
|
10
9
|
export interface ReportConfig {
|
|
11
10
|
puca_pid?: string;
|
|
@@ -58,11 +57,10 @@ export declare class ReportService {
|
|
|
58
57
|
private readonly configService;
|
|
59
58
|
private readonly jobExecutorFactory;
|
|
60
59
|
private readonly userConfigService;
|
|
61
|
-
private readonly linkBuilder;
|
|
62
60
|
private readonly logger;
|
|
63
61
|
private readonly folderCache;
|
|
64
62
|
private jobReportExecutor;
|
|
65
|
-
constructor(uuidService: UuidService, notificationService: NotificationService, repositoryFactory: RepositoryFactory, storageServiceManager: StorageServiceManager, configService: ConfigService, jobExecutorFactory: JobExecutorFactory, userConfigService: UserConfigService
|
|
63
|
+
constructor(uuidService: UuidService, notificationService: NotificationService, repositoryFactory: RepositoryFactory, storageServiceManager: StorageServiceManager, configService: ConfigService, jobExecutorFactory: JobExecutorFactory, userConfigService: UserConfigService);
|
|
66
64
|
prepare({ activateReportJobProcessator }: {
|
|
67
65
|
activateReportJobProcessator: Boolean;
|
|
68
66
|
}): Promise<void>;
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ReportService = exports.ReportMode = void 0;
|
|
4
4
|
const axios_1 = require("axios");
|
|
5
5
|
const _ = require("lodash");
|
|
6
|
+
const _1 = require(".");
|
|
6
7
|
const logger_1 = require("./logger");
|
|
7
8
|
var ReportMode;
|
|
8
9
|
(function (ReportMode) {
|
|
@@ -57,7 +58,7 @@ class FolderCache {
|
|
|
57
58
|
const response = await get(`${url}?${select}`, {
|
|
58
59
|
headers: await this.getDefaultHeaders()
|
|
59
60
|
});
|
|
60
|
-
const namespace = secret.
|
|
61
|
+
const namespace = secret.namespace;
|
|
61
62
|
this.logger.verbose(() => response.data, namespace);
|
|
62
63
|
const cache = response.data.value.map(f => {
|
|
63
64
|
try {
|
|
@@ -116,7 +117,7 @@ class FolderCache {
|
|
|
116
117
|
}
|
|
117
118
|
}
|
|
118
119
|
class ReportService {
|
|
119
|
-
constructor(uuidService, notificationService, repositoryFactory, storageServiceManager, configService, jobExecutorFactory, userConfigService
|
|
120
|
+
constructor(uuidService, notificationService, repositoryFactory, storageServiceManager, configService, jobExecutorFactory, userConfigService) {
|
|
120
121
|
this.uuidService = uuidService;
|
|
121
122
|
this.notificationService = notificationService;
|
|
122
123
|
this.repositoryFactory = repositoryFactory;
|
|
@@ -124,7 +125,6 @@ class ReportService {
|
|
|
124
125
|
this.configService = configService;
|
|
125
126
|
this.jobExecutorFactory = jobExecutorFactory;
|
|
126
127
|
this.userConfigService = userConfigService;
|
|
127
|
-
this.linkBuilder = linkBuilder;
|
|
128
128
|
this.logger = new logger_1.Logger('ReportService');
|
|
129
129
|
this.folderCache = new FolderCache(configService, this.getDefaultHeaders.bind(this));
|
|
130
130
|
}
|
|
@@ -192,7 +192,7 @@ class ReportService {
|
|
|
192
192
|
shortid: args.shortid,
|
|
193
193
|
},
|
|
194
194
|
data: Object.assign({ headers: {
|
|
195
|
-
host: await
|
|
195
|
+
host: await _1.linkBuilder.build(),
|
|
196
196
|
token: user.token
|
|
197
197
|
} }, data),
|
|
198
198
|
},
|
|
@@ -229,7 +229,7 @@ class ReportService {
|
|
|
229
229
|
]
|
|
230
230
|
},
|
|
231
231
|
data: Object.assign({ _headers: {
|
|
232
|
-
host: await
|
|
232
|
+
host: await _1.linkBuilder.build(),
|
|
233
233
|
token: user.token
|
|
234
234
|
} }, data)
|
|
235
235
|
},
|