@puca/puca-core 7.2.0 → 7.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/services/crud-base-testable.service.d.ts +8 -10
- package/dist/core/services/crud-base-testable.service.js +3 -0
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/index.d.ts +2 -2
- package/dist/core/services/index.js +6 -4
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.d.ts +8 -1
- package/dist/core/services/install.service.js +24 -3
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/job/job.client.d.ts +28 -0
- package/dist/core/services/job/job.client.js +39 -0
- package/dist/core/services/job/job.client.js.map +1 -0
- package/dist/core/services/job/job.service.d.ts +22 -0
- package/dist/core/services/job/job.service.js +40 -0
- package/dist/core/services/job/job.service.js.map +1 -0
- package/dist/core/services/storage/implementation/s3-client.service.d.ts +1 -1
- package/dist/core/services/storage/implementation/s3-client.service.js.map +1 -1
- package/dist/models/secret.d.ts +4 -0
- package/dist/orm/services/managers/database-manager.service.d.ts +6 -3
- package/dist/orm/services/managers/database-manager.service.js +7 -5
- package/dist/orm/services/managers/database-manager.service.js.map +1 -1
- package/dist/orm/services/managers/puca-orm-client.service.d.ts +13 -23
- package/dist/orm/services/managers/puca-orm-client.service.js +22 -90
- package/dist/orm/services/managers/puca-orm-client.service.js.map +1 -1
- package/dist/plugins/eval/eval.service.d.ts +2 -0
- package/dist/plugins/eval/eval.service.js +48 -0
- package/dist/plugins/eval/eval.service.js.map +1 -1
- package/dist/plugins/grpc-client.service.d.ts +19 -0
- package/dist/plugins/grpc-client.service.js +85 -0
- package/dist/plugins/grpc-client.service.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/puca-trigger.proto +49 -0
- package/dist/core/services/job.service.d.ts +0 -13
- package/dist/core/services/job.service.js +0 -42
- package/dist/core/services/job.service.js.map +0 -1
|
@@ -1,30 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
import { ClientConnection, GrpcClient } from '../../../plugins/grpc-client.service';
|
|
2
|
+
export interface QueryArgs {
|
|
3
|
+
commandList: {
|
|
4
|
+
name: string;
|
|
5
|
+
text: string;
|
|
6
|
+
values: any[];
|
|
7
|
+
}[];
|
|
8
|
+
opt: {
|
|
9
|
+
transaction: boolean;
|
|
10
|
+
};
|
|
8
11
|
}
|
|
9
12
|
export interface QueryResult {
|
|
10
13
|
name: string;
|
|
11
14
|
result: any[];
|
|
12
15
|
rowsAffected: number;
|
|
13
16
|
}
|
|
14
|
-
export declare class PucaOrmClient {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
private readonly metadata;
|
|
18
|
-
private readonly constr;
|
|
19
|
-
private activeClientId;
|
|
20
|
-
private readonly clients;
|
|
21
|
-
constructor(config: PucaOrmClientConnection);
|
|
22
|
-
query(commandList: {
|
|
23
|
-
name: string;
|
|
24
|
-
text: string;
|
|
25
|
-
values: any[];
|
|
26
|
-
}[], opt: PucaOrmQueryOpt): Promise<QueryResult[]>;
|
|
27
|
-
private switchClient;
|
|
28
|
-
private connect;
|
|
29
|
-
private disconect;
|
|
17
|
+
export declare class PucaOrmClient extends GrpcClient {
|
|
18
|
+
constructor(config: ClientConnection);
|
|
19
|
+
query(args: QueryArgs): Promise<QueryResult[]>;
|
|
30
20
|
}
|
|
@@ -1,101 +1,33 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PucaOrmClient = void 0;
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
const logger_1 = require("../../../core/services/logger");
|
|
7
|
-
class PucaOrmClient {
|
|
4
|
+
const grpc_client_service_1 = require("../../../plugins/grpc-client.service");
|
|
5
|
+
class PucaOrmClient extends grpc_client_service_1.GrpcClient {
|
|
8
6
|
constructor(config) {
|
|
9
|
-
|
|
10
|
-
this.logger = new logger_1.Logger('PucaOrmClient');
|
|
11
|
-
this.activeClientId = 0;
|
|
12
|
-
this.clients = [null, null];
|
|
13
|
-
const def = grpc_js_1.loadPackageDefinition(proto_loader_1.loadSync(`${process.cwd()}//node_modules/@puca/puca-core/puca-orm.proto`, {
|
|
14
|
-
json: true,
|
|
15
|
-
keepCase: true,
|
|
16
|
-
enums: String,
|
|
17
|
-
longs: Number,
|
|
18
|
-
arrays: true,
|
|
19
|
-
}));
|
|
20
|
-
this.constr = def.main.OrmService;
|
|
21
|
-
this.connect(this.activeClientId);
|
|
22
|
-
setInterval(async () => {
|
|
23
|
-
this.switchClient();
|
|
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');
|
|
7
|
+
super('PucaOrmClient', 'puca-orm.proto', 'OrmService', config);
|
|
29
8
|
}
|
|
30
|
-
async query(
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
(command.values || []).forEach((v, i) => {
|
|
36
|
-
if (v === undefined) {
|
|
37
|
-
v = null;
|
|
38
|
-
}
|
|
39
|
-
command.values[i] = JSON.stringify(v);
|
|
40
|
-
});
|
|
41
|
-
});
|
|
42
|
-
c.client.Query({
|
|
43
|
-
commandList,
|
|
44
|
-
opt
|
|
45
|
-
}, this.metadata, (err, res) => {
|
|
46
|
-
c.count--;
|
|
47
|
-
if (err) {
|
|
48
|
-
return reject(err.message || err);
|
|
49
|
-
}
|
|
50
|
-
if (res.error) {
|
|
51
|
-
this.logger.error(commandList, res.error);
|
|
52
|
-
return reject(res.error.message || 'Generic Error');
|
|
9
|
+
async query(args) {
|
|
10
|
+
args.commandList.forEach(command => {
|
|
11
|
+
(command.values || []).forEach((v, i) => {
|
|
12
|
+
if (v === undefined) {
|
|
13
|
+
v = null;
|
|
53
14
|
}
|
|
54
|
-
|
|
55
|
-
(r.result || []).forEach((v, i) => {
|
|
56
|
-
r.result[i] = JSON.parse(v);
|
|
57
|
-
});
|
|
58
|
-
});
|
|
59
|
-
resolve(res.result);
|
|
15
|
+
command.values[i] = JSON.stringify(v);
|
|
60
16
|
});
|
|
61
17
|
});
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
}
|
|
76
|
-
if (!safe || !oldClient.count) {
|
|
77
|
-
this.disconect(oldClient);
|
|
78
|
-
clearInterval(i);
|
|
79
|
-
}
|
|
80
|
-
}, 1000);
|
|
81
|
-
}
|
|
82
|
-
connect(clientId) {
|
|
83
|
-
const options = {
|
|
84
|
-
'grpc.service_config': JSON.stringify({
|
|
85
|
-
loadBalancingPolicy: 'round_robin',
|
|
86
|
-
loadBalancingConfig: [{
|
|
87
|
-
round_robin: {}
|
|
88
|
-
}],
|
|
89
|
-
}),
|
|
90
|
-
};
|
|
91
|
-
this.clients[clientId] = {
|
|
92
|
-
client: new this.constr(this.config.grpcServiceAddress || "localhost:5000", grpc_js_1.credentials.createInsecure(), options),
|
|
93
|
-
count: 0
|
|
94
|
-
};
|
|
95
|
-
}
|
|
96
|
-
disconect(c) {
|
|
97
|
-
c.client.close();
|
|
98
|
-
c.count = 0;
|
|
18
|
+
try {
|
|
19
|
+
const r = await this.call('Query', args);
|
|
20
|
+
(r || []).forEach(r => {
|
|
21
|
+
(r.result || []).forEach((v, i) => {
|
|
22
|
+
r.result[i] = JSON.parse(v);
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
return r;
|
|
26
|
+
}
|
|
27
|
+
catch (e) {
|
|
28
|
+
this.logger.error(args.commandList, e);
|
|
29
|
+
throw e;
|
|
30
|
+
}
|
|
99
31
|
}
|
|
100
32
|
}
|
|
101
33
|
exports.PucaOrmClient = PucaOrmClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puca-orm-client.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/puca-orm-client.service.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"puca-orm-client.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/puca-orm-client.service.ts"],"names":[],"mappings":";;;AAAA,8EAAoF;AAmBpF,MAAa,aAAc,SAAQ,gCAAU;IAC3C,YAAY,MAAwB;QAClC,KAAK,CAAC,eAAe,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,CAAC,CAAA;IAChE,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAe;QACzB,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACjC,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACtC,IAAI,CAAC,KAAK,SAAS,EAAE;oBACnB,CAAC,GAAG,IAAI,CAAA;iBACT;gBACD,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;YACvC,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,IAAI;YACF,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAA2B,OAAO,EAAE,IAAI,CAAC,CAAC;YAKnE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACpB,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;oBAChC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBAC7B,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,CAAC,CAAA;SACT;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;YACtC,MAAM,CAAC,CAAA;SACR;IACH,CAAC;CACF;AAhCD,sCAgCC"}
|
|
@@ -49,6 +49,54 @@ class EvalService {
|
|
|
49
49
|
return str;
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
|
+
async evalObject(obj) {
|
|
53
|
+
if (!obj) {
|
|
54
|
+
return null;
|
|
55
|
+
}
|
|
56
|
+
const token = _.get(this.opt, 'token');
|
|
57
|
+
const objClone = _.clone(obj);
|
|
58
|
+
if (!token) {
|
|
59
|
+
return objClone;
|
|
60
|
+
}
|
|
61
|
+
const keys = Object.keys(objClone);
|
|
62
|
+
for (let i = 0; i < keys.length; i++) {
|
|
63
|
+
const key = keys[i];
|
|
64
|
+
const value = objClone[key];
|
|
65
|
+
if (value instanceof Date) {
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
if (typeof value === 'object') {
|
|
69
|
+
objClone[key] = await this.evalObject(value);
|
|
70
|
+
}
|
|
71
|
+
else if (typeof value === 'string') {
|
|
72
|
+
objClone[key] = await this.eval(value);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
return objClone;
|
|
76
|
+
}
|
|
77
|
+
evalObjectSync(obj) {
|
|
78
|
+
if (!obj) {
|
|
79
|
+
return null;
|
|
80
|
+
}
|
|
81
|
+
const token = _.get(this.opt, 'token');
|
|
82
|
+
const objClone = _.clone(obj);
|
|
83
|
+
if (!token) {
|
|
84
|
+
return objClone;
|
|
85
|
+
}
|
|
86
|
+
Object.keys(objClone).forEach(key => {
|
|
87
|
+
const value = objClone[key];
|
|
88
|
+
if (value instanceof Date) {
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
if (typeof value === 'object') {
|
|
92
|
+
objClone[key] = this.evalObjectSync(value);
|
|
93
|
+
}
|
|
94
|
+
else if (typeof value === 'string') {
|
|
95
|
+
objClone[key] = this.evalSync(value);
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
return objClone;
|
|
99
|
+
}
|
|
52
100
|
}
|
|
53
101
|
exports.EvalService = EvalService;
|
|
54
102
|
//# sourceMappingURL=eval.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eval.service.js","sourceRoot":"","sources":["../../../src/plugins/eval/eval.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,+BAA4B;AAE5B,MAAa,WAAW;IAGtB,YAA6B,OAAO,EAAmB,MAGnD,IAAI;QAHqB,YAAO,GAAP,OAAO,CAAA;QAAmB,QAAG,GAAH,GAAG,CAGlD;QALS,SAAI,GAAG,IAAI,WAAI,EAAE,CAAC;QAMjC,IAAI,CAAC,IAAI,CAAC,aAAa,iBACrB,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,EAC7B,GAAG,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAClB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAChC,CAAC,EACD,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAE7D,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,IAAI,EAAE,CAAC,EACnC,CAAC;IACL,CAAC;IAEO,OAAO,CAAC,GAAW;QACzB,MAAM,QAAQ,GAAG,GAAG,EAAE;YACpB,OAAO,IAAI,GAAG,GAAG,CAAC;QACpB,CAAC,CAAC;QACF,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,GAAG,CAAC;SACZ;QACD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC1B,OAAO,QAAQ,EAAE,CAAC;SACnB;QACD,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAW;QACpB,IAAI,CAAC,GAAG,EAAE;YACR,OAAO,IAAI,CAAC;SACb;QACD,IAAI;YACF,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SAC9D;QAAC,OAAO,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"eval.service.js","sourceRoot":"","sources":["../../../src/plugins/eval/eval.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Logger } from '../core/services/logger';
|
|
2
|
+
export interface ClientConnection {
|
|
3
|
+
grpcServiceAddress: string;
|
|
4
|
+
namespace: string;
|
|
5
|
+
key: string;
|
|
6
|
+
}
|
|
7
|
+
export declare abstract class GrpcClient {
|
|
8
|
+
private readonly config;
|
|
9
|
+
protected readonly logger: Logger;
|
|
10
|
+
private readonly metadata;
|
|
11
|
+
private readonly constr;
|
|
12
|
+
private activeClientId;
|
|
13
|
+
private readonly clients;
|
|
14
|
+
constructor(className: string, protoFileName: string, serviceName: string, config: ClientConnection);
|
|
15
|
+
private switchClient;
|
|
16
|
+
private connect;
|
|
17
|
+
private disconect;
|
|
18
|
+
call<Request, Response>(method: string, data?: Request): Promise<Response>;
|
|
19
|
+
}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.GrpcClient = void 0;
|
|
4
|
+
const grpc_js_1 = require("@grpc/grpc-js");
|
|
5
|
+
const proto_loader_1 = require("@grpc/proto-loader");
|
|
6
|
+
const logger_1 = require("../core/services/logger");
|
|
7
|
+
class GrpcClient {
|
|
8
|
+
constructor(className, protoFileName, serviceName, config) {
|
|
9
|
+
this.config = config;
|
|
10
|
+
this.activeClientId = 0;
|
|
11
|
+
this.clients = [null, null];
|
|
12
|
+
this.logger = new logger_1.Logger(className);
|
|
13
|
+
const def = grpc_js_1.loadPackageDefinition(proto_loader_1.loadSync(`${process.cwd()}//node_modules/@puca/puca-core/${protoFileName}`, {
|
|
14
|
+
json: true,
|
|
15
|
+
keepCase: true,
|
|
16
|
+
enums: String,
|
|
17
|
+
longs: Number,
|
|
18
|
+
arrays: true
|
|
19
|
+
}));
|
|
20
|
+
this.constr = def.main[serviceName];
|
|
21
|
+
this.connect(this.activeClientId);
|
|
22
|
+
setInterval(async () => {
|
|
23
|
+
this.switchClient();
|
|
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({
|
|
52
|
+
loadBalancingPolicy: 'round_robin',
|
|
53
|
+
loadBalancingConfig: [{
|
|
54
|
+
round_robin: {}
|
|
55
|
+
}],
|
|
56
|
+
}),
|
|
57
|
+
};
|
|
58
|
+
this.clients[clientId] = {
|
|
59
|
+
client: new this.constr(this.config.grpcServiceAddress || "localhost:5000", grpc_js_1.credentials.createInsecure(), options),
|
|
60
|
+
count: 0
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
disconect(c) {
|
|
64
|
+
c.client.close();
|
|
65
|
+
c.count = 0;
|
|
66
|
+
}
|
|
67
|
+
async call(method, data = null) {
|
|
68
|
+
const c = this.clients[this.activeClientId];
|
|
69
|
+
c.count++;
|
|
70
|
+
return new Promise((resolve, reject) => {
|
|
71
|
+
c.client[method](data, this.metadata, (err, res) => {
|
|
72
|
+
c.count--;
|
|
73
|
+
if (err) {
|
|
74
|
+
return reject(err.message || err);
|
|
75
|
+
}
|
|
76
|
+
if (res.error) {
|
|
77
|
+
return reject(res.error.message || 'Generic Error');
|
|
78
|
+
}
|
|
79
|
+
resolve(res.result);
|
|
80
|
+
});
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
exports.GrpcClient = GrpcClient;
|
|
85
|
+
//# sourceMappingURL=grpc-client.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"grpc-client.service.js","sourceRoot":"","sources":["../../src/plugins/grpc-client.service.ts"],"names":[],"mappings":"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"}
|