@puca/puca-core 9.7.7 → 9.9.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/auth.service.d.ts +4 -3
- package/dist/core/services/auth.service.js +3 -16
- package/dist/core/services/auth.service.js.map +1 -1
- package/dist/core/services/bootstrap-commands.js +16 -3
- package/dist/core/services/bootstrap-commands.js.map +1 -1
- package/dist/core/services/comunication/comunication-http.service.d.ts +3 -3
- package/dist/core/services/comunication/comunication-http.service.js +3 -3
- package/dist/core/services/comunication/comunication-http.service.js.map +1 -1
- package/dist/core/services/comunication/comunication.service.d.ts +4 -4
- package/dist/core/services/comunication/comunication.service.js +3 -3
- package/dist/core/services/comunication/comunication.service.js.map +1 -1
- package/dist/core/services/crud-front-base.service.js +2 -1
- package/dist/core/services/crud-front-base.service.js.map +1 -1
- package/dist/core/services/email.service.d.ts +2 -2
- package/dist/core/services/email.service.js +2 -1
- package/dist/core/services/email.service.js.map +1 -1
- package/dist/core/services/incremental-search.service.d.ts +3 -3
- package/dist/core/services/incremental-search.service.js +3 -3
- package/dist/core/services/incremental-search.service.js.map +1 -1
- package/dist/core/services/index.d.ts +0 -4
- package/dist/core/services/index.js +13 -17
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/job/job.client.d.ts +2 -2
- package/dist/core/services/job/job.client.js.map +1 -1
- package/dist/core/services/job/job.service.d.ts +3 -3
- package/dist/core/services/job/job.service.js.map +1 -1
- package/dist/core/services/job-executor/job-executor.service.d.ts +9 -6
- package/dist/core/services/job-executor/job-executor.service.js +43 -9
- package/dist/core/services/job-executor/job-executor.service.js.map +1 -1
- package/dist/core/services/life-cycle.service.d.ts +15 -6
- package/dist/core/services/life-cycle.service.js +48 -8
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/migration.service.d.ts +1 -1
- package/dist/core/services/migration.service.js +15 -5
- package/dist/core/services/migration.service.js.map +1 -1
- package/dist/core/services/module-especification.service.d.ts +1 -1
- package/dist/core/services/onesignal.service.d.ts +2 -2
- package/dist/core/services/onesignal.service.js.map +1 -1
- package/dist/core/services/report.service.d.ts +2 -2
- package/dist/core/services/report.service.js.map +1 -1
- package/dist/core/services/storage/storage.service.d.ts +3 -3
- package/dist/core/services/storage/storage.service.js +3 -3
- package/dist/core/services/storage/storage.service.js.map +1 -1
- package/dist/core/services/user-config.service.d.ts +3 -3
- package/dist/core/services/user-config.service.js.map +1 -1
- package/dist/core/services/user.service.d.ts +32 -24
- package/dist/core/services/user.service.js +156 -115
- package/dist/core/services/user.service.js.map +1 -1
- package/dist/essential/audit.service.d.ts +22 -0
- package/dist/essential/audit.service.js +69 -0
- package/dist/essential/audit.service.js.map +1 -0
- package/dist/essential/{configs.service.d.ts → config.service.d.ts} +1 -1
- package/dist/essential/{configs.service.js → config.service.js} +4 -4
- package/dist/essential/config.service.js.map +1 -0
- package/dist/essential/envs-config.service.d.ts +3 -3
- package/dist/essential/envs-config.service.js +3 -3
- package/dist/essential/envs-config.service.js.map +1 -1
- package/dist/essential/index.d.ts +6 -2
- package/dist/essential/index.js +7 -3
- package/dist/essential/index.js.map +1 -1
- package/dist/{core/services → essential}/module-config.service.d.ts +2 -2
- package/dist/{core/services → essential}/module-config.service.js +1 -1
- package/dist/essential/module-config.service.js.map +1 -0
- package/dist/models/crud-controller-especification-environment.d.ts +1 -1
- package/dist/models/field-dictionary.d.ts +1 -1
- package/dist/models/secret.d.ts +4 -0
- package/dist/orm/services/cache.service.d.ts +4 -0
- package/dist/orm/services/cache.service.js +57 -26
- package/dist/orm/services/cache.service.js.map +1 -1
- package/dist/orm/services/index.js +1 -1
- package/dist/orm/services/index.js.map +1 -1
- package/dist/orm/services/transaction.d.ts +12 -7
- package/dist/orm/services/transaction.js +13 -12
- package/dist/orm/services/transaction.js.map +1 -1
- package/dist/plugins/eval/eval.service.js +2 -2
- package/dist/plugins/eval/eval.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/dist/core/services/module-config.service.js.map +0 -1
- package/dist/essential/configs.service.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":";;;AAAA,2CAA+D;AAC/D,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ConfigService } from "../../../essential/config.service";
|
|
2
2
|
import { ClientConnection, GrpcClient } from "../../../plugins/grpc-client.service";
|
|
3
3
|
export interface Args {
|
|
4
4
|
name: string;
|
|
@@ -23,7 +23,7 @@ declare class JobClient extends GrpcClient {
|
|
|
23
23
|
export declare class JobClientManager {
|
|
24
24
|
private readonly configService;
|
|
25
25
|
private instance;
|
|
26
|
-
constructor(configService:
|
|
26
|
+
constructor(configService: ConfigService);
|
|
27
27
|
get(): Promise<JobClient>;
|
|
28
28
|
}
|
|
29
29
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.client.js","sourceRoot":"","sources":["../../../../src/core/services/job/job.client.ts"],"names":[],"mappings":";;;AACA,8EAAoF;AAepF,MAAM,SAAU,SAAQ,gCAAU;IAChC,YAAY,MAAwB;QAClC,KAAK,CAAC,WAAW,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAA;IACpE,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAuC,MAAM,CAAC,CAAA;QACvE,IAAI,CAAC,CAAC,KAAK,EAAE;YACX,MAAM,CAAC,CAAC,KAAK,CAAA;SACd;QACD,OAAO,CAAC,CAAC,MAAM,CAAA;IACjB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAS;QACpB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAwB,QAAQ,EAAE,IAAI,CAAC,CAAA;QAChE,IAAI,CAAC,CAAC,KAAK,EAAE;YACX,MAAM,CAAC,CAAC,KAAK,CAAA;SACd;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAU;QACrB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAyB,QAAQ,EAAE,IAAI,CAAC,CAAA;QACjE,IAAI,CAAC,CAAC,KAAK,EAAE;YACX,MAAM,CAAC,CAAC,KAAK,CAAA;SACd;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAU;QACvB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAA2C,UAAU,EAAE,IAAI,CAAC,CAAA;QACrF,IAAI,CAAC,CAAC,KAAK,EAAE;YACX,MAAM,CAAC,CAAC,KAAK,CAAA;SACd;QACD,OAAO;YACL,QAAQ,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC;SAC/B,CAAA;IACH,CAAC;CACF;AAED,MAAa,gBAAgB;IAE3B,YAA6B,
|
|
1
|
+
{"version":3,"file":"job.client.js","sourceRoot":"","sources":["../../../../src/core/services/job/job.client.ts"],"names":[],"mappings":";;;AACA,8EAAoF;AAepF,MAAM,SAAU,SAAQ,gCAAU;IAChC,YAAY,MAAwB;QAClC,KAAK,CAAC,WAAW,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAA;IACpE,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAuC,MAAM,CAAC,CAAA;QACvE,IAAI,CAAC,CAAC,KAAK,EAAE;YACX,MAAM,CAAC,CAAC,KAAK,CAAA;SACd;QACD,OAAO,CAAC,CAAC,MAAM,CAAA;IACjB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAS;QACpB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAwB,QAAQ,EAAE,IAAI,CAAC,CAAA;QAChE,IAAI,CAAC,CAAC,KAAK,EAAE;YACX,MAAM,CAAC,CAAC,KAAK,CAAA;SACd;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAU;QACrB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAyB,QAAQ,EAAE,IAAI,CAAC,CAAA;QACjE,IAAI,CAAC,CAAC,KAAK,EAAE;YACX,MAAM,CAAC,CAAC,KAAK,CAAA;SACd;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAU;QACvB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAA2C,UAAU,EAAE,IAAI,CAAC,CAAA;QACrF,IAAI,CAAC,CAAC,KAAK,EAAE;YACX,MAAM,CAAC,CAAC,KAAK,CAAA;SACd;QACD,OAAO;YACL,QAAQ,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC;SAC/B,CAAA;IACH,CAAC;CACF;AAED,MAAa,gBAAgB;IAE3B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAI,CAAC;IAE9D,KAAK,CAAC,GAAG;QACP,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;YAC7E,IAAI,CAAC,iBAAiB,EAAE;gBACtB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;aACjD;YACD,IAAI,CAAC,QAAQ,GAAG,IAAI,SAAS,CAAC;gBAC5B,SAAS;gBACT,GAAG,EAAE,iBAAiB,CAAC,GAAG;gBAC1B,kBAAkB,EAAE,iBAAiB,CAAC,OAAO;gBAC7C,kBAAkB,EAAE,MAAM;aAC3B,CAAC,CAAA;SACH;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;CACF;AAnBD,4CAmBC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { ModuleConfigService } from "
|
|
1
|
+
import { ConfigService } from "../../../essential/config.service";
|
|
2
|
+
import { ModuleConfigService } from "../../../essential/module-config.service";
|
|
3
3
|
import { Args, JobClientManager } from "./job.client";
|
|
4
4
|
export interface Job {
|
|
5
5
|
name: string;
|
|
@@ -13,7 +13,7 @@ export declare class JobService {
|
|
|
13
13
|
private readonly jobClientManager;
|
|
14
14
|
private readonly configService;
|
|
15
15
|
private readonly moduleConfigService;
|
|
16
|
-
constructor(jobClientManager: JobClientManager, configService:
|
|
16
|
+
constructor(jobClientManager: JobClientManager, configService: ConfigService, moduleConfigService: ModuleConfigService);
|
|
17
17
|
list(): Promise<import("./job.client").Job>;
|
|
18
18
|
update(job: Job): Promise<void>;
|
|
19
19
|
delete(args: Args): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.service.js","sourceRoot":"","sources":["../../../../src/core/services/job/job.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;
|
|
1
|
+
{"version":3,"file":"job.service.js","sourceRoot":"","sources":["../../../../src/core/services/job/job.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAa5B,MAAa,UAAU;IACrB,YACmB,gBAAkC,EAClC,aAA4B,EAC5B,mBAAwC;QAFxC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAe;QAC5B,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAEhE,KAAK,CAAC,IAAI;QACR,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAQ;QACnB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAA;QACjC,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAA;QAC1E,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAA;YAC7E,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAA;YAC/E,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC;iBACrF,GAAG,CAAC,SAAS,CAAC;iBACd,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,GAAG,GAAG,GAAG,OAAO,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;SAClC;QAED,OAAO,MAAM,SAAS,CAAC,MAAM,iCACxB,GAAG,KACJ,OAAO,EAAE,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EACxE,IAAI,EAAE,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,IAC1E,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAU;QACrB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAU;QACvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACvC,CAAC;CACF;AAxCD,gCAwCC"}
|
|
@@ -1,19 +1,21 @@
|
|
|
1
1
|
import Bull = require("bull");
|
|
2
2
|
import { RedisConfig } from "../../../models/redis-config";
|
|
3
|
-
import {
|
|
3
|
+
import { ConfigService } from '../../../essential/config.service';
|
|
4
4
|
import { EnvConfigService } from "../../../essential/envs-config.service";
|
|
5
5
|
import { UuidService } from '../../../plugins/uuid/uuid.service';
|
|
6
|
+
import { AuditService } from '../../../essential/audit.service';
|
|
6
7
|
export declare class JobExecutor<T> {
|
|
7
8
|
private readonly envConfigService;
|
|
8
9
|
private readonly uuidService;
|
|
10
|
+
private readonly auditService;
|
|
9
11
|
private readonly logger;
|
|
10
12
|
private static instances;
|
|
11
13
|
private listenerIsActive;
|
|
12
14
|
private static readonly DEFAULT_OPT;
|
|
13
15
|
private readonly bull;
|
|
14
|
-
constructor(redisConfig: RedisConfig, envConfigService: EnvConfigService, uuidService: UuidService, queueName: string);
|
|
15
|
-
process(concurrency: number, callback: Bull.
|
|
16
|
-
process(callback: Bull.
|
|
16
|
+
constructor(redisConfig: RedisConfig, envConfigService: EnvConfigService, uuidService: UuidService, queueName: string, auditService: AuditService);
|
|
17
|
+
process(concurrency: number, callback: Bull.ProcessPromiseFunction<T>): any;
|
|
18
|
+
process(callback: Bull.ProcessPromiseFunction<T>): any;
|
|
17
19
|
add(data: T, opts?: {
|
|
18
20
|
key?: string;
|
|
19
21
|
backoff?: {
|
|
@@ -34,11 +36,12 @@ export declare class JobExecutor<T> {
|
|
|
34
36
|
static shutdown(immediate: boolean): Promise<void>;
|
|
35
37
|
}
|
|
36
38
|
export declare class JobExecutorFactory {
|
|
37
|
-
private readonly
|
|
39
|
+
private readonly configService;
|
|
38
40
|
private readonly envConfigService;
|
|
39
41
|
private readonly uuidService;
|
|
42
|
+
private readonly auditService;
|
|
40
43
|
private redisConfig;
|
|
41
|
-
constructor(
|
|
44
|
+
constructor(configService: ConfigService, envConfigService: EnvConfigService, uuidService: UuidService, auditService: AuditService);
|
|
42
45
|
prepare(): Promise<void>;
|
|
43
46
|
get<T>(queueName: string): JobExecutor<T>;
|
|
44
47
|
}
|
|
@@ -5,9 +5,10 @@ const _ = require("lodash");
|
|
|
5
5
|
const Bull = require("bull");
|
|
6
6
|
const logger_1 = require("../logger");
|
|
7
7
|
class JobExecutor {
|
|
8
|
-
constructor(redisConfig, envConfigService, uuidService, queueName) {
|
|
8
|
+
constructor(redisConfig, envConfigService, uuidService, queueName, auditService) {
|
|
9
9
|
this.envConfigService = envConfigService;
|
|
10
10
|
this.uuidService = uuidService;
|
|
11
|
+
this.auditService = auditService;
|
|
11
12
|
this.logger = new logger_1.Logger('JobExecutor');
|
|
12
13
|
this.listenerIsActive = false;
|
|
13
14
|
this.bull = new Bull(queueName, {
|
|
@@ -20,26 +21,58 @@ class JobExecutor {
|
|
|
20
21
|
});
|
|
21
22
|
this.bull.on('error', (error) => {
|
|
22
23
|
this.logger.error('error', queueName, error);
|
|
24
|
+
this.auditService.captureException(error);
|
|
23
25
|
});
|
|
24
26
|
this.bull.on('stalled', (job) => {
|
|
25
|
-
|
|
27
|
+
const data = {
|
|
28
|
+
error: 'stalled',
|
|
29
|
+
queueName,
|
|
30
|
+
jobId: job.opts.jobId,
|
|
31
|
+
failedReason: job.failedReason,
|
|
32
|
+
attemptsMade: job.attemptsMade,
|
|
33
|
+
stacktrace: job.stacktrace[0],
|
|
34
|
+
};
|
|
35
|
+
this.logger.error(data);
|
|
36
|
+
this.auditService.captureException(new Error(`Job stalled: ${JSON.stringify(data)}`));
|
|
26
37
|
});
|
|
27
38
|
this.bull.on('failed', (job) => {
|
|
28
|
-
|
|
39
|
+
const data = {
|
|
40
|
+
error: 'failed',
|
|
41
|
+
queueName,
|
|
42
|
+
jobId: job.opts.jobId,
|
|
43
|
+
failedReason: job.failedReason,
|
|
44
|
+
attemptsMade: job.attemptsMade,
|
|
45
|
+
stacktrace: job.stacktrace[0],
|
|
46
|
+
};
|
|
47
|
+
this.logger.error(data);
|
|
48
|
+
this.auditService.captureException(new Error(`Job failed: ${JSON.stringify(data)}`));
|
|
29
49
|
});
|
|
30
50
|
}
|
|
31
51
|
async process(arg1, arg2 = null) {
|
|
32
52
|
const concurrency = typeof arg1 === 'number' ? arg1 : 0;
|
|
33
53
|
const callback = arg2 || arg1;
|
|
54
|
+
const callbackHook = async (job) => {
|
|
55
|
+
const transaction = this.auditService.startTransaction(`JobExecutor: ${job.queue.name}`);
|
|
56
|
+
try {
|
|
57
|
+
return await callback(job);
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
this.auditService.captureException(error);
|
|
61
|
+
throw error;
|
|
62
|
+
}
|
|
63
|
+
finally {
|
|
64
|
+
transaction.finish();
|
|
65
|
+
}
|
|
66
|
+
};
|
|
34
67
|
if (!this.listenerIsActive) {
|
|
35
68
|
JobExecutor.instances.push(this);
|
|
36
69
|
}
|
|
37
70
|
this.listenerIsActive = true;
|
|
38
71
|
if (concurrency) {
|
|
39
|
-
return await this.bull.process(concurrency,
|
|
72
|
+
return await this.bull.process(concurrency, callbackHook);
|
|
40
73
|
}
|
|
41
74
|
else {
|
|
42
|
-
return await this.bull.process(
|
|
75
|
+
return await this.bull.process(callbackHook);
|
|
43
76
|
}
|
|
44
77
|
}
|
|
45
78
|
async add(data, opts) {
|
|
@@ -74,19 +107,20 @@ JobExecutor.DEFAULT_OPT = {
|
|
|
74
107
|
attempts: 15,
|
|
75
108
|
};
|
|
76
109
|
class JobExecutorFactory {
|
|
77
|
-
constructor(
|
|
78
|
-
this.
|
|
110
|
+
constructor(configService, envConfigService, uuidService, auditService) {
|
|
111
|
+
this.configService = configService;
|
|
79
112
|
this.envConfigService = envConfigService;
|
|
80
113
|
this.uuidService = uuidService;
|
|
114
|
+
this.auditService = auditService;
|
|
81
115
|
}
|
|
82
116
|
async prepare() {
|
|
83
|
-
this.redisConfig = (await this.
|
|
117
|
+
this.redisConfig = (await this.configService.getSecret()).redisConfig;
|
|
84
118
|
}
|
|
85
119
|
get(queueName) {
|
|
86
120
|
if (!this.redisConfig) {
|
|
87
121
|
throw new Error('not ready');
|
|
88
122
|
}
|
|
89
|
-
const je = new JobExecutor(this.redisConfig, this.envConfigService, this.uuidService, queueName);
|
|
123
|
+
const je = new JobExecutor(this.redisConfig, this.envConfigService, this.uuidService, queueName, this.auditService);
|
|
90
124
|
return je;
|
|
91
125
|
}
|
|
92
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-executor.service.js","sourceRoot":"","sources":["../../../../src/core/services/job-executor/job-executor.service.ts"],"names":[],"mappings":";;;AAAA,4BAA2B;AAC3B,6BAA8B;
|
|
1
|
+
{"version":3,"file":"job-executor.service.js","sourceRoot":"","sources":["../../../../src/core/services/job-executor/job-executor.service.ts"],"names":[],"mappings":";;;AAAA,4BAA2B;AAC3B,6BAA8B;AAK9B,sCAAmC;AAInC,MAAa,WAAW;IAetB,YACE,WAAwB,EACP,gBAAkC,EAElC,WAAwB,EACzC,SAAiB,EACA,YAA0B;QAJ1B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAElC,gBAAW,GAAX,WAAW,CAAa;QAExB,iBAAY,GAAZ,YAAY,CAAc;QApB5B,WAAM,GAAG,IAAI,eAAM,CAAC,aAAa,CAAC,CAAA;QAE3C,qBAAgB,GAAY,KAAK,CAAA;QAoBvC,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAClB,SAAS,EAAE;YACX,KAAK,EAAE,WAAW;YAClB,MAAM,EAAE,MAAM;YACd,iBAAiB,EAAE,WAAW,CAAC,WAAW;SAC3C,CAAC,CAAA;QAEF,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE;YAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,QAAQ,EACR,SAAS,EACT,GAAG,CAAC,IAAI,EACR,GAAG,CAAC,IAAI,CACT,CAAC;QACJ,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;YAC5C,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;QAC3C,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE;YAC9B,MAAM,IAAI,GAAG;gBACX,KAAK,EAAE,SAAS;gBAChB,SAAS;gBACT,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK;gBACrB,YAAY,EAAE,GAAG,CAAC,YAAY;gBAC9B,YAAY,EAAE,GAAG,CAAC,YAAY;gBAC9B,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;aAC9B,CAAA;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACvB,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,IAAI,KAAK,CAAC,gBAAgB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;QACvF,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE;YAC7B,MAAM,IAAI,GAAG;gBACX,KAAK,EAAE,QAAQ;gBACf,SAAS;gBACT,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK;gBACrB,YAAY,EAAE,GAAG,CAAC,YAAY;gBAC9B,YAAY,EAAE,GAAG,CAAC,YAAY;gBAC9B,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;aAC9B,CAAA;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACvB,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,IAAI,KAAK,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;QACtF,CAAC,CAAC,CAAA;IACJ,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,IAA6C,EAAE,OAAuC,IAAI;QACtG,MAAM,WAAW,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QACvD,MAAM,QAAQ,GAAG,IAAI,IAAI,IAAsC,CAAA;QAC/D,MAAM,YAAY,GAAG,KAAK,EAAE,GAAgB,EAAE,EAAE;YAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,gBAAgB,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;YACxF,IAAI;gBACF,OAAO,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAA;aAC3B;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;gBACzC,MAAM,KAAK,CAAA;aACZ;oBAAS;gBACR,WAAW,CAAC,MAAM,EAAE,CAAA;aACrB;QACH,CAAC,CAAA;QAED,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SACjC;QACD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAA;QAC5B,IAAI,WAAW,EAAE;YACf,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;SAC1D;aAAM;YACL,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;SAC7C;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CACP,IAAO,EACP,IAeC;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAC1D,aAAa,EACb,aAAa,CACd,CAAC;QAEF,MAAM,cAAc,GAAG,gCAClB,WAAW,CAAC,WAAW,KAC1B,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,EAClD,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,EAChE,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,EACnE,YAAY,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,WAAW,CAAC,WAAW,CAAC,YAAY,CAAC,EAC/E,gBAAgB,EAAE,WAAW,KAAK,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,WAAW,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAC3H,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,EAC7B,OAAO,kCACF,WAAW,CAAC,WAAW,CAAC,OAA8B,GACtD,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,IAET,CAAA;QACpB,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,SAAkB;QAC/B,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAChC,MAAM,CAAC,GAAG,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC7C,IAAG,CAAC,KAAG,CAAC,CAAC,EAAC;YACR,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;SACnC;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAkB;QACtC,OAAO,WAAW,CAAC,SAAS,CAAC,MAAM,EAAE;YACnC,MAAM,EAAE,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACpC,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;SAC7B;IACH,CAAC;;AArJH,kCAsJC;AApJgB,qBAAS,GAAuB,EAAE,CAAA;AAEzB,uBAAW,GAAG;IACpC,gBAAgB,EAAE,IAAI;IACtB,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE;QACP,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,IAAI;KACZ;IACD,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,EAAE;CACM,CAAA;AA2ItB,MAAa,kBAAkB;IAE7B,YACmB,aAA4B,EAC5B,gBAAkC,EAClC,WAAwB,EACxB,YAA0B;QAH1B,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,gBAAW,GAAX,WAAW,CAAa;QACxB,iBAAY,GAAZ,YAAY,CAAc;IACvC,CAAC;IAEP,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,WAAW,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,WAAW,CAAA;IACvE,CAAC;IAED,GAAG,CAAI,SAAiB;QACtB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAA;SAC7B;QACD,MAAM,EAAE,GAAG,IAAI,WAAW,CACxB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,gBAAgB,EAErB,IAAI,CAAC,WAAW,EAChB,SAAS,EACT,IAAI,CAAC,YAAY,CAClB,CAAA;QACD,OAAO,EAAE,CAAA;IACX,CAAC;CACF;AA3BD,gDA2BC"}
|
|
@@ -3,7 +3,8 @@ import { BootstrapService } from './bootstrap.service';
|
|
|
3
3
|
import { InstallService } from './install.service';
|
|
4
4
|
import { RepositoryFactory } from '../../orm/services/repository-factory';
|
|
5
5
|
import { WebSocketService } from './web-socket.service';
|
|
6
|
-
import {
|
|
6
|
+
import { INestApplication } from '@nestjs/common';
|
|
7
|
+
import { ConfigService } from '../../essential/config.service';
|
|
7
8
|
import { EnvConfigService } from '../../essential/envs-config.service';
|
|
8
9
|
import { RedisManagerService } from '../../orm/services/managers/redis-manager.service';
|
|
9
10
|
import { SqlService } from '../../orm/services/sql/sql.service';
|
|
@@ -13,13 +14,18 @@ import { EvalServiceFactory } from './eval.service';
|
|
|
13
14
|
import { OneSignalService } from './onesignal.service';
|
|
14
15
|
import { IncrementalSearchService } from './incremental-search.service';
|
|
15
16
|
import { EmailService } from './email.service';
|
|
17
|
+
import { AuditService } from '../../essential/audit.service';
|
|
18
|
+
import { AuthService } from './auth.service';
|
|
19
|
+
import { UserService } from './user.service';
|
|
16
20
|
export interface StartArgs {
|
|
17
21
|
appModule: any;
|
|
18
22
|
execBootStrap?: boolean;
|
|
19
23
|
bodyParser?: boolean;
|
|
20
24
|
activateWebSocketServer?: boolean;
|
|
21
25
|
activateReportJobProcessator?: boolean;
|
|
22
|
-
|
|
26
|
+
}
|
|
27
|
+
export interface ShutdownArgs {
|
|
28
|
+
exit?: () => any;
|
|
23
29
|
}
|
|
24
30
|
export declare class LifeCycleService {
|
|
25
31
|
private readonly databaseManagerService;
|
|
@@ -29,7 +35,7 @@ export declare class LifeCycleService {
|
|
|
29
35
|
private readonly installService;
|
|
30
36
|
private readonly repositoryFactory;
|
|
31
37
|
private readonly webSocketService;
|
|
32
|
-
private readonly
|
|
38
|
+
private readonly configService;
|
|
33
39
|
private readonly sqlService;
|
|
34
40
|
private readonly reportService;
|
|
35
41
|
private readonly jobExecutorFactory;
|
|
@@ -37,12 +43,15 @@ export declare class LifeCycleService {
|
|
|
37
43
|
private readonly oneSignalService;
|
|
38
44
|
private readonly incrementalSearchService;
|
|
39
45
|
private readonly emailService;
|
|
46
|
+
private readonly auditService;
|
|
47
|
+
private readonly authService;
|
|
48
|
+
private readonly userService;
|
|
40
49
|
private readonly logger;
|
|
41
50
|
private app;
|
|
42
51
|
private readonly intervals;
|
|
43
|
-
constructor(databaseManagerService: DatabaseManagerService, redisManagerService: RedisManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService, repositoryFactory: RepositoryFactory, webSocketService: WebSocketService,
|
|
44
|
-
shutdown(): Promise<void>;
|
|
45
|
-
start(args: StartArgs): Promise<
|
|
52
|
+
constructor(databaseManagerService: DatabaseManagerService, redisManagerService: RedisManagerService, bootstrapService: BootstrapService, envConfigService: EnvConfigService, installService: InstallService, repositoryFactory: RepositoryFactory, webSocketService: WebSocketService, configService: ConfigService, sqlService: SqlService, reportService: ReportService, jobExecutorFactory: JobExecutorFactory, evalServiceFactory: EvalServiceFactory, oneSignalService: OneSignalService, incrementalSearchService: IncrementalSearchService, emailService: EmailService, auditService: AuditService, authService: AuthService, userService: UserService);
|
|
53
|
+
shutdown(opt?: ShutdownArgs): Promise<void>;
|
|
54
|
+
start(args: StartArgs): Promise<INestApplication>;
|
|
46
55
|
private connectToRedis;
|
|
47
56
|
private connectToDataBase;
|
|
48
57
|
}
|
|
@@ -7,7 +7,7 @@ const core_1 = require("@nestjs/core");
|
|
|
7
7
|
const logger_1 = require("./logger");
|
|
8
8
|
const job_executor_service_1 = require("./job-executor/job-executor.service");
|
|
9
9
|
class LifeCycleService {
|
|
10
|
-
constructor(databaseManagerService, redisManagerService, bootstrapService, envConfigService, installService, repositoryFactory, webSocketService,
|
|
10
|
+
constructor(databaseManagerService, redisManagerService, bootstrapService, envConfigService, installService, repositoryFactory, webSocketService, configService, sqlService, reportService, jobExecutorFactory, evalServiceFactory, oneSignalService, incrementalSearchService, emailService, auditService, authService, userService) {
|
|
11
11
|
this.databaseManagerService = databaseManagerService;
|
|
12
12
|
this.redisManagerService = redisManagerService;
|
|
13
13
|
this.bootstrapService = bootstrapService;
|
|
@@ -15,7 +15,7 @@ class LifeCycleService {
|
|
|
15
15
|
this.installService = installService;
|
|
16
16
|
this.repositoryFactory = repositoryFactory;
|
|
17
17
|
this.webSocketService = webSocketService;
|
|
18
|
-
this.
|
|
18
|
+
this.configService = configService;
|
|
19
19
|
this.sqlService = sqlService;
|
|
20
20
|
this.reportService = reportService;
|
|
21
21
|
this.jobExecutorFactory = jobExecutorFactory;
|
|
@@ -23,10 +23,13 @@ class LifeCycleService {
|
|
|
23
23
|
this.oneSignalService = oneSignalService;
|
|
24
24
|
this.incrementalSearchService = incrementalSearchService;
|
|
25
25
|
this.emailService = emailService;
|
|
26
|
+
this.auditService = auditService;
|
|
27
|
+
this.authService = authService;
|
|
28
|
+
this.userService = userService;
|
|
26
29
|
this.logger = new logger_1.Logger('LifeCycleService');
|
|
27
30
|
this.intervals = [];
|
|
28
31
|
}
|
|
29
|
-
async shutdown() {
|
|
32
|
+
async shutdown(opt) {
|
|
30
33
|
const environment = await this.envConfigService.getEnvByName('ENVIRONMENT', 'DEVELOPMENT');
|
|
31
34
|
if (environment === 'PRODUCTION') {
|
|
32
35
|
this.logger.warn('Finalizando o servidor em 15-30 segundos');
|
|
@@ -47,56 +50,93 @@ class LifeCycleService {
|
|
|
47
50
|
}
|
|
48
51
|
try {
|
|
49
52
|
await Promise.all(tasks);
|
|
50
|
-
|
|
53
|
+
const exit = (opt === null || opt === void 0 ? void 0 : opt.exit) || process.exit;
|
|
54
|
+
exit(0);
|
|
51
55
|
}
|
|
52
56
|
catch (e) {
|
|
53
57
|
this.logger.error(e);
|
|
54
58
|
}
|
|
55
59
|
}
|
|
56
60
|
async start(args) {
|
|
61
|
+
const startDate = new Date();
|
|
62
|
+
const events = [];
|
|
63
|
+
let lastEvent = startDate;
|
|
64
|
+
const doneEvent = (name) => {
|
|
65
|
+
const now = new Date();
|
|
66
|
+
events.push({ name, start: lastEvent, end: now });
|
|
67
|
+
lastEvent = now;
|
|
68
|
+
};
|
|
57
69
|
logger_1.Logger.setStackCondition(await this.envConfigService.getEnvByName('LOG_STACK_CONDITION', ''));
|
|
58
70
|
const logLevel = await this.envConfigService.getEnvByName('LOG_LEVEL', '');
|
|
71
|
+
doneEvent('setLogLevel');
|
|
59
72
|
logLevel
|
|
60
73
|
.split(',')
|
|
61
74
|
.filter(l => l)
|
|
62
75
|
.forEach(logger_1.Logger.addLogLevel);
|
|
63
76
|
const logClass = await this.envConfigService.getEnvByName('LOG_CLASS', '');
|
|
77
|
+
doneEvent('setLogClass');
|
|
64
78
|
logClass
|
|
65
79
|
.split(',')
|
|
66
80
|
.filter(l => l)
|
|
67
81
|
.forEach(logger_1.Logger.addLogClass);
|
|
68
82
|
await this.connectToDataBase();
|
|
83
|
+
doneEvent('connectToDataBase');
|
|
69
84
|
await this.connectToRedis();
|
|
85
|
+
doneEvent('connectToRedis');
|
|
70
86
|
if (args.execBootStrap) {
|
|
71
87
|
await this.bootstrapService.install();
|
|
88
|
+
doneEvent('bootstrapService');
|
|
72
89
|
}
|
|
73
90
|
const environment = await this.envConfigService.getEnvByName('ENVIRONMENT', 'DEVELOPMENT');
|
|
91
|
+
doneEvent('getEnvironment');
|
|
74
92
|
this.app = await core_1.NestFactory.create(args.appModule, {
|
|
75
93
|
bodyParser: args.bodyParser === undefined ? true : args.bodyParser,
|
|
76
94
|
cors: environment !== 'PRODUCTION',
|
|
77
95
|
});
|
|
96
|
+
doneEvent('createApp');
|
|
78
97
|
await this.evalServiceFactory.prepare();
|
|
98
|
+
doneEvent('evalServiceFactory');
|
|
79
99
|
await this.jobExecutorFactory.prepare();
|
|
100
|
+
doneEvent('jobExecutorFactory');
|
|
80
101
|
await this.incrementalSearchService.prepare();
|
|
102
|
+
doneEvent('incrementalSearchService');
|
|
81
103
|
await this.installService.install();
|
|
104
|
+
doneEvent('installService');
|
|
82
105
|
await this.sqlService.prepare();
|
|
106
|
+
doneEvent('sqlService');
|
|
83
107
|
const httpServer = this.app.getHttpServer();
|
|
84
108
|
if (args.activateWebSocketServer) {
|
|
85
109
|
await this.webSocketService.config(httpServer);
|
|
110
|
+
doneEvent('webSocketService');
|
|
86
111
|
await this.oneSignalService.startOneSignal();
|
|
112
|
+
doneEvent('oneSignalService');
|
|
87
113
|
}
|
|
88
114
|
await this.emailService.startApiEmailService();
|
|
89
|
-
(
|
|
115
|
+
doneEvent('emailService');
|
|
90
116
|
await this.reportService.prepare({
|
|
91
117
|
activateReportJobProcessator: args.activateReportJobProcessator
|
|
92
118
|
});
|
|
119
|
+
doneEvent('reportService');
|
|
120
|
+
await this.auditService.start({
|
|
121
|
+
app: this.app,
|
|
122
|
+
});
|
|
123
|
+
doneEvent('auditService');
|
|
124
|
+
await this.authService.init();
|
|
125
|
+
doneEvent('authService');
|
|
126
|
+
await this.userService.init();
|
|
127
|
+
doneEvent('userService');
|
|
93
128
|
await this.app.listen(await this.envConfigService.getEnvByName('SERVER_PORT', '4000'));
|
|
94
|
-
|
|
129
|
+
doneEvent('listen');
|
|
130
|
+
events.forEach(e => {
|
|
131
|
+
this.logger.log(`${e.name} in ${e.end.getTime() - e.start.getTime()}ms`);
|
|
132
|
+
});
|
|
133
|
+
this.logger.log(`ready in ${new Date().getTime() - startDate.getTime()}ms`);
|
|
95
134
|
this.app.enableShutdownHooks();
|
|
135
|
+
return this.app;
|
|
96
136
|
}
|
|
97
137
|
async connectToRedis() {
|
|
98
138
|
try {
|
|
99
|
-
const { redisConfig } = await this.
|
|
139
|
+
const { redisConfig } = await this.configService.getSecret();
|
|
100
140
|
const redisClient = redis.createClient(redisConfig);
|
|
101
141
|
this.redisManagerService.set(redisClient);
|
|
102
142
|
}
|
|
@@ -106,7 +146,7 @@ class LifeCycleService {
|
|
|
106
146
|
}
|
|
107
147
|
}
|
|
108
148
|
async connectToDataBase() {
|
|
109
|
-
const { namespace, pucaOrmConfig: { key, address } } = await this.
|
|
149
|
+
const { namespace, pucaOrmConfig: { key, address } } = await this.configService.getSecret();
|
|
110
150
|
const database = new database_manager_service_1.Database({
|
|
111
151
|
grpcServiceAddress: address,
|
|
112
152
|
key,
|
|
@@ -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;AAI9D,uCAA2C;AAC3C,qCAAkC;AAQlC,8EAAsF;
|
|
1
|
+
{"version":3,"file":"life-cycle.service.js","sourceRoot":"","sources":["../../../src/core/services/life-cycle.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { User } from '../../models/user';
|
|
2
2
|
import { AlterTableAddColumn, CreateTable } from '../../orm/cases/bo/interfaces';
|
|
3
3
|
import { RepositoryFactory } from '../../orm/services/repository-factory';
|
|
4
|
-
import { ModuleConfigService } from '
|
|
4
|
+
import { ModuleConfigService } from '../../essential/module-config.service';
|
|
5
5
|
import { RedisManagerService } from '../../orm/services/managers/redis-manager.service';
|
|
6
6
|
import { TransactionFactory } from '../../orm/services/transaction';
|
|
7
7
|
import { EnvConfigService } from '../../essential/envs-config.service';
|
|
@@ -47,7 +47,9 @@ class MigrationService {
|
|
|
47
47
|
if (['createTableMigration', 'createTablTableDictionary', 'createTableFieldDictionary'].includes(c.id)) {
|
|
48
48
|
method = 'internalCreateTable';
|
|
49
49
|
}
|
|
50
|
-
const transaction = this.transactionFactory.get(
|
|
50
|
+
const transaction = this.transactionFactory.get({
|
|
51
|
+
name: `migration-${c.id}`,
|
|
52
|
+
});
|
|
51
53
|
try {
|
|
52
54
|
const exec = (method) => async (c) => {
|
|
53
55
|
const commandList = cases_1.cSqlService[method](c);
|
|
@@ -103,7 +105,9 @@ class MigrationService {
|
|
|
103
105
|
}
|
|
104
106
|
}
|
|
105
107
|
async createTable(c) {
|
|
106
|
-
const transaction = this.transactionFactory.get(
|
|
108
|
+
const transaction = this.transactionFactory.get({
|
|
109
|
+
name: `create-table-${c.tableName}`,
|
|
110
|
+
});
|
|
107
111
|
try {
|
|
108
112
|
await this._createTable(Object.assign(Object.assign({}, c), { transaction }));
|
|
109
113
|
await transaction.commit();
|
|
@@ -149,7 +153,9 @@ class MigrationService {
|
|
|
149
153
|
await c.transaction.serialExec(sqlCommandList);
|
|
150
154
|
}
|
|
151
155
|
async alterTableAddColumn(alterTableAddColumn) {
|
|
152
|
-
const transaction = this.transactionFactory.get(
|
|
156
|
+
const transaction = this.transactionFactory.get({
|
|
157
|
+
name: `alter-table-add-column-${alterTableAddColumn.tableName}-${alterTableAddColumn.name}`,
|
|
158
|
+
});
|
|
153
159
|
try {
|
|
154
160
|
await this._alterTableAddColumn(Object.assign(Object.assign({}, alterTableAddColumn), { transaction }));
|
|
155
161
|
await transaction.commit();
|
|
@@ -193,7 +199,9 @@ class MigrationService {
|
|
|
193
199
|
});
|
|
194
200
|
}
|
|
195
201
|
async alterTableDropColumn(args) {
|
|
196
|
-
const transaction = this.transactionFactory.get(
|
|
202
|
+
const transaction = this.transactionFactory.get({
|
|
203
|
+
name: `alter-table-drop-column-${args.tableName}-${args.name}`,
|
|
204
|
+
});
|
|
197
205
|
try {
|
|
198
206
|
await this._alterTableDropColumn(Object.assign(Object.assign({}, args), { transaction }));
|
|
199
207
|
await transaction.commit();
|
|
@@ -239,7 +247,9 @@ class MigrationService {
|
|
|
239
247
|
this.redisManagerService.get().publish('field_dictionary.change', fieldDictionary.puca_pid);
|
|
240
248
|
}
|
|
241
249
|
async dropTable(args) {
|
|
242
|
-
const transaction = this.transactionFactory.get(
|
|
250
|
+
const transaction = this.transactionFactory.get({
|
|
251
|
+
name: `drop-table-${args.tableName}`,
|
|
252
|
+
});
|
|
243
253
|
try {
|
|
244
254
|
await this._dropTable(Object.assign(Object.assign({}, args), { transaction }));
|
|
245
255
|
await transaction.commit();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.service.js","sourceRoot":"","sources":["../../../src/core/services/migration.service.ts"],"names":[],"mappings":";;;AACA,2CAA0D;AAC1D,8DAMuC;AAGvC,qCAAkC;AAelC,MAAa,gBAAgB;IAE3B,YACmB,kBAAsC,EACtC,iBAAoC,EACpC,mBAAwC,EACxC,mBAAwC,EACxC,gBAAkC;QAJlC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,qBAAgB,GAAhB,gBAAgB,CAAkB;QANpC,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAkB,CAAC,CAAC;IAOrD,CAAC;IAEL,KAAK,CAAC,OAAO,CAAC,EACZ,WAAW,EACX,IAAI,EACJ,UAAU,EACV,cAAc,EAMf;QACC,MAAM,mBAAmB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAiB;YAC7E,SAAS,EAAE,WAAW;YACtB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI;YACF,UAAU,GAAG,CAAC,MAAM,mBAAmB,CAAC,SAAS,CAAC;gBAChD,MAAM,EAAE,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE;oBACJ,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;iBACrC;gBACD,KAAK,EAAE;oBACL,EAAE,EAAE,IAAI;oBACR,QAAQ,EAAE,iCAAoB,CAAC,KAAK;oBACpC,EAAE,EAAE,MAAM;iBACX;gBACD,IAAI;aAEL,CAAC,CAAC,CAAC,IAAI,CAAC;SACV;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YACnD,UAAU,GAAG,EAAE,CAAC;YAEhB,cAAc,GAAG,KAAK,CAAA;SACvB;QACD,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;QACrD,IAAI,iBAAiB,GAAmC,EAAE,CAAA;QAC1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YACzB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;gBACjC,IAAI,MAAM,GAAG,CAAC,CAAC,MAAM,CAAA;gBACrB,IAAI,CAAC,sBAAsB,EAAE,2BAA2B,EAAE,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;oBACtG,MAAM,GAAG,qBAAqB,CAAA;iBAC/B;gBAED,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"migration.service.js","sourceRoot":"","sources":["../../../src/core/services/migration.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ModuleConfigService } from "
|
|
1
|
+
import { ModuleConfigService } from "../../essential/module-config.service";
|
|
2
2
|
import { ModuleEspecification } from "../../models/module-especification";
|
|
3
3
|
import { FileSystemService } from "../../plugins/file-system/file-system.service";
|
|
4
4
|
export declare class ModuleEspecificationService {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ConfigService } from '../../essential/config.service';
|
|
2
2
|
export interface Notification {
|
|
3
3
|
message: string;
|
|
4
4
|
destination: string;
|
|
@@ -9,7 +9,7 @@ export declare class OneSignalService {
|
|
|
9
9
|
private configuration;
|
|
10
10
|
private client;
|
|
11
11
|
private appId;
|
|
12
|
-
constructor(configService:
|
|
12
|
+
constructor(configService: ConfigService);
|
|
13
13
|
startOneSignal(): Promise<void>;
|
|
14
14
|
sendNotification(notification: Notification): Promise<void>;
|
|
15
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onesignal.service.js","sourceRoot":"","sources":["../../../src/core/services/onesignal.service.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AASvD,MAAa,gBAAgB;IAK3B,YAA6B,
|
|
1
|
+
{"version":3,"file":"onesignal.service.js","sourceRoot":"","sources":["../../../src/core/services/onesignal.service.ts"],"names":[],"mappings":";;;AAAA,uDAAuD;AASvD,MAAa,gBAAgB;IAK3B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE7D,KAAK,CAAC,cAAc;QAClB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;QAE3D,IAAI,CAAC,SAAS,EAAE;YACd,OAAO;SACR;QAED,MAAM,gBAAgB,GAAG;YACvB,QAAQ;gBACN,OAAO,SAAS,CAAC,UAAU,CAAC;YAC9B,CAAC;SACF,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC,mBAAmB,CAAC;YACjD,WAAW,EAAE;gBACX,OAAO,EAAE;oBACP,aAAa,EAAE,gBAAgB;iBAChC;aACF;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAA;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,YAA0B;QAC/C,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;YACd,OAAM;SACP;QACD,MAAM,qBAAqB,GAAG;YAC5B,QAAQ,EAAE;gBACR,EAAE,EAAE,YAAY,CAAC,OAAO;aACzB;YACD,6BAA6B,EAAE,MAAM;YACrC,yBAAyB,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC;YACrD,MAAM,EAAE,IAAI,CAAC,KAAK;YAClB,IAAI,EAAE;gBACJ,IAAI,EAAE,YAAY,CAAC,IAAI;aACxB;SACwB,CAAC;QAE5B,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;IAC9D,CAAC;CACF;AAlDD,4CAkDC"}
|