@puca/puca-core 9.8.0 → 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 +12 -0
- 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/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,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
class
|
|
3
|
+
exports.ConfigService = void 0;
|
|
4
|
+
class ConfigService {
|
|
5
5
|
constructor(fileSystemService) {
|
|
6
6
|
this.fileSystemService = fileSystemService;
|
|
7
7
|
this.MODULE = process.env.MODULE_PATH || 'config/modules.json';
|
|
@@ -41,5 +41,5 @@ class ConfigsService {
|
|
|
41
41
|
}) || [];
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
exports.
|
|
45
|
-
//# sourceMappingURL=
|
|
44
|
+
exports.ConfigService = ConfigService;
|
|
45
|
+
//# sourceMappingURL=config.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../src/essential/config.service.ts"],"names":[],"mappings":";;;AAMA,MAAa,aAAa;IAQxB,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAPhD,WAAM,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,qBAAqB,CAAC;QAC1D,eAAU,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC;QAC/C,QAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,iBAAiB,CAAC;QAChD,8BAAyB,GAAG,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,uCAAuC,CAAC;QAClH,kBAAa,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC;QACrD,WAAM,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,oBAAoB,CAAC;IAEL,CAAC;IAEtE,KAAK,CAAC,uBAAuB;QAC3B,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAyB,IAAI,CAAC,MAAM,EAAE;YACpF,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS;QACb,uCACK,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAS,IAAI,CAAC,aAAa,EAAE;YACvE,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,GACC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAS,IAAI,CAAC,MAAM,EAAE;YAChE,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,EACH;IACH,CAAC;IAGD,KAAK,CAAC,MAAM;QACV,uCACK,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAa,IAAI,CAAC,UAAU,EAAE;YACxE,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,GACC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAa,IAAI,CAAC,GAAG,EAAE;YACjE,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,EACH;IACH,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC3B,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAyB,IAAI,CAAC,yBAAyB,EAAE;YACvG,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,IAAI,EAAE,CAAA;IACV,CAAC;CACF;AAjDD,sCAiDC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ConfigService } from './config.service';
|
|
2
2
|
export declare class EnvConfigService {
|
|
3
|
-
private readonly
|
|
3
|
+
private readonly configService;
|
|
4
4
|
private envConfig;
|
|
5
|
-
constructor(
|
|
5
|
+
constructor(configService: ConfigService);
|
|
6
6
|
private getEnvConfig;
|
|
7
7
|
getEnvByName(envName: string, fallBack?: string): Promise<string>;
|
|
8
8
|
}
|
|
@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.EnvConfigService = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
5
|
class EnvConfigService {
|
|
6
|
-
constructor(
|
|
7
|
-
this.
|
|
6
|
+
constructor(configService) {
|
|
7
|
+
this.configService = configService;
|
|
8
8
|
}
|
|
9
9
|
async getEnvConfig() {
|
|
10
10
|
if (!this.envConfig) {
|
|
11
|
-
this.envConfig = await this.
|
|
11
|
+
this.envConfig = await this.configService.getEnv();
|
|
12
12
|
}
|
|
13
13
|
return this.envConfig;
|
|
14
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envs-config.service.js","sourceRoot":"","sources":["../../src/essential/envs-config.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAG5B,MAAa,gBAAgB;IAG3B,YAA6B,
|
|
1
|
+
{"version":3,"file":"envs-config.service.js","sourceRoot":"","sources":["../../src/essential/envs-config.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAG5B,MAAa,gBAAgB;IAG3B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAE,CAAC;IAEpD,KAAK,CAAC,YAAY;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAA;SACnD;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IACD,KAAK,CAAC,YAAY,CAChB,OAAe,EACf,WAAmB,IAAI;QAEvB,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,aAAa,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;QACzD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,OAAO,CACL,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,QAAQ,CACxE,CAAC;IACJ,CAAC;CACF;AAtBD,4CAsBC"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AuditService } from "./audit.service";
|
|
2
|
+
import { ConfigService } from "./config.service";
|
|
2
3
|
import { EnvConfigService } from "./envs-config.service";
|
|
3
|
-
|
|
4
|
+
import { ModuleConfigService } from "./module-config.service";
|
|
5
|
+
export declare const configService: ConfigService;
|
|
4
6
|
export declare const envConfigService: EnvConfigService;
|
|
7
|
+
export declare const moduleConfigService: ModuleConfigService;
|
|
8
|
+
export declare const auditService: AuditService;
|
package/dist/essential/index.js
CHANGED
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.envConfigService = exports.configService = void 0;
|
|
3
|
+
exports.auditService = exports.moduleConfigService = exports.envConfigService = exports.configService = void 0;
|
|
4
4
|
const plugins_1 = require("../plugins");
|
|
5
|
-
const
|
|
5
|
+
const audit_service_1 = require("./audit.service");
|
|
6
|
+
const config_service_1 = require("./config.service");
|
|
6
7
|
const envs_config_service_1 = require("./envs-config.service");
|
|
7
|
-
|
|
8
|
+
const module_config_service_1 = require("./module-config.service");
|
|
9
|
+
exports.configService = new config_service_1.ConfigService(plugins_1.fileSystemService);
|
|
8
10
|
exports.envConfigService = new envs_config_service_1.EnvConfigService(exports.configService);
|
|
11
|
+
exports.moduleConfigService = new module_config_service_1.ModuleConfigService(plugins_1.fileSystemService);
|
|
12
|
+
exports.auditService = new audit_service_1.AuditService(exports.moduleConfigService, exports.envConfigService, exports.configService);
|
|
9
13
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/essential/index.ts"],"names":[],"mappings":";;;AAAA,wCAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/essential/index.ts"],"names":[],"mappings":";;;AAAA,wCAA+C;AAC/C,mDAA+C;AAC/C,qDAAiD;AACjD,+DAAyD;AACzD,mEAA8D;AAEjD,QAAA,aAAa,GAAG,IAAI,8BAAa,CAAC,2BAAiB,CAAC,CAAA;AACpD,QAAA,gBAAgB,GAAG,IAAI,sCAAgB,CAAC,qBAAa,CAAC,CAAA;AACtD,QAAA,mBAAmB,GAAG,IAAI,2CAAmB,CAAC,2BAAiB,CAAC,CAAC;AACjE,QAAA,YAAY,GAAG,IAAI,4BAAY,CAC1C,2BAAmB,EACnB,wBAAgB,EAChB,qBAAa,CACd,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ModuleConfig } from '
|
|
2
|
-
import { FileSystemService } from '
|
|
1
|
+
import { ModuleConfig } from '../models/module-config';
|
|
2
|
+
import { FileSystemService } from '../plugins/file-system/file-system.service';
|
|
3
3
|
export declare class ModuleConfigService {
|
|
4
4
|
private readonly fileSystemService;
|
|
5
5
|
private readonly logger;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ModuleConfigService = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
|
-
const logger_1 = require("
|
|
5
|
+
const logger_1 = require("../core/services/logger");
|
|
6
6
|
class ModuleConfigService {
|
|
7
7
|
constructor(fileSystemService) {
|
|
8
8
|
this.fileSystemService = fileSystemService;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"module-config.service.js","sourceRoot":"","sources":["../../src/essential/module-config.service.ts"],"names":[],"mappings":";;;AAEA,4BAA4B;AAC5B,oDAAiD;AAEjD,MAAa,mBAAmB;IAG9B,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAFhD,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAqB,CAAC,CAAC;QAG1D,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACnC,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;gBACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;gBACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,eAAe;QACnB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAC3D,gBAAgB,CACjB,CAAC;YACF,IAAI,CAAC,YAAY,GAAG;gBAClB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,SAAS,EAAE,WAAW,CAAC,SAAS;aACjC,CAAC;SACH;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF;AA/BD,kDA+BC"}
|
package/dist/models/secret.d.ts
CHANGED
|
@@ -6,11 +6,15 @@ export declare class CacheService<K, R> {
|
|
|
6
6
|
private readonly lifetimeInSeconds;
|
|
7
7
|
private readonly envConfigService;
|
|
8
8
|
private readonly prefix;
|
|
9
|
+
private readonly memoryCache;
|
|
9
10
|
constructor(name: string, redisManagerService: RedisManagerService, fetch: (keyObj: K) => Promise<R>, lifetimeInSeconds: number, envConfigService: EnvConfigService);
|
|
10
11
|
invalidate(keyObj: K): Promise<void>;
|
|
12
|
+
private invalidateByKeyStr;
|
|
11
13
|
flush(): Promise<void>;
|
|
12
14
|
get(keyObj: K): Promise<R>;
|
|
15
|
+
private redisGet;
|
|
13
16
|
private buildKeyStr;
|
|
17
|
+
private getAllRedisCachedKeys;
|
|
14
18
|
}
|
|
15
19
|
export declare class CacheServiceFactory {
|
|
16
20
|
private readonly redisManagerService;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CacheServiceFactory = exports.CacheService = void 0;
|
|
4
|
+
const _ = require("lodash");
|
|
4
5
|
const crypto_1 = require("crypto");
|
|
5
6
|
class CacheService {
|
|
6
7
|
constructor(name, redisManagerService, fetch, lifetimeInSeconds, envConfigService) {
|
|
@@ -8,48 +9,62 @@ class CacheService {
|
|
|
8
9
|
this.fetch = fetch;
|
|
9
10
|
this.lifetimeInSeconds = lifetimeInSeconds;
|
|
10
11
|
this.envConfigService = envConfigService;
|
|
12
|
+
this.memoryCache = new Map();
|
|
11
13
|
this.prefix = `cache-${name}`;
|
|
14
|
+
setInterval(() => {
|
|
15
|
+
const now = new Date();
|
|
16
|
+
for (const [keyStr, { expires }] of this.memoryCache.entries()) {
|
|
17
|
+
if (expires < now) {
|
|
18
|
+
this.memoryCache.delete(keyStr);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
});
|
|
12
22
|
}
|
|
13
23
|
async invalidate(keyObj) {
|
|
24
|
+
const keyStr = this.buildKeyStr(keyObj);
|
|
25
|
+
return await this.invalidateByKeyStr(keyStr);
|
|
26
|
+
}
|
|
27
|
+
async invalidateByKeyStr(keyStr) {
|
|
14
28
|
return new Promise((resolve, reject) => {
|
|
15
29
|
const redisClient = this.redisManagerService.get();
|
|
16
|
-
redisClient.
|
|
30
|
+
redisClient.publish('invalidate', keyStr, (err) => {
|
|
17
31
|
if (err) {
|
|
18
32
|
reject(err);
|
|
19
33
|
return;
|
|
20
34
|
}
|
|
35
|
+
this.memoryCache.delete(keyStr);
|
|
21
36
|
resolve();
|
|
22
37
|
});
|
|
23
38
|
});
|
|
24
39
|
}
|
|
25
40
|
async flush() {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
}
|
|
33
|
-
if (keys.length) {
|
|
34
|
-
resolve();
|
|
35
|
-
return;
|
|
36
|
-
}
|
|
37
|
-
redisClient.del(keys.reduce((a, b) => `${a} ${b}`), (err) => {
|
|
38
|
-
if (err) {
|
|
39
|
-
reject(err);
|
|
40
|
-
return;
|
|
41
|
-
}
|
|
42
|
-
resolve();
|
|
43
|
-
});
|
|
44
|
-
});
|
|
45
|
-
});
|
|
41
|
+
const keys = await this.getAllRedisCachedKeys();
|
|
42
|
+
for (const key of keys) {
|
|
43
|
+
if (this.memoryCache.has(key)) {
|
|
44
|
+
await this.invalidateByKeyStr(key);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
46
47
|
}
|
|
47
48
|
async get(keyObj) {
|
|
48
|
-
const environment = await this.envConfigService.getEnvByName('ENVIRONMENT', 'DEVELOPMENT');
|
|
49
|
-
if (environment !== 'PRODUCTION') {
|
|
50
|
-
return await this.fetch(keyObj);
|
|
51
|
-
}
|
|
52
49
|
const keyStr = this.buildKeyStr(keyObj);
|
|
50
|
+
let memoryCache = this.memoryCache.get(keyStr);
|
|
51
|
+
if (memoryCache) {
|
|
52
|
+
if (memoryCache.expires > new Date()) {
|
|
53
|
+
return memoryCache.data;
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
this.memoryCache.delete(keyStr);
|
|
57
|
+
memoryCache = null;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
if (_.get(memoryCache, 'data') === '<<empty>>') {
|
|
61
|
+
return null;
|
|
62
|
+
}
|
|
63
|
+
const data = await this.redisGet(keyStr, keyObj);
|
|
64
|
+
this.memoryCache.set(keyStr, { data, expires: new Date(Date.now() + this.lifetimeInSeconds * 1000) });
|
|
65
|
+
return data;
|
|
66
|
+
}
|
|
67
|
+
redisGet(keyStr, keyObj) {
|
|
53
68
|
return new Promise((resolve, reject) => {
|
|
54
69
|
const redisClient = this.redisManagerService.get();
|
|
55
70
|
redisClient.get(keyStr, (err, reply) => {
|
|
@@ -84,7 +99,23 @@ class CacheService {
|
|
|
84
99
|
});
|
|
85
100
|
}
|
|
86
101
|
buildKeyStr(keyObj) {
|
|
87
|
-
return `${this.prefix}-${crypto_1.createHash('md5').update(JSON.stringify(keyObj)).digest('hex')}`;
|
|
102
|
+
return `${this.prefix}-${crypto_1.createHash('md5').update(JSON.stringify(keyObj || 'void')).digest('hex')}`;
|
|
103
|
+
}
|
|
104
|
+
getAllRedisCachedKeys() {
|
|
105
|
+
return new Promise((resolve, reject) => {
|
|
106
|
+
const redisClient = this.redisManagerService.get();
|
|
107
|
+
redisClient.keys(`${this.prefix}*`, async (err, keys) => {
|
|
108
|
+
if (err) {
|
|
109
|
+
reject(err);
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
112
|
+
if (keys.length) {
|
|
113
|
+
resolve([]);
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
resolve(keys);
|
|
117
|
+
});
|
|
118
|
+
});
|
|
88
119
|
}
|
|
89
120
|
}
|
|
90
121
|
exports.CacheService = CacheService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.service.js","sourceRoot":"","sources":["../../../src/orm/services/cache.service.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAInC,MAAa,YAAY;
|
|
1
|
+
{"version":3,"file":"cache.service.js","sourceRoot":"","sources":["../../../src/orm/services/cache.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ const cache_service_1 = require("./cache.service");
|
|
|
11
11
|
const transaction_1 = require("./transaction");
|
|
12
12
|
const essential_1 = require("../../essential");
|
|
13
13
|
exports.databaseManagerService = new database_manager_service_1.DatabaseManagerService();
|
|
14
|
-
exports.transactionFactory = new transaction_1.TransactionFactory(exports.databaseManagerService);
|
|
14
|
+
exports.transactionFactory = new transaction_1.TransactionFactory(exports.databaseManagerService, essential_1.auditService);
|
|
15
15
|
exports.redisManagerService = new redis_manager_service_1.RedisManagerService();
|
|
16
16
|
exports.cacheServiceFactory = new cache_service_1.CacheServiceFactory(exports.redisManagerService, essential_1.envConfigService);
|
|
17
17
|
exports.sqlService = new sql_service_1.SqlService(cases_1.cSqlService, () => exports.repositoryFactory);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/orm/services/index.ts"],"names":[],"mappings":";;;AAAA,2CAA4C;AAC5C,mDAA+C;AAC/C,6DAAyD;AACzD,kFAA6E;AAC7E,4EAAuE;AACvE,oCAAuC;AACvC,mDAAsD;AACtD,+CAAmD;AACnD,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/orm/services/index.ts"],"names":[],"mappings":";;;AAAA,2CAA4C;AAC5C,mDAA+C;AAC/C,6DAAyD;AACzD,kFAA6E;AAC7E,4EAAuE;AACvE,oCAAuC;AACvC,mDAAsD;AACtD,+CAAmD;AACnD,+CAAiE;AAEpD,QAAA,sBAAsB,GAAG,IAAI,iDAAsB,EAAE,CAAC;AACtD,QAAA,kBAAkB,GAAG,IAAI,gCAAkB,CAAC,8BAAsB,EAAE,wBAAY,CAAC,CAAA;AACjF,QAAA,mBAAmB,GAAG,IAAI,2CAAmB,EAAE,CAAC;AAIhD,QAAA,mBAAmB,GAAG,IAAI,mCAAmB,CAAC,2BAAmB,EAAE,4BAAgB,CAAC,CAAA;AAEpF,QAAA,UAAU,GAAG,IAAI,wBAAU,CACtC,mBAAW,EAAE,GAAG,EAAE,CAAC,yBAAiB,CACrC,CAAA;AAED,yBAAiB,GAAG,IAAI,sCAAiB,CACvC,8BAAsB,EACtB,0BAAkB,EAClB,2BAAmB,EACnB,GAAG,EAAE,CAAC,kBAAU,EAChB,qBAAW,CACZ,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { AuditService } from "../../essential/audit.service";
|
|
1
2
|
import { SqlCommand } from "../cases/bo/interfaces";
|
|
2
3
|
import { Database, DatabaseManagerService } from "./managers/database-manager.service";
|
|
3
4
|
import { QueryResult } from "./managers/puca-orm-client.service";
|
|
@@ -9,15 +10,16 @@ export declare enum TransactionStatus {
|
|
|
9
10
|
export declare class Transaction {
|
|
10
11
|
private readonly database;
|
|
11
12
|
private readonly opt;
|
|
12
|
-
private
|
|
13
|
-
private
|
|
13
|
+
private readonly auditService;
|
|
14
|
+
private readonly name;
|
|
14
15
|
private readonly id;
|
|
15
|
-
private status;
|
|
16
16
|
private readonly onCommit;
|
|
17
|
-
private
|
|
17
|
+
private status;
|
|
18
|
+
private auditTransaction;
|
|
18
19
|
constructor(database: Database, opt: {
|
|
19
20
|
pseudoTransaction: boolean;
|
|
20
|
-
});
|
|
21
|
+
}, auditService: AuditService, name: string);
|
|
22
|
+
private setStatus;
|
|
21
23
|
commit(): Promise<void>;
|
|
22
24
|
rollback(): Promise<void>;
|
|
23
25
|
exec<T>(sqlCommand: SqlCommand): Promise<T[]>;
|
|
@@ -28,7 +30,10 @@ export declare class Transaction {
|
|
|
28
30
|
}
|
|
29
31
|
export declare class TransactionFactory {
|
|
30
32
|
private readonly databaseManagerService;
|
|
31
|
-
|
|
32
|
-
|
|
33
|
+
private readonly auditService;
|
|
34
|
+
constructor(databaseManagerService: DatabaseManagerService, auditService: AuditService);
|
|
35
|
+
get({ name }: {
|
|
36
|
+
name: string;
|
|
37
|
+
}): Transaction;
|
|
33
38
|
getPseudoTransaction(): Transaction;
|
|
34
39
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TransactionFactory = exports.Transaction = exports.TransactionStatus = void 0;
|
|
4
|
-
const logger_1 = require("../../core/services/logger");
|
|
5
4
|
const plugins_1 = require("../../plugins");
|
|
6
5
|
var TransactionStatus;
|
|
7
6
|
(function (TransactionStatus) {
|
|
@@ -10,12 +9,14 @@ var TransactionStatus;
|
|
|
10
9
|
TransactionStatus["Done"] = "Done";
|
|
11
10
|
})(TransactionStatus = exports.TransactionStatus || (exports.TransactionStatus = {}));
|
|
12
11
|
class Transaction {
|
|
13
|
-
constructor(database, opt) {
|
|
12
|
+
constructor(database, opt, auditService, name) {
|
|
14
13
|
this.database = database;
|
|
15
14
|
this.opt = opt;
|
|
15
|
+
this.auditService = auditService;
|
|
16
|
+
this.name = name;
|
|
16
17
|
this.id = plugins_1.uuidService.v4();
|
|
17
|
-
this.status = TransactionStatus.New;
|
|
18
18
|
this.onCommit = [];
|
|
19
|
+
this.status = TransactionStatus.New;
|
|
19
20
|
}
|
|
20
21
|
setStatus(status) {
|
|
21
22
|
if (this.status === status) {
|
|
@@ -23,12 +24,12 @@ class Transaction {
|
|
|
23
24
|
}
|
|
24
25
|
if (!this.opt.pseudoTransaction) {
|
|
25
26
|
if (status === TransactionStatus.Done) {
|
|
26
|
-
|
|
27
|
+
if (this.auditTransaction) {
|
|
28
|
+
this.auditTransaction.finish();
|
|
29
|
+
}
|
|
27
30
|
}
|
|
28
31
|
else if (status === TransactionStatus.Started) {
|
|
29
|
-
this.
|
|
30
|
-
Transaction.logger.warn('transaction is too long');
|
|
31
|
-
}, 15000);
|
|
32
|
+
this.auditTransaction = this.auditService.startTransaction(this.name);
|
|
32
33
|
}
|
|
33
34
|
else {
|
|
34
35
|
throw new Error('setStatus: invalid transaction status');
|
|
@@ -93,16 +94,16 @@ class Transaction {
|
|
|
93
94
|
}
|
|
94
95
|
}
|
|
95
96
|
exports.Transaction = Transaction;
|
|
96
|
-
Transaction.logger = new logger_1.Logger('Transaction');
|
|
97
97
|
class TransactionFactory {
|
|
98
|
-
constructor(databaseManagerService) {
|
|
98
|
+
constructor(databaseManagerService, auditService) {
|
|
99
99
|
this.databaseManagerService = databaseManagerService;
|
|
100
|
+
this.auditService = auditService;
|
|
100
101
|
}
|
|
101
|
-
get() {
|
|
102
|
-
return new Transaction(this.databaseManagerService.getTransactionalDatabase(), { pseudoTransaction: false });
|
|
102
|
+
get({ name }) {
|
|
103
|
+
return new Transaction(this.databaseManagerService.getTransactionalDatabase(), { pseudoTransaction: false }, this.auditService, name);
|
|
103
104
|
}
|
|
104
105
|
getPseudoTransaction() {
|
|
105
|
-
return new Transaction(this.databaseManagerService.get(), { pseudoTransaction: true });
|
|
106
|
+
return new Transaction(this.databaseManagerService.get(), { pseudoTransaction: true }, this.auditService, null);
|
|
106
107
|
}
|
|
107
108
|
}
|
|
108
109
|
exports.TransactionFactory = TransactionFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/orm/services/transaction.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/orm/services/transaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.EvalService = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
5
|
const jexl_1 = require("jexl");
|
|
6
|
-
const
|
|
6
|
+
const moment = require("moment");
|
|
7
7
|
class EvalService {
|
|
8
8
|
constructor(context, opt = null) {
|
|
9
9
|
this.context = context;
|
|
@@ -22,7 +22,7 @@ class EvalService {
|
|
|
22
22
|
toDate,
|
|
23
23
|
dateFormat(date, mask) {
|
|
24
24
|
const d = typeof date === 'string' ? toDate(date) : date;
|
|
25
|
-
return format(mask
|
|
25
|
+
return moment(d).format(mask);
|
|
26
26
|
}
|
|
27
27
|
} : {})), (_.get(opt, 'transforms') || {})));
|
|
28
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eval.service.js","sourceRoot":"","sources":["../../../src/plugins/eval/eval.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,+BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"eval.service.js","sourceRoot":"","sources":["../../../src/plugins/eval/eval.service.ts"],"names":[],"mappings":"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"}
|