@puca/puca-core 8.0.2 → 8.1.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.js +2 -1
- package/dist/core/services/auth.service.js.map +1 -1
- package/dist/core/services/bootstrap-commands.js +20 -0
- package/dist/core/services/bootstrap-commands.js.map +1 -1
- package/dist/core/services/crud-base-testable.service.d.ts +19 -17
- package/dist/core/services/crud-base-testable.service.js +13 -10
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/crud-base.controller.js +8 -2
- package/dist/core/services/crud-base.controller.js.map +1 -1
- package/dist/core/services/crud-front-base.service.js +5 -2
- package/dist/core/services/crud-front-base.service.js.map +1 -1
- package/dist/core/services/eval.service.js +1 -1
- package/dist/core/services/eval.service.js.map +1 -1
- package/dist/core/services/index.js +1 -1
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.js +15 -12
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/job/job.client.js +2 -1
- package/dist/core/services/job/job.client.js.map +1 -1
- package/dist/core/services/life-cycle.service.js +11 -1
- package/dist/core/services/life-cycle.service.js.map +1 -1
- package/dist/core/services/migration.service.d.ts +3 -3
- package/dist/core/services/migration.service.js +70 -32
- package/dist/core/services/migration.service.js.map +1 -1
- package/dist/core/services/report.service.js +7 -3
- package/dist/core/services/report.service.js.map +1 -1
- package/dist/core/services/source/source.service.js +2 -1
- package/dist/core/services/source/source.service.js.map +1 -1
- package/dist/core/services/user-config.service.js +1 -0
- package/dist/core/services/user-config.service.js.map +1 -1
- package/dist/models/crud-controller-especification-environment.d.ts +2 -0
- package/dist/orm/services/cache-repository/cache-repository-redis.js +1 -1
- package/dist/orm/services/cache-repository/cache-repository-redis.js.map +1 -1
- package/dist/orm/services/index.d.ts +2 -0
- package/dist/orm/services/index.js +4 -2
- package/dist/orm/services/index.js.map +1 -1
- package/dist/orm/services/managers/database-manager.service.d.ts +19 -3
- package/dist/orm/services/managers/database-manager.service.js +36 -12
- package/dist/orm/services/managers/database-manager.service.js.map +1 -1
- package/dist/orm/services/managers/puca-orm-client.service.d.ts +10 -1
- package/dist/orm/services/managers/puca-orm-client.service.js +6 -0
- package/dist/orm/services/managers/puca-orm-client.service.js.map +1 -1
- package/dist/orm/services/repository-factory.d.ts +5 -3
- package/dist/orm/services/repository-factory.js +4 -7
- package/dist/orm/services/repository-factory.js.map +1 -1
- package/dist/orm/services/repository.d.ts +5 -3
- package/dist/orm/services/repository.js +55 -17
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/orm/services/sql.service.js +2 -1
- package/dist/orm/services/sql.service.js.map +1 -1
- package/dist/orm/services/transaction.d.ts +23 -0
- package/dist/orm/services/transaction.js +49 -0
- package/dist/orm/services/transaction.js.map +1 -0
- package/dist/plugins/grpc-client.service.d.ts +3 -5
- package/dist/plugins/grpc-client.service.js +16 -42
- package/dist/plugins/grpc-client.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/puca-orm.proto +15 -5
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TransactionFactory = exports.Transaction = void 0;
|
|
4
|
+
const plugins_1 = require("../../plugins");
|
|
5
|
+
class Transaction {
|
|
6
|
+
constructor(database, opt) {
|
|
7
|
+
this.database = database;
|
|
8
|
+
this.opt = opt;
|
|
9
|
+
this.id = plugins_1.uuidService.v4();
|
|
10
|
+
this.count = 0;
|
|
11
|
+
}
|
|
12
|
+
async commit() {
|
|
13
|
+
if (this.opt.pseudoTransaction) {
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
await this.database.commit({ transaction: this });
|
|
17
|
+
}
|
|
18
|
+
async rollback() {
|
|
19
|
+
if (this.opt.pseudoTransaction) {
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
await this.database.rollback({ transaction: this });
|
|
23
|
+
}
|
|
24
|
+
async exec(sqlCommand) {
|
|
25
|
+
this.count++;
|
|
26
|
+
return await this.database.exec(sqlCommand, { transaction: this.opt.pseudoTransaction ? null : this });
|
|
27
|
+
}
|
|
28
|
+
async serialExec(sqlCommandList) {
|
|
29
|
+
this.count++;
|
|
30
|
+
return await this.database.serialExec(sqlCommandList, { transaction: this.opt.pseudoTransaction ? null : this });
|
|
31
|
+
}
|
|
32
|
+
getID() {
|
|
33
|
+
return this.id;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
exports.Transaction = Transaction;
|
|
37
|
+
class TransactionFactory {
|
|
38
|
+
constructor(databaseManagerService) {
|
|
39
|
+
this.databaseManagerService = databaseManagerService;
|
|
40
|
+
}
|
|
41
|
+
get() {
|
|
42
|
+
return new Transaction(this.databaseManagerService.getTransactionalDatabase(), { pseudoTransaction: false });
|
|
43
|
+
}
|
|
44
|
+
getPseudoTransaction() {
|
|
45
|
+
return new Transaction(this.databaseManagerService.get(), { pseudoTransaction: true });
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
exports.TransactionFactory = TransactionFactory;
|
|
49
|
+
//# sourceMappingURL=transaction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../../src/orm/services/transaction.ts"],"names":[],"mappings":";;;AAAA,2CAA4C;AAK5C,MAAa,WAAW;IAMtB,YAA6B,QAAkB,EAAmB,GAEjE;QAF4B,aAAQ,GAAR,QAAQ,CAAU;QAAmB,QAAG,GAAH,GAAG,CAEpE;QAPgB,OAAE,GAAG,qBAAW,CAAC,EAAE,EAAE,CAAA;QAG9B,UAAK,GAAG,CAAC,CAAA;IAIb,CAAC;IAEL,KAAK,CAAC,MAAM;QACV,IAAG,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAC;YAC5B,OAAM;SACP;QACD,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;IACnD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAG,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAC;YAC5B,OAAM;SACP;QACD,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;IACrD,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,UAAsB;QAClC,IAAI,CAAC,KAAK,EAAE,CAAA;QACZ,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;IACxG,CAAC;IAMD,KAAK,CAAC,UAAU,CAAC,cAA4B;QAC3C,IAAI,CAAC,KAAK,EAAE,CAAA;QACZ,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;IAClH,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,EAAE,CAAA;IAChB,CAAC;CACF;AAzCD,kCAyCC;AAED,MAAa,kBAAkB;IAC7B,YAA6B,sBAA8C;QAA9C,2BAAsB,GAAtB,sBAAsB,CAAwB;IAAE,CAAC;IAC9E,GAAG;QACD,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,sBAAsB,CAAC,wBAAwB,EAAE,EAAC,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAA;IAC7G,CAAC;IACD,oBAAoB;QAClB,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,EAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAA;IACvF,CAAC;CACF;AARD,gDAQC"}
|
|
@@ -3,19 +3,17 @@ export interface ClientConnection {
|
|
|
3
3
|
grpcServiceAddress: string;
|
|
4
4
|
namespace: string;
|
|
5
5
|
key: string;
|
|
6
|
+
loadBalancerPolicy: 'round_robin' | 'none';
|
|
6
7
|
}
|
|
7
8
|
export declare abstract class GrpcClient {
|
|
8
9
|
private readonly config;
|
|
9
10
|
protected readonly logger: Logger;
|
|
10
11
|
private readonly metadata;
|
|
11
12
|
private readonly constr;
|
|
12
|
-
private
|
|
13
|
-
private readonly clients;
|
|
13
|
+
private readonly client;
|
|
14
14
|
constructor(className: string, protoFileName: string, serviceName: string, config: ClientConnection);
|
|
15
|
-
private switchClient;
|
|
16
|
-
private connect;
|
|
17
|
-
private disconect;
|
|
18
15
|
call<Request, Response extends {
|
|
19
16
|
error?: Error;
|
|
20
17
|
}>(method: string, data?: Request): Promise<Response>;
|
|
18
|
+
shutdown(): Promise<void>;
|
|
21
19
|
}
|
|
@@ -7,8 +7,6 @@ const logger_1 = require("../core/services/logger");
|
|
|
7
7
|
class GrpcClient {
|
|
8
8
|
constructor(className, protoFileName, serviceName, config) {
|
|
9
9
|
this.config = config;
|
|
10
|
-
this.activeClientId = 0;
|
|
11
|
-
this.clients = [null, null];
|
|
12
10
|
this.logger = new logger_1.Logger(className);
|
|
13
11
|
const def = grpc_js_1.loadPackageDefinition(proto_loader_1.loadSync(`${process.cwd()}//node_modules/@puca/puca-core/${protoFileName}`, {
|
|
14
12
|
json: true,
|
|
@@ -18,54 +16,26 @@ class GrpcClient {
|
|
|
18
16
|
arrays: true
|
|
19
17
|
}));
|
|
20
18
|
this.constr = def.main[serviceName];
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}, 60000);
|
|
25
|
-
this.metadata = new grpc_js_1.Metadata();
|
|
26
|
-
this.metadata.add('namespace', this.config.namespace);
|
|
27
|
-
this.metadata.add('key', this.config.key);
|
|
28
|
-
this.metadata.add('grpc-timeout', '10M');
|
|
29
|
-
}
|
|
30
|
-
switchClient() {
|
|
31
|
-
const oldClient = this.clients[this.activeClientId];
|
|
32
|
-
const newClientId = this.activeClientId === 0 ? 1 : 0;
|
|
33
|
-
this.connect(newClientId);
|
|
34
|
-
this.activeClientId = newClientId;
|
|
35
|
-
let safe = true;
|
|
36
|
-
setTimeout(() => {
|
|
37
|
-
safe = false;
|
|
38
|
-
}, 60000);
|
|
39
|
-
const i = setInterval(() => {
|
|
40
|
-
if (!safe) {
|
|
41
|
-
this.logger.warn('Client close was forced');
|
|
42
|
-
}
|
|
43
|
-
if (!safe || !oldClient.count) {
|
|
44
|
-
this.disconect(oldClient);
|
|
45
|
-
clearInterval(i);
|
|
46
|
-
}
|
|
47
|
-
}, 1000);
|
|
48
|
-
}
|
|
49
|
-
connect(clientId) {
|
|
50
|
-
const options = {
|
|
51
|
-
'grpc.service_config': JSON.stringify({
|
|
19
|
+
const options = {};
|
|
20
|
+
if (config.loadBalancerPolicy === 'round_robin') {
|
|
21
|
+
options['grpc.service_config'] = JSON.stringify({
|
|
52
22
|
loadBalancingPolicy: 'round_robin',
|
|
53
23
|
loadBalancingConfig: [{
|
|
54
|
-
round_robin: {}
|
|
24
|
+
round_robin: {},
|
|
55
25
|
}],
|
|
56
|
-
})
|
|
57
|
-
}
|
|
58
|
-
this.
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
this.client = {
|
|
59
29
|
client: new this.constr(this.config.grpcServiceAddress || "localhost:5000", grpc_js_1.credentials.createInsecure(), options),
|
|
60
30
|
count: 0
|
|
61
31
|
};
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
32
|
+
this.metadata = new grpc_js_1.Metadata();
|
|
33
|
+
this.metadata.add('namespace', this.config.namespace);
|
|
34
|
+
this.metadata.add('key', this.config.key);
|
|
35
|
+
this.metadata.add('grpc-timeout', '10M');
|
|
66
36
|
}
|
|
67
37
|
async call(method, data = null) {
|
|
68
|
-
const c = this.
|
|
38
|
+
const c = this.client;
|
|
69
39
|
c.count++;
|
|
70
40
|
return new Promise((resolve, reject) => {
|
|
71
41
|
c.client[method](data, this.metadata, (err, res) => {
|
|
@@ -77,6 +47,10 @@ class GrpcClient {
|
|
|
77
47
|
});
|
|
78
48
|
});
|
|
79
49
|
}
|
|
50
|
+
async shutdown() {
|
|
51
|
+
const c = this.client;
|
|
52
|
+
c.client.close();
|
|
53
|
+
}
|
|
80
54
|
}
|
|
81
55
|
exports.GrpcClient = GrpcClient;
|
|
82
56
|
//# sourceMappingURL=grpc-client.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc-client.service.js","sourceRoot":"","sources":["../../src/plugins/grpc-client.service.ts"],"names":[],"mappings":";;;AAAA,2CAA2G;AAE3G,qDAA8C;AAC9C,oDAAiD;
|
|
1
|
+
{"version":3,"file":"grpc-client.service.js","sourceRoot":"","sources":["../../src/plugins/grpc-client.service.ts"],"names":[],"mappings":";;;AAAA,2CAA2G;AAE3G,qDAA8C;AAC9C,oDAAiD;AAgBjD,MAAsB,UAAU;IAQ9B,YACE,SAAiB,EACjB,aAAqB,EACrB,WAAmB,EACF,MAAwB;QAAxB,WAAM,GAAN,MAAM,CAAkB;QAEzC,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,CAAA;QAEnC,MAAM,GAAG,GAAG,+BAAqB,CAC/B,uBAAQ,CACN,GAAG,OAAO,CAAC,GAAG,EAAE,kCAAkC,aAAa,EAAE,EAAE;YACnE,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;YACd,KAAK,EAAE,MAAM;YACb,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,IAAI;SACb,CACA,CACF,CAAA;QAED,IAAI,CAAC,MAAM,GAAI,GAAG,CAAC,IAAY,CAAC,WAAW,CAAC,CAAA;QAE5C,MAAM,OAAO,GAA4B,EAAE,CAAA;QAE3C,IAAI,MAAM,CAAC,kBAAkB,KAAK,aAAa,EAAE;YAC/C,OAAO,CAAC,qBAAqB,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC9C,mBAAmB,EAAE,aAAa;gBAClC,mBAAmB,EAAE,CAAC;wBACtB,WAAW,EAAE,EAAE;qBAChB,CAAQ;aACoB,CAAC,CAAA;SAC/B;QAED,IAAI,CAAC,MAAM,GAAG;YACZ,MAAM,EAAE,IAAI,IAAI,CAAC,MAAM,CACrB,IAAI,CAAC,MAAM,CAAC,kBAAkB,IAAI,gBAAgB,EAClD,qBAAW,CAAC,cAAc,EAAE,EAC5B,OAAO,CACD;YACR,KAAK,EAAE,CAAC;SACT,CAAA;QAED,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAQ,EAAE,CAAA;QAC9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACrD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACzC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;IAC1C,CAAC;IAED,KAAK,CAAC,IAAI,CAA8C,MAAc,EAAE,OAAgB,IAAI;QAC1F,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAA;QACrB,CAAC,CAAC,KAAK,EAAE,CAAA;QACT,OAAO,IAAI,OAAO,CAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC/C,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CACd,IAAI,EACJ,IAAI,CAAC,QAAQ,EACb,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBACX,CAAC,CAAC,KAAK,EAAE,CAAA;gBACT,IAAI,GAAG,EAAE;oBACP,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,CAAA;iBAClC;gBAED,OAAO,CAAC,GAAG,CAAC,CAAA;YACd,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ;QAEZ,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAA;QACrB,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;IAClB,CAAC;CACF;AA/ED,gCA+EC"}
|