@puca/puca-core 4.4.0 → 5.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.
Files changed (43) hide show
  1. package/dist/core/services/auth.service.js +1 -1
  2. package/dist/core/services/auth.service.js.map +1 -1
  3. package/dist/core/services/comunication/comunication-http.service.d.ts +18 -0
  4. package/dist/core/services/comunication/comunication-http.service.js +47 -0
  5. package/dist/core/services/comunication/comunication-http.service.js.map +1 -0
  6. package/dist/core/services/comunication/comunication.service.d.ts +26 -0
  7. package/dist/core/services/comunication/comunication.service.js +49 -0
  8. package/dist/core/services/comunication/comunication.service.js.map +1 -0
  9. package/dist/core/services/index.d.ts +3 -1
  10. package/dist/core/services/index.js +6 -4
  11. package/dist/core/services/index.js.map +1 -1
  12. package/dist/core/services/life-cycle.service.d.ts +4 -3
  13. package/dist/core/services/life-cycle.service.js +10 -53
  14. package/dist/core/services/life-cycle.service.js.map +1 -1
  15. package/dist/core/services/source/gcloud-run-cloud/v1/application.service.d.ts +1 -1
  16. package/dist/core/services/source/javascript/v1/application.service.d.ts +1 -1
  17. package/dist/models/crud-controller-especification-enviroment.d.ts +3 -1
  18. package/dist/models/secret.d.ts +4 -2
  19. package/dist/orm/cases/sql/sql.service.d.ts +1 -6
  20. package/dist/orm/cases/sql/sql.service.js +7 -7
  21. package/dist/orm/cases/sql/sql.service.js.map +1 -1
  22. package/dist/orm/interfaces.d.ts +0 -1
  23. package/dist/orm/services/cache-repository/cache-repository.js +1 -4
  24. package/dist/orm/services/cache-repository/cache-repository.js.map +1 -1
  25. package/dist/orm/services/managers/database-manager.service.d.ts +4 -36
  26. package/dist/orm/services/managers/database-manager.service.js +15 -131
  27. package/dist/orm/services/managers/database-manager.service.js.map +1 -1
  28. package/dist/orm/services/managers/puca-orm-client.service.d.ts +30 -0
  29. package/dist/orm/services/managers/puca-orm-client.service.js +104 -0
  30. package/dist/orm/services/managers/puca-orm-client.service.js.map +1 -0
  31. package/dist/orm/services/repository.d.ts +92 -82
  32. package/dist/orm/services/repository.js +4 -7
  33. package/dist/orm/services/repository.js.map +1 -1
  34. package/dist/tsconfig.tsbuildinfo +1 -1
  35. package/package.json +4 -4
  36. package/puca-orm.proto +38 -0
  37. package/yarn-error.log +560 -243
  38. package/dist/core/services/comunication.service.d.ts +0 -26
  39. package/dist/core/services/comunication.service.js +0 -77
  40. package/dist/core/services/comunication.service.js.map +0 -1
  41. package/dist/orm/services/cache-repository/cache-repository-postgres.d.ts +0 -23
  42. package/dist/orm/services/cache-repository/cache-repository-postgres.js +0 -128
  43. package/dist/orm/services/cache-repository/cache-repository-postgres.js.map +0 -1
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CacheRepository = void 0;
4
- const cache_repository_postgres_1 = require("./cache-repository-postgres");
5
4
  const cache_repository_redis_1 = require("./cache-repository-redis");
6
5
  class CacheRepository {
7
6
  constructor(envConfigService, database, redisClient, table) {
@@ -15,11 +14,9 @@ class CacheRepository {
15
14
  const cacheRepositoryProvider = await this.envConfigService.getEnvByName('CACHE_REPOSITORY_PROVIDER');
16
15
  switch (cacheRepositoryProvider) {
17
16
  case 'redis':
17
+ default:
18
18
  this.instance = new cache_repository_redis_1.CacheRepositoryRedis(this.database, this.redisClient, this.table);
19
19
  break;
20
- case 'postgres':
21
- default:
22
- this.instance = new cache_repository_postgres_1.CacheRepositoryPostgres(this.database, this.table);
23
20
  }
24
21
  }
25
22
  return this.instance;
@@ -1 +1 @@
1
- {"version":3,"file":"cache-repository.js","sourceRoot":"","sources":["../../../../src/orm/services/cache-repository/cache-repository.ts"],"names":[],"mappings":";;;AAIA,2EAAsE;AACtE,qEAAgE;AAgChE,MAAa,eAAe;IAG1B,YACmB,gBAAkC,EAClC,QAAkB,EAClB,WAAwB,EACxB,KAAa;QAHb,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,aAAQ,GAAR,QAAQ,CAAU;QAClB,gBAAW,GAAX,WAAW,CAAa;QACxB,UAAK,GAAL,KAAK,CAAQ;IAC5B,CAAC;IAEG,KAAK,CAAC,WAAW;QACvB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,2BAA2B,CAAC,CAAA;YACrG,QAAQ,uBAAuB,EAAE;gBAC/B,KAAK,OAAO;oBACV,IAAI,CAAC,QAAQ,GAAG,IAAI,6CAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;oBACrF,MAAK;gBACP,KAAK,UAAU,CAAC;gBAChB;oBACE,IAAI,CAAC,QAAQ,GAAG,IAAI,mDAAuB,CAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;aAC5E;SACF;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;QACzC,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAA;IAC3B,CAAC;IACD,KAAK,CAAC,QAAQ,CAAC,OAA8B;QAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;QACzC,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IACnC,CAAC;IACD,KAAK,CAAC,QAAQ;QACZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;QACzC,OAAO,QAAQ,CAAC,QAAQ,EAAE,CAAA;IAC5B,CAAC;CACF;AArCD,0CAqCC"}
1
+ {"version":3,"file":"cache-repository.js","sourceRoot":"","sources":["../../../../src/orm/services/cache-repository/cache-repository.ts"],"names":[],"mappings":";;;AAIA,qEAAgE;AAgChE,MAAa,eAAe;IAG1B,YACmB,gBAAkC,EAClC,QAAkB,EAClB,WAAwB,EACxB,KAAa;QAHb,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,aAAQ,GAAR,QAAQ,CAAU;QAClB,gBAAW,GAAX,WAAW,CAAa;QACxB,UAAK,GAAL,KAAK,CAAQ;IAC5B,CAAC;IAEG,KAAK,CAAC,WAAW;QACvB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,2BAA2B,CAAC,CAAA;YACrG,QAAQ,uBAAuB,EAAE;gBAC/B,KAAK,OAAO,CAAC;gBACb;oBACE,IAAI,CAAC,QAAQ,GAAG,IAAI,6CAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;oBACrF,MAAK;aACR;SACF;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;QACzC,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAA;IAC3B,CAAC;IACD,KAAK,CAAC,QAAQ,CAAC,OAA8B;QAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;QACzC,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IACnC,CAAC;IACD,KAAK,CAAC,QAAQ;QACZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;QACzC,OAAO,QAAQ,CAAC,QAAQ,EAAE,CAAA;IAC5B,CAAC;CACF;AAnCD,0CAmCC"}
@@ -1,46 +1,14 @@
1
1
  import { SqlCommand } from '../../interfaces';
2
- export interface SerialExecResult<T> {
3
- commandName: string;
4
- result: T[];
5
- rowsAffected: number;
6
- }
7
- export interface DatabaseConfig {
8
- user: string;
9
- database: string;
10
- password: string;
11
- port: number;
12
- host: string;
13
- max: number;
14
- }
2
+ import { PucaOrmClientConnection, PucaOrmQueryOpt, QueryResult } from './puca-orm-client.service';
15
3
  export declare type Handler = (payload: string) => void;
16
- export declare enum DatabaseState {
17
- Ready = "Ready",
18
- Closed = "Closed",
19
- Shutdown = "Shutdown"
20
- }
21
4
  export declare class Database {
22
- private readonly config;
23
- private readonly poolHelthCheck;
24
5
  private readonly logger;
25
- private readonly pool;
26
- private readonly clients;
27
- private subscriptions;
28
- private status;
29
- constructor(config: DatabaseConfig & {
30
- application_name: string;
31
- });
6
+ private readonly pucaOrmClient;
7
+ constructor(config: PucaOrmClientConnection);
32
8
  connect(): Promise<void>;
33
- private _subscribe;
34
- private getConnection;
35
- subscribe(topic: string, handler: Handler): Promise<void>;
36
9
  private query;
37
10
  exec<T>(sqlCommand: SqlCommand): Promise<T[]>;
38
- serialExec<T>(sqlCommandList: SqlCommand[], opt?: {
39
- transaction: boolean;
40
- }): Promise<SerialExecResult<T>[]>;
41
- getConfig(): DatabaseConfig & {
42
- application_name: string;
43
- };
11
+ serialExec(sqlCommandList: SqlCommand[], opt?: PucaOrmQueryOpt): Promise<QueryResult[]>;
44
12
  disconnect(): Promise<void>;
45
13
  }
46
14
  export declare class DatabaseManagerService {
@@ -1,52 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.DatabaseManagerService = exports.Database = exports.DatabaseState = void 0;
4
- const pg_1 = require("pg");
3
+ exports.DatabaseManagerService = exports.Database = void 0;
4
+ const _ = require("lodash");
5
5
  const logger_1 = require("../../../core/services/logger");
6
- const plugins_1 = require("../../../plugins");
7
- var DatabaseState;
8
- (function (DatabaseState) {
9
- DatabaseState["Ready"] = "Ready";
10
- DatabaseState["Closed"] = "Closed";
11
- DatabaseState["Shutdown"] = "Shutdown";
12
- })(DatabaseState = exports.DatabaseState || (exports.DatabaseState = {}));
6
+ const puca_orm_client_service_1 = require("./puca-orm-client.service");
13
7
  class Database {
14
8
  constructor(config) {
15
- this.config = config;
16
9
  this.logger = new logger_1.Logger('Database');
17
- this.clients = new Map();
18
- this.subscriptions = [];
19
- this.status = DatabaseState.Ready;
20
- this.pool = new pg_1.Pool(Object.assign({}, config));
21
- this.poolHelthCheck = setInterval(() => {
22
- if (this.pool.waitingCount > 0) {
23
- this.logger.warn('waitingCount: ' + this.pool.waitingCount);
24
- }
25
- }, 5000);
26
- this.pool.on('acquire', client => {
27
- const c = client;
28
- c.uuid = plugins_1.uuidService.v4();
29
- this.clients.set(c.uuid, c);
30
- });
31
- this.pool.on('remove', client => {
32
- const c = client;
33
- this.subscriptions = this.subscriptions.reduce((retorno, s) => {
34
- if (s.client.uuid === c.uuid && this.status === DatabaseState.Ready) {
35
- s.client.removeAllListeners('error');
36
- s.client.removeAllListeners('notification');
37
- this.logger.debug('resubscrevendo o topico ' + s.topic);
38
- this.subscribe(s.topic, s.handler);
39
- }
40
- else {
41
- retorno.push(s);
42
- }
43
- return retorno;
44
- }, []);
45
- this.clients.delete(c.uuid);
46
- });
47
- this.pool.on('error', error => {
48
- this.logger.error(error);
49
- });
10
+ this.pucaOrmClient = new puca_orm_client_service_1.PucaOrmClient(config);
50
11
  }
51
12
  async connect() {
52
13
  try {
@@ -60,104 +21,27 @@ class Database {
60
21
  throw new Error('Fail to connect on database');
61
22
  }
62
23
  }
63
- async _subscribe(client, topic, handler) {
64
- client.on('error', e => {
65
- this.logger.error(e);
66
- });
67
- client.on('notification', ({ payload }) => {
68
- handler(payload);
69
- });
70
- this.subscriptions.push({
71
- client,
72
- handler,
73
- topic,
74
- });
75
- this.logger.debug(`subscrevendo no '${topic}' no client ${client.uuid}`);
76
- await client.query(`listen "${topic}"`);
77
- }
78
- getConnection() {
79
- let tryCountDown = 10;
80
- let tryGetConnection = () => new Promise((resolve, r) => {
81
- const reject = (e) => {
82
- this.logger.error(e, `Tentativa: ${tryCountDown}`);
83
- if (tryCountDown <= 0) {
84
- r(new Error('Não foi possível atender esta solicitação, for favor tente mais tarde'));
85
- return;
86
- }
87
- tryCountDown--;
88
- setTimeout(() => tryGetConnection().then(resolve).catch(reject), 1000);
89
- };
90
- this.pool.connect().then(c => resolve(c)).catch(reject);
91
- });
92
- return tryGetConnection();
93
- }
94
- async subscribe(topic, handler) {
95
- const client = await this.getConnection();
96
- await this._subscribe(client, topic, handler);
97
- }
98
- query(client, sqlCommand) {
99
- this.logger.verbose(() => sqlCommand.sql, () => sqlCommand.args);
100
- return client.query({
101
- name: sqlCommand.uniqueName,
24
+ query(sqlCommandList, opt) {
25
+ sqlCommandList.forEach(sqlCommand => this.logger.verbose(() => sqlCommand.sql, () => sqlCommand.args));
26
+ return this.pucaOrmClient.query(sqlCommandList.map(sqlCommand => ({
27
+ name: sqlCommand.commandName,
102
28
  text: sqlCommand.sql,
103
29
  values: sqlCommand.args
104
- });
30
+ })), opt);
105
31
  }
106
32
  async exec(sqlCommand) {
107
- const client = await this.getConnection();
108
- try {
109
- const result = await this.query(client, sqlCommand);
110
- return result.rows;
111
- }
112
- catch (e) {
113
- this.logger.warn(sqlCommand, e);
114
- throw e;
115
- }
116
- finally {
117
- await client.release();
118
- }
33
+ const result = await this.query([sqlCommand], {
34
+ transaction: false
35
+ });
36
+ return _.get(result, [0, 'result']);
119
37
  }
120
38
  async serialExec(sqlCommandList, opt = {
121
39
  transaction: true,
122
40
  }) {
123
- const client = await this.getConnection();
124
- if (opt.transaction) {
125
- await client.query('begin');
126
- }
127
- let sqlCommand;
128
- try {
129
- const retorno = [];
130
- for (let j = 0; j < sqlCommandList.length; j++) {
131
- sqlCommand = sqlCommandList[j];
132
- const result = await this.query(client, sqlCommand);
133
- retorno.push({
134
- commandName: sqlCommand.commandName,
135
- result: result.rows,
136
- rowsAffected: result.rowCount,
137
- });
138
- }
139
- await client.query('commit');
140
- return retorno;
141
- }
142
- catch (e) {
143
- this.logger.warn(sqlCommand, e);
144
- if (opt.transaction) {
145
- await client.query('rollback');
146
- }
147
- throw e;
148
- }
149
- finally {
150
- await client.release();
151
- }
152
- }
153
- getConfig() {
154
- return this.config;
41
+ const result = await this.query(sqlCommandList, { transaction: opt.transaction });
42
+ return result;
155
43
  }
156
44
  async disconnect() {
157
- this.status = DatabaseState.Shutdown;
158
- clearTimeout(this.poolHelthCheck);
159
- await this.pool.end();
160
- this.status = DatabaseState.Closed;
161
45
  }
162
46
  }
163
47
  exports.Database = Database;
@@ -1 +1 @@
1
- {"version":3,"file":"database-manager.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/database-manager.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"database-manager.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/database-manager.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAE5B,0DAAuD;AACvD,uEAAiH;AAIjH,MAAa,QAAQ;IAInB,YAAY,MAA+B;QAH1B,WAAM,GAAG,IAAI,eAAM,CAAC,UAAU,CAAC,CAAC;QAI/C,IAAI,CAAC,aAAa,GAAG,IAAI,uCAAa,CAAC,MAAM,CAAC,CAAA;IAChD,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI;YACF,MAAM,IAAI,CAAC,IAAI,CAAC;gBACd,GAAG,EAAE,cAAc;gBACnB,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;SAChD;IACH,CAAC;IAEO,KAAK,CAAC,cAA4B,EAAE,GAAoB;QAC9D,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;QACtG,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAChE,IAAI,EAAE,UAAU,CAAC,WAAW;YAC5B,IAAI,EAAE,UAAU,CAAC,GAAG;YACpB,MAAM,EAAE,UAAU,CAAC,IAAI;SACxB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;IACX,CAAC;IAED,KAAK,CAAC,IAAI,CAAI,UAAsB;QAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,EAAE;YAC5C,WAAW,EAAE,KAAK;SACnB,CAAC,CAAC;QACH,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAQ,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,UAAU,CACd,cAA4B,EAC5B,MAAuB;QACrB,WAAW,EAAE,IAAI;KAClB;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QAClF,OAAO,MAAM,CAAA;IACf,CAAC;IAED,KAAK,CAAC,UAAU;IAEhB,CAAC;CACF;AAjDD,4BAiDC;AAED,MAAa,sBAAsB;IAGjC,GAAG;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;SACzC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,CAAW;QACb,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAA;IACnB,CAAC;CACF;AAbD,wDAaC"}
@@ -0,0 +1,30 @@
1
+ export interface PucaOrmClientConnection {
2
+ grpcServiceAddress: string;
3
+ namespace: string;
4
+ key: string;
5
+ }
6
+ export interface PucaOrmQueryOpt {
7
+ transaction: boolean;
8
+ }
9
+ export interface QueryResult {
10
+ name: string;
11
+ result: any[];
12
+ rowsAffected: number;
13
+ }
14
+ export declare class PucaOrmClient {
15
+ private readonly config;
16
+ private readonly logger;
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;
30
+ }
@@ -0,0 +1,104 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.PucaOrmClient = 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 PucaOrmClient {
8
+ constructor(config) {
9
+ this.config = config;
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');
29
+ }
30
+ async query(commandList, opt) {
31
+ const c = this.clients[this.activeClientId];
32
+ c.count++;
33
+ return new Promise((resolve, reject) => {
34
+ commandList.forEach(command => {
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
+ if (!res.error.message) {
52
+ this.logger.error(res.error);
53
+ }
54
+ return reject(new Error(res.error.message || 'Generic Error'));
55
+ }
56
+ (res.result || []).forEach(r => {
57
+ (r.result || []).forEach((v, i) => {
58
+ r.result[i] = JSON.parse(v);
59
+ });
60
+ });
61
+ resolve(res.result);
62
+ });
63
+ });
64
+ }
65
+ switchClient() {
66
+ const oldClient = this.clients[this.activeClientId];
67
+ const newClientId = this.activeClientId === 0 ? 1 : 0;
68
+ this.connect(newClientId);
69
+ this.activeClientId = newClientId;
70
+ let safe = true;
71
+ setTimeout(() => {
72
+ safe = false;
73
+ }, 60000);
74
+ const i = setInterval(() => {
75
+ if (!safe) {
76
+ this.logger.warn('Client close was forced');
77
+ }
78
+ if (!safe || !oldClient.count) {
79
+ this.disconect(oldClient);
80
+ clearInterval(i);
81
+ }
82
+ }, 1000);
83
+ }
84
+ connect(clientId) {
85
+ const options = {
86
+ 'grpc.service_config': JSON.stringify({
87
+ loadBalancingPolicy: 'round_robin',
88
+ loadBalancingConfig: [{
89
+ round_robin: {}
90
+ }],
91
+ }),
92
+ };
93
+ this.clients[clientId] = {
94
+ client: new this.constr(this.config.grpcServiceAddress || "localhost:5000", grpc_js_1.credentials.createInsecure(), options),
95
+ count: 0
96
+ };
97
+ }
98
+ disconect(c) {
99
+ c.client.close();
100
+ c.count = 0;
101
+ }
102
+ }
103
+ exports.PucaOrmClient = PucaOrmClient;
104
+ //# sourceMappingURL=puca-orm-client.service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"puca-orm-client.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/puca-orm-client.service.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,89 @@ import { SqlService } from '../cases/sql/sql.service';
5
5
  import { Database } from './managers/database-manager.service';
6
6
  import { EnvConfigService } from '../../essential/envs-config.service';
7
7
  import { RedisClient } from 'redis';
8
+ export interface FindWhereArgs {
9
+ where?: Where;
10
+ args?: any;
11
+ fields: SelectField[];
12
+ page?: number;
13
+ pageSize?: number;
14
+ orderBy?: OrderByField[];
15
+ totalize?: boolean;
16
+ join?: Join[];
17
+ user?: User;
18
+ groupBy?: SelectField[];
19
+ alias?: string;
20
+ }
21
+ export interface FindByInArgs {
22
+ key: string;
23
+ values: any[];
24
+ fields: SelectField[];
25
+ orderBy?: OrderByField[];
26
+ user?: User;
27
+ alias?: string;
28
+ }
29
+ export interface FindByPucaPidArgs {
30
+ pucaPid: string;
31
+ fields: SelectField[];
32
+ user?: User;
33
+ join?: Join[];
34
+ alias?: string;
35
+ }
36
+ export interface FindOneByArgs {
37
+ key: string;
38
+ value: any;
39
+ fields: SelectField[];
40
+ user?: User;
41
+ groupBy?: SelectField[];
42
+ alias?: string;
43
+ }
44
+ export interface FindOneWhereArgs {
45
+ fields: SelectField[];
46
+ args: Object;
47
+ where?: Where;
48
+ user?: User;
49
+ groupBy?: SelectField[];
50
+ join?: Join[];
51
+ alias?: string;
52
+ }
53
+ export interface CountByArgs {
54
+ key: string;
55
+ value: any;
56
+ user?: User;
57
+ groupBy?: SelectField[];
58
+ alias?: string;
59
+ }
60
+ export interface CountWhereArgs {
61
+ where?: Where;
62
+ args?: Object;
63
+ join?: Join[];
64
+ user?: User;
65
+ groupBy?: SelectField[];
66
+ alias?: string;
67
+ }
68
+ export interface FindByArgs {
69
+ key: string;
70
+ value: any;
71
+ fields: SelectField[];
72
+ page?: number;
73
+ pageSize?: number;
74
+ orderBy?: OrderByField[];
75
+ groupBy?: SelectField[];
76
+ totalize?: boolean;
77
+ user?: User;
78
+ alias?: string;
79
+ }
80
+ export interface FindAllArgs {
81
+ fields: SelectField[];
82
+ page?: number;
83
+ pageSize?: number;
84
+ orderBy?: OrderByField[];
85
+ groupBy?: SelectField[];
86
+ totalize?: boolean;
87
+ join?: Join[];
88
+ user?: User;
89
+ alias?: string;
90
+ }
8
91
  export declare class Repository<T extends {
9
92
  puca_pid?: string;
10
93
  }> {
@@ -16,91 +99,18 @@ export declare class Repository<T extends {
16
99
  private readonly envConfigService;
17
100
  private readonly log;
18
101
  constructor(database: Database, redisClient: RedisClient, sqlService: SqlService, uuidService: UuidService, table: string, envConfigService: EnvConfigService);
19
- findByIn({ key, values, fields, orderBy, user, alias }: {
20
- key: string;
21
- values: any[];
22
- fields: SelectField[];
23
- orderBy?: OrderByField[];
24
- user?: User;
25
- alias?: string;
26
- }): Promise<T[]>;
27
- findByPucaPid({ pucaPid, fields, user, alias }: {
28
- pucaPid: string;
29
- fields: SelectField[];
30
- user?: User;
31
- alias?: string;
32
- }): Promise<T>;
33
- findOneBy(args: {
34
- key: string;
35
- value: any;
36
- fields: SelectField[];
37
- user?: User;
38
- groupBy?: SelectField[];
39
- alias?: string;
40
- }): Promise<T>;
41
- findOneWhere(args: {
42
- fields: SelectField[];
43
- args: Object;
44
- where?: Where;
45
- user?: User;
46
- groupBy?: SelectField[];
47
- join?: Join[];
48
- alias?: string;
49
- }): Promise<T>;
50
- countBy({ key, value, user, groupBy, alias }: {
51
- key: string;
52
- value: any;
53
- user?: User;
54
- groupBy?: SelectField[];
55
- alias?: string;
56
- }): Promise<number>;
57
- countWhere({ where, args, join, user, groupBy, alias }: {
58
- where?: Where;
59
- args?: Object;
60
- join?: Join[];
61
- user?: User;
62
- groupBy?: SelectField[];
63
- alias?: string;
64
- }): Promise<number>;
65
- findWhere({ args, where, fields, join, page, pageSize, orderBy, totalize, user, groupBy, alias }: {
66
- where?: Where;
67
- args?: any;
68
- fields: SelectField[];
69
- page?: number;
70
- pageSize?: number;
71
- orderBy?: OrderByField[];
72
- totalize?: boolean;
73
- join?: Join[];
74
- user?: User;
75
- groupBy?: SelectField[];
76
- alias?: string;
77
- }): Promise<SelectResult<T>>;
78
- findBy({ key, value, fields, page, pageSize, orderBy, groupBy, totalize, user, alias }: {
79
- key: string;
80
- value: any;
81
- fields: SelectField[];
82
- page?: number;
83
- pageSize?: number;
84
- orderBy?: OrderByField[];
85
- groupBy?: SelectField[];
86
- totalize?: boolean;
87
- user?: User;
88
- alias?: string;
89
- }): Promise<SelectResult<T>>;
102
+ findByIn({ key, values, fields, orderBy, user, alias }: FindByInArgs): Promise<T[]>;
103
+ findByPucaPid({ pucaPid, fields, user, alias }: FindByPucaPidArgs): Promise<T>;
104
+ findOneBy(args: FindOneByArgs): Promise<T>;
105
+ findOneWhere(args: FindOneWhereArgs): Promise<T>;
106
+ countBy({ key, value, user, groupBy, alias }: CountByArgs): Promise<number>;
107
+ countWhere({ where, args, join, user, groupBy, alias }: CountWhereArgs): Promise<number>;
108
+ findWhere({ args, where, fields, join, page, pageSize, orderBy, totalize, user, groupBy, alias }: FindWhereArgs): Promise<SelectResult<T>>;
109
+ findBy({ key, value, fields, page, pageSize, orderBy, groupBy, totalize, user, alias }: FindByArgs): Promise<SelectResult<T>>;
90
110
  countAll(args?: {
91
111
  user?: User;
92
112
  }): Promise<number>;
93
- findAll({ fields, page, pageSize, orderBy, groupBy, totalize, join, user, alias }: {
94
- fields: SelectField[];
95
- page?: number;
96
- pageSize?: number;
97
- orderBy?: OrderByField[];
98
- groupBy?: SelectField[];
99
- totalize?: boolean;
100
- join?: Join[];
101
- user?: User;
102
- alias?: string;
103
- }): Promise<SelectResult<T>>;
113
+ findAll({ fields, page, pageSize, orderBy, groupBy, totalize, join, user, alias }: FindAllArgs): Promise<SelectResult<T>>;
104
114
  private insert;
105
115
  private upinsert;
106
116
  save(args: {
@@ -37,14 +37,14 @@ class Repository {
37
37
  async findByPucaPid({ pucaPid, fields, user, alias }) {
38
38
  return await this.findOneBy({
39
39
  fields,
40
- key: 'puca_pid',
40
+ key: `${alias || this.table}.puca_pid`,
41
41
  value: pucaPid,
42
42
  user,
43
43
  alias
44
44
  });
45
45
  }
46
46
  async findOneBy(args) {
47
- const result = await this.findBy(Object.assign(Object.assign({}, args), { pageSize: 1, orderBy: ['puca_created_at'] }));
47
+ const result = await this.findBy(Object.assign(Object.assign({}, args), { pageSize: 1, orderBy: [`${args.alias || this.table}.puca_created_at`] }));
48
48
  return _.get(result.data, 0);
49
49
  }
50
50
  async findOneWhere(args) {
@@ -217,11 +217,10 @@ class Repository {
217
217
  }, {}),
218
218
  args: entity,
219
219
  puca_pid: entity.puca_pid,
220
- notify: (cacheRepositoryProvider || 'postgres') === 'postgres'
221
220
  }, user);
222
221
  const response = await this.database.serialExec(commands);
223
222
  if (!response
224
- .filter(r => r.commandName === 'updatePuca' || r.commandName === 'updateUser')
223
+ .filter(r => r.name === 'updatePuca' || r.name === 'updateUser')
225
224
  .reduce((a, b) => a + b.rowsAffected, 0)) {
226
225
  const inserted = await this.insert({
227
226
  entity,
@@ -245,7 +244,6 @@ class Repository {
245
244
  const commands = this.sqlService.delete({
246
245
  tableName: this.table,
247
246
  puca_pid,
248
- notify: (cacheRepositoryProvider || 'postgres') === 'postgres'
249
247
  }, user);
250
248
  await this.database.serialExec(commands);
251
249
  await this.redisClient.publish(`${this.table}.change`, puca_pid);
@@ -263,11 +261,10 @@ class Repository {
263
261
  quantity,
264
262
  },
265
263
  returning: [field],
266
- notify: (cacheRepositoryProvider || 'postgres') === 'postgres'
267
264
  }, user);
268
265
  const commandName = field.startsWith('user_') ? 'updateUser' : 'updatePuca';
269
266
  const result = await this.database.serialExec(sqlCommand);
270
- const retorno = result.find(r => r.commandName === commandName).result;
267
+ const retorno = result.find(r => r.name === commandName).result;
271
268
  await this.redisClient.publish(`${this.table}.change`, puca_pid);
272
269
  return retorno[0][field];
273
270
  }